Merge branch 'rate' into license

diff --combined autorandr
index 0959cfb5fc555bc95dd58b5dba61a6d76a65b95b,30094e79d333875272d2d291bf6af5ae62737ad6..eace95048e1713ba00ee90b254319e51c1e72e5c
--- 1/autorandr
--- 2/autorandr
+++ b/autorandr
@@@ -2,22 -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:
  #
@@@ -75,7 -60,7 +75,7 @@@ FORCE_LOAD=
  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"
  
@@@ -93,45 -78,24 +93,45 @@@ if [ -f $CONFIG ]; the
        . $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
  }
  
@@@ -151,7 -115,7 +151,7 @@@ setup_fp() 
                echo "Unable to fingerprint display configuration" >&2
                return
        fi
 -      echo "$FP"
 +      echo "$FP" | sort
  }
  
  current_cfg_xrandr() {
@@@ -162,6 -126,7 +162,7 @@@
        $XRANDR -q | awk -v primary_setup="${PRIMARY_SETUP}" '
        # display is connected and has a mode
        /^[^ ]+ connected [^(]/ {
+               output=$1
                print "output "$1;
                if ($3 == "primary") {
                        print $3
@@@ -187,9 -152,19 +188,19 @@@
                }
                next;
        }
+       /  [0-9]+x[0-9]+ .+/ {
+               if (output) {
+                       for (n=1; n<10; n++) {
+                               if($n ~ /[0-9]+\.[0-9]+\*/) {
+                                       print "rate " gensub(/(+|\*)/, "", "g", $n);
+                               }
+                       }
+               }
+       }
        # disconnected or disabled displays
        /^[^ ]+ (dis)?connected / ||
        /^[^ ]+ unknown connection / {
+               output=""
                print "output "$1;
                print "off";
                next;
@@@ -481,27 -456,7 +492,27 @@@ for SETUP_FILE in $PROFILES/*/setup; d
                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