X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr;h=eace95048e1713ba00ee90b254319e51c1e72e5c;hb=9fe52b370dc224ef80abac1e4baff60e3f6651a5;hp=30094e79d333875272d2d291bf6af5ae62737ad6;hpb=920294ac15e6fb26e188336c821089cb2f1a5c4e;p=deb_pkgs%2Fautorandr.git

diff --git a/autorandr b/autorandr
index 30094e7..eace950 100755
--- a/autorandr
+++ b/autorandr
@@ -2,7 +2,22 @@
 #
 # Automatically select a display configuration based on connected devices
 #
-# Stefan Tomanek <stefan.tomanek@wertarbyte.de>
+# Copyright (c) 2013 Stefan Tomanek <stefan.tomanek@wertarbyte.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 #
 # How to use:
 #
@@ -60,7 +75,7 @@ FORCE_LOAD=0
 DEFAULT_PROFILE=""
 SAVE_PROFILE=""
 
-FP_METHODS="setup_fp_sysfs_edid setup_fp_xrandr_edid"
+FP_METHODS="setup_fp_xrandr_edid setup_fp_sysfs_edid"
 CURRENT_CFG_METHOD="current_cfg_xrandr"
 LOAD_METHOD="load_cfg_xrandr"
 
@@ -78,24 +93,45 @@ if [ -f $CONFIG ]; then
 	. $CONFIG
 fi
 
+if ! which xxd 2>&1 >/dev/null; then
+	xxd() {
+		# xxd replacement for systems without vim. Ugly, but the only simple
+		# version that both Python 2 and 3 understand that I could come up with.
+		# awk can only do one direction, it has no ord() function.
+		if [ "$1" = "-r" ]; then
+			python -c "import binascii, sys; getattr(sys.stdout, 'buffer', sys.stdout).write(binascii.unhexlify(getattr(sys.stdin, 'buffer', sys.stdin).read()))"
+		else
+			python -c "import binascii, sys; getattr(sys.stdout, 'buffer', sys.stdout).write(binascii.hexlify(getattr(sys.stdin, 'buffer', sys.stdin).read()))"
+			echo
+		fi
+	}
+fi
+
 setup_fp_xrandr_edid() {
 	$XRANDR -q --verbose | awk '
-	/^[^ ]+ (dis)?connected / { DEV=$1; }
-	$1 ~ /^[a-f0-9]+$/ { ID[DEV] = ID[DEV] $1 }
-	END { for (X in ID) { print X " " ID[X]; } }'
+	ORS="";
+	/ (dis)?connected/ { DEVICE=gensub("-([A-Z]-)?", "", "g", $1) " "; }
+	/^[[:blank:]]+EDID:/ {
+		print DEVICE
+		DEVICE=""
+		for(getline; /^[[:blank:]]+[0-9a-f]+$/; getline) {
+			print $1;
+		}
+		print "\n";
+	}
+	END {
+		print "\n";
+	}
+	'
 }
 
 setup_fp_sysfs_edid() {
-	# xrandr triggers the reloading of EDID data
 	$XRANDR -q > /dev/null
-	# hash the EDIDs of all _connected_ devices
-	for P in /sys/class/drm/card*-*/; do
-		# nothing found
-		[ ! -d "$P" ] && continue
-		if grep -q "^connected$" < "${P}status"; then
-			echo -n "$(basename "$P") "
-			md5sum ${P}edid | awk '{print $1}'
-		fi
+	for DEVICE in /sys/class/drm/card*-*; do
+		[ -e "${DEVICE}/status" ] && grep -q "^connected$" "${DEVICE}/status" || continue
+		echo -n "$(echo "${DEVICE}/edid" | sed -re 's#^.+card[0-9]+-([^/]+).+#\1#; s#-([A-Z]-)?##') "
+			cat "${DEVICE}/edid" | xxd -c 256 -ps | awk 'ORS=""; /.+/ { print; }'
+		echo
 	done
 }
 
@@ -115,7 +151,7 @@ setup_fp() {
 		echo "Unable to fingerprint display configuration" >&2
 		return
 	fi
-	echo "$FP"
+	echo "$FP" | sort
 }
 
 current_cfg_xrandr() {
@@ -456,7 +492,27 @@ for SETUP_FILE in $PROFILES/*/setup; do
 		continue
 	fi
 
-	FILE_SETUP="$(cat "$PROFILES/$PROFILE/setup")"
+	# This sed command is for compatibility with old versions that did not try
+	# to normalize device names
+	FILE_SETUP="$(sed -re 's#-([A-Z]-)?##g; s#card[0-9]##;' "$PROFILES/$PROFILE/setup")"
+	# Detect the md5sum in fingerprint files created using the old sysfs fingerprinting
+	# If it is detected, output a warning and calculate the legacy variant of the current
+	# setup.
+	if echo "$FILE_SETUP" | grep -Eq "^[^ ]+ [0-9a-f]{32}$"; then
+		echo -n " (Obsolete fingerprint format. Please update using --save.) "
+
+		if [ -z "$LEGACY_CURRENT_SETUP" ]; then
+			LEGACY_CURRENT_SETUP="$(echo "$CURRENT_SETUP" | while read DEVICE EDID; do
+				echo -n "${DEVICE} "
+				echo -n "${EDID}" | xxd -r -ps | md5sum - | awk '{print $1}'
+			done)"
+		fi
+		FILE_SETUP="$(echo "$FILE_SETUP" | sort)"
+		if [ "$LEGACY_CURRENT_SETUP" = "$FILE_SETUP" ]; then
+			CURRENT_SETUP="$LEGACY_CURRENT_SETUP"
+		fi
+	fi
+
 	if [ "$CURRENT_SETUP" = "$FILE_SETUP" ]; then
 		echo " (detected)"
 		if [ "$CHANGE_PROFILE" -eq 1 ]; then