-#!/usr/bin/python
+#!/usr/bin/python3
# DSL - easy Display Setup for Laptops
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012
-2014 Ralf Jung <post@ralfj.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import argparse, sys, os, re, subprocess
-import gui
+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
commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
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
# 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):
# unknown 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
+ print("Warning: Unknown xrandr line %s" % line)
return connectors
# convert a (width, height) pair into a string accepted by xrandr as argument for --mode
if connector == internalConnector:
raise Exception("%s is both internal and external, that doesn't make sense." % connector)
else:
- externalConnectors = allConnectors.keys()
+ externalConnectors = list(allConnectors.keys())
externalConnectors.remove(internalConnector)
if not externalConnectors:
raise Exception("No external connector found - either your config is wrong, or your machine has only one connector.")
try:
# parse command-line arguments
parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
- parser.add_argument("-r, --relative-position",
+ 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)
# 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?)
setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions
else:
# use GUI
- setup = gui.setup(connectors[internalConnector], connectors[usedExternalConnector])
+ setup = frontend.setup(connectors[internalConnector], connectors[usedExternalConnector])
if setup is None: sys.exit(1) # the user canceled
# apply it
connectorArgs[internalConnector] = setup.getInternalArgs()
call = ["xrandr"]
for name in connectorArgs:
call += ["--output", name] + connectorArgs[name]
- print "Call that will be made:",call
+ 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:
- gui.error(str(e))
+ frontend.error(str(e))
raise
projects / lilass.git / blobdiff