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

Jump to bottom

Fix X11 screen size when using fractional "scale-up" mode #694

Merged
merged 3 commits into from
May 23, 2024
Merged

Fix X11 screen size when using fractional "scale-up" mode #694

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74562e3
meta-monitor-manager-xrandr.c: fix crtc disabling
jknockel May 12, 2024
652ff9b
meta-monitor-manager-xrandr.c: fix screen size
jknockel May 12, 2024
c3dd5a4
meta-monitor-manager-xrandr.c: screen size fixes
jknockel May 12, 2024
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
23 changes: 12 additions & 11 deletions src/backends/x11/meta-monitor-manager-xrandr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
MetaX11ScaleMode scale_mode = meta_settings_get_x11_scale_mode (settings);
unsigned i, valid_crtcs;
GList *l;
int width, height;
int width, height, scaled_width, scaled_height;
float max_scale;
float avg_screen_scale;
gboolean have_scaling;
Expand All @@ -563,6 +563,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
/* Compute the new size of the screen (framebuffer) */
max_scale = get_maximum_crtc_info_scale (crtcs, n_crtcs);
width = 0; height = 0;
scaled_width = 0; scaled_height = 0;
avg_screen_scale = 0;
valid_crtcs = 0;
for (i = 0; i < n_crtcs; i++)
Expand All @@ -578,6 +579,13 @@ apply_crtc_assignments (MetaMonitorManager *manager,

if (have_scaling && scale_mode == META_X11_SCALE_MODE_UI_DOWN)
scale = (ceilf (max_scale) / crtc_info->scale) * crtc_info->scale;
else
{
scaled_width = MAX (scaled_width, crtc_info->layout.origin.x +
crtc_info->layout.size.width * crtc_info->scale);
scaled_height = MAX (scaled_height, crtc_info->layout.origin.y +
crtc_info->layout.size.height * crtc_info->scale);
}

width = MAX (width, (int) roundf (crtc_info->layout.origin.x +
crtc_info->layout.size.width * scale));
Expand Down Expand Up @@ -609,7 +617,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
y2 = (int) roundf (crtc_config->layout.origin.y +
crtc_config->layout.size.height);

if (!crtc_info->mode || x2 > width || y2 > height)
if (!crtc_info->mode || width < scaled_width || height < scaled_height || x2 > width || y2 > height)
{
xrandr_set_crtc_config (manager_xrandr,
crtc,
Expand Down Expand Up @@ -661,7 +669,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
if (!n_crtcs)
goto out;

if (width > manager->screen_width || height > manager->screen_height)
if (width > 0 && height > 0)
{
meta_monitor_manager_xrandr_update_screen_size (manager_xrandr,
width, height,
Expand Down Expand Up @@ -783,13 +791,6 @@ apply_crtc_assignments (MetaMonitorManager *manager,
output->is_primary = FALSE;
}

if (width > 0 && height > 0)
{
meta_monitor_manager_xrandr_update_screen_size (manager_xrandr,
width, height,
avg_screen_scale);
}

out:
XUngrabServer (manager_xrandr->xdisplay);
XFlush (manager_xrandr->xdisplay);
Expand Down Expand Up @@ -846,7 +847,7 @@ meta_monitor_manager_xrandr_update_screen_size_derived (MetaMonitorManager *mana
if (!crtc || !crtc->config)
continue;

if (!have_scaling || scale_mode != META_X11_SCALE_MODE_UI_DOWN)
if (!have_scaling)
{
/* When scaling up we should not reduce the screen size, or X will
* fail miserably, while we must do it when scaling down, in order to
Expand Down
Loading