callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of window cursor wrt grabs

Browse Source 
Even for grabs we need to recurse up to look for what cursor to use.
This commit is contained in:
Alexander Larsson
2009-09-08 11:48:20 +02:00
parent 4e78b4c7d1
commit 113d21801b
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gdk/gdkwindow.c
View File

@ -8599,28 +8599,36 @@ _gdk_window_event_parent_of (GdkWindow *parent,
static void static void
update_cursor (GdkDisplay *display) update_cursor (GdkDisplay *display)
{ {
GdkWindowObject *pointer_window, *cursor_window, *parent, *toplevel; GdkWindowObject *cursor_window, *parent, *toplevel;
GdkWindow *pointer_window;
GdkWindowImplIface *impl_iface; GdkWindowImplIface *impl_iface;
GdkPointerGrabInfo *grab; GdkPointerGrabInfo *grab;
pointer_window = (GdkWindowObject *)display->pointer_info.window_under_pointer; pointer_window = display->pointer_info.window_under_pointer;
cursor_window = pointer_window; /* We ignore the serials here and just pick the last grab
we've sent, as that would shortly be used anyway. */
grab = _gdk_display_get_last_pointer_grab (display);
if (/* have grab */
grab != NULL &&
/* the pointer is not in a descendant of the grab window */
!_gdk_window_event_parent_of (grab->window, pointer_window))
/* use the cursor from the grab window */
cursor_window = (GdkWindowObject *)grab->window;
else
/* otherwise use the cursor from the pointer window */
cursor_window = (GdkWindowObject *)pointer_window;
/* Find the first window with the cursor actually set, as
the cursor is inherited from the parent */
while (cursor_window->cursor == NULL && while (cursor_window->cursor == NULL &&
(parent = get_event_parent (cursor_window)) != NULL && (parent = get_event_parent (cursor_window)) != NULL &&
parent->window_type != GDK_WINDOW_ROOT) parent->window_type != GDK_WINDOW_ROOT)
cursor_window = parent; cursor_window = parent;
/* We ignore the serials here and just pick the last grab
we've sent, as that would shortly be used anyway. */
grab = _gdk_display_get_last_pointer_grab (display);
if (grab != NULL &&
!_gdk_window_event_parent_of (grab->window, (GdkWindow *)cursor_window))
cursor_window = (GdkWindowObject *)grab->window;
/* Set all cursors on toplevel, otherwise its tricky to keep track of /* Set all cursors on toplevel, otherwise its tricky to keep track of
* which native window has what cursor set. */ * which native window has what cursor set. */
toplevel = (GdkWindowObject *)get_event_toplevel ((GdkWindow *)pointer_window); toplevel = (GdkWindowObject *)get_event_toplevel (pointer_window);
impl_iface = GDK_WINDOW_IMPL_GET_IFACE (toplevel->impl); impl_iface = GDK_WINDOW_IMPL_GET_IFACE (toplevel->impl);
impl_iface->set_cursor ((GdkWindow *)toplevel, cursor_window->cursor); impl_iface->set_cursor ((GdkWindow *)toplevel, cursor_window->cursor);
} }