Description: Restore previous X11 screensaver timeout (xdg-screensaver)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88210
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/1363540
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=+745340
Author: Thaddaeus Tintenfisch <thad.fisch@gmail.com>
Last-Update: 2015-09-13

--- a/scripts/xdg-screensaver.in
+++ b/scripts/xdg-screensaver.in
@@ -372,16 +372,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=$?
         ;;
 
@@ -396,7 +409,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"