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 d8d88c977dc38be086137a38c6aa7217d5a087b0..d46f620aa7a6f749e918a48045f375326c5f6d1d 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -1,18 +1,62 @@
 #!/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 sys, re, subprocess
+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', 'LVDS1', 'LVDS-0']
+
+# 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:
+               for line in file:
+                       linenr += 1
+                       line = line.strip()
+                       if not len(line) or line.startswith("#"): continue # skip empty and comment lines
+                       try:
+                               # parse line
+                               pos = line.index("=") # will raise exception when substring is not found
+                               curKey = line[:pos].strip()
+                               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
+       return result
+
 def getXrandrInformation():
        p = subprocess.Popen(["xrandr", "-q"], stdout=subprocess.PIPE)
        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
@@ -43,48 +87,74 @@ def res2user(res):
                strRatio = '16:%d' % ratio
        return '%dx%d (%s)' %(w, h, strRatio)
 
-# Check screen setup
-internalName = "LVDS1"
-externalNames = ["HDMI1", "DP1", "VGA1"]
+def findAvailableConnector(tryConnectors):
+       for connector in tryConnectors:
+               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 connectors and options
 connectors = getXrandrInformation()
-internalResolutions = connectors[internalName] # there must be a screen assoicated to the internal connector
-externalName = None # *the* external connector which is actually used
-externalResolutions = None # resultions of the external connector
-args = {} # maps connector names to xrand arguments
+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")
 
-# look for enabled external screen, disable all the others
-for name in externalNames:
-       if externalResolutions is None and name in connectors:
-               externalName = name
-               externalResolutions = connectors[name]
-       else:
-               args[name] = ["--off"]
+# default: screen off
+args = {} # maps connector names to xrand arguments
+for c in externalConnectors+[internalConnector]:
+       args[c] = ["--off"]
 
 # Check what to do
-if externalName is not None: # we need to ask what to do
-       extPosition = PositionSelection(externalName, map(res2user, internalResolutions), map(res2user, externalResolutions))
+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]
+       extPosition = PositionSelection(usedExternalConnector, map(res2user, internalResolutions), map(res2user, externalResolutions))
        extPosition.exec_()
        if not extPosition.result(): sys.exit(1) # the user canceled
        extResolution = res2xrandr(externalResolutions[extPosition.extResolutions.currentIndex()])
        intResolution = res2xrandr(internalResolutions[extPosition.intResolutions.currentIndex()])
        # build command-line
-       args[externalName] = ["--mode", extResolution] # we definitely want an external screen
+       args[usedExternalConnector] = ["--mode", extResolution] # set external screen to desired resolution
        if extPosition.extOnly.isChecked():
-               args[internalName] = ["--off"]
-               args[externalName] += ["--primary"]
+               args[usedExternalConnector] += ["--primary"]
        else:
                # there are two screens
-               args[internalName] = ["--mode", intResolution]
+               args[internalConnector] = ["--mode", intResolution] # set internal screen to desired resolution
+               # set position
                if extPosition.posLeft.isChecked():
-                       args[externalName] += ["--left-of", internalName]
+                       args[usedExternalConnector] += ["--left-of", internalConnector]
                else:
-                       args[externalName] += ["--right-of", internalName]
+                       args[usedExternalConnector] += ["--right-of", internalConnector]
+               # set primary screen
                if extPosition.primExt.isChecked():
-                       args[externalName] += ["--primary"]
+                       args[usedExternalConnector] += ["--primary"]
                else:
-                       args[internalName] += ["--primary"]
+                       args[internalConnector] += ["--primary"]
 else:
-       args[internalName] = ["--mode", res2xrandr(internalResolutions[0]), "--primary"]
+       # use first resolution
+       args[internalConnector] = ["--mode", res2xrandr(connectors[internalConnector][0]), "--primary"]
 # and do it
 call = ["xrandr"]
 for name in args: