summaryrefslogtreecommitdiff
path: root/lib/libXcursor/src/library.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libXcursor/src/library.c')
-rw-r--r--lib/libXcursor/src/library.c142
1 files changed, 107 insertions, 35 deletions
diff --git a/lib/libXcursor/src/library.c b/lib/libXcursor/src/library.c
index de2351569..85c500600 100644
--- a/lib/libXcursor/src/library.c
+++ b/lib/libXcursor/src/library.c
@@ -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
@@ -47,6 +48,7 @@ XcursorLibraryPath (void)
path = getenv ("XCURSOR_PATH");
if (!path)
path = XCURSORPATH;
+ traceOpts((T_OPTION(XCURSOR_PATH) ": %s\n", NonNull(path)));
}
return path;
}
@@ -314,8 +316,11 @@ XcursorLibraryLoadImage (const char *file, const char *theme, int size)
FILE *f = NULL;
XcursorImage *image = NULL;
+ enterFunc((T_CALLED(XcursorLibraryLoadImage) "(\"%s\",\"%s\", %d)\n",
+ NonNull(file), NonNull(theme), size));
+
if (!file)
- return NULL;
+ returnAddr(NULL);
if (theme)
f = XcursorScanTheme (theme, file);
@@ -326,7 +331,33 @@ XcursorLibraryLoadImage (const char *file, const char *theme, int size)
image = XcursorFileLoadImage (f, size);
fclose (f);
}
- return image;
+ returnAddr(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 *
@@ -335,8 +366,11 @@ XcursorLibraryLoadImages (const char *file, const char *theme, int size)
FILE *f = NULL;
XcursorImages *images = NULL;
+ enterFunc((T_CALLED(XcursorLibraryLoadImages) "(\"%s\", \"%s\", %d)\n",
+ NonNull(file), NonNull(theme), size));
+
if (!file)
- return NULL;
+ returnAddr(NULL);
if (theme)
f = XcursorScanTheme (theme, file);
@@ -349,48 +383,53 @@ XcursorLibraryLoadImages (const char *file, const char *theme, int size)
XcursorImagesSetName (images, file);
fclose (f);
}
- return images;
+ returnAddr(images);
}
Cursor
XcursorLibraryLoadCursor (Display *dpy, const char *file)
{
- int size = XcursorGetDefaultSize (dpy);
- char *theme = XcursorGetTheme (dpy);
- XcursorImages *images = XcursorLibraryLoadImages (file, theme, size);
- Cursor cursor;
+ XcursorImages *images;
+ Cursor cursor = 0;
+
+ enterFunc((T_CALLED(XcursorLibraryLoadCursor) "(%p, \"%s\")\n",
+ (void*)dpy, NonNull(file)));
if (!file)
- return 0;
+ returnLong(cursor);
+ images = _XcursorLibraryLoadImages (dpy, file);
if (!images)
{
int id = XcursorLibraryShape (file);
if (id >= 0)
- return _XcursorCreateFontCursor (dpy, (unsigned) id);
- else
- return 0;
+ cursor = _XcursorCreateFontCursor (dpy, (unsigned) id);
}
- cursor = XcursorImagesLoadCursor (dpy, images);
- XcursorImagesDestroy (images);
+ else
+ {
+ cursor = XcursorImagesLoadCursor (dpy, images);
+ XcursorImagesDestroy (images);
#if defined HAVE_XFIXES && XFIXES_MAJOR >= 2
- XFixesSetCursorName (dpy, cursor, file);
+ XFixesSetCursorName (dpy, cursor, file);
#endif
- return cursor;
+ }
+ returnLong(cursor);
}
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;
+ enterFunc((T_CALLED(XcursorLibraryLoadCursors) "(%p, \"%s\")\n",
+ (void*)dpy, NonNull(file)));
+
if (!file)
- return NULL;
+ returnAddr(NULL);
+ images = _XcursorLibraryLoadImages (dpy, file);
if (!images)
{
int id = XcursorLibraryShape (file);
@@ -418,7 +457,7 @@ XcursorLibraryLoadCursors (Display *dpy, const char *file)
cursors = XcursorImagesLoadCursors (dpy, images);
XcursorImagesDestroy (images);
}
- return cursors;
+ returnAddr(cursors);
}
static const char _XcursorStandardNames[] =
@@ -518,44 +557,75 @@ XcursorImage *
XcursorShapeLoadImage (unsigned int shape, const char *theme, int size)
{
unsigned int id = shape >> 1;
+ XcursorImage *result = NULL;
+
+ enterFunc((T_CALLED(XcursorShapeLoadImage) "(%u, \"%s\", %d)\n",
+ shape, NonNull(theme), size));
if (id < NUM_STANDARD_NAMES)
- return XcursorLibraryLoadImage (STANDARD_NAME (id), theme, size);
- else
- return NULL;
+ result = XcursorLibraryLoadImage (STANDARD_NAME (id), theme, size);
+
+ returnAddr(result);
+}
+
+XcursorImages *
+_XcursorShapeLoadImages (Display *dpy, unsigned int shape)
+{
+ unsigned int id = shape >> 1;
+ XcursorImages *result = NULL;
+
+ enterFunc((T_CALLED(_XcursorShapeLoadImages) "(%p, %u)\n",
+ (void*)dpy, shape));
+
+ if (id < NUM_STANDARD_NAMES)
+ result = _XcursorLibraryLoadImages (dpy, STANDARD_NAME (id));
+
+ returnAddr(result);
}
XcursorImages *
XcursorShapeLoadImages (unsigned int shape, const char *theme, int size)
{
unsigned int id = shape >> 1;
+ XcursorImages *result = NULL;
+
+ enterFunc((T_CALLED(XcursorShapeLoadImages) "(%u, \"%s\", %d)\n",
+ shape, NonNull(theme), size));
if (id < NUM_STANDARD_NAMES)
- return XcursorLibraryLoadImages (STANDARD_NAME (id), theme, size);
- else
- return NULL;
+ result = XcursorLibraryLoadImages (STANDARD_NAME (id), theme, size);
+
+ returnAddr(result);
}
Cursor
XcursorShapeLoadCursor (Display *dpy, unsigned int shape)
{
unsigned int id = shape >> 1;
+ Cursor result = None;
+
+ enterFunc((T_CALLED(XcursorShapeLoadCursor) "(%p, %u)\n",
+ (void*)dpy, shape));
if (id < NUM_STANDARD_NAMES)
- return XcursorLibraryLoadCursor (dpy, STANDARD_NAME (id));
- else
- return 0;
+ result = XcursorLibraryLoadCursor (dpy, STANDARD_NAME (id));
+
+ returnLong(result);
}
XcursorCursors *
XcursorShapeLoadCursors (Display *dpy, unsigned int shape)
{
unsigned int id = shape >> 1;
+ XcursorCursors *result = NULL;
+
+ enterFunc((T_CALLED(XcursorShapeLoadCursors) "(%p, %u)\n",
+ (void*)dpy, shape));
if (id < NUM_STANDARD_NAMES)
- return XcursorLibraryLoadCursors (dpy, STANDARD_NAME (id));
- else
- return NULL;
+ result = XcursorLibraryLoadCursors (dpy, STANDARD_NAME (id));
+
+ returnAddr(result);
}
int
@@ -563,6 +633,8 @@ XcursorLibraryShape (const char *library)
{
int low, high;
+ enterFunc((T_CALLED(XcursorLibraryShape) "(%s)\n", NonNull(library)));
+
low = 0;
high = NUM_STANDARD_NAMES - 1;
while (low < high - 1)
@@ -570,7 +642,7 @@ XcursorLibraryShape (const char *library)
int mid = (low + high) >> 1;
int c = strcmp (library, STANDARD_NAME (mid));
if (c == 0)
- return (mid << 1);
+ returnCode(mid << 1);
if (c > 0)
low = mid;
else
@@ -582,5 +654,5 @@ XcursorLibraryShape (const char *library)
return (low << 1);
low++;
}
- return -1;
+ returnCode(-1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 15:33:45 +0000