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

tablet: rename tool_proximity_state to tablet_tool_proximity state

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2015-11-16 15:41:48 +10:00
parent c7cb77b36f
commit a22b94a22c
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libinput-private.h
View file

@ -473,7 +473,7 @@ void
tablet_notify_proximity(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_proximity_state state,
enum libinput_tablet_tool_proximity_state state,
unsigned char *changed_axes,
double *axes);

6
src/libinput.c
View file

@ -136,7 +136,7 @@ struct libinput_event_tablet {
double deltas_discrete[LIBINPUT_TABLET_TOOL_AXIS_MAX + 1];
unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)];
struct libinput_tablet_tool *tool;
enum libinput_tool_proximity_state proximity_state;
enum libinput_tablet_tool_proximity_state proximity_state;
enum libinput_tool_tip_state tip_state;
};
@ -1075,7 +1075,7 @@ libinput_event_tablet_get_tool(struct libinput_event_tablet *event)
return event->tool;
}
LIBINPUT_EXPORT enum libinput_tool_proximity_state
LIBINPUT_EXPORT enum libinput_tablet_tool_proximity_state
libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event)
{
require_event_type(libinput_event_get_context(&event->base),
@ -2011,7 +2011,7 @@ void
tablet_notify_proximity(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_proximity_state proximity_state,
enum libinput_tablet_tool_proximity_state proximity_state,
unsigned char *changed_axes,
double *axes)
{

4
src/libinput.h
View file

@ -211,7 +211,7 @@ enum libinput_tablet_tool_type {
* surface. On other hardware, the tool is still detectable within a short
* distance (a few cm) off the surface.
*/
enum libinput_tool_proximity_state {
enum libinput_tablet_tool_proximity_state {
LIBINPUT_TOOL_PROXIMITY_OUT = 0,
LIBINPUT_TOOL_PROXIMITY_IN = 1,
};
@ -1523,7 +1523,7 @@ libinput_event_tablet_get_tool(struct libinput_event_tablet *event);
* @param event The libinput tablet event
* @return The new proximity state of the tool from the event.
*/
enum libinput_tool_proximity_state
enum libinput_tablet_tool_proximity_state
libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event);
/**

2
tools/event-debug.c
View file

@ -458,7 +458,7 @@ print_proximity_event(struct libinput_event *ev)
{
struct libinput_event_tablet *t = libinput_event_get_tablet_event(ev);
struct libinput_tablet_tool *tool = libinput_event_tablet_get_tool(t);
enum libinput_tool_proximity_state state;
enum libinput_tablet_tool_proximity_state state;
const char *tool_str,
*state_str;