X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=9a677ab5c47a0cc691e0a473359d37f025a1f7df;hb=98cbc6fd179160430950f7fe768559e06645e0b7;hp=da5217bf5658f61d0855f97bffb40cdfd23551bd;hpb=89175899b5cd4bb129b2f16907a119b72e54fbc4;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index da5217b..9a677ab 100755 --- a/autorandr.py +++ b/autorandr.py @@ -83,16 +83,19 @@ class XrandrOutput(object): (?: # Differentiate disconnected and connected in first line disconnected | unknown\ connection | - (?Pconnected)\s+ # If connected: - (?: - (?Pprimary\ )? # Might be primary screen + (?Pconnected) + ) + \s* + (?Pprimary\ )? # Might be primary screen + (?:\s* (?P[0-9]+)x(?P[0-9]+) # Resolution (might be overridden below!) - \+(?P[0-9]+)\+(?P[0-9]+)\s+ # Position + \+(?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. - ).* + )? # .. but everything of the above only if the screen is in use. + (?:[\ \t]*\([^\)]+\))(?:\s*[0-9]+mm\sx\s[0-9]+mm)? + (?:[\ \t]*panning\ (?P[0-9]+x[0-9]+\+[0-9]+\+[0-9]+))? # Panning information (?:\s*(?: # Properties of the output Gamma: (?P[0-9\.: ]+) | # Gamma value Transform: (?P(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix @@ -116,6 +119,7 @@ class XrandrOutput(object): XRANDR_13_DEFAULTS = { "transform": "1,0,0,0,1,0,0,0,1", + "panning": "0x0", } XRANDR_12_DEFAULTS = { @@ -158,6 +162,8 @@ class XrandrOutput(object): def sort_key(self): "Return a key to sort the outputs for xrandr invocation" if not self.edid: + return -2 + if "off" in self.options: return -1 if "pos" in self.options: x, y = map(float, self.options["pos"].split("x")) @@ -210,11 +216,12 @@ class XrandrOutput(object): options = {} if not match["connected"]: - options["off"] = None edid = None - elif not match["width"]: - options["off"] = None + else: edid = "".join(match["edid"].strip().split()) if match["edid"] else "%s-%s" % (XrandrOutput.EDID_UNAVAILABLE, match["output"]) + + if not match["width"]: + options["off"] = None else: if match["mode_width"]: options["mode"] = "%sx%s" % (match["mode_width"], match["mode_height"]) @@ -233,6 +240,8 @@ class XrandrOutput(object): elif match["reflect"] == "X and Y": options["reflect"] = "xy" options["pos"] = "%sx%s" % (match["x"], match["y"]) + if match["panning"]: + options["panning"] = match["panning"] 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": @@ -246,7 +255,6 @@ class XrandrOutput(object): options["gamma"] = gamma if match["rate"]: options["rate"] = match["rate"] - edid = "".join(match["edid"].strip().split()) if match["edid"] else "%s-%s" % (XrandrOutput.EDID_UNAVAILABLE, match["output"]) return XrandrOutput(match["output"], edid, options), modes @@ -427,9 +435,9 @@ def update_mtime(filename): except: return False -def apply_configuration(configuration, dry_run=False): +def apply_configuration(new_configuration, current_configuration, dry_run=False): "Apply a configuration" - outputs = sorted(configuration.keys(), key=lambda x: configuration[x].sort_key) + outputs = sorted(new_configuration.keys(), key=lambda x: new_configuration[x].sort_key) if dry_run: base_argv = [ "echo", "xrandr" ] else: @@ -445,24 +453,41 @@ def apply_configuration(configuration, dry_run=False): # a limit on the number of enabled screens # - We must make sure that the screen at 0x0 is activated first, # or the other (first) screen to be activated would be moved there. + # - If an active screen already has a transformation and remains active, + # the xrandr call fails with an invalid RRSetScreenSize parameter error. + # Update the configuration in 3 passes in that case. (On Haswell graphics, + # at least.) + auxiliary_changes_pre = [] disable_outputs = [] enable_outputs = [] + remain_active_count = 0 for output in outputs: - if not configuration[output].edid or "off" in configuration[output].options: - disable_outputs.append(configuration[output].option_vector) + if not new_configuration[output].edid or "off" in new_configuration[output].options: + disable_outputs.append(new_configuration[output].option_vector) else: - enable_outputs.append(configuration[output].option_vector) + if "off" not in current_configuration[output].options: + remain_active_count += 1 + enable_outputs.append(new_configuration[output].option_vector) + if xrandr_version() >= Version("1.3.0") and "transform" in current_configuration[output].options: + auxiliary_changes_pre.append(["--output", output, "--transform", "none"]) + + # Perform pe-change auxiliary changes + if auxiliary_changes_pre: + argv = base_argv + list(chain.from_iterable(auxiliary_changes_pre)) + if subprocess.call(argv) != 0: + raise RuntimeError("Command failed: %s" % " ".join(argv)) - # Disable all but the last of the outputs to be disabled - if len(disable_outputs) > 1: - if subprocess.call(base_argv + list(chain.from_iterable(disable_outputs[:-1]))) != 0: + # Disable unused outputs, but make sure that there always is at least one active screen + disable_keep = 0 if remain_active_count else 1 + if len(disable_outputs) > disable_keep: + if subprocess.call(base_argv + list(chain.from_iterable(disable_outputs[:-1] if disable_keep else disable_outputs))) != 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_outputs = disable_outputs[-1:] + disable_outputs = disable_outputs[-1:] if disable_keep else [] # If disable_outputs still has more than one output in it, one of the xrandr-calls below would # disable the last two screens. This is a problem, so if this would happen, instead disable only @@ -644,10 +669,10 @@ def main(argv): try: if "--dry-run" in options: - apply_configuration(load_config, True) + apply_configuration(load_config, config, True) else: exec_scripts(scripts_path, "preswitch") - apply_configuration(load_config, False) + apply_configuration(load_config, config, False) exec_scripts(scripts_path, "postswitch") except Exception as e: print("Failed to apply profile '%s':\n%s" % (load_profile, str(e)), file=sys.stderr)