external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-20 03:35:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bar/wayland: seat: handle failure to create pointer surface

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-10 18:37:39 +02:00
parent 0a0ef8852a
commit c03564513d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
bar/wayland.c
View file

@ -183,6 +183,7 @@ reload_cursor_theme(struct seat *seat, int new_scale)
if (seat->pointer.theme != NULL) {
wl_cursor_theme_destroy(seat->pointer.theme);
seat->pointer.theme = NULL;
seat->pointer.cursor = NULL;
}
unsigned cursor_size = 24;
@ -315,30 +316,34 @@ seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
enum wl_seat_capability caps)
{
struct seat *seat = data;
struct wayland_backend *backend = seat->backend;
if (caps & WL_SEAT_CAPABILITY_POINTER) {
if (seat->wl_pointer == NULL) {
assert(seat->pointer.surface == NULL);
seat->pointer.surface = wl_compositor_create_surface(
seat->backend->compositor);
if (seat->pointer.surface == NULL) {
LOG_ERR("%s: failed to create pointer surface", seat->name);
return;
}
seat->wl_pointer = wl_seat_get_pointer(wl_seat);
seat->pointer.surface = wl_compositor_create_surface(backend->compositor);
seat->pointer.cursor = NULL;
wl_pointer_add_listener(
seat->wl_pointer, &pointer_listener, seat);
wl_pointer_add_listener(seat->wl_pointer, &pointer_listener, seat);
}
} else {
if (seat->wl_pointer != NULL)
if (seat->wl_pointer != NULL) {
wl_pointer_release(seat->wl_pointer);
if (seat->pointer.theme != NULL)
wl_cursor_theme_destroy(seat->pointer.theme);
if (seat->pointer.surface != NULL)
wl_surface_destroy(seat->pointer.surface);
seat->wl_pointer = NULL;
seat->pointer.cursor = NULL;
seat->pointer.theme = NULL;
seat->pointer.surface = NULL;
if (seat->pointer.theme != NULL)
wl_cursor_theme_destroy(seat->pointer.theme);
seat->wl_pointer = NULL;
seat->pointer.surface = NULL;
seat->pointer.theme = NULL;
seat->pointer.cursor = NULL;
}
}
}