blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature/data-device-selection

This commit is contained in:
Tony Crisci 2017-10-18 15:43:13 -04:00
parent c00a94ca76 a41d45eefb
commit 39308cb868
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/wayland/output.c
View File

@ -66,10 +66,12 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
} }
if (!buf) { if (!buf) {
// Hide cursor // Hide cursor
wl_surface_destroy(output->cursor_surface); if (output->cursor_surface) {
munmap(output->cursor_data, output->cursor_buf_size); wl_surface_destroy(output->cursor_surface);
output->cursor_surface = NULL; munmap(output->cursor_data, output->cursor_buf_size);
output->cursor_buf_size = 0; output->cursor_surface = NULL;
output->cursor_buf_size = 0;
}
wlr_wl_output_update_cursor(output, output->enter_serial, hotspot_x, wlr_wl_output_update_cursor(output, output->enter_serial, hotspot_x,
hotspot_y); hotspot_y);
return true; return true;

4
types/wlr_output.c
View File

@ -361,7 +361,9 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
renderer = output->cursor.surface->renderer; renderer = output->cursor.surface->renderer;
} }
if (texture && 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]; float matrix[16];
wlr_texture_get_matrix(texture, &matrix, &output->transform_matrix, wlr_texture_get_matrix(texture, &matrix, &output->transform_matrix,
output->cursor.x, output->cursor.y); output->cursor.x, output->cursor.y);