On Jun 6, 2016, at 8:16 PM, Peter Hutterer <[email protected]> wrote: > > 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 <[email protected]>
Reviewed-by: Yong Bakos <[email protected]> Cheers, yong > --- > Changes to v2: > - rename button.button to button.number, brings it in line with ring/strip > naming. > > src/libinput.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/src/libinput.c b/src/libinput.c > index 89fa594..6ff4e9a 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 > -- > 2.7.4 > > _______________________________________________ > wayland-devel mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
