X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=c2fdb9ad08f300a259a8832fe30cd55bde62ce71;hb=dcb1e65fd14e96c32d9fc1bc2e1ab0c0f8efd220;hp=5a0dd89bd373665d918a8b6387ee03fc6c1164f5;hpb=a79eb293b74d11dba714cb59412a70a345b42342;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 5a0dd89..c2fdb9a 100755 --- a/autorandr.py +++ b/autorandr.py @@ -23,22 +23,21 @@ # from __future__ import print_function -import copy -import getopt import binascii +import copy +import getopt import hashlib import os +import posix import re import subprocess import sys -from distutils.version import LooseVersion as Version +from collections import OrderedDict +from distutils.version import LooseVersion as Version from functools import reduce from itertools import chain -from collections import OrderedDict - -import posix virtual_profiles = [ @@ -62,6 +61,7 @@ Usage: autorandr [options] --fingerprint fingerprint your current hardware setup --config dump your current xrandr setup --dry-run don't change anything, only print the xrandr commands +--debug enable verbose output To prevent a profile from being loaded, place a script call "block" in its directory. The script is evaluated before the screen setup is inspected, and @@ -171,7 +171,11 @@ class XrandrOutput(object): 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)) + return "<%s%s %s>" % (self.output, self.short_edid, " ".join(self.option_vector)) + + @property + def short_edid(self): + return ("%s..%s" % (self.edid[:5], self.edid[-5:])) if self.edid else "" @property def options_with_defaults(self): @@ -358,6 +362,27 @@ class XrandrOutput(object): def __eq__(self, other): return self.edid_equals(other) and self.output == other.output and self.filtered_options == other.filtered_options + def verbose_diff(self, other): + "Compare to another XrandrOutput and return a list of human readable differences" + diffs = [] + if not self.edid_equals(other): + diffs.append("EDID `%s' differs from `%s'" % (self.short_edid, other.short_edid)) + if self.output != other.output: + diffs.append("Output name `%s' differs from `%s'" % (self.output, other.output)) + if "off" in self.options and "off" not in other.options: + diffs.append("The output is disabled currently, but active in the new configuration") + elif "off" in other.options and "off" not in self.options: + diffs.append("The output is currently enabled, but inactive in the new configuration") + else: + for name in set(chain.from_iterable((self.options.keys(), other.options.keys()))): + if name not in other.options: + diffs.append("Option --%s %sis not present in the new configuration" % (name, "(= `%s') " % self.options[name] if self.options[name] else "")) + elif name not in self.options: + diffs.append("Option --%s (`%s' in the new configuration) is not present currently" % (name, other.options[name])) + elif self.options[name] != other.options[name]: + diffs.append("Option --%s %sis `%s' in the new configuration" % (name, "(= `%s') " % self.options[name] if self.options[name] else "", other.options[name])) + return diffs + def xrandr_version(): "Return the version of XRandR that this system uses" if getattr(xrandr_version, "version", False) is False: @@ -518,6 +543,8 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) # the xrandr call fails with an invalid RRSetScreenSize parameter error. # Update the configuration in 3 passes in that case. (On Haswell graphics, # at least.) + # - Some implementations can not handle --transform at all, so avoid it unless + # necessary. (See https://github.com/phillipberndt/autorandr/issues/37) auxiliary_changes_pre = [] disable_outputs = [] @@ -529,9 +556,20 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) 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"]) + + option_vector = new_configuration[output].option_vector + if xrandr_version() >= Version("1.3.0"): + if "transform" in current_configuration[output].options: + auxiliary_changes_pre.append(["--output", output, "--transform", "none"]) + else: + try: + transform_index = option_vector.index("--transform") + if option_vector[transform_index+1] == XrandrOutput.XRANDR_DEFAULTS["transform"]: + option_vector = option_vector[:transform_index] + option_vector[transform_index+2:] + except ValueError: + pass + + enable_outputs.append(option_vector) # Perform pe-change auxiliary changes if auxiliary_changes_pre: @@ -587,13 +625,13 @@ def generate_virtual_profile(configuration, modes, profile_name): "Generate one of the virtual profiles" configuration = copy.deepcopy(configuration) if profile_name == "common": - common_resolution = [ set(( ( mode["width"], mode["height"] ) for mode in output )) for output in modes.values() ] + common_resolution = [ set(( ( mode["width"], mode["height"] ) for mode in output_modes )) for output, output_modes in modes.items() if configuration[output].edid ] common_resolution = reduce(lambda a, b: a & b, common_resolution[1:], common_resolution[0]) common_resolution = sorted(common_resolution, key=lambda a: int(a[0])*int(a[1])) if common_resolution: for output in configuration: configuration[output].options = {} - if output in modes: + if output in modes and configuration[output].edid: configuration[output].options["mode"] = [ x["name"] for x in sorted(modes[output], key=lambda x: 0 if x["preferred"] else 1) if x["width"] == common_resolution[-1][0] and x["height"] == common_resolution[-1][1] ][0] configuration[output].options["pos"] = "0x0" else: @@ -609,7 +647,7 @@ def generate_virtual_profile(configuration, modes, profile_name): for output in configuration: configuration[output].options = {} - if output in modes: + if output in modes and configuration[output].edid: mode = sorted(modes[output], key=lambda a: int(a["width"])*int(a["height"]) + (10**6 if a["preferred"] else 0))[-1] configuration[output].options["mode"] = mode["name"] configuration[output].options["rate"] = mode["rate"] @@ -619,6 +657,23 @@ def generate_virtual_profile(configuration, modes, profile_name): configuration[output].options["off"] = None return configuration +def print_profile_differences(one, another): + "Print the differences between two profiles for debugging" + if one == another: + return + print("| Differences between the two profiles:", file=sys.stderr) + for output in set(chain.from_iterable((one.keys(), another.keys()))): + if output not in one: + if "off" not in another[output].options: + print("| Output `%s' is missing from the active configuration" % output, file=sys.stderr) + elif output not in another: + if "off" not in one[output].options: + print("| Output `%s' is missing from the new configuration" % output, file=sys.stderr) + else: + for line in one[output].verbose_diff(another[output]): + print("| [Output %s] %s" % (output, line), file=sys.stderr) + print ("\\-", file=sys.stderr) + def exit_help(): "Print help and exit" print(help_text) @@ -634,7 +689,7 @@ def exec_scripts(profile_path, script_name): def main(argv): try: - options = dict(getopt.getopt(argv[1:], "s:l:d:cfh", [ "dry-run", "change", "default=", "save=", "load=", "force", "fingerprint", "config", "skip-options=", "help" ])[0]) + options = dict(getopt.getopt(argv[1:], "s:l:d:cfh", [ "dry-run", "change", "default=", "save=", "load=", "force", "fingerprint", "config", "debug", "skip-options=", "help" ])[0]) except getopt.GetoptError as e: print("Failed to parse options: {0}.\n" "Use --help to get usage information.".format(str(e)), @@ -711,9 +766,12 @@ def main(argv): props.append("(detected)") if ("-c" in options or "--change" in options) and not load_profile: load_profile = profile_name - if is_equal_configuration(config, profiles[profile_name]["config"]): + configs_are_equal = is_equal_configuration(config, profiles[profile_name]["config"]) + if configs_are_equal: props.append("(current)") print("%s%s%s" % (profile_name, " " if props else "", " ".join(props)), file=sys.stderr) + if not configs_are_equal and "--debug" in options and profile_name in detected_profiles: + print_profile_differences(config, profiles[profile_name]["config"]) if "-d" in options: options["--default"] = options["-d"] @@ -737,6 +795,10 @@ def main(argv): 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) + if "--debug" in options and load_config != dict(config): + print("Loading profile '%s'" % load_profile) + print_profile_differences(config, load_config) + remove_irrelevant_outputs(config, load_config) try: @@ -749,6 +811,12 @@ def main(argv): except Exception as e: raise AutorandrException("Failed to apply profile '%s'" % load_profile, e, True) + if "--dry-run" not in options and "--debug" in options: + new_config, _ = parse_xrandr_output() + if not is_equal_configuration(new_config, load_config): + print("The configuration change did not go as expected:") + print_profile_differences(new_config, load_config) + sys.exit(0) if __name__ == '__main__':