From: Ralf Jung <post@ralfj.de>
Date: Sat, 6 Oct 2012 10:39:15 +0000 (+0200)
Subject: Merge branch 'master' of git://ralfj.de/dsl
X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/d45277d71a662b4174c9173922368d00cfbefa94?hp=1fabdda231c0be36747b39fd681773a03d1bcf93

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

diff --git a/dsl.py b/dsl.py
index dad969a..c7ea0f9 100755
--- 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