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

gdk: Coalesce 2 GdkWindow fields in GdkPointerWindowInfo struct

Browse Source 
One used to point to the toplevel and the other to the client-side window
that the pointer pointed to. The latter was made to be like the former in
most places, so put those together, and fix the remaining cases where the
variable might not end up with a toplevel/native window.
This commit is contained in:
Carlos Garnacho 2017-09-15 19:39:18 +02:00
parent c00567a64c
commit f3b0a3780e
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gdk/gdkdisplay.c
View File

@ -346,8 +346,7 @@ gdk_display_class_init (GdkDisplayClass *class)
static void
free_pointer_info (GdkPointerWindowInfo *info)
{
if (info->toplevel_under_pointer)
g_object_unref (info->toplevel_under_pointer);
g_clear_object (&info->window_under_pointer);
g_slice_free (GdkPointerWindowInfo, info);
}
@ -736,7 +735,7 @@ switch_to_pointer_grab (GdkDisplay *display,
guint32 time,
gulong serial)
{
GdkWindow *pointer_window, *new_toplevel;
GdkWindow *new_toplevel;
GdkPointerWindowInfo *info;
GList *old_grabs;
GdkModifierType state;
@ -768,13 +767,6 @@ switch_to_pointer_grab (GdkDisplay *display,
if (grab == NULL /* ungrab */ ||
(!last_grab->owner_events && grab->owner_events) /* switched to owner_events */ )
{
/* We force check what window we're in, and update the toplevel_under_pointer info,
* as that won't get told of this change with toplevel enter events.
*/
if (info->toplevel_under_pointer)
g_object_unref (info->toplevel_under_pointer);
info->toplevel_under_pointer = NULL;
/* Ungrabbed slave devices don't have a position by
* itself, rather depend on its master pointer, so
* it doesn't make sense to track any position for
@ -786,7 +778,7 @@ switch_to_pointer_grab (GdkDisplay *display,
if (new_toplevel)
{
/* w is now toplevel and x,y in toplevel coords */
info->toplevel_under_pointer = g_object_ref (new_toplevel);
_gdk_display_set_window_under_pointer (display, device, new_toplevel);
info->toplevel_x = x;
info->toplevel_y = y;
info->state = state;
@ -803,20 +795,11 @@ switch_to_pointer_grab (GdkDisplay *display,
(gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN))
info->need_touch_press_enter = TRUE;
pointer_window = NULL;
if (new_toplevel &&
!info->need_touch_press_enter)
{
/* Find (possibly virtual) child window */
pointer_window =
_gdk_window_find_descendant_at (new_toplevel,
x, y,
NULL, NULL);
}
if (info->need_touch_press_enter)
new_toplevel = NULL;
/* We're now ungrabbed, update the window_under_pointer */
_gdk_display_set_window_under_pointer (display, device, pointer_window);
_gdk_display_set_window_under_pointer (display, device, new_toplevel);
}
}

2
gdk/gdkdisplayprivate.h
View File

@ -63,8 +63,6 @@ typedef struct
*/
typedef struct
{
GdkWindow *toplevel_under_pointer; /* toplevel window containing the pointer, */
/* tracked via native events */
GdkWindow *window_under_pointer; /* window that last got a normal enter event */
gdouble toplevel_x, toplevel_y;
guint32 state;

6
gdk/gdkwindow.c
View File

@ -1313,10 +1313,10 @@ update_pointer_info_foreach (GdkDisplay *display,
{
GdkWindow *window = user_data;
if (pointer_info->toplevel_under_pointer == window)
if (pointer_info->window_under_pointer == window)
{
g_object_unref (pointer_info->toplevel_under_pointer);
pointer_info->toplevel_under_pointer = NULL;
g_object_unref (pointer_info->window_under_pointer);
pointer_info->window_under_pointer = NULL;
}
}