fixed zenity

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index e0e71d11ac09b9d51453e15f3f124b762c44ba42..707a5c008cf2d85172879d289046cc29d5563550 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -21,13 +21,22 @@ from gui import getFrontend
 frontend = getFrontend("cli") # the fallback, until we got a proper frontend. This is guaranteed to be available.
 
 # for auto-config: common names of internal connectors
 frontend = getFrontend("cli") # the fallback, until we got a proper frontend. This is guaranteed to be available.
 
 # for auto-config: common names of internal connectors

-commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
+commonInternalConnectorPrefixes = ['LVDS', 'eDP']
+commonInternalConnectorSuffices = ['', '0', '1', '-0', '-1']

 
 # this is as close as one can get to an enum in Python
 class RelativeScreenPosition:
     LEFT          = 0
     RIGHT         = 1
     EXTERNAL_ONLY = 2
 
 # this is as close as one can get to an enum in Python
 class RelativeScreenPosition:
     LEFT          = 0
     RIGHT         = 1
     EXTERNAL_ONLY = 2

+    MIRROR        = 3
+    
+    __names__ = {
+        'left': LEFT,
+        'right': RIGHT,
+        'external-only': EXTERNAL_ONLY,
+        'mirror': MIRROR
+    }

 
 # storing what's necessary for screen setup
 class ScreenSetup:
 
 # storing what's necessary for screen setup
 class ScreenSetup:


@@ -50,10 +59,15 @@ class ScreenSetup:
         args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution
         if self.extIsPrimary:
             args.append('--primary')
         args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution
         if self.extIsPrimary:
             args.append('--primary')

+        # set position

         if self.relPosition == RelativeScreenPosition.LEFT:
             args += ['--left-of', intName]
         elif self.relPosition == RelativeScreenPosition.RIGHT:
             args += ['--right-of', intName]
         if self.relPosition == RelativeScreenPosition.LEFT:
             args += ['--left-of', intName]
         elif self.relPosition == RelativeScreenPosition.RIGHT:
             args += ['--right-of', intName]

+        elif self.relPosition == RelativeScreenPosition.MIRROR:
+            args += ['--same-as', intName]
+        else:
+            assert self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY

         return args
 
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
         return args
 
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)


@@ -79,6 +93,12 @@ def loadConfigFile(filename):
     # add some convencience get functions
     return result
 
     # add some convencience get functions
     return result
 

+# iterator yielding common names of internal connectors
+def commonInternalConnectorNames():
+    for prefix in commonInternalConnectorPrefixes:
+        for suffix in commonInternalConnectorSuffices:
+            yield prefix+suffix
+

 # 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):
 # 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):


@@ -158,7 +178,7 @@ def classifyConnectors(allConnectors):
             raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
     else:
         # auto-config
             raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
     else:
         # auto-config

-        internalConnector = findAvailableConnector(commonInternalConnectorNames, allConnectors)
+        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 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


@@ -179,23 +199,22 @@ def classifyConnectors(allConnectors):
 
 # if we run top-level
 if __name__ == "__main__":
 
 # if we run top-level
 if __name__ == "__main__":

+    # parse command-line arguments
+    parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
+    parser.add_argument("-f", "--frontend",
+                        dest="frontend",
+                        help="The frontend to be used for user interaction")
+    parser.add_argument("-r", "--relative-position",
+                        dest="rel_position", choices=RelativeScreenPosition.__names__.keys(),
+                        help="Position of external screen relative to internal one")
+    parser.add_argument("-i", "--internal-only",
+                        dest="internal_only", action='store_true',
+                        help="Enable internal screen, disable all the others (as if no external screen was connected")
+    cmdArgs = parser.parse_args()
+    
+    # load frontend
+    frontend = getFrontend(cmdArgs.frontend)

     try:
     try:

-        # parse command-line arguments
-        parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
-        parser.add_argument("-f", "--frontend",
-                            dest="frontend",
-                            help="The frontend to be used for user interaction")
-        parser.add_argument("-r", "--relative-position",
-                            dest="rel_position", choices=('left', 'right', 'external-only'),
-                            help="Position of external screen relative to internal one")
-        parser.add_argument("-i", "--internal-only",
-                            dest="internal_only", action='store_true',
-                            help="Enable internal screen, disable all the others (as if no external screen was connected")
-        cmdArgs = parser.parse_args()
-        
-        # load frontend
-        frontend = getFrontend(cmdArgs.frontend)
-        

         # load connectors and classify them
         connectors = getXrandrInformation()
         (internalConnector, externalConnectors) = classifyConnectors(connectors)
         # load connectors and classify them
         connectors = getXrandrInformation()
         (internalConnector, externalConnectors) = classifyConnectors(connectors)


@@ -206,23 +225,22 @@ if __name__ == "__main__":
             connectorArgs[c] = ["--off"]
         
         # check whether we got an external screen or not
             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
         hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None
         if hasExternal:
         usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used
         hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None
         if hasExternal:

+            # compute the list of resolutons available on both
+            commonRes = [res for res in connectors[usedExternalConnector] if res in connectors[internalConnector]]

             # there's an external screen connected, we need to get a setup
             if cmdArgs.rel_position 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
+                # use command-line arguments
+                relPosition = RelativeScreenPosition.__names__[cmdArgs.rel_position]
+                if relPosition == RelativeScreenPosition.MIRROR:
+                    setup = ScreenSetup(relPosition, commonRes[0], commonRes[0]) # use default resolutions

                 else:
                 else:

-                    relPosition = RelativeScreenPosition.EXTERNAL_ONLY
-                setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions
+                    setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions

             else:
                 # use GUI
             else:
                 # use GUI

-                setup = frontend.setup(connectors[internalConnector], connectors[usedExternalConnector])
+                setup = frontend.setup(connectors[internalConnector], connectors[usedExternalConnector], commonRes)

             if setup is None: sys.exit(1) # the user canceled
             # apply it
             connectorArgs[internalConnector] = setup.getInternalArgs()
             if setup is None: sys.exit(1) # the user canceled
             # apply it
             connectorArgs[internalConnector] = setup.getInternalArgs()


@@ -240,9 +258,14 @@ if __name__ == "__main__":
         
         # make sure the internal screen is really, *really* turned on if there is no external screen
         if not hasExternal:
         
         # make sure the internal screen is really, *really* turned on if there is no external screen
         if not hasExternal:

-            backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip())
-            if backlight == 0: # it's completely turned off, we better enable it
-                subprocess.check_call(["xbacklight", "-set", "100"])
+            try:
+                backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip())
+                if backlight == 0: # it's completely turned off, we better enable it
+                    subprocess.check_call(["xbacklight", "-set", "100"])
+            except FileNotFoundError:
+                print("xbacklight has not been found, unable to turn your laptop backlight on.")
+            except subprocess.CalledProcessError:
+                print("xbacklight returned an error while attempting to turn your laptop backlight on.")

     except Exception as e:
         frontend.error(str(e))
         raise
     except Exception as e:
         frontend.error(str(e))
         raise