From 771b1a0788198bfb9e82fd07c43d81413913cbfe Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 31 Jan 2019 12:02:39 +0100 Subject: [PATCH] shell: Do not set XFixes input region on wayland compositors This is just needed on the X11 compositor, wayland compositors are known for handling their own input. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/378 --- js/ui/layout.js | 3 +-- src/shell-global.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/ui/layout.js b/js/ui/layout.js index b98827a3c..6f6677d64 100644 --- a/js/ui/layout.js +++ b/js/ui/layout.js @@ -1072,8 +1072,7 @@ var LayoutManager = GObject.registerClass({ } } - if (!Meta.is_wayland_compositor()) - global.set_stage_input_region(rects); + global.set_stage_input_region(rects); this._isPopupWindowVisible = isPopupMenuVisible; let workspaceManager = global.workspace_manager; diff --git a/src/shell-global.c b/src/shell-global.c index 4295162a8..4ad23fdac 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -642,6 +642,9 @@ shell_global_set_stage_input_region (ShellGlobal *global, g_return_if_fail (SHELL_IS_GLOBAL (global)); + if (meta_is_wayland_compositor ()) + return; + nrects = g_slist_length (rectangles); rects = g_new (XRectangle, nrects); for (r = rectangles, i = 0; r; r = r->next, i++)