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 /backend/libinput | |
| parent | d1f543a9d87f354e5ad8f942933dba3edb54ffed (diff) | |
types/wlr_tablet_tool: uniformize events name
Diffstat (limited to 'backend/libinput')
| -rw-r--r-- | backend/libinput/tablet_tool.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 0aa960ab..31cd18b8 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -130,9 +130,8 @@ void handle_tablet_tool_axis(struct libinput_event *event, struct tablet_tool *tool = get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent)); - struct wlr_event_tablet_tool_axis wlr_event = { 0 }; - - wlr_event.device = &wlr_tablet->base; + struct wlr_tablet_tool_axis_event wlr_event = { 0 }; + wlr_event.tablet = wlr_tablet; wlr_event.tool = &tool->wlr_tool; wlr_event.time_msec = usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); @@ -185,9 +184,9 @@ void handle_tablet_tool_proximity(struct libinput_event *event, struct tablet_tool *tool = get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent)); - struct wlr_event_tablet_tool_proximity wlr_event = { 0 }; + struct wlr_tablet_tool_proximity_event wlr_event = { 0 }; + wlr_event.tablet = wlr_tablet; wlr_event.tool = &tool->wlr_tool; - wlr_event.device = &wlr_tablet->base; wlr_event.time_msec = usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); wlr_event.x = libinput_event_tablet_tool_get_x_transformed(tevent, 1); @@ -227,8 +226,8 @@ void handle_tablet_tool_tip(struct libinput_event *event, struct tablet_tool *tool = get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent)); - struct wlr_event_tablet_tool_tip wlr_event = { 0 }; - wlr_event.device = &wlr_tablet->base; + struct wlr_tablet_tool_tip_event wlr_event = { 0 }; + wlr_event.tablet = wlr_tablet; wlr_event.tool = &tool->wlr_tool; wlr_event.time_msec = usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); @@ -255,8 +254,8 @@ void handle_tablet_tool_button(struct libinput_event *event, struct tablet_tool *tool = get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent)); - struct wlr_event_tablet_tool_button wlr_event = { 0 }; - wlr_event.device = &wlr_tablet->base; + struct wlr_tablet_tool_button_event wlr_event = { 0 }; + wlr_event.tablet = wlr_tablet; wlr_event.tool = &tool->wlr_tool; wlr_event.time_msec = usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); |