diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-05-26 10:03:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-06-08 11:36:45 +1000 |
| commit | b90e2e8c43408afb87fa34fe87321dc33b72bd8d (patch) | |
| tree | a8e2cb649c9764629f8aaaadd7067f2d65ee0aed /src/libinput.c | |
| parent | 27078b2667def4ecde1f47b8258d510a576c8bb1 (diff) | |
pad: group the button state into a private struct
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>
Diffstat (limited to 'src/libinput.c')
| -rw-r--r-- | src/libinput.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libinput.c b/src/libinput.c index 89fa5942..6ff4e9a1 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -140,10 +140,12 @@ 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; int number; @@ -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 |