mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

input/cursor: handle setting a NULL image surface

Browse Source 
This fixes a crash when attempting to listen to a signal on a NULL
cursor image surface. If the surface is NULL, the listener is just
reinitialized using wl_list_init.
This commit is contained in:
Brian Ashworth 2020-01-05 22:29:32 -05:00 committed by Simon Ser
parent 897c36b12c
commit 1e2a2b0778
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sway/input/cursor.c
View File

@ -798,6 +798,17 @@ static void handle_image_surface_destroy(struct wl_listener *listener,
cursor_rebase(cursor); cursor_rebase(cursor);
} }
static void set_image_surface(struct sway_cursor *cursor,
struct wlr_surface *surface) {
wl_list_remove(&cursor->image_surface_destroy.link);
cursor->image_surface = surface;
if (surface) {
wl_signal_add(&surface->events.destroy, &cursor->image_surface_destroy);
} else {
wl_list_init(&cursor->image_surface_destroy.link);
}
}
void cursor_set_image(struct sway_cursor *cursor, const char *image, void cursor_set_image(struct sway_cursor *cursor, const char *image,
struct wl_client *client) { struct wl_client *client) {
if (!(cursor->seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) { if (!(cursor->seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
@ -805,10 +816,8 @@ void cursor_set_image(struct sway_cursor *cursor, const char *image,
} }
const char *current_image = cursor->image; const char *current_image = cursor->image;
set_image_surface(cursor, NULL);
cursor->image = image; cursor->image = image;
wl_list_remove(&cursor->image_surface_destroy.link);
cursor->image_surface = NULL;
wl_list_init(&cursor->image_surface_destroy.link);
cursor->hotspot_x = cursor->hotspot_y = 0; cursor->hotspot_x = cursor->hotspot_y = 0;
cursor->image_client = client; cursor->image_client = client;
@ -831,11 +840,8 @@ void cursor_set_image_surface(struct sway_cursor *cursor,
return; return;
} }
set_image_surface(cursor, surface);
cursor->image = NULL; cursor->image = NULL;
wl_list_remove(&cursor->image_surface_destroy.link);
cursor->image_surface = surface;
wl_signal_add(&cursor->image_surface->events.destroy,
&cursor->image_surface_destroy);
cursor->hotspot_x = hotspot_x; cursor->hotspot_x = hotspot_x;
cursor->hotspot_y = hotspot_y; cursor->hotspot_y = hotspot_y;
cursor->image_client = client; cursor->image_client = client;