aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorTudor Brindus <me@tbrindus.ca>2020-05-04 15:38:49 -0400
committerSimon Ser <contact@emersion.fr>2020-05-04 21:53:52 +0200
commit6357e166f9a31f0c828ea5bb0000627c15442505 (patch)
tree0b516c3e4070df5387f10fc376b14c9c5bc688aa /backend
parent16af1972d62e9fcdf6e3b6cb445b29762c2a1878 (diff)
backend/wayland: emit tablet tool axis events to the axis handler
Diffstat (limited to 'backend')
-rw-r--r--backend/wayland/tablet_v2.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c
index e327fbd1..3b24161d 100644
--- a/backend/wayland/tablet_v2.c
+++ b/backend/wayland/tablet_v2.c
@@ -230,7 +230,7 @@ static void handle_tablet_pad_group_ring(void *data,
}
tablet_ring->index = group->pad->ring_count++;
tablet_ring->group = group;
- zwp_tablet_pad_ring_v2_add_listener(ring, &tablet_pad_ring_listener,
+ zwp_tablet_pad_ring_v2_add_listener(ring, &tablet_pad_ring_listener,
tablet_ring);
group->group.rings = realloc(group->group.rings,
@@ -251,7 +251,7 @@ static void handle_tablet_pad_group_strip(void *data,
}
tablet_strip->index = group->pad->strip_count++;
tablet_strip->group = group;
- zwp_tablet_pad_strip_v2_add_listener(strip, &tablet_pad_strip_listener,
+ zwp_tablet_pad_strip_v2_add_listener(strip, &tablet_pad_strip_listener,
tablet_strip);
group->group.strips = realloc(group->group.strips,
@@ -521,7 +521,7 @@ static void handle_tablet_tool_capability(void *data,
struct wlr_wl_tablet_tool *tool = data;
enum zwp_tablet_tool_v2_capability cap = capability;
-
+
switch (cap) {
case ZWP_TABLET_TOOL_V2_CAPABILITY_TILT:
tool->wlr_tool.tilt = true;
@@ -674,7 +674,7 @@ static void handle_tablet_tool_frame(void *data,
.y = tool->y,
.state = WLR_TABLET_TOOL_PROXIMITY_IN,
};
-
+
wlr_signal_emit_safe(&tablet->events.proximity, &evt);
}
@@ -732,7 +732,7 @@ static void handle_tablet_tool_frame(void *data,
}
if (evt.updated_axes) {
- wlr_signal_emit_safe(&tablet->events.proximity, &evt);
+ wlr_signal_emit_safe(&tablet->events.axis, &evt);
}
}
@@ -750,7 +750,7 @@ static void handle_tablet_tool_frame(void *data,
.y = tool->y,
.state = WLR_TABLET_TOOL_TIP_DOWN,
};
-
+
wlr_signal_emit_safe(&tablet->events.tip, &evt);
}
@@ -763,7 +763,7 @@ static void handle_tablet_tool_frame(void *data,
.y = tool->y,
.state = WLR_TABLET_TOOL_TIP_UP,
};
-
+
wlr_signal_emit_safe(&tablet->events.tip, &evt);
}
@@ -776,7 +776,7 @@ static void handle_tablet_tool_frame(void *data,
.y = tool->y,
.state = WLR_TABLET_TOOL_PROXIMITY_OUT,
};
-
+
wlr_signal_emit_safe(&tablet->events.proximity, &evt);
}