diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-05 14:08:01 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-06 11:02:40 +1000 |
commit | 0b124a1a5d5e8d49d2a75af7da741f004b58ebbe (patch) | |
tree | 78137892626b4d9d6fad3b28b102ef97371b919e /src/libinput.c | |
parent | c5b87828ee4641b4a3cd7db8d1b86432283873c7 (diff) |
tablet: insert "STATE" into proximity/tip states
Makes it even longer, but at least it's consistent with button and key state.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Diffstat (limited to 'src/libinput.c')
-rw-r--r-- | src/libinput.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libinput.c b/src/libinput.c index 3a10df4..d73637a 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -2170,7 +2170,7 @@ tablet_notify_axis(struct libinput_device *device, *axis_event = (struct libinput_event_tablet_tool) { .time = time, .tool = tool, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_IN, + .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, .tip_state = tip_state, .wheel_discrete = wheel_discrete, }; @@ -2238,7 +2238,7 @@ tablet_notify_tip(struct libinput_device *device, .time = time, .tool = tool, .tip_state = tip_state, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_IN, + .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, }; memcpy(tip_event->axes, axes, @@ -2276,7 +2276,7 @@ tablet_notify_button(struct libinput_device *device, .button = button, .state = state, .seat_button_count = seat_button_count, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_IN, + .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, .tip_state = tip_state, }; memcpy(button_event->axes, axes, sizeof(button_event->axes)); |