callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/x11: Clamp window size both when creating and resizing

Browse Source 
We clamp to 32767 when creating a new X11 GdkWindow due to larger sizes
not being supported, but still try to resize to larger when
gdk_window_resize() is called. Fix this by clamping in both places.

This fixes an issue in mutter where ridiculously sized Java windows
would not show up.
This commit is contained in:
Jonas Ådahl
2019-08-06 11:13:55 +02:00
parent f592342870
commit 9dd198e53f
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gdk/x11/gdkwindow-x11.c
View File

@ -1003,6 +1003,25 @@ connect_frame_clock (GdkWindow *window)
} }
} }
static void
clamp_window_size (GdkWindow *window,
gint *width,
gint *height)
{
GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
if (*width * impl->window_scale > 32767 ||
*height * impl->window_scale > 32767)
{
g_warning ("Native Windows wider or taller than 32767 pixels are not supported");
if (*width * impl->window_scale > 32767)
*width = 32767 / impl->window_scale;
if (*height * impl->window_scale > 32767)
*height = 32767 / impl->window_scale;
}
}
void void
_gdk_x11_display_create_window_impl (GdkDisplay *display, _gdk_x11_display_create_window_impl (GdkDisplay *display,
GdkWindow *window, GdkWindow *window,
@ -1101,16 +1120,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
class = InputOnly; class = InputOnly;
} }
if (window->width * impl->window_scale > 32767 || clamp_window_size (window, &window->width, &window->height);
window->height * impl->window_scale > 32767)
{
g_warning ("Native Windows wider or taller than 32767 pixels are not supported");
if (window->width * impl->window_scale > 32767)
window->width = 32767 / impl->window_scale;
if (window->height * impl->window_scale > 32767)
window->height = 32767 / impl->window_scale;
}
impl->unscaled_width = window->width * impl->window_scale; impl->unscaled_width = window->width * impl->window_scale;
impl->unscaled_height = window->height * impl->window_scale; impl->unscaled_height = window->height * impl->window_scale;
@ -1909,6 +1919,8 @@ gdk_window_x11_move_resize (GdkWindow *window,
window_x11_move (window, x, y); window_x11_move (window, x, y);
else else
{ {
clamp_window_size (window, &width, &height);
if (with_move) if (with_move)
window_x11_move_resize (window, x, y, width, height); window_x11_move_resize (window, x, y, width, height);
else else