X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=257f2f9c6d622fca517f2648fc38b54770cef5dc;hb=2f2e85c1edebf9b6d04fd7125b1134e620b65514;hp=9dea362b1baf7e94b7649a22f5a36bff7bf4097f;hpb=0bb7e07999cb8f54d25c3d5fce5a3d6ad17c6bb2;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 9dea362..257f2f9 100755 --- a/autorandr.py +++ b/autorandr.py @@ -83,16 +83,17 @@ class XrandrOutput(object): (?: # Differentiate disconnected and connected in first line disconnected | unknown\ connection | - (?Pconnected)\s+ # If connected: - (?: + (?Pconnected) + ) + (?:\s* (?Pprimary\ )? # Might be primary screen (?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. - ).* + )? # .. but everything of the above only if the screen is in use. + (?:[\ \t]*\(.+)? (?:\s*(?: # Properties of the output Gamma: (?P[0-9\.: ]+) | # Gamma value Transform: (?P(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix @@ -126,6 +127,8 @@ class XrandrOutput(object): XRANDR_DEFAULTS = dict(list(XRANDR_13_DEFAULTS.items()) + list(XRANDR_12_DEFAULTS.items())) + EDID_UNAVAILABLE = "--CONNECTED-BUT-EDID-UNAVAILABLE-" + 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)) @@ -156,6 +159,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")) @@ -208,11 +213,12 @@ class XrandrOutput(object): options = {} if not match["connected"]: - options["off"] = None edid = None - elif not match["width"]: + 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 - edid = "".join(match["edid"].strip().split()) else: if match["mode_width"]: options["mode"] = "%sx%s" % (match["mode_width"], match["mode_height"]) @@ -244,7 +250,6 @@ class XrandrOutput(object): options["gamma"] = gamma if match["rate"]: options["rate"] = match["rate"] - edid = "".join(match["edid"].strip().split()) return XrandrOutput(match["output"], edid, options), modes @@ -278,9 +283,9 @@ class XrandrOutput(object): def edid_equals(self, other): "Compare to another XrandrOutput's edid and on/off-state, taking legacy autorandr behaviour (md5sum'ing) into account" if self.edid and other.edid: - if len(self.edid) == 32 and len(other.edid) != 32: + if len(self.edid) == 32 and len(other.edid) != 32 and not other.edid.startswith(XrandrOutput.EDID_UNAVAILABLE): return hashlib.md5(binascii.unhexlify(other.edid)).hexdigest() == self.edid - if len(self.edid) != 32 and len(other.edid) == 32: + if len(self.edid) != 32 and len(other.edid) == 32 and not self.edid.startswith(XrandrOutput.EDID_UNAVAILABLE): return hashlib.md5(binascii.unhexlify(self.edid)).hexdigest() == other.edid return self.edid == other.edid @@ -390,7 +395,7 @@ def find_profiles(current_config, profiles): def profile_blocked(profile_path): "Check if a profile is blocked" - script = os.path.join(profile_path, "blocked") + script = os.path.join(profile_path, "block") if not os.access(script, os.X_OK | os.F_OK): return False return subprocess.call(script) == 0 @@ -425,9 +430,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: @@ -443,24 +448,48 @@ 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 + # one screen in the first call below. + if len(disable_outputs) > 0 and len(disable_outputs) % 2 == 0: + # In the context of a xrandr call that changes the display state, `--query' should do nothing + disable_outputs.insert(0, ['--query']) # Enable the remaining outputs in pairs of two operations operations = disable_outputs + enable_outputs @@ -635,10 +664,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)