Merge branch 'feature/preswitch_scripts' of http://github.com/torrancew/autorandr

[deb_pkgs/autorandr.git] / autorandr

diff --git a/autorandr b/autorandr
index 03333f92cc9694049a110f95f97eb2c7348e1cbd..fbf17a14699bb96989ebc3587db2c7477779b1a7 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Automatically select a display configuration based on connected devives
+# Automatically select a display configuration based on connected devices
 #
 # Stefan Tomanek <stefan.tomanek@wertarbyte.de>
 #
@@ -39,7 +39,7 @@
 # applications about it.
 #
 #
-# While the script uses xrandr by defult, calling it by the name "autodisper"
+# While the script uses xrandr by default, calling it by the name "autodisper"
 # or "auto-disper" forces it to use the "disper" utility, which is useful for
 # controlling nvidia chipsets. The formats for fingerprinting the current setup
 # and saving/loading the current configuration are adjusted accordingly.
@@ -55,7 +55,7 @@ FORCE_LOAD=0
 DEFAULT_PROFILE=""
 SAVE_PROFILE=""
 
-FP_METHODS="setup_fp_xrandr_edid setup_fp_sysfs_edid"
+FP_METHODS="setup_fp_sysfs_edid setup_fp_xrandr_edid"
 CURRENT_CFG_METHOD="current_cfg_xrandr"
 LOAD_METHOD="load_cfg_xrandr"
 
@@ -121,12 +121,22 @@ current_cfg_xrandr() {
        $XRANDR -q | awk -v primary_setup="${PRIMARY_SETUP}" '
        # display is connected and has a mode
        /^[^ ]+ connected [^(]/ {
-               split($3, A, "+");
                print "output "$1;
+               if ($3 == "primary") {
+                       print $3
+                       split($4, A, "+")
+                       $4=$5
+               }
+               else {
+                       split($3, A, "+");
+                       if (A[1] A[2] "," A[3] == primary_setup)
+                               print "primary";
+               }
                print "mode "A[1];
                print "pos "A[2]"x"A[3];
-               if (A[1] A[2] "," A[3] == primary_setup)
-                       print "primary";
+               if ($4 !~ /^\(/) {
+                       print "rotate "$4;
+               }
                next;
        }
        # disconnected or disabled displays
@@ -164,7 +174,28 @@ config_equal() {
 }
 
 load_cfg_xrandr() {
-       sed 's!^!--!' "$1" | xargs $XRANDR
+       # sed 1: Prefix arguments with "--"
+       # sed 2: Merge arguments into one line per output
+       # sed 3: Merge into two lines, all --off outputs in the first one
+       sed 's/^/--/' "$1" | sed -e '
+               :START
+               /\n--output/{P;D}
+               s/\n/ /
+               N;bSTART' | sed -e '
+                       ### First line
+                       / --off/{
+                               G
+                               # Merge if next line contains --off
+                               s/\n\([^\n]* --off\)/ \1/
+                               h
+                               $!d;b
+                       }
+                       ### Last line
+                       H;x
+                       # Merge if previous line contains --mode
+                       s/\(--mode [^\n]*\)\n/\1 /
+                       h
+                       $!d' | xargs -L 1 $XRANDR
 }
 
 load_cfg_disper() {
@@ -175,6 +206,11 @@ load() {
        local PROFILE="$1"
        local CONF="$PROFILES/$PROFILE/config"
        if [ -e "$CONF" ] ; then
+    [ -x "$PROFILES/preswitch" ] && \
+      "$PROFILES/preswitch" "$PROFILE"
+    [ -x "$PROFILES/$PROFILE/preswitch" ] && \
+      "$PROFILES/$PROFILE/preswitch" "$PROFILE"
+
                echo " -> loading profile $PROFILE"
                $LOAD_METHOD "$CONF"
 
@@ -196,6 +232,7 @@ Usage: $SCRIPTNAME [options]
 -d, --default <profile> make profile <profile> the default profile 
 --force                        force (re)loading of a profile
 --fingerprint          fingerprint your current hardware setup
+--config               dump your current xrandr setup
 
  To prevent a profile from being loaded, place a script call "block" in its
  directory. The script is evaluated before the screen setup is inspected, and
@@ -217,7 +254,7 @@ EOH
        exit
 }
 # process parameters
-OPTS=$(getopt -n autorandr -o s:l:d:cfh --long change,default:,save:,load:,force,fingerprint,help -- "$@")
+OPTS=$(getopt -n autorandr -o s:l:d:cfh --long change,default:,save:,load:,force,fingerprint,config,help -- "$@")
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 eval set -- "$OPTS"
 
@@ -230,6 +267,7 @@ while true; do
                -h|--help) help ;; 
                --force) FORCE_LOAD=1; shift ;;
                --fingerprint) setup_fp; exit 0;;
+               --config) current_cfg; exit 0;;
                --) shift; break ;;
                *) echo "Error: $1"; exit 1;;
        esac