mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-22 04:45:58 +01:00
xcursor: garbage collect XcursorLibraryLoadImages
XcursorLibraryLoadImages is unused, let's drop it. Same as [1]. [1]: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/206 Co-authored-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
parent
ba6ba4b07a
commit
ab3b9f9a77
2 changed files with 0 additions and 82 deletions
|
@ -54,9 +54,6 @@ typedef struct _XcursorImages {
|
||||||
char *name; /* name used to load images */
|
char *name; /* name used to load images */
|
||||||
} XcursorImages;
|
} XcursorImages;
|
||||||
|
|
||||||
XcursorImages *
|
|
||||||
XcursorLibraryLoadImages (const char *file, const char *theme, int size);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
XcursorImagesDestroy (XcursorImages *images);
|
XcursorImagesDestroy (XcursorImages *images);
|
||||||
|
|
||||||
|
|
|
@ -795,85 +795,6 @@ _XcursorThemeInherits (const char *full)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static FILE *
|
|
||||||
XcursorScanTheme (const char *theme, const char *name)
|
|
||||||
{
|
|
||||||
FILE *f = NULL;
|
|
||||||
char *full;
|
|
||||||
char *dir;
|
|
||||||
const char *path;
|
|
||||||
char *inherits = NULL;
|
|
||||||
const char *i;
|
|
||||||
|
|
||||||
if (!theme || !name)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Scan this theme
|
|
||||||
*/
|
|
||||||
for (path = XcursorLibraryPath ();
|
|
||||||
path && f == NULL;
|
|
||||||
path = _XcursorNextPath (path))
|
|
||||||
{
|
|
||||||
dir = _XcursorBuildThemeDir (path, theme);
|
|
||||||
if (dir)
|
|
||||||
{
|
|
||||||
full = _XcursorBuildFullname (dir, "cursors", name);
|
|
||||||
if (full)
|
|
||||||
{
|
|
||||||
f = fopen (full, "r");
|
|
||||||
free (full);
|
|
||||||
}
|
|
||||||
if (!f && !inherits)
|
|
||||||
{
|
|
||||||
full = _XcursorBuildFullname (dir, "", "index.theme");
|
|
||||||
if (full)
|
|
||||||
{
|
|
||||||
inherits = _XcursorThemeInherits (full);
|
|
||||||
free (full);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free (dir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Recurse to scan inherited themes
|
|
||||||
*/
|
|
||||||
for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
|
|
||||||
{
|
|
||||||
if (strcmp(i, theme) != 0)
|
|
||||||
f = XcursorScanTheme (i, name);
|
|
||||||
else
|
|
||||||
printf("Not calling XcursorScanTheme because of circular dependency: %s. %s", i, name);
|
|
||||||
}
|
|
||||||
if (inherits != NULL)
|
|
||||||
free (inherits);
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
|
|
||||||
XcursorImages *
|
|
||||||
XcursorLibraryLoadImages (const char *file, const char *theme, int size)
|
|
||||||
{
|
|
||||||
FILE *f = NULL;
|
|
||||||
XcursorImages *images = NULL;
|
|
||||||
|
|
||||||
if (!file)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if (theme)
|
|
||||||
f = XcursorScanTheme (theme, file);
|
|
||||||
if (!f)
|
|
||||||
f = XcursorScanTheme ("default", file);
|
|
||||||
if (f)
|
|
||||||
{
|
|
||||||
images = XcursorFileLoadImages (f, size);
|
|
||||||
if (images)
|
|
||||||
XcursorImagesSetName (images, file);
|
|
||||||
fclose (f);
|
|
||||||
}
|
|
||||||
return images;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
load_all_cursors_from_dir(const char *path, int size,
|
load_all_cursors_from_dir(const char *path, int size,
|
||||||
void (*load_callback)(XcursorImages *, void *),
|
void (*load_callback)(XcursorImages *, void *),
|
||||||
|
|
Loading…
Reference in a new issue