From: Brice Waegeneire Date: Mon, 16 Jul 2018 17:35:52 +0000 (+0200) Subject: AUTORANDR_MONITORS only contains current monitors X-Git-Tag: 1.6~3^2 X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=commitdiff_plain;h=7086c637535d9053220f0764a7b8bb65d91fa279 AUTORANDR_MONITORS only contains current monitors Signed-off-by: Brice Waegeneire --- diff --git a/autorandr.py b/autorandr.py index 30fa225..f3612cb 100755 --- a/autorandr.py +++ b/autorandr.py @@ -1073,6 +1073,15 @@ def dispatch_call_to_sessions(argv): X11_displays_done.add(display) +def enabled_monitors(config): + monitors = [] + for monitor in config: + if "--off" in config[monitor].option_vector: + continue + monitors.append(monitor) + return monitors + + def read_config(options, directory): """Parse a configuration config.ini from directory and merge it into the options dictionary""" @@ -1178,7 +1187,7 @@ def main(argv): exec_scripts(profile_folder, "postsave", { "CURRENT_PROFILE": options["--save"], "PROFILE_FOLDER": profile_folder, - "MONITORS": ":".join(config.keys()), + "MONITORS": ":".join(enabled_monitors(config)), }) except Exception as e: raise AutorandrException("Failed to save current configuration as profile '%s'" % (options["--save"],), e) @@ -1299,7 +1308,7 @@ def main(argv): script_metadata = { "CURRENT_PROFILE": load_profile, "PROFILE_FOLDER": scripts_path, - "MONITORS": ":".join(load_config.keys()), + "MONITORS": ":".join(enabled_monitors(load_config)), } exec_scripts(scripts_path, "preswitch", script_metadata) if "--debug" in options: