fixup: Also allow -c instead of --change

[deb_pkgs/autorandr.git] / autorandr.py

diff --git a/autorandr.py b/autorandr.py
index ca761b0e99bd85aaa180b9cba3902004c10821d9..57943f7c6c80452eea1d6916b4fe14192a5aee0a 100755 (executable)
--- a/autorandr.py
+++ b/autorandr.py
@@ -68,7 +68,7 @@ help_text = """
 Usage: autorandr [options]
 
 -h, --help              get this small help
--c, --change            reload current setup
+-c, --change            automatically load the first detected profile
 -d, --default <profile> make profile <profile> the default profile
 -l, --load <profile>    load profile <profile>
 -s, --save <profile>    save your current setup to profile <profile>
@@ -649,6 +649,12 @@ def get_fb_dimensions(configuration):
             o_left, o_top = map(int, output.options["pos"].split("x"))
             o_width += o_left
             o_height += o_top
+        if "panning" in output.options:
+            match = re.match("(?P<w>[0-9]+)x(?P<h>[0-9]+)(?:\+(?P<x>[0-9]+))?(?:\+(?P<y>[0-9]+))?.*", output.options["panning"])
+            if match:
+                detail = match.groupdict()
+                o_width = int(detail.get("w")) + int(detail.get("x", "0"))
+                o_height = int(detail.get("h")) + int(detail.get("y", "0"))
         width = max(width, o_width)
         height = max(height, o_height)
     return int(width), int(height)
@@ -1237,7 +1243,7 @@ def main(argv):
 
     if "-d" in options:
         options["--default"] = options["-d"]
-    if not load_profile and "--default" in options:
+    if not load_profile and "--default" in options and ("-c" in options or "--change" in options):
         load_profile = options["--default"]
 
     if load_profile: