File 0001-Add-support-to-shutdown-KDE-bundled-to-a-s... of Package mingw32-kdebase4-runtime

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-support-to-shutdown-KDE-bundled-to-a-single-applic.txt of Package mingw32-kdebase4-runtime (Revision f1233a94da362b89252328d503dea15f)

Currently displaying revision f1233a94da362b89252328d503dea15f , Show latest

From 59c103faabfb89275e9cee23ac5bc88c2d10f464 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@sag.eu>
Date: Wed, 27 Jan 2016 12:32:33 +0100
Subject: [PATCH 1/2] Add support to shutdown KDE bundled to a single
 application package.

In this use case "kwinshutdown --watchdog <appname>" is installed as KDE
autostart service and watches registered services named on dbus. In case
the watched application has been exited, it shuts down the related KDE
session after two check intervals. The check interval could be changed
with command line option --interval and is set to 60 seconds by default.
---
 platforms/win/kwinshutdown/CMakeLists.txt      | 27 ++++++++
 platforms/win/kwinshutdown/main.cpp            | 55 +++++++++++----
 platforms/win/kwinshutdown/main.h              | 27 ++++++++
 platforms/win/kwinshutdown/shutdownwatcher.cpp | 95 ++++++++++++++++++++++++++
 platforms/win/kwinshutdown/shutdownwatcher.h   | 45 ++++++++++++
 5 files changed, 236 insertions(+), 13 deletions(-)
 create mode 100644 platforms/win/kwinshutdown/main.h
 create mode 100644 platforms/win/kwinshutdown/shutdownwatcher.cpp
 create mode 100644 platforms/win/kwinshutdown/shutdownwatcher.h

diff --git a/platforms/win/kwinshutdown/CMakeLists.txt b/platforms/win/kwinshutdown/CMakeLists.txt
index d9e107f..3d0058d 100644
--- a/platforms/win/kwinshutdown/CMakeLists.txt
+++ b/platforms/win/kwinshutdown/CMakeLists.txt
@@ -1,10 +1,37 @@
 project(kshutdown)
 
+if(CMAKE_STANDALONE)
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest)
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+
+# The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
+# definitions like _GNU_SOURCE that are needed on each platform.
+set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS)
+
+add_definitions (
+    ${KDE4_DEFINITIONS}
+)
+
+include_directories(
+    ${KDE4_INCLUDES}
+)
+endif()
+
 # use kded debug category for now
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=7020)
 
 set (SOURCES
     main.cpp
+    shutdownwatcher.cpp
 )
 kde4_add_app_icon(SOURCES "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/actions/application-exit.png")
 
diff --git a/platforms/win/kwinshutdown/main.cpp b/platforms/win/kwinshutdown/main.cpp
index cd8d786..2de0d83 100644
--- a/platforms/win/kwinshutdown/main.cpp
+++ b/platforms/win/kwinshutdown/main.cpp
@@ -18,25 +18,52 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include "shutdownwatcher.h"
 
 #include <kdebug.h>
 #include <KAboutData>
-#include <Kapplication>
+#include <KApplication>
 #include <KMessageBox>
 #include <KCmdLineArgs>
 #include <KGlobal>
 #include <KProcess>
 #include <KDebug>
 
+static bool dryrun = false;
+
+bool requestForShutDownApps()
+{
+    int res = KMessageBox::warningContinueCancel(0,
+    ki18n("Should I really shutdown all applications and processes of your recent installation ?"
+    "\n\nPlease make sure you have saved all documents.").toString(),
+    ki18n("Shutdown KDE").toString());
+    if (res == KMessageBox::Cancel)
+        return false;
+    return true;
+}
+
+int shutDownApps()
+{
+    QStringList cmd;
+    cmd  << "kdeinit4" << "--shutdown";
+    kDebug() << "running" << cmd;
+    if (!dryrun)
+        KProcess::startDetached(cmd);
+    return 0;
+}
+
 int main(int argc, char **argv)
 {
     KAboutData about("kwinshutdown", 0, ki18n("kwinshutdown"), "1.0",
                      ki18n("A helper tool to shutdown a running installation"),
                      KAboutData::License_GPL,
-                     ki18n("(C) 2011 Ralf Habacker"));
+                     ki18n("(C) 2011-2016 Ralf Habacker"));
     KCmdLineArgs::init( argc, argv, &about);
 
     KCmdLineOptions options;
+    options.add("timeout <seconds>", ki18n("Timeout to shut down KDE background processes after a watched application has been exited, defaulting to 60 seconds"), "60");
+    options.add("watch <appname>", ki18n("Enable shut down watching for <appname"), "");
+    options.add("dry-run", ki18n("Test mode, do not really shut down"), "");
     KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
     KComponentData a(&about);
@@ -46,18 +73,20 @@ int main(int argc, char **argv)
 
     KApplication app(true);
 
-    int res = KMessageBox::warningContinueCancel(0,
-        ki18n("Should I really shutdown all applications and processes of your recent installation ?"
-        "\n\nPlease make sure you have saved all documents.").toString(),
-        ki18n("Shutdown KDE").toString());
-    if (res == KMessageBox::Cancel)
-        return 2;
+    dryrun = args->isSet("dry-run");
 
-    QStringList cmd;
-    cmd  << "kdeinit4" << "--shutdown";
-    kDebug() << "running" << cmd;
-    KProcess::startDetached(cmd);
-    return 0;
+    if (args->isSet("watch"))
+    {
+        int timeout = args->getOption("timeout").toInt();
+        ShutdownWatcher watcher(args->getOption("watch"), timeout);
+        return app.exec();
+    }
+    else
+    {
+        if (requestForShutDownApps())
+            return shutDownApps();
+        return 1;
+    }
 }
 
 // vim: ts=4 sw=4 et
diff --git a/platforms/win/kwinshutdown/main.h b/platforms/win/kwinshutdown/main.h
new file mode 100644
index 0000000..ae71da4
--- /dev/null
+++ b/platforms/win/kwinshutdown/main.h
@@ -0,0 +1,27 @@
+/*
+    Copyright 2016 ralf.habacker <ralf.habacker@freenet.de>
+    
+    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 the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef MAIN_H
+#define MAIN_H
+
+bool requestForShutDownApps();
+int shutDownApps();
+
+#endif // MAIN_H
diff --git a/platforms/win/kwinshutdown/shutdownwatcher.cpp b/platforms/win/kwinshutdown/shutdownwatcher.cpp
new file mode 100644
index 0000000..b8c7f90
--- /dev/null
+++ b/platforms/win/kwinshutdown/shutdownwatcher.cpp
@@ -0,0 +1,95 @@
+/*
+    Copyright 2016 ralf.habacker <ralf.habacker@freenet.de>
+    
+    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 the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "shutdownwatcher.h"
+#include "main.h"
+
+#include <KDebug>
+
+#include <QApplication>
+#include <QStringList>
+#include <QTimer>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QtDebug>
+
+ShutdownWatcher::ShutdownWatcher(const QString &appName, int timeout, QObject *parent)
+  : QObject(parent),
+    m_appName(appName),
+    m_checkLevel(0),
+    m_timeout(timeout)
+{
+    startWatch();
+}
+
+void ShutdownWatcher::startWatch()
+{
+    int timeout = m_timeout*1000/2;
+    kDebug() << "starting timer with timeout" << timeout << "ms";
+    QTimer::singleShot(timeout, this, SLOT(slotCheckShutDown()));
+}
+
+QStringList ShutdownWatcher::allServiceNamesFromDBus() const
+{
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    QDBusConnectionInterface *bus = connection.interface();
+    return bus->registeredServiceNames();
+}
+
+void ShutdownWatcher::slotCheckShutDown()
+{
+    kDebug() << "timeout: checking at level" << m_checkLevel;
+    foreach(const QString &app, allServiceNamesFromDBus())
+    {
+        kDebug() << "checking" << app;
+        if (m_checkLevel == 0)
+        {
+            if (app.contains(m_appName))
+            {
+                kDebug() << app << "found";
+                startWatch();
+                return;
+            }
+        }
+        else if (m_checkLevel == 1)
+        {
+            if (app.contains(m_appName))
+            {
+                kDebug() << app << "found at level 1";
+                m_checkLevel = 0;
+                startWatch();
+                return;
+            }
+        }
+    }
+    if (m_checkLevel == 0)
+    {
+        m_checkLevel = 1;
+        kDebug() << m_appName << "not found, increasing check level to" << m_checkLevel;
+        startWatch();
+    }
+    else if (m_checkLevel == 1)
+    {
+        kDebug() << m_appName << "not running after two iterations, shutting down KDE";
+        shutDownApps();
+        qApp->quit();
+    }
+}
+
diff --git a/platforms/win/kwinshutdown/shutdownwatcher.h b/platforms/win/kwinshutdown/shutdownwatcher.h
new file mode 100644
index 0000000..5a4bb78
--- /dev/null
+++ b/platforms/win/kwinshutdown/shutdownwatcher.h
@@ -0,0 +1,45 @@
+/*
+    Copyright 2016 Ralf Habacker <ralf.habacker@freenet.de>
+    
+    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 the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef SHUTDOWNWATCHER_H
+#define SHUTDOWNWATCHER_H
+
+#include <QObject>
+
+class ShutdownWatcher : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ShutdownWatcher(const QString &appName, int timeout=60 /* seconds */, QObject *parent = 0);
+    
+    void startWatch();
+    QStringList allServiceNamesFromDBus() const;
+signals:
+    
+public slots:
+    void slotCheckShutDown();
+
+protected:
+    QString m_appName;
+    int m_checkLevel;
+    int m_timeout;
+};
+
+#endif // SHUTDOWNWATCHER_H
-- 
1.8.4.5

Places

File 0001-Add-support-to-shutdown-KDE-bundled-to-a-single-applic.txt of Package mingw32-kdebase4-runtime (Revision f1233a94da362b89252328d503dea15f)

Places