added more possible internal connector names

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 75f1cf2a0a823fc1608060259f0f0c335bf01660..396468d5bfca273ac8058b3cd980ea307c92e944 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -22,7 +22,7 @@ from selector_window import PositionSelection
 app = QtGui.QApplication(sys.argv)
 
 # 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):
@@ -52,8 +52,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