Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT

1 files changed, 29 insertions, 5 deletions

diff --git a/include/X11/Xcursor/Xcursor.h b/include/X11/Xcursor/Xcursor.h
index c4b4ac2..43cb332 100644
--- a/include/X11/Xcursor/Xcursor.h
+++ b/include/X11/Xcursor/Xcursor.h
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/Xcursor.h,v 1.3 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
@@ -69,9 +68,26 @@ typedef XcursorUInt	XcursorPixel;
 
 #define XCURSOR_MAGIC	0x72756358  /* "Xcur" LSBFirst */
 
-#define XCURSOR_MAJOR		1
-#define XCURSOR_MINOR		0
-#define XCURSOR_VERSION		((XCURSOR_MAJOR << 16) | (XCURSOR_MINOR))
+/*
+ * Current Xcursor version number.  This same number
+ * must appear in the Xcursor configure.ac file. Yes,
+ * it'a a pain to synchronize version numbers like this.
+ */
+
+#define XCURSOR_LIB_MAJOR	1
+#define XCURSOR_LIB_MINOR	1
+#define XCURSOR_LIB_REVISION	2
+#define XCURSOR_LIB_VERSION	((XCURSOR_LIB_MAJOR * 10000) + \
+				 (XCURSOR_LIB_MINOR * 100) + \
+				 (XCURSOR_LIB_REVISION))
+
+/*
+ * This version number is stored in cursor files; changes to the
+ * file format require updating this version number
+ */
+#define XCURSOR_FILE_MAJOR	1
+#define XCURSOR_FILE_MINOR	0
+#define XCURSOR_FILE_VERSION	((XCURSOR_FILE_MAJOR << 16) | (XCURSOR_FILE_MINOR))
 #define XCURSOR_FILE_HEADER_LEN	(4 * 4)
 #define XCURSOR_FILE_TOC_LEN	(3 * 4)
 
@@ -180,6 +196,7 @@ typedef struct _XcursorImage {
 typedef struct _XcursorImages {
     int		    nimage;	/* number of images */
     XcursorImage    **images;	/* array of XcursorImage pointers */
+    char	    *name;	/* name used to load images */
 } XcursorImages;
 
 typedef struct _XcursorCursors {
@@ -230,6 +247,9 @@ XcursorImagesCreate (int size);
 void
 XcursorImagesDestroy (XcursorImages *images);
 
+void
+XcursorImagesSetName (XcursorImages *images, const char *name);
+
 /*
  * Manage Cursor objects
  */
@@ -350,6 +370,10 @@ XcursorLibraryLoadImages (const char *library, const char *theme, int size);
 /*
  * Library/shape API
  */
+
+const char *
+XcursorLibraryPath (void);
+
 int
 XcursorLibraryShape (const char *library);