diff options
| author | Rex Dieter <rdieter@math.unl.edu> | 2017-02-28 11:30:28 -0600 |
|---|---|---|
| committer | Rex Dieter <rdieter@math.unl.edu> | 2017-02-28 11:30:28 -0600 |
| commit | e63b4088b5c605c9237d7a1cc589e3bd0d7d698a (patch) | |
| tree | 4608cbf7775f503592ad4a307457b0a6b05a78c3 | |
| parent | 6387086e4938d568c2bab185632f60e1619b3f68 (diff) | |
xdg-screensaver: Restore previous X11 screensaver timeout (BR#98509)
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | scripts/xdg-screensaver.in | 19 |
2 files changed, 17 insertions, 3 deletions
@@ -3,6 +3,7 @@ 2017-02-28 Rex Dieter <rdieter@fedoraproject.org> * xdg-open: Add "chromium" to fallback browsers (BR99366) * xdg-mime: fails on encountering a list for x-scheme-handler (BR44163) + * xdg-screensaver: Restore previous X11 screensaver timeout (BR#98509) 2016-12-12 Rex Dieter <rdieter@fedoraproject.org> * Add gio tool support (BR99063) diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in index 50ef916..aecd8e3 100644 --- a/scripts/xdg-screensaver.in +++ b/scripts/xdg-screensaver.in @@ -376,16 +376,29 @@ screensaver_kde3() esac } +xset_screensaver_timeout() +{ + xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d' +} + screensaver_xserver() { case "$1" in suspend) - xset s off > /dev/null + timeout=`xset_screensaver_timeout` + if [ "$timeout" -gt 0 ]; then + echo "$timeout" > "$screensaver_file.xset" + xset s off > /dev/null + fi result=$? ;; resume) - xset s default > /dev/null + if [ -f "$screensaver_file.xset" ] ; then + value=`cat "$screensaver_file.xset"` + xset s $value > /dev/null + rm -f "$screensaver_file.xset" + fi result=$? ;; @@ -400,7 +413,7 @@ screensaver_xserver() ;; status) - timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'` + timeout=`xset_screensaver_timeout` result=$? if [ "$timeout" -gt 0 ]; then echo "enabled" |