Merge pull request #120 from acrisci/feature/wlr-cursor

wlr_cursor

1 files changed, 309 insertions, 52 deletions

diff --git a/examples/pointer.c b/examples/pointer.c
index 12253b62..d9a06339 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
+#include <assert.h>
 #include <wayland-server.h>
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
@@ -16,19 +17,71 @@
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/xcursor.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/util/log.h>
 #include "shared.h"
+#include "config.h"
 #include "cat.h"
 
+struct sample_input_device {
+	struct wlr_input_device *device;
+	struct wl_list link;
+};
+
 struct sample_state {
-	struct wlr_xcursor *cursor;
+	struct compositor_state *compositor;
+	struct example_config *config;
+	struct wlr_xcursor *xcursor;
+	struct wlr_cursor *cursor;
 	double cur_x, cur_y;
 	float default_color[4];
 	float clear_color[4];
+	struct wlr_output_layout *layout;
+	struct wl_list devices;
+
+	struct wl_listener cursor_motion;
+	struct wl_listener cursor_motion_absolute;
+	struct wl_listener cursor_button;
+	struct wl_listener cursor_axis;
+
+	struct wl_listener touch_motion;
+	struct wl_listener touch_up;
+	struct wl_listener touch_down;
+	struct wl_listener touch_cancel;
+	list_t *touch_points;
+
+	struct wl_listener tablet_tool_axis;
+	struct wl_listener tablet_tool_proxmity;
+	struct wl_listener tablet_tool_tip;
+	struct wl_listener tablet_tool_button;
+};
+
+struct touch_point {
+	int32_t slot;
+	double x, y;
 };
 
-static void handle_output_frame(struct output_state *output, struct timespec *ts) {
+static void warp_to_touch(struct sample_state *sample,
+        struct wlr_input_device *dev) {
+	if (sample->touch_points->length == 0) {
+		return;
+	}
+
+	double x = 0, y = 0;
+	for (size_t i = 0; i < sample->touch_points->length; ++i) {
+		struct touch_point *point = sample->touch_points->items[i];
+		x += point->x;
+		y += point->y;
+	}
+	x /= sample->touch_points->length;
+	y /= sample->touch_points->length;
+	wlr_cursor_warp_absolute(sample->cursor, dev, x, y);
+}
+
+static void handle_output_frame(struct output_state *output,
+        struct timespec *ts) {
 	struct compositor_state *state = output->compositor;
 	struct sample_state *sample = state->data;
 	struct wlr_output *wlr_output = output->output;
@@ -36,65 +89,178 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
 	wlr_output_make_current(wlr_output);
 
 	glClearColor(sample->clear_color[0], sample->clear_color[1],
-			sample->clear_color[2], sample->clear_color[3]);
+		sample->clear_color[2], sample->clear_color[3]);
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	wlr_output_swap_buffers(wlr_output);
 }
 
-static void handle_pointer_motion(struct pointer_state *pstate,
-		double d_x, double d_y) {
-	struct sample_state *state = pstate->compositor->data;
-	state->cur_x += d_x;
-	state->cur_y += d_y;
+static void configure_devices(struct sample_state *sample) {
+	struct sample_input_device *dev;
+	struct device_config *dc;
 
-	struct wlr_xcursor_image *image = state->cursor->images[0];
+	// reset device mappings
+	wl_list_for_each(dev, &sample->devices, link) {
+		wlr_cursor_map_input_to_output(sample->cursor, dev->device, NULL);
+		wl_list_for_each(dc, &sample->config->devices, link) {
+			if (strcmp(dev->device->name, dc->name) == 0) {
+				wlr_cursor_map_input_to_region(sample->cursor, dev->device,
+					dc->mapped_box);
+			}
+		}
+	}
 
-	struct output_state *output;
-	wl_list_for_each(output, &pstate->compositor->outputs, link) {
-		wlr_output_move_cursor(output->output,
-				state->cur_x - image->hotspot_x,
-				state->cur_y - image->hotspot_y);
+	struct output_state *ostate;
+	wl_list_for_each(ostate, &sample->compositor->outputs, link) {
+		wl_list_for_each(dc, &sample->config->devices, link) {
+			// configure device to output mappings
+			if (dc->mapped_output &&
+					strcmp(dc->mapped_output, ostate->output->name) == 0) {
+				wl_list_for_each(dev, &sample->devices, link) {
+					if (strcmp(dev->device->name, dc->name) == 0) {
+						wlr_cursor_map_input_to_output(sample->cursor,
+							dev->device, ostate->output);
+					}
+				}
+			}
+		}
+	}
+}
+
+static void handle_output_add(struct output_state *ostate) {
+	struct sample_state *sample = ostate->compositor->data;
+	struct wlr_output *wlr_output = ostate->output;
+	struct wlr_xcursor_image *image = sample->xcursor->images[0];
+
+	// reset layout
+	wlr_output_layout_destroy(sample->layout);
+	sample->layout =
+        configure_layout(sample->config, &ostate->compositor->outputs);
+	wlr_cursor_attach_output_layout(sample->cursor, sample->layout);
+
+	// cursor configuration
+	char *mapped_output = sample->config->cursor.mapped_output;
+	if (mapped_output && strcmp(mapped_output, wlr_output->name) == 0) {
+		wlr_cursor_map_to_output(sample->cursor, wlr_output);
+	}
+
+	configure_devices(sample);
+
+	// TODO move to wlr_cursor
+	if (!wlr_output_set_cursor(wlr_output, image->buffer,
+			image->width, image->width, image->height)) {
+		wlr_log(L_DEBUG, "Failed to set hardware cursor");
+		return;
+	}
+	if (!wlr_output_move_cursor(wlr_output, 0, 0)) {
+		wlr_log(L_DEBUG, "Failed to move hardware cursor");
+	}
+}
+
+static void handle_output_remove(struct output_state *ostate) {
+		struct sample_state *sample = ostate->compositor->data;
+	wlr_output_layout_destroy(sample->layout);
+	sample->layout =
+        configure_layout(sample->config, &ostate->compositor->outputs);
+	wlr_cursor_attach_output_layout(sample->cursor, sample->layout);
+
+	configure_devices(sample);
+
+	char *mapped_output = sample->config->cursor.mapped_output;
+	if (mapped_output && strcmp(mapped_output, ostate->output->name) == 0) {
+		wlr_cursor_map_to_output(sample->cursor, NULL);
 	}
 }
 
-static void handle_pointer_motion_absolute(struct pointer_state *pstate,
-		double x, double y) {
-	struct sample_state *state = pstate->compositor->data;
-	state->cur_x = x;
-	state->cur_y = y;
+static void handle_output_resolution(struct compositor_state *state,
+		struct output_state *ostate) {
+	struct sample_state *sample = ostate->compositor->data;
+	wlr_output_layout_destroy(sample->layout);
+	sample->layout =
+        configure_layout(sample->config, &ostate->compositor->outputs);
+	wlr_cursor_attach_output_layout(sample->cursor, sample->layout);
+}
+
+static void handle_input_add(struct compositor_state *state,
+        struct wlr_input_device *device) {
+	struct sample_state *sample = state->data;
+
+	if (device->type == WLR_INPUT_DEVICE_POINTER ||
+			device->type == WLR_INPUT_DEVICE_TOUCH ||
+			device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
+		struct sample_input_device *s_device;
+		s_device = calloc(1, sizeof(struct sample_input_device));
+		s_device->device = device;
 
-	struct wlr_xcursor_image *image = state->cursor->images[0];
+		wl_list_insert(&sample->devices, &s_device->link);
+		wlr_cursor_attach_input_device(sample->cursor, device);
+		configure_devices(sample);
+	}
+}
+
+static void handle_input_remove(struct compositor_state *state,
+        struct wlr_input_device *device) {
+	struct sample_state *sample = state->data;
+	struct sample_input_device *s_device, *tmp = NULL;
+	wl_list_for_each_safe(s_device, tmp, &sample->devices, link) {
+		if (s_device->device == device) {
+			wl_list_remove(&s_device->link);
+			free(s_device);
+		}
+	}
+}
+
+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);
+}
+
+static void handle_cursor_motion_absolute(struct wl_listener *listener,
+        void *data) {
+	struct sample_state *sample =
+        wl_container_of(listener, sample, cursor_motion_absolute);
+	struct wlr_event_pointer_motion_absolute *event = data;
+
+	sample->cur_x = event->x_mm;
+	sample->cur_y = event->y_mm;
+
+	struct wlr_xcursor_image *image = sample->xcursor->images[0];
 
 	struct output_state *output;
-	wl_list_for_each(output, &pstate->compositor->outputs, link) {
+	wl_list_for_each(output, &sample->compositor->outputs, link) {
 		wlr_output_move_cursor(output->output,
-				state->cur_x - image->hotspot_x,
-				state->cur_y - image->hotspot_y);
+				sample->cur_x - image->hotspot_x,
+				sample->cur_y - image->hotspot_y);
 	}
 }
 
-static void handle_pointer_button(struct pointer_state *pstate,
-		uint32_t button, enum wlr_button_state state) {
-	struct sample_state *sample = pstate->compositor->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;
+
 	float (*color)[4];
-	if (state == WLR_BUTTON_RELEASED) {
+	if (event->state == WLR_BUTTON_RELEASED) {
 		color = &sample->default_color;
+		memcpy(&sample->clear_color, color, sizeof(*color));
 	} else {
 		float red[4] = { 0.25f, 0.25f, 0.25f, 1 };
-		red[button % 3] = 1;
+		red[event->button % 3] = 1;
 		color = &red;
+		memcpy(&sample->clear_color, color, sizeof(*color));
 	}
-	memcpy(&sample->clear_color, color, sizeof(*color));
 }
 
-static void handle_pointer_axis(struct pointer_state *pstate,
-	enum wlr_axis_source source,
-	enum wlr_axis_orientation orientation,
-	double delta) {
-	struct sample_state *sample = pstate->compositor->data;
+static void handle_cursor_axis(struct wl_listener *listener, void *data) {
+	struct sample_state *sample =
+        wl_container_of(listener, sample, cursor_axis);
+	struct wlr_event_pointer_axis *event = data;
+
 	for (size_t i = 0; i < 3; ++i) {
-		sample->default_color[i] += delta > 0 ? -0.05f : 0.05f;
+		sample->default_color[i] += event->delta > 0 ? -0.05f : 0.05f;
 		if (sample->default_color[i] > 1.0f) {
 			sample->default_color[i] = 1.0f;
 		}
@@ -102,52 +268,143 @@ static void handle_pointer_axis(struct pointer_state *pstate,
 			sample->default_color[i] = 0.0f;
 		}
 	}
+
 	memcpy(&sample->clear_color, &sample->default_color,
 			sizeof(sample->clear_color));
 }
 
-static void handle_output_add(struct output_state *ostate) {
-	struct sample_state *state = ostate->compositor->data;
-	struct wlr_output *wlr_output = ostate->output;
-	struct wlr_xcursor_image *image = state->cursor->images[0];
-	if (!wlr_output_set_cursor(wlr_output, image->buffer,
-			image->width, image->width, image->height)) {
-		wlr_log(L_DEBUG, "Failed to set hardware cursor");
-		return;
+static void handle_touch_up(struct wl_listener *listener, void *data) {
+	struct sample_state *sample = wl_container_of(listener, sample, touch_up);
+	struct wlr_event_touch_up *event = data;
+	for (size_t i = 0; i < sample->touch_points->length; ++i) {
+		struct touch_point *point = sample->touch_points->items[i];
+		if (point->slot == event->slot) {
+			list_del(sample->touch_points, i);
+			break;
+		}
 	}
-	if (!wlr_output_move_cursor(wlr_output, 0, 0)) {
-		wlr_log(L_DEBUG, "Failed to move hardware cursor");
+
+	warp_to_touch(sample, event->device);
+}
+
+static void handle_touch_down(struct wl_listener *listener, void *data) {
+	struct sample_state *sample = wl_container_of(listener, sample, touch_down);
+	struct wlr_event_touch_down *event = data;
+	struct touch_point *point = calloc(1, sizeof(struct touch_point));
+	point->slot = event->slot;
+	point->x = event->x_mm / event->width_mm;
+	point->y = event->y_mm / event->height_mm;
+	if (list_add(sample->touch_points, point) == -1) {
+		free(point);
+	}
+
+	warp_to_touch(sample, event->device);
+}
+
+static void handle_touch_motion(struct wl_listener *listener, void *data) {
+	struct sample_state *sample =
+        wl_container_of(listener, sample, touch_motion);
+	struct wlr_event_touch_motion *event = data;
+	for (size_t i = 0; i < sample->touch_points->length; ++i) {
+		struct touch_point *point = sample->touch_points->items[i];
+		if (point->slot == event->slot) {
+			point->x = event->x_mm / event->width_mm;
+			point->y = event->y_mm / event->height_mm;
+			break;
+		}
+	}
+
+	warp_to_touch(sample, event->device);
+}
+
+static void handle_touch_cancel(struct wl_listener *listener, void *data) {
+	wlr_log(L_DEBUG, "TODO: touch cancel");
+}
+
+static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
+	struct sample_state *sample =
+        wl_container_of(listener, sample, tablet_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);
 	}
 }
 
 int main(int argc, char *argv[]) {
 	struct sample_state state = {
 		.default_color = { 0.25f, 0.25f, 0.25f, 1 },
-		.clear_color = { 0.25f, 0.25f, 0.25f, 1 }
+		.clear_color = { 0.25f, 0.25f, 0.25f, 1 },
+		.touch_points = list_create(),
 	};
+
+	state.config = parse_args(argc, argv);
+	state.cursor = wlr_cursor_create();
+	wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box);
+	wl_list_init(&state.devices);
+
+	// pointer events
+	wl_signal_add(&state.cursor->events.motion, &state.cursor_motion);
+	state.cursor_motion.notify = handle_cursor_motion;
+
+	wl_signal_add(&state.cursor->events.motion_absolute,
+        &state.cursor_motion_absolute);
+	state.cursor_motion_absolute.notify = handle_cursor_motion_absolute;
+
+	wl_signal_add(&state.cursor->events.button, &state.cursor_button);
+	state.cursor_button.notify = handle_cursor_button;
+
+	wl_signal_add(&state.cursor->events.axis, &state.cursor_axis);
+	state.cursor_axis.notify = handle_cursor_axis;
+
+	// touch events
+	wl_signal_add(&state.cursor->events.touch_up, &state.touch_up);
+	state.touch_up.notify = handle_touch_up;
+
+	wl_signal_add(&state.cursor->events.touch_down, &state.touch_down);
+	state.touch_down.notify = handle_touch_down;
+
+	wl_signal_add(&state.cursor->events.touch_motion, &state.touch_motion);
+	state.touch_motion.notify = handle_touch_motion;
+
+	wl_signal_add(&state.cursor->events.touch_cancel, &state.touch_cancel);
+	state.touch_cancel.notify = handle_touch_cancel;
+
+	// tool events
+	wl_signal_add(&state.cursor->events.tablet_tool_axis,
+        &state.tablet_tool_axis);
+	state.tablet_tool_axis.notify = handle_tablet_tool_axis;
+
 	struct compositor_state compositor = { 0 };
 	compositor.data = &state;
 	compositor.output_add_cb = handle_output_add;
+	compositor.output_remove_cb = handle_output_remove;
+	compositor.output_resolution_cb = handle_output_resolution;
 	compositor.output_frame_cb = handle_output_frame;
-	compositor.pointer_motion_cb = handle_pointer_motion;
-	compositor.pointer_motion_absolute_cb = handle_pointer_motion_absolute;
-	compositor.pointer_button_cb = handle_pointer_button;
-	compositor.pointer_axis_cb = handle_pointer_axis;
+	compositor.input_add_cb = handle_input_add;
+	compositor.input_remove_cb = handle_input_remove;
+
+	state.compositor = &compositor;
 
 	struct wlr_xcursor_theme *theme = wlr_xcursor_theme_load("default", 16);
 	if (!theme) {
 		wlr_log(L_ERROR, "Failed to load cursor theme");
 		return 1;
 	}
-	state.cursor = wlr_xcursor_theme_get_cursor(theme, "left_ptr");
-	if (!state.cursor) {
+	state.xcursor = wlr_xcursor_theme_get_cursor(theme, "left_ptr");
+	if (!state.xcursor) {
 		wlr_log(L_ERROR, "Failed to load left_ptr cursor");
 		return 1;
 	}
 
+	wlr_cursor_set_xcursor(state.cursor, state.xcursor);
+
 	compositor_init(&compositor);
 	wl_display_run(compositor.display);
 	compositor_fini(&compositor);
 
 	wlr_xcursor_theme_destroy(theme);
+	example_config_destroy(state.config);
+	wlr_cursor_destroy(state.cursor);
 }