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 cc3b85318289c4a95b431c5942d119cec60f4105..da68210c12e4610dcbfc233c257887aaac8493c9 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2007-2010 by Peter Penz <peter.penz19@gmail.com>        *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -19,19 +19,32 @@
 
 #include "terminalpanel.h"
 
 
 #include "terminalpanel.h"
 

-#include <klibloader.h>
+#include <signal.h>
+
+#include <KPluginLoader>
+#include <KPluginFactory>
+#include <KService>

 #include <kde_terminal_interface.h>
 #include <kde_terminal_interface.h>

-#include <kparts/part.h>
-#include <kshell.h>
+#include <KParts/ReadOnlyPart>
+#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),

+    m_clearTerminal(true),
+    m_mostLocalUrlJob(0),

     m_layout(0),
     m_terminal(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);


@@ -41,29 +54,45 @@ TerminalPanel::~TerminalPanel()
 {
 }
 
 {
 }
 

-QSize TerminalPanel::sizeHint() const
+void TerminalPanel::terminalExited()

 {
 {

-    QSize size = Panel::sizeHint();
-    size.setHeight(200);
-    return size;
+    m_terminal = 0;
+    emit hideTerminalPanel();

 }
 
 }
 

-void TerminalPanel::setUrl(const KUrl& url)
+void TerminalPanel::dockVisibilityChanged()

 {
 {

-    if (!url.isValid() || (url == Panel::url())) {
-        return;
-    }
+    // 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)));

 
 

-    Panel::setUrl(url);
-    if ((m_terminal != 0) && isVisible() && url.isLocalFile()) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
+        // Make sure this terminal does not prevent unmounting any removable drives
+        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 = '/';

     }
 }
 
     }
 }
 

-void TerminalPanel::terminalExited()
+bool TerminalPanel::urlChanged()

 {
 {

-    emit hideTerminalPanel();
-    m_terminal = 0;
+    if (!url().isValid()) {
+        return false;
+    }
+
+    const bool sendInput = m_terminal && (m_terminal->foregroundProcessId() == -1) && isVisible();
+    if (sendInput) {
+        changeDir(url());
+    }
+
+    return true;

 }
 
 void TerminalPanel::showEvent(QShowEvent* event)
 }
 
 void TerminalPanel::showEvent(QShowEvent* event)


@@ -73,24 +102,103 @@ void TerminalPanel::showEvent(QShowEvent* event)
         return;
     }
 
         return;
     }
 

-    if (m_terminal == 0) {
-        KPluginFactory* factory = KPluginLoader("libkonsolepart").factory();
-        KParts::ReadOnlyPart* part = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
-        if (part != 0) {
-            connect(part, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited()));
-            m_terminalWidget = part->widget();
+    if (!m_terminal) {
+        m_clearTerminal = true;
+        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<TerminalInterface *>(part);
-            m_terminal->showShellInDir(url().path());
+            m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);

         }
     }
         }
     }

-    if (m_terminal != 0) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n');
-        m_terminal->sendInput("clear\n");
+    if (m_terminal) {
+        m_terminal->showShellInDir(url().toLocalFile());
+        changeDir(url());

         m_terminalWidget->setFocus();
         m_terminalWidget->setFocus();

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

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

-#include "terminalpanel.moc"
+void TerminalPanel::changeDir(const QUrl& url)
+{
+    delete m_mostLocalUrlJob;
+    m_mostLocalUrlJob = 0;
+
+    if (url.isLocalFile()) {
+        sendCdToTerminal(url.toLocalFile());
+    } else {
+        m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
+        if (m_mostLocalUrlJob->ui()) {
+            KJobWidgets::setWindow(m_mostLocalUrlJob, this);
+        }
+        connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);
+    }
+}
+
+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.
+        const int processId = m_terminal->terminalProcessId();
+        if (processId > 0) {
+            kill(processId, SIGINT);
+        }
+    }
+
+    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) {
+        m_terminal->sendInput(QStringLiteral(" clear\n"));
+        m_clearTerminal = false;
+    }
+}
+
+void TerminalPanel::slotMostLocalUrlResult(KJob* job)
+{
+    KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
+    const QUrl url = statJob->mostLocalUrl();
+    if (url.isLocalFile()) {
+        sendCdToTerminal(url.toLocalFile());
+    }
+
+    m_mostLocalUrlJob = 0;
+}
+
+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);
+}