[gtk+] gdk: Simplify code
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Simplify code
- Date: Mon, 3 Jan 2011 16:44:48 +0000 (UTC)
commit ae7e5fc2d19445ba55832888adcc7c24aeb17323
Author: Benjamin Otte <otte redhat com>
Date: Mon Jan 3 17:42:35 2011 +0100
gdk: Simplify code
Move a previous vfunc into the only caller.
gdk/gdkdevice.c | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index bd529cb..1b772ba 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -443,36 +443,6 @@ gdk_device_get_position (GdkDevice *device,
*y = tmp_y;
}
-static GdkWindow *
-gdk_display_real_get_window_at_device_position (GdkDisplay *display,
- GdkDevice *device,
- gint *win_x,
- gint *win_y)
-{
- GdkWindow *window;
- gint x, y;
-
- window = _gdk_device_window_at_position (device, &x, &y, NULL, FALSE);
-
- /* This might need corrections, as the native window returned
- may contain client side children */
- if (window)
- {
- double xx, yy;
-
- window = _gdk_window_find_descendant_at (window,
- x, y,
- &xx, &yy);
- x = floor (xx + 0.5);
- y = floor (yy + 0.5);
- }
-
- *win_x = x;
- *win_y = y;
-
- return window;
-}
-
/**
* gdk_device_get_window_at_position:
* @device: pointer #GdkDevice to query info to.
@@ -493,16 +463,26 @@ gdk_device_get_window_at_position (GdkDevice *device,
gint *win_x,
gint *win_y)
{
- GdkDisplay *display;
gint tmp_x, tmp_y;
GdkWindow *window;
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
g_return_val_if_fail (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD, NULL);
- display = gdk_device_get_display (device);
+ window = _gdk_device_window_at_position (device, &tmp_x, &tmp_y, NULL, FALSE);
+
+ /* This might need corrections, as the native window returned
+ may contain client side children */
+ if (window)
+ {
+ double xx, yy;
- window = gdk_display_real_get_window_at_device_position (display, device, &tmp_x, &tmp_y);
+ window = _gdk_window_find_descendant_at (window,
+ tmp_x, tmp_y,
+ &xx, &yy);
+ tmp_x = floor (xx + 0.5);
+ tmp_y = floor (yy + 0.5);
+ }
if (win_x)
*win_x = tmp_x;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]