summaryrefslogtreecommitdiffstats
path: root/core/modules/xscreensaver
diff options
context:
space:
mode:
authorSimon Rettberg2018-10-17 11:10:49 +0200
committerSimon Rettberg2018-10-17 11:10:49 +0200
commit7a3e38c6a3f6e333b7346099c08dd201c81f5a19 (patch)
tree44dc197c9f6327f693328450362a10e7fe04c4d0 /core/modules/xscreensaver
parent[vmware12] Fix broken keymap when leaving vm (terminal etc.) (diff)
downloadmltk-7a3e38c6a3f6e333b7346099c08dd201c81f5a19.tar.gz
mltk-7a3e38c6a3f6e333b7346099c08dd201c81f5a19.tar.xz
mltk-7a3e38c6a3f6e333b7346099c08dd201c81f5a19.zip
[xscreensaver/vmware12] Support ungrab hooks, work around idletime reset
vmware ungrab code has to fake mouse cursor movement, resetting PC idle time :-( - Now we can't record the PC idle time the moment the screen saver turned on anymore, since it will be reset at that point.
Diffstat (limited to 'core/modules/xscreensaver')
-rwxr-xr-xcore/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver1
-rwxr-xr-xcore/modules/xscreensaver/data/opt/openslx/xscreensaver/ungrab10
2 files changed, 11 insertions, 0 deletions
diff --git a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
index 69b9fa51..cd28bdb8 100755
--- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
+++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
@@ -68,6 +68,7 @@ dpmsStandby: $STANDBY
dpmsSuspend: $STANDBY
dpmsOff: $STANDBY
newLoginCommand:
+externalUngrabCommand: /opt/openslx/xscreensaver/ungrab
programs: /opt/openslx/bin/bwlp-screensaver
selected: 0
EOF
diff --git a/core/modules/xscreensaver/data/opt/openslx/xscreensaver/ungrab b/core/modules/xscreensaver/data/opt/openslx/xscreensaver/ungrab
new file mode 100755
index 00000000..1c355be8
--- /dev/null
+++ b/core/modules/xscreensaver/data/opt/openslx/xscreensaver/ungrab
@@ -0,0 +1,10 @@
+#!/bin/ash
+
+for file in /opt/openslx/xscreensaver/ungrab.d/*; do
+ [ -f "$file" ] || continue
+ [ -x "$file" ] || continue
+ "$file" "$@"
+done
+
+exit 0
+