From 3a73958f7eab973189441ec9b4a4c96ee6bb8ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 22 Jul 2024 12:55:30 +0200 Subject: [PATCH 2/3] Revert "x11/window: Update comment and variable name to reflect current behavior" This reverts commit e4763d00e8512aeb408ae118597d753f12217487. --- src/x11/window-x11.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index e7c76dd674..b358b64bf2 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -2491,20 +2491,21 @@ meta_window_x11_update_input_region (MetaWindow *window) if (region != NULL) { - MtkRectangle bounding_rect; + MtkRectangle client_area; - bounding_rect.x = 0; - bounding_rect.y = 0; - bounding_rect.width = window->buffer_rect.width; - bounding_rect.height = window->buffer_rect.height; + client_area.x = 0; + client_area.y = 0; + client_area.width = window->buffer_rect.width; + client_area.height = window->buffer_rect.height; /* The shape we get back from the client may have coordinates * outside of the frame. The X SHAPE Extension requires that * the overall shape the client provides never exceeds the * "bounding rectangle" of the window -- the shape that the - * window would have gotten if it was unshaped. + * window would have gotten if it was unshaped. In our case, + * this is simply the client area. */ - mtk_region_intersect_rectangle (region, &bounding_rect); + mtk_region_intersect_rectangle (region, &client_area); } meta_window_set_input_region (window, region); -- 2.44.0.501.g19981daefd.dirty