mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: extract hardware cursor disabling logic

Browse source 
(cherry picked from commit f534434be6)
This commit is contained in:
Kirill Primak 2024-05-06 21:23:08 +03:00 • committed by Simon Zeni
parent a1b3be49c5
commit 13a2020334
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
types/output/cursor.c
View file

@ -34,6 +34,16 @@ static bool output_set_hardware_cursor(struct wlr_output *output,
static void output_cursor_damage_whole(struct wlr_output_cursor *cursor);
static void output_disable_hardware_cursor(struct wlr_output *output) {
if (output->hardware_cursor == NULL) {
return;
}
output_set_hardware_cursor(output, NULL, 0, 0);
output_cursor_damage_whole(output->hardware_cursor);
output->hardware_cursor = NULL;
}
void wlr_output_lock_software_cursors(struct wlr_output *output, bool lock) {
if (lock) {
++output->software_cursor_locks;
@ -45,10 +55,8 @@ void wlr_output_lock_software_cursors(struct wlr_output *output, bool lock) {
lock ? "Disabling" : "Enabling", output->name,
output->software_cursor_locks);
if (output->software_cursor_locks > 0 && output->hardware_cursor != NULL) {
output_set_hardware_cursor(output, NULL, 0, 0);
output_cursor_damage_whole(output->hardware_cursor);
output->hardware_cursor = NULL;
if (output->software_cursor_locks > 0) {
output_disable_hardware_cursor(output);
}
// If it's possible to use hardware cursors again, don't switch immediately
@ -512,8 +520,7 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
output_cursor_reset(cursor);
if (cursor->output->hardware_cursor == cursor) {
// If this cursor was the hardware cursor, disable it
output_set_hardware_cursor(cursor->output, NULL, 0, 0);
cursor->output->hardware_cursor = NULL;
output_disable_hardware_cursor(cursor->output);
}
if (cursor->own_texture) {
wlr_texture_destroy(cursor->texture);