Add wlr_output_cursor

5 files changed, 280 insertions, 251 deletions

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 27a8490c..e3f2bfe1 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -558,36 +558,37 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
 		}
 	}
 
-	switch (output->transform) {
-	case WL_OUTPUT_TRANSFORM_90:
-		output->cursor.hotspot_x = hotspot_x;
-		output->cursor.hotspot_y = -plane->surf.height + hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_180:
-		output->cursor.hotspot_x = plane->surf.width - hotspot_x;
-		output->cursor.hotspot_y = plane->surf.height - hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_270:
-		output->cursor.hotspot_x = -plane->surf.height + hotspot_x;
-		output->cursor.hotspot_y = hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_FLIPPED:
-		output->cursor.hotspot_x = plane->surf.width - hotspot_x;
-		output->cursor.hotspot_y = hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_FLIPPED_90:
-		output->cursor.hotspot_x = hotspot_x;
-		output->cursor.hotspot_y = -hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_FLIPPED_180:
-		output->cursor.hotspot_x = hotspot_x;
-		output->cursor.hotspot_y = plane->surf.height - hotspot_y;
-		break;
-	case WL_OUTPUT_TRANSFORM_FLIPPED_270:
-		output->cursor.hotspot_x = -plane->surf.height + hotspot_x;
-		output->cursor.hotspot_y = plane->surf.width - hotspot_y;
-		break;
-	}
+	// TODO: this doesn't belong here
+	// switch (output->transform) {
+	// case WL_OUTPUT_TRANSFORM_90:
+	// 	output->cursor.hotspot_x = hotspot_x;
+	// 	output->cursor.hotspot_y = -plane->surf.height + hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_180:
+	// 	output->cursor.hotspot_x = plane->surf.width - hotspot_x;
+	// 	output->cursor.hotspot_y = plane->surf.height - hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_270:
+	// 	output->cursor.hotspot_x = -plane->surf.height + hotspot_x;
+	// 	output->cursor.hotspot_y = hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_FLIPPED:
+	// 	output->cursor.hotspot_x = plane->surf.width - hotspot_x;
+	// 	output->cursor.hotspot_y = hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_FLIPPED_90:
+	// 	output->cursor.hotspot_x = hotspot_x;
+	// 	output->cursor.hotspot_y = -hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_FLIPPED_180:
+	// 	output->cursor.hotspot_x = hotspot_x;
+	// 	output->cursor.hotspot_y = plane->surf.height - hotspot_y;
+	// 	break;
+	// case WL_OUTPUT_TRANSFORM_FLIPPED_270:
+	// 	output->cursor.hotspot_x = -plane->surf.height + hotspot_x;
+	// 	output->cursor.hotspot_y = plane->surf.width - hotspot_y;
+	// 	break;
+	// }
 
 	if (!update_pixels) {
 		// Only update the cursor hotspot
diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h
index e8c13b1d..be4f322f 100644
--- a/include/wlr/types/wlr_cursor.h
+++ b/include/wlr/types/wlr_cursor.h
@@ -48,10 +48,10 @@ void wlr_cursor_set_xcursor(struct wlr_cursor *cur, struct wlr_xcursor *xcur);
  * Returns true when the mouse warp was successful.
  */
 bool wlr_cursor_warp(struct wlr_cursor *cur, struct wlr_input_device *dev,
-		double x, double y);
+	double x, double y);
 
 void wlr_cursor_warp_absolute(struct wlr_cursor *cur,
-		struct wlr_input_device *dev, double x_mm, double y_mm);
+	struct wlr_input_device *dev, double x_mm, double y_mm);
 
 /**
  * Move the cursor in the direction of the given x and y coordinates.
@@ -60,7 +60,13 @@ void wlr_cursor_warp_absolute(struct wlr_cursor *cur,
  * device mapping constraints will be ignored.
  */
 void wlr_cursor_move(struct wlr_cursor *cur, struct wlr_input_device *dev,
-		double delta_x, double delta_y);
+	double delta_x, double delta_y);
+
+void wlr_cursor_set_image(struct wlr_cursor *cur, const uint8_t *pixels,
+	int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x,
+	int32_t hotspot_y);
+void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface,
+	int32_t hotspot_x, int32_t hotspot_y);
 
 /**
  * Attaches this input device to this cursor. The input device must be one of:
@@ -80,7 +86,7 @@ void wlr_cursor_detach_input_device(struct wlr_cursor *cur,
  * direction and do not support absolute input events.
  */
 void wlr_cursor_attach_output_layout(struct wlr_cursor *cur,
-		struct wlr_output_layout *l);
+	struct wlr_output_layout *l);
 
 /**
  * Attaches this cursor to the given output, which must be among the outputs in
@@ -88,7 +94,7 @@ void wlr_cursor_attach_output_layout(struct wlr_cursor *cur,
  * without an associated output layout.
  */
 void wlr_cursor_map_to_output(struct wlr_cursor *cur,
-		struct wlr_output *output);
+	struct wlr_output *output);
 
 /**
  * Maps all input from a specific input device to a given output. The input
@@ -96,7 +102,7 @@ void wlr_cursor_map_to_output(struct wlr_cursor *cur,
  * outputs in the attached output layout.
  */
 void wlr_cursor_map_input_to_output(struct wlr_cursor *cur,
-		struct wlr_input_device *dev, struct wlr_output *output);
+	struct wlr_input_device *dev, struct wlr_output *output);
 
 /**
  * Maps this cursor to an arbitrary region on the associated wlr_output_layout.
@@ -108,6 +114,6 @@ void wlr_cursor_map_to_region(struct wlr_cursor *cur, struct wlr_box *box);
  * wlr_output_layout.
  */
 void wlr_cursor_map_input_to_region(struct wlr_cursor *cur,
-		struct wlr_input_device *dev, struct wlr_box *box);
+	struct wlr_input_device *dev, struct wlr_box *box);
 
 #endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 74eb15ed..b6ea3a47 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -12,6 +12,21 @@ struct wlr_output_mode {
 	struct wl_list link;
 };
 
+struct wlr_output_cursor {
+	struct wlr_output *output;
+	int32_t x, y;
+	int32_t hotspot_x, hotspot_y;
+	struct wl_list link;
+
+	struct wlr_renderer *renderer;
+	struct wlr_texture *texture;
+
+	// only when using a cursor surface
+	struct wlr_surface *surface;
+	struct wl_listener surface_commit;
+	struct wl_listener surface_destroy;
+};
+
 struct wlr_output_impl;
 
 struct wlr_output {
@@ -44,19 +59,8 @@ struct wlr_output {
 		struct wl_signal destroy;
 	} events;
 
-	struct {
-		bool is_sw;
-		int32_t x, y;
-		uint32_t width, height;
-		int32_t hotspot_x, hotspot_y;
-		struct wlr_renderer *renderer;
-		struct wlr_texture *texture;
-
-		// only when using a cursor surface
-		struct wlr_surface *surface;
-		struct wl_listener surface_commit;
-		struct wl_listener surface_destroy;
-	} cursor;
+	struct wl_list cursors; // wlr_output_cursor::link
+	struct wlr_output_cursor *hardware_cursor;
 
 	// the output position in layout space reported to clients
 	int32_t lx, ly;
@@ -72,12 +76,6 @@ bool wlr_output_set_mode(struct wlr_output *output,
 void wlr_output_transform(struct wlr_output *output,
 	enum wl_output_transform transform);
 void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly);
-bool wlr_output_set_cursor(struct wlr_output *output,
-	const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height,
-	int32_t hotspot_x, int32_t hotspot_y);
-void wlr_output_set_cursor_surface(struct wlr_output *output,
-	struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y);
-bool wlr_output_move_cursor(struct wlr_output *output, int x, int y);
 void wlr_output_destroy(struct wlr_output *output);
 void wlr_output_effective_resolution(struct wlr_output *output,
 	int *width, int *height);
@@ -87,4 +85,13 @@ void wlr_output_set_gamma(struct wlr_output *output,
 	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b);
 uint32_t wlr_output_get_gamma_size(struct wlr_output *output);
 
+struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);
+bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
+	const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height,
+	int32_t hotspot_x, int32_t hotspot_y);
+void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
+	struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y);
+bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y);
+void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor);
+
 #endif
diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c
index 20781f0a..f07b57ab 100644
--- a/types/wlr_cursor.c
+++ b/types/wlr_cursor.c
@@ -33,9 +33,16 @@ struct wlr_cursor_device {
 	struct wl_listener destroy;
 };
 
+struct wlr_cursor_output_cursor {
+	struct wlr_cursor *cursor;
+	struct wlr_output_cursor *output_cursor;
+	struct wl_list link;
+};
+
 struct wlr_cursor_state {
 	struct wlr_cursor *cursor;
-	struct wl_list devices;
+	struct wl_list devices; // wlr_cursor_device::link
+	struct wl_list output_cursors; // wlr_cursor_output_cursor::link
 	struct wlr_output_layout *layout;
 	struct wlr_xcursor *xcursor;
 	struct wlr_output *mapped_output;
@@ -132,16 +139,15 @@ static void wlr_cursor_warp_unchecked(struct wlr_cursor *cur,
 		double x, double y) {
 	assert(cur->state->layout);
 
-	struct wlr_output_layout_output *l_output;
-	wl_list_for_each(l_output, &cur->state->layout->outputs, link) {
+	struct wlr_cursor_output_cursor *output_cursor;
+	wl_list_for_each(output_cursor, &cur->state->output_cursors, link) {
 		double output_x = x;
 		double output_y = y;
-
 		wlr_output_layout_output_coords(cur->state->layout,
-			l_output->output, &output_x, &output_y);
-		wlr_output_move_cursor(l_output->output,
-			output_x - l_output->output->cursor.hotspot_x,
-			output_y - l_output->output->cursor.hotspot_y);
+			output_cursor->output_cursor->output, &output_x, &output_y);
+		wlr_output_cursor_move(output_cursor->output_cursor,
+			output_x - output_cursor->output_cursor->hotspot_x,
+			output_y - output_cursor->output_cursor->hotspot_y);
 	}
 
 	cur->x = x;
@@ -254,6 +260,17 @@ void wlr_cursor_move(struct wlr_cursor *cur, struct wlr_input_device *dev,
 	wlr_cursor_warp_unchecked(cur, x, y);
 }
 
+void wlr_cursor_set_image(struct wlr_cursor *cur, const uint8_t *pixels,
+		int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x,
+		int32_t hotspot_y) {
+	// TODO
+}
+
+void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface,
+		int32_t hotspot_x, int32_t hotspot_y) {
+	// TODO
+}
+
 static void handle_pointer_motion(struct wl_listener *listener, void *data) {
 	struct wlr_event_pointer_motion *event = data;
 	struct wlr_cursor_device *device =
diff --git a/types/wlr_output.c b/types/wlr_output.c
index e8d4af3e..338494b6 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -188,94 +188,159 @@ void wlr_output_set_position(struct wlr_output *output, int32_t lx,
 	}
 }
 
-static bool set_cursor(struct wlr_output *output, const uint8_t *buf,
-		int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x,
-		int32_t hotspot_y) {
-	if (output->impl->set_cursor
-			&& output->impl->set_cursor(output, buf, stride, width, height,
-				hotspot_x, hotspot_y, true)) {
-		output->cursor.is_sw = false;
-		return true;
+void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
+		const struct wlr_output_impl *impl) {
+	output->backend = backend;
+	output->impl = impl;
+	wl_list_init(&output->modes);
+	output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
+	output->scale = 1;
+	wl_list_init(&output->cursors);
+	wl_signal_init(&output->events.frame);
+	wl_signal_init(&output->events.swap_buffers);
+	wl_signal_init(&output->events.resolution);
+	wl_signal_init(&output->events.destroy);
+}
+
+void wlr_output_destroy(struct wlr_output *output) {
+	if (!output) {
+		return;
 	}
 
-	wlr_log(L_INFO, "Falling back to software cursor");
+	wl_signal_emit(&output->events.destroy, output);
 
-	output->cursor.is_sw = true;
-	output->cursor.width = width;
-	output->cursor.height = height;
+	struct wlr_output_mode *mode, *tmp_mode;
+	wl_list_for_each_safe(mode, tmp_mode, &output->modes, link) {
+		free(mode);
+	}
+	wl_list_remove(&output->modes);
+	if (output->impl && output->impl->destroy) {
+		output->impl->destroy(output);
+	} else {
+		free(output);
+	}
+}
 
-	if (!output->cursor.renderer) {
-		output->cursor.renderer = wlr_gles2_renderer_create(output->backend);
-		if (!output->cursor.renderer) {
-			return false;
-		}
+void wlr_output_effective_resolution(struct wlr_output *output,
+		int *width, int *height) {
+	// TODO: Scale factor
+	if (output->transform % 2 == 1) {
+		*width = output->height;
+		*height = output->width;
+	} else {
+		*width = output->width;
+		*height = output->height;
 	}
+}
 
-	if (!output->cursor.texture) {
-		output->cursor.texture =
-			wlr_render_texture_create(output->cursor.renderer);
-		if (!output->cursor.texture) {
-			return false;
-		}
+void wlr_output_make_current(struct wlr_output *output) {
+	output->impl->make_current(output);
+}
+
+static void output_cursor_render(struct wlr_output_cursor *cursor) {
+	struct wlr_texture *texture = cursor->texture;
+	struct wlr_renderer *renderer = cursor->renderer;
+	if (cursor->surface != NULL) {
+		texture = cursor->surface->texture;
+		renderer = cursor->surface->renderer;
 	}
 
-	return wlr_texture_upload_pixels(output->cursor.texture,
-		WL_SHM_FORMAT_ARGB8888, stride, width, height, buf);
+	// We check texture->valid because some clients set a cursor surface
+	// with a NULL buffer to hide it
+	if (renderer && texture && texture->valid) {
+		glViewport(0, 0, cursor->output->width, cursor->output->height);
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		float matrix[16];
+		wlr_texture_get_matrix(texture, &matrix,
+			&cursor->output->transform_matrix, cursor->x, cursor->y);
+		wlr_render_with_matrix(renderer, texture, &matrix);
+	}
 }
 
-bool wlr_output_set_cursor(struct wlr_output *output,
-		const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height,
-		int32_t hotspot_x, int32_t hotspot_y) {
-	if (output->cursor.surface) {
-		wl_list_remove(&output->cursor.surface_commit.link);
-		wl_list_remove(&output->cursor.surface_destroy.link);
-		output->cursor.surface = NULL;
+void wlr_output_swap_buffers(struct wlr_output *output) {
+	struct wlr_output_cursor *cursor;
+	wl_list_for_each(cursor, &output->cursors, link) {
+		if (output->hardware_cursor == cursor) {
+			continue;
+		}
+		output_cursor_render(cursor);
 	}
 
-	output->cursor.hotspot_x = hotspot_x;
-	output->cursor.hotspot_y = hotspot_y;
+	wl_signal_emit(&output->events.swap_buffers, &output);
 
-	return set_cursor(output, buf, stride, width, height, hotspot_x, hotspot_y);
+	output->impl->swap_buffers(output);
 }
 
-static inline int64_t timespec_to_msec(const struct timespec *a) {
-	return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
+void wlr_output_set_gamma(struct wlr_output *output,
+	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
+	if (output->impl->set_gamma) {
+		output->impl->set_gamma(output, size, r, g, b);
+	}
 }
 
-static void commit_cursor_surface(struct wlr_output *output,
-		struct wlr_surface *surface) {
-	if (output->cursor.is_sw) {
-		return;
+uint32_t wlr_output_get_gamma_size(struct wlr_output *output) {
+	if (!output->impl->get_gamma_size) {
+		return 0;
+	}
+	return output->impl->get_gamma_size(output);
+}
+
+static void wlr_output_cursor_reset(struct wlr_output_cursor *cursor) {
+	if (cursor->surface != NULL) {
+		wl_list_remove(&cursor->surface_commit.link);
+		wl_list_remove(&cursor->surface_destroy.link);
+		cursor->surface = NULL;
 	}
+}
 
-	struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current->buffer);
-	if (buffer == NULL) {
-		return;
+bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
+		const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height,
+		int32_t hotspot_x, int32_t hotspot_y) {
+	wlr_output_cursor_reset(cursor);
+	cursor->hotspot_x = hotspot_x;
+	cursor->hotspot_y = hotspot_y;
+
+	if (cursor->output->hardware_cursor == NULL &&
+			cursor->output->impl->set_cursor &&
+			cursor->output->impl->set_cursor(cursor->output, pixels, stride,
+				width, height, hotspot_x, hotspot_y, true)) {
+		cursor->output->hardware_cursor = cursor;
+		return true;
 	}
 
-	uint32_t format = wl_shm_buffer_get_format(buffer);
-	if (format != WL_SHM_FORMAT_ARGB8888) {
-		return;
+	wlr_log(L_INFO, "Falling back to software cursor");
+
+	if (cursor->renderer == NULL) {
+		cursor->renderer = wlr_gles2_renderer_create(cursor->output->backend);
+		if (cursor->renderer == NULL) {
+			return false;
+		}
+	}
+
+	if (cursor->texture == NULL) {
+		cursor->texture = wlr_render_texture_create(cursor->renderer);
+		if (cursor->texture == NULL) {
+			return false;
+		}
 	}
 
-	void *buffer_data = wl_shm_buffer_get_data(buffer);
-	int32_t width = wl_shm_buffer_get_width(buffer);
-	int32_t height = wl_shm_buffer_get_height(buffer);
-	int32_t stride = wl_shm_buffer_get_stride(buffer);
-	wl_shm_buffer_begin_access(buffer);
-	wlr_output_set_cursor(output, buffer_data, stride/4, width, height,
-		output->cursor.hotspot_x - surface->current->sx,
-		output->cursor.hotspot_y - surface->current->sy);
-	wl_shm_buffer_end_access(buffer);
+	return wlr_texture_upload_pixels(cursor->texture, WL_SHM_FORMAT_ARGB8888,
+		stride, width, height, pixels);
 }
 
-static void handle_cursor_surface_commit(struct wl_listener *listener,
+static inline int64_t timespec_to_msec(const struct timespec *a) {
+	return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
+}
+
+static void output_cursor_handle_commit(struct wl_listener *listener,
 		void *data) {
-	struct wlr_output *output = wl_container_of(listener, output,
-		cursor.surface_commit);
+	struct wlr_output_cursor *cursor = wl_container_of(listener, cursor,
+		surface_commit);
 	struct wlr_surface *surface = data;
 
-	commit_cursor_surface(output, surface);
+	// TODO: if hardware cursor, upload pixels
 
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
@@ -288,170 +353,103 @@ static void handle_cursor_surface_commit(struct wl_listener *listener,
 	}
 }
 
-static void handle_cursor_surface_destroy(struct wl_listener *listener,
+static void output_cursor_handle_destroy(struct wl_listener *listener,
 		void *data) {
-	struct wlr_output *output = wl_container_of(listener, output,
-		cursor.surface_destroy);
-
-	wl_list_remove(&output->cursor.surface_commit.link);
-	wl_list_remove(&output->cursor.surface_destroy.link);
-	output->cursor.surface = NULL;
+	struct wlr_output_cursor *cursor = wl_container_of(listener, cursor,
+		surface_destroy);
+	wlr_output_cursor_reset(cursor);
 }
 
-void wlr_output_set_cursor_surface(struct wlr_output *output,
+void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
 		struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y) {
 	if (surface && strcmp(surface->role, "wl_pointer-cursor") != 0) {
 		return;
 	}
 
-	output->cursor.hotspot_x = hotspot_x;
-	output->cursor.hotspot_y = hotspot_y;
+	cursor->hotspot_x = hotspot_x;
+	cursor->hotspot_y = hotspot_y;
 
-	if (surface && surface == output->cursor.surface) {
-		if (output->impl->set_cursor && !output->cursor.is_sw) {
-			// Only update the hotspot
-			output->impl->set_cursor(output, NULL, 0, 0, 0, hotspot_x,
-				hotspot_y, false);
+	if (surface && surface == cursor->surface) {
+		if (cursor->output->hardware_cursor == cursor &&
+				cursor->output->impl->set_cursor) {
+			// If the surface hasn't changed and it's an hardware cursor, only
+			// update the hotspot
+			cursor->output->impl->set_cursor(cursor->output, NULL, 0, 0, 0,
+				hotspot_x, hotspot_y, false);
 		}
 		return;
 	}
 
-	if (output->cursor.surface) {
-		wl_list_remove(&output->cursor.surface_commit.link);
-		wl_list_remove(&output->cursor.surface_destroy.link);
-		output->cursor.surface = NULL;
-	}
+	wlr_output_cursor_reset(cursor);
 
-	// Disable hardware cursor
+	// Disable hardware cursor for surfaces
 	// TODO: support hardware cursors
-	output->cursor.is_sw = true;
-	if (output->impl->set_cursor) {
-		output->impl->set_cursor(output, NULL, 0, 0, 0, hotspot_x, hotspot_y,
-			true);
+	if (cursor->output->hardware_cursor == cursor &&
+			cursor->output->impl->set_cursor) {
+		cursor->output->impl->set_cursor(cursor->output, NULL, 0, 0, 0,
+			hotspot_x, hotspot_y, true);
+		cursor->output->hardware_cursor = NULL;
 	}
 
-	//output->cursor.is_sw = output->impl->set_cursor == NULL;
-	output->cursor.surface = surface;
+	cursor->surface = surface;
 
 	if (surface != NULL) {
-		wl_signal_add(&surface->events.commit, &output->cursor.surface_commit);
-		wl_signal_add(&surface->events.destroy,
-			&output->cursor.surface_destroy);
-		commit_cursor_surface(output, surface);
+		wl_signal_add(&surface->events.commit, &cursor->surface_commit);
+		wl_signal_add(&surface->events.destroy, &cursor->surface_destroy);
+		// TODO: if hardware cursor, upload pixels
 	} else {
-		set_cursor(output, NULL, 0, 0, 0, hotspot_x, hotspot_y);
+		// TODO: if hardware cursor, disable cursor
 	}
 }
 
-bool wlr_output_move_cursor(struct wlr_output *output, int x, int y) {
-	output->cursor.x = x;
-	output->cursor.y = y;
+bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y) {
+	cursor->x = x;
+	cursor->y = y;
 
-	if (output->cursor.is_sw) {
+	if (cursor->output->hardware_cursor != cursor) {
 		return true;
 	}
 
-	if (!output->impl->move_cursor) {
+	if (!cursor->output->impl->move_cursor) {
 		return false;
 	}
-
-	return output->impl->move_cursor(output, x, y);
+	return cursor->output->impl->move_cursor(cursor->output, x, y);
 }
 
-void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
-		const struct wlr_output_impl *impl) {
-	output->backend = backend;
-	output->impl = impl;
-	wl_list_init(&output->modes);
-	output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
-	output->scale = 1;
-	wl_signal_init(&output->events.frame);
-	wl_signal_init(&output->events.swap_buffers);
-	wl_signal_init(&output->events.resolution);
-	wl_signal_init(&output->events.destroy);
-
-	wl_list_init(&output->cursor.surface_commit.link);
-	output->cursor.surface_commit.notify = handle_cursor_surface_commit;
-	wl_list_init(&output->cursor.surface_destroy.link);
-	output->cursor.surface_destroy.notify = handle_cursor_surface_destroy;
+struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output) {
+	struct wlr_output_cursor *cursor =
+		calloc(1, sizeof(struct wlr_output_cursor));
+	if (cursor == NULL) {
+		return NULL;
+	}
+	cursor->output = output;
+	wl_list_init(&cursor->surface_commit.link);
+	cursor->surface_commit.notify = output_cursor_handle_commit;
+	wl_list_init(&cursor->surface_destroy.link);
+	cursor->surface_destroy.notify = output_cursor_handle_destroy;
+	wl_list_insert(&output->cursors, &cursor->link);
+	return cursor;
 }
 
-void wlr_output_destroy(struct wlr_output *output) {
-	if (!output) {
+void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
+	if (cursor == NULL) {
 		return;
 	}
-
-	wl_signal_emit(&output->events.destroy, output);
-
-	wlr_texture_destroy(output->cursor.texture);
-	wlr_renderer_destroy(output->cursor.renderer);
-
-	struct wlr_output_mode *mode, *tmp_mode;
-	wl_list_for_each_safe(mode, tmp_mode, &output->modes, link) {
-		free(mode);
-	}
-	wl_list_remove(&output->modes);
-	if (output->impl && output->impl->destroy) {
-		output->impl->destroy(output);
-	} else {
-		free(output);
-	}
-}
-
-void wlr_output_effective_resolution(struct wlr_output *output,
-		int *width, int *height) {
-	// TODO: Scale factor
-	if (output->transform % 2 == 1) {
-		*width = output->height;
-		*height = output->width;
-	} else {
-		*width = output->width;
-		*height = output->height;
-	}
-}
-
-void wlr_output_make_current(struct wlr_output *output) {
-	output->impl->make_current(output);
-}
-
-void wlr_output_swap_buffers(struct wlr_output *output) {
-	if (output->cursor.is_sw) {
-		glViewport(0, 0, output->width, output->height);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-		struct wlr_texture *texture = output->cursor.texture;
-		struct wlr_renderer *renderer = output->cursor.renderer;
-		if (output->cursor.surface) {
-			texture = output->cursor.surface->texture;
-			renderer = output->cursor.surface->renderer;
-		}
-
-		// We check texture->valid because some clients set a cursor surface
-		// with a NULL buffer to hide it
-		if (renderer && texture && texture->valid) {
-			float matrix[16];
-			wlr_texture_get_matrix(texture, &matrix, &output->transform_matrix,
-				output->cursor.x, output->cursor.y);
-			wlr_render_with_matrix(renderer, texture, &matrix);
+	wlr_output_cursor_reset(cursor);
+	if (cursor->output->hardware_cursor == cursor) {
+		// If this cursor was the hardware cursor, disable it
+		if (cursor->output->impl->set_cursor) {
+			cursor->output->impl->set_cursor(cursor->output, NULL, 0, 0, 0, 0,
+				0, true);
 		}
+		cursor->output->hardware_cursor = NULL;
 	}
-
-	wl_signal_emit(&output->events.swap_buffers, &output);
-
-	output->impl->swap_buffers(output);
-}
-
-void wlr_output_set_gamma(struct wlr_output *output,
-	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
-	if (output->impl->set_gamma) {
-		output->impl->set_gamma(output, size, r, g, b);
+	if (cursor->texture != NULL) {
+		wlr_texture_destroy(cursor->texture);
 	}
-}
-
-uint32_t wlr_output_get_gamma_size(struct wlr_output *output) {
-	if (!output->impl->get_gamma_size) {
-		return 0;
+	if (cursor->renderer != NULL) {
+		wlr_renderer_destroy(cursor->renderer);
 	}
-	return output->impl->get_gamma_size(output);
+	wl_list_remove(&cursor->link);
+	free(cursor);
 }