X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6a20b9c96295fa73434ec83c7ae4fccbbd7e3fc5..bd47eb2e6d:/src/panels/terminal/terminalpanel.cpp diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 3b77cd92e..b7d3605aa 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Peter Penz * + * Copyright (C) 2007-2010 by Peter Penz * * * * 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,23 +19,32 @@ #include "terminalpanel.h" -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include +#include -#include +#include #include - -#include +#include TerminalPanel::TerminalPanel(QWidget* parent) : Panel(parent), + m_clearTerminal(true), + 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); @@ -45,33 +54,58 @@ TerminalPanel::~TerminalPanel() { } -QSize TerminalPanel::sizeHint() const +void TerminalPanel::goHome() { - QSize size = Panel::sizeHint(); - size.setHeight(200); - return size; + sendCdToTerminal(QDir::homePath(), HistoryPolicy::SkipHistory); } -void TerminalPanel::setUrl(const KUrl& url) +QString TerminalPanel::currentWorkingDirectory() { - if (!url.isValid() || (url == Panel::url())) { - return; + if (m_terminal) { + return m_terminal->currentWorkingDirectory(); } + return QString(); +} - Panel::setUrl(url); +void TerminalPanel::terminalExited() +{ + m_terminal = 0; + emit hideTerminalPanel(); +} - const bool sendInput = (m_terminal != 0) - && (m_terminal->foregroundProcessId() == -1) - && isVisible(); - if (sendInput) { - cdUrl(url); +void TerminalPanel::dockVisibilityChanged() +{ + // 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 + 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) @@ -81,49 +115,104 @@ void TerminalPanel::showEvent(QShowEvent* event) return; } - if (m_terminal == 0) { - KPluginFactory* factory = KPluginLoader("libkonsolepart").factory(); - KParts::ReadOnlyPart* part = factory ? (factory->create(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(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_terminal = qobject_cast(part); + m_terminal = qobject_cast(m_konsolePart); } } - if (m_terminal != 0) { + if (m_terminal) { m_terminal->showShellInDir(url().toLocalFile()); - cdUrl(url()); - m_terminal->sendInput("clear\n"); // TODO do clear after slotMostLocalUrlResult is called, for remote dirs? + changeDir(url()); m_terminalWidget->setFocus(); + connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)), + this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString))); } Panel::showEvent(event); } -void TerminalPanel::cdUrl(const KUrl& url) +void TerminalPanel::changeDir(const QUrl& url) { + delete m_mostLocalUrlJob; + m_mostLocalUrlJob = 0; + if (url.isLocalFile()) { - cdDirectory(url.toLocalFile()); + sendCdToTerminal(url.toLocalFile()); } else { - KIO::StatJob* job = KIO::mostLocalUrl(url, KIO::HideProgressInfo); - job->ui()->setWindow(this); - connect(job, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*))); + m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo); + if (m_mostLocalUrlJob->uiDelegate()) { + KJobWidgets::setWindow(m_mostLocalUrlJob, this); + } + connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult); } } -void TerminalPanel::cdDirectory(const QString& dir) +void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory) { - m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n'); + 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. + if (addToHistory == HistoryPolicy::AddToHistory) + 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(job); - const KUrl url = statJob->mostLocalUrl(); + const QUrl url = statJob->mostLocalUrl(); if (url.isLocalFile()) { - cdDirectory(url.toLocalFile()); + sendCdToTerminal(url.toLocalFile()); } + + 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); +}