Skip to content

SystemKit: fix framebuffer sizing so single-axis resolution changes a… #540

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

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

SystemKit: fix framebuffer sizing so single-axis resolution changes a… #540

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
33 changes: 20 additions & 13 deletions Frameworks/SystemKit/OSEScreen.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,17 +1091,22 @@ - (BOOL)applyDisplayLayout:(NSArray *)layout

[updateScreenLock lock];

/* If new screen size is BIGGER - set new screen size here
Example: current size is 1440x900, new size 1280x960. Height is bigger
but width is smaller. In VirtualBox this leads to - X Error:
BadMatch (invalid parameter attributes). */
if (newPixSize.width > sizeInPixels.width &&
/* If either dimension GROWS, enlarge the framebuffer up front to the
per-axis maximum of the current and new sizes, so the new CRTC mode
always fits. Growing only when BOTH dimensions increase left the
framebuffer too narrow/short when just one dimension changed (e.g.
1400x1050 -> 1680x1050): XRRSetCrtcConfig then failed with BadMatch and
the display showed a black band. Using the union (not newPixSize) keeps
the framebuffer large enough for the still-current layout during the
transition. */
if (newPixSize.width > sizeInPixels.width ||
newPixSize.height > sizeInPixels.height) {
NSDebugLLog(@"Screen", @"OSEScreen: set new BIGGER screen size: START");
NSDebugLLog(@"Screen", @"OSEScreen: grow screen size to union: START");
XRRSetScreenSize(xDisplay, xRootWindow,
(int)newPixSize.width, (int)newPixSize.height,
(int)MAX(newPixSize.width, sizeInPixels.width),
(int)MAX(newPixSize.height, sizeInPixels.height),
(int)mmSize.width, (int)mmSize.height);
NSDebugLLog(@"Screen", @"OSEScreen: set new BIGGER screen size: END");
NSDebugLLog(@"Screen", @"OSEScreen: grow screen size to union: END");
}

// Set resolution and gamma to displays
Expand Down Expand Up @@ -1143,14 +1148,16 @@ - (BOOL)applyDisplayLayout:(NSArray *)layout
[display setGammaFromDescription:gamma];
}

// If new screen size is SMALLER - set new screen size here
if (newPixSize.width < sizeInPixels.width ||
newPixSize.height < sizeInPixels.height) {
NSDebugLLog(@"Screen", @"OSEScreen: set new SMALLER screen size: START");
// All CRTCs are now placed within the (possibly grown) framebuffer, so set
// it to the exact final size. This shrinks it back when growing only one
// dimension or when the new layout is smaller.
if (newPixSize.width != sizeInPixels.width ||
newPixSize.height != sizeInPixels.height) {
NSDebugLLog(@"Screen", @"OSEScreen: set final screen size: START");
XRRSetScreenSize(xDisplay, xRootWindow,
(int)newPixSize.width, (int)newPixSize.height,
(int)mmSize.width, (int)mmSize.height);
NSDebugLLog(@"Screen", @"OSEScreen: set new SMALLER screen size: END");
NSDebugLLog(@"Screen", @"OSEScreen: set final screen size: END");
}

sizeInPixels = newPixSize;
Expand Down
Loading