From 7a7335496b33ed9b516fddf6a86e4034ea098aa2 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat, 6 Dec 2003 13:24:22 +0000
Subject: merge XFree86 4.3.99.901 (RC1) from vendor branch

---
 man/Xcursor.man | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/man/Xcursor.man b/man/Xcursor.man
index 3596c6a..a40369b 100644
--- a/man/Xcursor.man
+++ b/man/Xcursor.man
@@ -1,5 +1,6 @@
 .\"
-.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.4 2003/06/12 14:12:27 eich Exp $
+.\" $XdotOrg: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $
 .\"
 .\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -161,12 +162,12 @@ value containing ARGB with A in the high byte.
 .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
@@ -179,8 +180,8 @@ XcursorImages is freed.
 .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
@@ -194,10 +195,10 @@ structures can use the same XcursorCursors.
 .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
@@ -211,8 +212,8 @@ holds a reference which is removed when the XcursorAnimate is freed.
 .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
-- 
cgit v1.2.3