/***************************************************************************
- * Copyright (C) 2007-2010 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 *
#include "terminalpanel.h"
-#include <kpluginloader.h>
-#include <kpluginfactory.h>
-#include <kde_terminal_interface_v2.h>
-#include <kparts/part.h>
-#include <kshell.h>
-#include <kio/job.h>
+#include <signal.h>
+
+#include <KPluginLoader>
+#include <KPluginFactory>
+#include <KService>
+#include <kde_terminal_interface.h>
+#include <KParts/ReadOnlyPart>
+#include <KShell>
+#include <KIO/Job>
#include <KIO/JobUiDelegate>
+#include <KJobWidgets>
#include <QBoxLayout>
+#include <QDir>
#include <QShowEvent>
TerminalPanel::TerminalPanel(QWidget* parent) :
m_mostLocalUrlJob(0),
m_layout(0),
m_terminal(0),
- m_terminalWidget(0)
+ m_terminalWidget(0),
+ m_konsolePart(0),
+ m_konsolePartCurrentDirectory()
{
m_layout = new QVBoxLayout(this);
m_layout->setMargin(0);
void TerminalPanel::terminalExited()
{
- emit hideTerminalPanel();
m_terminal = 0;
+ emit hideTerminalPanel();
+}
+
+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(KUrl::fromPath("/"));
+
+ // 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 = '/';
+ }
}
bool TerminalPanel::urlChanged()
return false;
}
- const bool sendInput = (m_terminal != 0)
- && (m_terminal->foregroundProcessId() == -1)
- && isVisible();
+ const bool sendInput = m_terminal && (m_terminal->foregroundProcessId() == -1) && isVisible();
if (sendInput) {
changeDir(url());
}
return;
}
- if (m_terminal == 0) {
+ if (!m_terminal) {
m_clearTerminal = true;
- 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();
+ KPluginFactory* factory = 0;
+ KService::Ptr service = KService::serviceByDesktopName("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_terminal = qobject_cast<TerminalInterfaceV2 *>(part);
+ m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);
}
}
- if (m_terminal != 0) {
+ if (m_terminal) {
+ connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
+ this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
m_terminal->showShellInDir(url().toLocalFile());
changeDir(url());
m_terminalWidget->setFocus();
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)
{
+ 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 Ctrl+C is send.
- QString cancel;
- cancel.append(QChar(3));
- cancel.append(QChar('c'));
- m_terminal->sendInput(cancel);
+ // 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');
+ m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
+ m_konsolePartCurrentDirectory = dir;
if (m_clearTerminal) {
- m_terminal->sendInput("clear\n");
+ m_terminal->sendInput(" clear\n");
m_clearTerminal = false;
}
}
m_mostLocalUrlJob = 0;
}
-#include "terminalpanel.moc"
+void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
+{
+ m_konsolePartCurrentDirectory = dir;
+
+ // Only change the view URL if 'dir' is different from the current view URL.
+ // Note that the current view URL could also be a symbolic link to 'dir'
+ // -> use QDir::canonicalPath() to check that.
+ const KUrl oldUrl(url());
+ const KUrl newUrl(dir);
+ if (newUrl != oldUrl && dir != QDir(oldUrl.path()).canonicalPath()) {
+ emit changeUrl(newUrl);
+ }
+}
+
projects / dolphin.git / blobdiff