complain if a connector is both internal and external

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 75f1cf2a0a823fc1608060259f0f0c335bf01660..fd7f10882758222588539255d61b9081db6a90c9 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -16,13 +16,12 @@
 # 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.
 
 # 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
+import os, re, subprocess

 from selector_window import PositionSelection
 from selector_window import PositionSelection

-app = QtGui.QApplication(sys.argv)
+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']

 
 # 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,7 +42,7 @@ 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 (quoting issue?)." % linenr)

        # add some convencience get functions
        return result
 
        # add some convencience get functions
        return result
 


@@ -52,8 +51,13 @@ def getXrandrInformation():
        connectors = {} # map of connector names to a list of resolutions
        connector = None # current connector
        for line in p.stdout:
        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,8 +68,13 @@ 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
+               raise Exception("Unknown line in xrandr output:\n"+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
 
 def res2xrandr(res):
        return connectors
 
 def res2xrandr(res):


@@ -84,77 +93,89 @@ 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):
+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")
+# the main function
+def main():
+       # 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, 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
+       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." % connector)
+                       if connector == internalConnector:
+                               raise Exception("%s is both internal and external, that doesn't make sense." % connector)
+       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"]
+       # 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"]
-       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():
+       # 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 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"]
                else:
                        args[usedExternalConnector] += ["--primary"]
                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)
+                       # 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"]
+                       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)
+
+# if we run top-level
+if __name__ == "__main__":
+       try:
+               main()
+       except Exception as e:
+               gui.error(str(e))
+               raise