Merge pull request #418 from acrisci/feature/wlr-seat-touch

wlr-seat: touch

3 files changed, 221 insertions, 88 deletions

diff --git a/rootston/cursor.c b/rootston/cursor.c
index 5949a364..10bb4dd3 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -28,7 +28,8 @@ void roots_cursor_destroy(struct roots_cursor *cursor) {
 	// TODO
 }
 
-static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t time) {
+static void roots_cursor_update_position(struct roots_cursor *cursor,
+		uint32_t time) {
 	struct roots_desktop *desktop = cursor->seat->input->server->desktop;
 	struct roots_seat *seat = cursor->seat;
 	struct roots_view *view;
@@ -128,15 +129,18 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t t
 
 static void roots_cursor_press_button(struct roots_cursor *cursor,
 		struct wlr_input_device *device, uint32_t time, uint32_t button,
-		uint32_t state) {
+		uint32_t state, double lx, double ly) {
 	struct roots_seat *seat = cursor->seat;
 	struct roots_desktop *desktop = seat->input->server->desktop;
+	bool is_touch = device->type == WLR_INPUT_DEVICE_TOUCH;
+
 	struct wlr_surface *surface;
 	double sx, sy;
-	struct roots_view *view = view_at(desktop,
-		cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
+	struct roots_view *view = view_at(desktop, lx, ly, &surface, &sx, &sy);
 
-	if (state == WLR_BUTTON_PRESSED && view && roots_seat_has_meta_pressed(seat)) {
+	if (state == WLR_BUTTON_PRESSED &&
+			view &&
+			roots_seat_has_meta_pressed(seat)) {
 		roots_seat_focus_view(seat, view);
 
 		uint32_t edges;
@@ -165,14 +169,21 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 		return;
 	}
 
-	uint32_t serial =
-		wlr_seat_pointer_notify_button(seat->seat, time, button, state);
+	uint32_t serial;
+	if (is_touch) {
+		serial = wl_display_get_serial(desktop->server->wl_display);
+	} else {
+		serial =
+			wlr_seat_pointer_notify_button(seat->seat, time, button, state);
+	}
 
 	int i;
 	switch (state) {
 	case WLR_BUTTON_RELEASED:
 		seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
-		roots_cursor_update_position(cursor, time);
+		if (!is_touch) {
+			roots_cursor_update_position(cursor, time);
+		}
 		break;
 	case WLR_BUTTON_PRESSED:
 		i = cursor->input_events_idx;
@@ -203,7 +214,7 @@ void roots_cursor_handle_motion_absolute(struct roots_cursor *cursor,
 void roots_cursor_handle_button(struct roots_cursor *cursor,
 		struct wlr_event_pointer_button *event) {
 	roots_cursor_press_button(cursor, event->device, event->time_msec,
-		event->button, event->state);
+		event->button, event->state, cursor->cursor->x, cursor->cursor->y);
 }
 
 void roots_cursor_handle_axis(struct roots_cursor *cursor,
@@ -214,50 +225,86 @@ void roots_cursor_handle_axis(struct roots_cursor *cursor,
 
 void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
 		struct wlr_event_touch_down *event) {
-	struct roots_touch_point *point =
-		calloc(1, sizeof(struct roots_touch_point));
-	if (!point) {
-		wlr_log(L_ERROR, "could not allocate memory for touch point");
+	struct roots_desktop *desktop = cursor->seat->input->server->desktop;
+	struct wlr_surface *surface = NULL;
+	double lx, ly;
+	bool result =
+		wlr_cursor_absolute_to_layout_coords(cursor->cursor,
+			event->device, event->x_mm, event->y_mm, event->width_mm,
+			event->height_mm, &lx, &ly);
+	if (!result) {
 		return;
 	}
+	double sx, sy;
+	view_at(desktop, lx, ly, &surface, &sx, &sy);
 
-	point->device = event->device->data;
-	point->slot = event->slot;
-	point->x = event->x_mm / event->width_mm;
-	point->y = event->y_mm / event->height_mm;
-	wlr_cursor_warp_absolute(cursor->cursor, event->device, point->x, point->y);
-	roots_cursor_update_position(cursor, event->time_msec);
-	wl_list_insert(&cursor->touch_points, &point->link);
-	roots_cursor_press_button(cursor,  event->device,
-		event->time_msec, BTN_LEFT, 1);
+	uint32_t serial = 0;
+	if (surface) {
+		serial = wlr_seat_touch_notify_down(cursor->seat->seat, surface,
+			event->time_msec, event->touch_id, sx, sy);
+	}
+
+	if (serial && wlr_seat_touch_num_points(cursor->seat->seat) == 1) {
+		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,
+			BTN_LEFT, 1, lx, ly);
+	}
 }
 
 void roots_cursor_handle_touch_up(struct roots_cursor *cursor,
 		struct wlr_event_touch_up *event) {
-	struct roots_touch_point *point;
-	wl_list_for_each(point, &cursor->touch_points, link) {
-		if (point->slot == event->slot) {
-			wl_list_remove(&point->link);
-			free(point);
-			break;
-		}
+	struct wlr_touch_point *point =
+		wlr_seat_touch_get_point(cursor->seat->seat, event->touch_id);
+	if (!point) {
+		return;
 	}
-	roots_cursor_press_button(cursor, event->device,
-		event->time_msec, BTN_LEFT, 0);
+
+	if (wlr_seat_touch_num_points(cursor->seat->seat) == 1) {
+		roots_cursor_press_button(cursor, event->device, event->time_msec,
+			BTN_LEFT, 0, cursor->seat->touch_x, cursor->seat->touch_y);
+	}
+
+	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_touch_point *point;
-	wl_list_for_each(point, &cursor->touch_points, link) {
-		if (point->slot == event->slot) {
-			point->x = event->x_mm / event->width_mm;
-			point->y = event->y_mm / event->height_mm;
-			wlr_cursor_warp_absolute(cursor->cursor, event->device,
-					point->x, point->y);
-			roots_cursor_update_position(cursor, event->time_msec);
-			break;
-		}
+	struct roots_desktop *desktop = cursor->seat->input->server->desktop;
+	struct wlr_touch_point *point =
+		wlr_seat_touch_get_point(cursor->seat->seat, event->touch_id);
+	if (!point) {
+		return;
+	}
+
+	struct wlr_surface *surface = NULL;
+	double lx, ly;
+	bool result =
+		wlr_cursor_absolute_to_layout_coords(cursor->cursor,
+			event->device, event->x_mm, event->y_mm, event->width_mm,
+			event->height_mm, &lx, &ly);
+	if (!result) {
+		return;
+	}
+
+	double sx, sy;
+	view_at(desktop, lx, ly, &surface, &sx, &sy);
+
+	if (surface) {
+		wlr_seat_touch_point_focus(cursor->seat->seat, surface,
+			event->time_msec, event->touch_id, sx, sy);
+		wlr_seat_touch_notify_motion(cursor->seat->seat, event->time_msec,
+			event->touch_id, sx, sy);
+	} else {
+		wlr_seat_touch_point_clear_focus(cursor->seat->seat, event->time_msec,
+			event->touch_id);
+	}
+
+	if (event->touch_id == cursor->seat->touch_id) {
+		cursor->seat->touch_x = lx;
+		cursor->seat->touch_y = ly;
 	}
 }
 
@@ -282,14 +329,16 @@ void roots_cursor_handle_tool_axis(struct roots_cursor *cursor,
 void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
 		struct wlr_event_tablet_tool_tip *event) {
 	roots_cursor_press_button(cursor, event->device,
-		event->time_msec, BTN_LEFT, event->state);
+		event->time_msec, BTN_LEFT, event->state, cursor->cursor->x,
+		cursor->cursor->y);
 }
 
 void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_request_set_cursor_event *event) {
 	struct wlr_surface *focused_surface =
 		event->seat_client->seat->pointer_state.focused_surface;
-	bool has_focused = focused_surface != NULL && focused_surface->resource != NULL;
+	bool has_focused =
+		focused_surface != NULL && focused_surface->resource != NULL;
 	struct wl_client *focused_client = NULL;
 	if (has_focused) {
 		focused_client = wl_resource_get_client(focused_surface->resource);
@@ -322,33 +371,59 @@ static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
 	free(drag_icon);
 }
 
+static struct roots_drag_icon *seat_add_drag_icon(struct roots_seat *seat,
+		struct wlr_surface *icon_surface) {
+	if (!icon_surface) {
+		return NULL;
+	}
+
+	struct roots_drag_icon *iter_icon;
+	wl_list_for_each(iter_icon, &seat->drag_icons, link) {
+		if (iter_icon->surface == icon_surface) {
+			// already in the list
+			return iter_icon;
+		}
+	}
+
+	struct roots_drag_icon *drag_icon =
+		calloc(1, sizeof(struct roots_drag_icon));
+	drag_icon->mapped = true;
+	drag_icon->surface = icon_surface;
+	wl_list_insert(&seat->drag_icons, &drag_icon->link);
+
+	wl_signal_add(&icon_surface->events.destroy,
+			&drag_icon->surface_destroy);
+	drag_icon->surface_destroy.notify = handle_drag_icon_destroy;
+
+	wl_signal_add(&icon_surface->events.commit,
+			&drag_icon->surface_commit);
+	drag_icon->surface_commit.notify = handle_drag_icon_commit;
+
+	return drag_icon;
+}
+
+static void seat_unmap_drag_icon(struct roots_seat *seat,
+		struct wlr_surface *icon_surface) {
+	if (!icon_surface) {
+		return;
+	}
+
+	struct roots_drag_icon *icon;
+	wl_list_for_each(icon, &seat->drag_icons, link) {
+		if (icon->surface == icon_surface) {
+			icon->mapped = false;
+		}
+	}
+}
+
 void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_grab *grab) {
-	struct roots_seat *seat = cursor->seat;
 	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
 		struct wlr_drag *drag = grab->data;
-		if (drag->icon) {
-			struct roots_drag_icon *iter_icon;
-			wl_list_for_each(iter_icon, &seat->drag_icons, link) {
-				if (iter_icon->surface == drag->icon) {
-					// already in the list
-					return;
-				}
-			}
-
-			struct roots_drag_icon *drag_icon =
-				calloc(1, sizeof(struct roots_drag_icon));
-			drag_icon->mapped = true;
-			drag_icon->surface = drag->icon;
-			wl_list_insert(&seat->drag_icons, &drag_icon->link);
-
-			wl_signal_add(&drag->icon->events.destroy,
-				&drag_icon->surface_destroy);
-			drag_icon->surface_destroy.notify = handle_drag_icon_destroy;
-
-			wl_signal_add(&drag->icon->events.commit,
-				&drag_icon->surface_commit);
-			drag_icon->surface_commit.notify = handle_drag_icon_commit;
+		struct roots_drag_icon *icon =
+			seat_add_drag_icon(cursor->seat, drag->icon);
+		if (icon) {
+			icon->is_pointer = true;
 		}
 	}
 }
@@ -357,13 +432,27 @@ void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_grab *grab) {
 	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
 		struct wlr_drag *drag = grab->data;
-		struct roots_drag_icon *icon;
-		wl_list_for_each(icon, &cursor->seat->drag_icons, link) {
-			if (icon->surface == drag->icon) {
-				icon->mapped = false;
-			}
+		seat_unmap_drag_icon(cursor->seat, drag->icon);
+	}
+}
+
+void roots_cursor_handle_touch_grab_begin(struct roots_cursor *cursor,
+		struct wlr_seat_touch_grab *grab) {
+	if (grab->interface == &wlr_data_device_touch_drag_interface) {
+		struct wlr_drag *drag = grab->data;
+		struct roots_drag_icon *icon =
+			seat_add_drag_icon(cursor->seat, drag->icon);
+		if (icon) {
+			icon->is_pointer = false;
+			icon->touch_id = drag->grab_touch_id;
 		}
 	}
+}
 
-	roots_cursor_update_position(cursor, 0);
+void roots_cursor_handle_touch_grab_end(struct roots_cursor *cursor,
+		struct wlr_seat_touch_grab *grab) {
+	if (grab->interface == &wlr_data_device_touch_drag_interface) {
+		struct wlr_drag *drag = grab->data;
+		seat_unmap_drag_icon(cursor->seat, drag->icon);
+	}
 }
diff --git a/rootston/output.c b/rootston/output.c
index 28312c2c..6c8f2519 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -200,9 +200,20 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 			}
 			struct wlr_surface *icon = drag_icon->surface;
 			struct wlr_cursor *cursor = seat->cursor->cursor;
-			double icon_x = cursor->x + drag_icon->sx;
-			double icon_y = cursor->y + drag_icon->sy;
-			render_surface(icon, desktop, wlr_output, &now, icon_x, icon_y, 0);
+			double icon_x = 0, icon_y = 0;
+			if (drag_icon->is_pointer) {
+				icon_x = cursor->x + drag_icon->sx;
+				icon_y = cursor->y + drag_icon->sy;
+				render_surface(icon, desktop, wlr_output, &now, icon_x, icon_y, 0);
+			} else {
+				struct wlr_touch_point *point =
+					wlr_seat_touch_get_point(seat->seat, drag_icon->touch_id);
+				if (point) {
+					icon_x = seat->touch_x + drag_icon->sx;
+					icon_y = seat->touch_y + drag_icon->sy;
+					render_surface(icon, desktop, wlr_output, &now, icon_x, icon_y, 0);
+				}
+			}
 		}
 	}
 
diff --git a/rootston/seat.c b/rootston/seat.c
index 2abc542b..1855ca49 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -31,7 +31,8 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
 	roots_cursor_handle_motion(cursor, event);
 }
 
-static void handle_cursor_motion_absolute(struct wl_listener *listener, void *data) {
+static void handle_cursor_motion_absolute(struct wl_listener *listener,
+		void *data) {
 	struct roots_cursor *cursor =
 		wl_container_of(listener, cursor, motion_absolute);
 	struct wlr_event_pointer_motion_absolute *event = data;
@@ -111,7 +112,24 @@ static void handle_pointer_grab_end(struct wl_listener *listener,
 	roots_cursor_handle_pointer_grab_end(cursor, grab);
 }
 
-static void seat_reset_device_mappings(struct roots_seat *seat, struct wlr_input_device *device) {
+static void handle_touch_grab_begin(struct wl_listener *listener,
+		void *data) {
+	struct roots_cursor *cursor =
+		wl_container_of(listener, cursor, touch_grab_begin);
+	struct wlr_seat_touch_grab *grab = data;
+	roots_cursor_handle_touch_grab_begin(cursor, grab);
+}
+
+static void handle_touch_grab_end(struct wl_listener *listener,
+		void *data) {
+	struct roots_cursor *cursor =
+		wl_container_of(listener, cursor, touch_grab_end);
+	struct wlr_seat_touch_grab *grab = data;
+	roots_cursor_handle_touch_grab_end(cursor, grab);
+}
+
+static void seat_reset_device_mappings(struct roots_seat *seat,
+		struct wlr_input_device *device) {
 	struct wlr_cursor *cursor = seat->cursor->cursor;
 	struct roots_config *config = seat->input->config;
 
@@ -194,8 +212,6 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
 	struct roots_desktop *desktop = seat->input->server->desktop;
 	wlr_cursor_attach_output_layout(wlr_cursor, desktop->layout);
 
-	wl_list_init(&seat->cursor->touch_points);
-
 	roots_seat_configure_cursor(seat);
 	roots_seat_configure_xcursor(seat);
 
@@ -219,10 +235,12 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
 	wl_signal_add(&wlr_cursor->events.touch_up, &seat->cursor->touch_up);
 	seat->cursor->touch_up.notify = handle_touch_up;
 
-	wl_signal_add(&wlr_cursor->events.touch_motion, &seat->cursor->touch_motion);
+	wl_signal_add(&wlr_cursor->events.touch_motion,
+		&seat->cursor->touch_motion);
 	seat->cursor->touch_motion.notify = handle_touch_motion;
 
-	wl_signal_add(&wlr_cursor->events.tablet_tool_axis, &seat->cursor->tool_axis);
+	wl_signal_add(&wlr_cursor->events.tablet_tool_axis,
+		&seat->cursor->tool_axis);
 	seat->cursor->tool_axis.notify = handle_tool_axis;
 
 	wl_signal_add(&wlr_cursor->events.tablet_tool_tip, &seat->cursor->tool_tip);
@@ -239,6 +257,14 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
 	wl_signal_add(&seat->seat->events.pointer_grab_end,
 			&seat->cursor->pointer_grab_end);
 	seat->cursor->pointer_grab_end.notify = handle_pointer_grab_end;
+
+	wl_signal_add(&seat->seat->events.touch_grab_begin,
+			&seat->cursor->touch_grab_begin);
+	seat->cursor->touch_grab_begin.notify = handle_touch_grab_begin;
+
+	wl_signal_add(&seat->seat->events.touch_grab_end,
+			&seat->cursor->touch_grab_end);
+	seat->cursor->touch_grab_end.notify = handle_touch_grab_end;
 }
 
 struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
@@ -282,9 +308,11 @@ void roots_seat_destroy(struct roots_seat *seat) {
 	// TODO
 }
 
-static void seat_add_keyboard(struct roots_seat *seat, struct wlr_input_device *device) {
+static void seat_add_keyboard(struct roots_seat *seat,
+		struct wlr_input_device *device) {
 	assert(device->type == WLR_INPUT_DEVICE_KEYBOARD);
-	struct roots_keyboard *keyboard = roots_keyboard_create(device, seat->input);
+	struct roots_keyboard *keyboard =
+		roots_keyboard_create(device, seat->input);
 	if (keyboard == NULL) {
 		wlr_log(L_ERROR, "could not allocate keyboard for seat");
 		return;
@@ -305,7 +333,8 @@ static void seat_add_keyboard(struct roots_seat *seat, struct wlr_input_device *
 	wlr_seat_set_keyboard(seat->seat, device);
 }
 
-static void seat_add_pointer(struct roots_seat *seat, struct wlr_input_device *device) {
+static void seat_add_pointer(struct roots_seat *seat,
+		struct wlr_input_device *device) {
 	struct roots_pointer *pointer = calloc(sizeof(struct roots_pointer), 1);
 	if (!pointer) {
 		wlr_log(L_ERROR, "could not allocate pointer for seat");
@@ -320,7 +349,8 @@ static void seat_add_pointer(struct roots_seat *seat, struct wlr_input_device *d
 	roots_seat_configure_cursor(seat);
 }
 
-static void seat_add_touch(struct roots_seat *seat, struct wlr_input_device *device) {
+static void seat_add_touch(struct roots_seat *seat,
+		struct wlr_input_device *device) {
 	struct roots_touch *touch = calloc(sizeof(struct roots_touch), 1);
 	if (!touch) {
 		wlr_log(L_ERROR, "could not allocate touch for seat");
@@ -335,12 +365,15 @@ static void seat_add_touch(struct roots_seat *seat, struct wlr_input_device *dev
 	roots_seat_configure_cursor(seat);
 }
 
-static void seat_add_tablet_pad(struct roots_seat *seat, struct wlr_input_device *device) {
+static void seat_add_tablet_pad(struct roots_seat *seat,
+		struct wlr_input_device *device) {
 	// TODO
 }
 
-static void seat_add_tablet_tool(struct roots_seat *seat, struct wlr_input_device *device) {
-	struct roots_tablet_tool *tablet_tool = calloc(sizeof(struct roots_tablet_tool), 1);
+static void seat_add_tablet_tool(struct roots_seat *seat,
+		struct wlr_input_device *device) {
+	struct roots_tablet_tool *tablet_tool =
+		calloc(sizeof(struct roots_tablet_tool), 1);
 	if (!tablet_tool) {
 		wlr_log(L_ERROR, "could not allocate tablet_tool for seat");
 		return;