isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Don't pass an event to a handler that will no-op

Browse Source 
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
This commit is contained in:
Jasper St. Pierre 2012-11-15 17:42:59 -05:00
parent 129c729c50
commit 6b31bd402a
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/display.c
View File

@ -2236,13 +2236,6 @@ event_callback (XEvent *event,
if (display->grab_op == META_GRAB_OP_COMPOSITOR) if (display->grab_op == META_GRAB_OP_COMPOSITOR)
break; 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 /* If the mouse switches screens, active the default window on the new
* screen; this will make keybindings and workspace-launched items * screen; this will make keybindings and workspace-launched items
* actually appear on the right screen. * actually appear on the right screen.
@ -2305,10 +2298,7 @@ event_callback (XEvent *event,
if (display->grab_op == META_GRAB_OP_COMPOSITOR) if (display->grab_op == META_GRAB_OP_COMPOSITOR)
break; break;
if (display->grab_window == window && if (window != NULL)
grab_op_is_mouse (display->grab_op))
meta_window_handle_mouse_grab_op_event (window, event);
else if (window != NULL)
{ {
if (window->type == META_WINDOW_DOCK && if (window->type == META_WINDOW_DOCK &&
event->xcrossing.mode != NotifyGrab && event->xcrossing.mode != NotifyGrab &&