From 5c80c4b0064fab81c5188f14b7d9d14ac785bd00 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 12 Oct 2014 16:12:26 -0700 Subject: [PATCH] window-x11: Update the input region after setting the client rect We clip the input region to the client rect, so the client rect should be up to date before we fetch the input region. This fixes popup windows not working in GTK+2 under Wayland. We should also update the shape / input regions when the window is reconfigured for a complete fix, so that making an O-R window bigger doesn't confuse mutter, but let's leave that to a future commit. --- src/x11/window-x11.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 53c04d5f7..1dca3e344 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -509,8 +509,6 @@ meta_window_x11_manage (MetaWindow *window) meta_icon_cache_init (&priv->icon_cache); meta_display_register_x_window (display, &window->xwindow, window); - meta_window_x11_update_shape_region (window); - meta_window_x11_update_input_region (window); /* assign the window to its group, or create a new group if needed */ window->group = NULL; @@ -568,6 +566,9 @@ meta_window_x11_manage (MetaWindow *window) meta_window_client_rect_to_frame_rect (window, &rect, &rect); meta_window_move_resize_internal (window, flags, gravity, rect); } + + meta_window_x11_update_shape_region (window); + meta_window_x11_update_input_region (window); } static void