aboutsummaryrefslogtreecommitdiffstats
path: root/cursor
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2021-05-05 17:15:33 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2021-08-05 17:09:40 +0200
commitf80879c03c194109190f48eb49a5ed649ce5da97 (patch)
treea9a4c0006c890de85a8aa8f6150105aff919cc44 /cursor
parentci: Sanitise build and install paths (diff)
downloadwayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar.gz
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar.bz2
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar.lz
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar.xz
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.tar.zst
wayland-f80879c03c194109190f48eb49a5ed649ce5da97.zip
cursor: Try to fall back to a default xcursor theme first
The use case is systems where for some reason the current xcursor theme cannot be accessed (an application packaged as a strictly confined snap, for example). Before falling back to wayland's default cursor theme, it is worth trying the xcursor theme called "default", which hopefully looks better than the former. Fixes: https://gitlab.gnome.org/Community/Ubuntu/gnome-sdk/-/issues/6 Signed-off-by: Olivier Tilloy <olivier.tilloy@canonical.com>
Diffstat (limited to 'cursor')
-rw-r--r--cursor/wayland-cursor.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cursor/wayland-cursor.c b/cursor/wayland-cursor.c
index 7da7014..dd48e21 100644
--- a/cursor/wayland-cursor.c
+++ b/cursor/wayland-cursor.c
@@ -405,6 +405,9 @@ wl_cursor_theme_load(const char *name, int size, struct wl_shm *shm)
xcursor_load_theme(name, size, load_callback, theme);
if (theme->cursor_count == 0)
+ xcursor_load_theme(NULL, size, load_callback, theme);
+
+ if (theme->cursor_count == 0)
load_default_theme(theme);
return theme;