X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/7fcfc9aa2427b253bc395d72e111e996382f2492..fa823bb6e20373991482a7d07476742452487543:/dsl.py?ds=sidebyside

diff --git a/dsl.py b/dsl.py
index 47c906e..396468d 100755
--- a/dsl.py
+++ b/dsl.py
@@ -1,18 +1,38 @@
 #!/usr/bin/python
 # DSL - easy Display Setup for Laptops
+# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (gpl.txt); if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os, sys, re, subprocess
 from PyQt4 import QtGui
 from selector_window import PositionSelection
 app = QtGui.QApplication(sys.argv)
 
+# for auto-config: common names of internal connectors
+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):
 	import shlex
+	result = {}
+	if not os.path.exists(file):
+		return result # no config file
 	# read config file
 	linenr = 0
 	with open(file) as file:
-		result = {}
 		for line in file:
 			linenr += 1
 			line = line.strip()
@@ -21,8 +41,7 @@ def loadConfigFile(file):
 				# parse line
 				pos = line.index("=") # will raise exception when substring is not found
 				curKey = line[:pos].strip()
-				value = line[pos+1:]
-				result[curKey] = shlex.split(value)
+				result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips
 			except Exception:
 				raise Exception("Invalid config, line %d: Error parsing line (quoting issue?)" % linenr)
 	# add some convencience get functions
@@ -33,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]+) connected ', line)
+		m = re.search(r'^([\w\-]+) (dis)?connected ', line)
 		if m is not None:
 			connector = m.groups()[0]
 			assert connector not in connectors
@@ -65,22 +87,38 @@ def res2user(res):
 		strRatio = '16:%d' % ratio
 	return '%dx%d (%s)' %(w, h, strRatio)
 
-def findAvailableConnector(tryConnectors, availableConnectors):
+def findAvailableConnector(tryConnectors):
 	for connector in tryConnectors:
-		if connector in availableConnectors: return connector
+		if connector in connectors and connectors[connector]: # if the connector exists and is active (i.e. there is a resolution)
+			return connector
 	return None
 
-# load options
-config = loadConfigFile(os.getenv('HOME') + '/.dsl.conf')
-if len(config['internalConnector']) != 1:
-	raise Exception("You must specify exactly one internal connector")
-if len(config['externalConnectors']) < 1:
-	raise Exception("You must specify at least one external connector")
-# use options
-internalConnector = config['internalConnector'][0]
-externalConnectors = config['externalConnectors']
+# load connectors and options
 connectors = getXrandrInformation()
-usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used
+config = loadConfigFile(os.getenv('HOME') + '/.dsl.conf')
+# find internal connector
+if 'internalConnector' in config:
+	if len(config['internalConnector']) != 1:
+		raise Exception("You must specify exactly one internal connector")
+	internalConnector = config['internalConnector'][0]
+	if not internalConnector in connectors:
+		raise Exception("Connector %s does not exist, there is an error in your config file" % internalConnector)
+else:
+	# auto-config
+	internalConnector = findAvailableConnector(commonInternalConnectorNames)
+	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
+if 'externalConnectors' in config:
+	externalConnectors = config['externalConnectors']
+	for connector in externalConnectors:
+		if not connector in connectors:
+			raise Exception("Connector %s does not exist, there is an error in your config file" % internalConnector)
+else:
+	externalConnectors = connectors.keys()
+	externalConnectors.remove(internalConnector)
+if not externalConnectors:
+	raise Exception("No external connector found - either your config is wrong, or your machine has only one connector")
 
 # default: screen off
 args = {} # maps connector names to xrand arguments
@@ -88,6 +126,7 @@ for c in externalConnectors+[internalConnector]:
 	args[c] = ["--off"]
 
 # Check what to do
+usedExternalConnector = findAvailableConnector(externalConnectors) # *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]