X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=ee559359100a6a47e4b235725dba0a3e5dda6d15;hb=586dce7ec54977b8a7cd1c38df7734fbd9a659c9;hp=5083c03c20486cb08e9ab7e459bb7a62403e5f96;hpb=198d8eb06e2dbd015e4d14932ff55a746861f5bb;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 5083c03..ee55935 100755 --- a/autorandr.py +++ b/autorandr.py @@ -4,7 +4,7 @@ # autorandr.py # Copyright (c) 2015, Phillip Berndt # -# Experimental autorandr rewrite in Python +# Autorandr rewrite in Python # # This script aims to be fully compatible with the original autorandr. # @@ -66,9 +66,10 @@ Usage: autorandr [options] 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 any profile directories: The scripts are executed - after a mode switch has taken place and can notify window managers. + Another script called "postswitch" can be placed in the directory + ~/.config/autorandr (or ~/.autorandr if you have an old installation) as well + as in any profile directories: The scripts are executed after a mode switch + has taken place and can notify window managers. The following virtual configurations are available: """.strip() @@ -93,9 +94,9 @@ class XrandrOutput(object): )? # .. but everything of the above only if the screen is in use. ).* (?:\s*(?: # Properties of the output - Gamma: (?P[0-9\.:\s]+) | # Gamma value - Transform: (?P[0-9\.\s]+) | # Transformation matrix - EDID: (?P[0-9a-f\s]+) | # EDID of the output + Gamma: (?P[0-9\.: ]+) | # Gamma value + Transform: (?P(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix + EDID: (?P\s*?(?:\\n\\t\\t[0-9a-f]+)+) | # EDID of the output (?![0-9])[^:\s][^:\n]+:.*(?:\s\\t[\\t ].+)* # Other properties ))+ \s* @@ -123,7 +124,7 @@ class XrandrOutput(object): "gamma": "1.0:1.0:1.0", } - XRANDR_DEFAULTS = dict(XRANDR_13_DEFAULTS.items() + XRANDR_12_DEFAULTS.items()) + XRANDR_DEFAULTS = dict(list(XRANDR_13_DEFAULTS.items()) + list(XRANDR_12_DEFAULTS.items())) def __repr__(self): return "<%s%s %s>" % (self.output, (" %s..%s" % (self.edid[:5], self.edid[-5:])) if self.edid else "", " ".join(self.option_vector)) @@ -185,6 +186,7 @@ class XrandrOutput(object): This method also returns a list of modes supported by the output. """ try: + xrandr_output = xrandr_output.replace("\r\n", "\n") match_object = re.search(XrandrOutput.XRANDR_OUTPUT_REGEXP, xrandr_output) except: raise RuntimeError("Parsing XRandR output failed, there is an error in the regular expression.") @@ -193,9 +195,8 @@ class XrandrOutput(object): raise RuntimeError("Parsing XRandR output failed, the regular expression did not match: %s" % debug) remainder = xrandr_output[len(match_object.group(0)):] if remainder: - raise RuntimeError(("Parsing XRandR output failed, %d bytes left unmatched after regular expression," - "starting with ..'%s'.") % (len(remainder), remainder[:10])) - + raise RuntimeError(("Parsing XRandR output failed, %d bytes left unmatched after regular expression, " + "starting at byte %d with ..'%s'.") % (len(remainder), len(len(match_object.group(0))), remainder[:10])) match = match_object.groupdict() @@ -421,18 +422,29 @@ def apply_configuration(configuration, dry_run=False): # Disable all unused outputs argv = base_argv[:] + disable_argv = [] for output in outputs: if not configuration[output].edid or "off" in configuration[output].options: - argv += configuration[output].option_vector - if argv != base_argv: - if subprocess.call(argv) != 0: - return False + disable_argv += configuration[output].option_vector + if disable_argv: + if subprocess.call(base_argv + disable_argv) != 0: + # Disabling the outputs failed. Retry with the next command: + # Sometimes disabling of outputs fails due to an invalid RRSetScreenSize. + # This does not occur if simultaneously the primary screen is reset. + pass + else: + disable_argv = [] # Enable remaining outputs in pairs of two remaining_outputs = [ x for x in outputs if configuration[x].edid ] for index in range(0, len(remaining_outputs), 2): - if subprocess.call((base_argv[:] + configuration[remaining_outputs[index]].option_vector + (configuration[remaining_outputs[index + 1]].option_vector if index < len(remaining_outputs) - 1 else []))) != 0: - return False + argv = base_argv[:] + if disable_argv: + argv += disable_argv + disable_argv = [] + argv += configuration[remaining_outputs[index]].option_vector + (configuration[remaining_outputs[index + 1]].option_vector if index < len(remaining_outputs) - 1 else []) + if subprocess.call(argv) != 0: + raise RuntimeError("Command failed: %s" % " ".join(argv)) def add_unused_outputs(source_configuration, target_configuration): "Add outputs that are missing in target to target, in 'off' state" @@ -496,15 +508,21 @@ def main(argv): print(str(e)) options = { "--help": True } - profile_path = os.path.expanduser("~/.autorandr") - + profiles = {} try: - profiles = load_profiles(profile_path) - except OSError as e: - if e.errno == 2: # No such file or directory - profiles = {} - else: - raise e + # Load profiles from each XDG config directory + for directory in os.environ.get("XDG_CONFIG_DIRS", "").split(":"): + system_profile_path = os.path.join(directory, "autorandr") + if os.path.isdir(system_profile_path): + profiles.update(load_profiles(system_profile_path)) + # For the user's profiles, prefer the legacy ~/.autorandr if it already exists + # profile_path is also used later on to store configurations + profile_path = os.path.expanduser("~/.autorandr") + if not os.path.isdir(profile_path): + # Elsewise, follow the XDG specification + profile_path = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "autorandr") + if os.path.isdir(profile_path): + profiles.update(load_profiles(profile_path)) except Exception as e: print("Failed to load profiles:\n%s" % str(e), file=sys.stderr) sys.exit(1) @@ -550,14 +568,14 @@ def main(argv): else: for profile_name in profiles.keys(): if profile_blocked(os.path.join(profile_path, profile_name)): - print("%s (blocked)" % profile_name) + print("%s (blocked)" % profile_name, file=sys.stderr) continue if detected_profile == profile_name: - print("%s (detected)" % profile_name) + print("%s (detected)" % profile_name, file=sys.stderr) if "-c" in options or "--change" in options: load_profile = detected_profile else: - print(profile_name) + print(profile_name, file=sys.stderr) if "-d" in options: options["--default"] = options["-d"] @@ -574,8 +592,8 @@ def main(argv): print("Failed to load profile '%s':\nProfile not found" % load_profile, file=sys.stderr) sys.exit(1) add_unused_outputs(config, profile) - if profile == config and not "-f" in options and not "--force" in options: - print("Config already loaded") + if profile == dict(config) and not "-f" in options and not "--force" in options: + print("Config already loaded", file=sys.stderr) sys.exit(0) try: