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

cursor-sprite/xcursor: Fall back to gray square if missing theme

Browse Source 
Instead of aborting with an error, display a half transparent gray
square instead of cursors and log a warning in the journal, allowing the
user to fix their system withotu having to rely on switching to a TTY.

It will be immediately obvious the cursor is silly looking, which will
be a better hint than just aborting.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1428
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1563>
This commit is contained in:
Jonas Ådahl 2020-11-16 11:03:31 +01:00 committed by Marge Bot
parent 815ed52ca1
commit 83360a4aed
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,12 +155,29 @@ meta_create_x_cursor (Display *xdisplay,
static XcursorImages * static XcursorImages *
load_cursor_on_client (MetaCursor cursor, int scale) load_cursor_on_client (MetaCursor cursor, int scale)
{ {
XcursorImages *xcursor_images;
int fallback_size;
if (cursor == META_CURSOR_BLANK) if (cursor == META_CURSOR_BLANK)
return create_blank_cursor_images (); return create_blank_cursor_images ();
return XcursorLibraryLoadImages (translate_meta_cursor (cursor), xcursor_images =
meta_prefs_get_cursor_theme (), XcursorLibraryLoadImages (translate_meta_cursor (cursor),
meta_prefs_get_cursor_size () * scale); 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");
fallback_size = 24 * scale;
xcursor_images = XcursorImagesCreate (1);
xcursor_images->images[0] = XcursorImageCreate (fallback_size, fallback_size);
xcursor_images->images[0]->xhot = 0;
xcursor_images->images[0]->yhot = 0;
memset (xcursor_images->images[0]->pixels, 0xc0,
fallback_size * fallback_size * sizeof (int32_t));
return xcursor_images;
} }
static void static void
@ -295,8 +312,6 @@ load_cursor_from_theme (MetaCursorSprite *sprite)
sprite_xcursor->xcursor_images = sprite_xcursor->xcursor_images =
load_cursor_on_client (sprite_xcursor->cursor, load_cursor_on_client (sprite_xcursor->cursor,
sprite_xcursor->theme_scale); sprite_xcursor->theme_scale);
if (!sprite_xcursor->xcursor_images)
g_error ("Could not find cursor. Perhaps set XCURSOR_PATH?");
load_from_current_xcursor_image (sprite_xcursor); load_from_current_xcursor_image (sprite_xcursor);
} }