AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 23:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wayland-cursor-theme' into 'master'

Browse Source 
wayland: Look for cursor themes in $HOME

Closes #4080

See merge request GNOME/gtk!3708
This commit is contained in:
Matthias Clasen 2021-06-29 22:17:49 +00:00
commit 3a5983e387
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gdk/wayland/gdkdisplay-wayland.c
View File

@ -991,6 +991,26 @@ gdk_wayland_display_get_toplevel_surfaces (GdkDisplay *display)
return GDK_WAYLAND_DISPLAY (display)->toplevels; return GDK_WAYLAND_DISPLAY (display)->toplevels;
} }
static struct wl_cursor_theme *
try_load_theme (GdkWaylandDisplay *display_wayland,
const char *dir,
gboolean dotdir,
const char *name,
int size)
{
struct wl_cursor_theme *theme = NULL;
char *path;
path = g_build_filename (dir, dotdir ? ".icons" : "icons", name, "cursors", NULL);
if (g_file_test (path, G_FILE_TEST_IS_DIR))
theme = wl_cursor_theme_create (path, size, display_wayland->shm);
g_free (path);
return theme;
}
static struct wl_cursor_theme * static struct wl_cursor_theme *
get_cursor_theme (GdkWaylandDisplay *display_wayland, get_cursor_theme (GdkWaylandDisplay *display_wayland,
const char *name, const char *name,
@ -1000,16 +1020,18 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
struct wl_cursor_theme *theme = NULL; struct wl_cursor_theme *theme = NULL;
int i; int i;
theme = try_load_theme (display_wayland, g_get_user_data_dir (), FALSE, name, size);
if (theme)
return theme;
theme = try_load_theme (display_wayland, g_get_home_dir (), TRUE, name, size);
if (theme)
return theme;
xdg_data_dirs = g_get_system_data_dirs (); xdg_data_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_data_dirs[i]; i++) for (i = 0; xdg_data_dirs[i]; i++)
{ {
char *path = g_build_filename (xdg_data_dirs[i], "icons", name, "cursors", NULL); theme = try_load_theme (display_wayland, xdg_data_dirs[i], FALSE, name, size);
if (g_file_test (path, G_FILE_TEST_IS_DIR))
theme = wl_cursor_theme_create (path, size, display_wayland->shm);
g_free (path);
if (theme) if (theme)
return theme; return theme;
} }