X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=pm-utils%2F40autorandr;h=74549fc49a7f4e64f7f932398b5c95e965ea7b18;hb=fb01d5e870d95c8dcd1006dcec0e825086332743;hp=f465b06d4d4bdb6d8395bb6e79999bb49b2958a3;hpb=5ada195b8564ecb457d5ba9cd5b3d927e7b36de3;p=deb_pkgs%2Fautorandr.git

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