mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: Prevent setting the same cursor image twice

Browse source 
Possibly fixes #512

Reported-by: @Flrian
This commit is contained in:
Consolatis 2022-09-10 19:48:49 +02:00 • committed by Johan Malm
parent 7af74c88a8
commit 0deaeceb72
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cursor.c
View file

@ -12,6 +12,10 @@
#include "ssd.h" #include "ssd.h"
#include "config/mousebind.h" #include "config/mousebind.h"
#include "common/scene-helpers.h" #include "common/scene-helpers.h"
#include "common/zfree.h"
/* Used to prevent setting the same cursor image twice */
static char *last_cursor_image = NULL;
static bool static bool
is_surface(enum ssd_part_type view_area) is_surface(enum ssd_part_type view_area)
@ -99,8 +103,13 @@ request_cursor_notify(struct wl_listener *listener, void *data)
* hardware cursor on the output that it's currently on and * hardware cursor on the output that it's currently on and
* continue to do so as the cursor moves between outputs. * continue to do so as the cursor moves between outputs.
*/ */
wlr_cursor_set_surface(seat->cursor, event->surface, wlr_cursor_set_surface(seat->cursor, event->surface,
event->hotspot_x, event->hotspot_y); event->hotspot_x, event->hotspot_y);
if (last_cursor_image) {
zfree(last_cursor_image);
}
} }
} }
@ -197,6 +206,15 @@ process_cursor_resize(struct server *server, uint32_t time)
void void
cursor_set(struct seat *seat, const char *cursor_name) cursor_set(struct seat *seat, const char *cursor_name)
{ {
if (last_cursor_image) {
if (!strcmp(last_cursor_image, cursor_name)) {
/* Prevent setting the same cursor image twice */
return;
}
free(last_cursor_image);
}
last_cursor_image = strdup(cursor_name);
wlr_xcursor_manager_set_cursor_image( wlr_xcursor_manager_set_cursor_image(
seat->xcursor_manager, cursor_name, seat->cursor); seat->xcursor_manager, cursor_name, seat->cursor);
} }