From c2128a109d3dea78428e6e6f0445a590a81a1cb0 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Fri, 24 Jan 2020 19:59:40 +0100
Subject: [PATCH] xss-lock: revert previous commit but keep systemd changes

---
 bin/xss-lock | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/bin/xss-lock b/bin/xss-lock
index 4d67239..502cfd1 100755
--- a/bin/xss-lock
+++ b/bin/xss-lock
@@ -24,19 +24,16 @@ case "$1" in
                              --property MainPID \
                              --value redshift@$(systemd-escape -- "$DISPLAY").service)
         [ x$redshift = x ] || kill -STOP $redshift
-        current=$(xrandr --verbose | sed -n \
-                                         -e 's/\([^ ]*\) connected .*/--output \1/p' \
-                                         -e 's/\t*Gamma: *\([^ ]\)/--gamma \1/p' \
-                                         -e 's/\t*Brightness: *\([^ ]\)/--brightness \1/p' | \
-                      tr '\n' ' ')
-        trap "echo notify: restore brightness;
-              xrandr $current;
-              [ x$redshift = x ] || kill -CONT $redshift" EXIT
+        trap "[ x$redshift = x ] || kill -CONT $redshift" EXIT
         trap 'kill %% 2> /dev/null; exit 0' HUP  # user activity
         trap 'sleep 0.2s; kill %% 2> /dev/null; exit 0' TERM # locker started
+        outputs=($(xrandr -q | sed -n 's/\([^ ]*\) connected .*/\1/p'))
         for i in $(seq 0.7 -0.01 0.1); do
-            xrandr $(echo $current | sed "s/\(--brightness\) [^ ]*/\1 $i/g")
-            sleep 0.05
+            for out in ${outputs[@]}; do
+                xrandr --output $out --brightness $i || \
+                    outputs=("${outputs[@]/$out}")
+            done
+            sleep 0.1
         done
         echo "notify: end"
         sleep infinity &