AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: return child only in device_query_state()

Browse Source 
On X11, device_query_state() uses XIQueryPointer() which will return a
child window only if the pointer is within an actual child of the given
window.

Wayland backend would return the pointer->focus window independently of
the given window, but that breaks the logic in get_device_state() and
later in gdk_window_get_device_position_double() because the window is
searched based on coordinates from another window without sibling
relationship, breaking gtkmenu sub-menus further down the line.

Fix the Wayland backend to mimic X11's XIQueryPointer() to return a
child only if really a child of the given window.

That's the most sensible thing to do to fix the issue, but the API here
seems to be modeled after the X11 implementation and the description of
gdk_window_get_device_position_double() is not entirely accurate.

https://bugzilla.gnome.org/show_bug.cgi?id=768016
This commit is contained in:
Olivier Fourdan 2016-06-29 15:08:06 +02:00
parent 4c01ab8945
commit 298221bfba
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/wayland/gdkdevice-wayland.c
View File

@ -517,7 +517,8 @@ gdk_wayland_device_query_state (GdkDevice *device,
if (root_window)
*root_window = gdk_screen_get_root_window (default_screen);
if (child_window)
*child_window = pointer->focus;
/* Set child only if actually a child of the given window, as XIQueryPointer() does */
*child_window = g_list_find (window->children, pointer->focus) ? pointer->focus : NULL;
if (mask)
*mask = device_get_modifiers (device);