Fix process communication
[lilass.git] / dsl.py
diff --git a/dsl.py b/dsl.py
index 75f1cf2a0a823fc1608060259f0f0c335bf01660..890ea70e8cdc5b24520ea3cf30fe1b1b0fa56f06 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # 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
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # 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)
+import argparse, sys, os, re, subprocess
+import gui
 
 # for auto-config: common names of internal connectors
 
 # for auto-config: common names of internal connectors
-commonInternalConnectorNames = ['LVDS', 'LVDS1']
+commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
+
+# this is as close as one can get to an enum in Python
+class RelativeScreenPosition:
+       LEFT          = 0
+       RIGHT         = 1
+       EXTERNAL_ONLY = 2
+
+# storing what's necessary for screen setup
+class ScreenSetup:
+       def __init__(self, relPosition, intResolution, extResolution, extIsPrimary = False):
+               '''relPosition must be one of the RelativeScreenPosition members, the resolutions must be (width, height) pairs'''
+               self.relPosition = relPosition
+               self.intResolution = intResolution # value doesn't matter if the internal screen is disabled
+               self.extResolution = extResolution
+               self.extIsPrimary = extIsPrimary or self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY # external is always primary if it is the only one
+       
+       def getInternalArgs(self):
+               if self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY:
+                       return ["--off"]
+               args = ["--mode", res2xrandr(self.intResolution)] # set internal screen to desired resolution
+               if not self.extIsPrimary:
+                       args.append('--primary')
+               return args
+       
+       def getExternalArgs(self, intName):
+               args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution
+               if self.extIsPrimary:
+                       args.append('--primary')
+               if self.relPosition == RelativeScreenPosition.LEFT:
+                       args += ['--left-of', intName]
+               elif self.relPosition == RelativeScreenPosition.RIGHT:
+                       args += ['--right-of', intName]
+               return args
 
 # 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):
@@ -43,17 +74,24 @@ def loadConfigFile(file):
                                curKey = line[:pos].strip()
                                result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips
                        except Exception:
                                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)
+                               raise Exception("Invalid config, line %d: Error parsing line (may be a quoting issue)." % linenr)
        # add some convencience get functions
        return result
 
        # add some convencience get functions
        return result
 
+# Run xrandr and return a dict of output names mapped to lists of available resolutions, each being a (width, height) pair.
+# An empty list indicates that the connector is disabled.
 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:
 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:
+               # screen?
+               m = re.search(r'^Screen [0-9]+: ', line)
+               if m is not None: # ignore this line
+                       connector = None
+                       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
@@ -64,14 +102,23 @@ def getXrandrInformation():
                if m is not None:
                        assert connector is not None
                        connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
                if m is not None:
                        assert connector is not None
                        connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
+                       continue
+               # unknown line
+               # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected
+               #raise Exception("Unknown line in xrandr output:\n"+line)
+               print "Warning: Unknown xrandr line %s" % line
+       # be sure to always proprly finish up with the xrandr
        p.communicate()
        p.communicate()
-       if p.returncode != 0: raise Exception("Querying xrandr for data failed")
+       # if everything succeededso far, check return code
+       if p.returncode != 0: raise Exception("Querying xrandr for data failed.")
        return connectors
 
        return connectors
 
+# convert a (width, height) pair into a string accepted by xrandr as argument for --mode
 def res2xrandr(res):
        (w, h) = res
        return str(w)+'x'+str(h)
 
 def res2xrandr(res):
        (w, h) = res
        return str(w)+'x'+str(h)
 
+# convert a (width, height) pair into a string to be displayed to the user
 def res2user(res):
        (w, h) = res
        # get ratio
 def res2user(res):
        (w, h) = res
        # get ratio
@@ -84,77 +131,95 @@ def res2user(res):
                strRatio = '16:%d' % ratio
        return '%dx%d (%s)' %(w, h, strRatio)
 
                strRatio = '16:%d' % ratio
        return '%dx%d (%s)' %(w, h, strRatio)
 
-def findAvailableConnector(tryConnectors):
+# return the first available connector from those listed in tryConnectors, skipping disabled connectors
+def findAvailableConnector(tryConnectors, allConnectors):
        for connector in 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)
+               if connector in allConnectors and allConnectors[connector]: # if the connector exists and is active (i.e. there is a resolution)
                        return connector
        return None
 
                        return connector
        return None
 
-# load connectors and options
-connectors = getXrandrInformation()
-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
-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]
-       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[usedExternalConnector] = ["--mode", extResolution] # set external screen to desired resolution
-       if extPosition.extOnly.isChecked():
-               args[usedExternalConnector] += ["--primary"]
+# Return a (internalConnector, externalConnectors) pair: The name of the internal connector, and a list of external connectors.
+# Use the config file at ~/.dsl.conf and fall back to auto-detection
+def classifyConnectors(allConnectors):
+       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 allConnectors:
+                       raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
        else:
        else:
-               # there are two screens
-               args[internalConnector] = ["--mode", intResolution] # set internal screen to desired resolution
-               # set position
-               if extPosition.posLeft.isChecked():
-                       args[usedExternalConnector] += ["--left-of", internalConnector]
-               else:
-                       args[usedExternalConnector] += ["--right-of", internalConnector]
-               # set primary screen
-               if extPosition.primExt.isChecked():
-                       args[usedExternalConnector] += ["--primary"]
+               # auto-config
+               internalConnector = findAvailableConnector(commonInternalConnectorNames, allConnectors)
+               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 allConnectors:
+                               raise Exception("Connector %s does not exist, there is an error in your config file." % connector)
+                       if connector == internalConnector:
+                               raise Exception("%s is both internal and external, that doesn't make sense." % connector)
+       else:
+               externalConnectors = allConnectors.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.")
+       # done!
+       return (internalConnector, externalConnectors)
+
+# if we run top-level
+if __name__ == "__main__":
+       try:
+               # parse command-line arguments
+               parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
+               parser.add_argument("-r, --relative-position",
+                                                       dest="rel_position", choices=('left', 'right', 'external-only'),
+                                                       help="Position of external screen relative to internal one")
+               cmdArgs = parser.parse_args()
+               
+               # load connectors and classify them
+               connectors = getXrandrInformation()
+               (internalConnector, externalConnectors) = classifyConnectors(connectors)
+               
+               # default: screen off
+               connectorArgs = {} # maps connector names to xrand arguments
+               for c in externalConnectors+[internalConnector]:
+                       connectorArgs[c] = ["--off"]
+               
+               # check whether we got an external screen or not
+               # Check what to do
+               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 get a setup
+                       if cmdArgs.rel_position is not None:
+                               # use command-line arguments (can we do this relPosition stuff more elegant?)
+                               if cmdArgs.rel_position == 'left':
+                                       relPosition = RelativeScreenPosition.LEFT
+                               elif cmdArgs.rel_position == 'right':
+                                       relPosition = RelativeScreenPosition.RIGHT
+                               else:
+                                       relPosition = RelativeScreenPosition.EXTERNAL_ONLY
+                               setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions
+                       else:
+                               # use GUI
+                               setup = gui.setup(connectors[internalConnector], connectors[usedExternalConnector])
+                       if setup is None: sys.exit(1) # the user canceled
+                       # apply it
+                       connectorArgs[internalConnector] = setup.getInternalArgs()
+                       connectorArgs[usedExternalConnector] = setup.getExternalArgs(internalConnector)
                else:
                else:
-                       args[internalConnector] += ["--primary"]
-else:
-       # use first resolution
-       args[internalConnector] = ["--mode", res2xrandr(connectors[internalConnector][0]), "--primary"]
-# and do it
-call = ["xrandr"]
-for name in args:
-       call += ["--output", name] + args[name]
-print "Call that will be made:",call
-subprocess.check_call(call)
+                       # use first resolution of internal connector
+                       connectorArgs[internalConnector] = ["--mode", res2xrandr(connectors[internalConnector][0]), "--primary"]
+               
+               # and do it
+               call = ["xrandr"]
+               for name in connectorArgs:
+                       call += ["--output", name] + connectorArgs[name]
+               print "Call that will be made:",call
+               subprocess.check_call(call)
+       except Exception as e:
+               gui.error(str(e))
+               raise