Thu Apr 15 03:15:04 PDT 2004

Committed by: eich

Update of /cvs/xorg/xc/lib/Xcursor
In directory pdx:/home/eich/tstbuild/xc/lib/Xcursor

Modified Files:
      Tag: XORG-CURRENT
	Imakefile Xcursor-def.cpp Xcursor.h Xcursor.man cursor.c 
	display.c file.c library.c xcursor-config.in xcursor.pc.in 
	xcursorint.h xlib.c 
Added Files:
      Tag: XORG-CURRENT
	AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README 
	autogen.sh config.h configure.ac 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch

--- NEW FILE: AUTHORS ---
Keith Packard, HP


--- NEW FILE: COPYING ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ChangeLog ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: INSTALL ---

--- NEW FILE: Makefile.am ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: NEWS ---

--- NEW FILE: README ---

--- NEW FILE: autogen.sh ---
#! /bin/sh
autoreconf -v --install || exit 1
./configure --enable-maintainer-mode "$@"

--- NEW FILE: config.h ---

--- NEW FILE: configure.ac ---
(This appears to be a binary file; contents omitted.)

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:39:21 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:15:00 -0000	1.1.4.3
@@ -2,7 +2,7 @@
 
 #ifndef NormalLibXcursor
 #define NormalLibXcursor YES
-SOXCURSORREV=1.0
+SOXCURSORREV=1.0.2
 #endif
 
 #ifndef SharedLibXcursor
@@ -21,14 +21,25 @@
 
 #include <Threads.tmpl>
 
-XCURSOR_REVISION=0
-
 #ifdef SharedXcursorReqs
 REQUIREDLIBS = SharedXcursorReqs
 #else
 REQUIREDLIBS = $(LDPRELIB) $(XRENDERLIB)
 #endif
 
+XCURSOR_VERSION=1.1.2
+
+XRENDER_LIBS=$(XRENDERLIB)
+XRENDER_CFLAGS=$(XRENDERINCLUDES)
+
+X_LIBS=-L$(SHLIBDIR) $(XONLYLIB)
+X_CFLAGS=-I$(INCROOT) $(THREADS_DEFINES)
+
+#if BuildRenderLibrary
+XRENDER_LIBS=-L$(USRLIBDIR) $(XRENDERLIB)
+XRENDER_CFLAGS=-I$(INCROOT)
+#endif
+
 RPATH_CFLAG = HardCodeLibdirFlag
 
 ICONDIR=$(LIBDIR)/icons
@@ -46,7 +57,11 @@
 	  libdir="$(USRLIBDIR)" \
 	  hardcode_libdir_flag_spec="$(RPATH_CFLAG)" \
 	  includedir="$(INCROOT)" \
-	  PACKAGE_VERSION="$(SOXCURSORREV).$(XCURSOR_REVISION)"
+	  XRENDER_LIBS="$(XRENDER_LIBS)"\
+	  XRENDER_CFLAGS="$(XRENDER_CFLAGS)"\
+	  X_LIBS="$(X_LIBS)" \
+	  X_CFLAGS="$(X_CFLAGS)" \
+	  VERSION="$(XCURSOR_VERSION)"
 
 #include <Library.tmpl>
 

Index: Xcursor-def.cpp
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/Xcursor-def.cpp,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Xcursor-def.cpp	5 Mar 2004 13:39:21 -0000	1.1.4.2
+++ b/Xcursor-def.cpp	15 Apr 2004 10:15:00 -0000	1.1.4.3
@@ -41,15 +41,14 @@
 XcursorImageDestroy
 XcursorImagesCreate
 XcursorImagesDestroy
-XcursorImageHash
 XcursorXcFileLoad
 XcursorXcFileLoadAllImages
 XcursorXcFileLoadImage
 XcursorXcFileLoadImages
 XcursorXcFileSave
+XcursorLibraryPath
 XcursorLibraryLoadImage
 XcursorLibraryLoadImages
 XcursorShapeLoadImage
 XcursorShapeLoadImages
 XcursorTryShapeCursor
-/* $XFree86: xc/lib/Xcursor/Xcursor-def.cpp,v 1.2 2002/09/30 22:02:17 alanh Exp $ */

Index: Xcursor.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/Xcursor.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Xcursor.h	5 Mar 2004 13:39:21 -0000	1.1.4.1
+++ b/Xcursor.h	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -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 @@
 
 #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 _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 @@
 void
 XcursorImagesDestroy (XcursorImages *images);
 
+void
+XcursorImagesSetName (XcursorImages *images, const char *name);
+
 /*
  * Manage Cursor objects
  */
@@ -350,6 +370,10 @@
 /*
  * Library/shape API
  */
+
+const char *
+XcursorLibraryPath (void);
+
 int
 XcursorLibraryShape (const char *library);
     

Index: Xcursor.man
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/Xcursor.man,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Xcursor.man	5 Mar 2004 13:39:21 -0000	1.1.4.3
+++ b/Xcursor.man	15 Apr 2004 10:15:00 -0000	1.1.4.4
@@ -1,8 +1,8 @@
 .\"
-.\" $XdotOrg$
-.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.4 2003/06/12 14:12:27 eich Exp $
+.\" $Id: Xcursor.3,v 1.1 2003/05/06 18:09:55 keithp Exp $
+.\"
+.\" Copyright © 2002 Keith Packard
 .\"
-.\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
@@ -26,7 +26,7 @@
 .ns
 .TP \\$1
 ..
-.TH XCURSOR 3 "Version 1.0" "XFree86"
+.TH XCURSOR 3 "Version 1.0" "Keith Packard"
 
 .SH NAME
 XCURSOR \- Cursor management library
@@ -141,7 +141,7 @@
 Xcursor (mostly) follows the freedesktop.org spec for theming icons.  The
 default search path it uses is $HOME/.icons, /usr/share/icons,
 /usr/share/pimaps, /usr/X11R6/lib/X11/icons.  Within each of these
-directories, it searches for a directory using the theme name.  Within the
+directorys, it searches for a directory using the theme name.  Within the
 theme directory, it looks for cursor files in the 'cursors' subdirectory.
 It uses the first cursor file found along  the path.
 .PP
@@ -162,12 +162,12 @@
 .nf
 .ft CR
     typedef struct _XcursorImage {
-        XcursorDim	size;	    /\(** nominal size for matching */
-        XcursorDim	width;	    /\(** actual width */
-        XcursorDim	height;	    /\(** actual height */
-        XcursorDim	xhot;	    /\(** hot spot x (must be inside image) */
-        XcursorDim	yhot;       /\(** hot spot y (must be inside image) */
-        XcursorPixel    *pixels;    /\(** pointer to pixels */
+        XcursorDim	size;	    /* nominal size for matching */
+        XcursorDim	width;	    /* actual width */
+        XcursorDim	height;	    /* actual height */
+        XcursorDim	xhot;	    /* hot spot x (must be inside image) */
+        XcursorDim	yhot;       /* hot spot y (must be inside image) */
+        XcursorPixel    *pixels;    /* pointer to pixels */
     } XcursorImage;
 .ft
 .fi
@@ -180,8 +180,8 @@
 .nf
 .ft CR
     typedef struct _XcursorImages {
-        int             nimage;	    /\(** number of images */
-        XcursorImage    **images;   /\(** array of XcursorImage pointers */
+        int             nimage;	    /* number of images */
+        XcursorImage    **images;   /* array of XcursorImage pointers */
     } XcursorImages;
 .ft
 .fi
@@ -195,10 +195,10 @@
 .nf
 .ft CR
     typedef struct _XcursorCursors {
-        Display     *dpy;	/\(** Display holding cursors */
-        int	    ref;	/\(** reference count */
-        int	    ncursor;	/\(** number of cursors */
-        Cursor	    *cursors;	/\(** array of cursors */
+        Display     *dpy;	/* Display holding cursors */
+        int	    ref;	/* reference count */
+        int	    ncursor;	/* number of cursors */
+        Cursor	    *cursors;	/* array of cursors */
     } XcursorCursors;
 .ft
 .fi
@@ -212,8 +212,8 @@
 .nf
 .ft CR
     typedef struct _XcursorAnimate {
-        XcursorCursors   *cursors;  /\(** list of cursors to use */
-        int		 sequence;  /\(** which cursor is next */
+        XcursorCursors   *cursors;  /* list of cursors to use */
+        int		 sequence;  /* which cursor is next */
     } XcursorAnimate;
 .ft
 .fi
@@ -376,4 +376,4 @@
 retain some level of source-file compatibility.
 
 .SH AUTHOR
-Keith Packard, member of the XFree86 Project, Inc.
+Keith Packard

Index: cursor.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/cursor.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cursor.c	5 Mar 2004 13:39:21 -0000	1.1.4.1
+++ b/cursor.c	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -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 @@
 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 @@
 	}
 	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;
 }
 
 

Index: display.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/display.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/display.c	5 Mar 2004 13:39:22 -0000	1.1.4.1
+++ b/display.c	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/display.c,v 1.5 2002/11/27 05:35:10 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

Index: file.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/file.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/file.c	5 Mar 2004 13:39:22 -0000	1.1.4.1
+++ b/file.c	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/file.c,v 1.1tsi 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
@@ -61,6 +60,7 @@
 	return 0;
     images->nimage = 0;
     images->images = (XcursorImage **) (images + 1);
+    images->name = 0;
     return images;
 }
 
@@ -71,9 +71,24 @@
 
     for (n = 0; n < images->nimage; n++)
 	XcursorImageDestroy (images->images[n]);
+    if (images->name)
+	free (images->name);
     free (images);
 }
 
+void
+XcursorImagesSetName (XcursorImages *images, const char *name)
+{
+    char    *new = malloc (strlen (name) + 1);
+
+    if (!new)
+	return;
+    strcpy (new, name);
+    if (images->name)
+	free (images->name);
+    images->name = new;
+}
+
 XcursorComment *
 XcursorCommentCreate (XcursorUInt comment_type, int length)
 {
@@ -185,7 +200,7 @@
 	return 0;
     fileHeader->magic = XCURSOR_MAGIC;
     fileHeader->header = XCURSOR_FILE_HEADER_LEN;
-    fileHeader->version = XCURSOR_VERSION;
+    fileHeader->version = XCURSOR_FILE_VERSION;
     fileHeader->ntoc = ntoc;
     fileHeader->tocs = (XcursorFileToc *) (fileHeader + 1);
     return fileHeader;

Index: library.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/library.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/library.c	5 Mar 2004 13:39:22 -0000	1.1.4.2
+++ b/library.c	15 Apr 2004 10:15:00 -0000	1.1.4.3
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/library.c,v 1.3 2003/11/07 17:56:02 dawes 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
@@ -32,8 +31,8 @@
 
 #define CURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
 
-static const char *
-_XcursorLibraryPath (void)
+const char *
+XcursorLibraryPath (void)
 {
     static const char	*path;
 
@@ -101,19 +100,16 @@
 	if (!home)
 	    return 0;
 	homelen = strlen (home);
-	/* A '/' gets prepended if $HOME doesn't start with one. */
-	if (home[0] != '/')
-	    homelen++;
 	dir++;
 	dirlen--;
     }
 
-    len = homelen + dirlen + 1 + themelen + 1;
+    /*
+     * add space for any needed directory separators, one per component,
+     * and one for the trailing null
+     */
+    len = 1 + homelen + 1 + dirlen + 1 + themelen + 1;
     
-    /* A '/' gets inserted if dir doesn't start with one. */
-    if (dir[0] != '/')
-	len++;
-
     full = malloc (len);
     if (!full)
 	return 0;
@@ -222,7 +218,7 @@
     /*
      * Scan this theme
      */
-    for (path = _XcursorLibraryPath ();
+    for (path = XcursorLibraryPath ();
 	 path && f == 0;
 	 path = _XcursorNextPath (path))
     {
@@ -292,6 +288,8 @@
     if (f)
     {
 	images = XcursorFileLoadImages (f, size);
+	if (images)
+	    XcursorImagesSetName (images, file);
 	fclose (f);
     }
     return images;
@@ -316,6 +314,9 @@
     }
     cursor = XcursorImagesLoadCursor (dpy, images);
     XcursorImagesDestroy (images);
+#if defined HAVE_XFIXES && XFIXES_MAJOR >= 2
+    XFixesSetCursorName (dpy, cursor, file);
+#endif
     return cursor;
 }
 

Index: xcursor-config.in
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/xcursor-config.in,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xcursor-config.in	26 Nov 2003 22:48:39 -0000	1.1.4.1
+++ b/xcursor-config.in	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -5,7 +5,7 @@
 libdir="@libdir@"
 hardcode_libdir_flag_spec=@hardcode_libdir_flag_spec@
 includedir="@includedir@"
-version="@PACKAGE_VERSION@"
+version="@VERSION@"
 
 usage()
 {

Index: xcursor.pc.in
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/xcursor.pc.in,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xcursor.pc.in	26 Nov 2003 22:48:39 -0000	1.1.4.1
+++ b/xcursor.pc.in	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -1,12 +1,15 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-hardcode_libdir_flag_spec=@hardcode_libdir_flag_spec@
 includedir=@includedir@
+xrenderlibs=@XRENDER_LIBS@
+xrendercflags=@XRENDER_CFLAGS@
+xlibs=@X_LIBS@
+xcflags=@X_CFLAGS@
 
 Name: Xcursor
-Description: X Cursor library
-Version: @PACKAGE_VERSION@
-Requires:
-Libs: ${hardcode_libdir_flag_spec} -L${libdir} -lXcursor
-Cflags: -I${includedir}
+Description: X Cursor Library
+Version: @VERSION@
+Requires: xrender
+Cflags: -I${includedir} ${xrendercflags} ${xcflags}
+Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs}

Index: xcursorint.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/xcursorint.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xcursorint.h	5 Mar 2004 13:39:22 -0000	1.1.4.1
+++ b/xcursorint.h	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/xcursorint.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
@@ -25,10 +24,20 @@
 #ifndef _XCURSORINT_H_
 #define _XCURSORINT_H_
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xrender.h>
+
+#ifdef HAVE_XFIXES
+#include <X11/extensions/Xfixes.h>
+#endif
+
 #include "Xcursor.h"
+#include "config.h"
 
 typedef struct _XcursorFontInfo {
     struct _XcursorFontInfo	*next;

Index: xlib.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xcursor/xlib.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xlib.c	5 Mar 2004 13:39:22 -0000	1.1.4.1
+++ b/xlib.c	15 Apr 2004 10:15:00 -0000	1.1.4.2
@@ -1,7 +1,6 @@
 /*
- * $XFree86: xc/lib/Xcursor/xlib.c,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


