add support for several external connectors (of which only one is used)

[lilass.git] / external_screen.py

diff --git a/external_screen.py b/external_screen.py
index 6d47ec725962fdc1a713a1b7f756fba9cb7ce07a..5474685d1f06ad7b26b646c2e42f1ee3b52120d3 100755 (executable)
--- a/external_screen.py
+++ b/external_screen.py
@@ -25,44 +25,67 @@ def getXrandrInformation():
        if p.returncode != 0: raise Exception("Querying xrandr for data failed")
        return connectors
 
-def res2str(res):
+def res2xrandr(res):
        (w, h) = res
        return str(w)+'x'+str(h)
 
+def res2user(res):
+       (w, h) = res
+       # get ratio
+       ratio = int(round(16.0*h/w))
+       if ratio == 12: # 16:12 = 4:3
+               strRatio = '4:3'
+       elif ratio == 13: # 16:12.8 = 5:4
+               strRatio = '5:4'
+       else: # let's just hope this will never be 14 or more...
+               strRatio = '16:%d' % ratio
+       return '%dx%d (%s)' %(w, h, strRatio)
+
 # Check screen setup
-internalName = "LVDS"
-externalName = "CRT1"
+internalName = "LVDS1"
+externalNames = ["HDMI1", "VGA1"]
 connectors = getXrandrInformation()
 internalResolutions = connectors[internalName] # there must be a screen assoicated to the internal connector
-externalResolutions = connectors.get(externalName)
+externalName = None # *the* external connector which is actually used
+externalResolutions = None # resultions of the external connector
+args = {} # maps connector names to xrand arguments
+
+# 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"]
 
 # Check what to do
-if externalResolutions is not None: # we need to ask what to do
-       extPosition = PositionSelection(map(res2str, internalResolutions), map(res2str, externalResolutions))
+if externalName is not None: # we need to ask what to do
+       extPosition = PositionSelection(externalName, map(res2user, internalResolutions), map(res2user, externalResolutions))
        extPosition.exec_()
        if not extPosition.result(): sys.exit(1) # the user canceled
-       extResolution = res2str(externalResolutions[extPosition.extResolutions.currentIndex()])
-       intResolution = res2str(internalResolutions[extPosition.intResolutions.currentIndex()])
+       extResolution = res2xrandr(externalResolutions[extPosition.extResolutions.currentIndex()])
+       intResolution = res2xrandr(internalResolutions[extPosition.intResolutions.currentIndex()])
        # build command-line
-       externalArgs = ["--mode", extResolution] # we definitely want an external screen
+       args[externalName] = ["--mode", extResolution] # we definitely want an external screen
        if extPosition.extOnly.isChecked():
-               internalArgs = ["--off"]
-               externalArgs += ["--primary"]
+               args[internalName] = ["--off"]
+               args[externalName] += ["--primary"]
        else:
                # there are two screens
-               internalArgs = ["--mode", intResolution]
+               args[internalName] = ["--mode", intResolution]
                if extPosition.posLeft.isChecked():
-                       externalArgs += ["--left-of", internalName]
+                       args[externalName] += ["--left-of", internalName]
                else:
-                       externalArgs += ["--right-of", internalName]
+                       args[externalName] += ["--right-of", internalName]
                if extPosition.primExt.isChecked():
-                       externalArgs += ["--primary"]
+                       args[externalName] += ["--primary"]
                else:
-                       internalArgs += ["--primary"]
+                       args[internalName] += ["--primary"]
 else:
-       internalArgs = ["--mode", res2str(internalResolutions[0]), "--primary"] # there must be a resolution for the internal screen
-       externalArgs = ["--off"]
+       args[internalName] = ["--mode", res2xrandr(internalResolutions[0]), "--primary"]
 # and do it
-call = ["xrandr", "--output", internalName] + internalArgs + ["--output", externalName] + externalArgs
+call = ["xrandr"]
+for name in args:
+       call += ["--output", name] + args[name]
 print "Call that will be made:",call
 subprocess.check_call(call)