diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-09 15:43:28 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-03-17 18:16:14 +0000 |
| commit | e732c5c8954900d06e042dac1b04cda9b93c2051 (patch) | |
| tree | 1c2ef216763028a024331d0087348fec87d39be2 /examples | |
| parent | d1f543a9d87f354e5ad8f942933dba3edb54ffed (diff) | |
types/wlr_tablet_tool: uniformize events name
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pointer.c | 6 | ||||
| -rw-r--r-- | examples/tablet.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/pointer.c b/examples/pointer.c index d22047de..d1dab770 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -217,11 +217,11 @@ static void handle_touch_cancel(struct wl_listener *listener, void *data) { static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) { struct sample_state *sample = wl_container_of(listener, sample, tablet_tool_axis); - struct wlr_event_tablet_tool_axis *event = data; + struct wlr_tablet_tool_axis_event *event = data; if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) && (event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) { - wlr_cursor_warp_absolute(sample->cursor, - event->device, event->x, event->y); + wlr_cursor_warp_absolute(sample->cursor, &event->tablet->base, + event->x, event->y); } } diff --git a/examples/tablet.c b/examples/tablet.c index 9903bbf1..35def700 100644 --- a/examples/tablet.c +++ b/examples/tablet.c @@ -136,7 +136,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { static void tablet_tool_axis_notify(struct wl_listener *listener, void *data) { struct tablet_tool_state *tstate = wl_container_of(listener, tstate, axis); - struct wlr_event_tablet_tool_axis *event = data; + struct wlr_tablet_tool_axis_event *event = data; struct sample_state *sample = tstate->sample; if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) { sample->x = event->x; @@ -160,14 +160,14 @@ static void tablet_tool_axis_notify(struct wl_listener *listener, void *data) { static void tablet_tool_proximity_notify(struct wl_listener *listener, void *data) { struct tablet_tool_state *tstate = wl_container_of(listener, tstate, proximity); - struct wlr_event_tablet_tool_proximity *event = data; + struct wlr_tablet_tool_proximity_event *event = data; struct sample_state *sample = tstate->sample; sample->proximity = event->state == WLR_TABLET_TOOL_PROXIMITY_IN; } static void tablet_tool_button_notify(struct wl_listener *listener, void *data) { struct tablet_tool_state *tstate = wl_container_of(listener, tstate, button); - struct wlr_event_tablet_tool_button *event = data; + struct wlr_tablet_tool_button_event *event = data; struct sample_state *sample = tstate->sample; if (event->state == WLR_BUTTON_RELEASED) { sample->button = false; |