From 8dbcc7f2efb730afecc2926ab19490ef6a41c7fe Mon Sep 17 00:00:00 2001 From: Chris Dunder Date: Tue, 31 Jul 2012 12:54:51 -0700 Subject: [PATCH 01/58] Added support for rotated outputs to the xrandr codepath. --- autorandr | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/autorandr b/autorandr index c14f5cb..2a21476 100755 --- a/autorandr +++ b/autorandr @@ -123,6 +123,11 @@ current_cfg_xrandr() { /^[^ ]+ connected [^(]/ { split($3, A, "+"); print "output "$1; + if (($4 == "left") || ($4 == "right")) { + split(A[1], B, "x"); + A[1] = B[2]"x"B[1]; + print "rotate "$4; + } print "mode "A[1]; print "pos "A[2]"x"A[3]; if (A[1] A[2] "," A[3] == primary_setup) @@ -193,7 +198,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 @@ -227,7 +232,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;; --) shift; break ;; From afd63d50667eb9665754eb6679e48816f092b078 Mon Sep 17 00:00:00 2001 From: helterscelter Date: Mon, 6 Aug 2012 15:08:08 -0400 Subject: [PATCH 02/58] Updated pm-utils scripts 40autorandr had issues when resuming on a system where one or more users have multiple terminal sessions open. enhanced 40autorandr to allow being called as 40auto-disper to automatically swap to using auto-disper semantics --- pm-utils/40auto-disper | 1 + pm-utils/40autorandr | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 120000 pm-utils/40auto-disper diff --git a/pm-utils/40auto-disper b/pm-utils/40auto-disper new file mode 120000 index 0000000..9d7b227 --- /dev/null +++ b/pm-utils/40auto-disper @@ -0,0 +1 @@ +40autorandr \ No newline at end of file diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index 60ca9ae..f465b06 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -2,22 +2,35 @@ # # 40autorandr: Change autorandr profile on thaw/resume -AUTORANDR="autorandr -c" +# detect if we are being called as 40auto-disper or 40autorandr +FORM=${0##*40} +case $FORM in + auto-disper) + AUTORANDR="auto-disper -c" + ;; + *) + AUTORANDR="autorandr -c" + ;; +esac +echo "$AUTORANDR" detect_display() { for X in /tmp/.X11-unix/X*; do D="${X##/tmp/.X11-unix/X}" - user=$(who | awk -vD="$D" '$5 ~ "\\(:"D"\\)$" {print $1}') + user=$( who | grep \(:$D\) | cut -d ' ' -sf 1 | uniq ) + echo "Checking $X -- $D - $user" if [ x"$user" != x"" ]; then + echo "AUTORANDR $D - $user" export DISPLAY=":$D" /bin/su -c "${AUTORANDR}" "$user" fi done + echo "Done" } case "$1" in thaw|resume) - detect_display + detect_display ;; esac From 41edb761814050e4e696a033d156d5d0459a3104 Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Wed, 24 Apr 2013 22:15:19 +0800 Subject: [PATCH 03/58] Added a default fallback ("default") for pm-script. --- pm-utils/40autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index f465b06..2e8080a 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -6,7 +6,7 @@ FORM=${0##*40} case $FORM in auto-disper) - AUTORANDR="auto-disper -c" + AUTORANDR="auto-disper -c --default default" ;; *) AUTORANDR="autorandr -c" From 37052d0f9d9e41e3fbf935f43477abd6098901b6 Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Wed, 24 Apr 2013 22:41:16 +0800 Subject: [PATCH 04/58] Added notes on how to get auto-disper running automatically. --- README | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README b/README index 9b54600..2447030 100644 --- a/README +++ b/README @@ -44,3 +44,15 @@ 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. + +For Debian using auto-disper: +To make the screen auto-configure when your computer wakes up, +* Copy auto-disper into /usr/local/bin/ +* Copy pm-utils/40auto-disper into /etc/pm/sleep.d/ +* (Assuming gnome) Run gnome-keybinding-properties and ADD a shortcut, + I called it "Run auto-disper", I set it to CTRL-F7, and the command is: + auto-disper -c --default default +* Create a default disper setting... eg for laptop: unplug all monitors, + set up the screen nicely on the laptop display. + Then run auto-disper --save laptop + From 3401494b339a79478d656f1ddcbe2bc963339ae6 Mon Sep 17 00:00:00 2001 From: mtahmed Date: Sun, 12 May 2013 08:29:18 -0400 Subject: [PATCH 05/58] Rename README -> README.md. Use markdown for README.md. --- README => README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) rename README => README.md (64%) diff --git a/README b/README.md similarity index 64% rename from README rename to README.md index 9b54600..f6a5bdb 100644 --- a/README +++ b/README.md @@ -1,46 +1,47 @@ -Tool: "autorandr" +# Tool: autorandr Automatically select a display configuration based on connected devices -Stefan Tomanek +### Stefan Tomanek <[stefan.tomanek@wertarbyte.de](stefan.tomanek@wertarbyte.de)> -How to use: +# How to use: Save your current display configuration and setup with: - $ autorandr --save mobile +```autorandr --save mobile``` Connect an additional display, configure your setup and save it: - $ autorandr --save docked +```autorandr --save docked``` Now autorandr can detect which hardware setup is active: +``` $ autorandr mobile docked (detected) +``` -To automatically reload your setup, just append --change to the command line +To automatically reload your setup, just append `--change` to the command line -To manually load a profile, you can use the --load option. +To manually load a profile, you can use the `--load ` option. autorandr tries to avoid reloading an identical configuration. To force the -(re)configuration, apply --force. +(re)configuration, apply `--force`. -To prevent a profile from being loaded, place a script call "block" in its +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 in case of it returning a value of 0 the profile is skipped. This can be used to query the status of a docking station you are about to leave. If no suitable profile can be identified, the current configuration is kept. To change this behaviour and switch to a fallback configuration, specify ---default +`--default `. -Another script called "postswitch "can be placed in the directory -~/.autorandr as well as in all profile directories: The scripts are executed +Another script called `postswitch` can be placed in the directory +`~/.autorandr` as well as in all profile directories: The scripts are executed after a mode switch has taken place and can notify window managers or other applications about it. -While the script uses xrandr by default, 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. - From 71eab77f43c7015d5d1db5dffc576f310c86e2fe Mon Sep 17 00:00:00 2001 From: mtahmed Date: Sun, 12 May 2013 08:33:46 -0400 Subject: [PATCH 06/58] Make the README.md a bit cleaner. --- README.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f6a5bdb..d09b386 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,20 @@ -# Tool: autorandr +# autorandr Automatically select a display configuration based on connected devices -### Stefan Tomanek <[stefan.tomanek@wertarbyte.de](stefan.tomanek@wertarbyte.de)> +Stefan Tomanek <[stefan.tomanek@wertarbyte.de](stefan.tomanek@wertarbyte.de)> -# How to use: +## How to use Save your current display configuration and setup with: -```autorandr --save mobile``` +``` +autorandr --save mobile +``` Connect an additional display, configure your setup and save it: -```autorandr --save docked``` +``` +autorandr --save docked +``` Now autorandr can detect which hardware setup is active: ``` @@ -41,7 +45,8 @@ after a mode switch has taken place and can notify window managers or other applications about it. -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. +While the script uses xrandr by default, calling it by the name `autodisper` +or `auto-disper` forces it to use the [disper](http://willem.engen.nl/projects/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. From 74a310b76da7dbff1735387fecf4b1ba5f3f6cde Mon Sep 17 00:00:00 2001 From: QueezyTheGreat Date: Wed, 26 Jun 2013 19:33:16 +0200 Subject: [PATCH 07/58] Added install makefile and autorandr inotify monitor --- Makefile | 7 +++++++ autorandr_monitor | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Makefile create mode 100755 autorandr_monitor diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4d871ad --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ + +install: + install auto-disper /usr/bin/ + install -m 774 autorandr /usr/bin/ + install -m 774 autorandr_monitor /usr/bin/ + install -m 644 bash_completion/autorandr /etc/bash_completion.d/ + #install -m pm-utils/40autorandr /etc/pm/power.d/ diff --git a/autorandr_monitor b/autorandr_monitor new file mode 100755 index 0000000..e1e5259 --- /dev/null +++ b/autorandr_monitor @@ -0,0 +1,38 @@ +#!/usr/bin/env python +import os +import pyinotify +from pyinotify import ProcessEvent + +SYS_VIDEO_OUTPUTS='/sys/class/drm/card0/' + +DEFAULT_PROFILE='mobile' +AUTORANDR_CMD='autorandr --change --default %s' % DEFAULT_PROFILE + +class VideoOutputMonitor(ProcessEvent): + + def process_IN_ACCESS(self, event): + if event.name == 'status': + print 'Change status of %s' % os.path.basename(event.path) + os.system(AUTORANDR_CMD) + + +def register_video_cards(manager): + if not os.path.exists(SYS_VIDEO_OUTPUTS): + return + + for directory in os.listdir(SYS_VIDEO_OUTPUTS): + path = os.path.join(SYS_VIDEO_OUTPUTS, directory) + status = os.path.join(path, 'status') + if os.path.exists(status): + print 'Monitoring %s' % path + manager.add_watch(path, pyinotify.ALL_EVENTS) + +# pyinotify.log.setLevel(10) + +manager = pyinotify.WatchManager() +handler = VideoOutputMonitor() +notifier = pyinotify.Notifier(manager, default_proc_fun=handler) + +register_video_cards(manager) + +notifier.loop() From 82a1046663291b69499543c17bae9bccd21f6c53 Mon Sep 17 00:00:00 2001 From: QueezyTheGreat Date: Wed, 26 Jun 2013 19:45:31 +0200 Subject: [PATCH 08/58] Updated Makefile, minor change to inotify monitor --- Makefile | 2 +- autorandr_monitor | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d871ad..8a45be5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ install: - install auto-disper /usr/bin/ install -m 774 autorandr /usr/bin/ install -m 774 autorandr_monitor /usr/bin/ install -m 644 bash_completion/autorandr /etc/bash_completion.d/ + ln -sf /usr/bin/autorandr /usr/bin/auto-disper #install -m pm-utils/40autorandr /etc/pm/power.d/ diff --git a/autorandr_monitor b/autorandr_monitor index e1e5259..245b4dd 100755 --- a/autorandr_monitor +++ b/autorandr_monitor @@ -4,8 +4,9 @@ import pyinotify from pyinotify import ProcessEvent SYS_VIDEO_OUTPUTS='/sys/class/drm/card0/' +SYS_VIDEO_OUTPUTS='/sys/class/drm/' -DEFAULT_PROFILE='mobile' +DEFAULT_PROFILE='default' AUTORANDR_CMD='autorandr --change --default %s' % DEFAULT_PROFILE class VideoOutputMonitor(ProcessEvent): From 0f31c5e5b6d772510cdd46eea4afa0878e154864 Mon Sep 17 00:00:00 2001 From: QueezyTheGreat Date: Wed, 26 Jun 2013 20:09:14 +0200 Subject: [PATCH 09/58] Minor code refactoring --- Makefile | 3 ++- Xsession.d/autorandr | 3 +++ autorandr_monitor | 30 ++++++++++++++++++++++-------- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 Xsession.d/autorandr diff --git a/Makefile b/Makefile index 8a45be5..a8ee74a 100644 --- a/Makefile +++ b/Makefile @@ -4,4 +4,5 @@ install: install -m 774 autorandr_monitor /usr/bin/ install -m 644 bash_completion/autorandr /etc/bash_completion.d/ ln -sf /usr/bin/autorandr /usr/bin/auto-disper - #install -m pm-utils/40autorandr /etc/pm/power.d/ + #install -m 644 /etc/X11/Xsession.d/ + #install -m 644 pm-utils/40autorandr /etc/pm/power.d/ diff --git a/Xsession.d/autorandr b/Xsession.d/autorandr new file mode 100644 index 0000000..06e9d2b --- /dev/null +++ b/Xsession.d/autorandr @@ -0,0 +1,3 @@ +# -*- sh -*- + +autorandr_mointor > /tmp/autorandr_monitor & diff --git a/autorandr_monitor b/autorandr_monitor index 245b4dd..6f369bb 100755 --- a/autorandr_monitor +++ b/autorandr_monitor @@ -1,23 +1,34 @@ #!/usr/bin/env python +"""" +Author: Tomasz Bogdal (a.k.a. QueezyTheGreat) +Home: https://github.com/queezythegreat/autorandr +License: This Source Code Form is subject to the terms of the + Mozilla Public License, v. 2.0 +""" import os import pyinotify from pyinotify import ProcessEvent -SYS_VIDEO_OUTPUTS='/sys/class/drm/card0/' -SYS_VIDEO_OUTPUTS='/sys/class/drm/' +#TODO: Fork off when started +#TODO: Add configuration file +#TODO: Add command line options +SYS_VIDEO_OUTPUTS='/sys/class/drm/' DEFAULT_PROFILE='default' AUTORANDR_CMD='autorandr --change --default %s' % DEFAULT_PROFILE class VideoOutputMonitor(ProcessEvent): + """ Launch autorandr when video card output status is changed. """ def process_IN_ACCESS(self, event): + """ Handle IN_ACCESS events to `status` file. """ if event.name == 'status': print 'Change status of %s' % os.path.basename(event.path) os.system(AUTORANDR_CMD) def register_video_cards(manager): + """ Register all video card ouptus for monitoring. """ if not os.path.exists(SYS_VIDEO_OUTPUTS): return @@ -28,12 +39,15 @@ def register_video_cards(manager): print 'Monitoring %s' % path manager.add_watch(path, pyinotify.ALL_EVENTS) -# pyinotify.log.setLevel(10) +def main(): + # pyinotify.log.setLevel(10) + manager = pyinotify.WatchManager() + handler = VideoOutputMonitor() + notifier = pyinotify.Notifier(manager, default_proc_fun=handler) -manager = pyinotify.WatchManager() -handler = VideoOutputMonitor() -notifier = pyinotify.Notifier(manager, default_proc_fun=handler) + register_video_cards(manager) -register_video_cards(manager) + notifier.loop() -notifier.loop() +if __name__ == '__main__': + main() From c71e1097d5f4b765579c434f20b49044519dc9d2 Mon Sep 17 00:00:00 2001 From: QueezyTheGreat Date: Wed, 26 Jun 2013 20:31:39 +0200 Subject: [PATCH 10/58] Minor fixes and improvements --- Makefile | 6 +++--- Xsession.d/autorandr | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a8ee74a..1bbfa0b 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ install: - install -m 774 autorandr /usr/bin/ - install -m 774 autorandr_monitor /usr/bin/ + install -m 775 autorandr /usr/bin/ + install -m 775 autorandr_monitor /usr/bin/ install -m 644 bash_completion/autorandr /etc/bash_completion.d/ ln -sf /usr/bin/autorandr /usr/bin/auto-disper - #install -m 644 /etc/X11/Xsession.d/ + install -m 644 Xsession.d/autorandr /etc/X11/Xsession.d/45autorandr #install -m 644 pm-utils/40autorandr /etc/pm/power.d/ diff --git a/Xsession.d/autorandr b/Xsession.d/autorandr index 06e9d2b..b53f10c 100644 --- a/Xsession.d/autorandr +++ b/Xsession.d/autorandr @@ -1,3 +1,4 @@ # -*- sh -*- -autorandr_mointor > /tmp/autorandr_monitor & +/usr/bin/autorandr --change --default default +/usr/bin/autorandr_monitor &> /tmp/autorandr_monitor & From 2509ac3b83b4b4ee16c4a4af34b0138a2c95a3c6 Mon Sep 17 00:00:00 2001 From: QueezyTheGreat Date: Wed, 26 Jun 2013 20:40:29 +0200 Subject: [PATCH 11/58] Minor fixes and improvements --- Makefile | 2 +- Xsession.d/autorandr | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1bbfa0b..49d598e 100644 --- a/Makefile +++ b/Makefile @@ -4,5 +4,5 @@ install: install -m 775 autorandr_monitor /usr/bin/ install -m 644 bash_completion/autorandr /etc/bash_completion.d/ ln -sf /usr/bin/autorandr /usr/bin/auto-disper - install -m 644 Xsession.d/autorandr /etc/X11/Xsession.d/45autorandr + install -m 644 Xsession.d/autorandr /etc/X11/Xsession.d/99zautorandr #install -m 644 pm-utils/40autorandr /etc/pm/power.d/ diff --git a/Xsession.d/autorandr b/Xsession.d/autorandr index b53f10c..d0b568a 100644 --- a/Xsession.d/autorandr +++ b/Xsession.d/autorandr @@ -1,4 +1,3 @@ # -*- sh -*- -/usr/bin/autorandr --change --default default /usr/bin/autorandr_monitor &> /tmp/autorandr_monitor & From 1ea13e42716c5ee80399a898c25fb23b2e5ae46a Mon Sep 17 00:00:00 2001 From: Helge Date: Wed, 3 Jul 2013 22:06:51 +0200 Subject: [PATCH 12/58] Fix "No such file or directory" on tab-completion Checks if the directory ~/.autorandr exists before searching for profiles. Example error message: autorandr -find: `/root/.autorandr/*': No such file or directory --- bash_completion/autorandr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bash_completion/autorandr b/bash_completion/autorandr index b009994..151c596 100644 --- a/bash_completion/autorandr +++ b/bash_completion/autorandr @@ -10,7 +10,11 @@ _autorandr () opts="-h -c -s -l -d" lopts="--help --change --save --load --default --force --fingerprint" - prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" + if [ -d ~/.autorandr ]; then + prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" + else + prfls="" + fi case "${cur}" in --*) From 393917156558574f0c3e07cccb8ea8c30cfc457f Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 4 Jul 2013 12:39:40 +0200 Subject: [PATCH 13/58] Fix xrandr -q parsing when output contains "primary" xRandR (in newer versions?) will output an extra columns for primary outputs. Detect this column and modify the string split and column numbers accordingly. --- autorandr | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/autorandr b/autorandr index c2c3384..e38fcad 100755 --- a/autorandr +++ b/autorandr @@ -121,15 +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 ($4 !~ /^\(/) { print "rotate "$4; } - if (A[1] A[2] "," A[3] == primary_setup) - print "primary"; next; } # disconnected or disabled displays From 83355f418b766be94a49c51a4f2cf77362148b0e Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 4 Jul 2013 12:44:43 +0200 Subject: [PATCH 14/58] Workaround xrandr bug: "cannot find crtc for output" - efficient solution xrandr will typically fail when switching outputs, if the maximum number is already enabled. This patch will cause xrandr to be called twice: - First invocation will only disable outputs, freeing up CRTCs - Second invocation will only enable outputs --- autorandr | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/autorandr b/autorandr index e38fcad..0872536 100755 --- a/autorandr +++ b/autorandr @@ -174,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() { From 2891190389372cc7bf618f5b375ac8d6131929b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Vod=C3=A1=C4=8Dek?= Date: Sat, 20 Jul 2013 13:12:25 +0200 Subject: [PATCH 15/58] added --config to bash completion --- bash_completion/autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion/autorandr b/bash_completion/autorandr index b009994..ff6a035 100644 --- a/bash_completion/autorandr +++ b/bash_completion/autorandr @@ -9,7 +9,7 @@ _autorandr () prev="${COMP_WORDS[COMP_CWORD-1]}" opts="-h -c -s -l -d" - lopts="--help --change --save --load --default --force --fingerprint" + lopts="--help --change --save --load --default --force --fingerprint --config" prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" case "${cur}" in From 2926c36940b4ff8f0731967312c7a1d93f33dca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Vod=C3=A1=C4=8Dek?= Date: Sat, 20 Jul 2013 13:17:28 +0200 Subject: [PATCH 16/58] bash_completion: load profiles only when .autorandr directory exists --- bash_completion/autorandr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bash_completion/autorandr b/bash_completion/autorandr index b009994..1dd716a 100644 --- a/bash_completion/autorandr +++ b/bash_completion/autorandr @@ -10,7 +10,10 @@ _autorandr () opts="-h -c -s -l -d" lopts="--help --change --save --load --default --force --fingerprint" - prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" + prfls="" + if [ -d ~/.autorandr/ ]; then + prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" + fi case "${cur}" in --*) From bbdf3fb63999e8a5baadce042e04cae8cdc8cdd5 Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Sun, 17 Nov 2013 23:07:52 +0100 Subject: [PATCH 17/58] Added Makefile to install program. --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f26018d --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +all: + @echo "Call \"make install\" to install this program." + @echo "Call \"make hotplug\" to install matching hotplug events." + +INSTALL_PATH=/usr/local/bin +install: + install auto-disper ${INSTALL_PATH} + install -m 755 autorandr ${INSTALL_PATH} + install -m 644 bash_completion/autorandr /etc/bash_completion.d/ + +hotplug: + install -m 755 pm-utils/40autorandr /etc/pm/power.d/ \ No newline at end of file From a0ace8e0c7b145a91084c87edcf25d785640080e Mon Sep 17 00:00:00 2001 From: Mandus Elfving Date: Wed, 10 Apr 2013 20:05:26 +0200 Subject: [PATCH 18/58] Some small fixes to the pm-utils script --- pm-utils/40autorandr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index 60ca9ae..1dcb856 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -1,6 +1,7 @@ #!/bin/sh # # 40autorandr: Change autorandr profile on thaw/resume +exec > /var/log/autorandr.log 2>&1 AUTORANDR="autorandr -c" @@ -8,7 +9,8 @@ detect_display() { for X in /tmp/.X11-unix/X*; do D="${X##/tmp/.X11-unix/X}" - user=$(who | awk -vD="$D" '$5 ~ "\\(:"D"\\)$" {print $1}') + user=`w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}'` + logger "user $user" if [ x"$user" != x"" ]; then export DISPLAY=":$D" /bin/su -c "${AUTORANDR}" "$user" From 5e3a9c5ec45c1c3adaf3503eae87d3fbd300b168 Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Mon, 18 Nov 2013 00:33:18 +0100 Subject: [PATCH 19/58] Make user name detection more reliable if there are multiple session (e.g. terminals). --- pm-utils/40autorandr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index 1dcb856..43c1766 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -9,8 +9,8 @@ detect_display() { for X in /tmp/.X11-unix/X*; do D="${X##/tmp/.X11-unix/X}" - user=`w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}'` - logger "user $user" + user=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1) + logger "autorandr: Changing display configuration for user '$user'" if [ x"$user" != x"" ]; then export DISPLAY=":$D" /bin/su -c "${AUTORANDR}" "$user" From 6bdb12f4882253dda5e1ef38db6dcc3d2a3463aa Mon Sep 17 00:00:00 2001 From: Mandus Elfving Date: Wed, 10 Apr 2013 20:06:03 +0200 Subject: [PATCH 20/58] Add a udev rules file for calling autorandr on monitor switch --- udev/40-monitor-hotplug.rules | 1 + 1 file changed, 1 insertion(+) create mode 100644 udev/40-monitor-hotplug.rules diff --git a/udev/40-monitor-hotplug.rules b/udev/40-monitor-hotplug.rules new file mode 100644 index 0000000..4c48ffb --- /dev/null +++ b/udev/40-monitor-hotplug.rules @@ -0,0 +1 @@ +ACTION=="change", SUBSYSTEM=="drm", RUN+="/etc/pm/sleep.d/40autorandr thaw" From 085ee737811613715af6aeb6e8c270eaf45ecb00 Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Sun, 17 Nov 2013 23:45:20 +0100 Subject: [PATCH 21/58] Install udev rules. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f26018d..41494fa 100644 --- a/Makefile +++ b/Makefile @@ -9,4 +9,6 @@ install: install -m 644 bash_completion/autorandr /etc/bash_completion.d/ hotplug: - install -m 755 pm-utils/40autorandr /etc/pm/power.d/ \ No newline at end of file + install -m 755 pm-utils/40autorandr /etc/pm/sleep.d/ + install -m 644 udev/40-monitor-hotplug.rules /etc/udev/rules.d/ + udevadm control --reload-rules \ No newline at end of file From 5b3e1feee23264856fb8d2bc6c4b415a159f55bc Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Mon, 18 Nov 2013 00:38:10 +0100 Subject: [PATCH 22/58] Update README. --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index 9b54600..32a32b7 100644 --- a/README +++ b/README @@ -44,3 +44,6 @@ 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. +To install autorandr call "make install", define your setup and then call +"make hotplug" to install hotplug scripts. + From ccd53397072dac967365f7f27740bcfa331cbd1a Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 29 Nov 2013 07:51:28 +0100 Subject: [PATCH 23/58] Updated README with branch information --- README | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README b/README index 32a32b7..301a46a 100644 --- a/README +++ b/README @@ -1,3 +1,16 @@ +BRANCH INFORMATION +------------------ + +The original wertarbyte/autorandr tree seems unmaintained, with lots of open +pull requests and issues. I forked it and merged what I thought were the most +important changes. I will maintain this branch until wertarbyte finds the time +to maintain his branch again. + + +ORIGINAL README +--------------- + + Tool: "autorandr" Automatically select a display configuration based on connected devices From 9a5ea1f32f3d21fd80989d0393f26fa7cda8156f Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 29 Nov 2013 08:04:18 +0100 Subject: [PATCH 24/58] Display logger information in pm-utils script only if a user was actually found --- pm-utils/40autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index 43c1766..fc97dea 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -10,8 +10,8 @@ detect_display() for X in /tmp/.X11-unix/X*; do D="${X##/tmp/.X11-unix/X}" user=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1) - logger "autorandr: Changing display configuration for user '$user'" if [ x"$user" != x"" ]; then + logger "autorandr: Changing display configuration for user '$user'" export DISPLAY=":$D" /bin/su -c "${AUTORANDR}" "$user" fi From 7dabe214f0835936d6e07de60db61f1e3af2628f Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Tue, 3 Dec 2013 12:22:31 +0100 Subject: [PATCH 25/58] Prefer sysfs probing over xrandr probing (more reliable, esp. if fake xrandr is used) --- autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorandr b/autorandr index 0872536..90f63ec 100755 --- 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" From b94559c3cf880c4a8b62189f69668f1457214b6a Mon Sep 17 00:00:00 2001 From: vapniks Date: Sun, 8 Dec 2013 01:20:58 +0000 Subject: [PATCH 26/58] Fix completion of config names --- bash_completion/autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion/autorandr b/bash_completion/autorandr index b009994..3bf6451 100644 --- a/bash_completion/autorandr +++ b/bash_completion/autorandr @@ -30,7 +30,7 @@ _autorandr () case "${prev}" in -l|--load|-d|--default) - COMPREPLY=( $( compgen -W "${prfls}" ) ) + COMPREPLY=( $( compgen -W "${prfls}" -- $cur ) ) return 0 ;; *) From f1315852bec78b8a114dca29721f6f8e9b0c0400 Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Mon, 30 Dec 2013 13:18:32 -0800 Subject: [PATCH 27/58] Add support for "preswitch" scripts --- autorandr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/autorandr b/autorandr index c2c3384..e77aeb7 100755 --- a/autorandr +++ b/autorandr @@ -178,6 +178,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" From 6a04c1b9134bc5f2be74f7c753e3c0469e9d02de Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 30 Jan 2014 12:31:29 +0100 Subject: [PATCH 28/58] Support DESTDIR + improvements for easy packaging --- Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a22a058..f1d2725 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,16 @@ all: INSTALL_PATH=/usr/local/bin install: - install auto-disper ${INSTALL_PATH} - install -m 755 autorandr ${INSTALL_PATH} - install -m 644 bash_completion/autorandr /etc/bash_completion.d/ + install -D auto-disper ${DESTDIR}${INSTALL_PATH}/auto-disper + install -D -m 755 autorandr ${DESTDIR}${INSTALL_PATH}/autorandr + install -D -m 644 bash_completion/autorandr ${DESTDIR}/etc/bash_completion.d/autorandr hotplug: - install -m 755 pm-utils/40autorandr /etc/pm/sleep.d/ - install -m 644 udev/40-monitor-hotplug.rules /etc/udev/rules.d/ + install -D -m 755 pm-utils/40autorandr ${DESTDIR}/etc/pm/sleep.d/40autorandr + install -D -m 644 udev/40-monitor-hotplug.rules ${DESTDIR}/etc/udev/rules.d/40-monitor-hotplug.rules +ifeq (${USER},root) udevadm control --reload-rules +else + @echo "Please run this command as root:" + @echo " udevadm control --reload-rules" +endif From 8af170c6ab4a4a2ae904ffa07e20f0a06f695b58 Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 30 Jan 2014 14:57:58 +0100 Subject: [PATCH 29/58] Only output "rotate" once --- autorandr | 1 - 1 file changed, 1 deletion(-) diff --git a/autorandr b/autorandr index e3c9d6d..1317061 100755 --- a/autorandr +++ b/autorandr @@ -135,7 +135,6 @@ current_cfg_xrandr() { if (($4 == "left") || ($4 == "right")) { split(A[1], B, "x"); A[1] = B[2]"x"B[1]; - print "rotate "$4; } print "mode "A[1]; print "pos "A[2]"x"A[3]; From 007920e83cf934f765d4424fab8148c9611eaacc Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Thu, 30 Jan 2014 16:35:07 +0100 Subject: [PATCH 30/58] Apply normal rotation unless another one is set --- autorandr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/autorandr b/autorandr index 1317061..2a2b0c1 100755 --- a/autorandr +++ b/autorandr @@ -135,12 +135,13 @@ current_cfg_xrandr() { if (($4 == "left") || ($4 == "right")) { split(A[1], B, "x"); A[1] = B[2]"x"B[1]; + print "rotate "$4; + } + else { + print "rotate normal"; } print "mode "A[1]; print "pos "A[2]"x"A[3]; - if ($4 !~ /^\(/) { - print "rotate "$4; - } next; } # disconnected or disabled displays From c980e5462e76c19bfe6c130bd4a13d2b79b5ed08 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Thu, 30 Jan 2014 16:36:26 +0100 Subject: [PATCH 31/58] Fixed indentation of commit f131585 --- autorandr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autorandr b/autorandr index 2a2b0c1..1635ce5 100755 --- a/autorandr +++ b/autorandr @@ -211,10 +211,10 @@ 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" + [ -x "$PROFILES/preswitch" ] && \ + "$PROFILES/preswitch" "$PROFILE" + [ -x "$PROFILES/$PROFILE/preswitch" ] && \ + "$PROFILES/$PROFILE/preswitch" "$PROFILE" echo " -> loading profile $PROFILE" $LOAD_METHOD "$CONF" From 02250278869bc1a787a1f36f3fa968b50bb36eff Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 30 Jan 2014 18:42:25 +0100 Subject: [PATCH 32/58] Revert "Apply normal rotation unless another one is set" This reverts commit 007920e83cf934f765d4424fab8148c9611eaacc. --- autorandr | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/autorandr b/autorandr index 1635ce5..e5f8a6e 100755 --- a/autorandr +++ b/autorandr @@ -135,13 +135,12 @@ current_cfg_xrandr() { if (($4 == "left") || ($4 == "right")) { split(A[1], B, "x"); A[1] = B[2]"x"B[1]; - print "rotate "$4; - } - else { - print "rotate normal"; } print "mode "A[1]; print "pos "A[2]"x"A[3]; + if ($4 !~ /^\(/) { + print "rotate "$4; + } next; } # disconnected or disabled displays From 13decd1df7b3c9186eb171589501f1a635e766ae Mon Sep 17 00:00:00 2001 From: tachylatus Date: Thu, 30 Jan 2014 18:43:53 +0100 Subject: [PATCH 33/58] Apply normal rotation unless another one is set (ver.2) --- autorandr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autorandr b/autorandr index e5f8a6e..feababd 100755 --- a/autorandr +++ b/autorandr @@ -141,6 +141,9 @@ current_cfg_xrandr() { if ($4 !~ /^\(/) { print "rotate "$4; } + else { + print "rotate normal"; + } next; } # disconnected or disabled displays From 78eaf1be4acda2cdef17cdff483d8db4b1da23ed Mon Sep 17 00:00:00 2001 From: Christian Storm Date: Mon, 10 Feb 2014 19:01:35 +0100 Subject: [PATCH 34/58] fix load() causing 'exit 1' on missing optional file $PROFILES/postswitch load() should return 1 and hence cause 'exit 1' on a missing config file but it should not implicitly return 1 on a missing optional file $PROFILES/postswitch --- autorandr | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/autorandr b/autorandr index feababd..90d1108 100755 --- a/autorandr +++ b/autorandr @@ -212,19 +212,22 @@ load_cfg_disper() { 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" - - [ -x "$PROFILES/$PROFILE/postswitch" ] && \ - "$PROFILES/$PROFILE/postswitch" "$PROFILE" - [ -x "$PROFILES/postswitch" ] && \ - "$PROFILES/postswitch" "$PROFILE" + [ -f "$CONF" ] || return 1 + if [ -x "$PROFILES/preswitch" ]; then + "$PROFILES/preswitch" "$PROFILE" + fi + if [ -x "$PROFILES/$PROFILE/preswitch" ]; then + "$PROFILES/$PROFILE/preswitch" "$PROFILE" + fi + + echo " -> loading profile $PROFILE" + $LOAD_METHOD "$CONF" + + if [ -x "$PROFILES/$PROFILE/postswitch" ]; then + "$PROFILES/$PROFILE/postswitch" "$PROFILE" + fi + if [ -x "$PROFILES/postswitch" ]; then + "$PROFILES/postswitch" "$PROFILE" fi } From 420686dc17c25ee75e79d30f5dd6d5cae7902284 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Fri, 4 Jul 2014 21:02:04 +0200 Subject: [PATCH 35/58] Adding emacs Local Variables block at the end. --- autorandr | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autorandr b/autorandr index 90d1108..fd0e271 100755 --- a/autorandr +++ b/autorandr @@ -331,3 +331,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: From 81552801f77f76261ca9542a37e8d35698035b15 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Sat, 19 Jul 2014 20:01:25 +0200 Subject: [PATCH 36/58] Added a virtual profile named 'common', which calculates the lowest common resolution for all attached displays. --- autorandr | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/autorandr b/autorandr index fd0e271..1f82fb2 100755 --- a/autorandr +++ b/autorandr @@ -159,6 +159,53 @@ current_cfg_disper() { $DISPER -p } +common_cfg_xrandr() { + $XRANDR -q | awk ' + # variables: + # output: current output + # outputlist: space sep list of all outputs + # outputarr: array of all connected outputs + # outputarrsize: number of connected outputs + # modelist[800x600]: space sep list of outputs supporting mode + BEGIN { + ORS = " " # output space sep argument list for xrandr + } + # display is connected + /^[^ ]+ connected / { + output=$1; + outputlist=outputlist " " output + outputarr[outputarrsize++]=output + } + # disconnected or disabled displays + /^[^ ]+ disconnected / || + /^[^ ]+ unknown connection / { + print "--output",$1,"--off"; + } + # modes available on a screen + /^ [0-9]+x[0-9]+/ { + modelist[$1]=modelist[$1] " " output + } + END { + # find common mode with largest screen area + for (m in modelist) { + if (modelist[m] == outputlist) { + # calculate area of resolution + split(m, wh, "x"); + if (wh[1]*wh[2] >= maxdim) { + maxdim=wh[1]*wh[2] + maxmode=m + } + } + } + if (maxmode) { + for (i in outputarr) + print "--output",outputarr[i],"--mode",maxmode,"--pos","0x0" + } + print param + }' \ + | xargs -L 1 $XRANDR +} + current_cfg() { $CURRENT_CFG_METHOD; } @@ -212,7 +259,7 @@ load_cfg_disper() { load() { local PROFILE="$1" local CONF="$PROFILES/$PROFILE/config" - [ -f "$CONF" ] || return 1 + [ -f "$CONF" -o "$PROFILE" = "common" ] || return 1 if [ -x "$PROFILES/preswitch" ]; then "$PROFILES/preswitch" "$PROFILE" fi @@ -220,8 +267,13 @@ load() { "$PROFILES/$PROFILE/preswitch" "$PROFILE" fi - echo " -> loading profile $PROFILE" - $LOAD_METHOD "$CONF" + if [ $PROFILE = "common" ]; then + echo " -> setting largest common mode" + common_cfg_xrandr + else + echo " -> loading profile $PROFILE" + $LOAD_METHOD "$CONF" + fi if [ -x "$PROFILES/$PROFILE/postswitch" ]; then "$PROFILES/$PROFILE/postswitch" "$PROFILE" From f7b14d1ee586f345004b3c22934a0e18a11c84c6 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Sun, 20 Jul 2014 12:05:46 +0200 Subject: [PATCH 37/58] Set virtual 'common' config via load_cfg_xrandr by piping into the sed. --- autorandr | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/autorandr b/autorandr index 1f82fb2..e2afd42 100755 --- a/autorandr +++ b/autorandr @@ -167,9 +167,6 @@ common_cfg_xrandr() { # outputarr: array of all connected outputs # outputarrsize: number of connected outputs # modelist[800x600]: space sep list of outputs supporting mode - BEGIN { - ORS = " " # output space sep argument list for xrandr - } # display is connected /^[^ ]+ connected / { output=$1; @@ -179,7 +176,8 @@ common_cfg_xrandr() { # disconnected or disabled displays /^[^ ]+ disconnected / || /^[^ ]+ unknown connection / { - print "--output",$1,"--off"; + print "output " $1; + print "off"; } # modes available on a screen /^ [0-9]+x[0-9]+/ { @@ -198,12 +196,14 @@ common_cfg_xrandr() { } } if (maxmode) { - for (i in outputarr) - print "--output",outputarr[i],"--mode",maxmode,"--pos","0x0" + for (i in outputarr) { + print "output " outputarr[i]; + print "mode " maxmode; + print "pos 0x0"; + } } - print param }' \ - | xargs -L 1 $XRANDR + | load_cfg_xrandr - } current_cfg() { From 8c7260f4209ed7bd572c51c3898f81cc7e6c519b Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Sun, 20 Jul 2014 12:38:11 +0200 Subject: [PATCH 38/58] Output "same-as" in the "common" virtual configuration --- autorandr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autorandr b/autorandr index e2afd42..e455700 100755 --- a/autorandr +++ b/autorandr @@ -200,6 +200,9 @@ common_cfg_xrandr() { print "output " outputarr[i]; print "mode " maxmode; print "pos 0x0"; + if (i > 0) { + print "same-as " outputarr[0] + } } } }' \ From 9c9a60325749758c1aa86cd4a9648a041e3986ef Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Sun, 20 Jul 2014 12:38:40 +0200 Subject: [PATCH 39/58] Inform users about virtual configurations, prevent name collisions, prefer existing configuration files over virtual configurations --- autorandr | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/autorandr b/autorandr index e455700..37f6eed 100755 --- a/autorandr +++ b/autorandr @@ -49,6 +49,9 @@ DISPER=/usr/bin/disper XDPYINFO=/usr/bin/xdpyinfo PROFILES=~/.autorandr/ CONFIG=~/.autorandr.conf +RESERVED_PROFILE_NAMES=`cat < setting largest common mode" - common_cfg_xrandr - else + if [ -f "$CONF" ]; then echo " -> loading profile $PROFILE" + if [ -n $IS_VIRTUAL_PROFILE ]; 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" + common_cfg_xrandr + fi fi if [ -x "$PROFILES/$PROFILE/postswitch" ]; then @@ -315,6 +325,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 } @@ -341,6 +354,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" From 4d608162f5ec66089dd1536d08c1a7f3aba82b28 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Sun, 20 Jul 2014 13:05:05 +0200 Subject: [PATCH 40/58] Add 'horizontal' and 'vertical' stacked virtual profiles. Small fixes to virtual profile code. --- autorandr | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/autorandr b/autorandr index 37f6eed..e507515 100755 --- a/autorandr +++ b/autorandr @@ -50,7 +50,9 @@ XDPYINFO=/usr/bin/xdpyinfo PROFILES=~/.autorandr/ CONFIG=~/.autorandr.conf RESERVED_PROFILE_NAMES=`cat < setting largest common mode" + 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 @@ -326,7 +373,7 @@ Usage: $SCRIPTNAME [options] instead of "xrandr" to detect, configure and save the display configuration. If xrandr is used, the following virtual configurations are available: - ${RESERVED_PROFILE_NAMES} +${RESERVED_PROFILE_NAMES} EOH exit From 9b719993939b13dd4c577ca2576d255c83a6cd75 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Sun, 20 Jul 2014 13:17:51 +0200 Subject: [PATCH 41/58] Use same virtual profile detection code in all places --- autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorandr b/autorandr index e507515..19b981c 100755 --- a/autorandr +++ b/autorandr @@ -401,7 +401,7 @@ done CURRENT_SETUP="$(setup_fp)" if [ -n "$SAVE_PROFILE" ]; then - if echo "$RESERVED_PROFILE_NAMES" | grep -q " $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 From 899c841c1174a0bf522e8b8b1795381584e6010f Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Sun, 20 Jul 2014 13:14:05 +0200 Subject: [PATCH 42/58] Print error when profile does not exist and fixing use of IS_VIRTUAL_PROFILE. --- autorandr | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/autorandr b/autorandr index e507515..22e61ed 100755 --- a/autorandr +++ b/autorandr @@ -307,7 +307,12 @@ load() { local PROFILE="$1" local CONF="$PROFILES/$PROFILE/config" local IS_VIRTUAL_PROFILE=`echo "$RESERVED_PROFILE_NAMES" | grep -c "^ $PROFILE "` - [ -f "$CONF" -o -n $IS_VIRTUAL_PROFILE ] || return 1 + + if [ ! -f "$CONF" -a $IS_VIRTUAL_PROFILE == 0 ]; then + echo " -> Error: Profile '$PROFILE' does not exist." >&2 + return + fi + if [ -x "$PROFILES/preswitch" ]; then "$PROFILES/preswitch" "$PROFILE" fi @@ -317,7 +322,7 @@ load() { if [ -f "$CONF" ]; then echo " -> loading profile $PROFILE" - if [ -n $IS_VIRTUAL_PROFILE ]; then + if [ $IS_VIRTUAL_PROFILE != 0 ]; then echo " -> Warning: Existing profile overrides virtual profile with same name" >&2 fi $LOAD_METHOD "$CONF" From b4e56eb70ab92c2936bb759c9319645ab55835fe Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Sun, 20 Jul 2014 13:21:47 +0200 Subject: [PATCH 43/58] Fixed integer test expressions --- autorandr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autorandr b/autorandr index 9cb87f7..143a044 100755 --- a/autorandr +++ b/autorandr @@ -308,7 +308,7 @@ load() { local CONF="$PROFILES/$PROFILE/config" local IS_VIRTUAL_PROFILE=`echo "$RESERVED_PROFILE_NAMES" | grep -c "^ $PROFILE "` - if [ ! -f "$CONF" -a $IS_VIRTUAL_PROFILE == 0 ]; then + if [ ! -f "$CONF" -a $IS_VIRTUAL_PROFILE -eq 0 ]; then echo " -> Error: Profile '$PROFILE' does not exist." >&2 return fi @@ -322,7 +322,7 @@ load() { if [ -f "$CONF" ]; then echo " -> loading profile $PROFILE" - if [ $IS_VIRTUAL_PROFILE != 0 ]; then + if [ $IS_VIRTUAL_PROFILE -ne 0 ]; then echo " -> Warning: Existing profile overrides virtual profile with same name" >&2 fi $LOAD_METHOD "$CONF" From abd5e778d3bc39f934314b0cff5379f3e3998e57 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Sun, 27 Jul 2014 15:26:07 +0200 Subject: [PATCH 44/58] replaced w with who as w cuts off long user names Conflicts: pm-utils/40autorandr --- pm-utils/40autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr index 74549fc..b8b2bee 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -18,7 +18,7 @@ detect_display() { for X in /tmp/.X11-unix/X*; do D="${X##/tmp/.X11-unix/X}" - user=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1) + user=`who | awk -vD="$D" '$2 ~ ":"D"(.[0-9])?$" {print $1}' | head -1` if [ x"$user" != x"" ]; then logger "autorandr: Changing display configuration for user '$user'" export DISPLAY=":$D" From f594071e2818fc7bccb7aa9b01b9ac785bec4fc2 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 3 Nov 2014 12:00:31 +0100 Subject: [PATCH 45/58] removed trailing slash --- autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorandr b/autorandr index 143a044..ef750e2 100755 --- a/autorandr +++ b/autorandr @@ -47,7 +47,7 @@ XRANDR=/usr/bin/xrandr DISPER=/usr/bin/disper XDPYINFO=/usr/bin/xdpyinfo -PROFILES=~/.autorandr/ +PROFILES=~/.autorandr CONFIG=~/.autorandr.conf RESERVED_PROFILE_NAMES=`cat < Date: Fri, 12 Dec 2014 14:51:19 +0100 Subject: [PATCH 46/58] Enable xrandr outputs one-by-one, --pos 0x0 first Enabling more than one or two outputs at once may result in this error: /usr/bin/xrandr: Configure crtc 1 failed This happens on my Dell Latitude E7440 with three monitors connected. Disabling many outputs at once still seems safe. Output positioning may be ignored by xrandr in some cases. To circumvent this, make sure the output with --pos 0x0 is enabled first. --- autorandr | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/autorandr b/autorandr index ef750e2..5937f8a 100755 --- a/autorandr +++ b/autorandr @@ -277,26 +277,34 @@ config_equal() { load_cfg_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 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 ' - ### First line / --off/{ G - # Merge if next line contains --off + # Merge with next line if it 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 + / --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() { From 8429886318b0788c4e18022b03b1c68319c900c7 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Sat, 13 Dec 2014 15:59:41 +0100 Subject: [PATCH 47/58] Enable outputs in pairs of two (Follow-up to commit f4cce4d) --- autorandr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/autorandr b/autorandr index 5937f8a..fa575b1 100755 --- a/autorandr +++ b/autorandr @@ -282,6 +282,7 @@ load_cfg_xrandr() { # * 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 5: Join lines enabling screens in pairs of two (See https://github.com/phillipberndt/autorandr/pull/6) sed 's/^/--/' "$1" | sed -e ' :START /\n--output/{P;D} @@ -304,7 +305,9 @@ load_cfg_xrandr() { H $!d x' | sed -e ' - /./ !d' | xargs -L 1 $XRANDR + /./ !d' | sed -e ' + /--mode/{ N; s/\n/ /; } + ' | xargs -L 1 $XRANDR } load_cfg_disper() { From 920294ac15e6fb26e188336c821089cb2f1a5c4e Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Wed, 31 Dec 2014 13:21:30 +0100 Subject: [PATCH 48/58] Store refresh rate See https://github.com/wertarbyte/autorandr/issues/6 --- autorandr | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/autorandr b/autorandr index fa575b1..30094e7 100755 --- a/autorandr +++ b/autorandr @@ -126,6 +126,7 @@ current_cfg_xrandr() { $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 @@ -151,9 +152,19 @@ current_cfg_xrandr() { } 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; From d0efe243a4646c14305405cd434a720be2fe8cb2 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 2 Jan 2015 09:23:20 +0100 Subject: [PATCH 49/58] Reimplemented the setup_fp methods In order to resolve bug #7, we need to remove non-trivial pieces of code by @wertarbyte, who does not react to requests currently. All other authors agreed to any suitable OSS license. See https://github.com/phillipberndt/autorandr/issues/7 for further discussion. A side-effect of my reimplementation is that both methods now return the same fingerprint, such that they are interchangeable. A downside is that the fingerprints change with this version. --- autorandr | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/autorandr b/autorandr index 30094e7..9559ead 100755 --- a/autorandr +++ b/autorandr @@ -80,22 +80,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 +123,7 @@ setup_fp() { echo "Unable to fingerprint display configuration" >&2 return fi - echo "$FP" + echo "$FINGERPRINT" | sort } current_cfg_xrandr() { From c677160fa618ff28e502d2318cfee2fb206c76d9 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 2 Jan 2015 10:06:54 +0100 Subject: [PATCH 50/58] Detect and process legacy fingerprint (setup) files --- autorandr | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/autorandr b/autorandr index 9559ead..7e09045 100755 --- a/autorandr +++ b/autorandr @@ -464,7 +464,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 From c5873ac531d1d15e417036d18bc3158218bd2418 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 2 Jan 2015 10:53:31 +0100 Subject: [PATCH 51/58] License information (1/2) --- README.md | 11 + autorandr | 6 +- gpl-3.0.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 690 insertions(+), 1 deletion(-) create mode 100644 gpl-3.0.txt diff --git a/README.md b/README.md index 619a992..88e32e1 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,17 @@ pull requests and issues. I forked it and merged what I thought were the most important changes. I will maintain this branch until wertarbyte finds the time to maintain his branch again. +## License information and authors + +autorandr was originally written by Stefan Tomanek and not published under any +Open Source license. He did so far not respond to requests regarding the code's +license. In this fork, all code has been reimplemented by various authors that +have agreed to release their code under the terms of the GNU General Public +License (version 3). + +Note that this license only applies to versions of autorandr from this fork +that are committed after issue #7 is closed, and versions derived from that +one. In particular, wertarbyte's original repository is still not OSS. ## How to use diff --git a/autorandr b/autorandr index 7e09045..6716745 100755 --- a/autorandr +++ b/autorandr @@ -2,7 +2,11 @@ # # Automatically select a display configuration based on connected devices # -# Stefan Tomanek +# Copyright (c) 2013 Stefan Tomanek +# +# THIS IS _NOT_ OSS CODE! +# +# # # How to use: # diff --git a/gpl-3.0.txt b/gpl-3.0.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/gpl-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 7a49fda6b2f7e3c1c42e97687cbb3c0b55215041 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 2 Jan 2015 11:21:01 +0100 Subject: [PATCH 52/58] Removed non-trivial code by Stefan Tomanek --- autorandr | 109 ++++++++++++++---------------------------------------- 1 file changed, 27 insertions(+), 82 deletions(-) diff --git a/autorandr b/autorandr index 6716745..e3d4fe1 100755 --- a/autorandr +++ b/autorandr @@ -2,55 +2,16 @@ # # Automatically select a display configuration based on connected devices # -# Copyright (c) 2013 Stefan Tomanek +# autorandr was originally written by Stefan Tomanek +# For licensing reasons, this version does not contain non-trivial code from the +# original version and from authors that did not consent with OSS licensing this +# program. # -# THIS IS _NOT_ OSS CODE! +# THIS IS _NOT_ OSS CODE YET! # -# -# -# How to use: -# -# Save your current display configuration and setup with: -# $ autorandr --save mobile -# -# Connect an additional display, configure your setup and save it: -# $ autorandr --save docked -# -# Now autorandr can detect which hardware setup is active: -# $ autorandr -# mobile -# docked (detected) -# -# To automatically reload your setup, just append --change to the command line -# -# To manually load a profile, you can use the --load option. -# -# autorandr tries to avoid reloading an identical configuration. To force the -# (re)configuration, apply --force. -# -# 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 -# in case of it returning a value of 0 the profile is skipped. This can be used -# to query the status of a docking station you are about to leave. -# -# If no suitable profile can be identified, the current configuration is kept. -# To change this behaviour and switch to a fallback configuration, specify -# --default -# -# Another script called "postswitch "can be placed in the directory -# ~/.autorandr as well as in all profile directories: The scripts are executed -# after a mode switch has taken place and can notify window managers or other -# applications about it. -# -# -# 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. XRANDR=/usr/bin/xrandr DISPER=/usr/bin/disper -XDPYINFO=/usr/bin/xdpyinfo PROFILES=~/.autorandr CONFIG=~/.autorandr.conf RESERVED_PROFILE_NAMES=`cat <&2 - FP_METHODS="setup_fp_disper" CURRENT_CFG_METHOD="current_cfg_disper" LOAD_METHOD="load_cfg_disper" fi @@ -111,31 +71,21 @@ setup_fp_sysfs_edid() { done } -setup_fp_disper() { - $DISPER -l | grep '^display ' -} - setup_fp() { - local FP=""; - for M in $FP_METHODS; do - FP="$($M)" - if [ -n "$FP" ]; then - break - fi + FINGERPRINT="" + for METHOD in $FP_METHODS; do + FINGERPRINT="$($METHOD)" + [ -n "$FINGERPRINT" ] && break done - if [ -z "$FP" ]; then - echo "Unable to fingerprint display configuration" >&2 - return + if [ -z "$FINGERPRINT" ]; then + echo "Unable to fingerprint display configuration." >&2 + return 0 fi echo "$FINGERPRINT" | sort } current_cfg_xrandr() { - local PRIMARY_SETUP=""; - if [ -x "$XDPYINFO" ]; then - PRIMARY_SETUP="$($XDPYINFO -ext XINERAMA | awk '/^ head #0:/ {printf $3 $5}')" - fi - $XRANDR -q | awk -v primary_setup="${PRIMARY_SETUP}" ' + $XRANDR -q | awk ' # display is connected and has a mode /^[^ ]+ connected [^(]/ { output=$1 @@ -147,8 +97,6 @@ current_cfg_xrandr() { } else { split($3, A, "+"); - if (A[1] A[2] "," A[3] == primary_setup) - print "primary"; } if (($4 == "left") || ($4 == "right")) { split(A[1], B, "x"); @@ -281,20 +229,16 @@ current_cfg() { } blocked() { - local PROFILE="$1" - [ ! -x "$PROFILES/$PROFILE/block" ] && return 1 - - "$PROFILES/$PROFILE/block" "$PROFILE" + [ ! -x "$PROFILES/$1/block" ] && return 1 + "$PROFILES/$1/block" "$1" } config_equal() { - local PROFILE="$1" - if [ "$(cat "$PROFILES/$PROFILE/config")" = "$(current_cfg)" ]; then - echo "Config already loaded" + if [ "$(cat "$PROFILES/$1/config")" = "$(current_cfg)" ]; then + echo "Config already loaded." >&2 return 0 - else - return 1 fi + return 1 } load_cfg_xrandr() { @@ -404,12 +348,13 @@ Usage: $SCRIPTNAME [options] To change this behaviour and switch to a fallback configuration, specify --default . - Another script called "postswitch "can be placed in the directory + Another script called "postswitch" can be placed in the directory ~/.autorandr as well as in any profile directories: The scripts are executed - after a mode switch has taken place and can notify window managers. + after a mode switch has taken place and can notify window managers. The same + goes for "preswitch", which will be executed before a mode switch. When called by the name "autodisper" or "auto-disper", the script uses "disper" - instead of "xrandr" to detect, configure and save the display configuration. + instead of "xrandr" to configure and save the display configuration. If xrandr is used, the following virtual configurations are available: ${RESERVED_PROFILE_NAMES} @@ -456,11 +401,11 @@ if [ -n "$LOAD_PROFILE" ]; then exit $? fi -for SETUP_FILE in $PROFILES/*/setup; do - if ! [ -e $SETUP_FILE ]; then - break - fi - PROFILE="$(basename $(dirname "$SETUP_FILE"))" +for PROFILE_PATH in $PROFILES/*; do + PROFILE="$(basename "$PROFILE_PATH")" + SETUP_FILE="${PROFILE_PATH}/setup" + + [ -e $SETUP_FILE ] || continue echo -n "$PROFILE" if blocked "$PROFILE"; then From d07beee1eb72620241e88d00364d2952ddc7caa1 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 2 Jan 2015 11:34:30 +0100 Subject: [PATCH 53/58] License information (2/2) --- README.md | 36 ++++++++++++++++++++++++------------ autorandr | 19 ++++++++++++++++++- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 88e32e1..9401d37 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,38 @@ Automatically select a display configuration based on connected devices -Stefan Tomanek <[stefan.tomanek@wertarbyte.de](stefan.tomanek@wertarbyte.de)> - ## Branch information -The original wertarbyte/autorandr tree seems unmaintained, with lots of open -pull requests and issues. I forked it and merged what I thought were the most -important changes. I will maintain this branch until wertarbyte finds the time -to maintain his branch again. +The original [wertarbyte/autorandr](https://github.com/wertarbyte/autorandr) +tree seems unmaintained, with lots of open pull requests and issues. I forked +it and merged what I thought were the most important changes. I will maintain +this branch until @wertarbyte finds the time to maintain his branch again. ## License information and authors -autorandr was originally written by Stefan Tomanek and not published under any -Open Source license. He did so far not respond to requests regarding the code's -license. In this fork, all code has been reimplemented by various authors that +Stefan Tomanek came up with and wrote the initial version of autorandr. He +currently does not maintain it, and did not express his opinion concerning an +OSS license in two independent requests. To resolve the licensing issue, all +non-trivial code in this fork has been reimplemented by various authors that have agreed to release their code under the terms of the GNU General Public License (version 3). -Note that this license only applies to versions of autorandr from this fork -that are committed after issue #7 is closed, and versions derived from that -one. In particular, wertarbyte's original repository is still not OSS. +This license will apply to versions of autorandr from this fork that are +committed after issue #7 has been resolved, and versions derived from that one. +**In particular, wertarbyte's original repository is still not OSS, and the current +version in this repository is neither.** + +Contributors to this version of autorandr are: + +* Alexander Wirt +* Chris Dunder +* Maciej Sitarz +* Matthew R Johnson +* Phillip Berndt +* Timo Bingmann +* Tomasz Bogdal +* stormc +* tachylatus ## How to use diff --git a/autorandr b/autorandr index e3d4fe1..0fc9833 100755 --- a/autorandr +++ b/autorandr @@ -7,7 +7,24 @@ # original version and from authors that did not consent with OSS licensing this # program. # -# THIS IS _NOT_ OSS CODE YET! +# +# +# THE FOLLOWING LICENCE AGREEMENT IS PRELIMINARY AND INVALID UNTIL ISSUE #7 AT +# https://github.com/phillipberndt/autorandr/issues/7 +# HAS BEEN RESOLVED! +# +# 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 . # XRANDR=/usr/bin/xrandr From 84651578512d816426934b54d8a673adafdf6ca4 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 16 Jan 2015 07:51:53 +0100 Subject: [PATCH 54/58] Revert "Removed non-trivial code by Stefan Tomanek" This reverts commit bbe8f8b547256542ad332bfee1614cf7137f9e5d. See https://github.com/wertarbyte/autorandr/issues/24 Conflicts: autorandr --- autorandr | 107 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 81 insertions(+), 26 deletions(-) diff --git a/autorandr b/autorandr index 0fc9833..dd5cee3 100755 --- a/autorandr +++ b/autorandr @@ -2,10 +2,7 @@ # # Automatically select a display configuration based on connected devices # -# autorandr was originally written by Stefan Tomanek -# For licensing reasons, this version does not contain non-trivial code from the -# original version and from authors that did not consent with OSS licensing this -# program. +# Copyright (c) 2013 Stefan Tomanek # # # @@ -26,9 +23,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +# +# +# How to use: +# +# Save your current display configuration and setup with: +# $ autorandr --save mobile +# +# Connect an additional display, configure your setup and save it: +# $ autorandr --save docked +# +# Now autorandr can detect which hardware setup is active: +# $ autorandr +# mobile +# docked (detected) +# +# To automatically reload your setup, just append --change to the command line +# +# To manually load a profile, you can use the --load option. +# +# autorandr tries to avoid reloading an identical configuration. To force the +# (re)configuration, apply --force. +# +# 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 +# in case of it returning a value of 0 the profile is skipped. This can be used +# to query the status of a docking station you are about to leave. +# +# If no suitable profile can be identified, the current configuration is kept. +# To change this behaviour and switch to a fallback configuration, specify +# --default +# +# Another script called "postswitch "can be placed in the directory +# ~/.autorandr as well as in all profile directories: The scripts are executed +# after a mode switch has taken place and can notify window managers or other +# applications about it. +# +# +# 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. XRANDR=/usr/bin/xrandr DISPER=/usr/bin/disper +XDPYINFO=/usr/bin/xdpyinfo PROFILES=~/.autorandr CONFIG=~/.autorandr.conf RESERVED_PROFILE_NAMES=`cat <&2 + FP_METHODS="setup_fp_disper" CURRENT_CFG_METHOD="current_cfg_disper" LOAD_METHOD="load_cfg_disper" fi @@ -88,21 +128,31 @@ setup_fp_sysfs_edid() { done } +setup_fp_disper() { + $DISPER -l | grep '^display ' +} + setup_fp() { - FINGERPRINT="" - for METHOD in $FP_METHODS; do - FINGERPRINT="$($METHOD)" - [ -n "$FINGERPRINT" ] && break + local FP=""; + for M in $FP_METHODS; do + FP="$($M)" + if [ -n "$FP" ]; then + break + fi done - if [ -z "$FINGERPRINT" ]; then - echo "Unable to fingerprint display configuration." >&2 - return 0 + if [ -z "$FP" ]; then + echo "Unable to fingerprint display configuration" >&2 + return fi echo "$FINGERPRINT" | sort } current_cfg_xrandr() { - $XRANDR -q | awk ' + local PRIMARY_SETUP=""; + if [ -x "$XDPYINFO" ]; then + PRIMARY_SETUP="$($XDPYINFO -ext XINERAMA | awk '/^ head #0:/ {printf $3 $5}')" + fi + $XRANDR -q | awk -v primary_setup="${PRIMARY_SETUP}" ' # display is connected and has a mode /^[^ ]+ connected [^(]/ { output=$1 @@ -114,6 +164,8 @@ current_cfg_xrandr() { } else { split($3, A, "+"); + if (A[1] A[2] "," A[3] == primary_setup) + print "primary"; } if (($4 == "left") || ($4 == "right")) { split(A[1], B, "x"); @@ -246,16 +298,20 @@ current_cfg() { } blocked() { - [ ! -x "$PROFILES/$1/block" ] && return 1 - "$PROFILES/$1/block" "$1" + local PROFILE="$1" + [ ! -x "$PROFILES/$PROFILE/block" ] && return 1 + + "$PROFILES/$PROFILE/block" "$PROFILE" } config_equal() { - if [ "$(cat "$PROFILES/$1/config")" = "$(current_cfg)" ]; then - echo "Config already loaded." >&2 + local PROFILE="$1" + if [ "$(cat "$PROFILES/$PROFILE/config")" = "$(current_cfg)" ]; then + echo "Config already loaded" return 0 + else + return 1 fi - return 1 } load_cfg_xrandr() { @@ -365,13 +421,12 @@ Usage: $SCRIPTNAME [options] To change this behaviour and switch to a fallback configuration, specify --default . - Another script called "postswitch" can be placed in the directory + Another script called "postswitch "can be placed in the directory ~/.autorandr as well as in any profile directories: The scripts are executed - after a mode switch has taken place and can notify window managers. The same - goes for "preswitch", which will be executed before a mode switch. + after a mode switch has taken place and can notify window managers. When called by the name "autodisper" or "auto-disper", the script uses "disper" - instead of "xrandr" to configure and save the display configuration. + instead of "xrandr" to detect, configure and save the display configuration. If xrandr is used, the following virtual configurations are available: ${RESERVED_PROFILE_NAMES} @@ -418,11 +473,11 @@ if [ -n "$LOAD_PROFILE" ]; then exit $? fi -for PROFILE_PATH in $PROFILES/*; do - PROFILE="$(basename "$PROFILE_PATH")" - SETUP_FILE="${PROFILE_PATH}/setup" - - [ -e $SETUP_FILE ] || continue +for SETUP_FILE in $PROFILES/*/setup; do + if ! [ -e $SETUP_FILE ]; then + break + fi + PROFILE="$(basename $(dirname "$SETUP_FILE"))" echo -n "$PROFILE" if blocked "$PROFILE"; then From 66ac3a852126c196aff8c2f2760587dba4a30c53 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 16 Jan 2015 08:22:11 +0100 Subject: [PATCH 55/58] xxd replacement for systems without xxd --- autorandr | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/autorandr b/autorandr index dd5cee3..ef4afac 100755 --- a/autorandr +++ b/autorandr @@ -99,6 +99,20 @@ if [ -f $CONFIG ]; then . $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 ' ORS=""; @@ -118,12 +132,11 @@ setup_fp_xrandr_edid() { } setup_fp_sysfs_edid() { - which xxd >/dev/null 2>&1 || return $XRANDR -q > /dev/null 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; }' + cat "${DEVICE}/edid" | xxd -c 256 -ps | awk 'ORS=""; /.+/ { print; }' echo done } @@ -144,7 +157,7 @@ setup_fp() { echo "Unable to fingerprint display configuration" >&2 return fi - echo "$FINGERPRINT" | sort + echo "$FP" | sort } current_cfg_xrandr() { From e66001b2759f8e0ccc64f352751dfe0c5192d6b1 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 16 Jan 2015 08:24:04 +0100 Subject: [PATCH 56/58] Adjusted license information See https://github.com/phillipberndt/autorandr/issues/7 and https://github.com/wertarbyte/autorandr/issues/24, where the original author wrote: > After a while, I finally got around to this - licence should be GPLv3, > so feel free to package :-) --- README.md | 16 ++++------------ autorandr | 6 ------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9401d37..0224271 100644 --- a/README.md +++ b/README.md @@ -5,23 +5,14 @@ Automatically select a display configuration based on connected devices ## Branch information The original [wertarbyte/autorandr](https://github.com/wertarbyte/autorandr) -tree seems unmaintained, with lots of open pull requests and issues. I forked +tree is unmaintained, with lots of open pull requests and issues. I forked it and merged what I thought were the most important changes. I will maintain this branch until @wertarbyte finds the time to maintain his branch again. ## License information and authors -Stefan Tomanek came up with and wrote the initial version of autorandr. He -currently does not maintain it, and did not express his opinion concerning an -OSS license in two independent requests. To resolve the licensing issue, all -non-trivial code in this fork has been reimplemented by various authors that -have agreed to release their code under the terms of the GNU General Public -License (version 3). - -This license will apply to versions of autorandr from this fork that are -committed after issue #7 has been resolved, and versions derived from that one. -**In particular, wertarbyte's original repository is still not OSS, and the current -version in this repository is neither.** +autorandr is available under the terms of the GNU General Public License +(version 3). Contributors to this version of autorandr are: @@ -30,6 +21,7 @@ Contributors to this version of autorandr are: * Maciej Sitarz * Matthew R Johnson * Phillip Berndt +* Stefan Tomanek * Timo Bingmann * Tomasz Bogdal * stormc diff --git a/autorandr b/autorandr index ef4afac..4831bfd 100755 --- a/autorandr +++ b/autorandr @@ -4,12 +4,6 @@ # # Copyright (c) 2013 Stefan Tomanek # -# -# -# THE FOLLOWING LICENCE AGREEMENT IS PRELIMINARY AND INVALID UNTIL ISSUE #7 AT -# https://github.com/phillipberndt/autorandr/issues/7 -# HAS BEEN RESOLVED! -# # 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 From c0b25211d9a4c5512ebc79f56e5703a12be208a1 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Fri, 16 Jan 2015 08:26:41 +0100 Subject: [PATCH 57/58] Prefer xrandr edid probing over sysfs To normalize the fingerprints, we have to fiddle a lot with the sysfs variant. The awk code is much simpler. In the long run I'd like to remove the sysfs code altogether. --- autorandr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorandr b/autorandr index 4831bfd..eace950 100755 --- a/autorandr +++ b/autorandr @@ -75,7 +75,7 @@ FORCE_LOAD=0 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" From 59f6aec0bb72e26751ce285d079e085b7178e45d Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Tue, 27 Jan 2015 08:10:12 +0100 Subject: [PATCH 58/58] Branch information updated --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0224271..eeac9f8 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,12 @@ tree is unmaintained, with lots of open pull requests and issues. I forked it and merged what I thought were the most important changes. I will maintain this branch until @wertarbyte finds the time to maintain his branch again. +This version is not currently under active development. If you experience any +issues, give the Python version a try: + + https://github.com/phillipberndt/autorandr + + ## License information and authors autorandr is available under the terms of the GNU General Public License