feat: Supports dsg-terminal-exec scheme (#340)

Issue: linuxdeepin/developer-center#7439 Log: Supports dsg-terminal-exec scheme Signed-off-by: Yutao Meng <[email protected]>
linuxdeepin · Mar 12, 2024 · 6a2da83 · 6a2da83
1 parent 8b117e5
commit 6a2da83
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/3rdparty/terminalwidget/lib/Session.cpp b/3rdparty/terminalwidget/lib/Session.cpp
@@ -737,15 +737,6 @@ void Session::done(int exitStatus)
         emit finished();
         return;
     }
-
-    /************************ Add by sunchengxi 2020-09-15:Bug#42864 无法同时打开多个终端 Begin************************/
-    if (false == _autoClose && false == _wantedClose && _shellProcess->exitStatus() == QProcess::NormalExit) {
-        qDebug() << "autoClose is false.";
-        emit titleChanged();
-        emit finished();
-        return;
-    }
-    /************************ Add by sunchengxi 2020-09-15:Bug#42864 无法同时打开多个终端 End ************************/
     if(exitStatus != 0)
     {
         QString message;
@@ -764,6 +755,12 @@ void Session::done(int exitStatus)
         //sendText(infoText);
         emit titleChanged();
     }
+    else
+    {
+        sendText("\n");
+        sendText(tr("Press any keys to exit"));
+    }
+    emit almostFinished();
 }
 
 Emulation * Session::emulation() const

diff --git a/3rdparty/terminalwidget/lib/Session.h b/3rdparty/terminalwidget/lib/Session.h
@@ -447,6 +447,12 @@ public slots:
     /** Emitted when the terminal process starts. */
     void started();
 
+    /**
+     * @brief Emitted when terminal process exits and session
+     * is still waiting for any key pressed to close.
+     */
+    void almostFinished();
+
     /**
      * Emitted when the terminal process exits.
      */

diff --git a/3rdparty/terminalwidget/lib/qtermwidget.cpp b/3rdparty/terminalwidget/lib/qtermwidget.cpp
@@ -321,6 +321,9 @@ void QTermWidget::addSnapShotTimer()
     m_termDisplay = m_impl->m_terminalDisplay;
     connect(m_interactionTimer, &QTimer::timeout, this, &QTermWidget::snapshot);
     connect(m_termDisplay.data(), &Konsole::TerminalDisplay::keyPressedSignal, this, &QTermWidget::interactionHandler);
+    connect(currSession, &Session::almostFinished, m_termDisplay, [=] {
+        connect(m_termDisplay, &TerminalDisplay::keyPressedSignal, currSession, &Session::finished);
+    });
 
     // take a snapshot of the session state periodically in the background
     auto backgroundTimer = new QTimer(currSession);

diff --git a/src/deepin-terminal.desktop b/src/deepin-terminal.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=DDE;Utility;System;TerminalEmulator;
 Comment=Use the command line
-Exec=deepin-terminal
+Exec=deepin-terminal %u
 GenericName=Terminal
 Icon=deepin-terminal
 Keywords=shell;prompt;command;commandline;
@@ -11,6 +11,7 @@ TryExec=deepin-terminal
 Type=Application
 X-Deepin-Vendor=deepin
 Actions=new-window;quake-mode;
+MimeType=x-scheme-handler/dsg-terminal-exec
 
 # Translations:
 # Do not manually modify!

diff --git a/src/main/main.cpp b/src/main/main.cpp
@@ -21,6 +21,7 @@
 #include <QCommandLineParser>
 #include <QTranslator>
 #include <QElapsedTimer>
+#include <QUrl>
 
 DWIDGET_USE_NAMESPACE
 
@@ -45,9 +46,20 @@ int main(int argc, char *argv[])
 
     // 参数解析
     TermProperties properties;
-    Utils::parseCommandLine(app.arguments(), properties, true);
     QStringList args = app.arguments();
 
+    for (int i = 0; i < args.size(); i++) {
+        if (args[i].startsWith("dsg-terminal-exec://")) {
+            QString execCMD = args[i];
+            execCMD.remove("dsg-terminal-exec://");
+            args += "-e";
+            args += QUrl::fromPercentEncoding(execCMD.toUtf8());
+            break;
+        }
+    }
+
+    Utils::parseCommandLine(app.arguments(), properties, true);
+
     if(!(args.contains("-w") || args.contains("--work-directory"))) {
         args += "-w";
         args += QDir::currentPath();