aboutsummaryrefslogtreecommitdiff
path: root/backend/libinput
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-06-15 16:15:12 -0400
committerDrew DeVault <sir@cmpwn.com>2017-06-15 16:15:12 -0400
commitdef3d7c64f68d59c6daec5974afc3ca84fa4bda9 (patch)
tree3022c631ba2cecf364f74d97dfb2ca3e0866268b /backend/libinput
parent2443a070e75e33285b6d5ed0ce89c989956b9065 (diff)
Add tablet example
Diffstat (limited to 'backend/libinput')
-rw-r--r--backend/libinput/tablet_tool.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 276c263c..e8a3bc7d 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -76,9 +76,6 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return;
}
- // Proximity events contain axis information. We update this information
- // before we send the proximity event
- handle_tablet_tool_axis(event, device);
struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event);
struct wlr_tablet_tool_proximity *wlr_event =
@@ -91,6 +88,7 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
break;
case LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN:
wlr_event->state = WLR_TABLET_TOOL_PROXIMITY_IN;
+ handle_tablet_tool_axis(event, device);
break;
}
wl_signal_emit(&dev->tablet_tool->events.proximity, wlr_event);
@@ -104,8 +102,6 @@ void handle_tablet_tool_tip(struct libinput_event *event,
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return;
}
- // Tip events contain axis information. We update this information
- // before we send the proximity event
handle_tablet_tool_axis(event, device);
struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event);