Only output "rotate" once

[deb_pkgs/autorandr.git] / autorandr

diff --git a/autorandr b/autorandr
index 08725363e1627a52bb2f2f7bcbb7162644c754c9..1317061aa4e8f1ecd263c389f00c3b09b2e3a181 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -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"
 
@@ -132,6 +132,10 @@ current_cfg_xrandr() {
                        if (A[1] A[2] "," A[3] == primary_setup)
                                print "primary";
                }
+               if (($4 == "left") || ($4 == "right")) {
+                       split(A[1], B, "x");
+                       A[1] = B[2]"x"B[1];
+               }
                print "mode "A[1];
                print "pos "A[2]"x"A[3];
                if ($4 !~ /^\(/) {
@@ -206,6 +210,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"
 
@@ -224,7 +233,7 @@ Usage: $SCRIPTNAME [options]
 -c, --change           reload current setup
 -s, --save <profile>   save your current setup to profile <profile>
 -l, --load <profile>   load profile <profile>
--d, --default <profile> make profile <profile> the default profile 
+-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
@@ -259,7 +268,7 @@ while true; do
                -d|--default) DEFAULT_PROFILE="$2"; shift 2 ;;
                -s|--save) SAVE_PROFILE="$2"; shift 2 ;;
                -l|--load) LOAD_PROFILE="$2"; shift 2 ;;
-               -h|--help) help ;; 
+               -h|--help) help ;;
                --force) FORCE_LOAD=1; shift ;;
                --fingerprint) setup_fp; exit 0;;
                --config) current_cfg; exit 0;;