provide internal variants of existing functions to pass "resized" parameter

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
This commit is contained in:
Thomas E. Dickey 2024-10-29 16:36:57 -04:00
parent e7272c8046
commit 5cb505f21e
No known key found for this signature in database
GPG key ID: CC2AF4472167BE03
2 changed files with 56 additions and 6 deletions

View file

@ -687,10 +687,10 @@ _XcursorXcFileLoadImage (XcursorFile *file, int size, XcursorBool resize)
return image; return image;
} }
XcursorImages * XcursorImage *
XcursorXcFileLoadImages (XcursorFile *file, int size) XcursorXcFileLoadImage (XcursorFile *file, int size)
{ {
return _XcursorXcFileLoadImages (file, size, XcursorFalse); return _XcursorXcFileLoadImage (file, size, XcursorFalse);
} }
XcursorImages * XcursorImages *
@ -747,10 +747,10 @@ _XcursorXcFileLoadImages (XcursorFile *file, int size, XcursorBool resize)
return images; return images;
} }
XcursorImage * XcursorImages *
XcursorXcFileLoadImage (XcursorFile *file, int size) XcursorXcFileLoadImages (XcursorFile *file, int size)
{ {
return _XcursorXcFileLoadImage (file, size, XcursorFalse); return _XcursorXcFileLoadImages (file, size, XcursorFalse);
} }
XcursorImages * XcursorImages *
@ -993,6 +993,30 @@ _XcursorStdioFileInitialize (FILE *stdfile, XcursorFile *file)
file->seek = _XcursorStdioFileSeek; file->seek = _XcursorStdioFileSeek;
} }
XcursorImage *
_XcursorFileLoadImage (FILE *file, int size, XcursorBool resize)
{
XcursorFile f;
if (!file)
return NULL;
_XcursorStdioFileInitialize (file, &f);
return _XcursorXcFileLoadImage (&f, size, resize);
}
XcursorImages *
_XcursorFileLoadImages (FILE *file, int size, XcursorBool resize)
{
XcursorFile f;
if (!file)
return NULL;
_XcursorStdioFileInitialize (file, &f);
return _XcursorXcFileLoadImages (&f, size, resize);
}
XcursorImage * XcursorImage *
XcursorFileLoadImage (FILE *file, int size) XcursorFileLoadImage (FILE *file, int size)
{ {
@ -1091,6 +1115,23 @@ XcursorFilenameLoadImage (const char *file, int size)
return image; return image;
} }
XcursorImages *
_XcursorFilenameLoadImages (const char *file, int size, XcursorBool resize)
{
FILE *f;
XcursorImages *images;
if (!file || size < 0)
return NULL;
f = fopen (file, "r" FOPEN_CLOEXEC);
if (!f)
return NULL;
images = _XcursorFileLoadImages (f, size, resize);
fclose (f);
return images;
}
XcursorImages * XcursorImages *
XcursorFilenameLoadImages (const char *file, int size) XcursorFilenameLoadImages (const char *file, int size)
{ {

View file

@ -113,7 +113,16 @@ Cursor
_XcursorCreateFontCursor (Display *dpy, unsigned int shape); _XcursorCreateFontCursor (Display *dpy, unsigned int shape);
/* provide for XCURSOR_RESIZED */ /* provide for XCURSOR_RESIZED */
XcursorImage *
_XcursorFileLoadImage (FILE *file, int size, XcursorBool resize);
XcursorImages * XcursorImages *
_XcursorXcFileLoadImages (XcursorFile *file, int size, XcursorBool resize); _XcursorXcFileLoadImages (XcursorFile *file, int size, XcursorBool resize);
XcursorImages *
_XcursorFileLoadImages (FILE *file, int size, XcursorBool resize);
XcursorImages *
_XcursorFilenameLoadImages (const char *file, int size, XcursorBool resize);
#endif /* _XCURSORINT_H_ */ #endif /* _XCURSORINT_H_ */