AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 20:30:11 +00:00
Code Issues Projects Releases Wiki Activity

Don't filter out BUTTON_MOTION event masks

Browse Source 
We don't really need to filter these out, it was just a leftover
safety check to not override the GDK_POINTER_MOTION_MASK.

Furthermore when we changed behaviour to not always select for native
pointer motion it is actually wrong. We'll still get normal motion
events for the toplevel which we will emulate as button motion on the
child, but the button motion mask will not be inherited by implicit
grabs which makes us not get any motion events during grabs.

This fixes bug 601473
This commit is contained in:
Alexander Larsson 2009-12-02 11:09:37 +01:00
parent 6201a5d7ee
commit b509f28559
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/gdkwindow.c
View File

@ -1181,14 +1181,12 @@ get_native_event_mask (GdkWindowObject *private)
/* Do whatever the app asks to, since the app /* Do whatever the app asks to, since the app
* may be asking for weird things for native windows, * may be asking for weird things for native windows,
* but filter out things that override the special * but don't use motion hints as that may affect non-native
* requests below. */ * child windows that don't want it. Also, we need to
mask = private->event_mask & * set all the app-specified masks since they will be picked
~(GDK_POINTER_MOTION_HINT_MASK | * up by any implicit grabs (i.e. if they were not set as
GDK_BUTTON_MOTION_MASK | * native we would not get the events we need). */
GDK_BUTTON1_MOTION_MASK | mask = private->event_mask & ~GDK_POINTER_MOTION_HINT_MASK;
GDK_BUTTON2_MOTION_MASK |
GDK_BUTTON3_MOTION_MASK);
/* We need thse for all native windows so we can /* We need thse for all native windows so we can
emulate events on children: */ emulate events on children: */
@ -1228,11 +1226,7 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_SCROLL_MASK | GDK_SCROLL_MASK |
(grab_mask & (grab_mask &
~(GDK_POINTER_MOTION_HINT_MASK | ~GDK_POINTER_MOTION_HINT_MASK);
GDK_BUTTON_MOTION_MASK |
GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON2_MOTION_MASK |
GDK_BUTTON3_MOTION_MASK));
} }
/* Puts the native window in the right order wrt the other native windows /* Puts the native window in the right order wrt the other native windows