X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=72f48b89059721689e2cf37349176764c5dc17bf;hb=ccfb4f9bafc9685c4c755b744a277107ea814972;hp=ce6856a0830a254449857003145041cb8dd62663;hpb=12f7af1a7ae9d0fe86d7615ab1390b838c5d2178;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index ce6856a..72f48b8 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. # @@ -32,6 +32,7 @@ import os import re import subprocess import sys +from distutils.version import LooseVersion as Version from itertools import chain from collections import OrderedDict @@ -82,12 +83,14 @@ 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 @@ -97,7 +100,8 @@ class XrandrOutput(object): ))+ \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 )*) """ @@ -109,13 +113,38 @@ 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)) + @property + def options_with_defaults(self): + "Return the options dictionary, augmented with the default values that weren't set" + if "off" in self.options: + return self.options + options = {} + if xrandr_version() >= Version("1.3"): + options.update(self.XRANDR_13_DEFAULTS) + if xrandr_version() >= Version("1.2"): + options.update(self.XRANDR_12_DEFAULTS) + options.update(self.options) + return options + @property def option_vector(self): "Return the command line parameters for XRandR for this instance" - return sum([["--%s" % option[0], option[1]] if option[1] else ["--%s" % option[0]] for option in chain((("output", self.output),), self.options.items())], []) + return sum([["--%s" % option[0], option[1]] if option[1] else ["--%s" % option[0]] for option in chain((("output", self.output),), self.options_with_defaults.items())], []) @property def option_string(self): @@ -138,6 +167,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): @@ -170,31 +209,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"] 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"] - options["reflect"] = "normal" - 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["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 - else: - options["transform"] = "none" + 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()) @@ -209,17 +255,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"] @@ -235,7 +284,19 @@ 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() + 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): "Use the partial matching functionality of the regex module to display debug info on a non-matching regular expression" @@ -244,6 +305,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 " @@ -296,6 +359,10 @@ def load_profiles(profile_path): else: buffer.append(line) + for output_name in list(config.keys()): + if config[output_name].edid is None: + del config[output_name] + profiles[profile] = config return profiles @@ -355,10 +422,11 @@ def apply_configuration(configuration, dry_run=False): # Disable all unused outputs argv = base_argv[:] for output in outputs: - if not configuration[output].edid: + if not configuration[output].edid or "off" in configuration[output].options: argv += configuration[output].option_vector - if subprocess.call(argv) != 0: - return False + if argv != base_argv: + if subprocess.call(argv) != 0: + return False # Enable remaining outputs in pairs of two remaining_outputs = [ x for x in outputs if configuration[x].edid ] @@ -366,6 +434,12 @@ def apply_configuration(configuration, dry_run=False): 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 +def add_unused_outputs(source_configuration, target_configuration): + "Add outputs that are missing in target to target, in 'off' state" + for output_name, output in source_configuration.items(): + if output_name not in target_configuration: + target_configuration[output_name] = XrandrOutput(output_name, output.edid, { "off": None }) + def generate_virtual_profile(configuration, modes, profile_name): "Generate one of the virtual profiles" configuration = copy.deepcopy(configuration) @@ -416,19 +490,28 @@ def exec_scripts(profile_path, script_name): subprocess.call(script) def main(argv): - options = dict(getopt.getopt(argv[1:], "s:l:d:cfh", [ "dry-run", "change", "default=", "save=", "load=", "force", "fingerprint", "config", "help" ])[0]) + try: + options = dict(getopt.getopt(argv[1:], "s:l:d:cfh", [ "dry-run", "change", "default=", "save=", "load=", "force", "fingerprint", "config", "help" ])[0]) + except getopt.GetoptError as e: + print(str(e)) + options = { "--help": True } profile_path = os.path.expanduser("~/.autorandr") try: profiles = load_profiles(profile_path) - except Exception, e: + except OSError as e: + if e.errno == 2: # No such file or directory + profiles = {} + else: + raise e + except Exception as e: print("Failed to load profiles:\n%s" % str(e), file=sys.stderr) sys.exit(1) try: config, modes = parse_xrandr_output() - except Exception, e: + except Exception as e: print("Failed to parse current configuration from XRandR:\n%s" % str(e), file=sys.stderr) sys.exit(1) @@ -448,7 +531,7 @@ def main(argv): sys.exit(1) try: save_configuration(os.path.join(profile_path, options["--save"]), config) - except Exception, e: + except Exception as e: print("Failed to save current configuration as profile '%s':\n%s" % (options["--save"], str(e)), file=sys.stderr) sys.exit(1) print("Saved current configuration as profile '%s'" % options["--save"]) @@ -467,14 +550,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"] @@ -485,9 +568,14 @@ def main(argv): if load_profile in ( x[0] for x in virtual_profiles ): profile = generate_virtual_profile(config, modes, load_profile) else: - profile = profiles[load_profile] - if profile == config and not "-f" in options and not "--force" in options: - print("Config already loaded") + try: + profile = profiles[load_profile] + except KeyError: + print("Failed to load profile '%s':\nProfile not found" % load_profile, file=sys.stderr) + sys.exit(1) + add_unused_outputs(config, profile) + 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: @@ -495,9 +583,9 @@ def main(argv): apply_configuration(profile, True) else: exec_scripts(os.path.join(profile_path, load_profile), "preswitch") - apply_configuration(profile, True) + apply_configuration(profile, False) exec_scripts(os.path.join(profile_path, load_profile), "postswitch") - except Exception, e: + except Exception as e: print("Failed to apply profile '%s':\n%s" % (load_profile, str(e)), file=sys.stderr) sys.exit(1) @@ -506,6 +594,6 @@ def main(argv): if __name__ == '__main__': try: main(sys.argv) - except Exception, e: + except Exception as e: print("General failure. Please report this as a bug:\n%s" % (str(e),), file=sys.stderr) sys.exit(1)