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

gdk: Simplify code

Browse Source 
Fold the previous vfunc into the only caller.
This commit is contained in:
Benjamin Otte 2011-01-03 17:01:36 +01:00
parent 8d2104fdc9
commit 2267602295
1 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gdk/gdkwindow.c
View File

@ -4938,38 +4938,6 @@ gdk_window_get_pointer (GdkWindow *window,
return gdk_window_get_device_position (window, display->core_pointer, x, y, mask); return gdk_window_get_device_position (window, display->core_pointer, x, y, mask);
} }
static GdkWindow *
gdk_window_real_window_get_device_position (GdkDisplay *display,
GdkDevice *device,
GdkWindow *window,
gint *x,
gint *y,
GdkModifierType *mask)
{
gint tmpx, tmpy;
GdkModifierType tmp_mask;
gboolean normal_child;
normal_child = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->get_device_state (window,
device,
&tmpx, &tmpy,
&tmp_mask);
/* We got the coords on the impl, convert to the window */
tmpx -= window->abs_x;
tmpy -= window->abs_y;
if (x)
*x = tmpx;
if (y)
*y = tmpy;
if (mask)
*mask = tmp_mask;
if (normal_child)
return _gdk_window_find_child_at (window, tmpx, tmpy);
return NULL;
}
/** /**
* gdk_window_get_device_position: * gdk_window_get_device_position:
* @window: a #GdkWindow. * @window: a #GdkWindow.
@ -4994,21 +4962,21 @@ gdk_window_get_device_position (GdkWindow *window,
gint *y, gint *y,
GdkModifierType *mask) GdkModifierType *mask)
{ {
GdkDisplay *display;
gint tmp_x, tmp_y; gint tmp_x, tmp_y;
GdkModifierType tmp_mask; GdkModifierType tmp_mask;
GdkWindow *child; gboolean normal_child;
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
g_return_val_if_fail (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD, NULL); g_return_val_if_fail (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD, NULL);
tmp_x = 0; normal_child = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->get_device_state (window,
tmp_y = 0; device,
&tmp_x, &tmp_y,
display = gdk_window_get_display (window); &tmp_mask);
child = gdk_window_real_window_get_device_position (display, device, window, /* We got the coords on the impl, convert to the window */
&tmp_x, &tmp_y, &tmp_mask); tmp_x -= window->abs_x;
tmp_y -= window->abs_y;
if (x) if (x)
*x = tmp_x; *x = tmp_x;
@ -5017,9 +4985,11 @@ gdk_window_get_device_position (GdkWindow *window,
if (mask) if (mask)
*mask = tmp_mask; *mask = tmp_mask;
_gdk_display_enable_motion_hints (display, device); _gdk_display_enable_motion_hints (gdk_window_get_display (window), device);
return child; if (normal_child)
return _gdk_window_find_child_at (window, tmp_x, tmp_y);
return NULL;
} }
/** /**