X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=285c751bda4294e4dd0e07846320d37c5deebd2f;hb=36b7e2ae7d43d995a9a9c2024c276654b429e12d;hp=aa464d61090774470ddef778b58e475f7b13ed74;hpb=1a37be02ae147c492e0e5f91b0f4537d888c6414;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index aa464d6..285c751 100755 --- a/autorandr.py +++ b/autorandr.py @@ -37,6 +37,9 @@ from distutils.version import LooseVersion as Version from itertools import chain from collections import OrderedDict +import posix + + virtual_profiles = [ # (name, description, callback) ("common", "Clone all connected outputs at the largest common resolution", None), @@ -74,6 +77,36 @@ Usage: autorandr [options] The following virtual configurations are available: """.strip() +class AutorandrException(Exception): + def __init__(self, message, original_exception=None, report_bug=False): + self.message = message + self.report_bug = report_bug + if original_exception: + self.original_exception = original_exception + trace = sys.exc_info()[2] + while trace.tb_next: + trace = trace.tb_next + self.line = trace.tb_lineno + else: + try: + import inspect + self.line = inspect.currentframe().f_back.f_lineno + except: + self.line = None + self.original_exception = None + + def __str__(self): + retval = [ self.message ] + if self.line: + retval.append(" (line %d)" % self.line) + if self.original_exception: + retval.append(":\n ") + retval.append(str(self.original_exception).replace("\n", "\n ")) + if self.report_bug: + retval.append("\nThis appears to be a bug. Please help improving autorandr by reporting it upstream." + "\nPlease attach the output of `xrandr --verbose` to your bug report if appropriate.") + return "".join(retval) + class XrandrOutput(object): "Represents an XRandR output" @@ -106,17 +139,17 @@ class XrandrOutput(object): ))+ \s* (?P(?: - (?P[0-9]+)x(?P[0-9]+).+?\*current.+\s+ - h:.+\s+v:.+clock\s+(?P[0-9\.]+)Hz\s* | # Interesting (current) resolution: Extract rate - [0-9]+x[0-9]+.+\s+h:.+\s+v:.+\s* # Other resolutions + (?P\S+).+?\*current.*\s+ # Interesting (current) resolution: Extract rate + h:\s+width\s+(?P[0-9]+).+\s+ + v:\s+height\s+(?P[0-9]+).+clock\s+(?P[0-9\.]+)Hz\s* | + \S+(?:(?!\*current).)+\s+h:.+\s+v:.+\s* # Other resolutions )*) """ XRANDR_OUTPUT_MODES_REGEXP = """(?x) - (?P[0-9]+)x(?P[0-9]+) - .*?(?P\+preferred)? - \s+h:.+ - \s+v:.+clock\s+(?P[0-9\.]+)Hz + (?P\S+).+?(?P\+preferred)?\s+ + h:\s+width\s+(?P[0-9]+).+\s+ + v:\s+height\s+(?P[0-9]+).+clock\s+(?P[0-9\.]+)Hz\s* | """ XRANDR_13_DEFAULTS = { @@ -199,22 +232,22 @@ class XrandrOutput(object): xrandr_output = xrandr_output.replace("\r\n", "\n") match_object = re.search(XrandrOutput.XRANDR_OUTPUT_REGEXP, xrandr_output) except: - raise RuntimeError("Parsing XRandR output failed, there is an error in the regular expression.") + raise AutorandrException("Parsing XRandR output failed, there is an error in the regular expression.", report_bug = True) if not match_object: debug = debug_regexp(XrandrOutput.XRANDR_OUTPUT_REGEXP, xrandr_output) - raise RuntimeError("Parsing XRandR output failed, the regular expression did not match: %s" % debug) + raise AutorandrException("Parsing XRandR output failed, the regular expression did not match: %s" % debug, report_bug = True) remainder = xrandr_output[len(match_object.group(0)):] if remainder: - raise RuntimeError(("Parsing XRandR output failed, %d bytes left unmatched after regular expression, " - "starting at byte %d with ..'%s'.") % (len(remainder), len(len(match_object.group(0))), remainder[:10])) + raise AutorandrException(("Parsing XRandR output failed, %d bytes left unmatched after regular expression, " + "starting at byte %d with ..'%s'.") % (len(remainder), len(match_object.group(0)), remainder[:10]), report_bug=True) match = match_object.groupdict() modes = [] if match["modes"]: - modes = [ x.groupdict() for x in re.finditer(XrandrOutput.XRANDR_OUTPUT_MODES_REGEXP, match["modes"]) ] + modes = [ x.groupdict() for x in re.finditer(XrandrOutput.XRANDR_OUTPUT_MODES_REGEXP, match["modes"]) if x.group("name") ] if not modes: - raise RuntimeError("Parsing XRandR output failed, couldn't find any display modes") + raise AutorandrException("Parsing XRandR output failed, couldn't find any display modes", report_bug=True) options = {} if not match["connected"]: @@ -225,7 +258,9 @@ class XrandrOutput(object): if not match["width"]: options["off"] = None else: - if match["mode_width"]: + if match["mode_name"]: + options["mode"] = match["mode_name"] + elif match["mode_width"]: options["mode"] = "%sx%s" % (match["mode_width"], match["mode_height"]) else: if match["rotate"] not in ("left", "right"): @@ -253,10 +288,10 @@ class XrandrOutput(object): 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": options["transform"] = transformation - if not match["mode_width"]: + if not match["mode_name"]: # TODO We'd need to apply the reverse transformation here. Let's see if someone complains, I doubt that this # special case is actually required. - print("Warning: Output %s has a transformation applied. Could not determine correct mode!", file=sys.stderr) + print("Warning: Output %s has a transformation applied. Could not determine correct mode! Using `%s'." % (match["output"], options["mode"]), file=sys.stderr) if match["gamma"]: gamma = match["gamma"].strip() options["gamma"] = gamma @@ -285,8 +320,7 @@ class XrandrOutput(object): if fuzzy_output in fuzzy_edid_map: edid = edid_map[list(edid_map.keys())[fuzzy_edid_map.index(fuzzy_output)]] elif "off" not in options: - raise RuntimeError("Failed to find an EDID for output `%s' in setup file, required as `%s' is not off in config file." - % (options["output"], options["output"])) + raise AutorandrException("Failed to find an EDID for output `%s' in setup file, required as `%s' is not off in config file." % (options["output"], options["output"])) output = options["output"] del options["output"] @@ -332,13 +366,13 @@ def debug_regexp(pattern, string): string[partial_length:partial_length+10])) except ImportError: pass - return "Debug information available if `regex' module is installed." + return "Debug information would be available if the `regex' module was installed." def parse_xrandr_output(): "Parse the output of `xrandr --verbose' into a list of outputs" xrandr_output = os.popen("xrandr -q --verbose").read() if not xrandr_output: - raise RuntimeError("Failed to run xrandr") + raise AutorandrException("Failed to run xrandr") # We are not interested in screens xrandr_output = re.sub("(?m)^Screen [0-9].+", "", xrandr_output).strip() @@ -346,7 +380,7 @@ def parse_xrandr_output(): # 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") + raise AutorandrException("No output boundaries found", report_bug=True) outputs = OrderedDict() modes = OrderedDict() for i in range(1, len(split_xrandr_output), 2): @@ -483,7 +517,7 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) 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)) + raise AutorandrException("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 @@ -508,7 +542,7 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) 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)) + raise AutorandrException("Command failed: %s" % " ".join(argv)) def add_unused_outputs(source_configuration, target_configuration): "Add outputs that are missing in target to target, in 'off' state" @@ -533,7 +567,7 @@ def generate_virtual_profile(configuration, modes, profile_name): for output in configuration: configuration[output].options = {} if output in modes: - configuration[output].options["mode"] = "%sx%s" % common_resolution[-1] + 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: configuration[output].options["off"] = None @@ -550,7 +584,7 @@ def generate_virtual_profile(configuration, modes, profile_name): configuration[output].options = {} if output in modes: 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"] = "%sx%s" % (mode["width"], mode["height"]) + configuration[output].options["mode"] = mode["name"] configuration[output].options["rate"] = mode["rate"] configuration[output].options["pos"] = pos_specifier % shift shift += int(mode[shift_index]) @@ -575,8 +609,10 @@ def main(argv): try: options = dict(getopt.getopt(argv[1:], "s:l:d:cfh", [ "dry-run", "change", "default=", "save=", "load=", "force", "fingerprint", "config", "help" ])[0]) except getopt.GetoptError as e: - print(str(e)) - options = { "--help": True } + print("Failed to parse options: {0}.\n" + "Use --help to get usage information.".format(str(e)), + file=sys.stderr) + sys.exit(posix.EX_USAGE) profiles = {} try: @@ -596,14 +632,9 @@ def main(argv): # Sort by descending mtime profiles = OrderedDict(sorted(profiles.items(), key=lambda x: -x[1]["config-mtime"])) except Exception as e: - print("Failed to load profiles:\n%s" % str(e), file=sys.stderr) - sys.exit(1) + raise AutorandrException("Failed to load profiles", e) - try: - config, modes = parse_xrandr_output() - except Exception as e: - print("Failed to parse current configuration from XRandR:\n%s" % str(e), file=sys.stderr) - sys.exit(1) + config, modes = parse_xrandr_output() if "--fingerprint" in options: output_setup(config, sys.stdout) @@ -617,13 +648,11 @@ def main(argv): options["--save"] = options["-s"] if "--save" in options: if options["--save"] in ( x[0] for x in virtual_profiles ): - print("Cannot save current configuration as profile '%s':\nThis configuration name is a reserved virtual configuration." % options["--save"]) - sys.exit(1) + raise AutorandrException("Cannot save current configuration as profile '%s':\nThis configuration name is a reserved virtual configuration." % options["--save"]) try: save_configuration(os.path.join(profile_path, options["--save"]), config) except Exception as e: - print("Failed to save current configuration as profile '%s':\n%s" % (options["--save"], str(e)), file=sys.stderr) - sys.exit(1) + raise AutorandrException("Failed to save current configuration as profile '%s'" % (options["--save"],), e) print("Saved current configuration as profile '%s'" % options["--save"]) sys.exit(0) @@ -664,8 +693,7 @@ def main(argv): load_config = profile["config"] scripts_path = profile["path"] except KeyError: - print("Failed to load profile '%s':\nProfile not found" % load_profile, file=sys.stderr) - sys.exit(1) + raise AutorandrException("Failed to load profile '%s': Profile not found" % load_profile) if load_profile in detected_profiles and detected_profiles[0] != load_profile: update_mtime(os.path.join(scripts_path, "config")) add_unused_outputs(config, load_config) @@ -682,14 +710,20 @@ def main(argv): 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) - sys.exit(1) + raise AutorandrException("Failed to apply profile '%s'" % load_profile, e, True) sys.exit(0) if __name__ == '__main__': try: main(sys.argv) - except Exception as e: - print("General failure. Please report this as a bug:\n%s" % (str(e),), file=sys.stderr) + except AutorandrException as e: + print(e, file=sys.stderr) sys.exit(1) + except Exception as e: + if not len(str(e)): # BdbQuit + print("Exception: {0}".format(e.__class__.__name__)) + sys.exit(2) + + print("Unhandled exception ({0}). Please report this as a bug.".format(e), file=sys.stderr) + raise