allow legacy autorandr to be off while connected

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

diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr
index 43c17667f814bdfcded67a2060aeabe1bc630de1..b8b2beebac6f385f90c6b8f4f104e6ee6001d134 100755 (executable)
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@ -3,15 +3,24 @@
 # 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=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1)
-               logger "autorandr: Changing display configuration for user '$user'"
+               user=`who | awk -vD="$D" '$2 ~ ":"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