[metacity] frame: remove unnecessary server grab



commit c66c3bc46f470504bc7d402261294e3cbc2128e3
Author: Daniel Drake <drake endlessm com>
Date:   Thu Jan 2 09:49:10 2014 -0600

    frame: remove unnecessary server grab
    
    meta_window_ensure_frame() creates its own grab and has a comment
    claiming that it must be called under a grab too.
    
    But the reasoning given in the comment does not seem relevant here.
    We only frame non-override-redirect windows, so we are creating
    the frame in response to MapRequest. There is no way that the child
    could receive a MapNotify at this point, since that only happens
    much later, once we go through the CALC_SHOWING queue and call
    XMapWindow() from meta_window_show().
    
    Remove the unnecessary grab.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=721345

 src/core/frame.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/src/core/frame.c b/src/core/frame.c
index c4387a5..192464d 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -77,9 +77,6 @@ meta_window_ensure_frame (MetaWindow *window)
   if (window->frame)
     return;
 
-  /* See comment below for why this is required. */
-  meta_display_grab (window->display);
-
   frame = g_new (MetaFrame, 1);
 
   frame->window = window;
@@ -121,14 +118,6 @@ meta_window_ensure_frame (MetaWindow *window)
 
   meta_display_register_x_window (window->display, &frame->xwindow, window);
 
-  /* Reparent the client window; it may be destroyed,
-   * thus the error trap. We'll get a destroy notify later
-   * and free everything. Comment in FVWM source code says
-   * we need a server grab or the child can get its MapNotify
-   * before we've finished reparenting and getting the decoration
-   * window onscreen, so ensure_frame must be called with
-   * a grab.
-   */
   meta_error_trap_push (window->display);
   if (window->mapped)
     {
@@ -174,8 +163,6 @@ meta_window_ensure_frame (MetaWindow *window)
   /* Shape mask */
   update_input_shape (frame);
   update_shape (frame);
-
-  meta_display_ungrab (window->display);
 }
 
 void


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