Merge remote-tracking branch 'paulharris/master'

[deb_pkgs/autorandr.git] / pm-utils / 40autorandr

diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr
index 60ca9ae8f374b3d4d9a1ab144863428758f546fb..74549fc49a7f4e64f7f932398b5c95e965ea7b18 100755 (executable)
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@ -1,15 +1,26 @@
 #!/bin/sh
 #
 # 40autorandr: Change autorandr profile on thaw/resume
+exec > /var/log/autorandr.log 2>&1
 
-AUTORANDR="autorandr -c"
+# detect if we are being called as 40auto-disper or 40autorandr
+FORM=${0##*40}
+case $FORM in
+       auto-disper)
+               AUTORANDR="auto-disper -c --default default"
+               ;;
+       *)
+               AUTORANDR="autorandr -c --default default"
+               ;;
+esac
 
 detect_display()
 {
        for X in /tmp/.X11-unix/X*; do
                D="${X##/tmp/.X11-unix/X}"
-               user=$(who | awk -vD="$D" '$5 ~ "\\(:"D"\\)$" {print $1}')
+               user=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1)
                if [ x"$user" != x"" ]; then
+                       logger "autorandr: Changing display configuration for user '$user'"
                        export DISPLAY=":$D"
                        /bin/su -c "${AUTORANDR}" "$user"
                fi