Fix scrolling on hidpi screens

[dolphin.git] / src / panels / terminal / terminalpanel.cpp

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index b45be621a56e5d24aadb5ec177c576dccda2d95b..da68210c12e4610dcbfc233c257887aaac8493c9 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -23,14 +23,17 @@
 
 #include <KPluginLoader>
 #include <KPluginFactory>
 
 #include <KPluginLoader>
 #include <KPluginFactory>

-#include <kde_terminal_interface_v2.h>
-#include <KParts/Part>
+#include <KService>
+#include <kde_terminal_interface.h>
+#include <KParts/ReadOnlyPart>

 #include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>

+#include <KJobWidgets>

 
 

-#include <QBoxLayout>
+#include <QDir>

 #include <QShowEvent>
 #include <QShowEvent>

+#include <QVBoxLayout>

 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),


@@ -38,7 +41,10 @@ TerminalPanel::TerminalPanel(QWidget* parent) :
     m_mostLocalUrlJob(0),
     m_layout(0),
     m_terminal(0),
     m_mostLocalUrlJob(0),
     m_layout(0),
     m_terminal(0),

-    m_terminalWidget(0)
+    m_terminalWidget(0),
+    m_konsolePart(0),
+    m_konsolePartCurrentDirectory(),
+    m_sendCdToTerminalHistory()

 {
     m_layout = new QVBoxLayout(this);
     m_layout->setMargin(0);
 {
     m_layout = new QVBoxLayout(this);
     m_layout->setMargin(0);


@@ -50,15 +56,28 @@ TerminalPanel::~TerminalPanel()
 
 void TerminalPanel::terminalExited()
 {
 
 void TerminalPanel::terminalExited()
 {

-    emit hideTerminalPanel();

     m_terminal = 0;
     m_terminal = 0;

+    emit hideTerminalPanel();

 }
 
 }
 

-void TerminalPanel::visibilityChanged(bool visible)
+void TerminalPanel::dockVisibilityChanged()

 {
 {

-    if (!visible && m_terminal && (m_terminal->foregroundProcessId() == -1)) {
+    // Only react when the DockWidget itself (not some parent) is hidden. This way we don't
+    // respond when e.g. Dolphin is minimized.
+    if (parentWidget() && parentWidget()->isHidden() &&
+        m_terminal && (m_terminal->foregroundProcessId() == -1)) {
+        // Make sure that the following "cd /" command will not affect the view.
+        disconnect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
+                   this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
+

         // Make sure this terminal does not prevent unmounting any removable drives
         // Make sure this terminal does not prevent unmounting any removable drives

-        changeDir(KUrl::fromPath("/"));
+        changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
+
+        // Because we have disconnected from the part's currentDirectoryChanged()
+        // signal, we have to update m_konsolePartCurrentDirectory manually. If this
+        // was not done, showing the panel again might not set the part's working
+        // directory correctly.
+        m_konsolePartCurrentDirectory = '/';

     }
 }
 
     }
 }
 


@@ -85,25 +104,31 @@ void TerminalPanel::showEvent(QShowEvent* event)
 
     if (!m_terminal) {
         m_clearTerminal = true;
 
     if (!m_terminal) {
         m_clearTerminal = true;

-        KPluginFactory* factory = KPluginLoader("libkonsolepart").factory();
-        KParts::ReadOnlyPart* part = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
-        if (part) {
-            connect(part, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited()));
-            m_terminalWidget = part->widget();
+        KPluginFactory* factory = 0;
+        KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart"));
+        if (service) {
+            factory = KPluginLoader(service->library()).factory();
+        }
+        m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
+        if (m_konsolePart) {
+            connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
+            m_terminalWidget = m_konsolePart->widget();

             m_layout->addWidget(m_terminalWidget);
             m_layout->addWidget(m_terminalWidget);

-            m_terminal = qobject_cast<TerminalInterfaceV2 *>(part);
+            m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);

         }
     }
     if (m_terminal) {
         m_terminal->showShellInDir(url().toLocalFile());
         changeDir(url());
         m_terminalWidget->setFocus();
         }
     }
     if (m_terminal) {
         m_terminal->showShellInDir(url().toLocalFile());
         changeDir(url());
         m_terminalWidget->setFocus();

+        connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
+                this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));

     }
 
     Panel::showEvent(event);
 }
 
     }
 
     Panel::showEvent(event);
 }
 

-void TerminalPanel::changeDir(const KUrl& url)
+void TerminalPanel::changeDir(const QUrl& url)

 {
     delete m_mostLocalUrlJob;
     m_mostLocalUrlJob = 0;
 {
     delete m_mostLocalUrlJob;
     m_mostLocalUrlJob = 0;


@@ -112,25 +137,41 @@ void TerminalPanel::changeDir(const KUrl& url)
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);

-        m_mostLocalUrlJob->ui()->setWindow(this);
-        connect(m_mostLocalUrlJob, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
+        if (m_mostLocalUrlJob->ui()) {
+            KJobWidgets::setWindow(m_mostLocalUrlJob, this);
+        }
+        connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);

     }
 }
 
 void TerminalPanel::sendCdToTerminal(const QString& dir)
 {
     }
 }
 
 void TerminalPanel::sendCdToTerminal(const QString& dir)
 {

+    if (dir == m_konsolePartCurrentDirectory) {
+        m_clearTerminal = false;
+        return;
+    }
+

     if (!m_clearTerminal) {
         // The TerminalV2 interface does not provide a way to delete the
         // current line before sending a new input. This is mandatory,
         // otherwise sending a 'cd x' to a existing 'rm -rf *' might
         // result in data loss. As workaround SIGINT is send.
     if (!m_clearTerminal) {
         // The TerminalV2 interface does not provide a way to delete the
         // current line before sending a new input. This is mandatory,
         // otherwise sending a 'cd x' to a existing 'rm -rf *' might
         // result in data loss. As workaround SIGINT is send.

-        kill(m_terminal->terminalProcessId(), SIGINT);
+        const int processId = m_terminal->terminalProcessId();
+        if (processId > 0) {
+            kill(processId, SIGINT);
+        }

     }
 
     }
 

-    m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
+    m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
+
+    // We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after
+    // the directory change, because this directory change is not caused by a "cd" command that the
+    // user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be
+    // a symbolic link -> remember the 'canonical' path.
+    m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());

 
     if (m_clearTerminal) {
 
     if (m_clearTerminal) {

-        m_terminal->sendInput("clear\n");
+        m_terminal->sendInput(QStringLiteral(" clear\n"));

         m_clearTerminal = false;
     }
 }
         m_clearTerminal = false;
     }
 }


@@ -138,7 +179,7 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);

-    const KUrl url = statJob->mostLocalUrl();
+    const QUrl url = statJob->mostLocalUrl();

     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     }
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     }


@@ -146,4 +187,18 @@ void TerminalPanel::slotMostLocalUrlResult(KJob* job)
     m_mostLocalUrlJob = 0;
 }
 
     m_mostLocalUrlJob = 0;
 }
 

-#include "terminalpanel.moc"
+void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
+{
+    m_konsolePartCurrentDirectory = QDir(dir).canonicalPath();
+
+    // Only emit a changeUrl signal if the directory change was caused by the user inside the
+    // terminal, and not by sendCdToTerminal(QString).
+    while (!m_sendCdToTerminalHistory.empty()) {
+        if (m_konsolePartCurrentDirectory == m_sendCdToTerminalHistory.dequeue()) {
+            return;
+        }
+    }
+
+    const QUrl url(QUrl::fromLocalFile(dir));
+    emit changeUrl(url);
+}