X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=481d810e561f1510ea0ee9c6275eb079491a9d98;hb=8b9eb294ed8171dde102e4f135f88833403448a8;hp=33998ac60e122d97c7cc288da357081923417511;hpb=93e5266b30cafe6643f7ad56cd0c7267c754e0cc;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 33998ac..481d810 100755 --- a/autorandr.py +++ b/autorandr.py @@ -34,6 +34,7 @@ import subprocess import sys from distutils.version import LooseVersion as Version +from functools import reduce from itertools import chain from collections import OrderedDict @@ -97,7 +98,7 @@ class AutorandrException(Exception): if self.line: retval.append(" (line %d)" % self.line) if self.original_exception: - retval.append(":\n " % self.line) + 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." @@ -129,24 +130,24 @@ class XrandrOutput(object): (?:[\ \t]*tracking\ (?P[0-9]+x[0-9]+\+[0-9]+\+[0-9]+))? # Tracking information (?:[\ \t]*border\ (?P(?:[0-9]+/){3}[0-9]+))? # Border information (?:\s*(?: # Properties of the output - Gamma: (?P[0-9\.: ]+) | # Gamma value + Gamma: (?P(?:inf|[0-9\.: e])+) | # Gamma value Transform: (?P(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix EDID: (?P\s*?(?:\\n\\t\\t[0-9a-f]+)+) | # EDID of the output (?![0-9])[^:\s][^:\n]+:.*(?:\s\\t[\\t ].+)* # Other properties ))+ \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]+(?:(?!\*current).)+\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 = { @@ -242,7 +243,7 @@ class XrandrOutput(object): 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 AutorandrException("Parsing XRandR output failed, couldn't find any display modes", report_bug=True) @@ -255,7 +256,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"): @@ -283,12 +286,16 @@ 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! Using `%s'." % (match["output"], options["mode"]), file=sys.stderr) if match["gamma"]: gamma = match["gamma"].strip() + # xrandr prints different values in --verbose than it accepts as a parameter value for --gamma + # Also, it is not able to work with non-standard gamma ramps. Finally, it auto-corrects 0 to 1, + # so we approximate by 1e-10. + gamma = ":".join([ str(max(1e-10, round(1./float(x), 3))) for x in gamma.split(":") ]) options["gamma"] = gamma if match["rate"]: options["rate"] = match["rate"] @@ -562,7 +569,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 @@ -579,7 +586,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]) @@ -711,12 +718,12 @@ if __name__ == '__main__': try: main(sys.argv) except AutorandrException as e: - print(file=sys.stderr) print(e, file=sys.stderr) sys.exit(1) except Exception as e: - trace = sys.exc_info()[2] - while trace.tb_next: - trace = trace.tb_next - print("\nUnhandled exception in line %d. Please report this as a bug:\n %s" % (trace.tb_lineno, "\n ".join(str(e).split("\n")),), file=sys.stderr) - sys.exit(1) + 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