X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=8aadacdfa909ce796710a306cc9ecd48484902fd;hb=e1f96a206e759943ecd9f6643d599867a8716355;hp=8d561fd85874d1b1d50499344744119715744f53;hpb=a02f2f6968167170cc335f9dc39d06b91aa15027;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 8d561fd..8aadacd 100755 --- a/autorandr.py +++ b/autorandr.py @@ -50,6 +50,7 @@ except NameError: virtual_profiles = [ # (name, description, callback) ("common", "Clone all connected outputs at the largest common resolution", None), + ("clone", "Clone all connected outputs with the largest resolution and scaled down in the others", None), ("horizontal", "Stack all connected outputs horizontally at their largest resolution", None), ("vertical", "Stack all connected outputs vertically at their largest resolution", None), ] @@ -601,6 +602,9 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) # at least.) # - Some implementations can not handle --transform at all, so avoid it unless # necessary. (See https://github.com/phillipberndt/autorandr/issues/37) + # - Some implementations can not handle --panning without specifying --fb + # explicitly, so avoid it unless necessary. + # (See https://github.com/phillipberndt/autorandr/issues/72) auxiliary_changes_pre = [] disable_outputs = [] @@ -615,15 +619,16 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) 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 + for option in ("transform", "panning"): + if option in current_configuration[output].options: + auxiliary_changes_pre.append(["--output", output, "--%s" % option, "none"]) + else: + try: + option_index = option_vector.index("--%s" % option) + if option_vector[option_index+1] == XrandrOutput.XRANDR_DEFAULTS[option]: + option_vector = option_vector[:option_index] + option_vector[option_index+2:] + except ValueError: + pass enable_outputs.append(option_vector) @@ -711,6 +716,20 @@ def generate_virtual_profile(configuration, modes, profile_name): shift += int(mode[shift_index]) else: configuration[output].options["off"] = None + elif profile_name == "clone": + biggest_resolution = sorted([output_modes[0] for output, output_modes in modes.items()], key=lambda x: int(x["width"])*int(x["height"]), reverse=True)[0] + for output in configuration: + configuration[output].options = {} + 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"] + configuration[output].options["pos"] = "0x0" + x_scale = float(biggest_resolution["width"]) / float(mode["width"]) + y_scale = float(biggest_resolution["height"]) / float(mode["height"]) + configuration[output].options["scale"] = "{}x{}".format(x_scale, y_scale) + else: + configuration[output].options["off"] = None return configuration def print_profile_differences(one, another):