X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=ee559359100a6a47e4b235725dba0a3e5dda6d15;hb=586dce7ec54977b8a7cd1c38df7734fbd9a659c9;hp=1225491d9fc492923159a817d7b026ee142a11bc;hpb=9659f92d653c79a14edd6bcd967cc1e3028c1d15;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 1225491..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() @@ -83,22 +84,25 @@ class XrandrOutput(object): disconnected | unknown\ connection | (?Pconnected)\s+ # If connected: + (?: (?Pprimary\ )? # Might be primary screen - (?P[0-9]+)x(?P[0-9]+) # Resolution + (?P[0-9]+)x(?P[0-9]+) # Resolution (might be overridden below!) \+(?P[0-9]+)\+(?P[0-9]+)\s+ # Position (?:\(0x[0-9a-fA-F]+\)\s+)? # XID (?P(?:normal|left|right|inverted))\s+ # Rotation (?:(?PX\ and\ Y|X|Y)\ axis)? # Reflection + )? # .. 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* (?P(?: - [0-9]+x[0-9]+.+?\*current.+\s+h:.+\s+v:.+clock\s+(?P[0-9\.]+)Hz\s* | # Interesting (current) resolution: Extract rate + (?P[0-9]+)x(?P[0-9]+).+?\*current.+\s+ + h:.+\s+v:.+clock\s+(?P[0-9\.]+)Hz\s* | # Interesting (current) resolution: Extract rate [0-9]+x[0-9]+.+\s+h:.+\s+v:.+\s* # Other resolutions )*) """ @@ -110,6 +114,18 @@ class XrandrOutput(object): \s+v:.+clock\s+(?P[0-9\.]+)Hz """ + XRANDR_13_DEFAULTS = { + "transform": "1,0,0,0,1,0,0,0,1", + } + + XRANDR_12_DEFAULTS = { + "reflect": "normal", + "rotate": "normal", + "gamma": "1.0:1.0:1.0", + } + + 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)) @@ -120,15 +136,9 @@ class XrandrOutput(object): return self.options options = {} if xrandr_version() >= Version("1.3"): - options.update({ - "transform": "1,0,0,0,1,0,0,0,1", - }) + options.update(self.XRANDR_13_DEFAULTS) if xrandr_version() >= Version("1.2"): - options.update({ - "reflect": "normal", - "rotate": "normal", - "gamma": "1:1:1", - }) + options.update(self.XRANDR_12_DEFAULTS) options.update(self.options) return options @@ -158,6 +168,16 @@ class XrandrOutput(object): self.output = output self.edid = edid self.options = options + self.remove_default_option_values() + + def remove_default_option_values(self): + "Remove values from the options dictionary that are superflous" + if "off" in self.options and len(self.options.keys()) > 1: + self.options = { "off": None } + return + for option, default_value in self.XRANDR_DEFAULTS.items(): + if option in self.options and self.options[option] == default_value: + del self.options[option] @classmethod def from_xrandr_output(cls, xrandr_output): @@ -166,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.") @@ -174,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() @@ -190,29 +210,38 @@ class XrandrOutput(object): if not match["connected"]: options["off"] = None edid = None + elif not match["width"]: + options["off"] = None + edid = "".join(match["edid"].strip().split()) else: - if match["rotate"] not in ("left", "right"): - options["mode"] = "%sx%s" % (match["width"], match["height"]) + if match["mode_width"]: + options["mode"] = "%sx%s" % (match["mode_width"], match["mode_height"]) else: - options["mode"] = "%sx%s" % (match["height"], match["width"]) - if match["rotate"] != "normal": - options["rotate"] = match["rotate"] - if "reflect" in match: - if match["reflect"] == "X": - options["reflect"] = "x" - elif match["reflect"] == "Y": - options["reflect"] = "y" - elif match["reflect"] == "X and Y": - options["reflect"] = "xy" + if match["rotate"] not in ("left", "right"): + options["mode"] = "%sx%s" % (match["width"], match["height"]) + else: + options["mode"] = "%sx%s" % (match["height"], match["width"]) + options["rotate"] = match["rotate"] + if match["primary"]: + options["primary"] = None + if match["reflect"] == "X": + options["reflect"] = "x" + elif match["reflect"] == "Y": + options["reflect"] = "y" + elif match["reflect"] == "X and Y": + options["reflect"] = "xy" options["pos"] = "%sx%s" % (match["x"], match["y"]) if match["transform"]: transformation = ",".join(match["transform"].strip().split()) if transformation != "1.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,1.000000": options["transform"] = transformation + if not match["mode_width"]: + # TODO We'd need to apply the reverse transformation here. Let's see if someone complains, I doubt that this + # special case is actually required. + print("Warning: Output %s has a transformation applied. Could not determine correct mode!", file=sys.stderr) if match["gamma"]: gamma = match["gamma"].strip() - if gamma != "1.0:1.0:1.0": - options["gamma"] = gamma + options["gamma"] = gamma if match["rate"]: options["rate"] = match["rate"] edid = "".join(match["edid"].strip().split()) @@ -227,17 +256,20 @@ class XrandrOutput(object): if line: line = line.split(None, 1) options[line[0]] = line[1] if len(line) > 1 else None - if "off" in options: - edid = None + + edid = None + + if options["output"] in edid_map: + edid = edid_map[options["output"]] else: - if options["output"] in edid_map: - edid = edid_map[options["output"]] - else: - fuzzy_edid_map = [ re.sub("(card[0-9]+|-)", "", x) for x in edid_map.keys() ] - fuzzy_output = re.sub("(card[0-9]+|-)", "", options["output"]) - if fuzzy_output not in fuzzy_edid_map: - raise RuntimeError("Failed to find a corresponding output in config/setup for output `%s'" % options["output"]) + # This fuzzy matching is for legacy autorandr that used sysfs output names + fuzzy_edid_map = [ re.sub("(card[0-9]+|-)", "", x) for x in edid_map.keys() ] + fuzzy_output = re.sub("(card[0-9]+|-)", "", options["output"]) + if fuzzy_output in fuzzy_edid_map: edid = edid_map[list(edid_map.keys())[fuzzy_edid_map.index(fuzzy_output)]] + elif "off" not in options: + raise RuntimeError("Failed to find an EDID for output `%s' in setup file, required as `%s' is not off in config file." + % (options["output"], options["output"])) output = options["output"] del options["output"] @@ -253,14 +285,18 @@ class XrandrOutput(object): return self.edid == other.edid def __eq__(self, other): - return self.edid == other.edid and self.output == other.output and self.options == other.options + return self.edid_equals(other) and self.output == other.output and self.options == other.options def xrandr_version(): "Return the version of XRandR that this system uses" if getattr(xrandr_version, "version", False) is False: version_string = os.popen("xrandr -v").read() - version = re.search("xrandr program version\s+([0-9\.]+)", version_string).group(1) - xrandr_version.version = Version(version) + try: + version = re.search("xrandr program version\s+([0-9\.]+)", version_string).group(1) + xrandr_version.version = Version(version) + except AttributeError: + xrandr_version.version = Version("1.3.0") + return xrandr_version.version def debug_regexp(pattern, string): @@ -270,6 +306,8 @@ def debug_regexp(pattern, string): bounds = ( 0, len(string) ) while bounds[0] != bounds[1]: half = int((bounds[0] + bounds[1]) / 2) + if half == bounds[0]: + break bounds = (half, bounds[1]) if regex.search(pattern, string[:half], partial=True) else (bounds[0], half - 1) partial_length = bounds[0] return ("Regular expression matched until position " @@ -323,7 +361,7 @@ def load_profiles(profile_path): buffer.append(line) for output_name in list(config.keys()): - if "off" in config[output_name].options: + if config[output_name].edid is None: del config[output_name] profiles[profile] = config @@ -384,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: - argv += configuration[output].option_vector - if argv != base_argv: - if subprocess.call(argv) != 0: - return False + if not configuration[output].edid or "off" in configuration[output].options: + 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" @@ -459,10 +508,21 @@ def main(argv): print(str(e)) options = { "--help": True } - profile_path = os.path.expanduser("~/.autorandr") - + profiles = {} try: - profiles = load_profiles(profile_path) + # 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) @@ -508,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"] @@ -532,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: