aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Zeni <simon@bl4ckb0ne.ca>2022-03-09 15:43:28 -0500
committerKirill Primak <vyivel@eclair.cafe>2022-03-17 18:16:14 +0000
commite732c5c8954900d06e042dac1b04cda9b93c2051 (patch)
tree1c2ef216763028a024331d0087348fec87d39be2 /include
parentd1f543a9d87f354e5ad8f942933dba3edb54ffed (diff)
types/wlr_tablet_tool: uniformize events name
Diffstat (limited to 'include')
-rw-r--r--include/wlr/types/wlr_tablet_tool.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 2819bcc4..ec0fc42a 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -90,8 +90,8 @@ enum wlr_tablet_tool_axes {
WLR_TABLET_TOOL_AXIS_WHEEL = 1 << 8,
};
-struct wlr_event_tablet_tool_axis {
- struct wlr_input_device *device;
+struct wlr_tablet_tool_axis_event {
+ struct wlr_tablet *tablet;
struct wlr_tablet_tool *tool;
uint32_t time_msec;
@@ -113,8 +113,8 @@ enum wlr_tablet_tool_proximity_state {
WLR_TABLET_TOOL_PROXIMITY_IN,
};
-struct wlr_event_tablet_tool_proximity {
- struct wlr_input_device *device;
+struct wlr_tablet_tool_proximity_event {
+ struct wlr_tablet *tablet;
struct wlr_tablet_tool *tool;
uint32_t time_msec;
// From 0..1
@@ -123,12 +123,12 @@ struct wlr_event_tablet_tool_proximity {
};
enum wlr_tablet_tool_tip_state {
- WLR_TABLET_TOOL_TIP_UP,
- WLR_TABLET_TOOL_TIP_DOWN,
+ WLR_TABLET_TOOL_TIP_UP = 1 << 0,
+ WLR_TABLET_TOOL_TIP_DOWN = 1 << 1,
};
-struct wlr_event_tablet_tool_tip {
- struct wlr_input_device *device;
+struct wlr_tablet_tool_tip_event {
+ struct wlr_tablet *tablet;
struct wlr_tablet_tool *tool;
uint32_t time_msec;
// From 0..1
@@ -136,8 +136,8 @@ struct wlr_event_tablet_tool_tip {
enum wlr_tablet_tool_tip_state state;
};
-struct wlr_event_tablet_tool_button {
- struct wlr_input_device *device;
+struct wlr_tablet_tool_button_event {
+ struct wlr_tablet *tablet;
struct wlr_tablet_tool *tool;
uint32_t time_msec;
uint32_t button;