[gtk+] gdkwindow: check grab window and children on get_pointer_window()



commit f96437317b0d3ae4d9b7ede29b239d3bbead6580
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Sep 16 17:14:09 2014 +0200

    gdkwindow: check grab window and children on get_pointer_window()
    
    If !owner_events, the pointer window has been usually set to NULL if
    the pointer fell outside the grabbing widget, but it was not being
    checked that the pointer_window is actually a child of the grab
    window, in which case it should be obtained as if ungrabbed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735749

 gdk/gdkwindow.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0460ffc..e023042 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7623,7 +7623,8 @@ get_pointer_window (GdkDisplay *display,
   grab = _gdk_display_has_device_grab (display, device, serial);
   if (grab != NULL &&
       !grab->owner_events &&
-      pointer_window != grab->window)
+      pointer_window != grab->window &&
+      !gdk_window_is_ancestor (pointer_window, grab->window))
     pointer_window = NULL;
 
   return pointer_window;


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