File mutter-SLE-bsc984738-grab-display.patch of Package mutter

Overview Repositories Revisions Requests Users Attributes Meta

File mutter-SLE-bsc984738-grab-display.patch of Package mutter (Revision bc8e8c053bcb32f4e2b0225ac7cda479)

Currently displaying revision bc8e8c053bcb32f4e2b0225ac7cda479 , Show latest

Index: mutter-41.0/src/core/display.c
===================================================================
--- mutter-41.0.orig/src/core/display.c
+++ mutter-41.0/src/core/display.c
@@ -826,6 +826,8 @@ meta_display_new (MetaContext  *context,
   display->check_fullscreen_later = 0;
   display->work_area_later = 0;
 
+  display->server_grab_count = 0;
+
   display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */
   display->allow_terminal_deactivation = TRUE; /* Only relevant for when a
                                                   terminal has the focus */
@@ -1141,6 +1143,50 @@ meta_display_close (MetaDisplay *display
   the_display = NULL;
 }
 
+/* Grab/ungrab routines taken from fvwm.
+ * Calling this function will cause X to ignore all other clients until
+ * you ungrab. This may not be quite as bad as it sounds, yet there is
+ * agreement that avoiding server grabs except when they are clearly needed
+ * is a good thing.
+ *
+ * If you do use such grabs, please clearly explain the necessity for their
+ * usage in a comment. Try to keep their scope extremely limited. In
+ * particular, try to avoid emitting any signals or notifications while
+ * a grab is active (if the signal receiver tries to block on an X request
+ * from another client at this point, you will have a deadlock).
+ */
+void
+meta_display_grab (MetaDisplay *display)
+{
+  if (display->server_grab_count == 0)
+    {
+      XGrabServer (display->x11_display->xdisplay);
+    }
+  display->server_grab_count += 1;
+  meta_verbose ("Grabbing display, grab count now %d\n",
+                display->server_grab_count);
+}
+
+void
+meta_display_ungrab (MetaDisplay *display)
+{
+  if (display->server_grab_count == 0)
+    meta_bug ("Ungrabbed non-grabbed server\n");
+
+  display->server_grab_count -= 1;
+  if (display->server_grab_count == 0)
+    {
+      /* FIXME we want to purge all pending "queued" stuff
+       * at this point, such as window hide/show
+       */
+      XUngrabServer (display->x11_display->xdisplay);
+      XFlush (display->x11_display->xdisplay);
+    }
+
+  meta_verbose ("Ungrabbing display, grab count now %d\n",
+                display->server_grab_count);
+}
+
 /**
  * meta_display_for_x_display:
  * @xdisplay: An X display
Index: mutter-41.0/src/core/display-private.h
===================================================================
--- mutter-41.0.orig/src/core/display-private.h
+++ mutter-41.0/src/core/display-private.h
@@ -140,6 +140,8 @@ struct _MetaDisplay
   GHashTable *stamps;
   GHashTable *wayland_windows;
 
+  int server_grab_count;
+
   /* serials of leave/unmap events that may
    * correspond to an enter event we should
    * ignore
@@ -258,6 +260,8 @@ struct _MetaDisplayClass
 
 MetaDisplay * meta_display_new (MetaContext  *context,
                                 GError      **error);
+void          meta_display_grab                (MetaDisplay *display);
+void          meta_display_ungrab              (MetaDisplay *display);
 
 void meta_display_manage_all_xwindows (MetaDisplay *display);
 void meta_display_unmanage_windows   (MetaDisplay *display,
Index: mutter-41.0/src/core/keybindings.c
===================================================================
--- mutter-41.0.orig/src/core/keybindings.c
+++ mutter-41.0/src/core/keybindings.c
@@ -1253,6 +1253,9 @@ meta_display_grab_window_buttons (MetaDi
 {
   MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+  if (display->server_grab_count > 0)
+    return;
+
   /* Grab Alt + button1 for moving window.
    * Grab Alt + button2 for resizing window.
    * Grab Alt + button3 for popping up window menu.
@@ -1289,6 +1292,9 @@ meta_display_ungrab_window_buttons (Meta
 {
   MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+  if (display->server_grab_count > 0)
+    return;
+
   if (keys->window_grab_modifiers == 0)
     return;
 
@@ -1319,6 +1325,9 @@ meta_display_grab_focus_window_button (M
 {
   MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+  if (display->server_grab_count > 0)
+    return;
+
   /* Grab button 1 for activating unfocused windows */
   meta_verbose ("Grabbing unfocused window buttons for %s", window->desc);
 
@@ -1343,6 +1352,9 @@ meta_display_ungrab_focus_window_button
 {
   MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+  if (display->server_grab_count > 0)
+    return;
+
   meta_verbose ("Ungrabbing unfocused window buttons for %s", window->desc);
 
   if (!window->have_focus_click_grab)
@@ -1588,6 +1600,10 @@ meta_window_grab_keys (MetaWindow  *wind
 
   if (meta_is_wayland_compositor ())
     return;
+
+  if (display->server_grab_count > 0)
+    return;
+    
   if (window->all_keys_grabbed)
     return;
 
@@ -1627,6 +1643,9 @@ meta_window_ungrab_keys (MetaWindow  *wi
       MetaDisplay *display = window->display;
       MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+      if (display->server_grab_count > 0)
+        return;
+
       if (window->grab_on_frame &&
           window->frame != NULL)
         change_window_keygrabs (keys, window->frame->xwindow, FALSE);
Index: mutter-41.0/src/x11/meta-x11-display.c
===================================================================
--- mutter-41.0.orig/src/x11/meta-x11-display.c
+++ mutter-41.0/src/x11/meta-x11-display.c
@@ -1916,7 +1916,7 @@ meta_x11_display_set_input_focus_interna
    * we know which is which by making two requests that the server will
    * process at the same time.
    */
-  XGrabServer (x11_display->xdisplay);
+  meta_display_grab(x11_display->display);
 
   XSetInputFocus (x11_display->xdisplay,
                   xwindow,
@@ -1928,8 +1928,7 @@ meta_x11_display_set_input_focus_interna
                    x11_display->atom__MUTTER_FOCUS_SET,
                    XA_STRING, 8, PropModeAppend, NULL, 0);
 
-  XUngrabServer (x11_display->xdisplay);
-  XFlush (x11_display->xdisplay);
+  meta_display_ungrab(x11_display->display);
 
   meta_x11_error_trap_pop (x11_display);
 }
Index: mutter-41.0/src/x11/window-x11.c
===================================================================
--- mutter-41.0.orig/src/x11/window-x11.c
+++ mutter-41.0/src/x11/window-x11.c
@@ -522,6 +522,8 @@ meta_window_x11_manage (MetaWindow *wind
 
   meta_icon_cache_init (&priv->icon_cache);
 
+  meta_display_grab (display);
+
   meta_x11_display_register_x_window (display->x11_display,
                                       &window->xwindow,
                                       window);
@@ -582,6 +584,13 @@ meta_window_x11_manage (MetaWindow *wind
 
   meta_window_x11_update_shape_region (window);
   meta_window_x11_update_input_region (window);
+
+  meta_display_ungrab (display);
+
+  /* Perform operations prevented by grab */
+  if (window->frame)
+    meta_display_grab_window_buttons (display, window->frame->xwindow);
+  meta_window_grab_keys (window);
 }
 
 static void

Places

File mutter-SLE-bsc984738-grab-display.patch of Package mutter (Revision bc8e8c053bcb32f4e2b0225ac7cda479)

Places