ignore "Screen" lines in xrandr -q and accept connector identifiers that contain...

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 75f1cf2a0a823fc1608060259f0f0c335bf01660..d46f620aa7a6f749e918a48045f375326c5f6d1d 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
 app = QtGui.QApplication(sys.argv)
 
 # for auto-config: common names of internal connectors

-commonInternalConnectorNames = ['LVDS', 'LVDS1']
+commonInternalConnectorNames = ['LVDS', 'LVDS1', 'LVDS-0']

 
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
 def loadConfigFile(file):
 
 # 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:
        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?
                # 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
                if m is not None:
                        connector = m.groups()[0]
                        assert connector not in connectors