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

device: gdk_device_list_axes() => gdk_device_get_axis_names()

Browse Source 
Turn a GList of GdkAtom into a char ** - and rename the function to not
cause problems.
This commit is contained in:
Benjamin Otte 2020-02-22 23:31:24 +01:00
parent 28dced597f
commit 4280ca2263
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gdk/gdk4-sections.txt
View File

@ -471,7 +471,7 @@ gdk_device_get_history
gdk_device_free_history gdk_device_free_history
GdkTimeCoord GdkTimeCoord
gdk_device_get_axis gdk_device_get_axis
gdk_device_list_axes gdk_device_get_axis_names
gdk_device_get_axis_value gdk_device_get_axis_value
gdk_device_get_last_event_surface gdk_device_get_last_event_surface

30
gdk/gdkdevice.c
View File

@ -1081,33 +1081,41 @@ gdk_device_get_n_axes (GdkDevice *device)
} }
/** /**
* gdk_device_list_axes: * gdk_device_get_axis_names:
* @device: a pointer #GdkDevice * @device: a #GdkDevice
* *
* Returns a #GList of #GdkAtoms, containing the labels for * Returns a null-terminated array of strings, containing the labels for
* the axes that @device currently has. * the axes that @device currently has.
* If the device has no axes, %NULL is returned.
* *
* Returns: (transfer container) (element-type GdkAtom): * Returns: (nullable) (transfer full): A null-terminated string array,
* A #GList of strings, free with g_list_free(). * free with g_strfreev().
**/ **/
GList * char **
gdk_device_list_axes (GdkDevice *device) gdk_device_get_axis_names (GdkDevice *device)
{ {
GList *axes = NULL; GPtrArray *axes;
gint i; gint i;
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);
if (device->axes->len == 0)
return NULL;
axes = g_ptr_array_new ();
for (i = 0; i < device->axes->len; i++) for (i = 0; i < device->axes->len; i++)
{ {
GdkAxisInfo axis_info; GdkAxisInfo axis_info;
axis_info = g_array_index (device->axes, GdkAxisInfo, i); axis_info = g_array_index (device->axes, GdkAxisInfo, i);
axes = g_list_prepend (axes, axis_info.label); g_ptr_array_add (axes, g_strdup (axis_info.label));
} }
return g_list_reverse (axes); g_ptr_array_add (axes, NULL);
return (char **) g_ptr_array_free (axes, FALSE);
} }
/** /**
@ -1119,7 +1127,7 @@ gdk_device_list_axes (GdkDevice *device)
* *
* Interprets an array of double as axis values for a given device, * Interprets an array of double as axis values for a given device,
* and locates the value in the array for a given axis label, as returned * and locates the value in the array for a given axis label, as returned
* by gdk_device_list_axes() * by gdk_device_get_axes()
* *
* Returns: %TRUE if the given axis use was found, otherwise %FALSE. * Returns: %TRUE if the given axis use was found, otherwise %FALSE.
**/ **/

2
gdk/gdkdevice.h
View File

@ -184,7 +184,7 @@ void gdk_device_free_history (GdkTimeCoord **events,
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gint gdk_device_get_n_axes (GdkDevice *device); gint gdk_device_get_n_axes (GdkDevice *device);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GList * gdk_device_list_axes (GdkDevice *device); char ** gdk_device_get_axis_names (GdkDevice *device);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gdk_device_get_axis_value (GdkDevice *device, gboolean gdk_device_get_axis_value (GdkDevice *device,
gdouble *axes, gdouble *axes,