Merge branch 'master' of git://ralfj.de/dsl

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index dad969abdaebe9cce52044fa99d4703d1af4906b..c7ea0f9ad333dc0d249edc4eacd4f66ca6f1afd2 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -21,7 +21,7 @@ from selector_window import PositionSelection
 import gui
 
 # for auto-config: common names of internal connectors
-commonInternalConnectorNames = ['LVDS', 'LVDS1']
+commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
 
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
 def loadConfigFile(file):
@@ -51,8 +51,11 @@ def getXrandrInformation():
        connectors = {} # map of connector names to a list of resolutions
        connector = None # current connector
        for line in p.stdout:
+               # ignore screens
+               if line.startswith("Screen"):
+                       continue
                # new connector?
-               m = re.search(r'^([\w]+) (dis)?connected ', line)
+               m = re.search(r'^([\w\-]+) (dis)?connected ', line)
                if m is not None:
                        connector = m.groups()[0]
                        assert connector not in connectors