diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:00 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:00 +0000 |
| commit | 80f3bc0df0118d01369f85c1e28fbf0f9d42f4fc (patch) | |
| tree | d380f8dd7791f5a2e602a013a9e707ced757f5b2 /src/cursor.c | |
| parent | 5b6ea4938668fe060e591b2ef273183d0e3aea6f (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
Diffstat (limited to 'src/cursor.c')
| -rw-r--r-- | src/cursor.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/cursor.c b/src/cursor.c index 2dd8d19..701e3a9 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -1,7 +1,6 @@ /* - * $XFree86: xc/lib/Xcursor/cursor.c,v 1.4 2002/11/23 02:34:45 keithp Exp $ * - * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. + * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -689,14 +688,14 @@ XcursorImagesLoadCursors (Display *dpy, const XcursorImages *images) Cursor XcursorImagesLoadCursor (Display *dpy, const XcursorImages *images) { + Cursor cursor; if (images->nimage == 1 || !XcursorSupportsAnim (dpy)) - return XcursorImageLoadCursor (dpy, images->images[0]); + cursor = XcursorImageLoadCursor (dpy, images->images[0]); else { XcursorCursors *cursors = XcursorImagesLoadCursors (dpy, images); XAnimCursor *anim; int n; - Cursor cursor; if (!cursors) return 0; @@ -713,8 +712,12 @@ XcursorImagesLoadCursor (Display *dpy, const XcursorImages *images) } cursor = XRenderCreateAnimCursor (dpy, cursors->ncursor, anim); free (anim); - return cursor; } +#if defined HAVE_XFIXES && XFIXES_MAJOR >= 2 + if (images->name) + XFixesSetCursorName (dpy, cursor, images->name); +#endif + return cursor; } |