fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-05 15:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tablet: remove the libinput_tablet_tool_axis enum from the public API

Browse source 
Internally we still use it, at least for now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Lyude <cpaul@redhat.com>
This commit is contained in:
Peter Hutterer 2015-12-14 11:51:17 +10:00
parent f96ee412df
commit 8635ba556b
2 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libinput-private.h
View file

@ -33,8 +33,6 @@
#include "libinput.h"
#include "libinput-util.h"
#define LIBINPUT_TABLET_TOOL_AXIS_MAX LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL
struct libinput_source;
/* A coordinate pair in device coordinates */
@ -250,6 +248,20 @@ struct libinput_device {
struct libinput_device_config config;
};
enum libinput_tablet_tool_axis {
LIBINPUT_TABLET_TOOL_AXIS_X = 1,
LIBINPUT_TABLET_TOOL_AXIS_Y = 2,
LIBINPUT_TABLET_TOOL_AXIS_DISTANCE = 3,
LIBINPUT_TABLET_TOOL_AXIS_PRESSURE = 4,
LIBINPUT_TABLET_TOOL_AXIS_TILT_X = 5,
LIBINPUT_TABLET_TOOL_AXIS_TILT_Y = 6,
LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z = 7,
LIBINPUT_TABLET_TOOL_AXIS_SLIDER = 8,
LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL = 9,
};
#define LIBINPUT_TABLET_TOOL_AXIS_MAX LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL
struct libinput_tablet_tool {
struct list link;
uint32_t serial;

21
src/libinput.h
View file

@ -138,27 +138,6 @@ enum libinput_pointer_axis_source {
* @ingroup device
* @struct libinput_tablet_tool
*
* Available axis types for a device. It must have the @ref
* LIBINPUT_DEVICE_CAP_TABLET_TOOL capability.
*
* For details on the interpretation of these axes see
* libinput_event_tablet_tool_get_axis_value().
*/
enum libinput_tablet_tool_axis {
LIBINPUT_TABLET_TOOL_AXIS_X = 1,
LIBINPUT_TABLET_TOOL_AXIS_Y = 2,
LIBINPUT_TABLET_TOOL_AXIS_DISTANCE = 3,
LIBINPUT_TABLET_TOOL_AXIS_PRESSURE = 4,
LIBINPUT_TABLET_TOOL_AXIS_TILT_X = 5,
LIBINPUT_TABLET_TOOL_AXIS_TILT_Y = 6,
LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z = 7,
LIBINPUT_TABLET_TOOL_AXIS_SLIDER = 8,
LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL = 9,
};
/**
* @ingroup device
*
* An object representing a tool being used by a device with the @ref
* LIBINPUT_DEVICE_CAP_TABLET_TOOL capability.
*