Merge pull request #149 from acrisci/feature/wlr-seat-pointer

wlr-seat pointer events

1 files changed, 137 insertions, 7 deletions

diff --git a/examples/compositor.c b/examples/compositor.c
index 63041615..085cbb0e 100644
--- a/examples/compositor.c
+++ b/examples/compositor.c
@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <wayland-server.h>
+// TODO: BSD et al
+#include <linux/input-event-codes.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render.h>
@@ -17,6 +19,7 @@
 #include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_data_device_manager.h>
 #include <wlr/types/wlr_gamma_control.h>
 #include "wlr/types/wlr_compositor.h"
@@ -27,6 +30,7 @@
 #include <wlr/util/log.h>
 #include "config.h"
 #include "shared.h"
+#include <assert.h>
 
 // TODO: move to common header?
 int os_create_anonymous_file(off_t size);
@@ -57,12 +61,19 @@ struct sample_state {
 	struct wl_listener cursor_button;
 	struct wl_listener cursor_axis;
 
+	struct wl_listener tool_axis;
+	struct wl_listener tool_tip;
+	struct wl_listener tool_button;
+
 	struct wl_listener new_xdg_surface_v6;
+
+	struct wlr_xdg_surface_v6 *focused_surface;
 };
 
 struct example_xdg_surface_v6 {
 	struct wlr_xdg_surface_v6 *surface;
 
+	// position of the wlr_surface in the layout
 	struct {
 		int lx;
 		int ly;
@@ -76,6 +87,29 @@ struct example_xdg_surface_v6 {
 	struct wl_listener request_show_window_menu_listener;
 };
 
+static void example_set_focused_surface(struct sample_state *sample,
+		struct wlr_xdg_surface_v6 *surface) {
+	if (sample->focused_surface == surface) {
+		return;
+	}
+
+	// set activated state of the xdg surfaces
+	struct wlr_xdg_surface_v6 *xdg_surface;
+	struct wlr_xdg_client_v6 *xdg_client;
+	wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
+		wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
+			if (!xdg_surface->configured ||
+					xdg_surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+				continue;
+			}
+			wlr_xdg_toplevel_v6_set_activated(xdg_surface,
+				xdg_surface == surface);
+		}
+	}
+
+	sample->focused_surface = surface;
+}
+
 /*
  * Convert timespec to milliseconds
  */
@@ -222,11 +256,13 @@ static void handle_output_frame(struct output_state *output,
 	struct wlr_xdg_client_v6 *xdg_client;
 	wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
 		wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
-			if (xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_NONE) {
+			if (!xdg_surface->configured) {
 				continue;
 			}
 
 			struct example_xdg_surface_v6 *esurface = xdg_surface->data;
+			assert(esurface);
+
 			int width = xdg_surface->surface->current.buffer_width;
 			int height = xdg_surface->surface->current.buffer_height;
 
@@ -307,12 +343,65 @@ static void handle_keyboard_bound(struct wl_listener *listener, void *data) {
 	}
 }
 
+static struct wlr_xdg_surface_v6 *example_xdg_surface_at(
+		struct sample_state *sample, int lx, int ly) {
+	struct wlr_xdg_surface_v6 *xdg_surface;
+	struct wlr_xdg_client_v6 *xdg_client;
+	wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
+		wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
+			if (!xdg_surface->configured) {
+				continue;
+			}
+
+			struct example_xdg_surface_v6 *esurface = xdg_surface->data;
+
+			double window_x = esurface->position.lx + xdg_surface->geometry->x;
+			double window_y = esurface->position.ly + xdg_surface->geometry->y;
+
+			if (sample->cursor->x >= window_x &&
+					sample->cursor->y >= window_y &&
+					sample->cursor->x <= window_x +
+						xdg_surface->geometry->width &&
+					sample->cursor->y <= window_y +
+						xdg_surface->geometry->height) {
+				return xdg_surface;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+static void update_pointer_position(struct sample_state *sample,
+		uint32_t time_sec) {
+	struct wlr_xdg_surface_v6 *surface =
+		example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
+
+	if (surface) {
+		struct example_xdg_surface_v6 *esurface = surface->data;
+
+		double sx = sample->cursor->x - esurface->position.lx;
+		double sy = sample->cursor->y - esurface->position.ly;
+
+		// TODO z-order
+		wlr_seat_pointer_enter(sample->wl_seat, surface->surface,
+			sx, sy);
+		wlr_seat_pointer_send_motion(sample->wl_seat, time_sec,
+			sx, sy);
+	} else {
+		wlr_seat_pointer_clear_focus(sample->wl_seat);
+	}
+}
+
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
 	struct sample_state *sample =
 		wl_container_of(listener, sample, cursor_motion);
 	struct wlr_event_pointer_motion *event = data;
+
 	wlr_cursor_move(sample->cursor, event->device, event->delta_x,
 		event->delta_y);
+
+	update_pointer_position(sample, event->time_sec);
 }
 
 static void handle_cursor_motion_absolute(struct wl_listener *listener,
@@ -321,8 +410,10 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
 		wl_container_of(listener, sample, cursor_motion_absolute);
 	struct wlr_event_pointer_motion_absolute *event = data;
 
-	wlr_cursor_warp_absolute(sample->cursor, event->device, event->x_mm,
-		event->y_mm);
+	wlr_cursor_warp_absolute(sample->cursor, event->device,
+		event->x_mm / event->width_mm, event->y_mm / event->height_mm);
+
+	update_pointer_position(sample, event->time_sec);
 }
 
 static void handle_cursor_axis(struct wl_listener *listener, void *data) {
@@ -333,10 +424,42 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
 }
 
 static void handle_cursor_button(struct wl_listener *listener, void *data) {
-	//struct sample_state *sample =
-	//wl_container_of(listener, sample, cursor_button);
-	//struct wlr_event_pointer_button *event = data;
-	wlr_log(L_DEBUG, "TODO: handle cursor button");
+	struct sample_state *sample =
+	wl_container_of(listener, sample, cursor_button);
+	struct wlr_event_pointer_button *event = data;
+
+	struct wlr_xdg_surface_v6 *surface =
+		example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
+
+	example_set_focused_surface(sample, surface);
+
+	wlr_seat_pointer_send_button(sample->wl_seat, event->time_sec,
+		event->button, event->state);
+}
+
+static void handle_tool_axis(struct wl_listener *listener, void *data) {
+	struct sample_state *sample =
+		wl_container_of(listener, sample, tool_axis);
+	struct wlr_event_tablet_tool_axis *event = data;
+	if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
+			(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
+		wlr_cursor_warp_absolute(sample->cursor, event->device,
+			event->x_mm / event->width_mm, event->y_mm / event->height_mm);
+		update_pointer_position(sample, event->time_sec);
+	}
+}
+
+static void handle_tool_tip(struct wl_listener *listener, void *data) {
+	struct sample_state *sample =
+		wl_container_of(listener, sample, tool_tip);
+	struct wlr_event_tablet_tool_tip *event = data;
+
+	struct wlr_xdg_surface_v6 *surface =
+		example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
+	example_set_focused_surface(sample, surface);
+
+	wlr_seat_pointer_send_button(sample->wl_seat, event->time_sec,
+		BTN_MOUSE, event->state);
 }
 
 static void handle_input_add(struct compositor_state *state,
@@ -436,6 +559,12 @@ int main(int argc, char *argv[]) {
 	wl_signal_add(&state.cursor->events.axis, &state.cursor_axis);
 	state.cursor_axis.notify = handle_cursor_axis;
 
+	wl_signal_add(&state.cursor->events.tablet_tool_axis, &state.tool_axis);
+	state.tool_axis.notify = handle_tool_axis;
+
+	wl_signal_add(&state.cursor->events.tablet_tool_tip, &state.tool_tip);
+	state.tool_tip.notify = handle_tool_tip;
+
 	compositor_init(&compositor);
 
 	state.renderer = wlr_gles2_renderer_create(compositor.backend);
@@ -462,6 +591,7 @@ int main(int argc, char *argv[]) {
 		wlr_gamma_control_manager_create(compositor.display);
 
 	state.wl_seat = wlr_seat_create(compositor.display, "seat0");
+	assert(state.wl_seat);
 	state.keyboard_bound.notify = handle_keyboard_bound;
 	wl_signal_add(&state.wl_seat->events.keyboard_bound, &state.keyboard_bound);
 	wlr_seat_set_capabilities(state.wl_seat, WL_SEAT_CAPABILITY_KEYBOARD