From a50b16aa1ad5a6819e902cc0570bbf18421563fc Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Thu, 16 Dec 2021 11:14:23 +0100 Subject: [PATCH] Prefix custom properties with x- and ignore unknown ones --- autorandr.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/autorandr.py b/autorandr.py index ccae968..3e17882 100755 --- a/autorandr.py +++ b/autorandr.py @@ -266,17 +266,20 @@ class XrandrOutput(object): "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: @@ -429,7 +432,7 @@ class XrandrOutput(object): 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 -- 2.39.2