(?: # Differentiate disconnected and connected in first line
disconnected |
unknown\ connection |
- (?P<connected>connected)\s+ # If connected:
- (?:
- (?P<primary>primary\ )? # Might be primary screen
+ (?P<connected>connected)
+ )
+ \s*
+ (?P<primary>primary\ )? # Might be primary screen
+ (?:\s* # The remainder of the first line only appears as one or not at all:
(?P<width>[0-9]+)x(?P<height>[0-9]+) # Resolution (might be overridden below!)
\+(?P<x>[0-9]+)\+(?P<y>[0-9]+)\s+ # Position
(?:\(0x[0-9a-fA-F]+\)\s+)? # XID
(?P<rotate>(?:normal|left|right|inverted))\s+ # Rotation
(?:(?P<reflect>X\ 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<gamma>[0-9\.: ]+) | # Gamma value
Transform: (?P<transform>(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix
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))
@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_with_defaults.items())], [])
+ return sum([["--%s" % option[0], option[1]] if option[1] else ["--%s" % option[0]] for option in chain((("output", self.output),), sorted(self.options_with_defaults.items()))], [])
@property
def option_string(self):
"Return the command line parameters in the configuration file format"
- return "\n".join([ " ".join(option) if option[1] else option[0] for option in chain((("output", self.output),), self.options.items())])
+ return "\n".join([ " ".join(option) if option[1] else option[0] for option in chain((("output", self.output),), sorted(self.options.items()))])
@property
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"))
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"])
options["gamma"] = gamma
if match["rate"]:
options["rate"] = match["rate"]
- edid = "".join(match["edid"].strip().split())
return XrandrOutput(match["output"], edid, options), modes
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
# Split at output boundaries and instanciate an XrandrOutput per output
split_xrandr_output = re.split("(?m)^([^ ]+ (?:(?:dis)?connected|unknown connection).*)$", xrandr_output)
+ if len(split_xrandr_output) < 2:
+ raise RuntimeError("No output boundaries found")
outputs = OrderedDict()
modes = OrderedDict()
for i in range(1, len(split_xrandr_output), 2):
if not os.path.isfile(config_name) or not os.path.isfile(setup_name):
continue
- edids = dict([ x.strip().split() for x in open(setup_name).readlines() ])
+ edids = dict([ x.strip().split() for x in open(setup_name).readlines() if x.strip() ])
config = {}
buffer = []
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
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:
base_argv = [ "xrandr" ]
- # Disable all unused outputs
- argv = base_argv[:]
- disable_argv = []
+ # There are several xrandr / driver bugs we need to take care of here:
+ # - We cannot enable more than two screens at the same time
+ # See https://github.com/phillipberndt/autorandr/pull/6
+ # and commits f4cce4d and 8429886.
+ # - We cannot disable all screens
+ # See https://github.com/phillipberndt/autorandr/pull/20
+ # - We should disable screens before enabling others, because there's
+ # 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_argv += configuration[output].option_vector
- if disable_argv:
- if subprocess.call(base_argv + disable_argv) != 0:
+ if not new_configuration[output].edid or "off" in new_configuration[output].options:
+ disable_outputs.append(new_configuration[output].option_vector)
+ else:
+ 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 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_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):
- 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 [])
+ 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
+ for index in range(0, len(operations), 2):
+ argv = base_argv + list(chain.from_iterable(operations[index:index+2]))
if subprocess.call(argv) != 0:
raise RuntimeError("Command failed: %s" % " ".join(argv))
if output_name not in target_configuration:
target_configuration[output_name] = XrandrOutput(output_name, output.edid, { "off": None })
+def remove_irrelevant_outputs(source_configuration, target_configuration):
+ "Remove outputs from target that ought to be 'off' and already are"
+ for output_name, output in source_configuration.items():
+ if "off" in output.options and output_name in target_configuration and "off" in target_configuration[output_name].options:
+ del target_configuration[output_name]
+
def generate_virtual_profile(configuration, modes, profile_name):
"Generate one of the virtual profiles"
configuration = copy.deepcopy(configuration)
if load_config == dict(config) and not "-f" in options and not "--force" in options:
print("Config already loaded", file=sys.stderr)
sys.exit(0)
+ remove_irrelevant_outputs(config, load_config)
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)
projects / deb_pkgs / autorandr.git / blobdiff