Don't make unknown xrandr lines a fatal error - my xrandr shows strange stuff when...

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 0704d3e8f3da546f9b5e510976cf98bcbebe328a..e1a945e5208454ac58deb0dfd083ce64f94f6fb1 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -49,32 +49,32 @@ def loadConfigFile(file):
 def getXrandrInformation():
        p = subprocess.Popen(["xrandr", "-q"], stdout=subprocess.PIPE)
        connectors = {} # map of connector names to a list of resolutions
-       try:
-               connector = None # current connector
-               for line in p.stdout:
-                       # screen?
-                       m = re.search(r'^Screen [0-9]+: ', line)
-                       if m is not None: # ignore this line
-                               connector = None
-                               continue
-                       # new connector?
-                       m = re.search(r'^([\w\-]+) (dis)?connected ', line)
-                       if m is not None:
-                               connector = m.groups()[0]
-                               assert connector not in connectors
-                               connectors[connector] = []
-                               continue
-                       # new resolution?
-                       m = re.search(r'^   ([\d]+)x([\d]+) +', line)
-                       if m is not None:
-                               assert connector is not None
-                               connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
-                               continue
-                       # unknown line
-                       raise Exception("Unknown line in xrandr output:\n"+line)
-       finally:
-               # be sure to always proprly finish up with the xrandr
-               p.communicate()
+       connector = None # current connector
+       for line in p.stdout:
+               # screen?
+               m = re.search(r'^Screen [0-9]+: ', line)
+               if m is not None: # ignore this line
+                       connector = None
+                       continue
+               # new connector?
+               m = re.search(r'^([\w\-]+) (dis)?connected ', line)
+               if m is not None:
+                       connector = m.groups()[0]
+                       assert connector not in connectors
+                       connectors[connector] = []
+                       continue
+               # new resolution?
+               m = re.search(r'^   ([\d]+)x([\d]+) +', line)
+               if m is not None:
+                       assert connector is not None
+                       connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
+                       continue
+               # unknown line
+               # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected
+               #raise Exception("Unknown line in xrandr output:\n"+line)
+               print "Warning: Unknown xrandr line %s" % line
+       # be sure to always proprly finish up with the xrandr
+       p.communicate()
        # if everything succeededso far, check return code
        if p.returncode != 0: raise Exception("Querying xrandr for data failed.")
        return connectors
@@ -123,7 +123,9 @@ def main():
                externalConnectors = config['externalConnectors']
                for connector in externalConnectors:
                        if not connector in connectors:
-                               raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
+                               raise Exception("Connector %s does not exist, there is an error in your config file." % connector)
+                       if connector == internalConnector:
+                               raise Exception("%s is both internal and external, that doesn't make sense." % connector)
        else:
                externalConnectors = connectors.keys()
                externalConnectors.remove(internalConnector)