Index: lib/X11/Xlib.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xlib.h,v retrieving revision 1.3 diff -u -p -r1.3 Xlib.h --- lib/X11/Xlib.h 2 Dec 2004 16:18:16 -0000 1.3 +++ lib/X11/Xlib.h 21 Mar 2005 02:01:42 -0000 @@ -59,9 +59,10 @@ in this Software without prior written a #include -/* applications should not depend on these two headers being included! */ +/* applications should not depend on these three headers being included! */ #include #include +#include #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV @@ -92,8 +93,8 @@ typedef unsigned long wchar_t; #endif #endif -extern int -_Xmblen( +X11API int +X11APIENTRY _Xmblen( #ifdef ISC char const *str, size_t len @@ -1394,20 +1395,20 @@ _XFUNCPROTOBEGIN #define _Xdebug (*_Xdebug_p) #endif -extern int _Xdebug; +X11API extern int _Xdebug; -extern XFontStruct *XLoadQueryFont( +X11API XFontStruct *XLoadQueryFont( Display* /* display */, _Xconst char* /* name */ ); -extern XFontStruct *XQueryFont( +X11API XFontStruct *XQueryFont( Display* /* display */, XID /* font_ID */ ); -extern XTimeCoord *XGetMotionEvents( +X11API XTimeCoord *XGetMotionEvents( Display* /* display */, Window /* w */, Time /* start */, @@ -1415,7 +1416,7 @@ extern XTimeCoord *XGetMotionEvents( int* /* nevents_return */ ); -extern XModifierKeymap *XDeleteModifiermapEntry( +X11API XModifierKeymap *XDeleteModifiermapEntry( XModifierKeymap* /* modmap */, #if NeedWidePrototypes unsigned int /* keycode_entry */, @@ -1425,11 +1426,11 @@ extern XModifierKeymap *XDeleteModifierm int /* modifier */ ); -extern XModifierKeymap *XGetModifierMapping( +X11API XModifierKeymap *XGetModifierMapping( Display* /* display */ ); -extern XModifierKeymap *XInsertModifiermapEntry( +X11API XModifierKeymap *XInsertModifiermapEntry( XModifierKeymap* /* modmap */, #if NeedWidePrototypes unsigned int /* keycode_entry */, @@ -1439,11 +1440,11 @@ extern XModifierKeymap *XInsertModifierm int /* modifier */ ); -extern XModifierKeymap *XNewModifiermap( +X11API XModifierKeymap *XNewModifiermap( int /* max_keys_per_mod */ ); -extern XImage *XCreateImage( +X11API XImage *XCreateImage( Display* /* display */, Visual* /* visual */, unsigned int /* depth */, @@ -1455,10 +1456,10 @@ extern XImage *XCreateImage( int /* bitmap_pad */, int /* bytes_per_line */ ); -extern Status XInitImage( +X11API Status X11APIENTRY XInitImage( XImage* /* image */ ); -extern XImage *XGetImage( +X11API XImage *XGetImage( Display* /* display */, Drawable /* d */, int /* x */, @@ -1468,7 +1469,7 @@ extern XImage *XGetImage( unsigned long /* plane_mask */, int /* format */ ); -extern XImage *XGetSubImage( +X11API XImage *XGetSubImage( Display* /* display */, Drawable /* d */, int /* x */, @@ -1485,52 +1486,52 @@ extern XImage *XGetSubImage( /* * X function declarations. */ -extern Display *XOpenDisplay( +X11API Display *XOpenDisplay( _Xconst char* /* display_name */ ); -extern void XrmInitialize( +X11API void X11APIENTRY XrmInitialize( void ); -extern char *XFetchBytes( +X11API char *XFetchBytes( Display* /* display */, int* /* nbytes_return */ ); -extern char *XFetchBuffer( +X11API char *XFetchBuffer( Display* /* display */, int* /* nbytes_return */, int /* buffer */ ); -extern char *XGetAtomName( +X11API char *XGetAtomName( Display* /* display */, Atom /* atom */ ); -extern Status XGetAtomNames( +X11API Status X11APIENTRY XGetAtomNames( Display* /* dpy */, Atom* /* atoms */, int /* count */, char** /* names_return */ ); -extern char *XGetDefault( +X11API char *XGetDefault( Display* /* display */, _Xconst char* /* program */, _Xconst char* /* option */ ); -extern char *XDisplayName( +X11API char *XDisplayName( _Xconst char* /* string */ ); -extern char *XKeysymToString( +X11API char *XKeysymToString( KeySym /* keysym */ ); -extern int (*XSynchronize( +X11API int (*XSynchronize( Display* /* display */, Bool /* onoff */ ))( Display* /* display */ ); -extern int (*XSetAfterFunction( +X11API int (*XSetAfterFunction( Display* /* display */, int (*) ( Display* /* display */ @@ -1538,29 +1539,29 @@ extern int (*XSetAfterFunction( ))( Display* /* display */ ); -extern Atom XInternAtom( +X11API Atom X11APIENTRY XInternAtom( Display* /* display */, _Xconst char* /* atom_name */, Bool /* only_if_exists */ ); -extern Status XInternAtoms( +X11API Status X11APIENTRY XInternAtoms( Display* /* dpy */, char** /* names */, int /* count */, Bool /* onlyIfExists */, Atom* /* atoms_return */ ); -extern Colormap XCopyColormapAndFree( +X11API Colormap X11APIENTRY XCopyColormapAndFree( Display* /* display */, Colormap /* colormap */ ); -extern Colormap XCreateColormap( +X11API Colormap X11APIENTRY XCreateColormap( Display* /* display */, Window /* w */, Visual* /* visual */, int /* alloc */ ); -extern Cursor XCreatePixmapCursor( +X11API Cursor X11APIENTRY XCreatePixmapCursor( Display* /* display */, Pixmap /* source */, Pixmap /* mask */, @@ -1569,7 +1570,7 @@ extern Cursor XCreatePixmapCursor( unsigned int /* x */, unsigned int /* y */ ); -extern Cursor XCreateGlyphCursor( +X11API Cursor X11APIENTRY XCreateGlyphCursor( Display* /* display */, Font /* source_font */, Font /* mask_font */, @@ -1578,42 +1579,42 @@ extern Cursor XCreateGlyphCursor( XColor _Xconst * /* foreground_color */, XColor _Xconst * /* background_color */ ); -extern Cursor XCreateFontCursor( +X11API Cursor X11APIENTRY XCreateFontCursor( Display* /* display */, unsigned int /* shape */ ); -extern Font XLoadFont( +X11API Font X11APIENTRY XLoadFont( Display* /* display */, _Xconst char* /* name */ ); -extern GC XCreateGC( +X11API GC X11APIENTRY XCreateGC( Display* /* display */, Drawable /* d */, unsigned long /* valuemask */, XGCValues* /* values */ ); -extern GContext XGContextFromGC( +X11API GContext X11APIENTRY XGContextFromGC( GC /* gc */ ); -extern void XFlushGC( +X11API void X11APIENTRY XFlushGC( Display* /* display */, GC /* gc */ ); -extern Pixmap XCreatePixmap( +X11API Pixmap X11APIENTRY XCreatePixmap( Display* /* display */, Drawable /* d */, unsigned int /* width */, unsigned int /* height */, unsigned int /* depth */ ); -extern Pixmap XCreateBitmapFromData( +X11API Pixmap X11APIENTRY XCreateBitmapFromData( Display* /* display */, Drawable /* d */, _Xconst char* /* data */, unsigned int /* width */, unsigned int /* height */ ); -extern Pixmap XCreatePixmapFromBitmapData( +X11API Pixmap X11APIENTRY XCreatePixmapFromBitmapData( Display* /* display */, Drawable /* d */, char* /* data */, @@ -1623,7 +1624,7 @@ extern Pixmap XCreatePixmapFromBitmapDat unsigned long /* bg */, unsigned int /* depth */ ); -extern Window XCreateSimpleWindow( +X11API Window X11APIENTRY XCreateSimpleWindow( Display* /* display */, Window /* parent */, int /* x */, @@ -1634,11 +1635,11 @@ extern Window XCreateSimpleWindow( unsigned long /* border */, unsigned long /* background */ ); -extern Window XGetSelectionOwner( +X11API Window X11APIENTRY XGetSelectionOwner( Display* /* display */, Atom /* selection */ ); -extern Window XCreateWindow( +X11API Window X11APIENTRY XCreateWindow( Display* /* display */, Window /* parent */, int /* x */, @@ -1652,43 +1653,43 @@ extern Window XCreateWindow( unsigned long /* valuemask */, XSetWindowAttributes* /* attributes */ ); -extern Colormap *XListInstalledColormaps( +X11API Colormap *XListInstalledColormaps( Display* /* display */, Window /* w */, int* /* num_return */ ); -extern char **XListFonts( +X11API char **XListFonts( Display* /* display */, _Xconst char* /* pattern */, int /* maxnames */, int* /* actual_count_return */ ); -extern char **XListFontsWithInfo( +X11API char **XListFontsWithInfo( Display* /* display */, _Xconst char* /* pattern */, int /* maxnames */, int* /* count_return */, XFontStruct** /* info_return */ ); -extern char **XGetFontPath( +X11API char **XGetFontPath( Display* /* display */, int* /* npaths_return */ ); -extern char **XListExtensions( +X11API char **XListExtensions( Display* /* display */, int* /* nextensions_return */ ); -extern Atom *XListProperties( +X11API Atom *XListProperties( Display* /* display */, Window /* w */, int* /* num_prop_return */ ); -extern XHostAddress *XListHosts( +X11API XHostAddress *XListHosts( Display* /* display */, int* /* nhosts_return */, Bool* /* state_return */ ); -extern KeySym XKeycodeToKeysym( +X11API KeySym X11APIENTRY XKeycodeToKeysym( Display* /* display */, #if NeedWidePrototypes unsigned int /* keycode */, @@ -1697,11 +1698,11 @@ extern KeySym XKeycodeToKeysym( #endif int /* index */ ); -extern KeySym XLookupKeysym( +X11API KeySym X11APIENTRY XLookupKeysym( XKeyEvent* /* key_event */, int /* index */ ); -extern KeySym *XGetKeyboardMapping( +X11API KeySym *XGetKeyboardMapping( Display* /* display */, #if NeedWidePrototypes unsigned int /* first_keycode */, @@ -1711,136 +1712,136 @@ extern KeySym *XGetKeyboardMapping( int /* keycode_count */, int* /* keysyms_per_keycode_return */ ); -extern KeySym XStringToKeysym( +X11API KeySym X11APIENTRY XStringToKeysym( _Xconst char* /* string */ ); -extern long XMaxRequestSize( +X11API long X11APIENTRY XMaxRequestSize( Display* /* display */ ); -extern long XExtendedMaxRequestSize( +X11API long X11APIENTRY XExtendedMaxRequestSize( Display* /* display */ ); -extern char *XResourceManagerString( +X11API char *XResourceManagerString( Display* /* display */ ); -extern char *XScreenResourceString( +X11API char *XScreenResourceString( Screen* /* screen */ ); -extern unsigned long XDisplayMotionBufferSize( +X11API unsigned long X11APIENTRY XDisplayMotionBufferSize( Display* /* display */ ); -extern VisualID XVisualIDFromVisual( +X11API VisualID X11APIENTRY XVisualIDFromVisual( Visual* /* visual */ ); /* multithread routines */ -extern Status XInitThreads( +X11API Status X11APIENTRY XInitThreads( void ); -extern void XLockDisplay( +X11API void X11APIENTRY XLockDisplay( Display* /* display */ ); -extern void XUnlockDisplay( +X11API void X11APIENTRY XUnlockDisplay( Display* /* display */ ); /* routines for dealing with extensions */ -extern XExtCodes *XInitExtension( +X11API XExtCodes *XInitExtension( Display* /* display */, _Xconst char* /* name */ ); -extern XExtCodes *XAddExtension( +X11API XExtCodes *XAddExtension( Display* /* display */ ); -extern XExtData *XFindOnExtensionList( +X11API XExtData *XFindOnExtensionList( XExtData** /* structure */, int /* number */ ); -extern XExtData **XEHeadOfExtensionList( +X11API XExtData **XEHeadOfExtensionList( XEDataObject /* object */ ); /* these are routines for which there are also macros */ -extern Window XRootWindow( +X11API Window X11APIENTRY XRootWindow( Display* /* display */, int /* screen_number */ ); -extern Window XDefaultRootWindow( +X11API Window X11APIENTRY XDefaultRootWindow( Display* /* display */ ); -extern Window XRootWindowOfScreen( +X11API Window X11APIENTRY XRootWindowOfScreen( Screen* /* screen */ ); -extern Visual *XDefaultVisual( +X11API Visual *XDefaultVisual( Display* /* display */, int /* screen_number */ ); -extern Visual *XDefaultVisualOfScreen( +X11API Visual *XDefaultVisualOfScreen( Screen* /* screen */ ); -extern GC XDefaultGC( +X11API GC X11APIENTRY XDefaultGC( Display* /* display */, int /* screen_number */ ); -extern GC XDefaultGCOfScreen( +X11API GC X11APIENTRY XDefaultGCOfScreen( Screen* /* screen */ ); -extern unsigned long XBlackPixel( +X11API unsigned long X11APIENTRY XBlackPixel( Display* /* display */, int /* screen_number */ ); -extern unsigned long XWhitePixel( +X11API unsigned long X11APIENTRY XWhitePixel( Display* /* display */, int /* screen_number */ ); -extern unsigned long XAllPlanes( +X11API unsigned long X11APIENTRY XAllPlanes( void ); -extern unsigned long XBlackPixelOfScreen( +X11API unsigned long X11APIENTRY XBlackPixelOfScreen( Screen* /* screen */ ); -extern unsigned long XWhitePixelOfScreen( +X11API unsigned long X11APIENTRY XWhitePixelOfScreen( Screen* /* screen */ ); -extern unsigned long XNextRequest( +X11API unsigned long X11APIENTRY XNextRequest( Display* /* display */ ); -extern unsigned long XLastKnownRequestProcessed( +X11API unsigned long X11APIENTRY XLastKnownRequestProcessed( Display* /* display */ ); -extern char *XServerVendor( +X11API char *XServerVendor( Display* /* display */ ); -extern char *XDisplayString( +X11API char *XDisplayString( Display* /* display */ ); -extern Colormap XDefaultColormap( +X11API Colormap X11APIENTRY XDefaultColormap( Display* /* display */, int /* screen_number */ ); -extern Colormap XDefaultColormapOfScreen( +X11API Colormap X11APIENTRY XDefaultColormapOfScreen( Screen* /* screen */ ); -extern Display *XDisplayOfScreen( +X11API Display *XDisplayOfScreen( Screen* /* screen */ ); -extern Screen *XScreenOfDisplay( +X11API Screen *XScreenOfDisplay( Display* /* display */, int /* screen_number */ ); -extern Screen *XDefaultScreenOfDisplay( +X11API Screen *XDefaultScreenOfDisplay( Display* /* display */ ); -extern long XEventMaskOfScreen( +X11API long X11APIENTRY XEventMaskOfScreen( Screen* /* screen */ ); -extern int XScreenNumberOfScreen( +X11API int X11APIENTRY XScreenNumberOfScreen( Screen* /* screen */ ); @@ -1849,7 +1850,7 @@ typedef int (*XErrorHandler) ( /* WA XErrorEvent* /* error_event */ ); -extern XErrorHandler XSetErrorHandler ( +X11API XErrorHandler XSetErrorHandler ( XErrorHandler /* handler */ ); @@ -1858,16 +1859,16 @@ typedef int (*XIOErrorHandler) ( /* W Display* /* display */ ); -extern XIOErrorHandler XSetIOErrorHandler ( +X11API XIOErrorHandler XSetIOErrorHandler ( XIOErrorHandler /* handler */ ); -extern XPixmapFormatValues *XListPixmapFormats( +X11API XPixmapFormatValues *XListPixmapFormats( Display* /* display */, int* /* count_return */ ); -extern int *XListDepths( +X11API int *XListDepths( Display* /* display */, int /* screen_number */, int* /* count_return */ @@ -1875,7 +1876,7 @@ extern int *XListDepths( /* ICCCM routines for things that don't require special include files; */ /* other declarations are given in Xutil.h */ -extern Status XReconfigureWMWindow( +X11API Status X11APIENTRY XReconfigureWMWindow( Display* /* display */, Window /* w */, int /* screen_number */, @@ -1883,50 +1884,50 @@ extern Status XReconfigureWMWindow( XWindowChanges* /* changes */ ); -extern Status XGetWMProtocols( +X11API Status X11APIENTRY XGetWMProtocols( Display* /* display */, Window /* w */, Atom** /* protocols_return */, int* /* count_return */ ); -extern Status XSetWMProtocols( +X11API Status X11APIENTRY XSetWMProtocols( Display* /* display */, Window /* w */, Atom* /* protocols */, int /* count */ ); -extern Status XIconifyWindow( +X11API Status X11APIENTRY XIconifyWindow( Display* /* display */, Window /* w */, int /* screen_number */ ); -extern Status XWithdrawWindow( +X11API Status X11APIENTRY XWithdrawWindow( Display* /* display */, Window /* w */, int /* screen_number */ ); -extern Status XGetCommand( +X11API Status X11APIENTRY XGetCommand( Display* /* display */, Window /* w */, char*** /* argv_return */, int* /* argc_return */ ); -extern Status XGetWMColormapWindows( +X11API Status X11APIENTRY XGetWMColormapWindows( Display* /* display */, Window /* w */, Window** /* windows_return */, int* /* count_return */ ); -extern Status XSetWMColormapWindows( +X11API Status X11APIENTRY XSetWMColormapWindows( Display* /* display */, Window /* w */, Window* /* colormap_windows */, int /* count */ ); -extern void XFreeStringList( +X11API void X11APIENTRY XFreeStringList( char** /* list */ ); -extern int XSetTransientForHint( +X11API int X11APIENTRY XSetTransientForHint( Display* /* display */, Window /* w */, Window /* prop_window */ @@ -1934,38 +1935,38 @@ extern int XSetTransientForHint( /* The following are given in alphabetical order */ -extern int XActivateScreenSaver( +X11API int X11APIENTRY XActivateScreenSaver( Display* /* display */ ); -extern int XAddHost( +X11API int X11APIENTRY XAddHost( Display* /* display */, XHostAddress* /* host */ ); -extern int XAddHosts( +X11API int X11APIENTRY XAddHosts( Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ ); -extern int XAddToExtensionList( +X11API int X11APIENTRY XAddToExtensionList( struct _XExtData** /* structure */, XExtData* /* ext_data */ ); -extern int XAddToSaveSet( +X11API int X11APIENTRY XAddToSaveSet( Display* /* display */, Window /* w */ ); -extern Status XAllocColor( +X11API Status X11APIENTRY XAllocColor( Display* /* display */, Colormap /* colormap */, XColor* /* screen_in_out */ ); -extern Status XAllocColorCells( +X11API Status X11APIENTRY XAllocColorCells( Display* /* display */, Colormap /* colormap */, Bool /* contig */, @@ -1975,7 +1976,7 @@ extern Status XAllocColorCells( unsigned int /* npixels */ ); -extern Status XAllocColorPlanes( +X11API Status X11APIENTRY XAllocColorPlanes( Display* /* display */, Colormap /* colormap */, Bool /* contig */, @@ -1989,7 +1990,7 @@ extern Status XAllocColorPlanes( unsigned long* /* bmask_return */ ); -extern Status XAllocNamedColor( +X11API Status X11APIENTRY XAllocNamedColor( Display* /* display */, Colormap /* colormap */, _Xconst char* /* color_name */, @@ -1997,62 +1998,62 @@ extern Status XAllocNamedColor( XColor* /* exact_def_return */ ); -extern int XAllowEvents( +X11API int X11APIENTRY XAllowEvents( Display* /* display */, int /* event_mode */, Time /* time */ ); -extern int XAutoRepeatOff( +X11API int X11APIENTRY XAutoRepeatOff( Display* /* display */ ); -extern int XAutoRepeatOn( +X11API int X11APIENTRY XAutoRepeatOn( Display* /* display */ ); -extern int XBell( +X11API int X11APIENTRY XBell( Display* /* display */, int /* percent */ ); -extern int XBitmapBitOrder( +X11API int X11APIENTRY XBitmapBitOrder( Display* /* display */ ); -extern int XBitmapPad( +X11API int X11APIENTRY XBitmapPad( Display* /* display */ ); -extern int XBitmapUnit( +X11API int X11APIENTRY XBitmapUnit( Display* /* display */ ); -extern int XCellsOfScreen( +X11API int X11APIENTRY XCellsOfScreen( Screen* /* screen */ ); -extern int XChangeActivePointerGrab( +X11API int X11APIENTRY XChangeActivePointerGrab( Display* /* display */, unsigned int /* event_mask */, Cursor /* cursor */, Time /* time */ ); -extern int XChangeGC( +X11API int X11APIENTRY XChangeGC( Display* /* display */, GC /* gc */, unsigned long /* valuemask */, XGCValues* /* values */ ); -extern int XChangeKeyboardControl( +X11API int X11APIENTRY XChangeKeyboardControl( Display* /* display */, unsigned long /* value_mask */, XKeyboardControl* /* values */ ); -extern int XChangeKeyboardMapping( +X11API int X11APIENTRY XChangeKeyboardMapping( Display* /* display */, int /* first_keycode */, int /* keysyms_per_keycode */, @@ -2060,7 +2061,7 @@ extern int XChangeKeyboardMapping( int /* num_codes */ ); -extern int XChangePointerControl( +X11API int X11APIENTRY XChangePointerControl( Display* /* display */, Bool /* do_accel */, Bool /* do_threshold */, @@ -2069,7 +2070,7 @@ extern int XChangePointerControl( int /* threshold */ ); -extern int XChangeProperty( +X11API int X11APIENTRY XChangeProperty( Display* /* display */, Window /* w */, Atom /* property */, @@ -2080,20 +2081,20 @@ extern int XChangeProperty( int /* nelements */ ); -extern int XChangeSaveSet( +X11API int X11APIENTRY XChangeSaveSet( Display* /* display */, Window /* w */, int /* change_mode */ ); -extern int XChangeWindowAttributes( +X11API int X11APIENTRY XChangeWindowAttributes( Display* /* display */, Window /* w */, unsigned long /* valuemask */, XSetWindowAttributes* /* attributes */ ); -extern Bool XCheckIfEvent( +X11API Bool X11APIENTRY XCheckIfEvent( Display* /* display */, XEvent* /* event_return */, Bool (*) ( @@ -2104,49 +2105,49 @@ extern Bool XCheckIfEvent( XPointer /* arg */ ); -extern Bool XCheckMaskEvent( +X11API Bool X11APIENTRY XCheckMaskEvent( Display* /* display */, long /* event_mask */, XEvent* /* event_return */ ); -extern Bool XCheckTypedEvent( +X11API Bool X11APIENTRY XCheckTypedEvent( Display* /* display */, int /* event_type */, XEvent* /* event_return */ ); -extern Bool XCheckTypedWindowEvent( +X11API Bool X11APIENTRY XCheckTypedWindowEvent( Display* /* display */, Window /* w */, int /* event_type */, XEvent* /* event_return */ ); -extern Bool XCheckWindowEvent( +X11API Bool X11APIENTRY XCheckWindowEvent( Display* /* display */, Window /* w */, long /* event_mask */, XEvent* /* event_return */ ); -extern int XCirculateSubwindows( +X11API int X11APIENTRY XCirculateSubwindows( Display* /* display */, Window /* w */, int /* direction */ ); -extern int XCirculateSubwindowsDown( +X11API int X11APIENTRY XCirculateSubwindowsDown( Display* /* display */, Window /* w */ ); -extern int XCirculateSubwindowsUp( +X11API int X11APIENTRY XCirculateSubwindowsUp( Display* /* display */, Window /* w */ ); -extern int XClearArea( +X11API int X11APIENTRY XClearArea( Display* /* display */, Window /* w */, int /* x */, @@ -2156,27 +2157,27 @@ extern int XClearArea( Bool /* exposures */ ); -extern int XClearWindow( +X11API int X11APIENTRY XClearWindow( Display* /* display */, Window /* w */ ); -extern int XCloseDisplay( +X11API int X11APIENTRY XCloseDisplay( Display* /* display */ ); -extern int XConfigureWindow( +X11API int X11APIENTRY XConfigureWindow( Display* /* display */, Window /* w */, unsigned int /* value_mask */, XWindowChanges* /* values */ ); -extern int XConnectionNumber( +X11API int X11APIENTRY XConnectionNumber( Display* /* display */ ); -extern int XConvertSelection( +X11API int X11APIENTRY XConvertSelection( Display* /* display */, Atom /* selection */, Atom /* target */, @@ -2185,7 +2186,7 @@ extern int XConvertSelection( Time /* time */ ); -extern int XCopyArea( +X11API int X11APIENTRY XCopyArea( Display* /* display */, Drawable /* src */, Drawable /* dest */, @@ -2198,14 +2199,14 @@ extern int XCopyArea( int /* dest_y */ ); -extern int XCopyGC( +X11API int X11APIENTRY XCopyGC( Display* /* display */, GC /* src */, unsigned long /* valuemask */, GC /* dest */ ); -extern int XCopyPlane( +X11API int X11APIENTRY XCopyPlane( Display* /* display */, Drawable /* src */, Drawable /* dest */, @@ -2219,91 +2220,91 @@ extern int XCopyPlane( unsigned long /* plane */ ); -extern int XDefaultDepth( +X11API int X11APIENTRY XDefaultDepth( Display* /* display */, int /* screen_number */ ); -extern int XDefaultDepthOfScreen( +X11API int X11APIENTRY XDefaultDepthOfScreen( Screen* /* screen */ ); -extern int XDefaultScreen( +X11API int X11APIENTRY XDefaultScreen( Display* /* display */ ); -extern int XDefineCursor( +X11API int X11APIENTRY XDefineCursor( Display* /* display */, Window /* w */, Cursor /* cursor */ ); -extern int XDeleteProperty( +X11API int X11APIENTRY XDeleteProperty( Display* /* display */, Window /* w */, Atom /* property */ ); -extern int XDestroyWindow( +X11API int X11APIENTRY XDestroyWindow( Display* /* display */, Window /* w */ ); -extern int XDestroySubwindows( +X11API int X11APIENTRY XDestroySubwindows( Display* /* display */, Window /* w */ ); -extern int XDoesBackingStore( +X11API int X11APIENTRY XDoesBackingStore( Screen* /* screen */ ); -extern Bool XDoesSaveUnders( +X11API Bool X11APIENTRY XDoesSaveUnders( Screen* /* screen */ ); -extern int XDisableAccessControl( +X11API int X11APIENTRY XDisableAccessControl( Display* /* display */ ); -extern int XDisplayCells( +X11API int X11APIENTRY XDisplayCells( Display* /* display */, int /* screen_number */ ); -extern int XDisplayHeight( +X11API int X11APIENTRY XDisplayHeight( Display* /* display */, int /* screen_number */ ); -extern int XDisplayHeightMM( +X11API int X11APIENTRY XDisplayHeightMM( Display* /* display */, int /* screen_number */ ); -extern int XDisplayKeycodes( +X11API int X11APIENTRY XDisplayKeycodes( Display* /* display */, int* /* min_keycodes_return */, int* /* max_keycodes_return */ ); -extern int XDisplayPlanes( +X11API int X11APIENTRY XDisplayPlanes( Display* /* display */, int /* screen_number */ ); -extern int XDisplayWidth( +X11API int X11APIENTRY XDisplayWidth( Display* /* display */, int /* screen_number */ ); -extern int XDisplayWidthMM( +X11API int X11APIENTRY XDisplayWidthMM( Display* /* display */, int /* screen_number */ ); -extern int XDrawArc( +X11API int X11APIENTRY XDrawArc( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2315,7 +2316,7 @@ extern int XDrawArc( int /* angle2 */ ); -extern int XDrawArcs( +X11API int X11APIENTRY XDrawArcs( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2323,7 +2324,7 @@ extern int XDrawArcs( int /* narcs */ ); -extern int XDrawImageString( +X11API int X11APIENTRY XDrawImageString( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2333,7 +2334,7 @@ extern int XDrawImageString( int /* length */ ); -extern int XDrawImageString16( +X11API int XDrawImageString16( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2343,7 +2344,7 @@ extern int XDrawImageString16( int /* length */ ); -extern int XDrawLine( +X11API int X11APIENTRY XDrawLine( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2353,7 +2354,7 @@ extern int XDrawLine( int /* y2 */ ); -extern int XDrawLines( +X11API int X11APIENTRY XDrawLines( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2362,7 +2363,7 @@ extern int XDrawLines( int /* mode */ ); -extern int XDrawPoint( +X11API int X11APIENTRY XDrawPoint( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2370,7 +2371,7 @@ extern int XDrawPoint( int /* y */ ); -extern int XDrawPoints( +X11API int X11APIENTRY XDrawPoints( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2379,7 +2380,7 @@ extern int XDrawPoints( int /* mode */ ); -extern int XDrawRectangle( +X11API int X11APIENTRY XDrawRectangle( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2389,7 +2390,7 @@ extern int XDrawRectangle( unsigned int /* height */ ); -extern int XDrawRectangles( +X11API int X11APIENTRY XDrawRectangles( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2397,7 +2398,7 @@ extern int XDrawRectangles( int /* nrectangles */ ); -extern int XDrawSegments( +X11API int X11APIENTRY XDrawSegments( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2405,7 +2406,7 @@ extern int XDrawSegments( int /* nsegments */ ); -extern int XDrawString( +X11API int X11APIENTRY XDrawString( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2415,7 +2416,7 @@ extern int XDrawString( int /* length */ ); -extern int XDrawString16( +X11API int XDrawString16( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2425,7 +2426,7 @@ extern int XDrawString16( int /* length */ ); -extern int XDrawText( +X11API int X11APIENTRY XDrawText( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2435,7 +2436,7 @@ extern int XDrawText( int /* nitems */ ); -extern int XDrawText16( +X11API int XDrawText16( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2445,22 +2446,22 @@ extern int XDrawText16( int /* nitems */ ); -extern int XEnableAccessControl( +X11API int X11APIENTRY XEnableAccessControl( Display* /* display */ ); -extern int XEventsQueued( +X11API int X11APIENTRY XEventsQueued( Display* /* display */, int /* mode */ ); -extern Status XFetchName( +X11API Status X11APIENTRY XFetchName( Display* /* display */, Window /* w */, char** /* window_name_return */ ); -extern int XFillArc( +X11API int X11APIENTRY XFillArc( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2472,7 +2473,7 @@ extern int XFillArc( int /* angle2 */ ); -extern int XFillArcs( +X11API int X11APIENTRY XFillArcs( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2480,7 +2481,7 @@ extern int XFillArcs( int /* narcs */ ); -extern int XFillPolygon( +X11API int X11APIENTRY XFillPolygon( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2490,7 +2491,7 @@ extern int XFillPolygon( int /* mode */ ); -extern int XFillRectangle( +X11API int X11APIENTRY XFillRectangle( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2500,7 +2501,7 @@ extern int XFillRectangle( unsigned int /* height */ ); -extern int XFillRectangles( +X11API int X11APIENTRY XFillRectangles( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2508,25 +2509,25 @@ extern int XFillRectangles( int /* nrectangles */ ); -extern int XFlush( +X11API int X11APIENTRY XFlush( Display* /* display */ ); -extern int XForceScreenSaver( +X11API int X11APIENTRY XForceScreenSaver( Display* /* display */, int /* mode */ ); -extern int XFree( +X11API int X11APIENTRY XFree( void* /* data */ ); -extern int XFreeColormap( +X11API int X11APIENTRY XFreeColormap( Display* /* display */, Colormap /* colormap */ ); -extern int XFreeColors( +X11API int X11APIENTRY XFreeColors( Display* /* display */, Colormap /* colormap */, unsigned long* /* pixels */, @@ -2534,49 +2535,49 @@ extern int XFreeColors( unsigned long /* planes */ ); -extern int XFreeCursor( +X11API int X11APIENTRY XFreeCursor( Display* /* display */, Cursor /* cursor */ ); -extern int XFreeExtensionList( +X11API int X11APIENTRY XFreeExtensionList( char** /* list */ ); -extern int XFreeFont( +X11API int X11APIENTRY XFreeFont( Display* /* display */, XFontStruct* /* font_struct */ ); -extern int XFreeFontInfo( +X11API int X11APIENTRY XFreeFontInfo( char** /* names */, XFontStruct* /* free_info */, int /* actual_count */ ); -extern int XFreeFontNames( +X11API int X11APIENTRY XFreeFontNames( char** /* list */ ); -extern int XFreeFontPath( +X11API int X11APIENTRY XFreeFontPath( char** /* list */ ); -extern int XFreeGC( +X11API int X11APIENTRY XFreeGC( Display* /* display */, GC /* gc */ ); -extern int XFreeModifiermap( +X11API int X11APIENTRY XFreeModifiermap( XModifierKeymap* /* modmap */ ); -extern int XFreePixmap( +X11API int X11APIENTRY XFreePixmap( Display* /* display */, Pixmap /* pixmap */ ); -extern int XGeometry( +X11API int X11APIENTRY XGeometry( Display* /* display */, int /* screen */, _Xconst char* /* position */, @@ -2592,7 +2593,7 @@ extern int XGeometry( int* /* height_return */ ); -extern int XGetErrorDatabaseText( +X11API int X11APIENTRY XGetErrorDatabaseText( Display* /* display */, _Xconst char* /* name */, _Xconst char* /* message */, @@ -2601,27 +2602,27 @@ extern int XGetErrorDatabaseText( int /* length */ ); -extern int XGetErrorText( +X11API int X11APIENTRY XGetErrorText( Display* /* display */, int /* code */, char* /* buffer_return */, int /* length */ ); -extern Bool XGetFontProperty( +X11API Bool X11APIENTRY XGetFontProperty( XFontStruct* /* font_struct */, Atom /* atom */, unsigned long* /* value_return */ ); -extern Status XGetGCValues( +X11API Status X11APIENTRY XGetGCValues( Display* /* display */, GC /* gc */, unsigned long /* valuemask */, XGCValues* /* values_return */ ); -extern Status XGetGeometry( +X11API Status X11APIENTRY XGetGeometry( Display* /* display */, Drawable /* d */, Window* /* root_return */, @@ -2633,37 +2634,37 @@ extern Status XGetGeometry( unsigned int* /* depth_return */ ); -extern Status XGetIconName( +X11API Status X11APIENTRY XGetIconName( Display* /* display */, Window /* w */, char** /* icon_name_return */ ); -extern int XGetInputFocus( +X11API int X11APIENTRY XGetInputFocus( Display* /* display */, Window* /* focus_return */, int* /* revert_to_return */ ); -extern int XGetKeyboardControl( +X11API int X11APIENTRY XGetKeyboardControl( Display* /* display */, XKeyboardState* /* values_return */ ); -extern int XGetPointerControl( +X11API int X11APIENTRY XGetPointerControl( Display* /* display */, int* /* accel_numerator_return */, int* /* accel_denominator_return */, int* /* threshold_return */ ); -extern int XGetPointerMapping( +X11API int X11APIENTRY XGetPointerMapping( Display* /* display */, unsigned char* /* map_return */, int /* nmap */ ); -extern int XGetScreenSaver( +X11API int X11APIENTRY XGetScreenSaver( Display* /* display */, int* /* timeout_return */, int* /* interval_return */, @@ -2671,13 +2672,13 @@ extern int XGetScreenSaver( int* /* allow_exposures_return */ ); -extern Status XGetTransientForHint( +X11API Status X11APIENTRY XGetTransientForHint( Display* /* display */, Window /* w */, Window* /* prop_window_return */ ); -extern int XGetWindowProperty( +X11API int X11APIENTRY XGetWindowProperty( Display* /* display */, Window /* w */, Atom /* property */, @@ -2692,13 +2693,13 @@ extern int XGetWindowProperty( unsigned char** /* prop_return */ ); -extern Status XGetWindowAttributes( +X11API Status X11APIENTRY XGetWindowAttributes( Display* /* display */, Window /* w */, XWindowAttributes* /* window_attributes_return */ ); -extern int XGrabButton( +X11API int X11APIENTRY XGrabButton( Display* /* display */, unsigned int /* button */, unsigned int /* modifiers */, @@ -2711,7 +2712,7 @@ extern int XGrabButton( Cursor /* cursor */ ); -extern int XGrabKey( +X11API int X11APIENTRY XGrabKey( Display* /* display */, int /* keycode */, unsigned int /* modifiers */, @@ -2721,7 +2722,7 @@ extern int XGrabKey( int /* keyboard_mode */ ); -extern int XGrabKeyboard( +X11API int X11APIENTRY XGrabKeyboard( Display* /* display */, Window /* grab_window */, Bool /* owner_events */, @@ -2730,7 +2731,7 @@ extern int XGrabKeyboard( Time /* time */ ); -extern int XGrabPointer( +X11API int X11APIENTRY XGrabPointer( Display* /* display */, Window /* grab_window */, Bool /* owner_events */, @@ -2742,19 +2743,19 @@ extern int XGrabPointer( Time /* time */ ); -extern int XGrabServer( +X11API int X11APIENTRY XGrabServer( Display* /* display */ ); -extern int XHeightMMOfScreen( +X11API int X11APIENTRY XHeightMMOfScreen( Screen* /* screen */ ); -extern int XHeightOfScreen( +X11API int X11APIENTRY XHeightOfScreen( Screen* /* screen */ ); -extern int XIfEvent( +X11API int X11APIENTRY XIfEvent( Display* /* display */, XEvent* /* event_return */, Bool (*) ( @@ -2765,26 +2766,26 @@ extern int XIfEvent( XPointer /* arg */ ); -extern int XImageByteOrder( +X11API int X11APIENTRY XImageByteOrder( Display* /* display */ ); -extern int XInstallColormap( +X11API int X11APIENTRY XInstallColormap( Display* /* display */, Colormap /* colormap */ ); -extern KeyCode XKeysymToKeycode( +X11API KeyCode X11APIENTRY XKeysymToKeycode( Display* /* display */, KeySym /* keysym */ ); -extern int XKillClient( +X11API int X11APIENTRY XKillClient( Display* /* display */, XID /* resource */ ); -extern Status XLookupColor( +X11API Status X11APIENTRY XLookupColor( Display* /* display */, Colormap /* colormap */, _Xconst char* /* color_name */, @@ -2792,41 +2793,41 @@ extern Status XLookupColor( XColor* /* screen_def_return */ ); -extern int XLowerWindow( +X11API int X11APIENTRY XLowerWindow( Display* /* display */, Window /* w */ ); -extern int XMapRaised( +X11API int X11APIENTRY XMapRaised( Display* /* display */, Window /* w */ ); -extern int XMapSubwindows( +X11API int X11APIENTRY XMapSubwindows( Display* /* display */, Window /* w */ ); -extern int XMapWindow( +X11API int X11APIENTRY XMapWindow( Display* /* display */, Window /* w */ ); -extern int XMaskEvent( +X11API int X11APIENTRY XMaskEvent( Display* /* display */, long /* event_mask */, XEvent* /* event_return */ ); -extern int XMaxCmapsOfScreen( +X11API int X11APIENTRY XMaxCmapsOfScreen( Screen* /* screen */ ); -extern int XMinCmapsOfScreen( +X11API int X11APIENTRY XMinCmapsOfScreen( Screen* /* screen */ ); -extern int XMoveResizeWindow( +X11API int X11APIENTRY XMoveResizeWindow( Display* /* display */, Window /* w */, int /* x */, @@ -2835,30 +2836,30 @@ extern int XMoveResizeWindow( unsigned int /* height */ ); -extern int XMoveWindow( +X11API int X11APIENTRY XMoveWindow( Display* /* display */, Window /* w */, int /* x */, int /* y */ ); -extern int XNextEvent( +X11API int X11APIENTRY XNextEvent( Display* /* display */, XEvent* /* event_return */ ); -extern int XNoOp( +X11API int X11APIENTRY XNoOp( Display* /* display */ ); -extern Status XParseColor( +X11API Status X11APIENTRY XParseColor( Display* /* display */, Colormap /* colormap */, _Xconst char* /* spec */, XColor* /* exact_def_return */ ); -extern int XParseGeometry( +X11API int X11APIENTRY XParseGeometry( _Xconst char* /* parsestring */, int* /* x_return */, int* /* y_return */, @@ -2866,12 +2867,12 @@ extern int XParseGeometry( unsigned int* /* height_return */ ); -extern int XPeekEvent( +X11API int X11APIENTRY XPeekEvent( Display* /* display */, XEvent* /* event_return */ ); -extern int XPeekIfEvent( +X11API int X11APIENTRY XPeekIfEvent( Display* /* display */, XEvent* /* event_return */, Bool (*) ( @@ -2882,29 +2883,29 @@ extern int XPeekIfEvent( XPointer /* arg */ ); -extern int XPending( +X11API int X11APIENTRY XPending( Display* /* display */ ); -extern int XPlanesOfScreen( +X11API int X11APIENTRY XPlanesOfScreen( Screen* /* screen */ ); -extern int XProtocolRevision( +X11API int X11APIENTRY XProtocolRevision( Display* /* display */ ); -extern int XProtocolVersion( +X11API int X11APIENTRY XProtocolVersion( Display* /* display */ ); -extern int XPutBackEvent( +X11API int X11APIENTRY XPutBackEvent( Display* /* display */, XEvent* /* event */ ); -extern int XPutImage( +X11API int X11APIENTRY XPutImage( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2917,11 +2918,11 @@ extern int XPutImage( unsigned int /* height */ ); -extern int XQLength( +X11API int X11APIENTRY XQLength( Display* /* display */ ); -extern Status XQueryBestCursor( +X11API Status X11APIENTRY XQueryBestCursor( Display* /* display */, Drawable /* d */, unsigned int /* width */, @@ -2930,7 +2931,7 @@ extern Status XQueryBestCursor( unsigned int* /* height_return */ ); -extern Status XQueryBestSize( +X11API Status X11APIENTRY XQueryBestSize( Display* /* display */, int /* class */, Drawable /* which_screen */, @@ -2940,7 +2941,7 @@ extern Status XQueryBestSize( unsigned int* /* height_return */ ); -extern Status XQueryBestStipple( +X11API Status X11APIENTRY XQueryBestStipple( Display* /* display */, Drawable /* which_screen */, unsigned int /* width */, @@ -2949,7 +2950,7 @@ extern Status XQueryBestStipple( unsigned int* /* height_return */ ); -extern Status XQueryBestTile( +X11API Status X11APIENTRY XQueryBestTile( Display* /* display */, Drawable /* which_screen */, unsigned int /* width */, @@ -2958,20 +2959,20 @@ extern Status XQueryBestTile( unsigned int* /* height_return */ ); -extern int XQueryColor( +X11API int X11APIENTRY XQueryColor( Display* /* display */, Colormap /* colormap */, XColor* /* def_in_out */ ); -extern int XQueryColors( +X11API int X11APIENTRY XQueryColors( Display* /* display */, Colormap /* colormap */, XColor* /* defs_in_out */, int /* ncolors */ ); -extern Bool XQueryExtension( +X11API Bool X11APIENTRY XQueryExtension( Display* /* display */, _Xconst char* /* name */, int* /* major_opcode_return */, @@ -2979,12 +2980,12 @@ extern Bool XQueryExtension( int* /* first_error_return */ ); -extern int XQueryKeymap( +X11API int X11APIENTRY XQueryKeymap( Display* /* display */, char [32] /* keys_return */ ); -extern Bool XQueryPointer( +X11API Bool X11APIENTRY XQueryPointer( Display* /* display */, Window /* w */, Window* /* root_return */, @@ -2996,7 +2997,7 @@ extern Bool XQueryPointer( unsigned int* /* mask_return */ ); -extern int XQueryTextExtents( +X11API int X11APIENTRY XQueryTextExtents( Display* /* display */, XID /* font_ID */, _Xconst char* /* string */, @@ -3007,7 +3008,7 @@ extern int XQueryTextExtents( XCharStruct* /* overall_return */ ); -extern int XQueryTextExtents16( +X11API int XQueryTextExtents16( Display* /* display */, XID /* font_ID */, _Xconst XChar2b* /* string */, @@ -3018,7 +3019,7 @@ extern int XQueryTextExtents16( XCharStruct* /* overall_return */ ); -extern Status XQueryTree( +X11API Status X11APIENTRY XQueryTree( Display* /* display */, Window /* w */, Window* /* root_return */, @@ -3027,12 +3028,12 @@ extern Status XQueryTree( unsigned int* /* nchildren_return */ ); -extern int XRaiseWindow( +X11API int X11APIENTRY XRaiseWindow( Display* /* display */, Window /* w */ ); -extern int XReadBitmapFile( +X11API int X11APIENTRY XReadBitmapFile( Display* /* display */, Drawable /* d */, _Xconst char* /* filename */, @@ -3043,7 +3044,7 @@ extern int XReadBitmapFile( int* /* y_hot_return */ ); -extern int XReadBitmapFileData( +X11API int X11APIENTRY XReadBitmapFileData( _Xconst char* /* filename */, unsigned int* /* width_return */, unsigned int* /* height_return */, @@ -3052,7 +3053,7 @@ extern int XReadBitmapFileData( int* /* y_hot_return */ ); -extern int XRebindKeysym( +X11API int X11APIENTRY XRebindKeysym( Display* /* display */, KeySym /* keysym */, KeySym* /* list */, @@ -3061,34 +3062,34 @@ extern int XRebindKeysym( int /* bytes_string */ ); -extern int XRecolorCursor( +X11API int X11APIENTRY XRecolorCursor( Display* /* display */, Cursor /* cursor */, XColor* /* foreground_color */, XColor* /* background_color */ ); -extern int XRefreshKeyboardMapping( +X11API int X11APIENTRY XRefreshKeyboardMapping( XMappingEvent* /* event_map */ ); -extern int XRemoveFromSaveSet( +X11API int X11APIENTRY XRemoveFromSaveSet( Display* /* display */, Window /* w */ ); -extern int XRemoveHost( +X11API int X11APIENTRY XRemoveHost( Display* /* display */, XHostAddress* /* host */ ); -extern int XRemoveHosts( +X11API int X11APIENTRY XRemoveHosts( Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ ); -extern int XReparentWindow( +X11API int X11APIENTRY XReparentWindow( Display* /* display */, Window /* w */, Window /* parent */, @@ -3096,29 +3097,29 @@ extern int XReparentWindow( int /* y */ ); -extern int XResetScreenSaver( +X11API int X11APIENTRY XResetScreenSaver( Display* /* display */ ); -extern int XResizeWindow( +X11API int X11APIENTRY XResizeWindow( Display* /* display */, Window /* w */, unsigned int /* width */, unsigned int /* height */ ); -extern int XRestackWindows( +X11API int X11APIENTRY XRestackWindows( Display* /* display */, Window* /* windows */, int /* nwindows */ ); -extern int XRotateBuffers( +X11API int X11APIENTRY XRotateBuffers( Display* /* display */, int /* rotate */ ); -extern int XRotateWindowProperties( +X11API int X11APIENTRY XRotateWindowProperties( Display* /* display */, Window /* w */, Atom* /* properties */, @@ -3126,17 +3127,17 @@ extern int XRotateWindowProperties( int /* npositions */ ); -extern int XScreenCount( +X11API int X11APIENTRY XScreenCount( Display* /* display */ ); -extern int XSelectInput( +X11API int X11APIENTRY XSelectInput( Display* /* display */, Window /* w */, long /* event_mask */ ); -extern Status XSendEvent( +X11API Status X11APIENTRY XSendEvent( Display* /* display */, Window /* w */, Bool /* propagate */, @@ -3144,37 +3145,37 @@ extern Status XSendEvent( XEvent* /* event_send */ ); -extern int XSetAccessControl( +X11API int X11APIENTRY XSetAccessControl( Display* /* display */, int /* mode */ ); -extern int XSetArcMode( +X11API int X11APIENTRY XSetArcMode( Display* /* display */, GC /* gc */, int /* arc_mode */ ); -extern int XSetBackground( +X11API int X11APIENTRY XSetBackground( Display* /* display */, GC /* gc */, unsigned long /* background */ ); -extern int XSetClipMask( +X11API int X11APIENTRY XSetClipMask( Display* /* display */, GC /* gc */, Pixmap /* pixmap */ ); -extern int XSetClipOrigin( +X11API int X11APIENTRY XSetClipOrigin( Display* /* display */, GC /* gc */, int /* clip_x_origin */, int /* clip_y_origin */ ); -extern int XSetClipRectangles( +X11API int X11APIENTRY XSetClipRectangles( Display* /* display */, GC /* gc */, int /* clip_x_origin */, @@ -3184,19 +3185,19 @@ extern int XSetClipRectangles( int /* ordering */ ); -extern int XSetCloseDownMode( +X11API int X11APIENTRY XSetCloseDownMode( Display* /* display */, int /* close_mode */ ); -extern int XSetCommand( +X11API int X11APIENTRY XSetCommand( Display* /* display */, Window /* w */, char** /* argv */, int /* argc */ ); -extern int XSetDashes( +X11API int X11APIENTRY XSetDashes( Display* /* display */, GC /* gc */, int /* dash_offset */, @@ -3204,62 +3205,62 @@ extern int XSetDashes( int /* n */ ); -extern int XSetFillRule( +X11API int X11APIENTRY XSetFillRule( Display* /* display */, GC /* gc */, int /* fill_rule */ ); -extern int XSetFillStyle( +X11API int X11APIENTRY XSetFillStyle( Display* /* display */, GC /* gc */, int /* fill_style */ ); -extern int XSetFont( +X11API int X11APIENTRY XSetFont( Display* /* display */, GC /* gc */, Font /* font */ ); -extern int XSetFontPath( +X11API int X11APIENTRY XSetFontPath( Display* /* display */, char** /* directories */, int /* ndirs */ ); -extern int XSetForeground( +X11API int X11APIENTRY XSetForeground( Display* /* display */, GC /* gc */, unsigned long /* foreground */ ); -extern int XSetFunction( +X11API int X11APIENTRY XSetFunction( Display* /* display */, GC /* gc */, int /* function */ ); -extern int XSetGraphicsExposures( +X11API int X11APIENTRY XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */ ); -extern int XSetIconName( +X11API int X11APIENTRY XSetIconName( Display* /* display */, Window /* w */, _Xconst char* /* icon_name */ ); -extern int XSetInputFocus( +X11API int X11APIENTRY XSetInputFocus( Display* /* display */, Window /* focus */, int /* revert_to */, Time /* time */ ); -extern int XSetLineAttributes( +X11API int X11APIENTRY XSetLineAttributes( Display* /* display */, GC /* gc */, unsigned int /* line_width */, @@ -3268,24 +3269,24 @@ extern int XSetLineAttributes( int /* join_style */ ); -extern int XSetModifierMapping( +X11API int X11APIENTRY XSetModifierMapping( Display* /* display */, XModifierKeymap* /* modmap */ ); -extern int XSetPlaneMask( +X11API int X11APIENTRY XSetPlaneMask( Display* /* display */, GC /* gc */, unsigned long /* plane_mask */ ); -extern int XSetPointerMapping( +X11API int X11APIENTRY XSetPointerMapping( Display* /* display */, _Xconst unsigned char* /* map */, int /* nmap */ ); -extern int XSetScreenSaver( +X11API int X11APIENTRY XSetScreenSaver( Display* /* display */, int /* timeout */, int /* interval */, @@ -3293,14 +3294,14 @@ extern int XSetScreenSaver( int /* allow_exposures */ ); -extern int XSetSelectionOwner( +X11API int X11APIENTRY XSetSelectionOwner( Display* /* display */, Atom /* selection */, Window /* owner */, Time /* time */ ); -extern int XSetState( +X11API int X11APIENTRY XSetState( Display* /* display */, GC /* gc */, unsigned long /* foreground */, @@ -3309,100 +3310,100 @@ extern int XSetState( unsigned long /* plane_mask */ ); -extern int XSetStipple( +X11API int X11APIENTRY XSetStipple( Display* /* display */, GC /* gc */, Pixmap /* stipple */ ); -extern int XSetSubwindowMode( +X11API int X11APIENTRY XSetSubwindowMode( Display* /* display */, GC /* gc */, int /* subwindow_mode */ ); -extern int XSetTSOrigin( +X11API int X11APIENTRY XSetTSOrigin( Display* /* display */, GC /* gc */, int /* ts_x_origin */, int /* ts_y_origin */ ); -extern int XSetTile( +X11API int X11APIENTRY XSetTile( Display* /* display */, GC /* gc */, Pixmap /* tile */ ); -extern int XSetWindowBackground( +X11API int X11APIENTRY XSetWindowBackground( Display* /* display */, Window /* w */, unsigned long /* background_pixel */ ); -extern int XSetWindowBackgroundPixmap( +X11API int X11APIENTRY XSetWindowBackgroundPixmap( Display* /* display */, Window /* w */, Pixmap /* background_pixmap */ ); -extern int XSetWindowBorder( +X11API int X11APIENTRY XSetWindowBorder( Display* /* display */, Window /* w */, unsigned long /* border_pixel */ ); -extern int XSetWindowBorderPixmap( +X11API int X11APIENTRY XSetWindowBorderPixmap( Display* /* display */, Window /* w */, Pixmap /* border_pixmap */ ); -extern int XSetWindowBorderWidth( +X11API int X11APIENTRY XSetWindowBorderWidth( Display* /* display */, Window /* w */, unsigned int /* width */ ); -extern int XSetWindowColormap( +X11API int X11APIENTRY XSetWindowColormap( Display* /* display */, Window /* w */, Colormap /* colormap */ ); -extern int XStoreBuffer( +X11API int X11APIENTRY XStoreBuffer( Display* /* display */, _Xconst char* /* bytes */, int /* nbytes */, int /* buffer */ ); -extern int XStoreBytes( +X11API int X11APIENTRY XStoreBytes( Display* /* display */, _Xconst char* /* bytes */, int /* nbytes */ ); -extern int XStoreColor( +X11API int X11APIENTRY XStoreColor( Display* /* display */, Colormap /* colormap */, XColor* /* color */ ); -extern int XStoreColors( +X11API int X11APIENTRY XStoreColors( Display* /* display */, Colormap /* colormap */, XColor* /* color */, int /* ncolors */ ); -extern int XStoreName( +X11API int X11APIENTRY XStoreName( Display* /* display */, Window /* w */, _Xconst char* /* window_name */ ); -extern int XStoreNamedColor( +X11API int X11APIENTRY XStoreNamedColor( Display* /* display */, Colormap /* colormap */, _Xconst char* /* color */, @@ -3410,12 +3411,12 @@ extern int XStoreNamedColor( int /* flags */ ); -extern int XSync( +X11API int X11APIENTRY XSync( Display* /* display */, Bool /* discard */ ); -extern int XTextExtents( +X11API int X11APIENTRY XTextExtents( XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* nchars */, @@ -3425,7 +3426,7 @@ extern int XTextExtents( XCharStruct* /* overall_return */ ); -extern int XTextExtents16( +X11API int XTextExtents16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* nchars */, @@ -3435,19 +3436,19 @@ extern int XTextExtents16( XCharStruct* /* overall_return */ ); -extern int XTextWidth( +X11API int X11APIENTRY XTextWidth( XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ ); -extern int XTextWidth16( +X11API int XTextWidth16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* count */ ); -extern Bool XTranslateCoordinates( +X11API Bool X11APIENTRY XTranslateCoordinates( Display* /* display */, Window /* src_w */, Window /* dest_w */, @@ -3458,64 +3459,64 @@ extern Bool XTranslateCoordinates( Window* /* child_return */ ); -extern int XUndefineCursor( +X11API int X11APIENTRY XUndefineCursor( Display* /* display */, Window /* w */ ); -extern int XUngrabButton( +X11API int X11APIENTRY XUngrabButton( Display* /* display */, unsigned int /* button */, unsigned int /* modifiers */, Window /* grab_window */ ); -extern int XUngrabKey( +X11API int X11APIENTRY XUngrabKey( Display* /* display */, int /* keycode */, unsigned int /* modifiers */, Window /* grab_window */ ); -extern int XUngrabKeyboard( +X11API int X11APIENTRY XUngrabKeyboard( Display* /* display */, Time /* time */ ); -extern int XUngrabPointer( +X11API int X11APIENTRY XUngrabPointer( Display* /* display */, Time /* time */ ); -extern int XUngrabServer( +X11API int X11APIENTRY XUngrabServer( Display* /* display */ ); -extern int XUninstallColormap( +X11API int X11APIENTRY XUninstallColormap( Display* /* display */, Colormap /* colormap */ ); -extern int XUnloadFont( +X11API int X11APIENTRY XUnloadFont( Display* /* display */, Font /* font */ ); -extern int XUnmapSubwindows( +X11API int X11APIENTRY XUnmapSubwindows( Display* /* display */, Window /* w */ ); -extern int XUnmapWindow( +X11API int X11APIENTRY XUnmapWindow( Display* /* display */, Window /* w */ ); -extern int XVendorRelease( +X11API int X11APIENTRY XVendorRelease( Display* /* display */ ); -extern int XWarpPointer( +X11API int X11APIENTRY XWarpPointer( Display* /* display */, Window /* src_w */, Window /* dest_w */, @@ -3527,22 +3528,22 @@ extern int XWarpPointer( int /* dest_y */ ); -extern int XWidthMMOfScreen( +X11API int X11APIENTRY XWidthMMOfScreen( Screen* /* screen */ ); -extern int XWidthOfScreen( +X11API int X11APIENTRY XWidthOfScreen( Screen* /* screen */ ); -extern int XWindowEvent( +X11API int X11APIENTRY XWindowEvent( Display* /* display */, Window /* w */, long /* event_mask */, XEvent* /* event_return */ ); -extern int XWriteBitmapFile( +X11API int X11APIENTRY XWriteBitmapFile( Display* /* display */, _Xconst char* /* filename */, Pixmap /* bitmap */, @@ -3552,65 +3553,65 @@ extern int XWriteBitmapFile( int /* y_hot */ ); -extern Bool XSupportsLocale (void); +X11API Bool XSupportsLocale (void); -extern char *XSetLocaleModifiers( +X11API char *XSetLocaleModifiers( const char* /* modifier_list */ ); -extern XOM XOpenOM( +X11API XOM X11APIENTRY XOpenOM( Display* /* display */, struct _XrmHashBucketRec* /* rdb */, _Xconst char* /* res_name */, _Xconst char* /* res_class */ ); -extern Status XCloseOM( +X11API Status X11APIENTRY XCloseOM( XOM /* om */ ); -extern char *XSetOMValues( +X11API char *XSetOMValues( XOM /* om */, ... ); -extern char *XGetOMValues( +X11API char *XGetOMValues( XOM /* om */, ... ); -extern Display *XDisplayOfOM( +X11API Display *XDisplayOfOM( XOM /* om */ ); -extern char *XLocaleOfOM( +X11API char *XLocaleOfOM( XOM /* om */ ); -extern XOC XCreateOC( +X11API XOC X11APIENTRY XCreateOC( XOM /* om */, ... ); -extern void XDestroyOC( +X11API void X11APIENTRY XDestroyOC( XOC /* oc */ ); -extern XOM XOMOfOC( +X11API XOM X11APIENTRY XOMOfOC( XOC /* oc */ ); -extern char *XSetOCValues( +X11API char *XSetOCValues( XOC /* oc */, ... ); -extern char *XGetOCValues( +X11API char *XGetOCValues( XOC /* oc */, ... ); -extern XFontSet XCreateFontSet( +X11API XFontSet X11APIENTRY XCreateFontSet( Display* /* display */, _Xconst char* /* base_font_name_list */, char*** /* missing_charset_list */, @@ -3618,60 +3619,60 @@ extern XFontSet XCreateFontSet( char** /* def_string */ ); -extern void XFreeFontSet( +X11API void X11APIENTRY XFreeFontSet( Display* /* display */, XFontSet /* font_set */ ); -extern int XFontsOfFontSet( +X11API int X11APIENTRY XFontsOfFontSet( XFontSet /* font_set */, XFontStruct*** /* font_struct_list */, char*** /* font_name_list */ ); -extern char *XBaseFontNameListOfFontSet( +X11API char *XBaseFontNameListOfFontSet( XFontSet /* font_set */ ); -extern char *XLocaleOfFontSet( +X11API char *XLocaleOfFontSet( XFontSet /* font_set */ ); -extern Bool XContextDependentDrawing( +X11API Bool X11APIENTRY XContextDependentDrawing( XFontSet /* font_set */ ); -extern Bool XDirectionalDependentDrawing( +X11API Bool X11APIENTRY XDirectionalDependentDrawing( XFontSet /* font_set */ ); -extern Bool XContextualDrawing( +X11API Bool X11APIENTRY XContextualDrawing( XFontSet /* font_set */ ); -extern XFontSetExtents *XExtentsOfFontSet( +X11API XFontSetExtents *XExtentsOfFontSet( XFontSet /* font_set */ ); -extern int XmbTextEscapement( +X11API int X11APIENTRY XmbTextEscapement( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */ ); -extern int XwcTextEscapement( +X11API int X11APIENTRY XwcTextEscapement( XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */ ); -extern int Xutf8TextEscapement( +X11API int Xutf8TextEscapement( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */ ); -extern int XmbTextExtents( +X11API int X11APIENTRY XmbTextExtents( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, @@ -3679,7 +3680,7 @@ extern int XmbTextExtents( XRectangle* /* overall_logical_return */ ); -extern int XwcTextExtents( +X11API int X11APIENTRY XwcTextExtents( XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */, @@ -3687,7 +3688,7 @@ extern int XwcTextExtents( XRectangle* /* overall_logical_return */ ); -extern int Xutf8TextExtents( +X11API int Xutf8TextExtents( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, @@ -3695,7 +3696,7 @@ extern int Xutf8TextExtents( XRectangle* /* overall_logical_return */ ); -extern Status XmbTextPerCharExtents( +X11API Status X11APIENTRY XmbTextPerCharExtents( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, @@ -3707,7 +3708,7 @@ extern Status XmbTextPerCharExtents( XRectangle* /* overall_logical_return */ ); -extern Status XwcTextPerCharExtents( +X11API Status X11APIENTRY XwcTextPerCharExtents( XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */, @@ -3719,7 +3720,7 @@ extern Status XwcTextPerCharExtents( XRectangle* /* overall_logical_return */ ); -extern Status Xutf8TextPerCharExtents( +X11API Status Xutf8TextPerCharExtents( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, @@ -3731,7 +3732,7 @@ extern Status Xutf8TextPerCharExtents( XRectangle* /* overall_logical_return */ ); -extern void XmbDrawText( +X11API void X11APIENTRY XmbDrawText( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -3741,7 +3742,7 @@ extern void XmbDrawText( int /* nitems */ ); -extern void XwcDrawText( +X11API void X11APIENTRY XwcDrawText( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -3751,7 +3752,7 @@ extern void XwcDrawText( int /* nitems */ ); -extern void Xutf8DrawText( +X11API void Xutf8DrawText( Display* /* display */, Drawable /* d */, GC /* gc */, @@ -3761,7 +3762,7 @@ extern void Xutf8DrawText( int /* nitems */ ); -extern void XmbDrawString( +X11API void X11APIENTRY XmbDrawString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3772,7 +3773,7 @@ extern void XmbDrawString( int /* bytes_text */ ); -extern void XwcDrawString( +X11API void X11APIENTRY XwcDrawString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3783,7 +3784,7 @@ extern void XwcDrawString( int /* num_wchars */ ); -extern void Xutf8DrawString( +X11API void Xutf8DrawString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3794,7 +3795,7 @@ extern void Xutf8DrawString( int /* bytes_text */ ); -extern void XmbDrawImageString( +X11API void X11APIENTRY XmbDrawImageString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3805,7 +3806,7 @@ extern void XmbDrawImageString( int /* bytes_text */ ); -extern void XwcDrawImageString( +X11API void X11APIENTRY XwcDrawImageString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3816,7 +3817,7 @@ extern void XwcDrawImageString( int /* num_wchars */ ); -extern void Xutf8DrawImageString( +X11API void Xutf8DrawImageString( Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -3827,79 +3828,79 @@ extern void Xutf8DrawImageString( int /* bytes_text */ ); -extern XIM XOpenIM( +X11API XIM X11APIENTRY XOpenIM( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, char* /* res_class */ ); -extern Status XCloseIM( +X11API Status X11APIENTRY XCloseIM( XIM /* im */ ); -extern char *XGetIMValues( +X11API char *XGetIMValues( XIM /* im */, ... ); -extern char *XSetIMValues( +X11API char *XSetIMValues( XIM /* im */, ... ); -extern Display *XDisplayOfIM( +X11API Display *XDisplayOfIM( XIM /* im */ ); -extern char *XLocaleOfIM( +X11API char *XLocaleOfIM( XIM /* im*/ ); -extern XIC XCreateIC( +X11API XIC X11APIENTRY XCreateIC( XIM /* im */, ... ); -extern void XDestroyIC( +X11API void X11APIENTRY XDestroyIC( XIC /* ic */ ); -extern void XSetICFocus( +X11API void X11APIENTRY XSetICFocus( XIC /* ic */ ); -extern void XUnsetICFocus( +X11API void X11APIENTRY XUnsetICFocus( XIC /* ic */ ); -extern wchar_t *XwcResetIC( +X11API wchar_t *XwcResetIC( XIC /* ic */ ); -extern char *XmbResetIC( +X11API char *XmbResetIC( XIC /* ic */ ); -extern char *Xutf8ResetIC( +X11API char *Xutf8ResetIC( XIC /* ic */ ); -extern char *XSetICValues( +X11API char *XSetICValues( XIC /* ic */, ... ); -extern char *XGetICValues( +X11API char *XGetICValues( XIC /* ic */, ... ); -extern XIM XIMOfIC( +X11API XIM X11APIENTRY XIMOfIC( XIC /* ic */ ); -extern Bool XFilterEvent( +X11API Bool X11APIENTRY XFilterEvent( XEvent* /* event */, Window /* window */ ); -extern int XmbLookupString( +X11API int X11APIENTRY XmbLookupString( XIC /* ic */, XKeyPressedEvent* /* event */, char* /* buffer_return */, @@ -3908,7 +3909,7 @@ extern int XmbLookupString( Status* /* status_return */ ); -extern int XwcLookupString( +X11API int X11APIENTRY XwcLookupString( XIC /* ic */, XKeyPressedEvent* /* event */, wchar_t* /* buffer_return */, @@ -3917,7 +3918,7 @@ extern int XwcLookupString( Status* /* status_return */ ); -extern int Xutf8LookupString( +X11API int Xutf8LookupString( XIC /* ic */, XKeyPressedEvent* /* event */, char* /* buffer_return */, @@ -3926,13 +3927,13 @@ extern int Xutf8LookupString( Status* /* status_return */ ); -extern XVaNestedList XVaCreateNestedList( +X11API XVaNestedList X11APIENTRY XVaCreateNestedList( int /*unused*/, ... ); /* internal connections for IMs */ -extern Bool XRegisterIMInstantiateCallback( +X11API Bool X11APIENTRY XRegisterIMInstantiateCallback( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, @@ -3941,7 +3942,7 @@ extern Bool XRegisterIMInstantiateCallba XPointer /* client_data */ ); -extern Bool XUnregisterIMInstantiateCallback( +X11API Bool X11APIENTRY XUnregisterIMInstantiateCallback( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, @@ -3959,37 +3960,37 @@ typedef void (*XConnectionWatchProc)( ); -extern Status XInternalConnectionNumbers( +X11API Status X11APIENTRY XInternalConnectionNumbers( Display* /* dpy */, int** /* fd_return */, int* /* count_return */ ); -extern void XProcessInternalConnection( +X11API void X11APIENTRY XProcessInternalConnection( Display* /* dpy */, int /* fd */ ); -extern Status XAddConnectionWatch( +X11API Status X11APIENTRY XAddConnectionWatch( Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ ); -extern void XRemoveConnectionWatch( +X11API void X11APIENTRY XRemoveConnectionWatch( Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ ); -extern void XSetAuthorization( +X11API void X11APIENTRY XSetAuthorization( char * /* name */, int /* namelen */, char * /* data */, int /* datalen */ ); -extern int _Xmbtowc( +X11API int X11APIENTRY _Xmbtowc( wchar_t * /* wstr */, #ifdef ISC char const * /* str */, @@ -4000,7 +4001,7 @@ extern int _Xmbtowc( #endif ); -extern int _Xwctomb( +X11API int X11APIENTRY _Xwctomb( char * /* str */, wchar_t /* wc */ ); diff -u -p -r1.2 XKBgeom.h --- include/extensions/XKBgeom.h 23 Apr 2004 18:43:06 -0000 1.2 +++ include/extensions/XKBgeom.h 24 Feb 2005 00:55:51 -0000 @@ -30,6 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define _XKBGEOM_H_ #include +#include #ifdef XKB_IN_SERVER #define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias @@ -317,53 +318,53 @@ typedef struct _XkbGeometrySizes { _XFUNCPROTOBEGIN -extern XkbPropertyPtr -XkbAddGeomProperty( +X11API XkbPropertyPtr +X11APIENTRY XkbAddGeomProperty( XkbGeometryPtr /* geom */, char * /* name */, char * /* value */ ); -extern XkbKeyAliasPtr -XkbAddGeomKeyAlias( +X11API XkbKeyAliasPtr +X11APIENTRY XkbAddGeomKeyAlias( XkbGeometryPtr /* geom */, char * /* alias */, char * /* real */ ); -extern XkbColorPtr -XkbAddGeomColor( +X11API XkbColorPtr +X11APIENTRY XkbAddGeomColor( XkbGeometryPtr /* geom */, char * /* spec */, unsigned int /* pixel */ ); -extern XkbOutlinePtr -XkbAddGeomOutline( +X11API XkbOutlinePtr +X11APIENTRY XkbAddGeomOutline( XkbShapePtr /* shape */, int /* sz_points */ ); -extern XkbShapePtr -XkbAddGeomShape( +X11API XkbShapePtr +X11APIENTRY XkbAddGeomShape( XkbGeometryPtr /* geom */, Atom /* name */, int /* sz_outlines */ ); -extern XkbKeyPtr -XkbAddGeomKey( +X11API XkbKeyPtr +X11APIENTRY XkbAddGeomKey( XkbRowPtr /* row */ ); -extern XkbRowPtr -XkbAddGeomRow( +X11API XkbRowPtr +X11APIENTRY XkbAddGeomRow( XkbSectionPtr /* section */, int /* sz_keys */ ); -extern XkbSectionPtr -XkbAddGeomSection( +X11API XkbSectionPtr +X11APIENTRY XkbAddGeomSection( XkbGeometryPtr /* geom */, Atom /* name */, int /* sz_rows */, @@ -371,110 +372,110 @@ XkbAddGeomSection( int /* sz_overlays */ ); -extern XkbOverlayPtr -XkbAddGeomOverlay( +X11API XkbOverlayPtr +X11APIENTRY XkbAddGeomOverlay( XkbSectionPtr /* section */, Atom /* name */, int /* sz_rows */ ); -extern XkbOverlayRowPtr -XkbAddGeomOverlayRow( +X11API XkbOverlayRowPtr +X11APIENTRY XkbAddGeomOverlayRow( XkbOverlayPtr /* overlay */, int /* row_under */, int /* sz_keys */ ); -extern XkbOverlayKeyPtr -XkbAddGeomOverlayKey( +X11API XkbOverlayKeyPtr +X11APIENTRY XkbAddGeomOverlayKey( XkbOverlayPtr /* overlay */, XkbOverlayRowPtr /* row */, char * /* over */, char * /* under */ ); -extern XkbDoodadPtr -XkbAddGeomDoodad( +X11API XkbDoodadPtr +X11APIENTRY XkbAddGeomDoodad( XkbGeometryPtr /* geom */, XkbSectionPtr /* section */, Atom /* name */ ); -extern void -XkbFreeGeomKeyAliases( +X11API void +X11APIENTRY XkbFreeGeomKeyAliases( XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomColors( +X11API void +X11APIENTRY XkbFreeGeomColors( XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomDoodads( +X11API void +X11APIENTRY XkbFreeGeomDoodads( XkbDoodadPtr /* doodads */, int /* nDoodads */, Bool /* freeAll */ ); -extern void -XkbFreeGeomProperties( +X11API void +X11APIENTRY XkbFreeGeomProperties( XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomOverlayKeys( +X11API void +X11APIENTRY XkbFreeGeomOverlayKeys( XkbOverlayRowPtr /* row */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomOverlayRows( +X11API void +X11APIENTRY XkbFreeGeomOverlayRows( XkbOverlayPtr /* overlay */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomOverlays( +X11API void +X11APIENTRY XkbFreeGeomOverlays( XkbSectionPtr /* section */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomKeys( +X11API void +X11APIENTRY XkbFreeGeomKeys( XkbRowPtr /* row */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomRows( +X11API void +X11APIENTRY XkbFreeGeomRows( XkbSectionPtr /* section */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomSections( +X11API void +X11APIENTRY XkbFreeGeomSections( XkbGeometryPtr /* geom */, int /* first */, int /* count */, @@ -482,173 +483,173 @@ XkbFreeGeomSections( ); -extern void -XkbFreeGeomPoints( +X11API void +X11APIENTRY XkbFreeGeomPoints( XkbOutlinePtr /* outline */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomOutlines( +X11API void +X11APIENTRY XkbFreeGeomOutlines( XkbShapePtr /* shape */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeomShapes( +X11API void +X11APIENTRY XkbFreeGeomShapes( XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ ); -extern void -XkbFreeGeometry( +X11API void +X11APIENTRY XkbFreeGeometry( XkbGeometryPtr /* geom */, unsigned int /* which */, Bool /* freeMap */ ); -extern Status -XkbAllocGeomProps( +X11API Status +X11APIENTRY XkbAllocGeomProps( XkbGeometryPtr /* geom */, int /* nProps */ ); -extern Status -XkbAllocGeomKeyAliases( +X11API Status +X11APIENTRY XkbAllocGeomKeyAliases( XkbGeometryPtr /* geom */, int /* nAliases */ ); -extern Status -XkbAllocGeomColors( +X11API Status +X11APIENTRY XkbAllocGeomColors( XkbGeometryPtr /* geom */, int /* nColors */ ); -extern Status -XkbAllocGeomShapes( +X11API Status +X11APIENTRY XkbAllocGeomShapes( XkbGeometryPtr /* geom */, int /* nShapes */ ); -extern Status -XkbAllocGeomSections( +X11API Status +X11APIENTRY XkbAllocGeomSections( XkbGeometryPtr /* geom */, int /* nSections */ ); -extern Status -XkbAllocGeomOverlays( +X11API Status +X11APIENTRY XkbAllocGeomOverlays( XkbSectionPtr /* section */, int /* num_needed */ ); -extern Status -XkbAllocGeomOverlayRows( +X11API Status +X11APIENTRY XkbAllocGeomOverlayRows( XkbOverlayPtr /* overlay */, int /* num_needed */ ); -extern Status -XkbAllocGeomOverlayKeys( +X11API Status +X11APIENTRY XkbAllocGeomOverlayKeys( XkbOverlayRowPtr /* row */, int /* num_needed */ ); -extern Status -XkbAllocGeomDoodads( +X11API Status +X11APIENTRY XkbAllocGeomDoodads( XkbGeometryPtr /* geom */, int /* nDoodads */ ); -extern Status -XkbAllocGeomSectionDoodads( +X11API Status +X11APIENTRY XkbAllocGeomSectionDoodads( XkbSectionPtr /* section */, int /* nDoodads */ ); -extern Status -XkbAllocGeomOutlines( +X11API Status +X11APIENTRY XkbAllocGeomOutlines( XkbShapePtr /* shape */, int /* nOL */ ); -extern Status -XkbAllocGeomRows( +X11API Status +X11APIENTRY XkbAllocGeomRows( XkbSectionPtr /* section */, int /* nRows */ ); -extern Status -XkbAllocGeomPoints( +X11API Status +X11APIENTRY XkbAllocGeomPoints( XkbOutlinePtr /* ol */, int /* nPts */ ); -extern Status -XkbAllocGeomKeys( +X11API Status +X11APIENTRY XkbAllocGeomKeys( XkbRowPtr /* row */, int /* nKeys */ ); -extern Status -XkbAllocGeometry( +X11API Status +X11APIENTRY XkbAllocGeometry( XkbDescPtr /* xkb */, XkbGeometrySizesPtr /* sizes */ ); -extern Status -XkbSetGeometry( +X11API Status +X11APIENTRY XkbSetGeometry( Display * /* dpy */, unsigned /* deviceSpec */, XkbGeometryPtr /* geom */ ); -extern Bool -XkbComputeShapeTop( +X11API Bool +X11APIENTRY XkbComputeShapeTop( XkbShapePtr /* shape */, XkbBoundsPtr /* bounds */ ); -extern Bool -XkbComputeShapeBounds( +X11API Bool +X11APIENTRY XkbComputeShapeBounds( XkbShapePtr /* shape */ ); -extern Bool -XkbComputeRowBounds( +X11API Bool +X11APIENTRY XkbComputeRowBounds( XkbGeometryPtr /* geom */, XkbSectionPtr /* section */, XkbRowPtr /* row */ ); -extern Bool -XkbComputeSectionBounds( +X11API Bool +X11APIENTRY XkbComputeSectionBounds( XkbGeometryPtr /* geom */, XkbSectionPtr /* section */ ); -extern char * -XkbFindOverlayForKey( +X11API char * +X11APIENTRY XkbFindOverlayForKey( XkbGeometryPtr /* geom */, XkbSectionPtr /* wanted */, char * /* under */ ); -extern Status -XkbGetGeometry( +X11API Status +X11APIENTRY XkbGetGeometry( Display * /* dpy */, XkbDescPtr /* xkb */ ); -extern Status -XkbGetNamedGeometry( +X11API Status +X11APIENTRY XkbGetNamedGeometry( Display * /* dpy */, XkbDescPtr /* xkb */, Atom /* name */ Index: lib/X11/ImUtil.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/ImUtil.h,v retrieving revision 1.2 diff -u -p -r1.2 ImUtil.h --- lib/X11/ImUtil.h 23 Apr 2004 18:43:24 -0000 1.2 +++ lib/X11/ImUtil.h 23 Feb 2005 05:55:30 -0000 @@ -3,29 +3,29 @@ #ifndef _IMUTIL_H_ #define _IMUTIL_H_ -extern int -_XGetScanlinePad( +X11API int +X11APIENTRY _XGetScanlinePad( Display *dpy, int depth); -extern int -_XGetBitsPerPixel( +X11API int +X11APIENTRY _XGetBitsPerPixel( Display *dpy, int depth); -extern int -_XSetImage( +X11API int +X11APIENTRY _XSetImage( XImage *srcimg, register XImage *dstimg, register int x, register int y); -extern int -_XReverse_Bytes( +X11API int +X11APIENTRY _XReverse_Bytes( register unsigned char *bpt, register int nb); -extern void -_XInitImageFuncPtrs( +X11API void +X11APIENTRY _XInitImageFuncPtrs( register XImage *image); #endif /* _IMUTIL_H_ */ Index: lib/X11/XKBlib.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/XKBlib.h,v retrieving revision 1.2 diff -u -p -r1.2 XKBlib.h --- lib/X11/XKBlib.h 23 Apr 2004 18:43:24 -0000 1.2 +++ lib/X11/XKBlib.h 23 Feb 2005 06:16:49 -0000 @@ -294,11 +294,11 @@ typedef struct _XkbKbdDpyState XkbKbdDpy _XFUNCPROTOBEGIN -extern Bool XkbIgnoreExtension( +X11API Bool X11APIENTRY XkbIgnoreExtension( Bool /* ignore */ ); -extern Display *XkbOpenDisplay( +X11API Display *XkbOpenDisplay( char * /* name */, int * /* ev_rtrn */, int * /* err_rtrn */, @@ -307,7 +307,7 @@ extern Display *XkbOpenDisplay( int * /* reason */ ); -extern Bool XkbQueryExtension( +X11API Bool X11APIENTRY XkbQueryExtension( Display * /* dpy */, int * /* opcodeReturn */, int * /* eventBaseReturn */, @@ -316,28 +316,28 @@ extern Bool XkbQueryExtension( int * /* minorRtrn */ ); -extern Bool XkbUseExtension( +X11API Bool X11APIENTRY XkbUseExtension( Display * /* dpy */, int * /* major_rtrn */, int * /* minor_rtrn */ ); -extern Bool XkbLibraryVersion( +X11API Bool X11APIENTRY XkbLibraryVersion( int * /* libMajorRtrn */, int * /* libMinorRtrn */ ); -extern unsigned int XkbSetXlibControls( +X11API unsigned int X11APIENTRY XkbSetXlibControls( Display* /* dpy */, unsigned int /* affect */, unsigned int /* values */ ); -extern unsigned int XkbGetXlibControls( +X11API unsigned int X11APIENTRY XkbGetXlibControls( Display* /* dpy */ ); -extern unsigned int XkbXlibControlsImplemented(void); +X11API unsigned int X11APIENTRY XkbXlibControlsImplemented(void); typedef Atom (*XkbInternAtomFunc)( Display * /* dpy */, @@ -350,12 +350,12 @@ typedef char * (*XkbGetAtomNameFunc)( Atom /* atom */ ); -extern void XkbSetAtomFuncs( +X11API void X11APIENTRY XkbSetAtomFuncs( XkbInternAtomFunc /* getAtom */, XkbGetAtomNameFunc /* getName */ ); -extern KeySym XkbKeycodeToKeysym( +X11API KeySym X11APIENTRY XkbKeycodeToKeysym( Display * /* dpy */, #if NeedWidePrototypes unsigned int /* kc */, @@ -366,12 +366,12 @@ extern KeySym XkbKeycodeToKeysym( int /* level */ ); -extern unsigned int XkbKeysymToModifiers( +X11API unsigned int X11APIENTRY XkbKeysymToModifiers( Display * /* dpy */, KeySym /* ks */ ); -extern Bool XkbLookupKeySym( +X11API Bool X11APIENTRY XkbLookupKeySym( Display * /* dpy */, KeyCode /* keycode */, unsigned int /* modifiers */, @@ -379,7 +379,7 @@ extern Bool XkbLookupKeySym( KeySym * /* keysym_return */ ); -extern int XkbLookupKeyBinding( +X11API int X11APIENTRY XkbLookupKeyBinding( Display * /* dpy */, KeySym /* sym_rtrn */, unsigned int /* mods */, @@ -388,7 +388,7 @@ extern int XkbLookupKeyBinding( int * /* extra_rtrn */ ); -extern Bool XkbTranslateKeyCode( +X11API Bool X11APIENTRY XkbTranslateKeyCode( XkbDescPtr /* xkb */, KeyCode /* keycode */, unsigned int /* modifiers */, @@ -396,7 +396,7 @@ extern Bool XkbTranslateKeyCode( KeySym * /* keysym_return */ ); -extern int XkbTranslateKeySym( +X11API int X11APIENTRY XkbTranslateKeySym( Display * /* dpy */, register KeySym * /* sym_return */, unsigned int /* modifiers */, @@ -405,28 +405,28 @@ extern int XkbTranslateKeySym( int * /* extra_rtrn */ ); -extern Bool XkbSetAutoRepeatRate( +X11API Bool X11APIENTRY XkbSetAutoRepeatRate( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* delay */, unsigned int /* interval */ ); -extern Bool XkbGetAutoRepeatRate( +X11API Bool X11APIENTRY XkbGetAutoRepeatRate( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int * /* delayRtrn */, unsigned int * /* intervalRtrn */ ); -extern Bool XkbChangeEnabledControls( +X11API Bool X11APIENTRY XkbChangeEnabledControls( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ ); -extern Bool XkbDeviceBell( +X11API Bool X11APIENTRY XkbDeviceBell( Display * /* dpy */, Window /* win */, int /* deviceSpec */, @@ -436,7 +436,7 @@ extern Bool XkbDeviceBell( Atom /* name */ ); -extern Bool XkbForceDeviceBell( +X11API Bool X11APIENTRY XkbForceDeviceBell( Display * /* dpy */, int /* deviceSpec */, int /* bellClass */, @@ -444,7 +444,7 @@ extern Bool XkbForceDeviceBell( int /* percent */ ); -extern Bool XkbDeviceBellEvent( +X11API Bool X11APIENTRY XkbDeviceBellEvent( Display * /* dpy */, Window /* win */, int /* deviceSpec */, @@ -454,33 +454,33 @@ extern Bool XkbDeviceBellEvent( Atom /* name */ ); -extern Bool XkbBell( +X11API Bool X11APIENTRY XkbBell( Display * /* dpy */, Window /* win */, int /* percent */, Atom /* name */ ); -extern Bool XkbForceBell( +X11API Bool X11APIENTRY XkbForceBell( Display * /* dpy */, int /* percent */ ); -extern Bool XkbBellEvent( +X11API Bool X11APIENTRY XkbBellEvent( Display * /* dpy */, Window /* win */, int /* percent */, Atom /* name */ ); -extern Bool XkbSelectEvents( +X11API Bool X11APIENTRY XkbSelectEvents( Display * /* dpy */, unsigned int /* deviceID */, unsigned int /* affect */, unsigned int /* values */ ); -extern Bool XkbSelectEventDetails( +X11API Bool X11APIENTRY XkbSelectEventDetails( Display * /* dpy */, unsigned int /* deviceID */, unsigned int /* eventType */, @@ -488,25 +488,25 @@ extern Bool XkbSelectEventDetails( unsigned long /* details */ ); -extern void XkbNoteMapChanges( +X11API void X11APIENTRY XkbNoteMapChanges( XkbMapChangesPtr /* old */, XkbMapNotifyEvent * /* new */, unsigned int /* wanted */ ); -extern void XkbNoteNameChanges( +X11API void X11APIENTRY XkbNoteNameChanges( XkbNameChangesPtr /* old */, XkbNamesNotifyEvent * /* new */, unsigned int /* wanted */ ); -extern Status XkbGetIndicatorState( +X11API Status X11APIENTRY XkbGetIndicatorState( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int * /* pStateRtrn */ ); -extern Status XkbGetDeviceIndicatorState( +X11API Status X11APIENTRY XkbGetDeviceIndicatorState( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, @@ -514,13 +514,13 @@ extern Status XkbGetDeviceIndicatorState unsigned int * /* pStateRtrn */ ); -extern Status XkbGetIndicatorMap( +X11API Status X11APIENTRY XkbGetIndicatorMap( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); -extern Bool XkbSetIndicatorMap( +X11API Bool X11APIENTRY XkbSetIndicatorMap( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ @@ -535,7 +535,7 @@ extern Bool XkbSetIndicatorMap( #define XkbChangeIndicatorMaps(d,x,c) \ (XkbSetIndicatorMap((d),(c)->map_changes,x)) -extern Bool XkbGetNamedIndicator( +X11API Bool X11APIENTRY XkbGetNamedIndicator( Display * /* dpy */, Atom /* name */, int * /* pNdxRtrn */, @@ -544,7 +544,7 @@ extern Bool XkbGetNamedIndicator( Bool * /* pRealRtrn */ ); -extern Bool XkbGetNamedDeviceIndicator( +X11API Bool X11APIENTRY XkbGetNamedDeviceIndicator( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, @@ -556,7 +556,7 @@ extern Bool XkbGetNamedDeviceIndicator( Bool * /* pRealRtrn */ ); -extern Bool XkbSetNamedIndicator( +X11API Bool X11APIENTRY XkbSetNamedIndicator( Display * /* dpy */, Atom /* name */, Bool /* changeState */, @@ -565,7 +565,7 @@ extern Bool XkbSetNamedIndicator( XkbIndicatorMapPtr /* pMap */ ); -extern Bool XkbSetNamedDeviceIndicator( +X11API Bool X11APIENTRY XkbSetNamedDeviceIndicator( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, @@ -577,33 +577,33 @@ extern Bool XkbSetNamedDeviceIndicator( XkbIndicatorMapPtr /* pMap */ ); -extern Bool XkbLockModifiers( +X11API Bool X11APIENTRY XkbLockModifiers( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ ); -extern Bool XkbLatchModifiers( +X11API Bool X11APIENTRY XkbLatchModifiers( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ ); -extern Bool XkbLockGroup( +X11API Bool X11APIENTRY XkbLockGroup( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ ); -extern Bool XkbLatchGroup( +X11API Bool X11APIENTRY XkbLatchGroup( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ ); -extern Bool XkbSetServerInternalMods( +X11API Bool X11APIENTRY XkbSetServerInternalMods( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affectReal */, @@ -612,7 +612,7 @@ extern Bool XkbSetServerInternalMods( unsigned int /* virtualValues */ ); -extern Bool XkbSetIgnoreLockMods( +X11API Bool X11APIENTRY XkbSetIgnoreLockMods( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affectReal */, @@ -622,59 +622,59 @@ extern Bool XkbSetIgnoreLockMods( ); -extern Bool XkbVirtualModsToReal( +X11API Bool X11APIENTRY XkbVirtualModsToReal( XkbDescPtr /* xkb */, unsigned int /* virtual_mask */, unsigned int * /* mask_rtrn */ ); -extern Bool XkbComputeEffectiveMap( +X11API Bool X11APIENTRY XkbComputeEffectiveMap( XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, unsigned char * /* map_rtrn */ ); -extern Status XkbInitCanonicalKeyTypes( +X11API Status X11APIENTRY XkbInitCanonicalKeyTypes( XkbDescPtr /* xkb */, unsigned int /* which */, int /* keypadVMod */ ); -extern XkbDescPtr XkbAllocKeyboard( +X11API XkbDescPtr X11APIENTRY XkbAllocKeyboard( void ); -extern void XkbFreeKeyboard( +X11API void X11APIENTRY XkbFreeKeyboard( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeDesc */ ); -extern Status XkbAllocClientMap( +X11API Status X11APIENTRY XkbAllocClientMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nTypes */ ); -extern Status XkbAllocServerMap( +X11API Status X11APIENTRY XkbAllocServerMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nActions */ ); -extern void XkbFreeClientMap( +X11API void X11APIENTRY XkbFreeClientMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); -extern void XkbFreeServerMap( +X11API void X11APIENTRY XkbFreeServerMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); -extern XkbKeyTypePtr XkbAddKeyType( +X11API XkbKeyTypePtr X11APIENTRY XkbAddKeyType( XkbDescPtr /* xkb */, Atom /* name */, int /* map_count */, @@ -682,116 +682,116 @@ extern XkbKeyTypePtr XkbAddKeyType( int /* num_lvls */ ); -extern Status XkbAllocIndicatorMaps( +X11API Status X11APIENTRY XkbAllocIndicatorMaps( XkbDescPtr /* xkb */ ); -extern void XkbFreeIndicatorMaps( +X11API void X11APIENTRY XkbFreeIndicatorMaps( XkbDescPtr /* xkb */ ); -extern XkbDescPtr XkbGetMap( +X11API XkbDescPtr X11APIENTRY XkbGetMap( Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ ); -extern Status XkbGetUpdatedMap( +X11API Status X11APIENTRY XkbGetUpdatedMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); -extern Status XkbGetMapChanges( +X11API Status X11APIENTRY XkbGetMapChanges( Display * /* dpy */, XkbDescPtr /* xkb */, XkbMapChangesPtr /* changes */ ); -extern Status XkbRefreshKeyboardMapping( +X11API Status X11APIENTRY XkbRefreshKeyboardMapping( XkbMapNotifyEvent * /* event */ ); -extern Status XkbGetKeyTypes( +X11API Status X11APIENTRY XkbGetKeyTypes( Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ ); -extern Status XkbGetKeySyms( +X11API Status X11APIENTRY XkbGetKeySyms( Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ ); -extern Status XkbGetKeyActions( +X11API Status X11APIENTRY XkbGetKeyActions( Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ ); -extern Status XkbGetKeyBehaviors( +X11API Status X11APIENTRY XkbGetKeyBehaviors( Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ ); -extern Status XkbGetVirtualMods( +X11API Status X11APIENTRY XkbGetVirtualMods( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); -extern Status XkbGetKeyExplicitComponents( +X11API Status X11APIENTRY XkbGetKeyExplicitComponents( Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ ); -extern Status XkbGetKeyModifierMap( +X11API Status X11APIENTRY XkbGetKeyModifierMap( Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ ); -extern Status XkbGetKeyVirtualModMap( +X11API Status X11APIENTRY XkbGetKeyVirtualModMap( Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ ); -extern Status XkbAllocControls( +X11API Status X11APIENTRY XkbAllocControls( XkbDescPtr /* xkb */, unsigned int /* which*/ ); -extern void XkbFreeControls( +X11API void X11APIENTRY XkbFreeControls( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); -extern Status XkbGetControls( +X11API Status X11APIENTRY XkbGetControls( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); -extern Bool XkbSetControls( +X11API Bool X11APIENTRY XkbSetControls( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); -extern void XkbNoteControlsChanges( +X11API void X11APIENTRY XkbNoteControlsChanges( XkbControlsChangesPtr /* old */, XkbControlsNotifyEvent * /* new */, unsigned int /* wanted */ @@ -800,52 +800,52 @@ extern void XkbNoteControlsChanges( #define XkbGetControlsChanges(d,x,c) XkbGetControls(d,(c)->changed_ctrls,x) #define XkbChangeControls(d,x,c) XkbSetControls(d,(c)->changed_ctrls,x) -extern Status XkbAllocCompatMap( +X11API Status X11APIENTRY XkbAllocCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nInterpret */ ); -extern void XkbFreeCompatMap( +X11API void X11APIENTRY XkbFreeCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); -extern Status XkbGetCompatMap( +X11API Status X11APIENTRY XkbGetCompatMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* xkb */ ); -extern Bool XkbSetCompatMap( +X11API Bool X11APIENTRY XkbSetCompatMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* xkb */, Bool /* updateActions */ ); -extern XkbSymInterpretPtr XkbAddSymInterpret( +X11API XkbSymInterpretPtr X11APIENTRY XkbAddSymInterpret( XkbDescPtr /* xkb */, XkbSymInterpretPtr /* si */, Bool /* updateMap */, XkbChangesPtr /* changes */ ); -extern Status XkbAllocNames( +X11API Status X11APIENTRY XkbAllocNames( XkbDescPtr /* xkb */, unsigned int /* which */, int /* nTotalRG */, int /* nTotalAliases */ ); -extern Status XkbGetNames( +X11API Status X11APIENTRY XkbGetNames( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); -extern Bool XkbSetNames( +X11API Bool X11APIENTRY XkbSetNames( Display * /* dpy */, unsigned int /* which */, unsigned int /* firstType */, @@ -853,84 +853,84 @@ extern Bool XkbSetNames( XkbDescPtr /* desc */ ); -extern Bool XkbChangeNames( +X11API Bool X11APIENTRY XkbChangeNames( Display * /* dpy */, XkbDescPtr /* xkb */, XkbNameChangesPtr /* changes */ ); -extern void XkbFreeNames( +X11API void X11APIENTRY XkbFreeNames( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); -extern Status XkbGetState( +X11API Status X11APIENTRY XkbGetState( Display * /* dpy */, unsigned int /* deviceSpec */, XkbStatePtr /* rtrnState */ ); -extern Bool XkbSetMap( +X11API Bool X11APIENTRY XkbSetMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); -extern Bool XkbChangeMap( +X11API Bool X11APIENTRY XkbChangeMap( Display* /* dpy */, XkbDescPtr /* desc */, XkbMapChangesPtr /* changes */ ); -extern Bool XkbSetDetectableAutoRepeat( +X11API Bool X11APIENTRY XkbSetDetectableAutoRepeat( Display * /* dpy */, Bool /* detectable */, Bool * /* supported */ ); -extern Bool XkbGetDetectableAutoRepeat( +X11API Bool X11APIENTRY XkbGetDetectableAutoRepeat( Display * /* dpy */, Bool * /* supported */ ); -extern Bool XkbSetAutoResetControls( +X11API Bool X11APIENTRY XkbSetAutoResetControls( Display * /* dpy */, unsigned int /* changes */, unsigned int * /* auto_ctrls */, unsigned int * /* auto_values */ ); -extern Bool XkbGetAutoResetControls( +X11API Bool X11APIENTRY XkbGetAutoResetControls( Display * /* dpy */, unsigned int * /* auto_ctrls */, unsigned int * /* auto_ctrl_values */ ); -extern Bool XkbSetPerClientControls( +X11API Bool X11APIENTRY XkbSetPerClientControls( Display * /* dpy */, unsigned int /* change */, unsigned int * /* values */ ); -extern Bool XkbGetPerClientControls( +X11API Bool X11APIENTRY XkbGetPerClientControls( Display * /* dpy */, unsigned int * /* ctrls */ ); -extern Status XkbCopyKeyType( +X11API Status X11APIENTRY XkbCopyKeyType( XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */ ); -extern Status XkbCopyKeyTypes( +X11API Status X11APIENTRY XkbCopyKeyTypes( XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */, int /* num_types */ ); -extern Status XkbResizeKeyType( +X11API Status X11APIENTRY XkbResizeKeyType( XkbDescPtr /* xkb */, int /* type_ndx */, int /* map_count */, @@ -938,19 +938,19 @@ extern Status XkbResizeKeyType( int /* new_num_lvls */ ); -extern KeySym *XkbResizeKeySyms( +X11API KeySym *XkbResizeKeySyms( XkbDescPtr /* desc */, int /* forKey */, int /* symsNeeded */ ); -extern XkbAction *XkbResizeKeyActions( +X11API XkbAction *XkbResizeKeyActions( XkbDescPtr /* desc */, int /* forKey */, int /* actsNeeded */ ); -extern Status XkbChangeTypesOfKey( +X11API Status X11APIENTRY XkbChangeTypesOfKey( XkbDescPtr /* xkb */, int /* key */, int /* num_groups */, @@ -959,7 +959,7 @@ extern Status XkbChangeTypesOfKey( XkbMapChangesPtr /* pChanges */ ); -extern Status XkbChangeKeycodeRange( +X11API Status X11APIENTRY XkbChangeKeycodeRange( XkbDescPtr /* xkb */, int /* minKC */, int /* maxKC */, @@ -968,24 +968,24 @@ extern Status XkbChangeKeycodeRange( /***====================================================================***/ -extern XkbComponentListPtr XkbListComponents( +X11API XkbComponentListPtr X11APIENTRY XkbListComponents( Display * /* dpy */, unsigned int /* deviceSpec */, XkbComponentNamesPtr /* ptrns */, int * /* max_inout */ ); -extern void XkbFreeComponentList( +X11API void X11APIENTRY XkbFreeComponentList( XkbComponentListPtr /* list */ ); -extern XkbDescPtr XkbGetKeyboard( +X11API XkbDescPtr X11APIENTRY XkbGetKeyboard( Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ ); -extern XkbDescPtr XkbGetKeyboardByName( +X11API XkbDescPtr X11APIENTRY XkbGetKeyboardByName( Display * /* dpy */, unsigned int /* deviceSpec */, XkbComponentNamesPtr /* names */, @@ -996,7 +996,7 @@ extern XkbDescPtr XkbGetKeyboardByName( /***====================================================================***/ -extern int XkbKeyTypesForCoreSymbols( /* returns # of groups */ +X11API int X11APIENTRY XkbKeyTypesForCoreSymbols( /* returns # of groups */ XkbDescPtr /* xkb */, /* keyboard device */ int /* map_width */, /* width of core KeySym array */ KeySym * /* core_syms */, /* always mapWidth symbols */ @@ -1005,13 +1005,13 @@ extern int XkbKeyTypesForCoreSymbols( /* KeySym * /* xkb_syms_rtrn */ /* must have enough space */ ); -extern Bool XkbApplyCompatMapToKey( /* False only on error */ +X11API Bool X11APIENTRY XkbApplyCompatMapToKey( /* False only on error */ XkbDescPtr /* xkb */, /* keymap to be edited */ KeyCode /* key */, /* key to be updated */ XkbChangesPtr /* changes */ /* resulting changes to map */ ); -extern Bool XkbUpdateMapFromCore( /* False only on error */ +X11API Bool X11APIENTRY XkbUpdateMapFromCore( /* False only on error */ XkbDescPtr /* xkb */, /* XKB keyboard to be edited */ KeyCode /* first_key */, /* first changed key */ int /* num_keys */, /* number of changed keys */ @@ -1022,36 +1022,36 @@ extern Bool XkbUpdateMapFromCore( /* Fal /***====================================================================***/ -extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo( +X11API XkbDeviceLedInfoPtr X11APIENTRY XkbAddDeviceLedInfo( XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, unsigned int /* ledId */ ); -extern Status XkbResizeDeviceButtonActions( +X11API Status X11APIENTRY XkbResizeDeviceButtonActions( XkbDeviceInfoPtr /* devi */, unsigned int /* newTotal */ ); -extern XkbDeviceInfoPtr XkbAllocDeviceInfo( +X11API XkbDeviceInfoPtr X11APIENTRY XkbAllocDeviceInfo( unsigned int /* deviceSpec */, unsigned int /* nButtons */, unsigned int /* szLeds */ ); -extern void XkbFreeDeviceInfo( +X11API void X11APIENTRY XkbFreeDeviceInfo( XkbDeviceInfoPtr /* devi */, unsigned int /* which */, Bool /* freeDevI */ ); -extern void XkbNoteDeviceChanges( +X11API void X11APIENTRY XkbNoteDeviceChanges( XkbDeviceChangesPtr /* old */, XkbExtensionDeviceNotifyEvent * /* new */, unsigned int /* wanted */ ); -extern XkbDeviceInfoPtr XkbGetDeviceInfo( +X11API XkbDeviceInfoPtr X11APIENTRY XkbGetDeviceInfo( Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */, @@ -1059,13 +1059,13 @@ extern XkbDeviceInfoPtr XkbGetDeviceInfo unsigned int /* ledID */ ); -extern Status XkbGetDeviceInfoChanges( +X11API Status X11APIENTRY XkbGetDeviceInfoChanges( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, XkbDeviceChangesPtr /* changes */ ); -extern Status XkbGetDeviceButtonActions( +X11API Status X11APIENTRY XkbGetDeviceButtonActions( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, Bool /* all */, @@ -1073,7 +1073,7 @@ extern Status XkbGetDeviceButtonActions( unsigned int /* nBtns */ ); -extern Status XkbGetDeviceLedInfo( +X11API Status X11APIENTRY XkbGetDeviceLedInfo( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass (class, XIDflt, XIAll) */, @@ -1081,19 +1081,19 @@ extern Status XkbGetDeviceLedInfo( unsigned int /* which (XkbXI_Indicator{Names,Map}Mask */ ); -extern Bool XkbSetDeviceInfo( +X11API Bool X11APIENTRY XkbSetDeviceInfo( Display * /* dpy */, unsigned int /* which */, XkbDeviceInfoPtr /* devi */ ); -extern Bool XkbChangeDeviceInfo( +X11API Bool X11APIENTRY XkbChangeDeviceInfo( Display* /* dpy */, XkbDeviceInfoPtr /* desc */, XkbDeviceChangesPtr /* changes */ ); -extern Bool XkbSetDeviceLedInfo( +X11API Bool X11APIENTRY XkbSetDeviceLedInfo( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, @@ -1101,7 +1101,7 @@ extern Bool XkbSetDeviceLedInfo( unsigned int /* which */ ); -extern Bool XkbSetDeviceButtonActions( +X11API Bool X11APIENTRY XkbSetDeviceButtonActions( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* first */, @@ -1110,13 +1110,13 @@ extern Bool XkbSetDeviceButtonActions( /***====================================================================***/ -extern char XkbToControl( +X11API char X11APIENTRY XkbToControl( char /* c */ ); /***====================================================================***/ -extern Bool XkbSetDebuggingFlags( +X11API Bool X11APIENTRY XkbSetDebuggingFlags( Display * /* dpy */, unsigned int /* mask */, unsigned int /* flags */, @@ -1127,19 +1127,19 @@ extern Bool XkbSetDebuggingFlags( unsigned int * /* rtrn_ctrls */ ); -extern Bool XkbApplyVirtualModChanges( +X11API Bool X11APIENTRY XkbApplyVirtualModChanges( XkbDescPtr /* xkb */, unsigned int /* changed */, XkbChangesPtr /* changes */ ); -extern Bool XkbUpdateActionVirtualMods( +X11API Bool X11APIENTRY XkbUpdateActionVirtualMods( XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* changed */ ); -extern void XkbUpdateKeyTypeVirtualMods( +X11API void X11APIENTRY XkbUpdateKeyTypeVirtualMods( XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, unsigned int /* changed */, Index: lib/X11/Xcms.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xcms.h,v retrieving revision 1.2 diff -u -p -r1.2 Xcms.h --- lib/X11/Xcms.h 23 Apr 2004 18:43:24 -0000 1.2 +++ lib/X11/Xcms.h 23 Feb 2005 06:19:57 -0000 @@ -336,22 +336,22 @@ typedef struct _XcmsFunctionSet { _XFUNCPROTOBEGIN -extern Status XcmsAddColorSpace ( +X11API Status X11APIENTRY XcmsAddColorSpace( XcmsColorSpace* /* pColorSpace */ ); -extern Status XcmsAddFunctionSet ( +X11API Status X11APIENTRY XcmsAddFunctionSet( XcmsFunctionSet* /* functionSet */ ); -extern Status XcmsAllocColor ( +X11API Status X11APIENTRY XcmsAllocColor( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* color_in_out */, XcmsColorFormat /* result_format */ ); -extern Status XcmsAllocNamedColor ( +X11API Status X11APIENTRY XcmsAllocNamedColor( Display* /* dpy */, Colormap /* colormap */, _Xconst char* /* color_string */, @@ -360,12 +360,12 @@ extern Status XcmsAllocNamedColor ( XcmsColorFormat /* result_format */ ); -extern XcmsCCC XcmsCCCOfColormap ( +X11API XcmsCCC X11APIENTRY XcmsCCCOfColormap( Display* /* dpy */, Colormap /* colormap */ ); -extern Status XcmsCIELabClipab( +X11API Status X11APIENTRY XcmsCIELabClipab( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -373,7 +373,7 @@ extern Status XcmsCIELabClipab( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELabClipL( +X11API Status X11APIENTRY XcmsCIELabClipL( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -381,7 +381,7 @@ extern Status XcmsCIELabClipL( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELabClipLab( +X11API Status X11APIENTRY XcmsCIELabClipLab( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -389,41 +389,41 @@ extern Status XcmsCIELabClipLab( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELabQueryMaxC ( +X11API Status X11APIENTRY XcmsCIELabQueryMaxC( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* L_star */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELabQueryMaxL ( +X11API Status X11APIENTRY XcmsCIELabQueryMaxL( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELabQueryMaxLC ( +X11API Status X11APIENTRY XcmsCIELabQueryMaxLC( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELabQueryMinL ( +X11API Status X11APIENTRY XcmsCIELabQueryMinL( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELabToCIEXYZ ( +X11API Status X11APIENTRY XcmsCIELabToCIEXYZ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIELabWhiteShiftColors( +X11API Status X11APIENTRY XcmsCIELabWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -433,7 +433,7 @@ extern Status XcmsCIELabWhiteShiftColors Bool* /* compression_flags_return */ ); -extern Status XcmsCIELuvClipL( +X11API Status X11APIENTRY XcmsCIELuvClipL( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -441,7 +441,7 @@ extern Status XcmsCIELuvClipL( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELuvClipLuv( +X11API Status X11APIENTRY XcmsCIELuvClipLuv( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -449,7 +449,7 @@ extern Status XcmsCIELuvClipLuv( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELuvClipuv( +X11API Status X11APIENTRY XcmsCIELuvClipuv( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -457,41 +457,41 @@ extern Status XcmsCIELuvClipuv( Bool* /* compression_flags_return */ ); -extern Status XcmsCIELuvQueryMaxC ( +X11API Status X11APIENTRY XcmsCIELuvQueryMaxC( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* L_star */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELuvQueryMaxL ( +X11API Status X11APIENTRY XcmsCIELuvQueryMaxL( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELuvQueryMaxLC ( +X11API Status X11APIENTRY XcmsCIELuvQueryMaxLC( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELuvQueryMinL ( +X11API Status X11APIENTRY XcmsCIELuvQueryMinL( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsCIELuvToCIEuvY ( +X11API Status X11APIENTRY XcmsCIELuvToCIEuvY( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIELuvWhiteShiftColors( +X11API Status X11APIENTRY XcmsCIELuvWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -501,67 +501,67 @@ extern Status XcmsCIELuvWhiteShiftColors Bool* /* compression_flags_return */ ); -extern Status XcmsCIEXYZToCIELab ( +X11API Status X11APIENTRY XcmsCIEXYZToCIELab( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIEXYZToCIEuvY ( +X11API Status X11APIENTRY XcmsCIEXYZToCIEuvY( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIEXYZToCIExyY ( +X11API Status X11APIENTRY XcmsCIEXYZToCIExyY( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIEXYZToRGBi ( +X11API Status X11APIENTRY XcmsCIEXYZToRGBi( XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ ); -extern Status XcmsCIEuvYToCIELuv ( +X11API Status X11APIENTRY XcmsCIEuvYToCIELuv( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIEuvYToCIEXYZ ( +X11API Status X11APIENTRY XcmsCIEuvYToCIEXYZ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIEuvYToTekHVC ( +X11API Status X11APIENTRY XcmsCIEuvYToTekHVC( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsCIExyYToCIEXYZ ( +X11API Status X11APIENTRY XcmsCIExyYToCIEXYZ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern XcmsColor *XcmsClientWhitePointOfCCC ( +X11API XcmsColor *XcmsClientWhitePointOfCCC ( XcmsCCC /* ccc */ ); -extern Status XcmsConvertColors ( +X11API Status X11APIENTRY XcmsConvertColors( XcmsCCC /* ccc */, XcmsColor* /* colorArry_in_out */, unsigned int /* nColors */, @@ -569,7 +569,7 @@ extern Status XcmsConvertColors ( Bool* /* compArry_return */ ); -extern XcmsCCC XcmsCreateCCC ( +X11API XcmsCCC X11APIENTRY XcmsCreateCCC( Display* /* dpy */, int /* screenNumber */, Visual* /* visual */, @@ -580,24 +580,24 @@ extern XcmsCCC XcmsCreateCCC ( XPointer /* whitePtAdjClientData */ ); -extern XcmsCCC XcmsDefaultCCC ( +X11API XcmsCCC X11APIENTRY XcmsDefaultCCC( Display* /* dpy */, int /* screenNumber */ ); -extern Display *XcmsDisplayOfCCC ( +X11API Display *X11APIENTRY XcmsDisplayOfCCC( XcmsCCC /* ccc */ ); -extern XcmsColorFormat XcmsFormatOfPrefix ( +X11API XcmsColorFormat X11APIENTRY XcmsFormatOfPrefix( char* /* prefix */ ); -extern void XcmsFreeCCC ( +X11API void X11APIENTRY XcmsFreeCCC( XcmsCCC /* ccc */ ); -extern Status XcmsLookupColor ( +X11API Status X11APIENTRY XcmsLookupColor( Display* /* dpy */, Colormap /* colormap */, _Xconst char* /* color_string */, @@ -606,30 +606,30 @@ extern Status XcmsLookupColor ( XcmsColorFormat /* result_format */ ); -extern char *XcmsPrefixOfFormat ( +X11API char *X11APIENTRY XcmsPrefixOfFormat( XcmsColorFormat /* id */ ); -extern Status XcmsQueryBlack ( +X11API Status X11APIENTRY XcmsQueryBlack( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); -extern Status XcmsQueryBlue ( +X11API Status X11APIENTRY XcmsQueryBlue( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); -extern Status XcmsQueryColor ( +X11API Status X11APIENTRY XcmsQueryColor( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* pColor_in_out */, XcmsColorFormat /* result_format */ ); -extern Status XcmsQueryColors ( +X11API Status X11APIENTRY XcmsQueryColors( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* colorArry_in_out */, @@ -637,83 +637,83 @@ extern Status XcmsQueryColors ( XcmsColorFormat /* result_format */ ); -extern Status XcmsQueryGreen ( +X11API Status X11APIENTRY XcmsQueryGreen( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); -extern Status XcmsQueryRed ( +X11API Status X11APIENTRY XcmsQueryRed( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); -extern Status XcmsQueryWhite ( +X11API Status X11APIENTRY XcmsQueryWhite( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); -extern Status XcmsRGBiToCIEXYZ ( +X11API Status X11APIENTRY XcmsRGBiToCIEXYZ( XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ ); -extern Status XcmsRGBiToRGB ( +X11API Status X11APIENTRY XcmsRGBiToRGB( XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ ); -extern Status XcmsRGBToRGBi ( +X11API Status X11APIENTRY XcmsRGBToRGBi( XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ ); -extern int XcmsScreenNumberOfCCC ( +X11API int X11APIENTRY XcmsScreenNumberOfCCC( XcmsCCC /* ccc */ ); -extern XcmsColor *XcmsScreenWhitePointOfCCC ( +X11API XcmsColor *XcmsScreenWhitePointOfCCC ( XcmsCCC /* ccc */ ); -extern XcmsCCC XcmsSetCCCOfColormap( +X11API XcmsCCC X11APIENTRY XcmsSetCCCOfColormap( Display* /* dpy */, Colormap /* colormap */, XcmsCCC /* ccc */ ); -extern XcmsCompressionProc XcmsSetCompressionProc ( +X11API XcmsCompressionProc X11APIENTRY XcmsSetCompressionProc( XcmsCCC /* ccc */, XcmsCompressionProc /* compression_proc */, XPointer /* client_data */ ); -extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc ( +X11API XcmsWhiteAdjustProc X11APIENTRY XcmsSetWhiteAdjustProc( XcmsCCC /* ccc */, XcmsWhiteAdjustProc /* white_adjust_proc */, XPointer /* client_data */ ); -extern Status XcmsSetWhitePoint ( +X11API Status X11APIENTRY XcmsSetWhitePoint( XcmsCCC /* ccc */, XcmsColor* /* color */ ); -extern Status XcmsStoreColor ( +X11API Status X11APIENTRY XcmsStoreColor( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* pColor_in */ ); -extern Status XcmsStoreColors ( +X11API Status X11APIENTRY XcmsStoreColors( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* colorArry_in */, @@ -721,7 +721,7 @@ extern Status XcmsStoreColors ( Bool* /* compArry_return */ ); -extern Status XcmsTekHVCClipC( +X11API Status X11APIENTRY XcmsTekHVCClipC( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -729,7 +729,7 @@ extern Status XcmsTekHVCClipC( Bool* /* compression_flags_return */ ); -extern Status XcmsTekHVCClipV( +X11API Status X11APIENTRY XcmsTekHVCClipV( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -737,7 +737,7 @@ extern Status XcmsTekHVCClipV( Bool* /* compression_flags_return */ ); -extern Status XcmsTekHVCClipVC( +X11API Status X11APIENTRY XcmsTekHVCClipVC( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, @@ -745,48 +745,48 @@ extern Status XcmsTekHVCClipVC( Bool* /* compression_flags_return */ ); -extern Status XcmsTekHVCQueryMaxC ( +X11API Status X11APIENTRY XcmsTekHVCQueryMaxC( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* value */, XcmsColor* /* color_return */ ); -extern Status XcmsTekHVCQueryMaxV ( +X11API Status X11APIENTRY XcmsTekHVCQueryMaxV( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsTekHVCQueryMaxVC ( +X11API Status X11APIENTRY XcmsTekHVCQueryMaxVC( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsColor* /* color_return */ ); -extern Status XcmsTekHVCQueryMaxVSamples ( +X11API Status X11APIENTRY XcmsTekHVCQueryMaxVSamples( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsColor* /* colors_return */, unsigned int /* nsamples */ ); -extern Status XcmsTekHVCQueryMinV ( +X11API Status X11APIENTRY XcmsTekHVCQueryMinV( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ ); -extern Status XcmsTekHVCToCIEuvY ( +X11API Status X11APIENTRY XcmsTekHVCToCIEuvY( XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ ); -extern Status XcmsTekHVCWhiteShiftColors( +X11API Status X11APIENTRY XcmsTekHVCWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -796,7 +796,7 @@ extern Status XcmsTekHVCWhiteShiftColors Bool* /* compression_flags_return */ ); -extern Visual *XcmsVisualOfCCC ( +X11API Visual * X11APIENTRY XcmsVisualOfCCC( XcmsCCC /* ccc */ ); Index: lib/X11/Xlibint.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xlibint.h,v retrieving revision 1.3 diff -u -p -r1.3 Xlibint.h --- lib/X11/Xlibint.h 31 Aug 2004 11:37:03 -0000 1.3 +++ lib/X11/Xlibint.h 23 Feb 2005 06:22:48 -0000 @@ -273,20 +273,20 @@ struct _XLockPtrs { #endif /* in XlibInt.c */ -extern void (*_XCreateMutex_fn)( +X11API void (*_XCreateMutex_fn)( LockInfoPtr /* lock */ ); -extern void (*_XFreeMutex_fn)( +X11API void (*_XFreeMutex_fn)( LockInfoPtr /* lock */ ); -extern void (*_XLockMutex_fn)( +X11API void (*_XLockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) , char * /* file */ , int /* line */ #endif ); -extern void (*_XUnlockMutex_fn)( +X11API void (*_XUnlockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) , char * /* file */ @@ -294,7 +294,7 @@ extern void (*_XUnlockMutex_fn)( #endif ); -extern LockInfoPtr _Xglobal_lock; +X11API extern LockInfoPtr _Xglobal_lock; #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) #define LockDisplay(d) if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__) @@ -578,7 +578,7 @@ extern LockInfoPtr _Xglobal_lock; #define SyncHandle() \ if (dpy->synchandler) (*dpy->synchandler)(dpy) -extern void _XFlushGCCache(Display *dpy, GC gc); +X11API void X11APIENTRY _XFlushGCCache(Display *dpy, GC gc); #define FlushGC(dpy, gc) \ if ((gc)->dirty) _XFlushGCCache((dpy), (gc)) /* @@ -630,12 +630,12 @@ extern void _XFlushGCCache(Display *dpy, #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len)) #ifdef LONG64 #define Data32(dpy, data, len) _XData32(dpy, (long *)data, len) -extern int _XData32( +X11API int X11APIENTRY _XData32( Display *dpy, register long *data, unsigned len ); -extern void _XRead32( +X11API void X11APIENTRY _XRead32( Display *dpy, register long *data, long len @@ -758,7 +758,7 @@ typedef struct _XAsyncEState { int error_count; } _XAsyncErrorState; -extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler); +X11API void X11APIENTRY _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler); #define DeqAsyncHandler(dpy,handler) { \ if (dpy->async_handlers == (handler)) \ dpy->async_handlers = (handler)->next; \ @@ -883,63 +883,63 @@ typedef struct _XExten { /* private to /* extension hooks */ #ifdef DataRoutineIsProcedure -extern void Data(Display *dpy, char *data, long len); +X11API void X11APIENTRY Data(Display *dpy, char *data, long len); #endif -extern int _XError( +X11API int X11APIENTRY _XError( Display* /* dpy */, xError* /* rep */ ); -extern int _XIOError( +X11API int X11APIENTRY _XIOError( Display* /* dpy */ ); -extern int (*_XIOErrorFunction)( +X11API int (*_XIOErrorFunction)( Display* /* dpy */ ); -extern int (*_XErrorFunction)( +X11API int (*_XErrorFunction)( Display* /* dpy */, XErrorEvent* /* error_event */ ); -extern void _XEatData( +X11API void X11APIENTRY _XEatData( Display* /* dpy */, unsigned long /* n */ ); -extern char *_XAllocScratch( +X11API char * X11APIENTRY _XAllocScratch( Display* /* dpy */, unsigned long /* nbytes */ ); -extern char *_XAllocTemp( +X11API char * X11APIENTRY _XAllocTemp( Display* /* dpy */, unsigned long /* nbytes */ ); -extern void _XFreeTemp( +X11API void X11APIENTRY _XFreeTemp( Display* /* dpy */, char* /* buf */, unsigned long /* nbytes */ ); -extern Visual *_XVIDtoVisual( +X11API Visual *_XVIDtoVisual( Display* /* dpy */, VisualID /* id */ ); -extern unsigned long _XSetLastRequestRead( +X11API unsigned long X11APIENTRY _XSetLastRequestRead( Display* /* dpy */, xGenericReply* /* rep */ ); -extern int _XGetHostname( +X11API int X11APIENTRY _XGetHostname( char* /* buf */, int /* maxlen */ ); -extern Screen *_XScreenOfWindow( +X11API Screen *_XScreenOfWindow( Display* /* dpy */, Window /* w */ ); -extern Bool _XAsyncErrorHandler( +X11API Bool X11APIENTRY _XAsyncErrorHandler( Display* /* dpy */, xReply* /* rep */, char* /* buf */, int /* len */, XPointer /* data */ ); -extern char *_XGetAsyncReply( +X11API char *_XGetAsyncReply( Display* /* dpy */, char* /* replbuf */, xReply* /* rep */, @@ -948,7 +948,7 @@ extern char *_XGetAsyncReply( int /* extra */, Bool /* discard */ ); -extern void _XGetAsyncData( +X11API void X11APIENTRY _XGetAsyncData( Display* /* dpy */, char * /* data */, char * /* buf */, @@ -957,71 +957,71 @@ extern void _XGetAsyncData( int /* datalen */, int /* discardtotal */ ); -extern void _XFlush( +X11API void X11APIENTRY _XFlush( Display* /* dpy */ ); -extern int _XEventsQueued( +X11API int X11APIENTRY _XEventsQueued( Display* /* dpy */, int /* mode */ ); -extern void _XReadEvents( +X11API void X11APIENTRY _XReadEvents( Display* /* dpy */ ); -extern int _XRead( +X11API int X11APIENTRY _XRead( Display* /* dpy */, char* /* data */, long /* size */ ); -extern void _XReadPad( +X11API void X11APIENTRY _XReadPad( Display* /* dpy */, char* /* data */, long /* size */ ); -extern void _XSend( +X11API void X11APIENTRY _XSend( Display* /* dpy */, _Xconst char* /* data */, long /* size */ ); -extern Status _XReply( +X11API Status X11APIENTRY _XReply( Display* /* dpy */, xReply* /* rep */, int /* extra */, Bool /* discard */ ); -extern void _XEnq( +X11API void X11APIENTRY _XEnq( Display* /* dpy */, xEvent* /* event */ ); -extern void _XDeq( +X11API void X11APIENTRY _XDeq( Display* /* dpy */, _XQEvent* /* prev */, _XQEvent* /* qelt */ ); -extern Bool _XUnknownWireEvent( +X11API Bool X11APIENTRY _XUnknownWireEvent( Display* /* dpy */, XEvent* /* re */, xEvent* /* event */ ); -extern Status _XUnknownNativeEvent( +X11API Status X11APIENTRY _XUnknownNativeEvent( Display* /* dpy */, XEvent* /* re */, xEvent* /* event */ ); -extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event); -extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we); -extern Bool _XPollfdCacheInit(Display *dpy); -extern void _XPollfdCacheAdd(Display *dpy, int fd); -extern void _XPollfdCacheDel(Display *dpy, int fd); -extern XID _XAllocID(Display *dpy); -extern void _XAllocIDs(Display *dpy, XID *ids, int count); +X11API Bool X11APIENTRY _XWireToEvent(Display *dpy, XEvent *re, xEvent *event); +X11API Bool X11APIENTRY _XDefaultWireError(Display *display, XErrorEvent *he, xError *we); +X11API Bool X11APIENTRY _XPollfdCacheInit(Display *dpy); +X11API void X11APIENTRY _XPollfdCacheAdd(Display *dpy, int fd); +X11API void X11APIENTRY _XPollfdCacheDel(Display *dpy, int fd); +X11API XID X11APIENTRY _XAllocID(Display *dpy); +X11API void X11APIENTRY _XAllocIDs(Display *dpy, XID *ids, int count); -extern int _XFreeExtData( +X11API int X11APIENTRY _XFreeExtData( XExtData* /* extension */ ); -extern int (*XESetCreateGC( +X11API int (*XESetCreateGC( Display* /* display */, int /* extension */, int (*) ( @@ -1033,7 +1033,7 @@ extern int (*XESetCreateGC( Display*, GC, XExtCodes* ); -extern int (*XESetCopyGC( +X11API int (*XESetCopyGC( Display* /* display */, int /* extension */, int (*) ( @@ -1045,7 +1045,7 @@ extern int (*XESetCopyGC( Display*, GC, XExtCodes* ); -extern int (*XESetFlushGC( +X11API int (*XESetFlushGC( Display* /* display */, int /* extension */, int (*) ( @@ -1057,7 +1057,7 @@ extern int (*XESetFlushGC( Display*, GC, XExtCodes* ); -extern int (*XESetFreeGC( +X11API int (*XESetFreeGC( Display* /* display */, int /* extension */, int (*) ( @@ -1069,7 +1069,7 @@ extern int (*XESetFreeGC( Display*, GC, XExtCodes* ); -extern int (*XESetCreateFont( +X11API int (*XESetCreateFont( Display* /* display */, int /* extension */, int (*) ( @@ -1081,7 +1081,7 @@ extern int (*XESetCreateFont( Display*, XFontStruct*, XExtCodes* ); -extern int (*XESetFreeFont( +X11API int (*XESetFreeFont( Display* /* display */, int /* extension */, int (*) ( @@ -1093,7 +1093,7 @@ extern int (*XESetFreeFont( Display*, XFontStruct*, XExtCodes* ); -extern int (*XESetCloseDisplay( +X11API int (*XESetCloseDisplay( Display* /* display */, int /* extension */, int (*) ( @@ -1104,7 +1104,7 @@ extern int (*XESetCloseDisplay( Display*, XExtCodes* ); -extern int (*XESetError( +X11API int (*XESetError( Display* /* display */, int /* extension */, int (*) ( @@ -1117,7 +1117,7 @@ extern int (*XESetError( Display*, xError*, XExtCodes*, int* ); -extern char* (*XESetErrorString( +X11API char* (*XESetErrorString( Display* /* display */, int /* extension */, char* (*) ( @@ -1131,7 +1131,7 @@ extern char* (*XESetErrorString( Display*, int, XExtCodes*, char*, int ); -extern void (*XESetPrintErrorValues ( +X11API void (*XESetPrintErrorValues ( Display* /* display */, int /* extension */, void (*)( @@ -1143,7 +1143,7 @@ extern void (*XESetPrintErrorValues ( Display*, XErrorEvent*, void* ); -extern Bool (*XESetWireToEvent( +X11API Bool (*XESetWireToEvent( Display* /* display */, int /* event_number */, Bool (*) ( @@ -1155,7 +1155,7 @@ extern Bool (*XESetWireToEvent( Display*, XEvent*, xEvent* ); -extern Status (*XESetEventToWire( +X11API Status (*XESetEventToWire( Display* /* display */, int /* event_number */, Status (*) ( @@ -1167,7 +1167,7 @@ extern Status (*XESetEventToWire( Display*, XEvent*, xEvent* ); -extern Bool (*XESetWireToError( +X11API Bool (*XESetWireToError( Display* /* display */, int /* error_number */, Bool (*) ( @@ -1179,7 +1179,7 @@ extern Bool (*XESetWireToError( Display*, XErrorEvent*, xError* ); -extern void (*XESetBeforeFlush( +X11API void (*XESetBeforeFlush( Display* /* display */, int /* error_number */, void (*) ( @@ -1201,14 +1201,14 @@ typedef void (*_XInternalConnectionProc) ); -extern Status _XRegisterInternalConnection( +X11API Status X11APIENTRY _XRegisterInternalConnection( Display* /* dpy */, int /* fd */, _XInternalConnectionProc /* callback */, XPointer /* call_data */ ); -extern void _XUnregisterInternalConnection( +X11API void X11APIENTRY _XUnregisterInternalConnection( Display* /* dpy */, int /* fd */ ); @@ -1230,18 +1230,18 @@ struct _XConnWatchInfo { /* info from XA }; #ifdef __UNIXOS2__ -extern char* __XOS2RedirRoot( +X11API char* X11APIENTRY X11APIENTRY __XOS2RedirRoot( char* ); #endif -extern int _XTextHeight( +X11API int X11APIENTRY X11APIENTRY X11APIENTRY _XTextHeight( XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ ); -extern int _XTextHeight16( +X11API int X11APIENTRY X11APIENTRY _XTextHeight16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* count */ @@ -1249,17 +1249,17 @@ extern int _XTextHeight16( #if defined(WIN32) -extern int _XOpenFile( +X11API int X11APIENTRY _XOpenFile( _Xconst char* /* path */, int /* flags */ ); -extern void* _XFopenFile( +X11API void* X11APIENTRY _XFopenFile( _Xconst char* /* path */, _Xconst char* /* mode */ ); -extern int _XAccessFile( +X11API int X11APIENTRY _XAccessFile( _Xconst char* /* path */ ); #else @@ -1268,29 +1268,29 @@ extern int _XAccessFile( #endif /* EvToWire.c */ -extern Status _XEventToWire(Display *dpy, XEvent *re, xEvent *event); +X11API Status X11APIENTRY _XEventToWire(Display *dpy, XEvent *re, xEvent *event); -extern int _XF86LoadQueryLocaleFont( +X11API int X11APIENTRY _XF86LoadQueryLocaleFont( Display* /* dpy */, _Xconst char* /* name*/, XFontStruct** /* xfp*/, Font* /* fidp */ ); -extern void _XProcessWindowAttributes ( +X11API void _XProcessWindowAttributes( register Display *dpy, xChangeWindowAttributesReq *req, register unsigned long valuemask, register XSetWindowAttributes *attributes); -extern int _XDefaultError( +X11API int X11APIENTRY _XDefaultError( Display *dpy, XErrorEvent *event); -extern int _XDefaultIOError( +X11API int X11APIENTRY _XDefaultIOError( Display *dpy); -extern void _XSetClipRectangles ( +X11API void X11APIENTRY _XSetClipRectangles( register Display *dpy, GC gc, int clip_x_origin, int clip_y_origin, @@ -1298,12 +1298,12 @@ extern void _XSetClipRectangles ( int n, int ordering); -Status _XGetWindowAttributes( +X11API Status X11APIENTRY _XGetWindowAttributes( register Display *dpy, Window w, XWindowAttributes *attr); -int _XPutBackEvent ( +X11API int X11APIENTRY _XPutBackEvent( register Display *dpy, register XEvent *event); Index: lib/X11/Xresource.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xresource.h,v retrieving revision 1.2 diff -u -p -r1.2 Xresource.h --- lib/X11/Xresource.h 23 Apr 2004 18:43:24 -0000 1.2 +++ lib/X11/Xresource.h 23 Feb 2005 05:39:56 -0000 @@ -73,7 +73,7 @@ _XFUNCPROTOBEGIN * ****************************************************************/ -extern char *Xpermalloc( +X11API char * X11APIENTRY Xpermalloc( unsigned int /* size */ ); @@ -90,20 +90,20 @@ typedef char *XrmString; #define NULLSTRING ((XrmString) 0) /* find quark for string, create new quark if none already exists */ -extern XrmQuark XrmStringToQuark( +X11API XrmQuark X11APIENTRY XrmStringToQuark( _Xconst char* /* string */ ); -extern XrmQuark XrmPermStringToQuark( +X11API XrmQuark X11APIENTRY XrmPermStringToQuark( _Xconst char* /* string */ ); /* find string for quark */ -extern XrmString XrmQuarkToString( +X11API XrmString X11APIENTRY XrmQuarkToString( XrmQuark /* quark */ ); -extern XrmQuark XrmUniqueQuark( +X11API XrmQuark X11APIENTRY XrmUniqueQuark( void ); @@ -118,12 +118,12 @@ extern XrmQuark XrmUniqueQuark( typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList; -extern void XrmStringToQuarkList( +X11API void X11APIENTRY XrmStringToQuarkList( _Xconst char* /* string */, XrmQuarkList /* quarks_return */ ); -extern void XrmStringToBindingQuarkList( +X11API void X11APIENTRY XrmStringToBindingQuarkList( _Xconst char* /* string */, XrmBindingList /* bindings_return */, XrmQuarkList /* quarks_return */ @@ -177,11 +177,11 @@ typedef XrmHashTable XrmSearchList[]; typedef struct _XrmHashBucketRec *XrmDatabase; -extern void XrmDestroyDatabase( +X11API void X11APIENTRY XrmDestroyDatabase( XrmDatabase /* database */ ); -extern void XrmQPutResource( +X11API void X11APIENTRY XrmQPutResource( XrmDatabase* /* database */, XrmBindingList /* bindings */, XrmQuarkList /* quarks */, @@ -189,32 +189,32 @@ extern void XrmQPutResource( XrmValue* /* value */ ); -extern void XrmPutResource( +X11API void X11APIENTRY XrmPutResource( XrmDatabase* /* database */, _Xconst char* /* specifier */, _Xconst char* /* type */, XrmValue* /* value */ ); -extern void XrmQPutStringResource( +X11API void X11APIENTRY XrmQPutStringResource( XrmDatabase* /* database */, XrmBindingList /* bindings */, XrmQuarkList /* quarks */, _Xconst char* /* value */ ); -extern void XrmPutStringResource( +X11API void X11APIENTRY XrmPutStringResource( XrmDatabase* /* database */, _Xconst char* /* specifier */, _Xconst char* /* value */ ); -extern void XrmPutLineResource( +X11API void X11APIENTRY XrmPutLineResource( XrmDatabase* /* database */, _Xconst char* /* line */ ); -extern Bool XrmQGetResource( +X11API Bool X11APIENTRY XrmQGetResource( XrmDatabase /* database */, XrmNameList /* quark_name */, XrmClassList /* quark_class */, @@ -222,7 +222,7 @@ extern Bool XrmQGetResource( XrmValue* /* value_return */ ); -extern Bool XrmGetResource( +X11API Bool X11APIENTRY XrmGetResource( XrmDatabase /* database */, _Xconst char* /* str_name */, _Xconst char* /* str_class */, @@ -230,7 +230,7 @@ extern Bool XrmGetResource( XrmValue* /* value_return */ ); -extern Bool XrmQGetSearchList( +X11API Bool X11APIENTRY XrmQGetSearchList( XrmDatabase /* database */, XrmNameList /* names */, XrmClassList /* classes */, @@ -238,7 +238,7 @@ extern Bool XrmQGetSearchList( int /* list_length */ ); -extern Bool XrmQGetSearchResource( +X11API Bool X11APIENTRY XrmQGetSearchResource( XrmSearchList /* list */, XrmName /* name */, XrmClass /* class */, @@ -254,42 +254,42 @@ extern Bool XrmQGetSearchResource( #ifndef _XP_PRINT_SERVER_ -extern void XrmSetDatabase( +X11API void X11APIENTRY XrmSetDatabase( Display* /* display */, XrmDatabase /* database */ ); -extern XrmDatabase XrmGetDatabase( +X11API XrmDatabase X11APIENTRY XrmGetDatabase( Display* /* display */ ); #endif /* !_XP_PRINT_SERVER_ */ -extern XrmDatabase XrmGetFileDatabase( +X11API XrmDatabase X11APIENTRY XrmGetFileDatabase( _Xconst char* /* filename */ ); -extern Status XrmCombineFileDatabase( +X11API Status X11APIENTRY XrmCombineFileDatabase( _Xconst char* /* filename */, XrmDatabase* /* target */, Bool /* override */ ); -extern XrmDatabase XrmGetStringDatabase( +X11API XrmDatabase X11APIENTRY XrmGetStringDatabase( _Xconst char* /* data */ /* null terminated string */ ); -extern void XrmPutFileDatabase( +X11API void X11APIENTRY XrmPutFileDatabase( XrmDatabase /* database */, _Xconst char* /* filename */ ); -extern void XrmMergeDatabases( +X11API void X11APIENTRY XrmMergeDatabases( XrmDatabase /* source_db */, XrmDatabase* /* target_db */ ); -extern void XrmCombineDatabase( +X11API void X11APIENTRY XrmCombineDatabase( XrmDatabase /* source_db */, XrmDatabase* /* target_db */, Bool /* override */ @@ -298,7 +298,7 @@ extern void XrmCombineDatabase( #define XrmEnumAllLevels 0 #define XrmEnumOneLevel 1 -extern Bool XrmEnumerateDatabase( +X11API Bool X11APIENTRY XrmEnumerateDatabase( XrmDatabase /* db */, XrmNameList /* name_prefix */, XrmClassList /* class_prefix */, @@ -314,7 +314,7 @@ extern Bool XrmEnumerateDatabase( XPointer /* closure */ ); -extern const char *XrmLocaleOfDatabase( +X11API const char *XrmLocaleOfDatabase( XrmDatabase /* database */ ); @@ -345,7 +345,7 @@ typedef struct { } XrmOptionDescRec, *XrmOptionDescList; -extern void XrmParseCommand( +X11API void X11APIENTRY XrmParseCommand( XrmDatabase* /* database */, XrmOptionDescList /* table */, int /* table_count */, Index: lib/X11/Xutil.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xutil.h,v retrieving revision 1.3 diff -u -p -r1.3 Xutil.h --- lib/X11/Xutil.h 19 Aug 2004 06:48:06 -0000 1.3 +++ lib/X11/Xutil.h 23 Feb 2005 05:36:38 -0000 @@ -185,20 +185,20 @@ typedef struct { } XClassHint; #ifdef XUTIL_DEFINE_FUNCTIONS -extern int XDestroyImage( +X11API int X11APIENTRY XDestroyImage( XImage *ximage); -extern unsigned long XGetPixel( +X11API unsigned long X11APIENTRY XGetPixel( XImage *ximage, int x, int y); -extern int XPutPixel( +X11API int X11APIENTRY XPutPixel( XImage *ximage, int x, int y, unsigned long pixel); -extern XImage *XSubImage( +X11API XImage *XSubImage( XImage *ximage, int x, int y, unsigned int width, unsigned int height); -extern int XAddPixel( +X11API int X11APIENTRY XAddPixel( XImage *ximage, long value); #else @@ -356,83 +356,83 @@ _XFUNCPROTOBEGIN /* The following declarations are alphabetized. */ -extern XClassHint *XAllocClassHint ( +X11API XClassHint * X11APIENTRY XAllocClassHint ( void ); -extern XIconSize *XAllocIconSize ( +X11API XIconSize * X11APIENTRY XAllocIconSize ( void ); -extern XSizeHints *XAllocSizeHints ( +X11API XSizeHints * X11APIENTRY XAllocSizeHints ( void ); -extern XStandardColormap *XAllocStandardColormap ( +X11API XStandardColormap * X11APIENTRY XAllocStandardColormap ( void ); -extern XWMHints *XAllocWMHints ( +X11API XWMHints * X11APIENTRY XAllocWMHints ( void ); -extern int XClipBox( +X11API int X11APIENTRY XClipBox( Region /* r */, XRectangle* /* rect_return */ ); -extern Region XCreateRegion( +X11API Region X11APIENTRY XCreateRegion( void ); -extern const char *XDefaultString (void); +X11API const char * X11APIENTRY XDefaultString (void); -extern int XDeleteContext( +X11API int X11APIENTRY XDeleteContext( Display* /* display */, XID /* rid */, XContext /* context */ ); -extern int XDestroyRegion( +X11API int X11APIENTRY XDestroyRegion( Region /* r */ ); -extern int XEmptyRegion( +X11API int X11APIENTRY XEmptyRegion( Region /* r */ ); -extern int XEqualRegion( +X11API int X11APIENTRY XEqualRegion( Region /* r1 */, Region /* r2 */ ); -extern int XFindContext( +X11API int X11APIENTRY XFindContext( Display* /* display */, XID /* rid */, XContext /* context */, XPointer* /* data_return */ ); -extern Status XGetClassHint( +X11API Status X11APIENTRY XGetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints_return */ ); -extern Status XGetIconSizes( +X11API Status X11APIENTRY XGetIconSizes( Display* /* display */, Window /* w */, XIconSize** /* size_list_return */, int* /* count_return */ ); -extern Status XGetNormalHints( +X11API Status X11APIENTRY XGetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */ ); -extern Status XGetRGBColormaps( +X11API Status X11APIENTRY XGetRGBColormaps( Display* /* display */, Window /* w */, XStandardColormap** /* stdcmap_return */, @@ -440,65 +440,65 @@ extern Status XGetRGBColormaps( Atom /* property */ ); -extern Status XGetSizeHints( +X11API Status X11APIENTRY XGetSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, Atom /* property */ ); -extern Status XGetStandardColormap( +X11API Status X11APIENTRY XGetStandardColormap( Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, Atom /* property */ ); -extern Status XGetTextProperty( +X11API Status X11APIENTRY XGetTextProperty( Display* /* display */, Window /* window */, XTextProperty* /* text_prop_return */, Atom /* property */ ); -extern XVisualInfo *XGetVisualInfo( +X11API XVisualInfo *XGetVisualInfo( Display* /* display */, long /* vinfo_mask */, XVisualInfo* /* vinfo_template */, int* /* nitems_return */ ); -extern Status XGetWMClientMachine( +X11API Status X11APIENTRY XGetWMClientMachine( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); -extern XWMHints *XGetWMHints( +X11API XWMHints *XGetWMHints( Display* /* display */, Window /* w */ ); -extern Status XGetWMIconName( +X11API Status X11APIENTRY XGetWMIconName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); -extern Status XGetWMName( +X11API Status X11APIENTRY XGetWMName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); -extern Status XGetWMNormalHints( +X11API Status X11APIENTRY XGetWMNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */ ); -extern Status XGetWMSizeHints( +X11API Status X11APIENTRY XGetWMSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, @@ -506,25 +506,25 @@ extern Status XGetWMSizeHints( Atom /* property */ ); -extern Status XGetZoomHints( +X11API Status X11APIENTRY XGetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints_return */ ); -extern int XIntersectRegion( +X11API int X11APIENTRY XIntersectRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); -extern void XConvertCase( +X11API void X11APIENTRY XConvertCase( KeySym /* sym */, KeySym* /* lower */, KeySym* /* upper */ ); -extern int XLookupString( +X11API int X11APIENTRY XLookupString( XKeyEvent* /* event_struct */, char* /* buffer_return */, int /* bytes_buffer */, @@ -532,7 +532,7 @@ extern int XLookupString( XComposeStatus* /* status_in_out */ ); -extern Status XMatchVisualInfo( +X11API Status X11APIENTRY XMatchVisualInfo( Display* /* display */, int /* screen */, int /* depth */, @@ -540,25 +540,25 @@ extern Status XMatchVisualInfo( XVisualInfo* /* vinfo_return */ ); -extern int XOffsetRegion( +X11API int X11APIENTRY XOffsetRegion( Region /* r */, int /* dx */, int /* dy */ ); -extern Bool XPointInRegion( +X11API Bool X11APIENTRY XPointInRegion( Region /* r */, int /* x */, int /* y */ ); -extern Region XPolygonRegion( +X11API Region X11APIENTRY XPolygonRegion( XPoint* /* points */, int /* n */, int /* fill_rule */ ); -extern int XRectInRegion( +X11API int X11APIENTRY XRectInRegion( Region /* r */, int /* x */, int /* y */, @@ -566,33 +566,33 @@ extern int XRectInRegion( unsigned int /* height */ ); -extern int XSaveContext( +X11API int X11APIENTRY XSaveContext( Display* /* display */, XID /* rid */, XContext /* context */, _Xconst char* /* data */ ); -extern int XSetClassHint( +X11API int X11APIENTRY XSetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints */ ); -extern int XSetIconSizes( +X11API int X11APIENTRY XSetIconSizes( Display* /* display */, Window /* w */, XIconSize* /* size_list */, int /* count */ ); -extern int XSetNormalHints( +X11API int X11APIENTRY XSetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ ); -extern void XSetRGBColormaps( +X11API void X11APIENTRY XSetRGBColormaps( Display* /* display */, Window /* w */, XStandardColormap* /* stdcmaps */, @@ -600,14 +600,14 @@ extern void XSetRGBColormaps( Atom /* property */ ); -extern int XSetSizeHints( +X11API int X11APIENTRY XSetSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ ); -extern int XSetStandardProperties( +X11API int X11APIENTRY XSetStandardProperties( Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -618,44 +618,44 @@ extern int XSetStandardProperties( XSizeHints* /* hints */ ); -extern void XSetTextProperty( +X11API void X11APIENTRY XSetTextProperty( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */, Atom /* property */ ); -extern void XSetWMClientMachine( +X11API void X11APIENTRY XSetWMClientMachine( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); -extern int XSetWMHints( +X11API int X11APIENTRY XSetWMHints( Display* /* display */, Window /* w */, XWMHints* /* wm_hints */ ); -extern void XSetWMIconName( +X11API void X11APIENTRY XSetWMIconName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); -extern void XSetWMName( +X11API void X11APIENTRY XSetWMName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); -extern void XSetWMNormalHints( +X11API void X11APIENTRY XSetWMNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ ); -extern void XSetWMProperties( +X11API void X11APIENTRY XSetWMProperties( Display* /* display */, Window /* w */, XTextProperty* /* window_name */, @@ -667,7 +667,7 @@ extern void XSetWMProperties( XClassHint* /* class_hints */ ); -extern void XmbSetWMProperties( +X11API void X11APIENTRY XmbSetWMProperties( Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -679,7 +679,7 @@ extern void XmbSetWMProperties( XClassHint* /* class_hints */ ); -extern void Xutf8SetWMProperties( +X11API void Xutf8SetWMProperties( Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -691,51 +691,51 @@ extern void Xutf8SetWMProperties( XClassHint* /* class_hints */ ); -extern void XSetWMSizeHints( +X11API void X11APIENTRY XSetWMSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ ); -extern int XSetRegion( +X11API int X11APIENTRY XSetRegion( Display* /* display */, GC /* gc */, Region /* r */ ); -extern void XSetStandardColormap( +X11API void X11APIENTRY XSetStandardColormap( Display* /* display */, Window /* w */, XStandardColormap* /* colormap */, Atom /* property */ ); -extern int XSetZoomHints( +X11API int X11APIENTRY XSetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints */ ); -extern int XShrinkRegion( +X11API int X11APIENTRY XShrinkRegion( Region /* r */, int /* dx */, int /* dy */ ); -extern Status XStringListToTextProperty( +X11API Status X11APIENTRY XStringListToTextProperty( char** /* list */, int /* count */, XTextProperty* /* text_prop_return */ ); -extern int XSubtractRegion( +X11API int X11APIENTRY XSubtractRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); -extern int XmbTextListToTextProperty( +X11API int X11APIENTRY XmbTextListToTextProperty( Display* display, char** list, int count, @@ -743,7 +743,7 @@ extern int XmbTextListToTextProperty( XTextProperty* text_prop_return ); -extern int XwcTextListToTextProperty( +X11API int X11APIENTRY XwcTextListToTextProperty( Display* display, wchar_t** list, int count, @@ -751,7 +751,7 @@ extern int XwcTextListToTextProperty( XTextProperty* text_prop_return ); -extern int Xutf8TextListToTextProperty( +X11API int Xutf8TextListToTextProperty( Display* display, char** list, int count, @@ -759,50 +759,50 @@ extern int Xutf8TextListToTextProperty( XTextProperty* text_prop_return ); -extern void XwcFreeStringList( +X11API void X11APIENTRY XwcFreeStringList( wchar_t** list ); -extern Status XTextPropertyToStringList( +X11API Status X11APIENTRY XTextPropertyToStringList( XTextProperty* /* text_prop */, char*** /* list_return */, int* /* count_return */ ); -extern int XmbTextPropertyToTextList( +X11API int X11APIENTRY XmbTextPropertyToTextList( Display* display, const XTextProperty* text_prop, char*** list_return, int* count_return ); -extern int XwcTextPropertyToTextList( +X11API int X11APIENTRY XwcTextPropertyToTextList( Display* display, const XTextProperty* text_prop, wchar_t*** list_return, int* count_return ); -extern int Xutf8TextPropertyToTextList( +X11API int Xutf8TextPropertyToTextList( Display* display, const XTextProperty* text_prop, char*** list_return, int* count_return ); -extern int XUnionRectWithRegion( +X11API int X11APIENTRY XUnionRectWithRegion( XRectangle* /* rectangle */, Region /* src_region */, Region /* dest_region_return */ ); -extern int XUnionRegion( +X11API int X11APIENTRY XUnionRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); -extern int XWMGeometry( +X11API int X11APIENTRY XWMGeometry( Display* /* display */, int /* screen_number */, _Xconst char* /* user_geometry */, @@ -816,7 +816,7 @@ extern int XWMGeometry( int* /* gravity_return */ ); -extern int XXorRegion( +X11API int X11APIENTRY XXorRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ Index: lib/X11/evtomask.c =================================================================== RCS file: /cvs/xorg/xc/lib/X11/evtomask.c,v retrieving revision 1.2 diff -u -p -r1.2 evtomask.c --- lib/X11/evtomask.c 23 Apr 2004 18:43:24 -0000 1.2 +++ lib/X11/evtomask.c 24 Feb 2005 04:29:01 -0000 @@ -27,12 +27,15 @@ in this Software without prior written a /* $XFree86: xc/lib/X11/evtomask.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ #include +#include /* * This array can be used given an event type to determine the mask bits * that could have generated it. + * + * NOTE: dmx uses this symbol so we must export it from libX11. */ -long const _Xevent_to_mask [LASTEvent] = { +X11API long const _Xevent_to_mask [LASTEvent] = { 0, /* no event 0 */ 0, /* no event 1 */ KeyPressMask, /* KeyPress */ Index: lib/Xau/Xauth.h =================================================================== RCS file: /cvs/xorg/xc/lib/Xau/Xauth.h,v retrieving revision 1.2 diff -u -p -r1.2 Xauth.h --- lib/Xau/Xauth.h 23 Apr 2004 18:43:36 -0000 1.2 +++ lib/Xau/Xauth.h 24 Feb 2005 06:27:15 -0000 @@ -47,6 +47,7 @@ typedef struct xauth { # include # include +# include /* for X11API, X11APIENTRY */ # include @@ -59,9 +60,9 @@ typedef struct xauth { _XFUNCPROTOBEGIN -char *XauFileName(void); +X11API char * X11APIENTRY XauFileName(void); -Xauth *XauReadAuth( +X11API Xauth * X11APIENTRY XauReadAuth( FILE* /* auth_file */ ); @@ -108,7 +109,7 @@ unsigned short /* name_length */, _Xconst char* /* name */ ); -Xauth *XauGetBestAuthByAddr( +X11API Xauth * X11APIENTRY XauGetBestAuthByAddr( #if NeedWidePrototypes unsigned int /* family */, unsigned int /* address_length */, @@ -128,7 +129,7 @@ char** /* type_names */, _Xconst int* /* type_lengths */ ); -void XauDisposeAuth( +X11API void X11APIENTRY XauDisposeAuth( Xauth* /* auth */ ); Index: programs/Xserver/hw/dmx/input/ChkNotMaskEv.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/input/ChkNotMaskEv.c,v retrieving revision 1.1 diff -u -p -r1.1 ChkNotMaskEv.c --- programs/Xserver/hw/dmx/input/ChkNotMaskEv.c 30 Jun 2004 20:06:55 -0000 1.1 +++ programs/Xserver/hw/dmx/input/ChkNotMaskEv.c 24 Feb 2005 03:38:28 -0000 @@ -59,7 +59,7 @@ #include "dmx.h" #include "ChkNotMaskEv.h" -extern long const _Xevent_to_mask[]; +X11API long const _Xevent_to_mask[]; /** Check existing events in queue to find if any match. If so, return. * If not, flush buffer and see if any more events are readable. If one