X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/d45277d71a662b4174c9173922368d00cfbefa94..59f9c1154b5cb55269382c404ae4295171b19557:/dsl.py?ds=sidebyside

diff --git a/dsl.py b/dsl.py
index c7ea0f9..fa7750a 100755
--- a/dsl.py
+++ b/dsl.py
@@ -51,8 +51,10 @@ 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"):
+		# 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)
@@ -66,7 +68,12 @@ def getXrandrInformation():
 		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)
+	# 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
 
@@ -86,9 +93,9 @@ def res2user(res):
 		strRatio = '16:%d' % ratio
 	return '%dx%d (%s)' %(w, h, strRatio)
 
-def findAvailableConnector(tryConnectors):
+def findAvailableConnector(tryConnectors, allConnectors):
 	for connector in tryConnectors:
-		if connector in connectors and connectors[connector]: # if the connector exists and is active (i.e. there is a resolution)
+		if connector in allConnectors and allConnectors[connector]: # if the connector exists and is active (i.e. there is a resolution)
 			return connector
 	return None
 
@@ -106,7 +113,7 @@ def main():
 			raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
 	else:
 		# auto-config
-		internalConnector = findAvailableConnector(commonInternalConnectorNames)
+		internalConnector = findAvailableConnector(commonInternalConnectorNames, connectors)
 		if internalConnector is None:
 			raise Exception("Could not automatically find internal connector, please use ~/.dsl.conf to specify it manually.")
 	# all the rest is external then, obviously - unless the user wants to do that manually
@@ -127,7 +134,7 @@ def main():
 		args[c] = ["--off"]
 
 	# Check what to do
-	usedExternalConnector = findAvailableConnector(externalConnectors) # *the* external connector which is actually used
+	usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used
 	if usedExternalConnector is not None: # there's an external screen connected, we need to ask what to do
 		internalResolutions = connectors[internalConnector]
 		externalResolutions = connectors[usedExternalConnector]