import posix
import pwd
import re
+import shlex
import subprocess
import sys
import shutil
else:
import configparser
-__version__ = "1.11"
+__version__ = "1.12.1"
try:
input = raw_input
"Return the command line parameters for XRandR for this instance"
args = ["--output", self.output]
for option, arg in sorted(self.options_with_defaults.items()):
- if option[:5] == "prop-":
+ if option.startswith("x-prop-"):
prop_found = False
for prop, xrandr_prop in [(re.sub(r"\W+", "_", p.lower()), p) for p in properties]:
- if prop == option[5:]:
+ if prop == option[7:]:
args.append("--set")
args.append(xrandr_prop)
prop_found = True
break
if not prop_found:
- print("Warning: Unknown property `%s' in config file. Skipping." % option[5:], file=sys.stderr)
+ print("Warning: Unknown property `%s' in config file. Skipping." % option[7:], file=sys.stderr)
continue
+ elif option.startswith("x-"):
+ print("Warning: Unknown option `%s' in config file. Skipping." % option, file=sys.stderr)
+ continue
else:
args.append("--%s" % option)
if arg:
options["rate"] = match["rate"]
for prop in [re.sub(r"\W+", "_", p.lower()) for p in properties]:
if match[prop]:
- options["prop-" + prop] = match[prop]
+ options["x-prop-" + prop] = match[prop]
return XrandrOutput(match["output"], edid, options), modes
return "Debug information would be available if the `regex' module was installed."
-def parse_xrandr_output():
+def parse_xrandr_output(
+ *,
+ ignore_lid,
+):
"Parse the output of `xrandr --verbose' into a list of outputs"
xrandr_output = os.popen("xrandr -q --verbose").read()
if not xrandr_output:
modes[output_name] = output_modes
# consider a closed lid as disconnected if other outputs are connected
- if sum(o.edid != None for o in outputs.values()) > 1:
+ if not ignore_lid and sum(
+ o.edid != None
+ for o
+ in outputs.values()
+ ) > 1:
for output_name in outputs.keys():
if is_closed_lid(output_name):
outputs[output_name].edid = None
profile_config = profiles[p]["config"]
for edid in edid_map:
- for c in profile_config.keys():
+ for c in list(profile_config.keys()):
if profile_config[c].edid != edid or c == edid_map[edid]:
continue
waits a second and then retries once. This mitigates #47,
a timing issue with some drivers.
"""
- if "dry_run" in kwargs:
- dry_run = kwargs["dry_run"]
- del kwargs["dry_run"]
+ if kwargs.pop("dry_run", False):
+ for arg in args[0]:
+ print(shlex.quote(arg), end=" ")
+ print()
+ return 0
else:
- dry_run = False
- kwargs_redirected = dict(kwargs)
- if not dry_run:
if hasattr(subprocess, "DEVNULL"):
- kwargs_redirected["stdout"] = getattr(subprocess, "DEVNULL")
+ kwargs["stdout"] = getattr(subprocess, "DEVNULL")
else:
- kwargs_redirected["stdout"] = open(os.devnull, "w")
- kwargs_redirected["stderr"] = kwargs_redirected["stdout"]
- retval = subprocess.call(*args, **kwargs_redirected)
- if retval != 0:
- time.sleep(1)
+ kwargs["stdout"] = open(os.devnull, "w")
+ kwargs["stderr"] = kwargs["stdout"]
retval = subprocess.call(*args, **kwargs)
- return retval
+ if retval != 0:
+ time.sleep(1)
+ retval = subprocess.call(*args, **kwargs)
+ return retval
def get_fb_dimensions(configuration):
found_left_monitor = False
found_top_monitor = False
outputs = sorted(new_configuration.keys(), key=lambda x: new_configuration[x].sort_key)
- if dry_run:
- base_argv = ["echo", "xrandr"]
- else:
- base_argv = ["xrandr"]
+ base_argv = ["xrandr"]
# There are several xrandr / driver bugs we need to take care of here:
# - We cannot enable more than two screens at the same time
sys.exit(1)
os.waitpid(child_pid, 0)
+ # The following line assumes that user accounts start at 1000 and that no
+ # one works using the root or another system account. This is rather
+ # restrictive, but de facto default. If this breaks your use case, set the
+ # env var AUTORANDR_UID_MIN as appropriate. (Alternatives would be to use
+ # the UID_MIN from /etc/login.defs or FIRST_UID from /etc/adduser.conf; but
+ # effectively, both values aren't binding in any way.)
+ uid_min = 1000
+ if 'AUTORANDR_UID_MIN' in os.environ:
+ uid_min = int(os.environ['AUTORANDR_UID_MIN'])
+
for directory in os.listdir("/proc"):
directory = os.path.join("/proc/", directory)
if not os.path.isdir(directory):
continue
uid = os.stat(environ_file).st_uid
- # The following line assumes that user accounts start at 1000 and that
- # no one works using the root or another system account. This is rather
- # restrictive, but de facto default. Alternatives would be to use the
- # UID_MIN from /etc/login.defs or FIRST_UID from /etc/adduser.conf;
- # but effectively, both values aren't binding in any way.
- # If this breaks your use case, please file a bug on Github.
- if uid < 1000:
+ if uid < uid_min:
continue
process_environ = {}
def main(argv):
try:
- opts, args = getopt.getopt(argv[1:], "s:r:l:d:cfh",
- ["batch", "dry-run", "change", "cycle", "default=", "save=", "remove=", "load=",
- "force", "fingerprint", "config", "debug", "skip-options=", "help",
- "list", "current", "detected", "version", "match-edid"])
+ opts, args = getopt.getopt(
+ argv[1:],
+ "s:r:l:d:cfh",
+ [
+ "batch",
+ "dry-run",
+ "change",
+ "cycle",
+ "default=",
+ "save=",
+ "remove=",
+ "load=",
+ "force",
+ "fingerprint",
+ "config",
+ "debug",
+ "skip-options=",
+ "help",
+ "list",
+ "current",
+ "detected",
+ "version",
+ "match-edid",
+ "ignore-lid"
+ ]
+ )
except getopt.GetoptError as e:
print("Failed to parse options: {0}.\n"
"Use --help to get usage information.".format(str(e)),
raise AutorandrException("Failed to load profiles", e)
exec_scripts(None, "predetect")
- config, modes = parse_xrandr_output()
+
+ ignore_lid = "--ignore-lid" in options
+
+ config, modes = parse_xrandr_output(
+ ignore_lid=ignore_lid,
+ )
if "--match-edid" in options:
update_profiles_edid(profiles, config)
raise AutorandrException("Failed to apply profile '%s'" % load_profile, e, True)
if "--dry-run" not in options and "--debug" in options:
- new_config, _ = parse_xrandr_output()
+ new_config, _ = parse_xrandr_output(
+ ignore_lid=ignore_lid,
+ )
if not is_equal_configuration(new_config, load_config):
print("The configuration change did not go as expected:")
print_profile_differences(new_config, load_config)