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

pad: group the button state into a private struct

Browse source 
This is only set on button events so use the same approach as for rings and
strips. No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
This commit is contained in:
Peter Hutterer 2016-05-26 10:03:47 +10:00
parent 27078b2667
commit b90e2e8c43
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libinput.c
View file

@ -140,9 +140,11 @@ struct libinput_event_tablet_tool {
struct libinput_event_tablet_pad {
struct libinput_event base;
uint32_t button;
enum libinput_button_state state;
uint64_t time;
struct {
uint32_t number;
enum libinput_button_state state;
} button;
struct {
enum libinput_tablet_pad_ring_axis_source source;
double position;
@ -2408,8 +2410,8 @@ tablet_pad_notify_button(struct libinput_device *device,
*button_event = (struct libinput_event_tablet_pad) {
.time = time,
.button = button,
.state = state,
.button.number = button,
.button.state = state,
};
post_device_event(device,
@ -2973,7 +2975,7 @@ libinput_event_tablet_pad_get_button_number(struct libinput_event_tablet_pad *ev
0,
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
return event->button;
return event->button.number;
}
LIBINPUT_EXPORT enum libinput_button_state
@ -2984,7 +2986,7 @@ libinput_event_tablet_pad_get_button_state(struct libinput_event_tablet_pad *eve
LIBINPUT_BUTTON_STATE_RELEASED,
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
return event->state;
return event->button.state;
}
LIBINPUT_EXPORT uint32_t