License information (1/2)

[deb_pkgs/autorandr.git] / autorandr

diff --git a/autorandr b/autorandr
index fa575b196346552dd44c10666468ce428caef9b8..babc0f690de3f9558fc978bbcd67e30ec2ad81c7 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -2,7 +2,11 @@
 #
 # 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 IS _NOT_ OSS CODE!
+#
+#
 #
 # How to use:
 #
@@ -80,22 +84,30 @@ 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
+       which xxd >/dev/null 2>&1 || return
        $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]-)?##') "
+                       xxd -c 256 -ps "${DEVICE}/edid" | awk 'ORS=""; /.+/ { print; }'
+               echo
        done
 }
 
@@ -115,7 +127,7 @@ setup_fp() {
                echo "Unable to fingerprint display configuration" >&2
                return
        fi
-       echo "$FP"
+       echo "$FINGERPRINT" | sort
 }
 
 current_cfg_xrandr() {
@@ -445,7 +457,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