From: Phillip Berndt Date: Mon, 2 Dec 2013 09:50:40 +0000 (+0100) Subject: Merge remote-tracking branch 'queezythegreat/master' X-Git-Tag: 1.0~149 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43bb98c613862cdf8cb81a49a03b30f70c706816;hp=2509ac3b83b4b4ee16c4a4af34b0138a2c95a3c6;p=deb_pkgs%2Fautorandr.git Merge remote-tracking branch 'queezythegreat/master' Conflicts: Makefile --- diff --git a/Makefile b/Makefile index 49d598e..a22a058 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,14 @@ +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 -m 775 autorandr /usr/bin/ - install -m 775 autorandr_monitor /usr/bin/ + install auto-disper ${INSTALL_PATH} + install -m 755 autorandr ${INSTALL_PATH} 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/99zautorandr - #install -m 644 pm-utils/40autorandr /etc/pm/power.d/ + +hotplug: + 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 diff --git a/README b/README deleted file mode 100644 index 9b54600..0000000 --- a/README +++ /dev/null @@ -1,46 +0,0 @@ -Tool: "autorandr" - -Automatically select a display configuration based on connected devices - -Stefan Tomanek - -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. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..619a992 --- /dev/null +++ b/README.md @@ -0,0 +1,73 @@ +# autorandr + +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. + + +## 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](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. + +To install autorandr call `make install`, define your setup and then call +`make hotplug` to install hotplug scripts. + +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` diff --git a/Xsession.d/autorandr b/Xsession.d/autorandr deleted file mode 100644 index d0b568a..0000000 --- a/Xsession.d/autorandr +++ /dev/null @@ -1,3 +0,0 @@ -# -*- sh -*- - -/usr/bin/autorandr_monitor &> /tmp/autorandr_monitor & diff --git a/autorandr b/autorandr index c2c3384..0872536 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 @@ -167,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() { diff --git a/autorandr_monitor b/autorandr_monitor deleted file mode 100755 index 6f369bb..0000000 --- a/autorandr_monitor +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 - -#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 - - 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) - -def main(): - # pyinotify.log.setLevel(10) - manager = pyinotify.WatchManager() - handler = VideoOutputMonitor() - notifier = pyinotify.Notifier(manager, default_proc_fun=handler) - - register_video_cards(manager) - - notifier.loop() - -if __name__ == '__main__': - main() 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 --*) diff --git a/contrib/autorandr_monitor/Xsession.d/autorandr b/contrib/autorandr_monitor/Xsession.d/autorandr new file mode 100644 index 0000000..d0b568a --- /dev/null +++ b/contrib/autorandr_monitor/Xsession.d/autorandr @@ -0,0 +1,3 @@ +# -*- sh -*- + +/usr/bin/autorandr_monitor &> /tmp/autorandr_monitor & diff --git a/contrib/autorandr_monitor/autorandr_monitor b/contrib/autorandr_monitor/autorandr_monitor new file mode 100755 index 0000000..6f369bb --- /dev/null +++ b/contrib/autorandr_monitor/autorandr_monitor @@ -0,0 +1,53 @@ +#!/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 + +#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 + + 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) + +def main(): + # pyinotify.log.setLevel(10) + manager = pyinotify.WatchManager() + handler = VideoOutputMonitor() + notifier = pyinotify.Notifier(manager, default_proc_fun=handler) + + register_video_cards(manager) + + notifier.loop() + +if __name__ == '__main__': + main() 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..74549fc 100755 --- a/pm-utils/40autorandr +++ b/pm-utils/40autorandr @@ -1,15 +1,26 @@ #!/bin/sh # # 40autorandr: Change autorandr profile on thaw/resume +exec > /var/log/autorandr.log 2>&1 -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 --default default" + ;; + *) + AUTORANDR="autorandr -c --default default" + ;; +esac 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}' | head -1) if [ x"$user" != x"" ]; then + logger "autorandr: Changing display configuration for user '$user'" export DISPLAY=":$D" /bin/su -c "${AUTORANDR}" "$user" fi 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"