abstract the dialogue away so it can be implementing using an abritrary GUI frontend...

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index fa7750a55fc355213f3629e77ae0a85be0265025..1c4ec1e867e2eef94d26ec7fdbf36716e0ac115b 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -17,12 +17,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os, re, subprocess
-from selector_window import PositionSelection
 import gui
 
 # for auto-config: common names of internal connectors
 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
+
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
 def loadConfigFile(file):
        import shlex
@@ -70,7 +75,9 @@ def getXrandrInformation():
                        connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
                        continue
                # unknown line
-               raise Exception("Unknown line in xrandr output:\n"+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()
        # if everything succeededso far, check return code
@@ -121,7 +128,9 @@ def main():
                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)
+                               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)
@@ -138,25 +147,25 @@ def main():
        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()])
+               dialogue = gui.getDialogue(usedExternalConnector, map(res2user, internalResolutions), map(res2user, externalResolutions))
+               if not dialogue.run(): sys.exit(1) # the user canceled
+               extResolution = res2xrandr(externalResolutions[dialogue.getExtResolutionIndex()])
+               intResolution = res2xrandr(internalResolutions[dialogue.getIntResolutionIndex()])
+               relPosition = dialogue.getRelativeScreenPosition()
                # build command-line
                args[usedExternalConnector] = ["--mode", extResolution] # set external screen to desired resolution
-               if extPosition.extOnly.isChecked():
+               if relPosition == RelativeScreenPosition.EXTERNAL_ONLY:
                        args[usedExternalConnector] += ["--primary"]
                else:
                        # there are two screens
                        args[internalConnector] = ["--mode", intResolution] # set internal screen to desired resolution
                        # set position
-                       if extPosition.posLeft.isChecked():
+                       if relPosition == RelativeScreenPosition.LEFT:
                                args[usedExternalConnector] += ["--left-of", internalConnector]
                        else:
                                args[usedExternalConnector] += ["--right-of", internalConnector]
                        # set primary screen
-                       if extPosition.primExt.isChecked():
+                       if dialogue.externalIsPrimary():
                                args[usedExternalConnector] += ["--primary"]
                        else:
                                args[internalConnector] += ["--primary"]