else:
import configparser
-__version__ = "1.8.1"
+__version__ = "1.9"
try:
input = raw_input
(?:[\ \t]*tracking\ (?P<tracking>[0-9]+x[0-9]+\+[0-9]+\+[0-9]+))? # Tracking information
(?:[\ \t]*border\ (?P<border>(?:[0-9]+/){3}[0-9]+))? # Border information
(?:\s*(?: # Properties of the output
- Gamma: (?P<gamma>(?:inf|[0-9\.: e])+) | # Gamma value
+ Gamma: (?P<gamma>(?:inf|[0-9\.\-: e])+) | # Gamma value
CRTC:\s*(?P<crtc>[0-9]) | # CRTC value
Transform: (?P<transform>(?:[\-0-9\. ]+\s+){3}) | # Transformation matrix
EDID: (?P<edid>\s*?(?:\\n\\t\\t[0-9a-f]+)+) | # EDID of the output
def apply_configuration(new_configuration, current_configuration, dry_run=False):
"Apply a configuration"
+ found_top_left_monitor = False
+ 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"]
option_vector = option_vector[:option_index] + option_vector[option_index + 2:]
except ValueError:
pass
-
- enable_outputs.append(option_vector)
+ if not found_top_left_monitor:
+ position = new_configuration[output].options.get("pos", "0x0")
+ if position == "0x0":
+ found_top_left_monitor = True
+ enable_outputs.insert(0, option_vector)
+ elif not found_left_monitor and position.startswith("0x"):
+ found_left_monitor = True
+ enable_outputs.insert(0, option_vector)
+ elif not found_top_monitor and position.endswith("x0"):
+ found_top_monitor = True
+ enable_outputs.insert(0, option_vector)
+ else:
+ enable_outputs.append(option_vector)
+ else:
+ enable_outputs.append(option_vector)
# Perform pe-change auxiliary changes
if auxiliary_changes_pre:
# In the context of a xrandr call that changes the display state, `--query' should do nothing
disable_outputs.insert(0, ['--query'])
+ # If we did not find a candidate, we might need to inject a call
+ # If there is no output to disable, we will enable 0x and x0 at the same time
+ if not found_top_left_monitor and len(disable_outputs) > 0:
+ # If the call to 0x and x0 is splitted, inject one of them
+ if found_top_monitor and found_left_monitor:
+ enable_outputs.insert(0, enable_outputs[0])
+
# Enable the remaining outputs in pairs of two operations
operations = disable_outputs + enable_outputs
for index in range(0, len(operations), 2):