mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/wayland: remember cursor state so that we can call update_wl_output_cursor arbitrarily

Browse source
This commit is contained in:
Alexander Orzechowski 2023-02-02 12:48:07 -05:00 • committed by Alexander Orzechowski
parent c15cd16d0e
commit 152c58c340
2 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

66
backend/wayland/output.c
View file

@ -527,34 +527,18 @@ static bool output_commit(struct wlr_output *wlr_output,
static bool output_set_cursor(struct wlr_output *wlr_output, static bool output_set_cursor(struct wlr_output *wlr_output,
struct wlr_buffer *wlr_buffer, int hotspot_x, int hotspot_y) { struct wlr_buffer *wlr_buffer, int hotspot_x, int hotspot_y) {
struct wlr_wl_output *output = get_wl_output_from_output(wlr_output); struct wlr_wl_output *output = get_wl_output_from_output(wlr_output);
struct wlr_wl_backend *backend = output->backend;
output->cursor.hotspot_x = hotspot_x; output->cursor.hotspot_x = hotspot_x;
output->cursor.hotspot_y = hotspot_y; output->cursor.hotspot_y = hotspot_y;
if (output->cursor.surface == NULL) { wlr_buffer_unlock(output->cursor.buffer);
output->cursor.surface = output->cursor.buffer = NULL;
wl_compositor_create_surface(backend->compositor);
}
struct wl_surface *surface = output->cursor.surface;
if (wlr_buffer != NULL) { if (wlr_buffer) {
struct wlr_wl_buffer *buffer = output->cursor.buffer = wlr_buffer_lock(wlr_buffer);
get_or_create_wl_buffer(output->backend, wlr_buffer);
if (buffer == NULL) {
return false;
}
wl_surface_attach(surface, buffer->wl_buffer, 0, 0);
wl_surface_damage_buffer(surface, 0, 0, INT32_MAX, INT32_MAX);
wl_surface_commit(surface);
} else {
wl_surface_attach(surface, NULL, 0, 0);
wl_surface_commit(surface);
} }
update_wl_output_cursor(output); update_wl_output_cursor(output);
wl_display_flush(backend->remote_display);
return true; return true;
} }
@ -603,15 +587,41 @@ static void output_destroy(struct wlr_output *wlr_output) {
void update_wl_output_cursor(struct wlr_wl_output *output) { void update_wl_output_cursor(struct wlr_wl_output *output) {
struct wlr_wl_pointer *pointer = output->cursor.pointer; struct wlr_wl_pointer *pointer = output->cursor.pointer;
if (pointer) { if (!pointer || !output->cursor.buffer) {
assert(pointer->output == output); return;
assert(output->enter_serial);
struct wlr_wl_seat *seat = pointer->seat;
wl_pointer_set_cursor(seat->wl_pointer, output->enter_serial,
output->cursor.surface, output->cursor.hotspot_x,
output->cursor.hotspot_y);
} }
assert(pointer->output == output);
assert(output->enter_serial);
struct wlr_wl_backend *backend = output->backend;
if (output->cursor.surface == NULL) {
output->cursor.surface =
wl_compositor_create_surface(backend->compositor);
}
struct wl_surface *surface = output->cursor.surface;
if (!surface) {
return;
}
struct wlr_wl_buffer *buffer =
get_or_create_wl_buffer(output->backend, output->cursor.buffer);
if (!buffer) {
return;
}
wl_surface_attach(surface, buffer->wl_buffer, 0, 0);
wl_surface_damage_buffer(surface, 0, 0, INT32_MAX, INT32_MAX);
wl_surface_commit(surface);
wl_display_flush(backend->remote_display);
struct wlr_wl_seat *seat = pointer->seat;
wl_pointer_set_cursor(seat->wl_pointer, output->enter_serial,
output->cursor.surface, output->cursor.hotspot_x,
output->cursor.hotspot_y);
} }
static bool output_move_cursor(struct wlr_output *_output, int x, int y) { static bool output_move_cursor(struct wlr_output *_output, int x, int y) {

1
include/backend/wayland.h
View file

@ -104,6 +104,7 @@ struct wlr_wl_output {
struct { struct {
struct wlr_wl_pointer *pointer; struct wlr_wl_pointer *pointer;
struct wl_surface *surface; struct wl_surface *surface;
struct wlr_buffer *buffer;
int32_t hotspot_x, hotspot_y; int32_t hotspot_x, hotspot_y;
} cursor; } cursor;
}; };