X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=0c1c942b7392f6bdb7b219ba1eb8342082e038a8;hb=d3f9f80ed0076fff6311ca09cb0b494c836b5081;hp=f14f5ab536152f60109e47524d092f673e0ba753;hpb=6511bf29f9a8c3082d5bbdccaf5fa8ad3de0214d;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index f14f5ab..0c1c942 100755 --- a/autorandr.py +++ b/autorandr.py @@ -48,7 +48,7 @@ if sys.version_info.major == 2: else: import configparser -__version__ = "1.5" +__version__ = "1.8.1" try: input = raw_input @@ -140,7 +140,7 @@ class XrandrOutput(object): # This regular expression is used to parse an output in `xrandr --verbose' XRANDR_OUTPUT_REGEXP = """(?x) - ^(?P[^ ]+)\s+ # Line starts with output name + ^\s*(?P\S[^ ]*)\s+ # Line starts with output name (?: # Differentiate disconnected and connected disconnected | # in first line unknown\ connection | @@ -161,6 +161,7 @@ class XrandrOutput(object): (?:[\ \t]*border\ (?P(?:[0-9]+/){3}[0-9]+))? # Border information (?:\s*(?: # Properties of the output Gamma: (?P(?:inf|[0-9\.: e])+) | # Gamma value + CRTC:\s*(?P[0-9]) | # CRTC 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 @@ -317,6 +318,12 @@ class XrandrOutput(object): else: edid = "%s-%s" % (XrandrOutput.EDID_UNAVAILABLE, match["output"]) + # An output can be disconnected but still have a mode configured. This can only happen + # as a residual situation after a disconnect, you cannot associate a mode with an disconnected + # output. + # + # This code needs to be careful not to mix the two. An output should only be configured to + # "off" if it doesn't have a mode associated with it, which is modelled as "not a width" here. if not match["width"]: options["off"] = None else: @@ -326,10 +333,11 @@ class XrandrOutput(object): options["mode"] = "%sx%s" % (match["mode_width"], match["mode_height"]) else: if match["rotate"] not in ("left", "right"): - options["mode"] = "%sx%s" % (match["width"], match["height"]) + options["mode"] = "%sx%s" % (match["width"] or 0, match["height"] or 0) else: - options["mode"] = "%sx%s" % (match["height"], match["width"]) - options["rotate"] = match["rotate"] + options["mode"] = "%sx%s" % (match["height"] or 0, match["width"] or 0) + if match["rotate"]: + options["rotate"] = match["rotate"] if match["primary"]: options["primary"] = None if match["reflect"] == "X": @@ -338,7 +346,8 @@ class XrandrOutput(object): options["reflect"] = "y" elif match["reflect"] == "X and Y": options["reflect"] = "xy" - options["pos"] = "%sx%s" % (match["x"], match["y"]) + if match["x"] or match["y"]: + options["pos"] = "%sx%s" % (match["x"] or "0", match["y"] or "0") if match["panning"]: panning = [match["panning"]] if match["tracking"]: @@ -362,6 +371,8 @@ class XrandrOutput(object): # so we approximate by 1e-10. gamma = ":".join([str(max(1e-10, round(1. / float(x), 3))) for x in gamma.split(":")]) options["gamma"] = gamma + if match["crtc"]: + options["crtc"] = match["crtc"] if match["rate"]: options["rate"] = match["rate"] @@ -571,6 +582,17 @@ def profile_blocked(profile_path, meta_information=None): return not exec_scripts(profile_path, "block", meta_information) +def check_configuration_pre_save(configuration): + "Check that a configuration is safe for saving." + outputs = sorted(configuration.keys(), key=lambda x: configuration[x].sort_key) + for output in outputs: + if "off" not in configuration[output].options and not configuration[output].edid: + return ("`%(o)s' is not off (has a mode configured) but is disconnected (does not have an EDID).\n" + "This typically means that it has been recently unplugged and then not properly disabled\n" + "by the user. Please disable it (e.g. using `xrandr --output %(o)s --off`) and then rerun\n" + "this command.") % {"o": output} + + def output_configuration(configuration, config): "Write a configuration file" outputs = sorted(configuration.keys(), key=lambda x: configuration[x].sort_key) @@ -638,13 +660,17 @@ def get_fb_dimensions(configuration): if "off" in output.options or not output.edid: continue # This won't work with all modes -- but it's a best effort. - o_width, o_height = map(int, output.options["mode"].split("x")) + o_mode = re.search("[0-9]{3,}x[0-9]{3,}", output.options["mode"]).group(0) + o_width, o_height = map(int, o_mode.split("x")) if "transform" in output.options: a, b, c, d, e, f, g, h, i = map(float, output.options["transform"].split(",")) w = (g * o_width + h * o_height + i) x = (a * o_width + b * o_height + c) / w y = (d * o_width + e * o_height + f) / w o_width, o_height = x, y + if "rotate" in output.options: + if output.options["rotate"] in ("left", "right"): + o_width, o_height = o_height, o_width if "pos" in output.options: o_left, o_top = map(int, output.options["pos"].split("x")) o_width += o_left @@ -652,9 +678,9 @@ def get_fb_dimensions(configuration): if "panning" in output.options: match = re.match("(?P[0-9]+)x(?P[0-9]+)(?:\+(?P[0-9]+))?(?:\+(?P[0-9]+))?.*", output.options["panning"]) if match: - detail = match.groupdict() - o_width = int(detail.get("w")) + int(detail.get("x", "0")) - o_height = int(detail.get("h")) + int(detail.get("y", "0")) + detail = match.groupdict(default="0") + o_width = int(detail.get("w")) + int(detail.get("x")) + o_height = int(detail.get("h")) + int(detail.get("y")) width = max(width, o_width) height = max(height, o_height) return int(width), int(height) @@ -703,6 +729,9 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) if not new_configuration[output].edid or "off" in new_configuration[output].options: disable_outputs.append(new_configuration[output].option_vector) else: + if output not in current_configuration: + raise AutorandrException("New profile configures output %s which does not exist in current xrandr --verbose output. " + "Don't know how to proceed." % output) if "off" not in current_configuration[output].options: remain_active_count += 1 @@ -755,10 +784,24 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) def is_equal_configuration(source_configuration, target_configuration): - "Check if all outputs from target are already configured correctly in source" + """ + Check if all outputs from target are already configured correctly in source and + that no other outputs are active. + """ for output in target_configuration.keys(): - if (output not in source_configuration) or (source_configuration[output] != target_configuration[output]): - return False + if "off" in target_configuration[output].options: + if (output in source_configuration and "off" not in source_configuration[output].options): + return False + else: + if (output not in source_configuration) or (source_configuration[output] != target_configuration[output]): + return False + for output in source_configuration.keys(): + if "off" in source_configuration[output].options: + if output in target_configuration and "off" not in target_configuration[output].options: + return False + else: + if output not in target_configuration: + return False return True @@ -1059,6 +1102,15 @@ def dispatch_call_to_sessions(argv): X11_displays_done.add(display) +def enabled_monitors(config): + monitors = [] + for monitor in config: + if "--off" in config[monitor].option_vector: + continue + monitors.append(monitor) + return monitors + + def read_config(options, directory): """Parse a configuration config.ini from directory and merge it into the options dictionary""" @@ -1158,13 +1210,18 @@ def main(argv): if options["--save"] in (x[0] for x in virtual_profiles): raise AutorandrException("Cannot save current configuration as profile '%s':\n" "This configuration name is a reserved virtual configuration." % options["--save"]) + error = check_configuration_pre_save(config) + if error: + print("Cannot save current configuration as profile '%s':" % options["--save"]) + print(error) + sys.exit(1) try: profile_folder = os.path.join(profile_path, options["--save"]) save_configuration(profile_folder, config) exec_scripts(profile_folder, "postsave", { "CURRENT_PROFILE": options["--save"], "PROFILE_FOLDER": profile_folder, - "MONITORS": ":".join(config.keys()), + "MONITORS": ":".join(enabled_monitors(config)), }) except Exception as e: raise AutorandrException("Failed to save current configuration as profile '%s'" % (options["--save"],), e) @@ -1285,7 +1342,7 @@ def main(argv): script_metadata = { "CURRENT_PROFILE": load_profile, "PROFILE_FOLDER": scripts_path, - "MONITORS": ":".join(load_config.keys()), + "MONITORS": ":".join(enabled_monitors(load_config)), } exec_scripts(scripts_path, "preswitch", script_metadata) if "--debug" in options: