aboutsummaryrefslogtreecommitdiff
path: root/rootston/cursor.c
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-11-16 17:53:52 -0500
committerTony Crisci <tony@dubstepdish.com>2017-11-16 17:53:52 -0500
commitf61986e8dbadf1be3f3d850356d939ef57f942a0 (patch)
treefd7eaf41eafade1a57e93ca165d67b77790f2c0c /rootston/cursor.c
parentfb18e345a6e4546fe87729962b54cce61759bc71 (diff)
rename touch slot to touch id
Diffstat (limited to 'rootston/cursor.c')
-rw-r--r--rootston/cursor.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 40618fe7..2a0550d6 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -237,11 +237,11 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
uint32_t serial = 0;
if (surface) {
serial = wlr_seat_touch_notify_down(cursor->seat->seat, surface,
- event->time_msec, event->slot, sx, sy);
+ event->time_msec, event->touch_id, sx, sy);
}
if (serial && wlr_seat_touch_num_points(cursor->seat->seat) == 1) {
- cursor->seat->touch_id = event->slot;
+ cursor->seat->touch_id = event->touch_id;
cursor->seat->touch_x = lx;
cursor->seat->touch_y = ly;
roots_cursor_press_button(cursor, event->device, event->time_msec,
@@ -251,7 +251,7 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
void roots_cursor_handle_touch_up(struct roots_cursor *cursor,
struct wlr_event_touch_up *event) {
- struct wlr_touch_point *point = wlr_seat_touch_get_point(cursor->seat->seat, event->slot);
+ struct wlr_touch_point *point = wlr_seat_touch_get_point(cursor->seat->seat, event->touch_id);
if (!point) {
return;
}
@@ -261,14 +261,14 @@ void roots_cursor_handle_touch_up(struct roots_cursor *cursor,
BTN_LEFT, 0, cursor->seat->touch_x, cursor->seat->touch_y);
}
- wlr_seat_touch_notify_up(cursor->seat->seat, event->time_msec, event->slot);
+ wlr_seat_touch_notify_up(cursor->seat->seat, event->time_msec, event->touch_id);
}
void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
struct wlr_event_touch_motion *event) {
struct roots_desktop *desktop = cursor->seat->input->server->desktop;
struct wlr_touch_point *point =
- wlr_seat_touch_get_point(cursor->seat->seat, event->slot);
+ wlr_seat_touch_get_point(cursor->seat->seat, event->touch_id);
if (!point) {
return;
}
@@ -288,15 +288,15 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
if (surface) {
wlr_seat_touch_point_focus(cursor->seat->seat, surface,
- event->time_msec, event->slot, sx, sy);
+ event->time_msec, event->touch_id, sx, sy);
wlr_seat_touch_notify_motion(cursor->seat->seat, event->time_msec,
- event->slot, sx, sy);
+ event->touch_id, sx, sy);
} else {
wlr_seat_touch_point_clear_focus(cursor->seat->seat, event->time_msec,
- event->slot);
+ event->touch_id);
}
- if (event->slot == cursor->seat->touch_id) {
+ if (event->touch_id == cursor->seat->touch_id) {
cursor->seat->touch_x = lx;
cursor->seat->touch_y = ly;
}