mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
Merge branch 'master' into feature/data-device-selection
This commit is contained in:
commit
39308cb868
2 changed files with 9 additions and 5 deletions
|
@ -66,10 +66,12 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
|
|||
}
|
||||
if (!buf) {
|
||||
// Hide cursor
|
||||
wl_surface_destroy(output->cursor_surface);
|
||||
munmap(output->cursor_data, output->cursor_buf_size);
|
||||
output->cursor_surface = NULL;
|
||||
output->cursor_buf_size = 0;
|
||||
if (output->cursor_surface) {
|
||||
wl_surface_destroy(output->cursor_surface);
|
||||
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;
|
||||
|
|
|
@ -361,7 +361,9 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
|
|||
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];
|
||||
wlr_texture_get_matrix(texture, &matrix, &output->transform_matrix,
|
||||
output->cursor.x, output->cursor.y);
|
||||
|
|
Loading…
Reference in a new issue