If disabling outputs failed, try to disable them together with the second xrandr...

[deb_pkgs/autorandr.git] / autorandr.py

diff --git a/autorandr.py b/autorandr.py
index 1e08e50c67ef8da6421739a20482ae5c8aa4d2b4..ee559359100a6a47e4b235725dba0a3e5dda6d15 100755 (executable)
--- a/autorandr.py
+++ b/autorandr.py
@@ -94,9 +94,9 @@ class XrandrOutput(object):
             )?                                                                          # .. but everything of the above only if the screen is in use.
         ).*
         (?:\s*(?:                                                                       # Properties of the output
-            Gamma: (?P<gamma>[0-9\.:\s]+) |                                             # Gamma value
-            Transform: (?P<transform>[0-9\.\s]+) |                                      # Transformation matrix
-            EDID: (?P<edid>[0-9a-f\s]+) |                                               # EDID of the output
+            Gamma: (?P<gamma>[0-9\.: ]+) |                                              # Gamma value
+            Transform: (?P<transform>(?:[\-0-9\. ]+\s+){3}) |                           # Transformation matrix
+            EDID: (?P<edid>\s*?(?:\\n\\t\\t[0-9a-f]+)+) |                               # EDID of the output
             (?![0-9])[^:\s][^:\n]+:.*(?:\s\\t[\\t ].+)*                                 # Other properties
         ))+
         \s*
@@ -186,6 +186,7 @@ class XrandrOutput(object):
         This method also returns a list of modes supported by the output.
         """
         try:
+            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.")
@@ -194,9 +195,8 @@ class XrandrOutput(object):
             raise RuntimeError("Parsing XRandR output failed, the regular expression did not match: %s" % debug)
         remainder = xrandr_output[len(match_object.group(0)):]
         if remainder:
-            raise RuntimeError(("Parsing XRandR output failed, %d bytes left unmatched after regular expression,"
-                                "starting with ..'%s'.") % (len(remainder), remainder[:10]))
-
+            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]))
 
         match = match_object.groupdict()
 
@@ -422,18 +422,29 @@ def apply_configuration(configuration, dry_run=False):
 
     # Disable all unused outputs
     argv = base_argv[:]
+    disable_argv = []
     for output in outputs:
         if not configuration[output].edid or "off" in configuration[output].options:
-            argv += configuration[output].option_vector
-    if argv != base_argv:
-        if subprocess.call(argv) != 0:
-            return False
+            disable_argv += configuration[output].option_vector
+    if disable_argv:
+        if subprocess.call(base_argv + disable_argv) != 0:
+            # Disabling the outputs failed. Retry with the next command:
+            # Sometimes disabling of outputs fails due to an invalid RRSetScreenSize.
+            # This does not occur if simultaneously the primary screen is reset.
+            pass
+        else:
+            disable_argv = []
 
     # Enable remaining outputs in pairs of two
     remaining_outputs = [ x for x in outputs if configuration[x].edid ]
     for index in range(0, len(remaining_outputs), 2):
-        if subprocess.call((base_argv[:] + configuration[remaining_outputs[index]].option_vector + (configuration[remaining_outputs[index + 1]].option_vector if index < len(remaining_outputs) - 1 else []))) != 0:
-            return False
+        argv = base_argv[:]
+        if disable_argv:
+            argv += disable_argv
+            disable_argv = []
+        argv += configuration[remaining_outputs[index]].option_vector + (configuration[remaining_outputs[index + 1]].option_vector if index < len(remaining_outputs) - 1 else [])
+        if subprocess.call(argv) != 0:
+            raise RuntimeError("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"