diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /include/cursor.h | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
Diffstat (limited to 'include/cursor.h')
| -rw-r--r-- | include/cursor.h | 64 |
1 files changed, 13 insertions, 51 deletions
diff --git a/include/cursor.h b/include/cursor.h index 82423cd9e..7509a94af 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,11 +66,8 @@ typedef struct _CursorMetric *CursorMetricPtr; extern CursorPtr rootCursor; extern int FreeCursor( -#if NeedFunctionPrototypes pointer /*pCurs*/, - XID /*cid*/ -#endif -); + XID /*cid*/); /* Quartz support on Mac OS X pulls in the QuickDraw framework whose AllocCursor function conflicts here. */ @@ -78,7 +75,6 @@ extern int FreeCursor( #define AllocCursor Darwin_X_AllocCursor #endif extern CursorPtr AllocCursor( -#if NeedFunctionPrototypes unsigned char* /*psrcbits*/, unsigned char* /*pmaskbits*/, CursorMetricPtr /*cm*/, @@ -87,12 +83,9 @@ extern CursorPtr AllocCursor( unsigned /*foreBlue*/, unsigned /*backRed*/, unsigned /*backGreen*/, - unsigned /*backBlue*/ -#endif -); + unsigned /*backBlue*/); extern CursorPtr AllocCursorARGB( -#if NeedFunctionPrototypes unsigned char* /*psrcbits*/, unsigned char* /*pmaskbits*/, CARD32* /*argb*/, @@ -102,12 +95,9 @@ extern CursorPtr AllocCursorARGB( unsigned /*foreBlue*/, unsigned /*backRed*/, unsigned /*backGreen*/, - unsigned /*backBlue*/ -#endif -); + unsigned /*backBlue*/); extern int AllocGlyphCursor( -#if NeedFunctionPrototypes Font /*source*/, unsigned int /*sourceChar*/, Font /*mask*/, @@ -119,67 +109,39 @@ extern int AllocGlyphCursor( unsigned /*backGreen*/, unsigned /*backBlue*/, CursorPtr* /*ppCurs*/, - ClientPtr /*client*/ -#endif -); + ClientPtr /*client*/); extern CursorPtr CreateRootCursor( -#if NeedFunctionPrototypes char* /*pfilename*/, - unsigned int /*glyph*/ -#endif -); + unsigned int /*glyph*/); extern int ServerBitsFromGlyph( -#if NeedFunctionPrototypes FontPtr /*pfont*/, unsigned int /*ch*/, register CursorMetricPtr /*cm*/, - unsigned char ** /*ppbits*/ -#endif -); + unsigned char ** /*ppbits*/); extern Bool CursorMetricsFromGlyph( -#if NeedFunctionPrototypes FontPtr /*pfont*/, unsigned /*ch*/, - CursorMetricPtr /*cm*/ -#endif -); + CursorMetricPtr /*cm*/); extern void CheckCursorConfinement( -#if NeedFunctionPrototypes - WindowPtr /*pWin*/ -#endif -); + WindowPtr /*pWin*/); extern void NewCurrentScreen( -#if NeedFunctionPrototypes ScreenPtr /*newScreen*/, int /*x*/, - int /*y*/ -#endif -); + int /*y*/); -extern Bool PointerConfinedToScreen( -#if NeedFunctionPrototypes - void -#endif -); +extern Bool PointerConfinedToScreen(void); extern void GetSpritePosition( -#if NeedFunctionPrototypes int * /*px*/, - int * /*py*/ -#endif -); + int * /*py*/); #ifdef PANORAMIX -extern int XineramaGetCursorScreen( -#if NeedFunctionPrototypes - void -#endif -); +extern int XineramaGetCursorScreen(void); #endif /* PANORAMIX */ #endif /* CURSOR_H */ |