diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-08-08 15:43:03 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-08-11 15:45:23 -0400 |
| commit | c409fca703cd5e8c90b2843aa2613b34405284b9 (patch) | |
| tree | 1cb7483c8fc8268dbb6a5ae563bbccf3aa34e788 /gdk/gdkdevice.c | |
| parent | 8d3dd50948255e6c3ca6abc353c83f271aac3d5e (diff) | |
| download | gtk+-c409fca703cd5e8c90b2843aa2613b34405284b9.tar.gz | |
Drop root windows from some internal apis
_gdk_device_query_state was needlessly shuffling
root windows around.
Diffstat (limited to 'gdk/gdkdevice.c')
| -rw-r--r-- | gdk/gdkdevice.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 13451a5400..62ee1cf730 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -586,7 +586,6 @@ gdk_device_get_position_double (GdkDevice *device, GdkDisplay *display; gdouble tmp_x, tmp_y; GdkScreen *default_screen; - GdkWindow *root; g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD); @@ -600,12 +599,12 @@ gdk_device_get_position_double (GdkDevice *device, _gdk_device_query_state (device, gdk_screen_get_root_window (default_screen), - &root, NULL, + NULL, &tmp_x, &tmp_y, NULL, NULL, NULL); if (screen) - *screen = gdk_window_get_screen (root); + *screen = default_screen; if (x) *x = tmp_x; if (y) @@ -1838,7 +1837,6 @@ _gdk_device_translate_axis (GdkDevice *device, void _gdk_device_query_state (GdkDevice *device, GdkWindow *window, - GdkWindow **root_window, GdkWindow **child_window, gdouble *root_x, gdouble *root_y, @@ -1848,7 +1846,6 @@ _gdk_device_query_state (GdkDevice *device, { GDK_DEVICE_GET_CLASS (device)->query_state (device, window, - root_window, child_window, root_x, root_y, |