From d9e978e1b379c811c47f4b3b75f1ec186a640ff7 Mon Sep 17 00:00:00 2001 From: Markus Ongyerth Date: Sat, 16 Jun 2018 11:19:48 +0200 Subject: rename wlr_tablet_tool to wlr_tablet The previous naming was based on the input-device capability names from libinput. With code that uses the libinput_tablet_tool and mapping into tablet-v2, this is confusing, so the name is changed to follow the names used in the protocol. --- rootston/seat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rootston') diff --git a/rootston/seat.c b/rootston/seat.c index 5bd6e752..89a32fa9 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -103,7 +103,7 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { static void handle_tablet_tool_position(struct roots_cursor *cursor, struct roots_tablet_tool *tool, - struct wlr_tablet_tool_tool *tool_tool, + struct wlr_tablet_tool *tool_tool, bool change_x, bool change_y, double x, double y, double dx, double dy) { if (!change_x && !change_y) { @@ -264,7 +264,7 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) { wlr_idle_notify_activity(desktop->idle, cursor->seat->seat); struct wlr_event_tablet_tool_proximity *event = data; - struct wlr_tablet_tool_tool *tool = event->tool; + struct wlr_tablet_tool *tool = event->tool; if (!tool->data) { struct roots_tablet_tool_tool *roots_tool = calloc(1, sizeof(struct roots_tablet_tool_tool)); -- cgit v1.2.3