From dc2fea413b82dcfca401b13034b18047ac9f311f Mon Sep 17 00:00:00 2001 From: John Stowers Date: Wed, 14 Jul 2010 21:57:34 +1200 Subject: [PATCH] Add gdk_device_get_n_axes https://bugzilla.gnome.org/show_bug.cgi?id=624221 --- docs/reference/gdk/gdk-sections.txt | 1 + gdk/gdk.symbols | 1 + gdk/gdkinput.h | 1 + gdk/quartz/gdkinput.c | 8 ++++++++ gdk/win32/gdkinput.c | 8 ++++++++ gdk/x11/gdkinput.c | 16 ++++++++++++++++ 6 files changed, 35 insertions(+) diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index cecc971465..ff5a902ca4 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -1070,6 +1070,7 @@ gdk_device_get_history gdk_device_free_history GdkTimeCoord gdk_device_get_axis +gdk_device_get_n_axes gdk_input_set_extension_events diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index 3dc234f64d..015a659937 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -386,6 +386,7 @@ gdk_device_get_history gdk_device_get_key gdk_device_get_mode gdk_device_get_name +gdk_device_get_n_axes gdk_device_get_source gdk_device_get_type G_GNUC_CONST gdk_device_set_axis_use diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h index b2ab1e4612..c8907c1234 100644 --- a/gdk/gdkinput.h +++ b/gdk/gdkinput.h @@ -141,6 +141,7 @@ void gdk_device_get_key (GdkDevice *device, GdkModifierType *modifiers); GdkAxisUse gdk_device_get_axis_use (GdkDevice *device, guint index); +gint gdk_device_get_n_axes (GdkDevice *device); /* Functions to configure a device */ void gdk_device_set_source (GdkDevice *device, diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c index 9407b08c0a..212638d314 100644 --- a/gdk/quartz/gdkinput.c +++ b/gdk/quartz/gdkinput.c @@ -198,6 +198,14 @@ gdk_device_get_axis_use (GdkDevice *device, return device->axes[index].use; } +gint +gdk_device_get_n_axes (GdkDevice *device) +{ + g_return_val_if_fail (GDK_IS_DEVICE (device), 0); + + return device->num_axes; +} + void gdk_device_set_axis_use (GdkDevice *device, guint index, diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c index f8e9c1755d..e4aabdac3c 100644 --- a/gdk/win32/gdkinput.c +++ b/gdk/win32/gdkinput.c @@ -193,6 +193,14 @@ gdk_device_get_axis_use (GdkDevice *device, return device->axes[index].use; } +gint +gdk_device_get_n_axes (GdkDevice *device) +{ + g_return_val_if_fail (GDK_IS_DEVICE (device), 0); + + return device->num_axes; +} + void gdk_device_set_axis_use (GdkDevice *device, guint index, diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index fb2f810cea..196ec37725 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -317,6 +317,22 @@ gdk_device_get_axis_use (GdkDevice *device, return device->axes[index].use; } +/** + * gdk_device_get_n_axes: + * @device: a #GdkDevice. + * + * Returns: the number of axes of this device. + * + * Since: 2.22 + **/ +gint +gdk_device_get_n_axes (GdkDevice *device) +{ + g_return_val_if_fail (GDK_IS_DEVICE (device), 0); + + return device->num_axes; +} + void gdk_device_set_axis_use (GdkDevice *device, guint index,