properly open and close processes

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index f9c58fa641bb4969c081ded41256f93f2b0f104f..d13d0a0f8dc058c008fe2e12dbc7393624cb242b 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -13,10 +13,10 @@
 # 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.
 
-import sys, os, re, subprocess
+import argparse, sys, os, re, subprocess
 import gui
 
 # for auto-config: common names of internal connectors
@@ -46,7 +46,7 @@ class ScreenSetup:
                return args
        
        def getExternalArgs(self, intName):
-               args = ["--mode", res2xrandr(self.extResolution)]
+               args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution
                if self.extIsPrimary:
                        args.append('--primary')
                if self.relPosition == RelativeScreenPosition.LEFT:
@@ -78,13 +78,24 @@ def loadConfigFile(file):
        # add some convencience get functions
        return result
 
+# helper function: execute a process, return output as iterator, throw exception if there was an error
+# you *must* iterate to the end if you use this!
+def processOutputGen(*args):
+       p = subprocess.Popen(args, stdout=subprocess.PIPE)
+       for line in p.stdout:
+               yield line
+       p.wait() # wait for process to exit (it closed stdout, so it can't block anymore)
+       if p.returncode != 0:
+               raise Exception("Error executing "+str(args))
+def processOutputIt(*args):
+       return list(processOutputGen(*args)) # list() iterates over the generator
+
 # 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:
+       for line in processOutputGen("xrandr", "-q"):
                # screen?
                m = re.search(r'^Screen [0-9]+: ', line)
                if m is not None: # ignore this line
@@ -107,10 +118,6 @@ def getXrandrInformation():
                # 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
-       if p.returncode != 0: raise Exception("Querying xrandr for data failed.")
        return connectors
 
 # convert a (width, height) pair into a string accepted by xrandr as argument for --mode
@@ -173,6 +180,13 @@ def classifyConnectors(allConnectors):
 # 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)
@@ -185,10 +199,20 @@ if __name__ == "__main__":
                # 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 ask what to do
-                       # get setup
-                       dialogue = gui.getDialogue(connectors[internalConnector], connectors[usedExternalConnector])
-                       setup = dialogue.run()
+               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()