Merge branch 'release-1.2'

Script now changes the screen timeout when the screen is locked and restores the values after unlocking from the config-file.

Makefile

@@ -0,0 +1,30 @@
+DESTDIR=~/
+KSMSERVER_NOTIFY_CONFIG_PATH=.config/ksmserver.notifyrc
+SCRIPT_PATH=.local/bin/event_screensaver
+
+.PHONY: install remove
+default: install
+
+install:
+	# Deploy script
+	cp -f ./event_screensaver ${DESTDIR}${SCRIPT_PATH}
+	# Make executeable
+	chmod +x ${DESTDIR}${SCRIPT_PATH}
+
+	# Deploy notifyrc-file
+	cp ./ksmserver.notifyrc ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}
+
+	# Reload kwin..
+	qdbus org.kde.KWin /KWin reconfigure
+
+	# Installed!
+
+
+remove:
+	# Remove files..
+	rm ${DESTDIR}${SCRIPT_PATH} ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}
+
+	# Reload kwin..
+	qdbus org.kde.KWin /KWin reconfigure
+
+	# Removed!

README.md

@@ -10,7 +10,9 @@ Table of contents
 <!-- TOC -->
 - [1. The Problem](#1-the-problem)
 - [2. The Fix](#2-the-fix)
-- [3. How to install](#3-how-to-install)
+- [3. How to install/remove](#3-how-to-installremove)
+    - [3.1. Automatically](#31-automatically)
+    - [3.2. Manually](#32-manually)
 <!-- /TOC -->
 <br>
 
@@ -32,12 +34,49 @@ This script aims to fix this.
 
 Adding a script to `notifyrc` as event makes it possible to change settings when screen-locking begins.
 
-So after x seconds the screen will simply be forcefully turned off using `xset`.
+When the screen is locked, the script will change the screen-timeout to a custom-value in the config `~/.config/powermanagementprofilesrc` (or a default of 10s).
+
+This is done, so even after the System wakes up and activates the screens e.g. when mouse is moved, but no unlock is done, the screen begins to sleep quickly again.
+
+After a successful unlock, the value from the config is reapplied.
 
 <br>
 
-# 3. How to install
+# 3. How to install/remove
+
+## 3.1. Automatically
+
+### 3.1.1. Install
+
+Run the Makefile with `install`.
+
+```sh
+make install
+```
+
+### 3.1.2. Remove
+
+Run the Makefile with `remove`.
+
+```sh
+make remove
+```
+
+<br>
+
+## 3.2. Manually
+
+### 3.2.1. Install
 
 Place the file `event_screensaver` to a bin-location, for a local user this is typically `~/.local/bin/` and make it executeable.
 
-In Settings under `Notifications > Applications > Configure > 'Screen Saver' > Configure Events...` for event `Screen locked`, enable `Run command` and add your script-location for `event_screensaver`.
+In Settings under `Notifications > Applications > Configure > 'Screen Saver' > Configure Events...` for event locked & unlocked, enable `Run command` and add your script-location for `event_screensaver` and the event triggered.
+
+Example:
+```
+Screen locked
+Run Command: ~/.local/bin/event_screenSaver locked
+```
+
+Or update/create the config-file directly under `~/.config/ksmserver.notifyrc` similary to the file found in this repository.
+Then restart or reload KWin.

event_screensaver

@@ -1,18 +1,25 @@
 #!/bin/sh
+SCREENSAVER_TIMEOUT_DEFAULT=10
+NORMAL_TIMEOUT_DEFAULT=1800
 
-is_screen_locked()
+case "$1" in
-{
+  "locked")
-  if dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call --print-reply /org/freedesktop/ScreenSaver org.freedesktop.ScreenSaver.GetActive | grep 'boolean true' > /dev/null; then
+    # Read timeout from KDE
-    return 0
+    SCREENSAVER_TIMEOUT=$(kreadconfig5 --file powermanagementprofilesrc --group AC --group DPMSControl --key idleTime_screenSaver)
-  else
+    TIMEOUT="${SCREENSAVER_TIMEOUT:-$SCREENSAVER_TIMEOUT_DEFAULT}"
-    return 1
+    ;;
-  fi
-}
 
-# Sleep to timeout
+  "unlocked")
-sleep 15
+    # Read timeout from KDE
+    NORMAL_TIMEOUT=$(kreadconfig5 --file powermanagementprofilesrc --group AC --group DPMSControl --key idleTime)
+    TIMEOUT="${NORMAL_TIMEOUT:-$NORMAL_TIMEOUT_DEFAULT}"
+    ;;
 
-if is_screen_locked; then
+  *)
-    # Disable screens
+    echo "$0 <locked|unlocked>"
-    xset dpms force off
+    exit 1
-fi
+    ;;
+esac
+
+# Set timeout-value
+xset s ${TIMEOUT} ${TIMEOUT}

ksmserver.notifyrc

@@ -0,0 +1,13 @@
+[Event/locked]
+Action=Execute
+Execute=~/.local/bin/event_screensaver locked
+Logfile=
+Sound=
+TTS=
+
+[Event/unlocked]
+Action=Execute
+Execute=~/.local/bin/event_screensaver unlocked
+Logfile=
+Sound=
+TTS=