Lock stuff

rodlie · Feb 9, 2024 · cbb7d1d · cbb7d1d
1 parent 407a44b
commit cbb7d1d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/powerkit_app.cpp b/src/powerkit_app.cpp
@@ -883,7 +883,7 @@ void App::handlePrepareForResume()
 {
     qDebug() << "prepare for resume ...";
     resetTimer();
-    ss->SimulateUserActivity();
+    ss->setDisplaysOff(false);
 }
 
 // turn off/on monitor using xrandr

diff --git a/src/powerkit_manager.cpp b/src/powerkit_manager.cpp
@@ -575,6 +575,8 @@ void Manager::LockScreen()
     QProcess::startDetached(Settings::getValue(CONF_SCREENSAVER_LOCK_CMD,
                                                PK_SCREENSAVER_LOCK_CMD).toString(),
                             QStringList());
+    QProcess::execute("xset",
+                      QStringList() << "dpms" << "force" << "off");
 }
 
 bool Manager::HasBattery()

diff --git a/src/powerkit_screensaver.cpp b/src/powerkit_screensaver.cpp
@@ -119,6 +119,7 @@ void ScreenSaver::Lock()
     if (xlock.isEmpty()) { return; }
     qDebug() << "screensaver lock";
     QProcess::startDetached(xlock, QStringList());
+    setDisplaysOff(true);
 }
 
 void ScreenSaver::SimulateUserActivity()
@@ -206,3 +207,14 @@ const QString ScreenSaver::GetInternalDisplay()
     XCloseDisplay(dpy);
     return result;
 }
+
+void ScreenSaver::setDisplaysOff(bool off)
+{
+    int xset = QProcess::execute("xset",
+                                QStringList() << "dpms" << "force" << (off ? "off" : "on"));
+    if (!off) {
+        QProcess::execute("xset",
+                          QStringList() << "s" << "reset");
+    }
+    qDebug() << "xset dpms force" << off << xset;
+}
diff --git a/src/powerkit_screensaver.h b/src/powerkit_screensaver.h
@@ -52,6 +52,7 @@ namespace PowerKit
         void UnInhibit(quint32 cookie);
         static const QMap<QString, bool> GetDisplays();
         static const QString GetInternalDisplay();
+        static void setDisplaysOff(bool off);
     };
 }