Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep the frame-buffer size flexible until the very end #408

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Keep the frame-buffer size flexible until the very end #408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions autorandr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,13 +925,6 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False)
# explicitly, so avoid it unless necessary.
# (See https://github.com/phillipberndt/autorandr/issues/72)

fb_dimensions = get_fb_dimensions(new_configuration)
try:
fb_args = ["--fb", "%dx%d" % fb_dimensions]
except:
# Failed to obtain frame-buffer size. Doesn't matter, xrandr will choose for the user.
fb_args = []

auxiliary_changes_pre = []
disable_outputs = []
enable_outputs = []
Expand Down Expand Up @@ -980,11 +973,6 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False)
if call_and_retry(argv, dry_run=dry_run) != 0:
raise AutorandrException("Command failed: %s" % " ".join(map(shlex.quote, argv)))

# Starting here, fix the frame buffer size
# Do not do this earlier, as disabling scaling might temporarily make the framebuffer
# dimensions larger than they will finally be.
base_argv += fb_args

# Disable unused outputs, but make sure that there always is at least one active screen
disable_keep = 0 if remain_active_count else 1
if len(disable_outputs) > disable_keep:
Expand Down Expand Up @@ -1018,9 +1006,13 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False)
if call_and_retry(argv, dry_run=dry_run) != 0:
raise AutorandrException("Command failed: %s" % " ".join(map(shlex.quote, argv)))

# Adjust the frame buffer to match (see #319)
if fb_args:
argv = base_argv
# Finally, fix the frame buffer size
# Do not do this earlier, as disabling scaling might temporarily make the framebuffer
# dimensions larger than they will finally be. (see #319 and #404)
fb_dimensions = get_fb_dimensions(new_configuration)
if fb_dimensions is not None:
fb_args = ["--fb", "%dx%d" % fb_dimensions]
argv = base_argv + fb_args
if call_and_retry(argv, dry_run=dry_run) != 0:
raise AutorandrException("Command failed: %s" % " ".join(map(shlex.quote, argv)))

Expand Down