summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2013-11-18 22:12:18 +0100
committerCarlos Garnacho <carlosg@gnome.org>2013-11-18 22:12:18 +0100
commitfee754e0d22e5c8ab329278e8b836fbee1267100 (patch)
tree1a76c4e90bd2c52bef9521df71d8549f0112e8e0 /gdk
parent9127087e1c0e93f94552f0ad5170d4dfa785146a (diff)
downloadgtk+-fee754e0d22e5c8ab329278e8b836fbee1267100.tar.gz
gdk: Ignore crossings generated by passive grabs when resetting scroll axes
Passive grabs may take pointer focus out of the application, even though the pointer didn't leave the window, but those events still trigger resetting of the scroll axes. This is most visible with compiz, and possibly other reparenting WMs, where passive grabs happen on the WM-managed window that is a parent of the application toplevel. As it is not possible to have scrolling happening on the timespan a passive grab takes action, it is entirely safe for GTK+ to assume none happened if it gets a crossing event of that nature. https://bugzilla.gnome.org/show_bug.cgi?id=699574#c33
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkdevicemanager-xi2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 7dba5a6eab..87d28100f3 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1585,7 +1585,8 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
GUINT_TO_POINTER (xev->sourceid));
gdk_event_set_source_device (event, source_device);
- if (ev->evtype == XI_Enter && xev->detail != XINotifyInferior &&
+ if (ev->evtype == XI_Enter &&
+ xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab &&
gdk_window_get_window_type (window) == GDK_WINDOW_TOPLEVEL)
{
if (gdk_device_get_device_type (source_device) != GDK_DEVICE_TYPE_MASTER)