[gnome-shell/wip/carlosg/x11less-preparations: 2/3] shell: Do not set XFixes input region on wayland compositors



commit f574dc09518865b80b053843a8fd7efa56781411
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jan 31 12:02:39 2019 +0100

    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 5bf3ec573..55ca2da4f 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1051,8 +1051,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 df84b6b0d..8f778c0f1 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++)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]