From 8d0e520721ab7697d2d4f639425499b79c61b43f Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon, 7 Mar 2005 23:02:59 +0000
Subject: xc/programs/Xserver/dix/atom.c xc/programs/Xserver/dix/colormap.c
 xc/programs/Xserver/dix/cursor.c xc/programs/Xserver/dix/devices.c
 xc/programs/Xserver/dix/dispatch.c xc/programs/Xserver/dix/dixfonts.c
 xc/programs/Xserver/dix/dixutils.c xc/programs/Xserver/dix/events.c
 xc/programs/Xserver/dix/extension.c xc/programs/Xserver/dix/gc.c
 xc/programs/Xserver/dix/glyphcurs.c xc/programs/Xserver/dix/grabs.c
 xc/programs/Xserver/dix/main.c xc/programs/Xserver/dix/pixmap.c
 xc/programs/Xserver/dix/privates.c xc/programs/Xserver/dix/property.c
 xc/programs/Xserver/dix/resource.c xc/programs/Xserver/dix/swaprep.c
 xc/programs/Xserver/dix/swapreq.c
 //bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037    
 (https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy     Xserver/dix
 code. The conversion preserves the comments which annotate     variables.
 These have been moved into doxygen(esque?) "stubs" above     each function.
 Patch by Mike Owens <etc@filespanker.com>.

---
 dix/cursor.c | 65 +++++++++++++++++++++++++++---------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

(limited to 'dix/cursor.c')

diff --git a/dix/cursor.c b/dix/cursor.c
index 9e0724fb4..b269c4e8d 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -100,14 +100,13 @@ FreeCursorBits(CursorBitsPtr bits)
     }
 }
 
-/*
- * To be called indirectly by DeleteResource; must use exactly two args
+/**
+ * To be called indirectly by DeleteResource; must use exactly two args.
+ *
+ *  \param value must conform to DeleteType
  */
-/*ARGSUSED*/
 int
-FreeCursor(value, cid)
-    pointer	value; /* must conform to DeleteType */
-    XID 	cid;	
+FreeCursor(pointer value, XID cid)
 {
     int		nscr;
     CursorPtr 	pCurs = (CursorPtr)value;
@@ -152,19 +151,19 @@ CheckForEmptyMask(CursorBitsPtr bits)
     bits->emptyMask = TRUE;
 }
 
-/*
+/**
  * does nothing about the resource table, just creates the data structure.
  * does not copy the src and mask bits
+ *
+ *  \param psrcbits  server-defined padding
+ *  \param pmaskbits server-defined padding
+ *  \param argb      no padding
  */
 CursorPtr 
-AllocCursorARGB(psrcbits, pmaskbits, argb, cm,
-	    foreRed, foreGreen, foreBlue, backRed, backGreen, backBlue)
-    unsigned char *	psrcbits;		/* server-defined padding */
-    unsigned char *	pmaskbits;		/* server-defined padding */
-    CARD32 *		argb;			/* no padding */
-    CursorMetricPtr	cm;
-    unsigned		foreRed, foreGreen, foreBlue;
-    unsigned		backRed, backGreen, backBlue;
+AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, 
+                CursorMetricPtr cm,
+                unsigned foreRed, unsigned foreGreen, unsigned foreBlue, 
+                unsigned backRed, unsigned backGreen, unsigned backBlue)
 {
     CursorBitsPtr  bits;
     CursorPtr 	pCurs;
@@ -227,14 +226,16 @@ AllocCursorARGB(psrcbits, pmaskbits, argb, cm,
     return pCurs;
 }
 
+/**
+ *
+ * \param psrcbits   server-defined padding
+ * \param pmaskbits  server-defined padding
+ */
 CursorPtr 
-AllocCursor(psrcbits, pmaskbits, cm,
-	    foreRed, foreGreen, foreBlue, backRed, backGreen, backBlue)
-    unsigned char *	psrcbits;		/* server-defined padding */
-    unsigned char *	pmaskbits;		/* server-defined padding */
-    CursorMetricPtr	cm;
-    unsigned		foreRed, foreGreen, foreBlue;
-    unsigned		backRed, backGreen, backBlue;
+AllocCursor(unsigned char *psrcbits, unsigned char *pmaskbits, 
+            CursorMetricPtr cm,
+            unsigned foreRed, unsigned foreGreen, unsigned foreBlue,
+            unsigned backRed, unsigned backGreen, unsigned backBlue)
 {
     return AllocCursorARGB (psrcbits, pmaskbits, (CARD32 *) 0, cm,
 			    foreRed, foreGreen, foreBlue,
@@ -242,15 +243,10 @@ AllocCursor(psrcbits, pmaskbits, cm,
 }
 
 int
-AllocGlyphCursor(source, sourceChar, mask, maskChar,
-		 foreRed, foreGreen, foreBlue, backRed, backGreen, backBlue,
-		 ppCurs, client)
-    Font source, mask;
-    unsigned int sourceChar, maskChar;
-    unsigned foreRed, foreGreen, foreBlue;
-    unsigned backRed, backGreen, backBlue;
-    CursorPtr *ppCurs;
-    ClientPtr client;
+AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
+                unsigned foreRed, unsigned foreGreen, unsigned foreBlue, 
+                unsigned backRed, unsigned backGreen, unsigned backBlue,
+                CursorPtr *ppCurs, ClientPtr client)
 {
     FontPtr  sourcefont, maskfont;
     unsigned char   *srcbits;
@@ -422,8 +418,7 @@ AllocGlyphCursor(source, sourceChar, mask, maskChar,
     return Success;
 }
 
-/***********************************************************
- * CreateRootCursor
+/** CreateRootCursor
  *
  * look up the name of a font
  * open the font
@@ -433,9 +428,7 @@ AllocGlyphCursor(source, sourceChar, mask, maskChar,
  *************************************************************/
 
 CursorPtr 
-CreateRootCursor(pfilename, glyph)
-    char *		pfilename;
-    unsigned int	glyph;
+CreateRootCursor(char *pfilename, unsigned glyph)
 {
     CursorPtr 	curs;
     FontPtr 	cursorfont;
-- 
cgit v1.2.3