Better handling of hidden cursors in wayland backend, add TODOs
This commit is contained in:
parent
92daa790bb
commit
19860c03f7
|
@ -66,8 +66,12 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
|
||||||
}
|
}
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
// Hide cursor
|
// Hide cursor
|
||||||
wl_pointer_set_cursor(output->backend->pointer, output->enter_serial,
|
wl_surface_destroy(output->cursor_surface);
|
||||||
NULL, 0, 0);
|
munmap(output->cursor_data, output->cursor_buf_size);
|
||||||
|
output->cursor_surface = NULL;
|
||||||
|
output->cursor_buf_size = 0;
|
||||||
|
wlr_wl_output_update_cursor(output, output->enter_serial, hotspot_x,
|
||||||
|
hotspot_y);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,7 +164,7 @@ static void wlr_wl_output_destroy(struct wlr_output *_output) {
|
||||||
|
|
||||||
void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output,
|
void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output,
|
||||||
uint32_t serial, int32_t hotspot_x, int32_t hotspot_y) {
|
uint32_t serial, int32_t hotspot_x, int32_t hotspot_y) {
|
||||||
if (output->cursor_surface && output->backend->pointer && serial) {
|
if (output->backend->pointer && serial) {
|
||||||
wl_pointer_set_cursor(output->backend->pointer, serial,
|
wl_pointer_set_cursor(output->backend->pointer, serial,
|
||||||
output->cursor_surface, hotspot_x, hotspot_y);
|
output->cursor_surface, hotspot_x, hotspot_y);
|
||||||
}
|
}
|
||||||
|
|
|
@ -259,7 +259,9 @@ void wlr_output_set_cursor_surface(struct wlr_output *output,
|
||||||
wl_signal_add(&surface->events.commit, &output->cursor.surface_commit);
|
wl_signal_add(&surface->events.commit, &output->cursor.surface_commit);
|
||||||
wl_signal_add(&surface->events.destroy,
|
wl_signal_add(&surface->events.destroy,
|
||||||
&output->cursor.surface_destroy);
|
&output->cursor.surface_destroy);
|
||||||
commit_cursor_surface(output, surface);
|
// TODO: doing it breaks GTK apps
|
||||||
|
// TODO: not doing it breaks weston-subsurfaces
|
||||||
|
//commit_cursor_surface(output, surface);
|
||||||
} else {
|
} else {
|
||||||
set_cursor(output, NULL, 0, 0, 0, hotspot_x, hotspot_y);
|
set_cursor(output, NULL, 0, 0, 0, hotspot_x, hotspot_y);
|
||||||
}
|
}
|
||||||
|
|
|
@ -429,7 +429,8 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) {
|
||||||
|
|
||||||
// Release the buffer after calling commit, because some listeners
|
// Release the buffer after calling commit, because some listeners
|
||||||
// might need it (e.g. for cursor surfaces)
|
// might need it (e.g. for cursor surfaces)
|
||||||
wlr_surface_state_release_buffer(surface->current);
|
// TODO: breaks weston-subsurfaces
|
||||||
|
//wlr_surface_state_release_buffer(surface->current);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool wlr_subsurface_is_synchronized(struct wlr_subsurface *subsurface) {
|
static bool wlr_subsurface_is_synchronized(struct wlr_subsurface *subsurface) {
|
||||||
|
|
Loading…
Reference in New Issue