[mutter/wip/xinput2b: 18/31] display: Don't pass an event to a handler that will no-op



commit 458da820c594936c61f21bf1943d797a45a03788
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Nov 15 17:42:59 2012 -0500

    display: Don't pass an event to a handler that will no-op
    
    meta_window_handle_mouse_grab_op_event won't do anything on a
    EnterNotify/LeaveNotify, so why are we passing something to it?
    
    https://bugzilla.gnome.org/show_bug.cgi?id=688779

 src/core/display.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 9d35d34..346241a 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2236,13 +2236,6 @@ event_callback (XEvent   *event,
           if (display->grab_op == META_GRAB_OP_COMPOSITOR)
             break;
 
-          if (display->grab_window == window &&
-              grab_op_is_mouse (display->grab_op))
-            {
-              meta_window_handle_mouse_grab_op_event (window, event);
-              break;
-            }
-
           /* If the mouse switches screens, active the default window on the new
            * screen; this will make keybindings and workspace-launched items
            * actually appear on the right screen.
@@ -2305,10 +2298,7 @@ event_callback (XEvent   *event,
           if (display->grab_op == META_GRAB_OP_COMPOSITOR)
             break;
 
-          if (display->grab_window == window &&
-              grab_op_is_mouse (display->grab_op))
-            meta_window_handle_mouse_grab_op_event (window, event);
-          else if (window != NULL)
+          if (window != NULL)
             {
               if (window->type == META_WINDOW_DOCK &&
                   event->xcrossing.mode != NotifyGrab &&



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