X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr;h=5937f8a2a8ad3ded1cd9dd27a3d9d7b3535b1bcf;hb=f4cce4d;hp=e38fcad575b046efb8ca0b9f1d5643b3285aaa30;hpb=393917156558574f0c3e07cccb8ea8c30cfc457f;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr b/autorandr index e38fcad..5937f8a 100755 --- a/autorandr +++ b/autorandr @@ -47,15 +47,20 @@ XRANDR=/usr/bin/xrandr DISPER=/usr/bin/disper XDPYINFO=/usr/bin/xdpyinfo -PROFILES=~/.autorandr/ +PROFILES=~/.autorandr CONFIG=~/.autorandr.conf +RESERVED_PROFILE_NAMES=`cat <= maxdim) { + maxdim=wh[1]*wh[2] + maxmode=m + } + } + } + if (maxmode) { + for (i in outputarr) { + print "output " outputarr[i]; + print "mode " maxmode; + print "pos 0x0"; + if (i > 0) { + print "same-as " outputarr[0] + } + } + } + }' \ + | load_cfg_xrandr - +} + +stack_cfg_xrandr() { + $XRANDR -q | awk -v stack="${STACK}" ' + # variables: + # stack: "horizontal" (anything except vertical) or "vertical" + # output: current output + # firstmode: pick first mode after output + # posX,posY: position of the next output + BEGIN { + posX=posY=0 + } + # display is connected + /^[^ ]+ connected / { + output=$1; + print "output " $1; + firstmode=1 + } + # disconnected or disabled displays + /^[^ ]+ disconnected / || + /^[^ ]+ unknown connection / { + print "output " $1; + print "off"; + } + # modes available on a screen, but pick only the first + /^ [0-9]+x[0-9]+/ { + if (!firstmode) next; + firstmode=0 + # output mode at current virtual desktop pos + print "mode " $1; + print "pos " posX "x" posY; + # calculate position of next output + split($1, wh, "x"); + if (stack == "vertical") + posY += wh[2]; + else + posX += wh[1]; + }' \ + | load_cfg_xrandr - +} + current_cfg() { $CURRENT_CFG_METHOD; } @@ -174,7 +275,36 @@ 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 all --off outputs into the first line + # * Place the output with --pos 0x0 on the second line + # * Remaining outputs are appended as they appear + # * Keep everything in hold buffer until the last line + # sed 4: Remove empty lines caused by G and H on empty hold buffer + sed 's/^/--/' "$1" | sed -e ' + :START + /\n--output/{P;D} + s/\n/ / + N;bSTART' | sed -e ' + / --off/{ + G + # Merge with next line if it contains --off + s/\n\([^\n]* --off\)/ \1/ + h + $!d;b + } + / --pos 0x0/{ + G + # Swap lines 1 and 2 if --off is found + / --off/ s/^\([^\n]*\)\n\([^\n]*\)/\2\n\1/ + h + $!d;b + } + H + $!d + x' | sed -e ' + /./ !d' | xargs -L 1 $XRANDR } load_cfg_disper() { @@ -184,14 +314,45 @@ load_cfg_disper() { load() { local PROFILE="$1" local CONF="$PROFILES/$PROFILE/config" - if [ -e "$CONF" ] ; then + local IS_VIRTUAL_PROFILE=`echo "$RESERVED_PROFILE_NAMES" | grep -c "^ $PROFILE "` + + if [ ! -f "$CONF" -a $IS_VIRTUAL_PROFILE -eq 0 ]; then + echo " -> Error: Profile '$PROFILE' does not exist." >&2 + return + fi + + if [ -x "$PROFILES/preswitch" ]; then + "$PROFILES/preswitch" "$PROFILE" + fi + if [ -x "$PROFILES/$PROFILE/preswitch" ]; then + "$PROFILES/$PROFILE/preswitch" "$PROFILE" + fi + + if [ -f "$CONF" ]; then echo " -> loading profile $PROFILE" + if [ $IS_VIRTUAL_PROFILE -ne 0 ]; then + echo " -> Warning: Existing profile overrides virtual profile with same name" >&2 + fi $LOAD_METHOD "$CONF" + else + # Virtual profiles + if [ $PROFILE = "common" ]; then + echo " -> setting largest common mode in cloned mode" + common_cfg_xrandr + elif [ $PROFILE = "horizontal" ]; then + echo " -> stacking all outputs horizontally at their largest modes" + STACK="horizontal" stack_cfg_xrandr + elif [ $PROFILE = "vertical" ]; then + echo " -> stacking all outputs vertically at their largest modes" + STACK="vertical" stack_cfg_xrandr + fi + fi - [ -x "$PROFILES/$PROFILE/postswitch" ] && \ - "$PROFILES/$PROFILE/postswitch" "$PROFILE" - [ -x "$PROFILES/postswitch" ] && \ - "$PROFILES/postswitch" "$PROFILE" + if [ -x "$PROFILES/$PROFILE/postswitch" ]; then + "$PROFILES/$PROFILE/postswitch" "$PROFILE" + fi + if [ -x "$PROFILES/postswitch" ]; then + "$PROFILES/postswitch" "$PROFILE" fi } @@ -203,7 +364,7 @@ Usage: $SCRIPTNAME [options] -c, --change reload current setup -s, --save save your current setup to profile -l, --load load profile --d, --default make profile the default profile +-d, --default make profile the default profile --force force (re)loading of a profile --fingerprint fingerprint your current hardware setup --config dump your current xrandr setup @@ -224,6 +385,9 @@ Usage: $SCRIPTNAME [options] When called by the name "autodisper" or "auto-disper", the script uses "disper" instead of "xrandr" to detect, configure and save the display configuration. + If xrandr is used, the following virtual configurations are available: +${RESERVED_PROFILE_NAMES} + EOH exit } @@ -238,7 +402,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;; @@ -250,6 +414,10 @@ done CURRENT_SETUP="$(setup_fp)" if [ -n "$SAVE_PROFILE" ]; then + if echo "$RESERVED_PROFILE_NAMES" | grep -q "^ $SAVE_PROFILE "; then + echo "Cannot save current configuration as profile '${SAVE_PROFILE}': This configuration name is a reserved virtual configuration." + exit 1 + fi echo "Saving current configuration as profile '${SAVE_PROFILE}'" mkdir -p "$PROFILES/$SAVE_PROFILE" echo "$CURRENT_SETUP" > "$PROFILES/$SAVE_PROFILE/setup" @@ -295,3 +463,10 @@ if [ -n "$DEFAULT_PROFILE" ]; then load "$DEFAULT_PROFILE" fi exit 1 + +# Local Variables: +# tab-width: 8 +# sh-basic-offset: 8 +# sh-indentation: 8 +# indent-tabs-mode: t +# End: