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

tablet: allow checking for proximity state on all tablet events

Browse source 
By definition, the state is always proximity in on other events but let's
allow the call to be made anyway.

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-12 07:32:34 +10:00
parent 117161dc72
commit 5f928dfeac
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libinput.c
View file

@ -1081,6 +1081,9 @@ libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event)
require_event_type(libinput_event_get_context(&event->base),
event->base.type,
0,
LIBINPUT_EVENT_TABLET_AXIS,
LIBINPUT_EVENT_TABLET_TIP,
LIBINPUT_EVENT_TABLET_BUTTON,
LIBINPUT_EVENT_TABLET_PROXIMITY);
return event->proximity_state;
@ -1981,6 +1984,7 @@ tablet_notify_axis(struct libinput_device *device,
*axis_event = (struct libinput_event_tablet) {
.time = time,
.tool = tool,
.proximity_state = LIBINPUT_TOOL_PROXIMITY_IN,
};
memcpy(axis_event->changed_axes,
@ -2049,6 +2053,7 @@ tablet_notify_tip(struct libinput_device *device,
.time = time,
.tool = tool,
.tip_state = tip_state,
.proximity_state = LIBINPUT_TOOL_PROXIMITY_IN,
};
memcpy(tip_event->axes,
axes,
@ -2085,6 +2090,7 @@ tablet_notify_button(struct libinput_device *device,
.button = button,
.state = state,
.seat_button_count = seat_button_count,
.proximity_state = LIBINPUT_TOOL_PROXIMITY_IN,
};
memcpy(button_event->axes, axes, sizeof(button_event->axes));