brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends: Attempt a fallback to 'default' cursor on failed lookups

Browse Source 
While we should ideally have a sensible cursor theme, handle the
case of cursor themes that lack certain cursor names, and fallback
to the 'default' cursor in those cases.

The 'grey rectangle' fallback is still left, in case we even fail
to load a 'default' cursor.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3295>
This commit is contained in:
Carlos Garnacho 2023-10-03 13:54:38 +02:00 committed by Marge Bot
parent d970c9db1a
commit 9f89421ef5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backends/meta-cursor-sprite-xcursor.c
View File

@ -157,17 +157,22 @@ static XcursorImages *
load_cursor_on_client (MetaCursor cursor, int scale)
{
XcursorImages *xcursor_images;
int fallback_size;
int fallback_size, i;
/* Set a 'default' fallback */
MetaCursor cursors[] = { cursor, META_CURSOR_DEFAULT };
if (cursor == META_CURSOR_BLANK)
return create_blank_cursor_images ();
xcursor_images =
XcursorLibraryLoadImages (translate_meta_cursor (cursor),
meta_prefs_get_cursor_theme (),
meta_prefs_get_cursor_size () * scale);
if (xcursor_images)
return xcursor_images;
for (i = 0; i < G_N_ELEMENTS (cursors); i++)
{
xcursor_images =
XcursorLibraryLoadImages (translate_meta_cursor (cursors[i]),
meta_prefs_get_cursor_theme (),
meta_prefs_get_cursor_size () * scale);
if (xcursor_images)
return xcursor_images;
}
g_warning_once ("No cursor theme available, please install a cursor theme");