fdo-mirrors/xorg-libxcursor
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcursor.git synced 2026-05-07 15:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add/use _XcursorLibraryLoadImages to pass resized-parameter when loading

Browse source 
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
This commit is contained in:
Thomas E. Dickey 2024-10-29 16:53:05 -04:00
parent b00d7da27b
commit 8a1de72216
No known key found for this signature in database
GPG key ID: CC2AF4472167BE03
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/library.c
View file

@ -1,4 +1,5 @@
/*
* Copyright © 2024 Thomas E. Dickey
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -329,6 +330,32 @@ XcursorLibraryLoadImage (const char *file, const char *theme, int size)
return image;
}
static XcursorImages *
_XcursorLibraryLoadImages (Display *dpy, const char *file)
{
int size = XcursorGetDefaultSize (dpy);
char *theme = XcursorGetTheme (dpy);
XcursorBool resized = XcursorGetResizable (dpy);
FILE *f = NULL;
XcursorImages *images = NULL;
if (!file)
return NULL;
if (theme)
f = XcursorScanTheme (theme, file);
if (!f)
f = XcursorScanTheme ("default", file);
if (f != NULL && f != XCURSOR_SCAN_CORE)
{
images = _XcursorFileLoadImages (f, size, resized);
if (images)
XcursorImagesSetName (images, file);
fclose (f);
}
return images;
}
XcursorImages *
XcursorLibraryLoadImages (const char *file, const char *theme, int size)
{
@ -355,14 +382,13 @@ XcursorLibraryLoadImages (const char *file, const char *theme, int size)
Cursor
XcursorLibraryLoadCursor (Display *dpy, const char *file)
{
int size = XcursorGetDefaultSize (dpy);
char *theme = XcursorGetTheme (dpy);
XcursorImages *images = XcursorLibraryLoadImages (file, theme, size);
XcursorImages *images;
Cursor cursor;
if (!file)
return 0;
images = _XcursorLibraryLoadImages (dpy, file);
if (!images)
{
int id = XcursorLibraryShape (file);
@ -383,14 +409,13 @@ XcursorLibraryLoadCursor (Display *dpy, const char *file)
XcursorCursors *
XcursorLibraryLoadCursors (Display *dpy, const char *file)
{
int size = XcursorGetDefaultSize (dpy);
char *theme = XcursorGetTheme (dpy);
XcursorImages *images = XcursorLibraryLoadImages (file, theme, size);
XcursorImages *images;
XcursorCursors *cursors;
if (!file)
return NULL;
images = _XcursorLibraryLoadImages (dpy, file);
if (!images)
{
int id = XcursorLibraryShape (file);