when forcefully switching to internal mode, check brightness of internal screen and...

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 9dd2223c42cece516f5c5f14b062842261837d62..2baca7dddbf9c64677a8ef65b2925679c0d23aa3 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -57,15 +57,15 @@ class ScreenSetup:
                return args
 
 # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
-def loadConfigFile(file):
+def loadConfigFile(filename):
        import shlex
        result = {}
-       if not os.path.exists(file):
+       if not os.path.exists(filename):
                return result # no config file
        # read config file
        linenr = 0
-       with open(file) as file:
-               for line in file:
+       with open(filename) as f:
+               for line in f:
                        linenr += 1
                        line = line.strip()
                        if not len(line) or line.startswith("#"): continue # skip empty and comment lines
@@ -82,10 +82,9 @@ def loadConfigFile(file):
 # 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)
+       with subprocess.Popen(args, stdout=subprocess.PIPE) as p:
+               for line in p.stdout:
+                       yield line.decode("utf-8")
        if p.returncode != 0:
                raise Exception("Error executing "+str(args))
 def processOutputIt(*args):
@@ -189,6 +188,9 @@ if __name__ == "__main__":
                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
@@ -206,7 +208,7 @@ 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:
+               if not cmdArgs.internal_only and 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?)
@@ -234,6 +236,12 @@ if __name__ == "__main__":
                        call += ["--output", name] + connectorArgs[name]
                print("Call that will be made:",call)
                subprocess.check_call(call)
+               
+               # make sure the internal screen is really, *really* turned on if requested
+               if cmdArgs.internal_only:
+                       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 Exception as e:
                frontend.error(str(e))
                raise