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

tablet: rename tool_tip_state to tablet_tool_tip_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:43:41 +10:00
parent cc2b45dd50
commit 7123c37f1c
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/evdev-tablet.c
View file

@ -407,7 +407,7 @@ tablet_check_notify_axes(struct tablet_dispatch *tablet,
tablet->changed_axes,
axes);
else {
enum libinput_tool_tip_state tip_state;
enum libinput_tablet_tool_tip_state tip_state;
tip_state = tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT) ?
LIBINPUT_TOOL_TIP_DOWN : LIBINPUT_TOOL_TIP_UP;
@ -792,7 +792,7 @@ tablet_notify_button_mask(struct tablet_dispatch *tablet,
struct libinput_device *base = &device->base;
size_t i;
size_t nbits = 8 * sizeof(buttons[0]) * buttons_len;
enum libinput_tool_tip_state tip_state;
enum libinput_tablet_tool_tip_state tip_state;
tip_state = tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT) ?
LIBINPUT_TOOL_TIP_DOWN : LIBINPUT_TOOL_TIP_UP;

6
src/libinput-private.h
View file

@ -463,7 +463,7 @@ void
tablet_notify_axis(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
unsigned char *changed_axes,
double *axes,
double *deltas,
@ -481,14 +481,14 @@ void
tablet_notify_tip(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
double *axes);
void
tablet_notify_button(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
double *axes,
int32_t button,
enum libinput_button_state state);

10
src/libinput.c
View file

@ -137,7 +137,7 @@ struct libinput_event_tablet {
unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)];
struct libinput_tablet_tool *tool;
enum libinput_tablet_tool_proximity_state proximity_state;
enum libinput_tool_tip_state tip_state;
enum libinput_tablet_tool_tip_state tip_state;
};
static void
@ -1089,7 +1089,7 @@ libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event)
return event->proximity_state;
}
LIBINPUT_EXPORT enum libinput_tool_tip_state
LIBINPUT_EXPORT enum libinput_tablet_tool_tip_state
libinput_event_tablet_get_tip_state(struct libinput_event_tablet *event)
{
require_event_type(libinput_event_get_context(&event->base),
@ -1973,7 +1973,7 @@ void
tablet_notify_axis(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
unsigned char *changed_axes,
double *axes,
double *deltas,
@ -2045,7 +2045,7 @@ void
tablet_notify_tip(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
double *axes)
{
struct libinput_event_tablet *tip_event;
@ -2074,7 +2074,7 @@ void
tablet_notify_button(struct libinput_device *device,
uint64_t time,
struct libinput_tablet_tool *tool,
enum libinput_tool_tip_state tip_state,
enum libinput_tablet_tool_tip_state tip_state,
double *axes,
int32_t button,
enum libinput_button_state state)

4
src/libinput.h
View file

@ -225,7 +225,7 @@ enum libinput_tablet_tool_proximity_state {
* The tip contact state of a tool is a binary state signalling whether the tool is
* touching the surface of the tablet device.
*/
enum libinput_tool_tip_state {
enum libinput_tablet_tool_tip_state {
LIBINPUT_TOOL_TIP_UP = 0,
LIBINPUT_TOOL_TIP_DOWN = 1,
};
@ -1537,7 +1537,7 @@ libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event);
* @param event The libinput tablet event
* @return The new tip state of the tool from the event.
*/
enum libinput_tool_tip_state
enum libinput_tablet_tool_tip_state
libinput_event_tablet_get_tip_state(struct libinput_event_tablet *event);
/**

2
tools/event-debug.c
View file

@ -285,7 +285,7 @@ static void
print_tablet_tip_event(struct libinput_event *ev)
{
struct libinput_event_tablet *p = libinput_event_get_tablet_event(ev);
enum libinput_tool_tip_state state;
enum libinput_tablet_tool_tip_state state;
print_event_time(libinput_event_tablet_get_time(p));