Making use of GCC Visibility reduces huge ELF symbols. Signed-off-by: Jim Huang Index: libX11/configure.ac =================================================================== --- libX11.orig/configure.ac 2007-05-26 23:55:44.000000000 +0800 +++ libX11/configure.ac 2007-05-26 23:56:22.000000000 +0800 @@ -379,6 +379,25 @@ XORG_CHECK_MALLOC_ZERO XORG_RELEASE_VERSION +# -------------------------- +# Adds -fvisibility=hidden to CFLAGS if running with gcc 4 or greater. + +AC_MSG_CHECKING([whether the compiler supports the visibility arg]) +dnl Check for gcc4 or greater +AC_TRY_COMPILE([ +void +#if defined(__GNUC__) && (__GNUC__ >= 4) +foo () {}; +#endif +], [], [ + has_visibility=yes + CFLAGS="$CFLAGS -fvisibility=hidden" +], [ + has_visibility=no +] +) +AC_MSG_RESULT($has_visibility) + AC_OUTPUT([Makefile include/Makefile man/Makefile Index: libX11/include/X11/ImUtil.h =================================================================== --- libX11.orig/include/X11/ImUtil.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/ImUtil.h 2007-05-26 23:56:22.000000000 +0800 @@ -3,16 +3,19 @@ #ifndef _IMUTIL_H_ #define _IMUTIL_H_ +_X_EXPORT extern int _XGetScanlinePad( Display *dpy, int depth); +_X_EXPORT extern int _XGetBitsPerPixel( Display *dpy, int depth); +_X_EXPORT extern int _XSetImage( XImage *srcimg, @@ -20,10 +23,13 @@ register int x, register int y); +_X_EXPORT extern int _XReverse_Bytes( register unsigned char *bpt, register int nb); + +_X_EXPORT extern void _XInitImageFuncPtrs( register XImage *image); Index: libX11/include/X11/XKBlib.h =================================================================== --- libX11.orig/include/X11/XKBlib.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/XKBlib.h 2007-05-26 23:56:22.000000000 +0800 @@ -294,10 +294,12 @@ _XFUNCPROTOBEGIN +_X_EXPORT extern Bool XkbIgnoreExtension( Bool /* ignore */ ); +_X_EXPORT extern Display *XkbOpenDisplay( char * /* name */, int * /* ev_rtrn */, @@ -307,6 +309,7 @@ int * /* reason */ ); +_X_EXPORT extern Bool XkbQueryExtension( Display * /* dpy */, int * /* opcodeReturn */, @@ -316,27 +319,32 @@ int * /* minorRtrn */ ); +_X_EXPORT extern Bool XkbUseExtension( Display * /* dpy */, int * /* major_rtrn */, int * /* minor_rtrn */ ); +_X_EXPORT extern Bool XkbLibraryVersion( int * /* libMajorRtrn */, int * /* libMinorRtrn */ ); +_X_EXPORT extern unsigned int XkbSetXlibControls( Display* /* dpy */, unsigned int /* affect */, unsigned int /* values */ ); +_X_EXPORT extern unsigned int XkbGetXlibControls( Display* /* dpy */ ); +_X_EXPORT extern unsigned int XkbXlibControlsImplemented(void); typedef Atom (*XkbInternAtomFunc)( @@ -350,11 +358,13 @@ Atom /* atom */ ); +_X_EXPORT extern void XkbSetAtomFuncs( XkbInternAtomFunc /* getAtom */, XkbGetAtomNameFunc /* getName */ ); +_X_EXPORT extern KeySym XkbKeycodeToKeysym( Display * /* dpy */, #if NeedWidePrototypes @@ -366,11 +376,13 @@ int /* level */ ); +_X_EXPORT extern unsigned int XkbKeysymToModifiers( Display * /* dpy */, KeySym /* ks */ ); +_X_EXPORT extern Bool XkbLookupKeySym( Display * /* dpy */, KeyCode /* keycode */, @@ -379,6 +391,7 @@ KeySym * /* keysym_return */ ); +_X_EXPORT extern int XkbLookupKeyBinding( Display * /* dpy */, KeySym /* sym_rtrn */, @@ -388,6 +401,7 @@ int * /* extra_rtrn */ ); +_X_EXPORT extern Bool XkbTranslateKeyCode( XkbDescPtr /* xkb */, KeyCode /* keycode */, @@ -396,6 +410,7 @@ KeySym * /* keysym_return */ ); +_X_EXPORT extern int XkbTranslateKeySym( Display * /* dpy */, register KeySym * /* sym_return */, @@ -405,6 +420,7 @@ int * /* extra_rtrn */ ); +_X_EXPORT extern Bool XkbSetAutoRepeatRate( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -412,6 +428,7 @@ unsigned int /* interval */ ); +_X_EXPORT extern Bool XkbGetAutoRepeatRate( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -419,6 +436,7 @@ unsigned int * /* intervalRtrn */ ); +_X_EXPORT extern Bool XkbChangeEnabledControls( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -426,6 +444,7 @@ unsigned int /* values */ ); +_X_EXPORT extern Bool XkbDeviceBell( Display * /* dpy */, Window /* win */, @@ -436,6 +455,7 @@ Atom /* name */ ); +_X_EXPORT extern Bool XkbForceDeviceBell( Display * /* dpy */, int /* deviceSpec */, @@ -444,6 +464,7 @@ int /* percent */ ); +_X_EXPORT extern Bool XkbDeviceBellEvent( Display * /* dpy */, Window /* win */, @@ -454,6 +475,7 @@ Atom /* name */ ); +_X_EXPORT extern Bool XkbBell( Display * /* dpy */, Window /* win */, @@ -461,11 +483,13 @@ Atom /* name */ ); +_X_EXPORT extern Bool XkbForceBell( Display * /* dpy */, int /* percent */ ); +_X_EXPORT extern Bool XkbBellEvent( Display * /* dpy */, Window /* win */, @@ -473,6 +497,7 @@ Atom /* name */ ); +_X_EXPORT extern Bool XkbSelectEvents( Display * /* dpy */, unsigned int /* deviceID */, @@ -480,6 +505,7 @@ unsigned int /* values */ ); +_X_EXPORT extern Bool XkbSelectEventDetails( Display * /* dpy */, unsigned int /* deviceID */, @@ -488,24 +514,28 @@ unsigned long /* details */ ); +_X_EXPORT extern void XkbNoteMapChanges( XkbMapChangesPtr /* old */, XkbMapNotifyEvent * /* new */, unsigned int /* wanted */ ); +_X_EXPORT extern void XkbNoteNameChanges( XkbNameChangesPtr /* old */, XkbNamesNotifyEvent * /* new */, unsigned int /* wanted */ ); +_X_EXPORT extern Status XkbGetIndicatorState( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int * /* pStateRtrn */ ); +_X_EXPORT extern Status XkbGetDeviceIndicatorState( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -514,12 +544,14 @@ unsigned int * /* pStateRtrn */ ); +_X_EXPORT extern Status XkbGetIndicatorMap( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Bool XkbSetIndicatorMap( Display * /* dpy */, unsigned long /* which */, @@ -535,6 +567,7 @@ #define XkbChangeIndicatorMaps(d,x,c) \ (XkbSetIndicatorMap((d),(c)->map_changes,x)) +_X_EXPORT extern Bool XkbGetNamedIndicator( Display * /* dpy */, Atom /* name */, @@ -544,6 +577,7 @@ Bool * /* pRealRtrn */ ); +_X_EXPORT extern Bool XkbGetNamedDeviceIndicator( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -556,6 +590,7 @@ Bool * /* pRealRtrn */ ); +_X_EXPORT extern Bool XkbSetNamedIndicator( Display * /* dpy */, Atom /* name */, @@ -565,6 +600,7 @@ XkbIndicatorMapPtr /* pMap */ ); +_X_EXPORT extern Bool XkbSetNamedDeviceIndicator( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -577,6 +613,7 @@ XkbIndicatorMapPtr /* pMap */ ); +_X_EXPORT extern Bool XkbLockModifiers( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -584,6 +621,7 @@ unsigned int /* values */ ); +_X_EXPORT extern Bool XkbLatchModifiers( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -591,18 +629,21 @@ unsigned int /* values */ ); +_X_EXPORT extern Bool XkbLockGroup( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ ); +_X_EXPORT extern Bool XkbLatchGroup( Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ ); +_X_EXPORT extern Bool XkbSetServerInternalMods( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -612,6 +653,7 @@ unsigned int /* virtualValues */ ); +_X_EXPORT extern Bool XkbSetIgnoreLockMods( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -621,59 +663,68 @@ unsigned int /* virtualValues */ ); - +_X_EXPORT extern Bool XkbVirtualModsToReal( XkbDescPtr /* xkb */, unsigned int /* virtual_mask */, unsigned int * /* mask_rtrn */ ); +_X_EXPORT extern Bool XkbComputeEffectiveMap( XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, unsigned char * /* map_rtrn */ ); +_X_EXPORT extern Status XkbInitCanonicalKeyTypes( XkbDescPtr /* xkb */, unsigned int /* which */, int /* keypadVMod */ ); +_X_EXPORT extern XkbDescPtr XkbAllocKeyboard( void ); +_X_EXPORT extern void XkbFreeKeyboard( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeDesc */ ); +_X_EXPORT extern Status XkbAllocClientMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nTypes */ ); +_X_EXPORT extern Status XkbAllocServerMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nActions */ ); +_X_EXPORT extern void XkbFreeClientMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); +_X_EXPORT extern void XkbFreeServerMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); +_X_EXPORT extern XkbKeyTypePtr XkbAddKeyType( XkbDescPtr /* xkb */, Atom /* name */, @@ -682,37 +733,43 @@ int /* num_lvls */ ); +_X_EXPORT extern Status XkbAllocIndicatorMaps( XkbDescPtr /* xkb */ ); +_X_EXPORT extern void XkbFreeIndicatorMaps( XkbDescPtr /* xkb */ ); +_X_EXPORT extern XkbDescPtr XkbGetMap( Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ ); +_X_EXPORT extern Status XkbGetUpdatedMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Status XkbGetMapChanges( Display * /* dpy */, XkbDescPtr /* xkb */, XkbMapChangesPtr /* changes */ ); - +_X_EXPORT extern Status XkbRefreshKeyboardMapping( XkbMapNotifyEvent * /* event */ ); +_X_EXPORT extern Status XkbGetKeyTypes( Display * /* dpy */, unsigned int /* first */, @@ -720,6 +777,7 @@ XkbDescPtr /* xkb */ ); +_X_EXPORT extern Status XkbGetKeySyms( Display * /* dpy */, unsigned int /* first */, @@ -727,6 +785,7 @@ XkbDescPtr /* xkb */ ); +_X_EXPORT extern Status XkbGetKeyActions( Display * /* dpy */, unsigned int /* first */, @@ -734,6 +793,7 @@ XkbDescPtr /* xkb */ ); +_X_EXPORT extern Status XkbGetKeyBehaviors( Display * /* dpy */, unsigned int /* firstKey */, @@ -741,12 +801,14 @@ XkbDescPtr /* desc */ ); +_X_EXPORT extern Status XkbGetVirtualMods( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Status XkbGetKeyExplicitComponents( Display * /* dpy */, unsigned int /* firstKey */, @@ -754,6 +816,7 @@ XkbDescPtr /* desc */ ); +_X_EXPORT extern Status XkbGetKeyModifierMap( Display * /* dpy */, unsigned int /* firstKey */, @@ -761,6 +824,7 @@ XkbDescPtr /* desc */ ); +_X_EXPORT extern Status XkbGetKeyVirtualModMap( Display * /* dpy */, unsigned int /* first */, @@ -768,29 +832,34 @@ XkbDescPtr /* xkb */ ); +_X_EXPORT extern Status XkbAllocControls( XkbDescPtr /* xkb */, unsigned int /* which*/ ); +_X_EXPORT extern void XkbFreeControls( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); +_X_EXPORT extern Status XkbGetControls( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Bool XkbSetControls( Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern void XkbNoteControlsChanges( XkbControlsChangesPtr /* old */, XkbControlsNotifyEvent * /* new */, @@ -800,24 +869,28 @@ #define XkbGetControlsChanges(d,x,c) XkbGetControls(d,(c)->changed_ctrls,x) #define XkbChangeControls(d,x,c) XkbSetControls(d,(c)->changed_ctrls,x) +_X_EXPORT extern Status XkbAllocCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nInterpret */ ); +_X_EXPORT extern void XkbFreeCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); +_X_EXPORT extern Status XkbGetCompatMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* xkb */ ); +_X_EXPORT extern Bool XkbSetCompatMap( Display * /* dpy */, unsigned int /* which */, @@ -825,6 +898,7 @@ Bool /* updateActions */ ); +_X_EXPORT extern XkbSymInterpretPtr XkbAddSymInterpret( XkbDescPtr /* xkb */, XkbSymInterpretPtr /* si */, @@ -832,6 +906,7 @@ XkbChangesPtr /* changes */ ); +_X_EXPORT extern Status XkbAllocNames( XkbDescPtr /* xkb */, unsigned int /* which */, @@ -839,12 +914,14 @@ int /* nTotalAliases */ ); +_X_EXPORT extern Status XkbGetNames( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Bool XkbSetNames( Display * /* dpy */, unsigned int /* which */, @@ -853,48 +930,55 @@ XkbDescPtr /* desc */ ); +_X_EXPORT extern Bool XkbChangeNames( Display * /* dpy */, XkbDescPtr /* xkb */, XkbNameChangesPtr /* changes */ ); +_X_EXPORT extern void XkbFreeNames( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); - +_X_EXPORT extern Status XkbGetState( Display * /* dpy */, unsigned int /* deviceSpec */, XkbStatePtr /* rtrnState */ ); +_X_EXPORT extern Bool XkbSetMap( Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ ); +_X_EXPORT extern Bool XkbChangeMap( Display* /* dpy */, XkbDescPtr /* desc */, XkbMapChangesPtr /* changes */ ); +_X_EXPORT extern Bool XkbSetDetectableAutoRepeat( Display * /* dpy */, Bool /* detectable */, Bool * /* supported */ ); +_X_EXPORT extern Bool XkbGetDetectableAutoRepeat( Display * /* dpy */, Bool * /* supported */ ); +_X_EXPORT extern Bool XkbSetAutoResetControls( Display * /* dpy */, unsigned int /* changes */, @@ -902,34 +986,40 @@ unsigned int * /* auto_values */ ); +_X_EXPORT extern Bool XkbGetAutoResetControls( Display * /* dpy */, unsigned int * /* auto_ctrls */, unsigned int * /* auto_ctrl_values */ ); +_X_EXPORT extern Bool XkbSetPerClientControls( Display * /* dpy */, unsigned int /* change */, unsigned int * /* values */ ); +_X_EXPORT extern Bool XkbGetPerClientControls( Display * /* dpy */, unsigned int * /* ctrls */ ); +_X_EXPORT extern Status XkbCopyKeyType( XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */ ); +_X_EXPORT extern Status XkbCopyKeyTypes( XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */, int /* num_types */ ); +_X_EXPORT extern Status XkbResizeKeyType( XkbDescPtr /* xkb */, int /* type_ndx */, @@ -938,18 +1028,21 @@ int /* new_num_lvls */ ); +_X_EXPORT extern KeySym *XkbResizeKeySyms( XkbDescPtr /* desc */, int /* forKey */, int /* symsNeeded */ ); +_X_EXPORT extern XkbAction *XkbResizeKeyActions( XkbDescPtr /* desc */, int /* forKey */, int /* actsNeeded */ ); +_X_EXPORT extern Status XkbChangeTypesOfKey( XkbDescPtr /* xkb */, int /* key */, @@ -959,6 +1052,7 @@ XkbMapChangesPtr /* pChanges */ ); +_X_EXPORT extern Status XkbChangeKeycodeRange( XkbDescPtr /* xkb */, int /* minKC */, @@ -968,6 +1062,7 @@ /***====================================================================***/ +_X_EXPORT extern XkbComponentListPtr XkbListComponents( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -975,16 +1070,19 @@ int * /* max_inout */ ); +_X_EXPORT extern void XkbFreeComponentList( XkbComponentListPtr /* list */ ); +_X_EXPORT extern XkbDescPtr XkbGetKeyboard( Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ ); +_X_EXPORT extern XkbDescPtr XkbGetKeyboardByName( Display * /* dpy */, unsigned int /* deviceSpec */, @@ -996,6 +1094,7 @@ /***====================================================================***/ +_X_EXPORT extern int XkbKeyTypesForCoreSymbols( /* returns # of groups */ XkbDescPtr /* xkb */, /* keyboard device */ int /* map_width */, /* width of core KeySym array */ @@ -1005,12 +1104,14 @@ KeySym * /* xkb_syms_rtrn */ /* must have enough space */ ); +_X_EXPORT extern Bool XkbApplyCompatMapToKey( /* False only on error */ XkbDescPtr /* xkb */, /* keymap to be edited */ KeyCode /* key */, /* key to be updated */ XkbChangesPtr /* changes */ /* resulting changes to map */ ); +_X_EXPORT extern Bool XkbUpdateMapFromCore( /* False only on error */ XkbDescPtr /* xkb */, /* XKB keyboard to be edited */ KeyCode /* first_key */, /* first changed key */ @@ -1022,35 +1123,41 @@ /***====================================================================***/ +_X_EXPORT extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo( XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, unsigned int /* ledId */ ); +_X_EXPORT extern Status XkbResizeDeviceButtonActions( XkbDeviceInfoPtr /* devi */, unsigned int /* newTotal */ ); +_X_EXPORT extern XkbDeviceInfoPtr XkbAllocDeviceInfo( unsigned int /* deviceSpec */, unsigned int /* nButtons */, unsigned int /* szLeds */ ); +_X_EXPORT extern void XkbFreeDeviceInfo( XkbDeviceInfoPtr /* devi */, unsigned int /* which */, Bool /* freeDevI */ ); +_X_EXPORT extern void XkbNoteDeviceChanges( XkbDeviceChangesPtr /* old */, XkbExtensionDeviceNotifyEvent * /* new */, unsigned int /* wanted */ ); +_X_EXPORT extern XkbDeviceInfoPtr XkbGetDeviceInfo( Display * /* dpy */, unsigned int /* which */, @@ -1059,12 +1166,14 @@ unsigned int /* ledID */ ); +_X_EXPORT extern Status XkbGetDeviceInfoChanges( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, XkbDeviceChangesPtr /* changes */ ); +_X_EXPORT extern Status XkbGetDeviceButtonActions( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, @@ -1073,6 +1182,7 @@ unsigned int /* nBtns */ ); +_X_EXPORT extern Status XkbGetDeviceLedInfo( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, @@ -1081,18 +1191,21 @@ unsigned int /* which (XkbXI_Indicator{Names,Map}Mask */ ); +_X_EXPORT extern Bool XkbSetDeviceInfo( Display * /* dpy */, unsigned int /* which */, XkbDeviceInfoPtr /* devi */ ); +_X_EXPORT extern Bool XkbChangeDeviceInfo( Display* /* dpy */, XkbDeviceInfoPtr /* desc */, XkbDeviceChangesPtr /* changes */ ); +_X_EXPORT extern Bool XkbSetDeviceLedInfo( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, @@ -1101,6 +1214,7 @@ unsigned int /* which */ ); +_X_EXPORT extern Bool XkbSetDeviceButtonActions( Display * /* dpy */, XkbDeviceInfoPtr /* devi */, @@ -1110,12 +1224,14 @@ /***====================================================================***/ +_X_EXPORT extern char XkbToControl( char /* c */ ); /***====================================================================***/ +_X_EXPORT extern Bool XkbSetDebuggingFlags( Display * /* dpy */, unsigned int /* mask */, @@ -1127,18 +1243,21 @@ unsigned int * /* rtrn_ctrls */ ); +_X_EXPORT extern Bool XkbApplyVirtualModChanges( XkbDescPtr /* xkb */, unsigned int /* changed */, XkbChangesPtr /* changes */ ); +_X_EXPORT extern Bool XkbUpdateActionVirtualMods( XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* changed */ ); +_X_EXPORT extern void XkbUpdateKeyTypeVirtualMods( XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, Index: libX11/include/X11/Xcms.h =================================================================== --- libX11.orig/include/X11/Xcms.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/Xcms.h 2007-05-26 23:56:22.000000000 +0800 @@ -336,14 +336,17 @@ _XFUNCPROTOBEGIN +_X_EXPORT extern Status XcmsAddColorSpace ( XcmsColorSpace* /* pColorSpace */ ); +_X_EXPORT extern Status XcmsAddFunctionSet ( XcmsFunctionSet* /* functionSet */ ); +_X_EXPORT extern Status XcmsAllocColor ( Display* /* dpy */, Colormap /* colormap */, @@ -351,6 +354,7 @@ XcmsColorFormat /* result_format */ ); +_X_EXPORT extern Status XcmsAllocNamedColor ( Display* /* dpy */, Colormap /* colormap */, @@ -360,11 +364,13 @@ XcmsColorFormat /* result_format */ ); +_X_EXPORT extern XcmsCCC XcmsCCCOfColormap ( Display* /* dpy */, Colormap /* colormap */ ); +_X_EXPORT extern Status XcmsCIELabClipab( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -373,6 +379,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELabClipL( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -381,6 +388,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELabClipLab( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -389,6 +397,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELabQueryMaxC ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -396,6 +405,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELabQueryMaxL ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -403,12 +413,14 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELabQueryMaxLC ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELabQueryMinL ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -416,6 +428,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELabToCIEXYZ ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -423,6 +436,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIELabWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, @@ -433,6 +447,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELuvClipL( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -441,6 +456,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELuvClipLuv( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -449,6 +465,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELuvClipuv( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -457,6 +474,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIELuvQueryMaxC ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -464,6 +482,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELuvQueryMaxL ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -471,12 +490,14 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELuvQueryMaxLC ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELuvQueryMinL ( XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, @@ -484,6 +505,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsCIELuvToCIEuvY ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -491,6 +513,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIELuvWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, @@ -501,6 +524,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIEXYZToCIELab ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -508,6 +532,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIEXYZToCIEuvY ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -515,6 +540,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIEXYZToCIExyY ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -522,6 +548,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIEXYZToRGBi ( XcmsCCC /* ccc */, XcmsColor* /* colors */, @@ -529,6 +556,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsCIEuvYToCIELuv ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -536,6 +564,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIEuvYToCIEXYZ ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -543,6 +572,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIEuvYToTekHVC ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -550,6 +580,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsCIExyYToCIEXYZ ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -557,10 +588,12 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern XcmsColor *XcmsClientWhitePointOfCCC ( XcmsCCC /* ccc */ ); +_X_EXPORT extern Status XcmsConvertColors ( XcmsCCC /* ccc */, XcmsColor* /* colorArry_in_out */, @@ -569,6 +602,7 @@ Bool* /* compArry_return */ ); +_X_EXPORT extern XcmsCCC XcmsCreateCCC ( Display* /* dpy */, int /* screenNumber */, @@ -580,23 +614,28 @@ XPointer /* whitePtAdjClientData */ ); +_X_EXPORT extern XcmsCCC XcmsDefaultCCC ( Display* /* dpy */, int /* screenNumber */ ); +_X_EXPORT extern Display *XcmsDisplayOfCCC ( XcmsCCC /* ccc */ ); +_X_EXPORT extern XcmsColorFormat XcmsFormatOfPrefix ( char* /* prefix */ ); +_X_EXPORT extern void XcmsFreeCCC ( XcmsCCC /* ccc */ ); +_X_EXPORT extern Status XcmsLookupColor ( Display* /* dpy */, Colormap /* colormap */, @@ -606,22 +645,26 @@ XcmsColorFormat /* result_format */ ); +_X_EXPORT extern char *XcmsPrefixOfFormat ( XcmsColorFormat /* id */ ); +_X_EXPORT extern Status XcmsQueryBlack ( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsQueryBlue ( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsQueryColor ( Display* /* dpy */, Colormap /* colormap */, @@ -629,6 +672,7 @@ XcmsColorFormat /* result_format */ ); +_X_EXPORT extern Status XcmsQueryColors ( Display* /* dpy */, Colormap /* colormap */, @@ -637,24 +681,28 @@ XcmsColorFormat /* result_format */ ); +_X_EXPORT extern Status XcmsQueryGreen ( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsQueryRed ( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsQueryWhite ( XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsRGBiToCIEXYZ ( XcmsCCC /* ccc */, XcmsColor* /* colors */, @@ -662,6 +710,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsRGBiToRGB ( XcmsCCC /* ccc */, XcmsColor* /* colors */, @@ -669,6 +718,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsRGBToRGBi ( XcmsCCC /* ccc */, XcmsColor* /* colors */, @@ -676,43 +726,51 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern int XcmsScreenNumberOfCCC ( XcmsCCC /* ccc */ ); +_X_EXPORT extern XcmsColor *XcmsScreenWhitePointOfCCC ( XcmsCCC /* ccc */ ); +_X_EXPORT extern XcmsCCC XcmsSetCCCOfColormap( Display* /* dpy */, Colormap /* colormap */, XcmsCCC /* ccc */ ); +_X_EXPORT extern XcmsCompressionProc XcmsSetCompressionProc ( XcmsCCC /* ccc */, XcmsCompressionProc /* compression_proc */, XPointer /* client_data */ ); +_X_EXPORT extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc ( XcmsCCC /* ccc */, XcmsWhiteAdjustProc /* white_adjust_proc */, XPointer /* client_data */ ); +_X_EXPORT extern Status XcmsSetWhitePoint ( XcmsCCC /* ccc */, XcmsColor* /* color */ ); +_X_EXPORT extern Status XcmsStoreColor ( Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* pColor_in */ ); +_X_EXPORT extern Status XcmsStoreColors ( Display* /* dpy */, Colormap /* colormap */, @@ -721,6 +779,7 @@ Bool* /* compArry_return */ ); +_X_EXPORT extern Status XcmsTekHVCClipC( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -729,6 +788,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsTekHVCClipV( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -737,6 +797,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsTekHVCClipVC( XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, @@ -745,6 +806,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Status XcmsTekHVCQueryMaxC ( XcmsCCC /* ccc */, XcmsFloat /* hue */, @@ -752,6 +814,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsTekHVCQueryMaxV ( XcmsCCC /* ccc */, XcmsFloat /* hue */, @@ -759,12 +822,14 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsTekHVCQueryMaxVC ( XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsTekHVCQueryMaxVSamples ( XcmsCCC /* ccc */, XcmsFloat /* hue */, @@ -772,6 +837,7 @@ unsigned int /* nsamples */ ); +_X_EXPORT extern Status XcmsTekHVCQueryMinV ( XcmsCCC /* ccc */, XcmsFloat /* hue */, @@ -779,6 +845,7 @@ XcmsColor* /* color_return */ ); +_X_EXPORT extern Status XcmsTekHVCToCIEuvY ( XcmsCCC /* ccc */, XcmsColor* /* white_point */, @@ -786,6 +853,7 @@ unsigned int /* ncolors */ ); +_X_EXPORT extern Status XcmsTekHVCWhiteShiftColors( XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, @@ -796,6 +864,7 @@ Bool* /* compression_flags_return */ ); +_X_EXPORT extern Visual *XcmsVisualOfCCC ( XcmsCCC /* ccc */ ); Index: libX11/include/X11/Xlib.h =================================================================== --- libX11.orig/include/X11/Xlib.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/Xlib.h 2007-05-26 23:56:22.000000000 +0800 @@ -90,6 +90,7 @@ #endif #endif +_X_EXPORT extern int _Xmblen( #ifdef ISC @@ -1392,19 +1393,22 @@ #define _Xdebug (*_Xdebug_p) #endif +_X_EXPORT extern int _Xdebug; +_X_EXPORT extern XFontStruct *XLoadQueryFont( Display* /* display */, _Xconst char* /* name */ ); +_X_EXPORT extern XFontStruct *XQueryFont( Display* /* display */, XID /* font_ID */ ); - +_X_EXPORT extern XTimeCoord *XGetMotionEvents( Display* /* display */, Window /* w */, @@ -1413,6 +1417,7 @@ int* /* nevents_return */ ); +_X_EXPORT extern XModifierKeymap *XDeleteModifiermapEntry( XModifierKeymap* /* modmap */, #if NeedWidePrototypes @@ -1423,10 +1428,12 @@ int /* modifier */ ); +_X_EXPORT extern XModifierKeymap *XGetModifierMapping( Display* /* display */ ); +_X_EXPORT extern XModifierKeymap *XInsertModifiermapEntry( XModifierKeymap* /* modmap */, #if NeedWidePrototypes @@ -1437,10 +1444,12 @@ int /* modifier */ ); +_X_EXPORT extern XModifierKeymap *XNewModifiermap( int /* max_keys_per_mod */ ); +_X_EXPORT extern XImage *XCreateImage( Display* /* display */, Visual* /* visual */, @@ -1453,9 +1462,13 @@ int /* bitmap_pad */, int /* bytes_per_line */ ); + +_X_EXPORT extern Status XInitImage( XImage* /* image */ ); + +_X_EXPORT extern XImage *XGetImage( Display* /* display */, Drawable /* d */, @@ -1466,6 +1479,8 @@ unsigned long /* plane_mask */, int /* format */ ); + +_X_EXPORT extern XImage *XGetSubImage( Display* /* display */, Drawable /* d */, @@ -1483,51 +1498,69 @@ /* * X function declarations. */ +_X_EXPORT extern Display *XOpenDisplay( _Xconst char* /* display_name */ ); +_X_EXPORT extern void XrmInitialize( void ); +_X_EXPORT extern char *XFetchBytes( Display* /* display */, int* /* nbytes_return */ ); + +_X_EXPORT extern char *XFetchBuffer( Display* /* display */, int* /* nbytes_return */, int /* buffer */ ); + +_X_EXPORT extern char *XGetAtomName( Display* /* display */, Atom /* atom */ ); + +_X_EXPORT extern Status XGetAtomNames( Display* /* dpy */, Atom* /* atoms */, int /* count */, char** /* names_return */ ); + +_X_EXPORT extern char *XGetDefault( Display* /* display */, _Xconst char* /* program */, _Xconst char* /* option */ ); + +_X_EXPORT extern char *XDisplayName( _Xconst char* /* string */ ); + +_X_EXPORT extern char *XKeysymToString( KeySym /* keysym */ ); +_X_EXPORT extern int (*XSynchronize( Display* /* display */, Bool /* onoff */ ))( Display* /* display */ ); + +_X_EXPORT extern int (*XSetAfterFunction( Display* /* display */, int (*) ( @@ -1536,11 +1569,15 @@ ))( Display* /* display */ ); + +_X_EXPORT extern Atom XInternAtom( Display* /* display */, _Xconst char* /* atom_name */, Bool /* only_if_exists */ ); + +_X_EXPORT extern Status XInternAtoms( Display* /* dpy */, char** /* names */, @@ -1548,16 +1585,22 @@ Bool /* onlyIfExists */, Atom* /* atoms_return */ ); + +_X_EXPORT extern Colormap XCopyColormapAndFree( Display* /* display */, Colormap /* colormap */ ); + +_X_EXPORT extern Colormap XCreateColormap( Display* /* display */, Window /* w */, Visual* /* visual */, int /* alloc */ ); + +_X_EXPORT extern Cursor XCreatePixmapCursor( Display* /* display */, Pixmap /* source */, @@ -1567,6 +1610,8 @@ unsigned int /* x */, unsigned int /* y */ ); + +_X_EXPORT extern Cursor XCreateGlyphCursor( Display* /* display */, Font /* source_font */, @@ -1576,27 +1621,39 @@ XColor _Xconst * /* foreground_color */, XColor _Xconst * /* background_color */ ); + +_X_EXPORT extern Cursor XCreateFontCursor( Display* /* display */, unsigned int /* shape */ ); + +_X_EXPORT extern Font XLoadFont( Display* /* display */, _Xconst char* /* name */ ); + +_X_EXPORT extern GC XCreateGC( Display* /* display */, Drawable /* d */, unsigned long /* valuemask */, XGCValues* /* values */ ); + +_X_EXPORT extern GContext XGContextFromGC( GC /* gc */ ); + +_X_EXPORT extern void XFlushGC( Display* /* display */, GC /* gc */ ); + +_X_EXPORT extern Pixmap XCreatePixmap( Display* /* display */, Drawable /* d */, @@ -1604,6 +1661,8 @@ unsigned int /* height */, unsigned int /* depth */ ); + +_X_EXPORT extern Pixmap XCreateBitmapFromData( Display* /* display */, Drawable /* d */, @@ -1611,6 +1670,8 @@ unsigned int /* width */, unsigned int /* height */ ); + +_X_EXPORT extern Pixmap XCreatePixmapFromBitmapData( Display* /* display */, Drawable /* d */, @@ -1621,6 +1682,8 @@ unsigned long /* bg */, unsigned int /* depth */ ); + +_X_EXPORT extern Window XCreateSimpleWindow( Display* /* display */, Window /* parent */, @@ -1632,10 +1695,14 @@ unsigned long /* border */, unsigned long /* background */ ); + +_X_EXPORT extern Window XGetSelectionOwner( Display* /* display */, Atom /* selection */ ); + +_X_EXPORT extern Window XCreateWindow( Display* /* display */, Window /* parent */, @@ -1650,17 +1717,23 @@ unsigned long /* valuemask */, XSetWindowAttributes* /* attributes */ ); + +_X_EXPORT extern Colormap *XListInstalledColormaps( Display* /* display */, Window /* w */, int* /* num_return */ ); + +_X_EXPORT extern char **XListFonts( Display* /* display */, _Xconst char* /* pattern */, int /* maxnames */, int* /* actual_count_return */ ); + +_X_EXPORT extern char **XListFontsWithInfo( Display* /* display */, _Xconst char* /* pattern */, @@ -1668,24 +1741,34 @@ int* /* count_return */, XFontStruct** /* info_return */ ); + +_X_EXPORT extern char **XGetFontPath( Display* /* display */, int* /* npaths_return */ ); + +_X_EXPORT extern char **XListExtensions( Display* /* display */, int* /* nextensions_return */ ); + +_X_EXPORT extern Atom *XListProperties( Display* /* display */, Window /* w */, int* /* num_prop_return */ ); + +_X_EXPORT extern XHostAddress *XListHosts( Display* /* display */, int* /* nhosts_return */, Bool* /* state_return */ ); + +_X_EXPORT extern KeySym XKeycodeToKeysym( Display* /* display */, #if NeedWidePrototypes @@ -1695,10 +1778,14 @@ #endif int /* index */ ); + +_X_EXPORT extern KeySym XLookupKeysym( XKeyEvent* /* key_event */, int /* index */ ); + +_X_EXPORT extern KeySym *XGetKeyboardMapping( Display* /* display */, #if NeedWidePrototypes @@ -1709,135 +1796,203 @@ int /* keycode_count */, int* /* keysyms_per_keycode_return */ ); + +_X_EXPORT extern KeySym XStringToKeysym( _Xconst char* /* string */ ); + +_X_EXPORT extern long XMaxRequestSize( Display* /* display */ ); + +_X_EXPORT extern long XExtendedMaxRequestSize( Display* /* display */ ); + +_X_EXPORT extern char *XResourceManagerString( Display* /* display */ ); + +_X_EXPORT extern char *XScreenResourceString( Screen* /* screen */ ); + +_X_EXPORT extern unsigned long XDisplayMotionBufferSize( Display* /* display */ ); + +_X_EXPORT extern VisualID XVisualIDFromVisual( Visual* /* visual */ ); /* multithread routines */ +_X_EXPORT extern Status XInitThreads( void ); +_X_EXPORT extern void XLockDisplay( Display* /* display */ ); +_X_EXPORT extern void XUnlockDisplay( Display* /* display */ ); /* routines for dealing with extensions */ +_X_EXPORT extern XExtCodes *XInitExtension( Display* /* display */, _Xconst char* /* name */ ); +_X_EXPORT extern XExtCodes *XAddExtension( Display* /* display */ ); + +_X_EXPORT extern XExtData *XFindOnExtensionList( XExtData** /* structure */, int /* number */ ); + +_X_EXPORT extern XExtData **XEHeadOfExtensionList( XEDataObject /* object */ ); /* these are routines for which there are also macros */ +_X_EXPORT extern Window XRootWindow( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern Window XDefaultRootWindow( Display* /* display */ ); + +_X_EXPORT extern Window XRootWindowOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern Visual *XDefaultVisual( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern Visual *XDefaultVisualOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern GC XDefaultGC( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern GC XDefaultGCOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern unsigned long XBlackPixel( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern unsigned long XWhitePixel( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern unsigned long XAllPlanes( void ); + +_X_EXPORT extern unsigned long XBlackPixelOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern unsigned long XWhitePixelOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern unsigned long XNextRequest( Display* /* display */ ); + +_X_EXPORT extern unsigned long XLastKnownRequestProcessed( Display* /* display */ ); + +_X_EXPORT extern char *XServerVendor( Display* /* display */ ); + +_X_EXPORT extern char *XDisplayString( Display* /* display */ ); + +_X_EXPORT extern Colormap XDefaultColormap( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern Colormap XDefaultColormapOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern Display *XDisplayOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern Screen *XScreenOfDisplay( Display* /* display */, int /* screen_number */ ); + +_X_EXPORT extern Screen *XDefaultScreenOfDisplay( Display* /* display */ ); + +_X_EXPORT extern long XEventMaskOfScreen( Screen* /* screen */ ); + +_X_EXPORT extern int XScreenNumberOfScreen( Screen* /* screen */ ); @@ -1847,6 +2002,7 @@ XErrorEvent* /* error_event */ ); +_X_EXPORT extern XErrorHandler XSetErrorHandler ( XErrorHandler /* handler */ ); @@ -1856,15 +2012,18 @@ Display* /* display */ ); +_X_EXPORT extern XIOErrorHandler XSetIOErrorHandler ( XIOErrorHandler /* handler */ ); - +_X_EXPORT extern XPixmapFormatValues *XListPixmapFormats( Display* /* display */, int* /* count_return */ ); + +_X_EXPORT extern int *XListDepths( Display* /* display */, int /* screen_number */, @@ -1873,6 +2032,8 @@ /* ICCCM routines for things that don't require special include files; */ /* other declarations are given in Xutil.h */ + +_X_EXPORT extern Status XReconfigureWMWindow( Display* /* display */, Window /* w */, @@ -1881,49 +2042,66 @@ XWindowChanges* /* changes */ ); +_X_EXPORT extern Status XGetWMProtocols( Display* /* display */, Window /* w */, Atom** /* protocols_return */, int* /* count_return */ ); + +_X_EXPORT extern Status XSetWMProtocols( Display* /* display */, Window /* w */, Atom* /* protocols */, int /* count */ ); + +_X_EXPORT extern Status XIconifyWindow( Display* /* display */, Window /* w */, int /* screen_number */ ); + +_X_EXPORT extern Status XWithdrawWindow( Display* /* display */, Window /* w */, int /* screen_number */ ); + +_X_EXPORT extern Status XGetCommand( Display* /* display */, Window /* w */, char*** /* argv_return */, int* /* argc_return */ ); + +_X_EXPORT extern Status XGetWMColormapWindows( Display* /* display */, Window /* w */, Window** /* windows_return */, int* /* count_return */ ); + +_X_EXPORT extern Status XSetWMColormapWindows( Display* /* display */, Window /* w */, Window* /* colormap_windows */, int /* count */ ); + +_X_EXPORT extern void XFreeStringList( char** /* list */ ); + +_X_EXPORT extern int XSetTransientForHint( Display* /* display */, Window /* w */, @@ -1932,37 +2110,44 @@ /* The following are given in alphabetical order */ +_X_EXPORT extern int XActivateScreenSaver( Display* /* display */ ); +_X_EXPORT extern int XAddHost( Display* /* display */, XHostAddress* /* host */ ); +_X_EXPORT extern int XAddHosts( Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ ); +_X_EXPORT extern int XAddToExtensionList( struct _XExtData** /* structure */, XExtData* /* ext_data */ ); +_X_EXPORT extern int XAddToSaveSet( Display* /* display */, Window /* w */ ); +_X_EXPORT extern Status XAllocColor( Display* /* display */, Colormap /* colormap */, XColor* /* screen_in_out */ ); +_X_EXPORT extern Status XAllocColorCells( Display* /* display */, Colormap /* colormap */, @@ -1973,6 +2158,7 @@ unsigned int /* npixels */ ); +_X_EXPORT extern Status XAllocColorPlanes( Display* /* display */, Colormap /* colormap */, @@ -1987,6 +2173,7 @@ unsigned long* /* bmask_return */ ); +_X_EXPORT extern Status XAllocNamedColor( Display* /* display */, Colormap /* colormap */, @@ -1995,41 +2182,50 @@ XColor* /* exact_def_return */ ); +_X_EXPORT extern int XAllowEvents( Display* /* display */, int /* event_mode */, Time /* time */ ); +_X_EXPORT extern int XAutoRepeatOff( Display* /* display */ ); +_X_EXPORT extern int XAutoRepeatOn( Display* /* display */ ); +_X_EXPORT extern int XBell( Display* /* display */, int /* percent */ ); +_X_EXPORT extern int XBitmapBitOrder( Display* /* display */ ); +_X_EXPORT extern int XBitmapPad( Display* /* display */ ); +_X_EXPORT extern int XBitmapUnit( Display* /* display */ ); +_X_EXPORT extern int XCellsOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XChangeActivePointerGrab( Display* /* display */, unsigned int /* event_mask */, @@ -2037,6 +2233,7 @@ Time /* time */ ); +_X_EXPORT extern int XChangeGC( Display* /* display */, GC /* gc */, @@ -2044,12 +2241,14 @@ XGCValues* /* values */ ); +_X_EXPORT extern int XChangeKeyboardControl( Display* /* display */, unsigned long /* value_mask */, XKeyboardControl* /* values */ ); +_X_EXPORT extern int XChangeKeyboardMapping( Display* /* display */, int /* first_keycode */, @@ -2058,6 +2257,7 @@ int /* num_codes */ ); +_X_EXPORT extern int XChangePointerControl( Display* /* display */, Bool /* do_accel */, @@ -2067,6 +2267,7 @@ int /* threshold */ ); +_X_EXPORT extern int XChangeProperty( Display* /* display */, Window /* w */, @@ -2078,12 +2279,14 @@ int /* nelements */ ); +_X_EXPORT extern int XChangeSaveSet( Display* /* display */, Window /* w */, int /* change_mode */ ); +_X_EXPORT extern int XChangeWindowAttributes( Display* /* display */, Window /* w */, @@ -2091,6 +2294,7 @@ XSetWindowAttributes* /* attributes */ ); +_X_EXPORT extern Bool XCheckIfEvent( Display* /* display */, XEvent* /* event_return */, @@ -2102,18 +2306,21 @@ XPointer /* arg */ ); +_X_EXPORT extern Bool XCheckMaskEvent( Display* /* display */, long /* event_mask */, XEvent* /* event_return */ ); +_X_EXPORT extern Bool XCheckTypedEvent( Display* /* display */, int /* event_type */, XEvent* /* event_return */ ); +_X_EXPORT extern Bool XCheckTypedWindowEvent( Display* /* display */, Window /* w */, @@ -2121,6 +2328,7 @@ XEvent* /* event_return */ ); +_X_EXPORT extern Bool XCheckWindowEvent( Display* /* display */, Window /* w */, @@ -2128,22 +2336,26 @@ XEvent* /* event_return */ ); +_X_EXPORT extern int XCirculateSubwindows( Display* /* display */, Window /* w */, int /* direction */ ); +_X_EXPORT extern int XCirculateSubwindowsDown( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XCirculateSubwindowsUp( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XClearArea( Display* /* display */, Window /* w */, @@ -2154,15 +2366,18 @@ Bool /* exposures */ ); +_X_EXPORT extern int XClearWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XCloseDisplay( Display* /* display */ ); +_X_EXPORT extern int XConfigureWindow( Display* /* display */, Window /* w */, @@ -2170,10 +2385,12 @@ XWindowChanges* /* values */ ); +_X_EXPORT extern int XConnectionNumber( Display* /* display */ ); +_X_EXPORT extern int XConvertSelection( Display* /* display */, Atom /* selection */, @@ -2183,6 +2400,7 @@ Time /* time */ ); +_X_EXPORT extern int XCopyArea( Display* /* display */, Drawable /* src */, @@ -2196,6 +2414,7 @@ int /* dest_y */ ); +_X_EXPORT extern int XCopyGC( Display* /* display */, GC /* src */, @@ -2203,6 +2422,7 @@ GC /* dest */ ); +_X_EXPORT extern int XCopyPlane( Display* /* display */, Drawable /* src */, @@ -2217,90 +2437,107 @@ unsigned long /* plane */ ); +_X_EXPORT extern int XDefaultDepth( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDefaultDepthOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XDefaultScreen( Display* /* display */ ); +_X_EXPORT extern int XDefineCursor( Display* /* display */, Window /* w */, Cursor /* cursor */ ); +_X_EXPORT extern int XDeleteProperty( Display* /* display */, Window /* w */, Atom /* property */ ); +_X_EXPORT extern int XDestroyWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XDestroySubwindows( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XDoesBackingStore( Screen* /* screen */ ); +_X_EXPORT extern Bool XDoesSaveUnders( Screen* /* screen */ ); +_X_EXPORT extern int XDisableAccessControl( Display* /* display */ ); - +_X_EXPORT extern int XDisplayCells( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDisplayHeight( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDisplayHeightMM( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDisplayKeycodes( Display* /* display */, int* /* min_keycodes_return */, int* /* max_keycodes_return */ ); +_X_EXPORT extern int XDisplayPlanes( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDisplayWidth( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDisplayWidthMM( Display* /* display */, int /* screen_number */ ); +_X_EXPORT extern int XDrawArc( Display* /* display */, Drawable /* d */, @@ -2313,6 +2550,7 @@ int /* angle2 */ ); +_X_EXPORT extern int XDrawArcs( Display* /* display */, Drawable /* d */, @@ -2321,6 +2559,7 @@ int /* narcs */ ); +_X_EXPORT extern int XDrawImageString( Display* /* display */, Drawable /* d */, @@ -2331,6 +2570,7 @@ int /* length */ ); +_X_EXPORT extern int XDrawImageString16( Display* /* display */, Drawable /* d */, @@ -2341,6 +2581,7 @@ int /* length */ ); +_X_EXPORT extern int XDrawLine( Display* /* display */, Drawable /* d */, @@ -2351,6 +2592,7 @@ int /* y2 */ ); +_X_EXPORT extern int XDrawLines( Display* /* display */, Drawable /* d */, @@ -2360,6 +2602,7 @@ int /* mode */ ); +_X_EXPORT extern int XDrawPoint( Display* /* display */, Drawable /* d */, @@ -2368,6 +2611,7 @@ int /* y */ ); +_X_EXPORT extern int XDrawPoints( Display* /* display */, Drawable /* d */, @@ -2377,6 +2621,7 @@ int /* mode */ ); +_X_EXPORT extern int XDrawRectangle( Display* /* display */, Drawable /* d */, @@ -2387,6 +2632,7 @@ unsigned int /* height */ ); +_X_EXPORT extern int XDrawRectangles( Display* /* display */, Drawable /* d */, @@ -2395,6 +2641,7 @@ int /* nrectangles */ ); +_X_EXPORT extern int XDrawSegments( Display* /* display */, Drawable /* d */, @@ -2403,6 +2650,7 @@ int /* nsegments */ ); +_X_EXPORT extern int XDrawString( Display* /* display */, Drawable /* d */, @@ -2413,6 +2661,7 @@ int /* length */ ); +_X_EXPORT extern int XDrawString16( Display* /* display */, Drawable /* d */, @@ -2423,6 +2672,7 @@ int /* length */ ); +_X_EXPORT extern int XDrawText( Display* /* display */, Drawable /* d */, @@ -2433,6 +2683,7 @@ int /* nitems */ ); +_X_EXPORT extern int XDrawText16( Display* /* display */, Drawable /* d */, @@ -2443,21 +2694,25 @@ int /* nitems */ ); +_X_EXPORT extern int XEnableAccessControl( Display* /* display */ ); +_X_EXPORT extern int XEventsQueued( Display* /* display */, int /* mode */ ); +_X_EXPORT extern Status XFetchName( Display* /* display */, Window /* w */, char** /* window_name_return */ ); +_X_EXPORT extern int XFillArc( Display* /* display */, Drawable /* d */, @@ -2470,6 +2725,7 @@ int /* angle2 */ ); +_X_EXPORT extern int XFillArcs( Display* /* display */, Drawable /* d */, @@ -2478,6 +2734,7 @@ int /* narcs */ ); +_X_EXPORT extern int XFillPolygon( Display* /* display */, Drawable /* d */, @@ -2488,6 +2745,7 @@ int /* mode */ ); +_X_EXPORT extern int XFillRectangle( Display* /* display */, Drawable /* d */, @@ -2498,6 +2756,7 @@ unsigned int /* height */ ); +_X_EXPORT extern int XFillRectangles( Display* /* display */, Drawable /* d */, @@ -2506,24 +2765,29 @@ int /* nrectangles */ ); +_X_EXPORT extern int XFlush( Display* /* display */ ); +_X_EXPORT extern int XForceScreenSaver( Display* /* display */, int /* mode */ ); +_X_EXPORT extern int XFree( void* /* data */ ); +_X_EXPORT extern int XFreeColormap( Display* /* display */, Colormap /* colormap */ ); +_X_EXPORT extern int XFreeColors( Display* /* display */, Colormap /* colormap */, @@ -2532,48 +2796,58 @@ unsigned long /* planes */ ); +_X_EXPORT extern int XFreeCursor( Display* /* display */, Cursor /* cursor */ ); +_X_EXPORT extern int XFreeExtensionList( char** /* list */ ); +_X_EXPORT extern int XFreeFont( Display* /* display */, XFontStruct* /* font_struct */ ); +_X_EXPORT extern int XFreeFontInfo( char** /* names */, XFontStruct* /* free_info */, int /* actual_count */ ); +_X_EXPORT extern int XFreeFontNames( char** /* list */ ); +_X_EXPORT extern int XFreeFontPath( char** /* list */ ); +_X_EXPORT extern int XFreeGC( Display* /* display */, GC /* gc */ ); +_X_EXPORT extern int XFreeModifiermap( XModifierKeymap* /* modmap */ ); +_X_EXPORT extern int XFreePixmap( Display* /* display */, Pixmap /* pixmap */ ); +_X_EXPORT extern int XGeometry( Display* /* display */, int /* screen */, @@ -2590,6 +2864,7 @@ int* /* height_return */ ); +_X_EXPORT extern int XGetErrorDatabaseText( Display* /* display */, _Xconst char* /* name */, @@ -2599,6 +2874,7 @@ int /* length */ ); +_X_EXPORT extern int XGetErrorText( Display* /* display */, int /* code */, @@ -2606,12 +2882,14 @@ int /* length */ ); +_X_EXPORT extern Bool XGetFontProperty( XFontStruct* /* font_struct */, Atom /* atom */, unsigned long* /* value_return */ ); +_X_EXPORT extern Status XGetGCValues( Display* /* display */, GC /* gc */, @@ -2619,6 +2897,7 @@ XGCValues* /* values_return */ ); +_X_EXPORT extern Status XGetGeometry( Display* /* display */, Drawable /* d */, @@ -2631,23 +2910,27 @@ unsigned int* /* depth_return */ ); +_X_EXPORT extern Status XGetIconName( Display* /* display */, Window /* w */, char** /* icon_name_return */ ); +_X_EXPORT extern int XGetInputFocus( Display* /* display */, Window* /* focus_return */, int* /* revert_to_return */ ); +_X_EXPORT extern int XGetKeyboardControl( Display* /* display */, XKeyboardState* /* values_return */ ); +_X_EXPORT extern int XGetPointerControl( Display* /* display */, int* /* accel_numerator_return */, @@ -2655,12 +2938,14 @@ int* /* threshold_return */ ); +_X_EXPORT extern int XGetPointerMapping( Display* /* display */, unsigned char* /* map_return */, int /* nmap */ ); +_X_EXPORT extern int XGetScreenSaver( Display* /* display */, int* /* timeout_return */, @@ -2669,12 +2954,14 @@ int* /* allow_exposures_return */ ); +_X_EXPORT extern Status XGetTransientForHint( Display* /* display */, Window /* w */, Window* /* prop_window_return */ ); +_X_EXPORT extern int XGetWindowProperty( Display* /* display */, Window /* w */, @@ -2690,12 +2977,14 @@ unsigned char** /* prop_return */ ); +_X_EXPORT extern Status XGetWindowAttributes( Display* /* display */, Window /* w */, XWindowAttributes* /* window_attributes_return */ ); +_X_EXPORT extern int XGrabButton( Display* /* display */, unsigned int /* button */, @@ -2709,6 +2998,7 @@ Cursor /* cursor */ ); +_X_EXPORT extern int XGrabKey( Display* /* display */, int /* keycode */, @@ -2719,6 +3009,7 @@ int /* keyboard_mode */ ); +_X_EXPORT extern int XGrabKeyboard( Display* /* display */, Window /* grab_window */, @@ -2728,6 +3019,7 @@ Time /* time */ ); +_X_EXPORT extern int XGrabPointer( Display* /* display */, Window /* grab_window */, @@ -2740,18 +3032,22 @@ Time /* time */ ); +_X_EXPORT extern int XGrabServer( Display* /* display */ ); +_X_EXPORT extern int XHeightMMOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XHeightOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XIfEvent( Display* /* display */, XEvent* /* event_return */, @@ -2763,25 +3059,30 @@ XPointer /* arg */ ); +_X_EXPORT extern int XImageByteOrder( Display* /* display */ ); +_X_EXPORT extern int XInstallColormap( Display* /* display */, Colormap /* colormap */ ); +_X_EXPORT extern KeyCode XKeysymToKeycode( Display* /* display */, KeySym /* keysym */ ); +_X_EXPORT extern int XKillClient( Display* /* display */, XID /* resource */ ); +_X_EXPORT extern Status XLookupColor( Display* /* display */, Colormap /* colormap */, @@ -2790,40 +3091,48 @@ XColor* /* screen_def_return */ ); +_X_EXPORT extern int XLowerWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XMapRaised( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XMapSubwindows( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XMapWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XMaskEvent( Display* /* display */, long /* event_mask */, XEvent* /* event_return */ ); +_X_EXPORT extern int XMaxCmapsOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XMinCmapsOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XMoveResizeWindow( Display* /* display */, Window /* w */, @@ -2833,6 +3142,7 @@ unsigned int /* height */ ); +_X_EXPORT extern int XMoveWindow( Display* /* display */, Window /* w */, @@ -2840,15 +3150,18 @@ int /* y */ ); +_X_EXPORT extern int XNextEvent( Display* /* display */, XEvent* /* event_return */ ); +_X_EXPORT extern int XNoOp( Display* /* display */ ); +_X_EXPORT extern Status XParseColor( Display* /* display */, Colormap /* colormap */, @@ -2856,6 +3169,7 @@ XColor* /* exact_def_return */ ); +_X_EXPORT extern int XParseGeometry( _Xconst char* /* parsestring */, int* /* x_return */, @@ -2864,11 +3178,13 @@ unsigned int* /* height_return */ ); +_X_EXPORT extern int XPeekEvent( Display* /* display */, XEvent* /* event_return */ ); +_X_EXPORT extern int XPeekIfEvent( Display* /* display */, XEvent* /* event_return */, @@ -2880,28 +3196,33 @@ XPointer /* arg */ ); +_X_EXPORT extern int XPending( Display* /* display */ ); +_X_EXPORT extern int XPlanesOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XProtocolRevision( Display* /* display */ ); +_X_EXPORT extern int XProtocolVersion( Display* /* display */ ); - +_X_EXPORT extern int XPutBackEvent( Display* /* display */, XEvent* /* event */ ); +_X_EXPORT extern int XPutImage( Display* /* display */, Drawable /* d */, @@ -2915,10 +3236,12 @@ unsigned int /* height */ ); +_X_EXPORT extern int XQLength( Display* /* display */ ); +_X_EXPORT extern Status XQueryBestCursor( Display* /* display */, Drawable /* d */, @@ -2928,6 +3251,7 @@ unsigned int* /* height_return */ ); +_X_EXPORT extern Status XQueryBestSize( Display* /* display */, int /* class */, @@ -2938,6 +3262,7 @@ unsigned int* /* height_return */ ); +_X_EXPORT extern Status XQueryBestStipple( Display* /* display */, Drawable /* which_screen */, @@ -2947,6 +3272,7 @@ unsigned int* /* height_return */ ); +_X_EXPORT extern Status XQueryBestTile( Display* /* display */, Drawable /* which_screen */, @@ -2956,12 +3282,14 @@ unsigned int* /* height_return */ ); +_X_EXPORT extern int XQueryColor( Display* /* display */, Colormap /* colormap */, XColor* /* def_in_out */ ); +_X_EXPORT extern int XQueryColors( Display* /* display */, Colormap /* colormap */, @@ -2969,6 +3297,7 @@ int /* ncolors */ ); +_X_EXPORT extern Bool XQueryExtension( Display* /* display */, _Xconst char* /* name */, @@ -2977,11 +3306,13 @@ int* /* first_error_return */ ); +_X_EXPORT extern int XQueryKeymap( Display* /* display */, char [32] /* keys_return */ ); +_X_EXPORT extern Bool XQueryPointer( Display* /* display */, Window /* w */, @@ -2994,6 +3325,7 @@ unsigned int* /* mask_return */ ); +_X_EXPORT extern int XQueryTextExtents( Display* /* display */, XID /* font_ID */, @@ -3005,6 +3337,7 @@ XCharStruct* /* overall_return */ ); +_X_EXPORT extern int XQueryTextExtents16( Display* /* display */, XID /* font_ID */, @@ -3016,6 +3349,7 @@ XCharStruct* /* overall_return */ ); +_X_EXPORT extern Status XQueryTree( Display* /* display */, Window /* w */, @@ -3025,11 +3359,13 @@ unsigned int* /* nchildren_return */ ); +_X_EXPORT extern int XRaiseWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XReadBitmapFile( Display* /* display */, Drawable /* d */, @@ -3041,6 +3377,7 @@ int* /* y_hot_return */ ); +_X_EXPORT extern int XReadBitmapFileData( _Xconst char* /* filename */, unsigned int* /* width_return */, @@ -3050,6 +3387,7 @@ int* /* y_hot_return */ ); +_X_EXPORT extern int XRebindKeysym( Display* /* display */, KeySym /* keysym */, @@ -3059,6 +3397,7 @@ int /* bytes_string */ ); +_X_EXPORT extern int XRecolorCursor( Display* /* display */, Cursor /* cursor */, @@ -3066,26 +3405,31 @@ XColor* /* background_color */ ); +_X_EXPORT extern int XRefreshKeyboardMapping( XMappingEvent* /* event_map */ ); +_X_EXPORT extern int XRemoveFromSaveSet( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XRemoveHost( Display* /* display */, XHostAddress* /* host */ ); +_X_EXPORT extern int XRemoveHosts( Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ ); +_X_EXPORT extern int XReparentWindow( Display* /* display */, Window /* w */, @@ -3094,10 +3438,12 @@ int /* y */ ); +_X_EXPORT extern int XResetScreenSaver( Display* /* display */ ); +_X_EXPORT extern int XResizeWindow( Display* /* display */, Window /* w */, @@ -3105,17 +3451,20 @@ unsigned int /* height */ ); +_X_EXPORT extern int XRestackWindows( Display* /* display */, Window* /* windows */, int /* nwindows */ ); +_X_EXPORT extern int XRotateBuffers( Display* /* display */, int /* rotate */ ); +_X_EXPORT extern int XRotateWindowProperties( Display* /* display */, Window /* w */, @@ -3124,16 +3473,19 @@ int /* npositions */ ); +_X_EXPORT extern int XScreenCount( Display* /* display */ ); +_X_EXPORT extern int XSelectInput( Display* /* display */, Window /* w */, long /* event_mask */ ); +_X_EXPORT extern Status XSendEvent( Display* /* display */, Window /* w */, @@ -3142,29 +3494,34 @@ XEvent* /* event_send */ ); +_X_EXPORT extern int XSetAccessControl( Display* /* display */, int /* mode */ ); +_X_EXPORT extern int XSetArcMode( Display* /* display */, GC /* gc */, int /* arc_mode */ ); +_X_EXPORT extern int XSetBackground( Display* /* display */, GC /* gc */, unsigned long /* background */ ); +_X_EXPORT extern int XSetClipMask( Display* /* display */, GC /* gc */, Pixmap /* pixmap */ ); +_X_EXPORT extern int XSetClipOrigin( Display* /* display */, GC /* gc */, @@ -3172,6 +3529,7 @@ int /* clip_y_origin */ ); +_X_EXPORT extern int XSetClipRectangles( Display* /* display */, GC /* gc */, @@ -3182,11 +3540,13 @@ int /* ordering */ ); +_X_EXPORT extern int XSetCloseDownMode( Display* /* display */, int /* close_mode */ ); +_X_EXPORT extern int XSetCommand( Display* /* display */, Window /* w */, @@ -3194,6 +3554,7 @@ int /* argc */ ); +_X_EXPORT extern int XSetDashes( Display* /* display */, GC /* gc */, @@ -3202,54 +3563,63 @@ int /* n */ ); +_X_EXPORT extern int XSetFillRule( Display* /* display */, GC /* gc */, int /* fill_rule */ ); +_X_EXPORT extern int XSetFillStyle( Display* /* display */, GC /* gc */, int /* fill_style */ ); +_X_EXPORT extern int XSetFont( Display* /* display */, GC /* gc */, Font /* font */ ); +_X_EXPORT extern int XSetFontPath( Display* /* display */, char** /* directories */, int /* ndirs */ ); +_X_EXPORT extern int XSetForeground( Display* /* display */, GC /* gc */, unsigned long /* foreground */ ); +_X_EXPORT extern int XSetFunction( Display* /* display */, GC /* gc */, int /* function */ ); +_X_EXPORT extern int XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */ ); +_X_EXPORT extern int XSetIconName( Display* /* display */, Window /* w */, _Xconst char* /* icon_name */ ); +_X_EXPORT extern int XSetInputFocus( Display* /* display */, Window /* focus */, @@ -3257,6 +3627,7 @@ Time /* time */ ); +_X_EXPORT extern int XSetLineAttributes( Display* /* display */, GC /* gc */, @@ -3266,23 +3637,27 @@ int /* join_style */ ); +_X_EXPORT extern int XSetModifierMapping( Display* /* display */, XModifierKeymap* /* modmap */ ); +_X_EXPORT extern int XSetPlaneMask( Display* /* display */, GC /* gc */, unsigned long /* plane_mask */ ); +_X_EXPORT extern int XSetPointerMapping( Display* /* display */, _Xconst unsigned char* /* map */, int /* nmap */ ); +_X_EXPORT extern int XSetScreenSaver( Display* /* display */, int /* timeout */, @@ -3291,6 +3666,7 @@ int /* allow_exposures */ ); +_X_EXPORT extern int XSetSelectionOwner( Display* /* display */, Atom /* selection */, @@ -3298,6 +3674,7 @@ Time /* time */ ); +_X_EXPORT extern int XSetState( Display* /* display */, GC /* gc */, @@ -3307,18 +3684,21 @@ unsigned long /* plane_mask */ ); +_X_EXPORT extern int XSetStipple( Display* /* display */, GC /* gc */, Pixmap /* stipple */ ); +_X_EXPORT extern int XSetSubwindowMode( Display* /* display */, GC /* gc */, int /* subwindow_mode */ ); +_X_EXPORT extern int XSetTSOrigin( Display* /* display */, GC /* gc */, @@ -3326,48 +3706,56 @@ int /* ts_y_origin */ ); +_X_EXPORT extern int XSetTile( Display* /* display */, GC /* gc */, Pixmap /* tile */ ); +_X_EXPORT extern int XSetWindowBackground( Display* /* display */, Window /* w */, unsigned long /* background_pixel */ ); +_X_EXPORT extern int XSetWindowBackgroundPixmap( Display* /* display */, Window /* w */, Pixmap /* background_pixmap */ ); +_X_EXPORT extern int XSetWindowBorder( Display* /* display */, Window /* w */, unsigned long /* border_pixel */ ); +_X_EXPORT extern int XSetWindowBorderPixmap( Display* /* display */, Window /* w */, Pixmap /* border_pixmap */ ); +_X_EXPORT extern int XSetWindowBorderWidth( Display* /* display */, Window /* w */, unsigned int /* width */ ); +_X_EXPORT extern int XSetWindowColormap( Display* /* display */, Window /* w */, Colormap /* colormap */ ); +_X_EXPORT extern int XStoreBuffer( Display* /* display */, _Xconst char* /* bytes */, @@ -3375,18 +3763,21 @@ int /* buffer */ ); +_X_EXPORT extern int XStoreBytes( Display* /* display */, _Xconst char* /* bytes */, int /* nbytes */ ); +_X_EXPORT extern int XStoreColor( Display* /* display */, Colormap /* colormap */, XColor* /* color */ ); +_X_EXPORT extern int XStoreColors( Display* /* display */, Colormap /* colormap */, @@ -3394,12 +3785,14 @@ int /* ncolors */ ); +_X_EXPORT extern int XStoreName( Display* /* display */, Window /* w */, _Xconst char* /* window_name */ ); +_X_EXPORT extern int XStoreNamedColor( Display* /* display */, Colormap /* colormap */, @@ -3408,11 +3801,13 @@ int /* flags */ ); +_X_EXPORT extern int XSync( Display* /* display */, Bool /* discard */ ); +_X_EXPORT extern int XTextExtents( XFontStruct* /* font_struct */, _Xconst char* /* string */, @@ -3423,6 +3818,7 @@ XCharStruct* /* overall_return */ ); +_X_EXPORT extern int XTextExtents16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, @@ -3433,18 +3829,21 @@ XCharStruct* /* overall_return */ ); +_X_EXPORT extern int XTextWidth( XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ ); +_X_EXPORT extern int XTextWidth16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* count */ ); +_X_EXPORT extern Bool XTranslateCoordinates( Display* /* display */, Window /* src_w */, @@ -3456,11 +3855,13 @@ Window* /* child_return */ ); +_X_EXPORT extern int XUndefineCursor( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XUngrabButton( Display* /* display */, unsigned int /* button */, @@ -3468,6 +3869,7 @@ Window /* grab_window */ ); +_X_EXPORT extern int XUngrabKey( Display* /* display */, int /* keycode */, @@ -3475,44 +3877,53 @@ Window /* grab_window */ ); +_X_EXPORT extern int XUngrabKeyboard( Display* /* display */, Time /* time */ ); +_X_EXPORT extern int XUngrabPointer( Display* /* display */, Time /* time */ ); +_X_EXPORT extern int XUngrabServer( Display* /* display */ ); +_X_EXPORT extern int XUninstallColormap( Display* /* display */, Colormap /* colormap */ ); +_X_EXPORT extern int XUnloadFont( Display* /* display */, Font /* font */ ); +_X_EXPORT extern int XUnmapSubwindows( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XUnmapWindow( Display* /* display */, Window /* w */ ); +_X_EXPORT extern int XVendorRelease( Display* /* display */ ); +_X_EXPORT extern int XWarpPointer( Display* /* display */, Window /* src_w */, @@ -3525,14 +3936,17 @@ int /* dest_y */ ); +_X_EXPORT extern int XWidthMMOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XWidthOfScreen( Screen* /* screen */ ); +_X_EXPORT extern int XWindowEvent( Display* /* display */, Window /* w */, @@ -3540,6 +3954,7 @@ XEvent* /* event_return */ ); +_X_EXPORT extern int XWriteBitmapFile( Display* /* display */, _Xconst char* /* filename */, @@ -3550,12 +3965,15 @@ int /* y_hot */ ); +_X_EXPORT extern Bool XSupportsLocale (void); +_X_EXPORT extern char *XSetLocaleModifiers( const char* /* modifier_list */ ); +_X_EXPORT extern XOM XOpenOM( Display* /* display */, struct _XrmHashBucketRec* /* rdb */, @@ -3563,51 +3981,62 @@ _Xconst char* /* res_class */ ); +_X_EXPORT extern Status XCloseOM( XOM /* om */ ); +_X_EXPORT extern char *XSetOMValues( XOM /* om */, ... ) _X_SENTINEL(0); +_X_EXPORT extern char *XGetOMValues( XOM /* om */, ... ) _X_SENTINEL(0); +_X_EXPORT extern Display *XDisplayOfOM( XOM /* om */ ); +_X_EXPORT extern char *XLocaleOfOM( XOM /* om */ ); +_X_EXPORT extern XOC XCreateOC( XOM /* om */, ... ) _X_SENTINEL(0); +_X_EXPORT extern void XDestroyOC( XOC /* oc */ ); +_X_EXPORT extern XOM XOMOfOC( XOC /* oc */ ); +_X_EXPORT extern char *XSetOCValues( XOC /* oc */, ... ) _X_SENTINEL(0); +_X_EXPORT extern char *XGetOCValues( XOC /* oc */, ... ) _X_SENTINEL(0); +_X_EXPORT extern XFontSet XCreateFontSet( Display* /* display */, _Xconst char* /* base_font_name_list */, @@ -3616,59 +4045,71 @@ char** /* def_string */ ); +_X_EXPORT extern void XFreeFontSet( Display* /* display */, XFontSet /* font_set */ ); +_X_EXPORT extern int XFontsOfFontSet( XFontSet /* font_set */, XFontStruct*** /* font_struct_list */, char*** /* font_name_list */ ); +_X_EXPORT extern char *XBaseFontNameListOfFontSet( XFontSet /* font_set */ ); +_X_EXPORT extern char *XLocaleOfFontSet( XFontSet /* font_set */ ); +_X_EXPORT extern Bool XContextDependentDrawing( XFontSet /* font_set */ ); +_X_EXPORT extern Bool XDirectionalDependentDrawing( XFontSet /* font_set */ ); +_X_EXPORT extern Bool XContextualDrawing( XFontSet /* font_set */ ); +_X_EXPORT extern XFontSetExtents *XExtentsOfFontSet( XFontSet /* font_set */ ); +_X_EXPORT extern int XmbTextEscapement( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */ ); +_X_EXPORT extern int XwcTextEscapement( XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */ ); +_X_EXPORT extern int Xutf8TextEscapement( XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */ ); +_X_EXPORT extern int XmbTextExtents( XFontSet /* font_set */, _Xconst char* /* text */, @@ -3677,6 +4118,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern int XwcTextExtents( XFontSet /* font_set */, _Xconst wchar_t* /* text */, @@ -3685,6 +4127,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern int Xutf8TextExtents( XFontSet /* font_set */, _Xconst char* /* text */, @@ -3693,6 +4136,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern Status XmbTextPerCharExtents( XFontSet /* font_set */, _Xconst char* /* text */, @@ -3705,6 +4149,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern Status XwcTextPerCharExtents( XFontSet /* font_set */, _Xconst wchar_t* /* text */, @@ -3717,6 +4162,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern Status Xutf8TextPerCharExtents( XFontSet /* font_set */, _Xconst char* /* text */, @@ -3729,6 +4175,7 @@ XRectangle* /* overall_logical_return */ ); +_X_EXPORT extern void XmbDrawText( Display* /* display */, Drawable /* d */, @@ -3739,6 +4186,7 @@ int /* nitems */ ); +_X_EXPORT extern void XwcDrawText( Display* /* display */, Drawable /* d */, @@ -3749,6 +4197,7 @@ int /* nitems */ ); +_X_EXPORT extern void Xutf8DrawText( Display* /* display */, Drawable /* d */, @@ -3759,6 +4208,7 @@ int /* nitems */ ); +_X_EXPORT extern void XmbDrawString( Display* /* display */, Drawable /* d */, @@ -3770,6 +4220,7 @@ int /* bytes_text */ ); +_X_EXPORT extern void XwcDrawString( Display* /* display */, Drawable /* d */, @@ -3781,6 +4232,7 @@ int /* num_wchars */ ); +_X_EXPORT extern void Xutf8DrawString( Display* /* display */, Drawable /* d */, @@ -3792,6 +4244,7 @@ int /* bytes_text */ ); +_X_EXPORT extern void XmbDrawImageString( Display* /* display */, Drawable /* d */, @@ -3803,6 +4256,7 @@ int /* bytes_text */ ); +_X_EXPORT extern void XwcDrawImageString( Display* /* display */, Drawable /* d */, @@ -3814,6 +4268,7 @@ int /* num_wchars */ ); +_X_EXPORT extern void Xutf8DrawImageString( Display* /* display */, Drawable /* d */, @@ -3825,6 +4280,7 @@ int /* bytes_text */ ); +_X_EXPORT extern XIM XOpenIM( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, @@ -3832,71 +4288,88 @@ char* /* res_class */ ); +_X_EXPORT extern Status XCloseIM( XIM /* im */ ); +_X_EXPORT extern char *XGetIMValues( XIM /* im */, ... ) _X_SENTINEL(0); +_X_EXPORT extern char *XSetIMValues( XIM /* im */, ... ) _X_SENTINEL(0); +_X_EXPORT extern Display *XDisplayOfIM( XIM /* im */ ); +_X_EXPORT extern char *XLocaleOfIM( XIM /* im*/ ); +_X_EXPORT extern XIC XCreateIC( XIM /* im */, ... ) _X_SENTINEL(0); +_X_EXPORT extern void XDestroyIC( XIC /* ic */ ); +_X_EXPORT extern void XSetICFocus( XIC /* ic */ ); +_X_EXPORT extern void XUnsetICFocus( XIC /* ic */ ); +_X_EXPORT extern wchar_t *XwcResetIC( XIC /* ic */ ); +_X_EXPORT extern char *XmbResetIC( XIC /* ic */ ); +_X_EXPORT extern char *Xutf8ResetIC( XIC /* ic */ ); +_X_EXPORT extern char *XSetICValues( XIC /* ic */, ... ) _X_SENTINEL(0); +_X_EXPORT extern char *XGetICValues( XIC /* ic */, ... ) _X_SENTINEL(0); +_X_EXPORT extern XIM XIMOfIC( XIC /* ic */ ); +_X_EXPORT extern Bool XFilterEvent( XEvent* /* event */, Window /* window */ ); +_X_EXPORT extern int XmbLookupString( XIC /* ic */, XKeyPressedEvent* /* event */, @@ -3906,6 +4379,7 @@ Status* /* status_return */ ); +_X_EXPORT extern int XwcLookupString( XIC /* ic */, XKeyPressedEvent* /* event */, @@ -3915,6 +4389,7 @@ Status* /* status_return */ ); +_X_EXPORT extern int Xutf8LookupString( XIC /* ic */, XKeyPressedEvent* /* event */, @@ -3924,12 +4399,14 @@ Status* /* status_return */ ); +_X_EXPORT extern XVaNestedList XVaCreateNestedList( int /*unused*/, ... ) _X_SENTINEL(0); /* internal connections for IMs */ +_X_EXPORT extern Bool XRegisterIMInstantiateCallback( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, @@ -3939,6 +4416,7 @@ XPointer /* client_data */ ); +_X_EXPORT extern Bool XUnregisterIMInstantiateCallback( Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, @@ -3957,29 +4435,34 @@ ); +_X_EXPORT extern Status XInternalConnectionNumbers( Display* /* dpy */, int** /* fd_return */, int* /* count_return */ ); +_X_EXPORT extern void XProcessInternalConnection( Display* /* dpy */, int /* fd */ ); +_X_EXPORT extern Status XAddConnectionWatch( Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ ); +_X_EXPORT extern void XRemoveConnectionWatch( Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ ); +_X_EXPORT extern void XSetAuthorization( char * /* name */, int /* namelen */, @@ -3987,6 +4470,7 @@ int /* datalen */ ); +_X_EXPORT extern int _Xmbtowc( wchar_t * /* wstr */, #ifdef ISC @@ -3998,6 +4482,7 @@ #endif ); +_X_EXPORT extern int _Xwctomb( char * /* str */, wchar_t /* wc */ Index: libX11/include/X11/Xlibint.h =================================================================== --- libX11.orig/include/X11/Xlibint.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/Xlibint.h 2007-05-26 23:56:22.000000000 +0800 @@ -275,12 +275,17 @@ #endif /* in XlibInt.c */ +_X_EXPORT extern void (*_XCreateMutex_fn)( LockInfoPtr /* lock */ ); + +_X_EXPORT extern void (*_XFreeMutex_fn)( LockInfoPtr /* lock */ ); + +_X_EXPORT extern void (*_XLockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) @@ -288,6 +293,8 @@ , int /* line */ #endif ); + +_X_EXPORT extern void (*_XUnlockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) @@ -296,6 +303,7 @@ #endif ); +_X_EXPORT extern LockInfoPtr _Xglobal_lock; #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) @@ -580,6 +588,7 @@ #define SyncHandle() \ if (dpy->synchandler) (*dpy->synchandler)(dpy) +_X_EXPORT extern void _XFlushGCCache(Display *dpy, GC gc); #define FlushGC(dpy, gc) \ if ((gc)->dirty) _XFlushGCCache((dpy), (gc)) @@ -632,11 +641,15 @@ #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len)) #ifdef LONG64 #define Data32(dpy, data, len) _XData32(dpy, (long *)data, len) + +_X_EXPORT extern int _XData32( Display *dpy, register long *data, unsigned len ); + +_X_EXPORT extern void _XRead32( Display *dpy, register long *data, @@ -760,6 +773,7 @@ int error_count; } _XAsyncErrorState; +_X_EXPORT extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler); #define DeqAsyncHandler(dpy,handler) { \ if (dpy->async_handlers == (handler)) \ @@ -885,55 +899,82 @@ /* extension hooks */ #ifdef DataRoutineIsProcedure +_X_EXPORT extern void Data(Display *dpy, char *data, long len); #endif + +_X_EXPORT extern int _XError( Display* /* dpy */, xError* /* rep */ ); + +_X_EXPORT extern int _XIOError( Display* /* dpy */ ); + +_X_EXPORT extern int (*_XIOErrorFunction)( Display* /* dpy */ ); + +_X_EXPORT extern int (*_XErrorFunction)( Display* /* dpy */, XErrorEvent* /* error_event */ ); + +_X_EXPORT extern void _XEatData( Display* /* dpy */, unsigned long /* n */ ); + +_X_EXPORT extern char *_XAllocScratch( Display* /* dpy */, unsigned long /* nbytes */ ); + +_X_EXPORT extern char *_XAllocTemp( Display* /* dpy */, unsigned long /* nbytes */ ); + +_X_EXPORT extern void _XFreeTemp( Display* /* dpy */, char* /* buf */, unsigned long /* nbytes */ ); + +_X_EXPORT extern Visual *_XVIDtoVisual( Display* /* dpy */, VisualID /* id */ ); + +_X_EXPORT extern unsigned long _XSetLastRequestRead( Display* /* dpy */, xGenericReply* /* rep */ ); + +_X_EXPORT extern int _XGetHostname( char* /* buf */, int /* maxlen */ ); + +_X_EXPORT extern Screen *_XScreenOfWindow( Display* /* dpy */, Window /* w */ ); + +_X_EXPORT extern Bool _XAsyncErrorHandler( Display* /* dpy */, xReply* /* rep */, @@ -941,6 +982,8 @@ int /* len */, XPointer /* data */ ); + +_X_EXPORT extern char *_XGetAsyncReply( Display* /* dpy */, char* /* replbuf */, @@ -950,6 +993,8 @@ int /* extra */, Bool /* discard */ ); + +_X_EXPORT extern void _XGetAsyncData( Display* /* dpy */, char * /* data */, @@ -959,73 +1004,111 @@ int /* datalen */, int /* discardtotal */ ); + +_X_EXPORT extern void _XSetSeqSyncFunction( Display* /* dpy */ ); + +_X_EXPORT extern void _XFlush( Display* /* dpy */ ); + +_X_EXPORT extern int _XEventsQueued( Display* /* dpy */, int /* mode */ ); + +_X_EXPORT extern void _XReadEvents( Display* /* dpy */ ); + +_X_EXPORT extern int _XRead( Display* /* dpy */, char* /* data */, long /* size */ ); + +_X_EXPORT extern void _XReadPad( Display* /* dpy */, char* /* data */, long /* size */ ); + +_X_EXPORT extern void _XSend( Display* /* dpy */, _Xconst char* /* data */, long /* size */ ); + +_X_EXPORT extern Status _XReply( Display* /* dpy */, xReply* /* rep */, int /* extra */, Bool /* discard */ ); + +_X_EXPORT extern void _XEnq( Display* /* dpy */, xEvent* /* event */ ); + +_X_EXPORT extern void _XDeq( Display* /* dpy */, _XQEvent* /* prev */, _XQEvent* /* qelt */ ); +_X_EXPORT extern Bool _XUnknownWireEvent( Display* /* dpy */, XEvent* /* re */, xEvent* /* event */ ); + +_X_EXPORT extern Status _XUnknownNativeEvent( Display* /* dpy */, XEvent* /* re */, xEvent* /* event */ ); +_X_EXPORT extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event); + +_X_EXPORT extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we); + +_X_EXPORT extern Bool _XPollfdCacheInit(Display *dpy); + +_X_EXPORT extern void _XPollfdCacheAdd(Display *dpy, int fd); + +_X_EXPORT extern void _XPollfdCacheDel(Display *dpy, int fd); + +_X_EXPORT extern XID _XAllocID(Display *dpy); + +_X_EXPORT extern void _XAllocIDs(Display *dpy, XID *ids, int count); +_X_EXPORT extern int _XFreeExtData( XExtData* /* extension */ ); +_X_EXPORT extern int (*XESetCreateGC( Display* /* display */, int /* extension */, @@ -1038,6 +1121,7 @@ Display*, GC, XExtCodes* ); +_X_EXPORT extern int (*XESetCopyGC( Display* /* display */, int /* extension */, @@ -1050,6 +1134,7 @@ Display*, GC, XExtCodes* ); +_X_EXPORT extern int (*XESetFlushGC( Display* /* display */, int /* extension */, @@ -1062,6 +1147,7 @@ Display*, GC, XExtCodes* ); +_X_EXPORT extern int (*XESetFreeGC( Display* /* display */, int /* extension */, @@ -1074,6 +1160,7 @@ Display*, GC, XExtCodes* ); +_X_EXPORT extern int (*XESetCreateFont( Display* /* display */, int /* extension */, @@ -1086,6 +1173,7 @@ Display*, XFontStruct*, XExtCodes* ); +_X_EXPORT extern int (*XESetFreeFont( Display* /* display */, int /* extension */, @@ -1098,6 +1186,7 @@ Display*, XFontStruct*, XExtCodes* ); +_X_EXPORT extern int (*XESetCloseDisplay( Display* /* display */, int /* extension */, @@ -1109,6 +1198,7 @@ Display*, XExtCodes* ); +_X_EXPORT extern int (*XESetError( Display* /* display */, int /* extension */, @@ -1122,6 +1212,7 @@ Display*, xError*, XExtCodes*, int* ); +_X_EXPORT extern char* (*XESetErrorString( Display* /* display */, int /* extension */, @@ -1136,6 +1227,7 @@ Display*, int, XExtCodes*, char*, int ); +_X_EXPORT extern void (*XESetPrintErrorValues ( Display* /* display */, int /* extension */, @@ -1148,6 +1240,7 @@ Display*, XErrorEvent*, void* ); +_X_EXPORT extern Bool (*XESetWireToEvent( Display* /* display */, int /* event_number */, @@ -1160,6 +1253,7 @@ Display*, XEvent*, xEvent* ); +_X_EXPORT extern Status (*XESetEventToWire( Display* /* display */, int /* event_number */, @@ -1172,6 +1266,7 @@ Display*, XEvent*, xEvent* ); +_X_EXPORT extern Bool (*XESetWireToError( Display* /* display */, int /* error_number */, @@ -1184,6 +1279,7 @@ Display*, XErrorEvent*, xError* ); +_X_EXPORT extern void (*XESetBeforeFlush( Display* /* display */, int /* error_number */, @@ -1206,6 +1302,7 @@ ); +_X_EXPORT extern Status _XRegisterInternalConnection( Display* /* dpy */, int /* fd */, @@ -1213,11 +1310,13 @@ XPointer /* call_data */ ); +_X_EXPORT extern void _XUnregisterInternalConnection( Display* /* dpy */, int /* fd */ ); +_X_EXPORT extern void _XProcessInternalConnection( Display* /* dpy */, struct _XConnectionInfo* /* conn_info */ @@ -1240,17 +1339,20 @@ }; #ifdef __UNIXOS2__ +_X_EXPORT extern char* __XOS2RedirRoot( char* ); #endif +_X_EXPORT extern int _XTextHeight( XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ ); +_X_EXPORT extern int _XTextHeight16( XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, @@ -1259,22 +1361,26 @@ #if defined(WIN32) +_X_EXPORT extern int _XOpenFile( _Xconst char* /* path */, int /* flags */ ); +_X_EXPORT extern int _XOpenFileMode( _Xconst char* /* path */, int /* flags */, mode_t /* mode */ ); +_X_EXPORT extern void* _XFopenFile( _Xconst char* /* path */, _Xconst char* /* mode */ ); +_X_EXPORT extern int _XAccessFile( _Xconst char* /* path */ ); @@ -1285,8 +1391,10 @@ #endif /* EvToWire.c */ +_X_EXPORT extern Status _XEventToWire(Display *dpy, XEvent *re, xEvent *event); +_X_EXPORT extern int _XF86LoadQueryLocaleFont( Display* /* dpy */, _Xconst char* /* name*/, @@ -1294,19 +1402,23 @@ Font* /* fidp */ ); +_X_EXPORT extern void _XProcessWindowAttributes ( register Display *dpy, xChangeWindowAttributesReq *req, register unsigned long valuemask, register XSetWindowAttributes *attributes); +_X_EXPORT extern int _XDefaultError( Display *dpy, XErrorEvent *event); +_X_EXPORT extern int _XDefaultIOError( Display *dpy); +_X_EXPORT extern void _XSetClipRectangles ( register Display *dpy, GC gc, @@ -1315,11 +1427,13 @@ int n, int ordering); +_X_EXPORT Status _XGetWindowAttributes( register Display *dpy, Window w, XWindowAttributes *attr); +_X_EXPORT int _XPutBackEvent ( register Display *dpy, register XEvent *event); Index: libX11/include/X11/Xresource.h =================================================================== --- libX11.orig/include/X11/Xresource.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/Xresource.h 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ * ****************************************************************/ +_X_EXPORT extern char *Xpermalloc( unsigned int /* size */ ); @@ -90,19 +91,23 @@ #define NULLSTRING ((XrmString) 0) /* find quark for string, create new quark if none already exists */ +_X_EXPORT extern XrmQuark XrmStringToQuark( _Xconst char* /* string */ ); +_X_EXPORT extern XrmQuark XrmPermStringToQuark( _Xconst char* /* string */ ); /* find string for quark */ +_X_EXPORT extern XrmString XrmQuarkToString( XrmQuark /* quark */ ); +_X_EXPORT extern XrmQuark XrmUniqueQuark( void ); @@ -118,11 +123,13 @@ typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList; +_X_EXPORT extern void XrmStringToQuarkList( _Xconst char* /* string */, XrmQuarkList /* quarks_return */ ); +_X_EXPORT extern void XrmStringToBindingQuarkList( _Xconst char* /* string */, XrmBindingList /* bindings_return */, @@ -177,10 +184,12 @@ typedef struct _XrmHashBucketRec *XrmDatabase; +_X_EXPORT extern void XrmDestroyDatabase( XrmDatabase /* database */ ); +_X_EXPORT extern void XrmQPutResource( XrmDatabase* /* database */, XrmBindingList /* bindings */, @@ -189,6 +198,7 @@ XrmValue* /* value */ ); +_X_EXPORT extern void XrmPutResource( XrmDatabase* /* database */, _Xconst char* /* specifier */, @@ -196,6 +206,7 @@ XrmValue* /* value */ ); +_X_EXPORT extern void XrmQPutStringResource( XrmDatabase* /* database */, XrmBindingList /* bindings */, @@ -203,17 +214,20 @@ _Xconst char* /* value */ ); +_X_EXPORT extern void XrmPutStringResource( XrmDatabase* /* database */, _Xconst char* /* specifier */, _Xconst char* /* value */ ); +_X_EXPORT extern void XrmPutLineResource( XrmDatabase* /* database */, _Xconst char* /* line */ ); +_X_EXPORT extern Bool XrmQGetResource( XrmDatabase /* database */, XrmNameList /* quark_name */, @@ -222,6 +236,7 @@ XrmValue* /* value_return */ ); +_X_EXPORT extern Bool XrmGetResource( XrmDatabase /* database */, _Xconst char* /* str_name */, @@ -230,6 +245,7 @@ XrmValue* /* value_return */ ); +_X_EXPORT extern Bool XrmQGetSearchList( XrmDatabase /* database */, XrmNameList /* names */, @@ -238,6 +254,7 @@ int /* list_length */ ); +_X_EXPORT extern Bool XrmQGetSearchResource( XrmSearchList /* list */, XrmName /* name */, @@ -254,41 +271,49 @@ #ifndef _XP_PRINT_SERVER_ +_X_EXPORT extern void XrmSetDatabase( Display* /* display */, XrmDatabase /* database */ ); +_X_EXPORT extern XrmDatabase XrmGetDatabase( Display* /* display */ ); #endif /* !_XP_PRINT_SERVER_ */ +_X_EXPORT extern XrmDatabase XrmGetFileDatabase( _Xconst char* /* filename */ ); +_X_EXPORT extern Status XrmCombineFileDatabase( _Xconst char* /* filename */, XrmDatabase* /* target */, Bool /* override */ ); +_X_EXPORT extern XrmDatabase XrmGetStringDatabase( _Xconst char* /* data */ /* null terminated string */ ); +_X_EXPORT extern void XrmPutFileDatabase( XrmDatabase /* database */, _Xconst char* /* filename */ ); +_X_EXPORT extern void XrmMergeDatabases( XrmDatabase /* source_db */, XrmDatabase* /* target_db */ ); +_X_EXPORT extern void XrmCombineDatabase( XrmDatabase /* source_db */, XrmDatabase* /* target_db */, @@ -298,6 +323,7 @@ #define XrmEnumAllLevels 0 #define XrmEnumOneLevel 1 +_X_EXPORT extern Bool XrmEnumerateDatabase( XrmDatabase /* db */, XrmNameList /* name_prefix */, @@ -314,6 +340,7 @@ XPointer /* closure */ ); +_X_EXPORT extern const char *XrmLocaleOfDatabase( XrmDatabase /* database */ ); @@ -345,6 +372,7 @@ } XrmOptionDescRec, *XrmOptionDescList; +_X_EXPORT extern void XrmParseCommand( XrmDatabase* /* database */, XrmOptionDescList /* table */, Index: libX11/include/X11/Xutil.h =================================================================== --- libX11.orig/include/X11/Xutil.h 2007-05-26 23:55:44.000000000 +0800 +++ libX11/include/X11/Xutil.h 2007-05-26 23:56:22.000000000 +0800 @@ -186,19 +186,29 @@ } XClassHint; #ifdef XUTIL_DEFINE_FUNCTIONS + +_X_EXPORT extern int XDestroyImage( XImage *ximage); + +_X_EXPORT extern unsigned long XGetPixel( XImage *ximage, int x, int y); + +_X_EXPORT extern int XPutPixel( XImage *ximage, int x, int y, unsigned long pixel); + +_X_EXPORT extern XImage *XSubImage( XImage *ximage, int x, int y, unsigned int width, unsigned int height); + +_X_EXPORT extern int XAddPixel( XImage *ximage, long value); @@ -357,56 +367,69 @@ /* The following declarations are alphabetized. */ +_X_EXPORT extern XClassHint *XAllocClassHint ( void ); +_X_EXPORT extern XIconSize *XAllocIconSize ( void ); +_X_EXPORT extern XSizeHints *XAllocSizeHints ( void ); +_X_EXPORT extern XStandardColormap *XAllocStandardColormap ( void ); +_X_EXPORT extern XWMHints *XAllocWMHints ( void ); +_X_EXPORT extern int XClipBox( Region /* r */, XRectangle* /* rect_return */ ); +_X_EXPORT extern Region XCreateRegion( void ); +_X_EXPORT extern const char *XDefaultString (void); +_X_EXPORT extern int XDeleteContext( Display* /* display */, XID /* rid */, XContext /* context */ ); +_X_EXPORT extern int XDestroyRegion( Region /* r */ ); +_X_EXPORT extern int XEmptyRegion( Region /* r */ ); +_X_EXPORT extern int XEqualRegion( Region /* r1 */, Region /* r2 */ ); +_X_EXPORT extern int XFindContext( Display* /* display */, XID /* rid */, @@ -414,12 +437,14 @@ XPointer* /* data_return */ ); +_X_EXPORT extern Status XGetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints_return */ ); +_X_EXPORT extern Status XGetIconSizes( Display* /* display */, Window /* w */, @@ -427,12 +452,14 @@ int* /* count_return */ ); +_X_EXPORT extern Status XGetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */ ); +_X_EXPORT extern Status XGetRGBColormaps( Display* /* display */, Window /* w */, @@ -441,6 +468,7 @@ Atom /* property */ ); +_X_EXPORT extern Status XGetSizeHints( Display* /* display */, Window /* w */, @@ -448,6 +476,7 @@ Atom /* property */ ); +_X_EXPORT extern Status XGetStandardColormap( Display* /* display */, Window /* w */, @@ -455,6 +484,7 @@ Atom /* property */ ); +_X_EXPORT extern Status XGetTextProperty( Display* /* display */, Window /* window */, @@ -462,6 +492,7 @@ Atom /* property */ ); +_X_EXPORT extern XVisualInfo *XGetVisualInfo( Display* /* display */, long /* vinfo_mask */, @@ -469,29 +500,34 @@ int* /* nitems_return */ ); +_X_EXPORT extern Status XGetWMClientMachine( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); +_X_EXPORT extern XWMHints *XGetWMHints( Display* /* display */, Window /* w */ ); +_X_EXPORT extern Status XGetWMIconName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); +_X_EXPORT extern Status XGetWMName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ ); +_X_EXPORT extern Status XGetWMNormalHints( Display* /* display */, Window /* w */, @@ -499,6 +535,7 @@ long* /* supplied_return */ ); +_X_EXPORT extern Status XGetWMSizeHints( Display* /* display */, Window /* w */, @@ -507,24 +544,28 @@ Atom /* property */ ); +_X_EXPORT extern Status XGetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints_return */ ); +_X_EXPORT extern int XIntersectRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); +_X_EXPORT extern void XConvertCase( KeySym /* sym */, KeySym* /* lower */, KeySym* /* upper */ ); +_X_EXPORT extern int XLookupString( XKeyEvent* /* event_struct */, char* /* buffer_return */, @@ -533,6 +574,7 @@ XComposeStatus* /* status_in_out */ ); +_X_EXPORT extern Status XMatchVisualInfo( Display* /* display */, int /* screen */, @@ -541,24 +583,28 @@ XVisualInfo* /* vinfo_return */ ); +_X_EXPORT extern int XOffsetRegion( Region /* r */, int /* dx */, int /* dy */ ); +_X_EXPORT extern Bool XPointInRegion( Region /* r */, int /* x */, int /* y */ ); +_X_EXPORT extern Region XPolygonRegion( XPoint* /* points */, int /* n */, int /* fill_rule */ ); +_X_EXPORT extern int XRectInRegion( Region /* r */, int /* x */, @@ -567,6 +613,7 @@ unsigned int /* height */ ); +_X_EXPORT extern int XSaveContext( Display* /* display */, XID /* rid */, @@ -574,12 +621,14 @@ _Xconst char* /* data */ ); +_X_EXPORT extern int XSetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints */ ); +_X_EXPORT extern int XSetIconSizes( Display* /* display */, Window /* w */, @@ -587,12 +636,14 @@ int /* count */ ); +_X_EXPORT extern int XSetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ ); +_X_EXPORT extern void XSetRGBColormaps( Display* /* display */, Window /* w */, @@ -601,6 +652,7 @@ Atom /* property */ ); +_X_EXPORT extern int XSetSizeHints( Display* /* display */, Window /* w */, @@ -608,6 +660,7 @@ Atom /* property */ ); +_X_EXPORT extern int XSetStandardProperties( Display* /* display */, Window /* w */, @@ -619,6 +672,7 @@ XSizeHints* /* hints */ ); +_X_EXPORT extern void XSetTextProperty( Display* /* display */, Window /* w */, @@ -626,36 +680,42 @@ Atom /* property */ ); +_X_EXPORT extern void XSetWMClientMachine( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); +_X_EXPORT extern int XSetWMHints( Display* /* display */, Window /* w */, XWMHints* /* wm_hints */ ); +_X_EXPORT extern void XSetWMIconName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); +_X_EXPORT extern void XSetWMName( Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ ); +_X_EXPORT extern void XSetWMNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ ); +_X_EXPORT extern void XSetWMProperties( Display* /* display */, Window /* w */, @@ -668,6 +728,7 @@ XClassHint* /* class_hints */ ); +_X_EXPORT extern void XmbSetWMProperties( Display* /* display */, Window /* w */, @@ -680,6 +741,7 @@ XClassHint* /* class_hints */ ); +_X_EXPORT extern void Xutf8SetWMProperties( Display* /* display */, Window /* w */, @@ -692,6 +754,7 @@ XClassHint* /* class_hints */ ); +_X_EXPORT extern void XSetWMSizeHints( Display* /* display */, Window /* w */, @@ -699,12 +762,14 @@ Atom /* property */ ); +_X_EXPORT extern int XSetRegion( Display* /* display */, GC /* gc */, Region /* r */ ); +_X_EXPORT extern void XSetStandardColormap( Display* /* display */, Window /* w */, @@ -712,30 +777,35 @@ Atom /* property */ ); +_X_EXPORT extern int XSetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints */ ); +_X_EXPORT extern int XShrinkRegion( Region /* r */, int /* dx */, int /* dy */ ); +_X_EXPORT extern Status XStringListToTextProperty( char** /* list */, int /* count */, XTextProperty* /* text_prop_return */ ); +_X_EXPORT extern int XSubtractRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); +_X_EXPORT extern int XmbTextListToTextProperty( Display* display, char** list, @@ -744,6 +814,7 @@ XTextProperty* text_prop_return ); +_X_EXPORT extern int XwcTextListToTextProperty( Display* display, wchar_t** list, @@ -752,6 +823,7 @@ XTextProperty* text_prop_return ); +_X_EXPORT extern int Xutf8TextListToTextProperty( Display* display, char** list, @@ -760,16 +832,19 @@ XTextProperty* text_prop_return ); +_X_EXPORT extern void XwcFreeStringList( wchar_t** list ); +_X_EXPORT extern Status XTextPropertyToStringList( XTextProperty* /* text_prop */, char*** /* list_return */, int* /* count_return */ ); +_X_EXPORT extern int XmbTextPropertyToTextList( Display* display, const XTextProperty* text_prop, @@ -777,6 +852,7 @@ int* count_return ); +_X_EXPORT extern int XwcTextPropertyToTextList( Display* display, const XTextProperty* text_prop, @@ -784,6 +860,7 @@ int* count_return ); +_X_EXPORT extern int Xutf8TextPropertyToTextList( Display* display, const XTextProperty* text_prop, @@ -791,18 +868,21 @@ int* count_return ); +_X_EXPORT extern int XUnionRectWithRegion( XRectangle* /* rectangle */, Region /* src_region */, Region /* dest_region_return */ ); +_X_EXPORT extern int XUnionRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ ); +_X_EXPORT extern int XWMGeometry( Display* /* display */, int /* screen_number */, @@ -817,6 +897,7 @@ int* /* gravity_return */ ); +_X_EXPORT extern int XXorRegion( Region /* sra */, Region /* srb */, Index: libX11/src/AllCells.c =================================================================== --- libX11.orig/src/AllCells.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/AllCells.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XAllocColorCells( register Display *dpy, Colormap cmap, Index: libX11/src/AllPlanes.c =================================================================== --- libX11.orig/src/AllPlanes.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/AllPlanes.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XAllocColorPlanes( register Display *dpy, Colormap cmap, Index: libX11/src/AllowEv.c =================================================================== --- libX11.orig/src/AllowEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/AllowEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XAllowEvents( register Display *dpy, Index: libX11/src/AutoRep.c =================================================================== --- libX11.orig/src/AutoRep.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/AutoRep.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XAutoRepeatOn (register Display *dpy) { @@ -40,6 +41,7 @@ return 1; } +_X_EXPORT int XAutoRepeatOff (register Display *dpy) { Index: libX11/src/Backgnd.c =================================================================== --- libX11.orig/src/Backgnd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Backgnd.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetWindowBackground( register Display *dpy, Index: libX11/src/BdrWidth.c =================================================================== --- libX11.orig/src/BdrWidth.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/BdrWidth.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetWindowBorderWidth( Display *dpy, Index: libX11/src/Bell.c =================================================================== --- libX11.orig/src/Bell.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Bell.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XBell( register Display *dpy, Index: libX11/src/ChAccCon.c =================================================================== --- libX11.orig/src/ChAccCon.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChAccCon.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,18 +31,21 @@ #endif #include "Xlibint.h" +_X_EXPORT int XEnableAccessControl(register Display *dpy) { return XSetAccessControl(dpy, EnableAccess); } +_X_EXPORT int XDisableAccessControl(register Display *dpy) { return XSetAccessControl(dpy, DisableAccess); } +_X_EXPORT int XSetAccessControl( register Display *dpy, Index: libX11/src/ChActPGb.c =================================================================== --- libX11.orig/src/ChActPGb.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChActPGb.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XChangeActivePointerGrab( register Display *dpy, Index: libX11/src/ChClMode.c =================================================================== --- libX11.orig/src/ChClMode.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChClMode.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetCloseDownMode( register Display *dpy, Index: libX11/src/ChCmap.c =================================================================== --- libX11.orig/src/ChCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetWindowColormap( register Display *dpy, Index: libX11/src/ChGC.c =================================================================== --- libX11.orig/src/ChGC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChGC.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #include "Xlibint.h" #include "Cr.h" +_X_EXPORT int XChangeGC ( register Display *dpy, Index: libX11/src/ChKeyCon.c =================================================================== --- libX11.orig/src/ChKeyCon.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChKeyCon.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XChangeKeyboardControl( register Display *dpy, Index: libX11/src/ChPntCon.c =================================================================== --- libX11.orig/src/ChPntCon.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChPntCon.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XChangePointerControl( register Display *dpy, Index: libX11/src/ChProp.c =================================================================== --- libX11.orig/src/ChProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XChangeProperty ( register Display *dpy, Index: libX11/src/ChSaveSet.c =================================================================== --- libX11.orig/src/ChSaveSet.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChSaveSet.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XChangeSaveSet( register Display *dpy, @@ -48,6 +49,7 @@ return 1; } +_X_EXPORT int XAddToSaveSet( register Display *dpy, @@ -56,6 +58,7 @@ return XChangeSaveSet(dpy,win,SetModeInsert); } +_X_EXPORT int XRemoveFromSaveSet ( register Display *dpy, Index: libX11/src/ChWAttrs.c =================================================================== --- libX11.orig/src/ChWAttrs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChWAttrs.c 2007-05-26 23:56:22.000000000 +0800 @@ -37,6 +37,7 @@ CWOverrideRedirect|CWSaveUnder|CWEventMask|\ CWDontPropagate|CWColormap|CWCursor) +_X_EXPORT int XChangeWindowAttributes ( register Display *dpy, Index: libX11/src/ChWindow.c =================================================================== --- libX11.orig/src/ChWindow.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChWindow.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XResizeWindow( register Display *dpy, Index: libX11/src/ChkIfEv.c =================================================================== --- libX11.orig/src/ChkIfEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChkIfEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ * matches, return. If all else fails, tell the user no events found. */ +_X_EXPORT Bool XCheckIfEvent ( register Display *dpy, register XEvent *event, /* XEvent to be filled in. */ Index: libX11/src/ChkMaskEv.c =================================================================== --- libX11.orig/src/ChkMaskEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChkMaskEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -44,6 +44,7 @@ * matches, return. If all else fails, tell the user no events found. */ +_X_EXPORT Bool XCheckMaskEvent ( register Display *dpy, long mask, /* Selected event mask. */ Index: libX11/src/ChkTypEv.c =================================================================== --- libX11.orig/src/ChkTypEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChkTypEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ * matches, return. If all else fails, tell the user no events found. */ +_X_EXPORT Bool XCheckTypedEvent ( register Display *dpy, int type, /* Selected event type. */ Index: libX11/src/ChkTypWEv.c =================================================================== --- libX11.orig/src/ChkTypWEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChkTypWEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ * matches, return. If all else fails, tell the user no events found. */ +_X_EXPORT Bool XCheckTypedWindowEvent ( register Display *dpy, Window w, /* Selected window. */ Index: libX11/src/ChkWinEv.c =================================================================== --- libX11.orig/src/ChkWinEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ChkWinEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -43,6 +43,7 @@ * matches, return. If all else fails, tell the user no events found. */ +_X_EXPORT Bool XCheckWindowEvent ( register Display *dpy, Window w, /* Selected window. */ Index: libX11/src/CirWin.c =================================================================== --- libX11.orig/src/CirWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CirWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCirculateSubwindows( register Display *dpy, Index: libX11/src/CirWinDn.c =================================================================== --- libX11.orig/src/CirWinDn.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CirWinDn.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCirculateSubwindowsDown( register Display *dpy, Index: libX11/src/CirWinUp.c =================================================================== --- libX11.orig/src/CirWinUp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CirWinUp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCirculateSubwindowsUp( register Display *dpy, Index: libX11/src/ClDisplay.c =================================================================== --- libX11.orig/src/ClDisplay.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ClDisplay.c 2007-05-26 23:56:22.000000000 +0800 @@ -47,6 +47,7 @@ * memory and must be careful about the types of requests they generate. */ +_X_EXPORT int XCloseDisplay ( register Display *dpy) Index: libX11/src/Clear.c =================================================================== --- libX11.orig/src/Clear.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Clear.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XClearWindow( register Display *dpy, Index: libX11/src/ClearArea.c =================================================================== --- libX11.orig/src/ClearArea.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ClearArea.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XClearArea ( register Display *dpy, Index: libX11/src/ConfWind.c =================================================================== --- libX11.orig/src/ConfWind.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ConfWind.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XMoveResizeWindow( register Display *dpy, Index: libX11/src/ConnDis.c =================================================================== --- libX11.orig/src/ConnDis.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ConnDis.c 2007-05-26 23:56:22.000000000 +0800 @@ -669,6 +669,7 @@ static int xauth_names_length = NUM_DEFAULT_AUTH; +_X_EXPORT void XSetAuthorization (name, namelen, data, datalen) int namelen, datalen; /* lengths of name and data */ char *name, *data; /* NULL or arbitrary array of bytes */ Index: libX11/src/Context.c =================================================================== --- libX11.orig/src/Context.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Context.c 2007-05-26 23:56:22.000000000 +0800 @@ -158,6 +158,7 @@ Possible errors are Out-of-memory. */ +_X_EXPORT int XSaveContext( Display *display, register XID rid, @@ -235,6 +236,7 @@ if an error has occured, 0 otherwise. Possible errors are Entry-not-found. */ +_X_EXPORT int XFindContext(display, rid, context, data) Display *display; register XID rid; @@ -274,6 +276,7 @@ with the same arguments. */ +_X_EXPORT int XDeleteContext(display, rid, context) Display *display; register XID rid; Index: libX11/src/ConvSel.c =================================================================== --- libX11.orig/src/ConvSel.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ConvSel.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XConvertSelection( register Display *dpy, Index: libX11/src/CopyArea.c =================================================================== --- libX11.orig/src/CopyArea.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CopyArea.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCopyArea( register Display *dpy, Index: libX11/src/CopyCmap.c =================================================================== --- libX11.orig/src/CopyCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CopyCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -42,6 +42,7 @@ Colormap copy_cmap); #endif +_X_EXPORT Colormap XCopyColormapAndFree( register Display *dpy, Colormap src_cmap) Index: libX11/src/CopyGC.c =================================================================== --- libX11.orig/src/CopyGC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CopyGC.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCopyGC ( register Display *dpy, Index: libX11/src/CopyPlane.c =================================================================== --- libX11.orig/src/CopyPlane.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CopyPlane.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XCopyPlane( register Display *dpy, Index: libX11/src/CrBFData.c =================================================================== --- libX11.orig/src/CrBFData.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrBFData.c 2007-05-26 23:56:22.000000000 +0800 @@ -48,6 +48,7 @@ * xoffset=0 * no extra bytes per line */ +_X_EXPORT Pixmap XCreateBitmapFromData( Display *display, Drawable d, Index: libX11/src/CrCmap.c =================================================================== --- libX11.orig/src/CrCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,7 +32,7 @@ #include "Xlibint.h" #include "Xcmsint.h" - +_X_EXPORT Colormap XCreateColormap( register Display *dpy, Window w, Index: libX11/src/CrCursor.c =================================================================== --- libX11.orig/src/CrCursor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrCursor.c 2007-05-26 23:56:22.000000000 +0800 @@ -42,6 +42,7 @@ unsigned int y); #endif +_X_EXPORT Cursor XCreatePixmapCursor( register Display *dpy, Pixmap source, Index: libX11/src/CrGC.c =================================================================== --- libX11.orig/src/CrGC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrGC.c 2007-05-26 23:56:22.000000000 +0800 @@ -63,6 +63,7 @@ GC gc, xReq *req); +_X_EXPORT GC XCreateGC ( register Display *dpy, Drawable d, /* Window or Pixmap for which depth matches */ @@ -314,6 +315,7 @@ /* can only call when display is already locked. */ +_X_EXPORT void _XFlushGCCache( Display *dpy, GC gc) @@ -333,6 +335,7 @@ } } +_X_EXPORT void XFlushGC( Display *dpy, @@ -341,6 +344,7 @@ FlushGC(dpy, gc); } +_X_EXPORT GContext XGContextFromGC(GC gc) { return (gc->gid); Index: libX11/src/CrGlCur.c =================================================================== --- libX11.orig/src/CrGlCur.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrGlCur.c 2007-05-26 23:56:22.000000000 +0800 @@ -220,6 +220,7 @@ } #endif +_X_EXPORT Cursor XCreateGlyphCursor( register Display *dpy, Font source_font, Index: libX11/src/CrPFBData.c =================================================================== --- libX11.orig/src/CrPFBData.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrPFBData.c 2007-05-26 23:56:22.000000000 +0800 @@ -49,6 +49,7 @@ * xoffset=0 * no extra bytes per line */ +_X_EXPORT Pixmap XCreatePixmapFromBitmapData( Display *display, Drawable d, Index: libX11/src/CrPixmap.c =================================================================== --- libX11.orig/src/CrPixmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrPixmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -39,6 +39,7 @@ unsigned int height); #endif +_X_EXPORT Pixmap XCreatePixmap ( register Display *dpy, Drawable d, Index: libX11/src/CrWindow.c =================================================================== --- libX11.orig/src/CrWindow.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/CrWindow.c 2007-05-26 23:56:22.000000000 +0800 @@ -30,6 +30,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Window XCreateSimpleWindow( register Display *dpy, Window parent, Index: libX11/src/Cursor.c =================================================================== --- libX11.orig/src/Cursor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Cursor.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */ +_X_EXPORT Cursor XCreateFontCursor( Display *dpy, unsigned int which) Index: libX11/src/DefCursor.c =================================================================== --- libX11.orig/src/DefCursor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DefCursor.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDefineCursor ( register Display *dpy, Index: libX11/src/DelProp.c =================================================================== --- libX11.orig/src/DelProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DelProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDeleteProperty( register Display *dpy, Index: libX11/src/Depths.c =================================================================== --- libX11.orig/src/Depths.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Depths.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ /* * XListDepths - return info from connection setup */ +_X_EXPORT int *XListDepths ( Display *dpy, int scrnum, Index: libX11/src/DestSubs.c =================================================================== --- libX11.orig/src/DestSubs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DestSubs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDestroySubwindows( register Display *dpy, Index: libX11/src/DestWind.c =================================================================== --- libX11.orig/src/DestWind.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DestWind.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDestroyWindow ( register Display *dpy, Index: libX11/src/DisName.c =================================================================== --- libX11.orig/src/DisName.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DisName.c 2007-05-26 23:56:22.000000000 +0800 @@ -53,6 +53,7 @@ #include #include "Xlib.h" +_X_EXPORT char * XDisplayName( _Xconst char *display) Index: libX11/src/DrArc.c =================================================================== --- libX11.orig/src/DrArc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrArc.c 2007-05-26 23:56:22.000000000 +0800 @@ -37,6 +37,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawArc( register Display *dpy, Index: libX11/src/DrArcs.c =================================================================== --- libX11.orig/src/DrArcs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrArcs.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ #define arc_scale (SIZEOF(xArc) / 4) +_X_EXPORT int XDrawArcs( register Display *dpy, Index: libX11/src/DrLine.c =================================================================== --- libX11.orig/src/DrLine.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrLine.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ #define wsize (SIZEOF(xPolySegmentReq) + WLNSPERBATCH * SIZEOF(xSegment)) #define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment)) +_X_EXPORT int XDrawLine ( register Display *dpy, Index: libX11/src/DrLines.c =================================================================== --- libX11.orig/src/DrLines.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrLines.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawLines ( register Display *dpy, Index: libX11/src/DrPoint.c =================================================================== --- libX11.orig/src/DrPoint.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrPoint.c 2007-05-26 23:56:22.000000000 +0800 @@ -35,6 +35,7 @@ #define size (SIZEOF(xPolyPointReq) + PTSPERBATCH * SIZEOF(xPoint)) +_X_EXPORT int XDrawPoint( register Display *dpy, Index: libX11/src/DrPoints.c =================================================================== --- libX11.orig/src/DrPoints.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrPoints.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawPoints( register Display *dpy, Index: libX11/src/DrRect.c =================================================================== --- libX11.orig/src/DrRect.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrRect.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ #define wsize (SIZEOF(xPolyRectangleReq) + WRCTSPERBATCH * SIZEOF(xRectangle)) #define zsize (SIZEOF(xPolyRectangleReq) + ZRCTSPERBATCH * SIZEOF(xRectangle)) +_X_EXPORT int XDrawRectangle( register Display *dpy, Index: libX11/src/DrRects.c =================================================================== --- libX11.orig/src/DrRects.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrRects.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawRectangles( register Display *dpy, Index: libX11/src/DrSegs.c =================================================================== --- libX11.orig/src/DrSegs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/DrSegs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawSegments ( register Display *dpy, Index: libX11/src/ErrDes.c =================================================================== --- libX11.orig/src/ErrDes.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ErrDes.c 2007-05-26 23:56:22.000000000 +0800 @@ -98,7 +98,7 @@ 106, 115, 124, 130, 142, 150, 160 }; - +_X_EXPORT int XGetErrorText( register Display *dpy, @@ -136,6 +136,7 @@ return 0; } +_X_EXPORT int /*ARGSUSED*/ XGetErrorDatabaseText( Index: libX11/src/ErrHndlr.c =================================================================== --- libX11.orig/src/ErrHndlr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ErrHndlr.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,7 +36,7 @@ * (_XErrorFunction) to be the specified routine. If NULL is passed in * the original error handler is restored. */ - +_X_EXPORT XErrorHandler XSetErrorHandler(XErrorHandler handler) { @@ -64,7 +64,7 @@ * (_XIOErrorFunction) to be the specified routine. If NULL is passed in * the original error handler is restored. */ - +_X_EXPORT XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler handler) { Index: libX11/src/EvToWire.c =================================================================== --- libX11.orig/src/EvToWire.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/EvToWire.c 2007-05-26 23:56:22.000000000 +0800 @@ -44,6 +44,7 @@ /* * reformat a wire event into an XEvent structure of the right type. */ +_X_EXPORT Status _XEventToWire( register Display *dpy, /* pointer to display structure */ Index: libX11/src/FSSaver.c =================================================================== --- libX11.orig/src/FSSaver.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FSSaver.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XActivateScreenSaver(register Display *dpy) { @@ -38,6 +39,7 @@ return 1; } +_X_EXPORT int XResetScreenSaver(register Display *dpy) { @@ -45,6 +47,7 @@ return 1; } +_X_EXPORT int XForceScreenSaver( register Display *dpy, Index: libX11/src/FSWrap.c =================================================================== --- libX11.orig/src/FSWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FSWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -163,6 +163,7 @@ return string_list_ret; } +_X_EXPORT XFontSet XCreateFontSet ( Display *dpy, @@ -207,6 +208,7 @@ return (XFontSet) oc; } +_X_EXPORT int XFontsOfFontSet( XFontSet font_set, @@ -218,36 +220,42 @@ return font_set->core.font_info.num_font; } +_X_EXPORT char * XBaseFontNameListOfFontSet(XFontSet font_set) { return font_set->core.base_name_list; } +_X_EXPORT char * XLocaleOfFontSet(XFontSet font_set) { return font_set->core.om->core.lcd->core->name; } +_X_EXPORT Bool XContextDependentDrawing(XFontSet font_set) { return font_set->core.om->core.context_dependent; } +_X_EXPORT Bool XDirectionalDependentDrawing(XFontSet font_set) { return font_set->core.om->core.directional_dependent; } +_X_EXPORT Bool XContextualDrawing(XFontSet font_set) { return font_set->core.om->core.contextual_drawing; } +_X_EXPORT XFontSetExtents * XExtentsOfFontSet(XFontSet font_set) { @@ -256,6 +264,7 @@ return &font_set->core.font_set_extents; } +_X_EXPORT void XFreeFontSet( Display *dpy, Index: libX11/src/FetchName.c =================================================================== --- libX11.orig/src/FetchName.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FetchName.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,7 +33,7 @@ #include #include - +_X_EXPORT Status XFetchName ( register Display *dpy, Window w, @@ -64,6 +64,7 @@ return(0); } +_X_EXPORT Status XGetIconName ( register Display *dpy, Window w, Index: libX11/src/FillArc.c =================================================================== --- libX11.orig/src/FillArc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FillArc.c 2007-05-26 23:56:22.000000000 +0800 @@ -35,6 +35,7 @@ #define size (SIZEOF(xPolyFillArcReq) + FARCSPERBATCH * SIZEOF(xArc)) +_X_EXPORT int XFillArc( register Display *dpy, Index: libX11/src/FillArcs.c =================================================================== --- libX11.orig/src/FillArcs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FillArcs.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ #define arc_scale (SIZEOF(xArc) / 4) +_X_EXPORT int XFillArcs( register Display *dpy, Index: libX11/src/FillPoly.c =================================================================== --- libX11.orig/src/FillPoly.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FillPoly.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFillPolygon( register Display *dpy, Index: libX11/src/FillRct.c =================================================================== --- libX11.orig/src/FillRct.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FillRct.c 2007-05-26 23:56:22.000000000 +0800 @@ -35,6 +35,7 @@ #define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle)) +_X_EXPORT int XFillRectangle( register Display *dpy, Index: libX11/src/FillRcts.c =================================================================== --- libX11.orig/src/FillRcts.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FillRcts.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFillRectangles( register Display *dpy, Index: libX11/src/FilterEv.c =================================================================== --- libX11.orig/src/FilterEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FilterEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -71,6 +71,7 @@ /* * Look up if there is a specified filter for the event. */ +_X_EXPORT Bool XFilterEvent( XEvent *ev, Index: libX11/src/Flush.c =================================================================== --- libX11.orig/src/Flush.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Flush.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ /* Flush all buffered output requests. */ /* NOTE: NOT necessary when calling any of the Xlib routines. */ +_X_EXPORT int XFlush (register Display *dpy) { Index: libX11/src/Font.c =================================================================== --- libX11.orig/src/Font.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Font.c 2007-05-26 23:56:22.000000000 +0800 @@ -89,7 +89,7 @@ #endif /* USE_XF86BIGFONT */ - +_X_EXPORT XFontStruct *XLoadQueryFont( register Display *dpy, _Xconst char *name) @@ -126,6 +126,7 @@ return font_result; } +_X_EXPORT XFontStruct *XQueryFont ( register Display *dpy, Font fid) @@ -671,6 +672,7 @@ #endif /* USE_XF86BIGFONT */ +_X_EXPORT int _XF86LoadQueryLocaleFont( Display *dpy, _Xconst char *name, Index: libX11/src/FontInfo.c =================================================================== --- libX11.orig/src/FontInfo.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FontInfo.c 2007-05-26 23:56:22.000000000 +0800 @@ -41,6 +41,7 @@ ); #endif +_X_EXPORT char **XListFontsWithInfo( register Display *dpy, _Xconst char *pattern, /* null-terminated */ @@ -225,6 +226,7 @@ return (char **) NULL; } +_X_EXPORT int XFreeFontInfo ( char **names, Index: libX11/src/FontNames.c =================================================================== --- libX11.orig/src/FontNames.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FontNames.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ #endif #include "Xlibint.h" +_X_EXPORT char ** XListFonts( register Display *dpy, Index: libX11/src/FreeCmap.c =================================================================== --- libX11.orig/src/FreeCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreeCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ #include "Xlibint.h" #include "Cmap.h" +_X_EXPORT int XFreeColormap( register Display *dpy, Index: libX11/src/FreeCols.c =================================================================== --- libX11.orig/src/FreeCols.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreeCols.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFreeColors( register Display *dpy, Index: libX11/src/FreeCurs.c =================================================================== --- libX11.orig/src/FreeCurs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreeCurs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFreeCursor( register Display *dpy, Index: libX11/src/FreeEData.c =================================================================== --- libX11.orig/src/FreeEData.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreeEData.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int _XFreeExtData (XExtData *extension) { Index: libX11/src/FreeGC.c =================================================================== --- libX11.orig/src/FreeGC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreeGC.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFreeGC ( register Display *dpy, Index: libX11/src/FreePix.c =================================================================== --- libX11.orig/src/FreePix.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/FreePix.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XFreePixmap( register Display *dpy, Index: libX11/src/GCMisc.c =================================================================== --- libX11.orig/src/GCMisc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GCMisc.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetArcMode ( register Display *dpy, @@ -47,6 +48,7 @@ return 1; } +_X_EXPORT int XSetFillRule ( register Display *dpy, @@ -63,6 +65,7 @@ return 1; } +_X_EXPORT int XSetFillStyle ( register Display *dpy, @@ -79,6 +82,7 @@ return 1; } +_X_EXPORT int XSetGraphicsExposures ( register Display *dpy, @@ -95,6 +99,7 @@ return 1; } +_X_EXPORT int XSetSubwindowMode ( register Display *dpy, Index: libX11/src/Geom.c =================================================================== --- libX11.orig/src/Geom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Geom.c 2007-05-26 23:56:22.000000000 +0800 @@ -41,6 +41,7 @@ * returns 0 if there was some problem, else the position bitmask. */ +_X_EXPORT int XGeometry ( Display *dpy, /* user's display connection */ Index: libX11/src/GetAtomNm.c =================================================================== --- libX11.orig/src/GetAtomNm.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetAtomNm.c 2007-05-26 23:56:22.000000000 +0800 @@ -59,6 +59,7 @@ return (char *)NULL; } +_X_EXPORT char *XGetAtomName( register Display *dpy, Atom atom) @@ -141,6 +142,7 @@ return True; } +_X_EXPORT Status XGetAtomNames ( Display *dpy, Index: libX11/src/GetColor.c =================================================================== --- libX11.orig/src/GetColor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetColor.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ #include "Xlibint.h" #include "Xcmsint.h" +_X_EXPORT Status XAllocNamedColor( register Display *dpy, Index: libX11/src/GetDflt.c =================================================================== --- libX11.orig/src/GetDflt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetDflt.c 2007-05-26 23:56:22.000000000 +0800 @@ -195,6 +195,7 @@ #endif } +_X_EXPORT char * XGetDefault( Display *dpy, /* display for defaults.... */ Index: libX11/src/GetFPath.c =================================================================== --- libX11.orig/src/GetFPath.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetFPath.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT char **XGetFontPath( register Display *dpy, int *npaths) /* RETURN */ @@ -83,6 +84,7 @@ return (flist); } +_X_EXPORT int XFreeFontPath (char **list) { Index: libX11/src/GetFProp.c =================================================================== --- libX11.orig/src/GetFProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetFProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -30,6 +30,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Bool XGetFontProperty ( XFontStruct *fs, register Atom name, Index: libX11/src/GetGCVals.c =================================================================== --- libX11.orig/src/GetGCVals.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetGCVals.c 2007-05-26 23:56:22.000000000 +0800 @@ -43,6 +43,7 @@ GCClipXOrigin | GCClipYOrigin | GCDashOffset | \ GCArcMode) +_X_EXPORT /*ARGSUSED*/ Status XGetGCValues ( Display *dpy, Index: libX11/src/GetGeom.c =================================================================== --- libX11.orig/src/GetGeom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetGeom.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XGetGeometry ( register Display *dpy, Drawable d, Index: libX11/src/GetHColor.c =================================================================== --- libX11.orig/src/GetHColor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetHColor.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XAllocColor( register Display *dpy, Colormap cmap, Index: libX11/src/GetHints.c =================================================================== --- libX11.orig/src/GetHints.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetHints.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ #include #include +_X_EXPORT Status XGetSizeHints ( Display *dpy, Window w, @@ -105,6 +106,7 @@ * on. */ +_X_EXPORT XWMHints *XGetWMHints ( Display *dpy, Window w) @@ -148,6 +150,7 @@ return(hints); } +_X_EXPORT Status XGetZoomHints ( Display *dpy, @@ -157,6 +160,7 @@ return (XGetSizeHints(dpy, w, zhints, XA_WM_ZOOM_HINTS)); } +_X_EXPORT Status XGetNormalHints ( Display *dpy, @@ -172,6 +176,7 @@ * ICONSIZE_ATOM type: ICONSIZE_ATOM format: 32 */ +_X_EXPORT Status XGetIconSizes ( Display *dpy, Window w, /* typically, root */ @@ -228,7 +233,7 @@ return(1); } - +_X_EXPORT Status XGetCommand ( Display *dpy, Window w, @@ -267,7 +272,7 @@ return 1; } - +_X_EXPORT Status XGetTransientForHint( Display *dpy, @@ -298,6 +303,7 @@ return(0); } +_X_EXPORT Status XGetClassHint( Display *dpy, Index: libX11/src/GetIFocus.c =================================================================== --- libX11.orig/src/GetIFocus.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetIFocus.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGetInputFocus( register Display *dpy, Index: libX11/src/GetImage.c =================================================================== --- libX11.orig/src/GetImage.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetImage.c 2007-05-26 23:56:22.000000000 +0800 @@ -46,6 +46,7 @@ return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077)); } +_X_EXPORT XImage *XGetImage ( register Display *dpy, Drawable d, @@ -107,6 +108,7 @@ return (image); } +_X_EXPORT XImage *XGetSubImage( register Display *dpy, Drawable d, Index: libX11/src/GetKCnt.c =================================================================== --- libX11.orig/src/GetKCnt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetKCnt.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGetKeyboardControl ( register Display *dpy, Index: libX11/src/GetMoEv.c =================================================================== --- libX11.orig/src/GetMoEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetMoEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT XTimeCoord *XGetMotionEvents( register Display *dpy, Time start, Index: libX11/src/GetNrmHint.c =================================================================== --- libX11.orig/src/GetNrmHint.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetNrmHint.c 2007-05-26 23:56:22.000000000 +0800 @@ -61,6 +61,7 @@ #include #include +_X_EXPORT Status XGetWMSizeHints ( Display *dpy, Window w, @@ -118,6 +119,7 @@ } +_X_EXPORT Status XGetWMNormalHints ( Display *dpy, Window w, Index: libX11/src/GetPCnt.c =================================================================== --- libX11.orig/src/GetPCnt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetPCnt.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGetPointerControl( register Display *dpy, Index: libX11/src/GetPntMap.c =================================================================== --- libX11.orig/src/GetPntMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetPntMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ #endif #define MIN(a, b) ((a) < (b) ? (a) : (b)) +_X_EXPORT int XGetPointerMapping ( register Display *dpy, unsigned char *map, /* RETURN */ @@ -79,6 +80,7 @@ return ((int) rep.nElts); } +_X_EXPORT KeySym * XGetKeyboardMapping (Display *dpy, #if NeedWidePrototypes Index: libX11/src/GetProp.c =================================================================== --- libX11.orig/src/GetProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGetWindowProperty( register Display *dpy, Index: libX11/src/GetRGBCMap.c =================================================================== --- libX11.orig/src/GetRGBCMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetRGBCMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ #include "Xatomtype.h" #include +_X_EXPORT Status XGetRGBColormaps ( Display *dpy, Window w, Index: libX11/src/GetSOwner.c =================================================================== --- libX11.orig/src/GetSOwner.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetSOwner.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Window XGetSelectionOwner( register Display *dpy, Atom selection) Index: libX11/src/GetSSaver.c =================================================================== --- libX11.orig/src/GetSSaver.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetSSaver.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGetScreenSaver( register Display *dpy, Index: libX11/src/GetStCmap.c =================================================================== --- libX11.orig/src/GetStCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetStCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -62,6 +62,7 @@ * in the XStandardColormap structure. */ +_X_EXPORT Status XGetStandardColormap ( Display *dpy, Window w, Index: libX11/src/GetTxtProp.c =================================================================== --- libX11.orig/src/GetTxtProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetTxtProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ #include #include +_X_EXPORT Status XGetTextProperty ( Display *display, Window window, @@ -88,6 +89,7 @@ return False; } +_X_EXPORT Status XGetWMName ( Display *dpy, Window w, @@ -96,6 +98,7 @@ return (XGetTextProperty (dpy, w, tp, XA_WM_NAME)); } +_X_EXPORT Status XGetWMIconName ( Display *dpy, Window w, @@ -104,6 +107,7 @@ return (XGetTextProperty (dpy, w, tp, XA_WM_ICON_NAME)); } +_X_EXPORT Status XGetWMClientMachine ( Display *dpy, Window w, Index: libX11/src/GetWAttrs.c =================================================================== --- libX11.orig/src/GetWAttrs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetWAttrs.c 2007-05-26 23:56:22.000000000 +0800 @@ -86,6 +86,7 @@ return True; } +_X_EXPORT Status _XGetWindowAttributes( register Display *dpy, @@ -139,6 +140,7 @@ return(1); } +_X_EXPORT Status XGetWindowAttributes( Display *dpy, Index: libX11/src/GetWMCMapW.c =================================================================== --- libX11.orig/src/GetWMCMapW.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetWMCMapW.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ #include #include +_X_EXPORT Status XGetWMColormapWindows ( Display *dpy, Window w, Index: libX11/src/GetWMProto.c =================================================================== --- libX11.orig/src/GetWMProto.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GetWMProto.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ #include #include +_X_EXPORT Status XGetWMProtocols ( Display *dpy, Window w, Index: libX11/src/GrButton.c =================================================================== --- libX11.orig/src/GrButton.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GrButton.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGrabButton( register Display *dpy, Index: libX11/src/GrKey.c =================================================================== --- libX11.orig/src/GrKey.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GrKey.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGrabKey( register Display *dpy, Index: libX11/src/GrKeybd.c =================================================================== --- libX11.orig/src/GrKeybd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GrKeybd.c 2007-05-26 23:56:22.000000000 +0800 @@ -30,6 +30,8 @@ #include #endif #include "Xlibint.h" + +_X_EXPORT int XGrabKeyboard ( register Display *dpy, Window window, Index: libX11/src/GrPointer.c =================================================================== --- libX11.orig/src/GrPointer.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GrPointer.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGrabPointer( register Display *dpy, Window grab_window, Index: libX11/src/GrServer.c =================================================================== --- libX11.orig/src/GrServer.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/GrServer.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XGrabServer (register Display *dpy) { Index: libX11/src/Host.c =================================================================== --- libX11.orig/src/Host.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Host.c 2007-05-26 23:56:22.000000000 +0800 @@ -44,6 +44,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XAddHost ( register Display *dpy, @@ -81,6 +82,7 @@ return 1; } +_X_EXPORT int XRemoveHost ( register Display *dpy, @@ -118,6 +120,7 @@ return 1; } +_X_EXPORT int XAddHosts ( register Display *dpy, @@ -131,6 +134,7 @@ return 1; } +_X_EXPORT int XRemoveHosts ( register Display *dpy, Index: libX11/src/Iconify.c =================================================================== --- libX11.orig/src/Iconify.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Iconify.c 2007-05-26 23:56:22.000000000 +0800 @@ -64,6 +64,7 @@ * This function instructs the window manager to change this window from * NormalState to IconicState. */ +_X_EXPORT Status XIconifyWindow ( Display *dpy, Window w, Index: libX11/src/IfEvent.c =================================================================== --- libX11.orig/src/IfEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/IfEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -37,6 +37,7 @@ * predicate in the queue. */ +_X_EXPORT int XIfEvent ( register Display *dpy, Index: libX11/src/ImText.c =================================================================== --- libX11.orig/src/ImText.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ImText.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawImageString( register Display *dpy, Index: libX11/src/ImText16.c =================================================================== --- libX11.orig/src/ImText16.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ImText16.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawImageString16( register Display *dpy, Index: libX11/src/ImUtil.c =================================================================== --- libX11.orig/src/ImUtil.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ImUtil.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ associated with a specific depth of ZPixmap format image for a display. */ +_X_EXPORT int _XGetScanlinePad( Display *dpy, @@ -70,6 +71,7 @@ return(dpy->bitmap_pad); } +_X_EXPORT int _XGetBitsPerPixel( Display *dpy, @@ -270,6 +272,7 @@ * routines always have to check to make sure the optimization is still * valid, and reinit the functions if not. */ +_X_EXPORT void _XInitImageFuncPtrs ( register XImage *image) { @@ -307,6 +310,7 @@ * */ +_X_EXPORT XImage *XCreateImage ( register Display *dpy, register Visual *visual, @@ -386,6 +390,7 @@ return image; } +_X_EXPORT Status XInitImage (XImage *image) { int min_bytes_per_line; @@ -925,6 +930,7 @@ * */ +_X_EXPORT int _XSetImage( XImage *srcimg, register XImage *dstimg, Index: libX11/src/InitExt.c =================================================================== --- libX11.orig/src/InitExt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/InitExt.c 2007-05-26 23:56:22.000000000 +0800 @@ -40,6 +40,7 @@ * at appropriate times. */ +_X_EXPORT XExtCodes *XInitExtension ( Display *dpy, _Xconst char *name) @@ -69,6 +70,7 @@ return (&ext->codes); /* tell him which extension */ } +_X_EXPORT XExtCodes *XAddExtension (Display *dpy) { register _XExtension *ext; @@ -98,11 +100,13 @@ return (NULL); } +_X_EXPORT XExtData **XEHeadOfExtensionList(XEDataObject object) { return *(XExtData ***)&object; } +_X_EXPORT int XAddToExtensionList( XExtData **structure, @@ -113,6 +117,7 @@ return 1; } +_X_EXPORT XExtData *XFindOnExtensionList( XExtData **structure, int number) @@ -128,6 +133,7 @@ /* * Routines to hang procs on the extension structure. */ +_X_EXPORT CreateGCType XESetCreateGC( Display *dpy, /* display */ int extension, /* extension number */ @@ -143,6 +149,7 @@ return (CreateGCType)oldproc; } +_X_EXPORT CopyGCType XESetCopyGC( Display *dpy, /* display */ int extension, /* extension number */ @@ -158,6 +165,7 @@ return (CopyGCType)oldproc; } +_X_EXPORT FlushGCType XESetFlushGC( Display *dpy, /* display */ int extension, /* extension number */ @@ -173,6 +181,7 @@ return (FlushGCType)oldproc; } +_X_EXPORT FreeGCType XESetFreeGC( Display *dpy, /* display */ int extension, /* extension number */ @@ -188,6 +197,7 @@ return (FreeGCType)oldproc; } +_X_EXPORT CreateFontType XESetCreateFont( Display *dpy, /* display */ int extension, /* extension number */ @@ -203,6 +213,7 @@ return (CreateFontType)oldproc; } +_X_EXPORT FreeFontType XESetFreeFont( Display *dpy, /* display */ int extension, /* extension number */ @@ -218,6 +229,7 @@ return (FreeFontType)oldproc; } +_X_EXPORT CloseDisplayType XESetCloseDisplay( Display *dpy, /* display */ int extension, /* extension number */ @@ -239,6 +251,7 @@ xEvent* /* event */ ); +_X_EXPORT WireToEventType XESetWireToEvent( Display *dpy, /* display */ int event_number, /* event routine to replace */ @@ -259,6 +272,7 @@ xEvent* /* event */ ); +_X_EXPORT EventToWireType XESetEventToWire( Display *dpy, /* display */ int event_number, /* event routine to replace */ @@ -279,6 +293,7 @@ xError* /* we */ ); +_X_EXPORT WireToErrorType XESetWireToError( Display *dpy, /* display */ int error_number, /* error routine to replace */ @@ -301,6 +316,7 @@ return (WireToErrorType)oldproc; } +_X_EXPORT ErrorType XESetError( Display *dpy, /* display */ int extension, /* extension number */ @@ -316,6 +332,7 @@ return (ErrorType)oldproc; } +_X_EXPORT ErrorStringType XESetErrorString( Display *dpy, /* display */ int extension, /* extension number */ @@ -331,6 +348,7 @@ return (ErrorStringType)oldproc; } +_X_EXPORT PrintErrorType XESetPrintErrorValues( Display *dpy, /* display */ int extension, /* extension number */ @@ -346,6 +364,7 @@ return (PrintErrorType)oldproc; } +_X_EXPORT BeforeFlushType XESetBeforeFlush( Display *dpy, /* display */ int extension, /* extension number */ Index: libX11/src/InsCmap.c =================================================================== --- libX11.orig/src/InsCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/InsCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XInstallColormap( register Display *dpy, Index: libX11/src/IntAtom.c =================================================================== --- libX11.orig/src/IntAtom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/IntAtom.c 2007-05-26 23:56:22.000000000 +0800 @@ -161,6 +161,7 @@ } } +_X_EXPORT Atom XInternAtom ( Display *dpy, Index: libX11/src/KeyBind.c =================================================================== --- libX11.orig/src/KeyBind.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/KeyBind.c 2007-05-26 23:56:22.000000000 +0800 @@ -121,6 +121,7 @@ return syms[col]; } +_X_EXPORT KeySym XKeycodeToKeysym(Display *dpy, #if NeedWidePrototypes @@ -135,6 +136,7 @@ return KeyCodetoKeySym(dpy, kc, col); } +_X_EXPORT KeyCode XKeysymToKeycode( Display *dpy, @@ -153,6 +155,7 @@ return 0; } +_X_EXPORT KeySym XLookupKeysym( register XKeyEvent *event, @@ -231,6 +234,7 @@ return 1; } +_X_EXPORT int XRefreshKeyboardMapping(register XMappingEvent *event) { @@ -643,6 +647,7 @@ *upper -= 0x28; } +_X_EXPORT void XConvertCase( register KeySym sym, @@ -877,6 +882,7 @@ return 1; } +_X_EXPORT /*ARGSUSED*/ int XLookupString ( @@ -981,6 +987,7 @@ } } +_X_EXPORT int XRebindKeysym ( Display *dpy, Index: libX11/src/KeysymStr.c =================================================================== --- libX11.orig/src/KeysymStr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/KeysymStr.c 2007-05-26 23:56:22.000000000 +0800 @@ -71,6 +71,7 @@ return False; } +_X_EXPORT char *XKeysymToString(KeySym ks) { register int i, n; Index: libX11/src/KillCl.c =================================================================== --- libX11.orig/src/KillCl.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/KillCl.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XKillClient( register Display *dpy, Index: libX11/src/LiHosts.c =================================================================== --- libX11.orig/src/LiHosts.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LiHosts.c 2007-05-26 23:56:22.000000000 +0800 @@ -47,6 +47,7 @@ * can be freed using XFree. */ +_X_EXPORT XHostAddress *XListHosts ( register Display *dpy, int *nhosts, /* RETURN */ Index: libX11/src/LiICmaps.c =================================================================== --- libX11.orig/src/LiICmaps.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LiICmaps.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Colormap *XListInstalledColormaps( register Display *dpy, Window win, Index: libX11/src/LiProps.c =================================================================== --- libX11.orig/src/LiProps.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LiProps.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Atom *XListProperties( register Display *dpy, Window window, Index: libX11/src/ListExt.c =================================================================== --- libX11.orig/src/ListExt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ListExt.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT char **XListExtensions( register Display *dpy, int *nextensions) /* RETURN */ @@ -89,6 +90,7 @@ return (list); } +_X_EXPORT int XFreeExtensionList (char **list) { Index: libX11/src/LoadFont.c =================================================================== --- libX11.orig/src/LoadFont.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LoadFont.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Font XLoadFont ( register Display *dpy, Index: libX11/src/LockDis.c =================================================================== --- libX11.orig/src/LockDis.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LockDis.c 2007-05-26 23:56:22.000000000 +0800 @@ -41,6 +41,7 @@ #include "locking.h" #endif +_X_EXPORT void XLockDisplay( register Display* dpy) @@ -73,6 +74,7 @@ #endif } +_X_EXPORT void XUnlockDisplay( register Display* dpy) Index: libX11/src/LookupCol.c =================================================================== --- libX11.orig/src/LookupCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LookupCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,7 +34,7 @@ #include "Xlibint.h" #include "Xcmsint.h" - +_X_EXPORT Status XLookupColor ( register Display *dpy, Index: libX11/src/LowerWin.c =================================================================== --- libX11.orig/src/LowerWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/LowerWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XLowerWindow( Display *dpy, Index: libX11/src/Macros.c =================================================================== --- libX11.orig/src/Macros.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Macros.c 2007-05-26 23:56:22.000000000 +0800 @@ -39,104 +39,133 @@ * need them. */ +_X_EXPORT int XConnectionNumber(Display *dpy) { return (ConnectionNumber(dpy)); } +_X_EXPORT Window XRootWindow (Display *dpy, int scr) { return (RootWindow(dpy,scr)); } +_X_EXPORT int XDefaultScreen(Display *dpy) { return (DefaultScreen(dpy)); } +_X_EXPORT Window XDefaultRootWindow (Display *dpy) { return (RootWindow(dpy,DefaultScreen(dpy))); } +_X_EXPORT Visual *XDefaultVisual(Display *dpy, int scr) { return (DefaultVisual(dpy, scr)); } +_X_EXPORT GC XDefaultGC(Display *dpy, int scr) { return (DefaultGC(dpy,scr)); } +_X_EXPORT unsigned long XBlackPixel(Display *dpy, int scr) { return (BlackPixel(dpy, scr)); } +_X_EXPORT unsigned long XWhitePixel(Display *dpy, int scr) { return (WhitePixel(dpy,scr)); } +_X_EXPORT unsigned long XAllPlanes(void) { return AllPlanes; } +_X_EXPORT int XQLength(Display *dpy) { return (QLength(dpy)); } +_X_EXPORT int XDisplayWidth(Display *dpy, int scr) { return (DisplayWidth(dpy,scr)); } +_X_EXPORT int XDisplayHeight(Display *dpy, int scr) { return (DisplayHeight(dpy, scr)); } +_X_EXPORT int XDisplayWidthMM(Display *dpy, int scr) { return (DisplayWidthMM(dpy, scr)); } +_X_EXPORT int XDisplayHeightMM(Display *dpy, int scr) { return (DisplayHeightMM(dpy, scr)); } +_X_EXPORT int XDisplayPlanes(Display *dpy, int scr) { return (DisplayPlanes(dpy, scr)); } +_X_EXPORT int XDisplayCells(Display *dpy, int scr) { return (DisplayCells (dpy, scr)); } +_X_EXPORT int XScreenCount(Display *dpy) { return (ScreenCount(dpy)); } +_X_EXPORT char *XServerVendor(Display *dpy) { return (ServerVendor(dpy)); } +_X_EXPORT int XProtocolVersion(Display *dpy) { return (ProtocolVersion(dpy)); } +_X_EXPORT int XProtocolRevision(Display *dpy) { return (ProtocolRevision(dpy));} +_X_EXPORT int XVendorRelease(Display *dpy) { return (VendorRelease(dpy)); } +_X_EXPORT char *XDisplayString(Display *dpy) { return (DisplayString(dpy)); } +_X_EXPORT int XDefaultDepth(Display *dpy, int scr) { return(DefaultDepth(dpy, scr)); } +_X_EXPORT Colormap XDefaultColormap(Display *dpy, int scr) { return (DefaultColormap(dpy, scr)); } +_X_EXPORT int XBitmapUnit(Display *dpy) { return (BitmapUnit(dpy)); } +_X_EXPORT int XBitmapBitOrder(Display *dpy) { return (BitmapBitOrder(dpy)); } +_X_EXPORT int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); } +_X_EXPORT int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); } +_X_EXPORT unsigned long XNextRequest(Display *dpy) { #ifdef WORD64 @@ -147,78 +176,101 @@ #endif } +_X_EXPORT unsigned long XLastKnownRequestProcessed(Display *dpy) { return (LastKnownRequestProcessed(dpy)); } /* screen oriented macros (toolkit) */ +_X_EXPORT Screen *XScreenOfDisplay(Display *dpy, int scr) { return (ScreenOfDisplay(dpy, scr)); } +_X_EXPORT Screen *XDefaultScreenOfDisplay(Display *dpy) { return (DefaultScreenOfDisplay(dpy)); } +_X_EXPORT Display *XDisplayOfScreen(Screen *s) { return (DisplayOfScreen(s)); } +_X_EXPORT Window XRootWindowOfScreen(Screen *s) { return (RootWindowOfScreen(s)); } +_X_EXPORT unsigned long XBlackPixelOfScreen(Screen *s) { return (BlackPixelOfScreen(s)); } +_X_EXPORT unsigned long XWhitePixelOfScreen(Screen *s) { return (WhitePixelOfScreen(s)); } +_X_EXPORT Colormap XDefaultColormapOfScreen(Screen *s) { return (DefaultColormapOfScreen(s)); } +_X_EXPORT int XDefaultDepthOfScreen(Screen *s) { return (DefaultDepthOfScreen(s)); } +_X_EXPORT GC XDefaultGCOfScreen(Screen *s) { return (DefaultGCOfScreen(s)); } +_X_EXPORT Visual *XDefaultVisualOfScreen(Screen *s) { return (DefaultVisualOfScreen(s)); } +_X_EXPORT int XWidthOfScreen(Screen *s) { return (WidthOfScreen(s)); } +_X_EXPORT int XHeightOfScreen(Screen *s) { return (HeightOfScreen(s)); } +_X_EXPORT int XWidthMMOfScreen(Screen *s) { return (WidthMMOfScreen(s)); } +_X_EXPORT int XHeightMMOfScreen(Screen *s) { return (HeightMMOfScreen(s)); } +_X_EXPORT int XPlanesOfScreen(Screen *s) { return (PlanesOfScreen(s)); } +_X_EXPORT int XCellsOfScreen(Screen *s) { return (CellsOfScreen(s)); } +_X_EXPORT int XMinCmapsOfScreen(Screen *s) { return (MinCmapsOfScreen(s)); } +_X_EXPORT int XMaxCmapsOfScreen(Screen *s) { return (MaxCmapsOfScreen(s)); } +_X_EXPORT Bool XDoesSaveUnders(Screen *s) { return (DoesSaveUnders(s)); } +_X_EXPORT int XDoesBackingStore(Screen *s) { return (DoesBackingStore(s)); } +_X_EXPORT long XEventMaskOfScreen(Screen *s) { return (EventMaskOfScreen(s)); } +_X_EXPORT int XScreenNumberOfScreen (register Screen *scr) { register Display *dpy = scr->display; @@ -236,20 +288,28 @@ * naive people are more comfortable with them. */ #undef XDestroyImage + +_X_EXPORT int XDestroyImage( XImage *ximage) { return((*((ximage)->f.destroy_image))((ximage))); } + #undef XGetPixel + +_X_EXPORT unsigned long XGetPixel( XImage *ximage, int x, int y) { return ((*((ximage)->f.get_pixel))((ximage), (x), (y))); } + #undef XPutPixel + +_X_EXPORT int XPutPixel( XImage *ximage, int x, int y, @@ -257,7 +317,10 @@ { return((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel))); } + #undef XSubImage + +_X_EXPORT XImage *XSubImage( XImage *ximage, int x, int y, @@ -266,7 +329,10 @@ return((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height))); } + #undef XAddPixel + +_X_EXPORT int XAddPixel( XImage *ximage, long value) @@ -274,7 +340,7 @@ return((*((ximage)->f.add_pixel))((ximage), (value))); } - +_X_EXPORT int XNoOp (register Display *dpy) { Index: libX11/src/MapRaised.c =================================================================== --- libX11.orig/src/MapRaised.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/MapRaised.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XMapRaised ( register Display *dpy, Index: libX11/src/MapSubs.c =================================================================== --- libX11.orig/src/MapSubs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/MapSubs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XMapSubwindows( register Display *dpy, Index: libX11/src/MapWindow.c =================================================================== --- libX11.orig/src/MapWindow.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/MapWindow.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XMapWindow ( register Display *dpy, Index: libX11/src/MaskEvent.c =================================================================== --- libX11.orig/src/MaskEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/MaskEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -43,6 +43,7 @@ * Events earlier in the queue are not discarded. */ +_X_EXPORT int XMaskEvent ( register Display *dpy, Index: libX11/src/Misc.c =================================================================== --- libX11.orig/src/Misc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Misc.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,21 +31,25 @@ #endif #include "Xlibint.h" +_X_EXPORT long XMaxRequestSize(Display *dpy) { return dpy->max_request_size; } +_X_EXPORT char *XResourceManagerString(Display *dpy) { return dpy->xdefaults; } +_X_EXPORT unsigned long XDisplayMotionBufferSize(Display *dpy) { return dpy->motion_buffer; } +_X_EXPORT int XDisplayKeycodes( Display *dpy, @@ -57,11 +61,13 @@ return 1; } +_X_EXPORT VisualID XVisualIDFromVisual(Visual *visual) { return visual->visualid; } +_X_EXPORT long XExtendedMaxRequestSize(Display *dpy) { return dpy->bigreq_size; Index: libX11/src/ModMap.c =================================================================== --- libX11.orig/src/ModMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ModMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT XModifierKeymap * XGetModifierMapping(register Display *dpy) { @@ -67,6 +68,7 @@ * 1 Busy - one or more old or new modifiers are down * 2 Failed - one or more new modifiers unacceptable */ +_X_EXPORT int XSetModifierMapping( register Display *dpy, @@ -92,6 +94,7 @@ return (rep.success); } +_X_EXPORT XModifierKeymap * XNewModifiermap(int keyspermodifier) { @@ -109,7 +112,7 @@ return (res); } - +_X_EXPORT int XFreeModifiermap(XModifierKeymap *map) { @@ -121,6 +124,7 @@ return 1; } +_X_EXPORT XModifierKeymap * XInsertModifiermapEntry(XModifierKeymap *map, #if NeedWidePrototypes @@ -163,6 +167,7 @@ return(newmap); } +_X_EXPORT XModifierKeymap * XDeleteModifiermapEntry(XModifierKeymap *map, #if NeedWidePrototypes Index: libX11/src/MoveWin.c =================================================================== --- libX11.orig/src/MoveWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/MoveWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XMoveWindow ( register Display *dpy, Index: libX11/src/NextEvent.c =================================================================== --- libX11.orig/src/NextEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/NextEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -37,6 +37,7 @@ * events. */ +_X_EXPORT int XNextEvent ( register Display *dpy, Index: libX11/src/OCWrap.c =================================================================== --- libX11.orig/src/OCWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/OCWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #include "Xlibint.h" #include "Xlcint.h" +_X_EXPORT XOC XCreateOC(XOM om, ...) { @@ -62,6 +63,7 @@ return oc; } +_X_EXPORT void XDestroyOC(XOC oc) { @@ -83,12 +85,14 @@ (*oc->methods->destroy)(oc); } +_X_EXPORT XOM XOMOfOC(XOC oc) { return oc->core.om; } +_X_EXPORT char * XSetOCValues(XOC oc, ...) { @@ -115,6 +119,7 @@ return ret; } +_X_EXPORT char * XGetOCValues(XOC oc, ...) { Index: libX11/src/OMWrap.c =================================================================== --- libX11.orig/src/OMWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/OMWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #include "Xlibint.h" #include "Xlcint.h" +_X_EXPORT XOM XOpenOM(Display *dpy, XrmDatabase rdb, _Xconst char *res_name, _Xconst char *res_class) @@ -46,6 +47,7 @@ return (XOM) NULL; } +_X_EXPORT Status XCloseOM(XOM om) { @@ -66,6 +68,7 @@ return (*om->methods->close)(om); } +_X_EXPORT char * XSetOMValues(XOM om, ...) { @@ -92,6 +95,7 @@ return ret; } +_X_EXPORT char * XGetOMValues(XOM om, ...) { @@ -118,12 +122,14 @@ return ret; } +_X_EXPORT Display * XDisplayOfOM(XOM om) { return om->core.display; } +_X_EXPORT char * XLocaleOfOM(XOM om) { Index: libX11/src/OpenDis.c =================================================================== --- libX11.orig/src/OpenDis.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/OpenDis.c 2007-05-26 23:56:22.000000000 +0800 @@ -88,6 +88,7 @@ * Connects to a server, creates a Display object and returns a pointer to * the newly created Display back to the caller. */ +_X_EXPORT Display * XOpenDisplay ( register _Xconst char *display) Index: libX11/src/ParseCmd.c =================================================================== --- libX11.orig/src/ParseCmd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ParseCmd.c 2007-05-26 23:56:22.000000000 +0800 @@ -72,6 +72,7 @@ exit(1); } +_X_EXPORT void XrmParseCommand( XrmDatabase *pdb, /* data base */ Index: libX11/src/ParseCol.c =================================================================== --- libX11.orig/src/ParseCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ParseCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,7 +34,7 @@ #include "Xlibint.h" #include "Xcmsint.h" - +_X_EXPORT Status XParseColor ( register Display *dpy, Index: libX11/src/ParseGeom.c =================================================================== --- libX11.orig/src/ParseGeom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ParseGeom.c 2007-05-26 23:56:22.000000000 +0800 @@ -89,6 +89,7 @@ return (-Result); } +_X_EXPORT int XParseGeometry ( _Xconst char *string, Index: libX11/src/PeekEvent.c =================================================================== --- libX11.orig/src/PeekEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PeekEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ * If none found, flush and wait until there is an event to peek. */ +_X_EXPORT int XPeekEvent ( register Display *dpy, Index: libX11/src/PeekIfEv.c =================================================================== --- libX11.orig/src/PeekIfEv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PeekIfEv.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ * If none found, flush, and then wait until one satisfies the predicate. */ +_X_EXPORT int XPeekIfEvent ( register Display *dpy, Index: libX11/src/Pending.c =================================================================== --- libX11.orig/src/Pending.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Pending.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ /* Read in pending events if needed and return the number of queued events. */ +_X_EXPORT int XEventsQueued ( register Display *dpy, int mode) @@ -46,6 +47,7 @@ return ret_val; } +_X_EXPORT int XPending (register Display *dpy) { int ret_val; Index: libX11/src/PixFormats.c =================================================================== --- libX11.orig/src/PixFormats.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PixFormats.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,7 +34,7 @@ /* * XListPixmapFormats - return info from connection setup */ - +_X_EXPORT XPixmapFormatValues *XListPixmapFormats ( Display *dpy, int *count) /* RETURN */ Index: libX11/src/PmapBgnd.c =================================================================== --- libX11.orig/src/PmapBgnd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PmapBgnd.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetWindowBackgroundPixmap( register Display *dpy, Index: libX11/src/PmapBord.c =================================================================== --- libX11.orig/src/PmapBord.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PmapBord.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetWindowBorderPixmap( register Display *dpy, Index: libX11/src/PolyReg.c =================================================================== --- libX11.orig/src/PolyReg.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PolyReg.c 2007-05-26 23:56:22.000000000 +0800 @@ -472,6 +472,7 @@ * encoding of the resultant bitmap -- the run-length * encoding is in the form of an array of rectangles. */ +_X_EXPORT Region XPolygonRegion( XPoint *Pts, /* the pts */ Index: libX11/src/PolyTxt.c =================================================================== --- libX11.orig/src/PolyTxt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PolyTxt.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawText( register Display *dpy, Index: libX11/src/PropAlloc.c =================================================================== --- libX11.orig/src/PropAlloc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PropAlloc.c 2007-05-26 23:56:22.000000000 +0800 @@ -39,12 +39,14 @@ * longer at some point. */ +_X_EXPORT XSizeHints *XAllocSizeHints (void) { return ((XSizeHints *) Xcalloc (1, (unsigned) sizeof (XSizeHints))); } +_X_EXPORT XStandardColormap *XAllocStandardColormap (void) { return ((XStandardColormap *) @@ -52,12 +54,14 @@ } +_X_EXPORT XWMHints *XAllocWMHints (void) { return ((XWMHints *) Xcalloc (1, (unsigned) sizeof (XWMHints))); } +_X_EXPORT XClassHint *XAllocClassHint (void) { register XClassHint *h; @@ -69,6 +73,7 @@ } +_X_EXPORT XIconSize *XAllocIconSize (void) { return ((XIconSize *) Xcalloc (1, (unsigned) sizeof (XIconSize))); Index: libX11/src/PutBEvent.c =================================================================== --- libX11.orig/src/PutBEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PutBEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -35,6 +35,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int _XPutBackEvent ( register Display *dpy, @@ -60,6 +61,7 @@ return 0; } +_X_EXPORT int XPutBackEvent ( register Display * dpy, Index: libX11/src/PutImage.c =================================================================== --- libX11.orig/src/PutImage.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/PutImage.c 2007-05-26 23:56:22.000000000 +0800 @@ -118,6 +118,7 @@ 0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff }; +_X_EXPORT int _XReverse_Bytes( register unsigned char *bpt, @@ -939,7 +940,7 @@ } } - +_X_EXPORT int XPutImage ( register Display *dpy, Index: libX11/src/QuBest.c =================================================================== --- libX11.orig/src/QuBest.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuBest.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XQueryBestSize( register Display *dpy, int class, Index: libX11/src/QuColor.c =================================================================== --- libX11.orig/src/QuColor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuColor.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XQueryColor( register Display *dpy, Index: libX11/src/QuColors.c =================================================================== --- libX11.orig/src/QuColors.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuColors.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XQueryColors( register Display *dpy, Index: libX11/src/QuCurShp.c =================================================================== --- libX11.orig/src/QuCurShp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuCurShp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XQueryBestCursor( register Display *dpy, Drawable drawable, Index: libX11/src/QuExt.c =================================================================== --- libX11.orig/src/QuExt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuExt.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Bool XQueryExtension( register Display *dpy, Index: libX11/src/QuKeybd.c =================================================================== --- libX11.orig/src/QuKeybd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuKeybd.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ char map[32]; }; +_X_EXPORT int XQueryKeymap( register Display *dpy, Index: libX11/src/QuPntr.c =================================================================== --- libX11.orig/src/QuPntr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuPntr.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Bool XQueryPointer( register Display *dpy, Window w, Index: libX11/src/QuStipShp.c =================================================================== --- libX11.orig/src/QuStipShp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuStipShp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XQueryBestStipple( register Display *dpy, Drawable drawable, Index: libX11/src/QuTextE16.c =================================================================== --- libX11.orig/src/QuTextE16.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuTextE16.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XQueryTextExtents16 ( register Display *dpy, Index: libX11/src/QuTextExt.c =================================================================== --- libX11.orig/src/QuTextExt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuTextExt.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XQueryTextExtents ( register Display *dpy, Index: libX11/src/QuTileShp.c =================================================================== --- libX11.orig/src/QuTileShp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuTileShp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XQueryBestTile( register Display *dpy, Drawable drawable, Index: libX11/src/QuTree.c =================================================================== --- libX11.orig/src/QuTree.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/QuTree.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Status XQueryTree ( register Display *dpy, Window w, Index: libX11/src/Quarks.c =================================================================== --- libX11.orig/src/Quarks.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Quarks.c 2007-05-26 23:56:22.000000000 +0800 @@ -141,6 +141,7 @@ #ifdef XTHREADS static char *_Xpermalloc(unsigned int length); +_X_EXPORT char *Xpermalloc(unsigned int length) { char *p; @@ -350,6 +351,7 @@ return NULLQUARK; } +_X_EXPORT XrmQuark XrmStringToQuark( _Xconst char *name) @@ -366,6 +368,7 @@ return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, False); } +_X_EXPORT XrmQuark XrmPermStringToQuark( _Xconst char *name) @@ -382,6 +385,7 @@ return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, True); } +_X_EXPORT XrmQuark XrmUniqueQuark(void) { XrmQuark q; @@ -395,6 +399,7 @@ return q; } +_X_EXPORT XrmString XrmQuarkToString(register XrmQuark quark) { XrmString s; Index: libX11/src/RaiseWin.c =================================================================== --- libX11.orig/src/RaiseWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RaiseWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XRaiseWindow ( register Display *dpy, Index: libX11/src/RdBitF.c =================================================================== --- libX11.orig/src/RdBitF.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RdBitF.c 2007-05-26 23:56:22.000000000 +0800 @@ -107,6 +107,7 @@ return value; } +_X_EXPORT int XReadBitmapFileData ( _Xconst char *filename, @@ -233,6 +234,7 @@ return (BitmapSuccess); } +_X_EXPORT int XReadBitmapFile ( Display *display, Index: libX11/src/RecolorC.c =================================================================== --- libX11.orig/src/RecolorC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RecolorC.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XRecolorCursor( register Display *dpy, Index: libX11/src/ReconfWM.c =================================================================== --- libX11.orig/src/ReconfWM.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ReconfWM.c 2007-05-26 23:56:22.000000000 +0800 @@ -37,6 +37,7 @@ #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\ CWBorderWidth|CWSibling|CWStackMode) +_X_EXPORT Status XReconfigureWMWindow ( register Display *dpy, Window w, Index: libX11/src/ReconfWin.c =================================================================== --- libX11.orig/src/ReconfWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ReconfWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\ CWBorderWidth|CWSibling|CWStackMode) +_X_EXPORT int XConfigureWindow( register Display *dpy, Index: libX11/src/Region.c =================================================================== --- libX11.orig/src/Region.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Region.c 2007-05-26 23:56:22.000000000 +0800 @@ -136,6 +136,7 @@ /* Create a new empty region */ +_X_EXPORT Region XCreateRegion(void) { @@ -156,6 +157,7 @@ return( temp ); } +_X_EXPORT int XClipBox( Region r, @@ -168,6 +170,7 @@ return 1; } +_X_EXPORT int XUnionRectWithRegion( register XRectangle *rect, @@ -252,6 +255,7 @@ assert(pExtents->x1 < pExtents->x2); } +_X_EXPORT int XSetRegion( Display *dpy, @@ -282,6 +286,7 @@ return 1; } +_X_EXPORT int XDestroyRegion( Region r) @@ -297,6 +302,7 @@ added by raymond */ +_X_EXPORT int XOffsetRegion( register Region pRegion, @@ -377,6 +383,7 @@ #undef ZShiftRegion #undef ZCopyRegion +_X_EXPORT int XShrinkRegion( Region r, @@ -496,6 +503,7 @@ return 0; /* lint */ } +_X_EXPORT int XIntersectRegion( Region reg1, @@ -1280,6 +1288,7 @@ return 0; /* lint */ } +_X_EXPORT int XUnionRegion( Region reg1, @@ -1563,6 +1572,7 @@ *----------------------------------------------------------------------- */ +_X_EXPORT int XSubtractRegion( Region regM, @@ -1591,6 +1601,7 @@ return 1; } +_X_EXPORT int XXorRegion(Region sra, Region srb, Region dr) { @@ -1610,6 +1621,7 @@ * Check to see if the region is empty. Assumes a region is passed * as a parameter */ +_X_EXPORT int XEmptyRegion( Region r) @@ -1621,6 +1633,7 @@ /* * Check to see if two regions are equal */ +_X_EXPORT int XEqualRegion(Region r1, Region r2) { @@ -1641,6 +1654,7 @@ return TRUE; } +_X_EXPORT int XPointInRegion( Region pRegion, @@ -1660,6 +1674,7 @@ return FALSE; } +_X_EXPORT int XRectInRegion( register Region region, Index: libX11/src/RepWindow.c =================================================================== --- libX11.orig/src/RepWindow.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RepWindow.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XReparentWindow( register Display *dpy, Index: libX11/src/RestackWs.c =================================================================== --- libX11.orig/src/RestackWs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RestackWs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XRestackWindows ( register Display *dpy, Index: libX11/src/RotProp.c =================================================================== --- libX11.orig/src/RotProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/RotProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XRotateWindowProperties( register Display *dpy, Index: libX11/src/ScrResStr.c =================================================================== --- libX11.orig/src/ScrResStr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/ScrResStr.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #include "Xlibint.h" #include +_X_EXPORT char *XScreenResourceString(Screen *screen) { Atom prop_name; Index: libX11/src/SelInput.c =================================================================== --- libX11.orig/src/SelInput.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SelInput.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSelectInput ( register Display *dpy, Index: libX11/src/SendEvent.c =================================================================== --- libX11.orig/src/SendEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SendEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ * In order to avoid all images requiring _XEventToWire, we install the * event converter here if it has never been installed. */ +_X_EXPORT Status XSendEvent( register Display *dpy, Index: libX11/src/SetBack.c =================================================================== --- libX11.orig/src/SetBack.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetBack.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetBackground ( register Display *dpy, Index: libX11/src/SetCRects.c =================================================================== --- libX11.orig/src/SetCRects.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetCRects.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #include "Xlibint.h" /* can only call when display is locked. */ +_X_EXPORT void _XSetClipRectangles ( register Display *dpy, GC gc, @@ -63,6 +64,7 @@ gc->dirty = dirty; } +_X_EXPORT int XSetClipRectangles ( register Display *dpy, Index: libX11/src/SetClMask.c =================================================================== --- libX11.orig/src/SetClMask.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetClMask.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetClipMask ( register Display *dpy, Index: libX11/src/SetClOrig.c =================================================================== --- libX11.orig/src/SetClOrig.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetClOrig.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetClipOrigin ( register Display *dpy, Index: libX11/src/SetDashes.c =================================================================== --- libX11.orig/src/SetDashes.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetDashes.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetDashes ( register Display *dpy, Index: libX11/src/SetFPath.c =================================================================== --- libX11.orig/src/SetFPath.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetFPath.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,6 +33,7 @@ #define safestrlen(s) ((s) ? strlen(s) : 0) +_X_EXPORT int XSetFontPath ( register Display *dpy, Index: libX11/src/SetFont.c =================================================================== --- libX11.orig/src/SetFont.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetFont.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetFont ( register Display *dpy, Index: libX11/src/SetFore.c =================================================================== --- libX11.orig/src/SetFore.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetFore.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetForeground ( register Display *dpy, Index: libX11/src/SetFunc.c =================================================================== --- libX11.orig/src/SetFunc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetFunc.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetFunction ( register Display *dpy, Index: libX11/src/SetHints.c =================================================================== --- libX11.orig/src/SetHints.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetHints.c 2007-05-26 23:56:22.000000000 +0800 @@ -59,6 +59,7 @@ #define safestrlen(s) ((s) ? strlen(s) : 0) +_X_EXPORT int XSetSizeHints( /* old routine */ Display *dpy, @@ -105,6 +106,7 @@ * WM_HINTS type: WM_HINTS format:32 */ +_X_EXPORT int XSetWMHints ( Display *dpy, @@ -142,6 +144,7 @@ * WM_ZOOM_HINTS type: WM_SIZE_HINTS format: 32 */ +_X_EXPORT int XSetZoomHints ( Display *dpy, @@ -157,6 +160,7 @@ * WM_NORMAL_HINTS type: WM_SIZE_HINTS format: 32 */ +_X_EXPORT int XSetNormalHints ( /* old routine */ Display *dpy, @@ -174,6 +178,7 @@ * routine will take care of converting to host to network data structures. */ +_X_EXPORT int XSetIconSizes ( Display *dpy, @@ -205,6 +210,7 @@ return 1; } +_X_EXPORT int XSetCommand ( Display *dpy, @@ -243,6 +249,7 @@ * WM_NORMAL_HINTS type: WM_SIZE_HINTS format: 32 */ +_X_EXPORT int XSetStandardProperties ( Display *dpy, @@ -277,6 +284,7 @@ return 1; } +_X_EXPORT int XSetTransientForHint( Display *dpy, @@ -287,6 +295,7 @@ PropModeReplace, (unsigned char *) &propWindow, 1); } +_X_EXPORT int XSetClassHint( Display *dpy, Index: libX11/src/SetIFocus.c =================================================================== --- libX11.orig/src/SetIFocus.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetIFocus.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetInputFocus( register Display *dpy, Index: libX11/src/SetLStyle.c =================================================================== --- libX11.orig/src/SetLStyle.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetLStyle.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetLineAttributes( register Display *dpy, Index: libX11/src/SetNrmHint.c =================================================================== --- libX11.orig/src/SetNrmHint.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetNrmHint.c 2007-05-26 23:56:22.000000000 +0800 @@ -60,6 +60,7 @@ #include #include +_X_EXPORT void XSetWMSizeHints ( Display *dpy, Window w, @@ -118,6 +119,7 @@ } +_X_EXPORT void XSetWMNormalHints ( Display *dpy, Window w, Index: libX11/src/SetPMask.c =================================================================== --- libX11.orig/src/SetPMask.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetPMask.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetPlaneMask ( register Display *dpy, Index: libX11/src/SetPntMap.c =================================================================== --- libX11.orig/src/SetPntMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetPntMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ #include "Xlibint.h" /* returns either DeviceMappingSuccess or DeviceMappingBusy */ +_X_EXPORT int XSetPointerMapping ( register Display *dpy, @@ -55,6 +56,7 @@ return ((int) rep.success); } +_X_EXPORT int XChangeKeyboardMapping ( register Display *dpy, Index: libX11/src/SetRGBCMap.c =================================================================== --- libX11.orig/src/SetRGBCMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetRGBCMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ #include "Xatomtype.h" #include +_X_EXPORT void XSetRGBColormaps ( Display *dpy, Window w, Index: libX11/src/SetSOwner.c =================================================================== --- libX11.orig/src/SetSOwner.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetSOwner.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetSelectionOwner( register Display *dpy, Index: libX11/src/SetSSaver.c =================================================================== --- libX11.orig/src/SetSSaver.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetSSaver.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetScreenSaver( register Display *dpy, Index: libX11/src/SetStCmap.c =================================================================== --- libX11.orig/src/SetStCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetStCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -62,6 +62,7 @@ * in the XStandardColormap structure. */ +_X_EXPORT void XSetStandardColormap( Display *dpy, Window w, Index: libX11/src/SetState.c =================================================================== --- libX11.orig/src/SetState.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetState.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetState( register Display *dpy, Index: libX11/src/SetStip.c =================================================================== --- libX11.orig/src/SetStip.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetStip.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetStipple ( register Display *dpy, Index: libX11/src/SetTSOrig.c =================================================================== --- libX11.orig/src/SetTSOrig.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetTSOrig.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetTSOrigin ( register Display *dpy, Index: libX11/src/SetTile.c =================================================================== --- libX11.orig/src/SetTile.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetTile.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XSetTile ( register Display *dpy, Index: libX11/src/SetTxtProp.c =================================================================== --- libX11.orig/src/SetTxtProp.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetTxtProp.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ #include #include +_X_EXPORT void XSetTextProperty ( Display *dpy, Window w, @@ -68,6 +69,7 @@ PropModeReplace, tp->value, tp->nitems); } +_X_EXPORT void XSetWMName ( Display *dpy, Window w, @@ -76,6 +78,7 @@ XSetTextProperty (dpy, w, tp, XA_WM_NAME); } +_X_EXPORT void XSetWMIconName ( Display *dpy, Window w, @@ -84,6 +87,7 @@ XSetTextProperty (dpy, w, tp, XA_WM_ICON_NAME); } +_X_EXPORT void XSetWMClientMachine ( Display *dpy, Window w, Index: libX11/src/SetWMCMapW.c =================================================================== --- libX11.orig/src/SetWMCMapW.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetWMCMapW.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ * WM_COLORMAP_WINDOWS type: WINDOW format:32 */ +_X_EXPORT Status XSetWMColormapWindows ( Display *dpy, Window w, Index: libX11/src/SetWMProto.c =================================================================== --- libX11.orig/src/SetWMProto.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/SetWMProto.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ * WM_PROTOCOLS type: ATOM format: 32 */ +_X_EXPORT Status XSetWMProtocols ( Display *dpy, Window w, Index: libX11/src/StBytes.c =================================================================== --- libX11.orig/src/StBytes.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StBytes.c 2007-05-26 23:56:22.000000000 +0800 @@ -43,6 +43,7 @@ XA_CUT_BUFFER6, XA_CUT_BUFFER7}; +_X_EXPORT int XRotateBuffers ( register Display *dpy, @@ -54,6 +55,7 @@ return XRotateWindowProperties(dpy, RootWindow(dpy, 0), n_to_atom, 8, rotate); } +_X_EXPORT char *XFetchBuffer ( register Display *dpy, int *nbytes, @@ -80,6 +82,7 @@ return(NULL); } +_X_EXPORT char *XFetchBytes ( register Display *dpy, int *nbytes) @@ -87,6 +90,7 @@ return (XFetchBuffer (dpy, nbytes, 0)); } +_X_EXPORT int XStoreBuffer ( register Display *dpy, @@ -99,6 +103,7 @@ XA_STRING, 8, PropModeReplace, (unsigned char *) bytes, nbytes); } +_X_EXPORT int XStoreBytes ( register Display *dpy, Index: libX11/src/StColor.c =================================================================== --- libX11.orig/src/StColor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StColor.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XStoreColor( register Display *dpy, Index: libX11/src/StColors.c =================================================================== --- libX11.orig/src/StColors.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StColors.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XStoreColors( register Display *dpy, Index: libX11/src/StNColor.c =================================================================== --- libX11.orig/src/StNColor.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StNColor.c 2007-05-26 23:56:22.000000000 +0800 @@ -33,7 +33,7 @@ #include "Xlibint.h" #include "Xcmsint.h" - +_X_EXPORT int XStoreNamedColor( register Display *dpy, Index: libX11/src/StName.c =================================================================== --- libX11.orig/src/StName.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StName.c 2007-05-26 23:56:22.000000000 +0800 @@ -32,6 +32,7 @@ #include #include +_X_EXPORT int XStoreName ( register Display *dpy, @@ -43,6 +44,7 @@ name ? strlen(name) : 0); } +_X_EXPORT int XSetIconName ( register Display *dpy, Index: libX11/src/StrKeysym.c =================================================================== --- libX11.orig/src/StrKeysym.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StrKeysym.c 2007-05-26 23:56:22.000000000 +0800 @@ -71,6 +71,7 @@ return keysymdb; } +_X_EXPORT KeySym XStringToKeysym(_Xconst char *s) { Index: libX11/src/StrToText.c =================================================================== --- libX11.orig/src/StrToText.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/StrToText.c 2007-05-26 23:56:22.000000000 +0800 @@ -39,6 +39,7 @@ * count. */ +_X_EXPORT Status XStringListToTextProperty ( char **argv, int argc, Index: libX11/src/Sync.c =================================================================== --- libX11.orig/src/Sync.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Sync.c 2007-05-26 23:56:22.000000000 +0800 @@ -35,6 +35,7 @@ /* Synchronize with errors and events, optionally discarding pending events */ +_X_EXPORT int XSync ( register Display *dpy, Index: libX11/src/Synchro.c =================================================================== --- libX11.orig/src/Synchro.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Synchro.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ return 0; } +_X_EXPORT int (*XSynchronize(Display *dpy, int onoff))(Display *) { int (*temp)(Display *); @@ -58,6 +59,7 @@ return (temp); } +_X_EXPORT int (*XSetAfterFunction( Display *dpy, int (*func)( Index: libX11/src/Text.c =================================================================== --- libX11.orig/src/Text.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Text.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawString( register Display *dpy, Index: libX11/src/Text16.c =================================================================== --- libX11.orig/src/Text16.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Text16.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XDrawString16( register Display *dpy, Index: libX11/src/TextExt.c =================================================================== --- libX11.orig/src/TextExt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/TextExt.c 2007-05-26 23:56:22.000000000 +0800 @@ -72,6 +72,7 @@ * first row of the font (i.e. byte1 == 0), we can do some optimizations beyond * what is done in XTextExtents16. */ +_X_EXPORT int XTextExtents ( XFontStruct *fs, @@ -146,6 +147,7 @@ * XTextWidth - compute the width of a string of eightbit bytes. This is a * subset of XTextExtents. */ +_X_EXPORT int XTextWidth ( XFontStruct *fs, @@ -192,6 +194,7 @@ /* * _XTextHeight - compute the height of a string of eightbit bytes. */ +_X_EXPORT int _XTextHeight ( XFontStruct *fs, Index: libX11/src/TextExt16.c =================================================================== --- libX11.orig/src/TextExt16.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/TextExt16.c 2007-05-26 23:56:22.000000000 +0800 @@ -46,6 +46,7 @@ * XTextExtents16 - compute the extents of string given as a sequence of * XChar2bs. */ +_X_EXPORT int XTextExtents16 ( XFontStruct *fs, @@ -121,6 +122,7 @@ * XTextWidth16 - compute the width of sequence of XChar2bs. This is a * subset of XTextExtents16. */ +_X_EXPORT int XTextWidth16 ( XFontStruct *fs, @@ -167,6 +169,7 @@ /* * _XTextHeight16 - compute the height of sequence of XChar2bs. */ +_X_EXPORT int _XTextHeight16 ( XFontStruct *fs, Index: libX11/src/TextToStr.c =================================================================== --- libX11.orig/src/TextToStr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/TextToStr.c 2007-05-26 23:56:22.000000000 +0800 @@ -40,6 +40,7 @@ * null-separated STRING property. */ +_X_EXPORT Status XTextPropertyToStringList ( XTextProperty *tp, char ***list_return, @@ -108,7 +109,7 @@ return True; } - +_X_EXPORT void XFreeStringList (char **list) { if (list) { Index: libX11/src/TrCoords.c =================================================================== --- libX11.orig/src/TrCoords.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/TrCoords.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT Bool XTranslateCoordinates( register Display *dpy, Window src_win, Index: libX11/src/UndefCurs.c =================================================================== --- libX11.orig/src/UndefCurs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UndefCurs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUndefineCursor ( register Display *dpy, Index: libX11/src/UngrabBut.c =================================================================== --- libX11.orig/src/UngrabBut.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UngrabBut.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUngrabButton( register Display *dpy, Index: libX11/src/UngrabKbd.c =================================================================== --- libX11.orig/src/UngrabKbd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UngrabKbd.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUngrabKeyboard ( register Display *dpy, Index: libX11/src/UngrabPtr.c =================================================================== --- libX11.orig/src/UngrabPtr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UngrabPtr.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUngrabPointer( register Display *dpy, Index: libX11/src/UngrabSvr.c =================================================================== --- libX11.orig/src/UngrabSvr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UngrabSvr.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUngrabServer ( register Display *dpy) Index: libX11/src/UnldFont.c =================================================================== --- libX11.orig/src/UnldFont.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UnldFont.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUnloadFont( register Display *dpy, Index: libX11/src/UnmapSubs.c =================================================================== --- libX11.orig/src/UnmapSubs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UnmapSubs.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUnmapSubwindows( register Display *dpy, Index: libX11/src/UnmapWin.c =================================================================== --- libX11.orig/src/UnmapWin.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/UnmapWin.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XUnmapWindow ( register Display *dpy, Index: libX11/src/VisUtil.c =================================================================== --- libX11.orig/src/VisUtil.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/VisUtil.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ * VisualAllMask */ +_X_EXPORT XVisualInfo *XGetVisualInfo( Display *dpy, register long visual_info_mask, @@ -189,6 +190,7 @@ * otherwise False is returned. */ +_X_EXPORT Status XMatchVisualInfo( Display *dpy, int screen, Index: libX11/src/WMGeom.c =================================================================== --- libX11.orig/src/WMGeom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/WMGeom.c 2007-05-26 23:56:22.000000000 +0800 @@ -44,6 +44,7 @@ * be considered "negative". */ +_X_EXPORT int XWMGeometry ( Display *dpy, /* user's display connection */ Index: libX11/src/WMProps.c =================================================================== --- libX11.orig/src/WMProps.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/WMProps.c 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ * WM_CLASS type: STRING/STRING format: 8 */ +_X_EXPORT void XSetWMProperties ( Display *dpy, Window w, /* window to decorate */ Index: libX11/src/WarpPtr.c =================================================================== --- libX11.orig/src/WarpPtr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/WarpPtr.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT int XWarpPointer( register Display *dpy, Index: libX11/src/WinEvent.c =================================================================== --- libX11.orig/src/WinEvent.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/WinEvent.c 2007-05-26 23:56:22.000000000 +0800 @@ -44,7 +44,7 @@ * If none found, flush, and then wait until an event arrives which * matches. */ - +_X_EXPORT int XWindowEvent ( register Display *dpy, Index: libX11/src/Window.c =================================================================== --- libX11.orig/src/Window.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Window.c 2007-05-26 23:56:22.000000000 +0800 @@ -31,6 +31,7 @@ #endif #include "Xlibint.h" +_X_EXPORT void _XProcessWindowAttributes ( register Display *dpy, xChangeWindowAttributesReq *req, @@ -99,6 +100,7 @@ CWOverrideRedirect|CWSaveUnder|CWEventMask|\ CWDontPropagate|CWColormap|CWCursor) +_X_EXPORT Window XCreateWindow( register Display *dpy, Window parent, Index: libX11/src/Withdraw.c =================================================================== --- libX11.orig/src/Withdraw.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Withdraw.c 2007-05-26 23:56:22.000000000 +0800 @@ -64,6 +64,7 @@ * This function instructs the window manager to change this window from * NormalState or IconicState to Withdrawn. */ +_X_EXPORT Status XWithdrawWindow ( Display *dpy, Window w, Index: libX11/src/WrBitF.c =================================================================== --- libX11.orig/src/WrBitF.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/WrBitF.c 2007-05-26 23:56:22.000000000 +0800 @@ -85,6 +85,7 @@ #define BYTES_PER_OUTPUT_LINE 12 +_X_EXPORT int XWriteBitmapFile( Display *display, Index: libX11/src/XlibAsync.c =================================================================== --- libX11.orig/src/XlibAsync.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/XlibAsync.c 2007-05-26 23:56:22.000000000 +0800 @@ -34,6 +34,7 @@ #include #include +_X_EXPORT /*ARGSUSED*/ Bool _XAsyncErrorHandler( @@ -64,6 +65,7 @@ return False; } +_X_EXPORT void _XDeqAsyncHandler( Display *dpy, register _XAsyncHandler *handler) @@ -79,6 +81,7 @@ *prev = async->next; } +_X_EXPORT char * _XGetAsyncReply( register Display *dpy, @@ -126,6 +129,7 @@ return (char *)rep; } +_X_EXPORT void _XGetAsyncData( Display *dpy, Index: libX11/src/XlibInt.c =================================================================== --- libX11.orig/src/XlibInt.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/XlibInt.c 2007-05-26 23:56:22.000000000 +0800 @@ -56,10 +56,17 @@ #include "locking.h" /* these pointers get initialized by XInitThreads */ +_X_EXPORT LockInfoPtr _Xglobal_lock = NULL; + +_X_EXPORT void (*_XCreateMutex_fn)(LockInfoPtr) = NULL; + /* struct _XCVList *(*_XCreateCVL_fn)() = NULL; */ +_X_EXPORT void (*_XFreeMutex_fn)(LockInfoPtr) = NULL; + +_X_EXPORT void (*_XLockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) @@ -67,6 +74,8 @@ , int /* line */ #endif ) = NULL; + +_X_EXPORT void (*_XUnlockMutex_fn)( LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) @@ -381,6 +390,7 @@ #define POLLFD_CACHE_SIZE 5 /* initialize the struct array passed to poll() below */ +_X_EXPORT Bool _XPollfdCacheInit( Display *dpy) { @@ -398,6 +408,7 @@ return True; } +_X_EXPORT void _XPollfdCacheAdd( Display *dpy, int fd) @@ -412,6 +423,7 @@ #endif } +_X_EXPORT /* ARGSUSED */ void _XPollfdCacheDel( Display *dpy, @@ -587,6 +599,7 @@ return 0; } +_X_EXPORT void _XSetSeqSyncFunction( register Display *dpy) { @@ -610,6 +623,7 @@ * action is taken. This routine correctly handles incremental writes. * This routine may have to be reworked if int < long. */ +_X_EXPORT void _XFlush( register Display *dpy) { @@ -718,6 +732,7 @@ #endif } +_X_EXPORT int _XEventsQueued( register Display *dpy, @@ -914,6 +929,7 @@ /* _XReadEvents - Flush the output queue, * then read as many events as possible (but at least 1) and enqueue them */ +_X_EXPORT void _XReadEvents( register Display *dpy) { @@ -1073,6 +1089,7 @@ * _XRead - Read bytes from the socket taking into account incomplete * reads. This routine may have to be reworked if int < long. */ +_X_EXPORT int _XRead( register Display *dpy, register char *data, @@ -1131,6 +1148,7 @@ #endif /* !USE_XCB */ #ifdef LONG64 +_X_EXPORT void _XRead32( Display *dpy, register long *data, @@ -1276,6 +1294,7 @@ * reads. If the number of bytes is not 0 mod 4, read additional pad * bytes. This routine may have to be reworked if int < long. */ +_X_EXPORT void _XReadPad( register Display *dpy, register char *data, @@ -1358,6 +1377,7 @@ * transmission is used, if size is not 0 mod 4, extra bytes are transmitted. * This routine may have to be reworked if int < long; */ +_X_EXPORT void _XSend ( register Display *dpy, @@ -1543,6 +1563,7 @@ /* * _XAllocID - resource ID allocation routine. */ +_X_EXPORT XID _XAllocID( register Display *dpy) { @@ -1573,6 +1594,7 @@ /* * _XAllocIDs - multiple resource ID allocation routine. */ +_X_EXPORT void _XAllocIDs( register Display *dpy, XID *ids, @@ -1634,6 +1656,7 @@ * by forcing syncs when we get close. */ +_X_EXPORT unsigned long _XSetLastRequestRead( register Display *dpy, @@ -1673,6 +1696,7 @@ * specified rep. Meanwhile we must handle error and event packets that * we may encounter. */ +_X_EXPORT Status _XReply ( register Display *dpy, @@ -1949,6 +1973,7 @@ * because could not allocate memory. * Assumes Display locked when called. */ +_X_EXPORT Status _XRegisterInternalConnection( Display* dpy, @@ -1998,6 +2023,7 @@ * * Assumes Display locked when called. */ +_X_EXPORT void _XUnregisterInternalConnection( Display* dpy, @@ -2036,6 +2062,7 @@ * The list is allocated with Xmalloc and should be freed by the caller * with Xfree; */ +_X_EXPORT Status XInternalConnectionNumbers( Display *dpy, @@ -2068,6 +2095,7 @@ return 1; } +_X_EXPORT void _XProcessInternalConnection( Display *dpy, struct _XConnectionInfo *conn_info) @@ -2097,6 +2125,7 @@ * for this fd. * The Display is NOT locked during the call. */ +_X_EXPORT void XProcessInternalConnection( Display* dpy, @@ -2122,6 +2151,7 @@ * If any connections are already registered, the callback is immediately * called for each of them. */ +_X_EXPORT Status XAddConnectionWatch( Display* dpy, @@ -2177,6 +2207,7 @@ * Both callback and client_data must match what was passed to * XAddConnectionWatch. */ +_X_EXPORT void XRemoveConnectionWatch( Display* dpy, @@ -2220,6 +2251,7 @@ #if !USE_XCB /* Read and discard "n" 8-bit bytes of data */ +_X_EXPORT void _XEatData( Display *dpy, register unsigned long n) @@ -2242,6 +2274,7 @@ * note that no squishing of move events in V11, since there * is pointer motion hints.... */ +_X_EXPORT void _XEnq( register Display *dpy, register xEvent *event) @@ -2277,6 +2310,7 @@ /* * _XDeq - Remove event packet from the display's queue. */ +_X_EXPORT void _XDeq( register Display *dpy, register _XQEvent *prev, /* element before qelt */ @@ -2300,6 +2334,7 @@ * EventToWire in separate file in that often not needed. */ +_X_EXPORT /*ARGSUSED*/ Bool _XUnknownWireEvent( @@ -2315,6 +2350,7 @@ return(False); } +_X_EXPORT /*ARGSUSED*/ Status _XUnknownNativeEvent( @@ -2332,6 +2368,7 @@ /* * reformat a wire event into an XEvent structure of the right type. */ +_X_EXPORT Bool _XWireToEvent( register Display *dpy, /* pointer to display structure */ @@ -2707,6 +2744,7 @@ * _XDefaultIOError - Default fatal system error reporting routine. Called * when an X internal system error is encountered. */ +_X_EXPORT int _XDefaultIOError( Display *dpy) { @@ -2845,6 +2883,7 @@ return 1; } +_X_EXPORT int _XDefaultError( Display *dpy, XErrorEvent *event) @@ -2854,6 +2893,7 @@ /*NOTREACHED*/ } +_X_EXPORT /*ARGSUSED*/ Bool _XDefaultWireError(display, he, we) Display *display; @@ -2866,6 +2906,7 @@ /* * _XError - upcall internal or user protocol error handler */ +_X_EXPORT int _XError ( Display *dpy, register xError *rep) @@ -2917,6 +2958,7 @@ /* * _XIOError - call user connection error handler and exit */ +_X_EXPORT int _XIOError ( Display *dpy) @@ -2942,6 +2984,7 @@ * GetReq* and a call to Data* or _XSend*, or in a context when the thread * is guaranteed to not unlock the display. */ +_X_EXPORT char *_XAllocScratch( register Display *dpy, unsigned long nbytes) @@ -2959,6 +3002,7 @@ * Scratch space allocator you can call any time, multiple times, and be * MT safe, but you must hand the buffer back with _XFreeTemp. */ +_X_EXPORT char *_XAllocTemp( register Display *dpy, unsigned long nbytes) @@ -2971,6 +3015,7 @@ return buf; } +_X_EXPORT void _XFreeTemp( register Display *dpy, char *buf, @@ -2985,6 +3030,7 @@ /* * Given a visual id, find the visual structure for this id on this display. */ +_X_EXPORT Visual *_XVIDtoVisual( Display *dpy, VisualID id) @@ -3007,6 +3053,7 @@ return (NULL); } +_X_EXPORT int XFree (void *data) { @@ -3032,6 +3079,7 @@ #endif #ifdef DataRoutineIsProcedure +_X_EXPORT void Data( Display *dpy, char *data, @@ -3048,6 +3096,7 @@ #ifdef LONG64 +_X_EXPORT int _XData32( Display *dpy, @@ -3210,6 +3259,7 @@ /* * _XGetHostname - similar to gethostname but allows special processing. */ +_X_EXPORT int _XGetHostname ( char *buf, int maxlen) @@ -3244,6 +3294,7 @@ * _XScreenOfWindow - get the Screen of a given window */ +_X_EXPORT Screen *_XScreenOfWindow (dpy, w) Display *dpy; Window w; @@ -3369,6 +3420,7 @@ return 0; } +_X_EXPORT int _XOpenFile(path, flags) _Xconst char* path; int flags; @@ -3388,6 +3440,7 @@ return ret; } +_X_EXPORT int _XOpenFileMode(path, flags, mode) _Xconst char* path; int flags; @@ -3408,6 +3461,7 @@ return ret; } +_X_EXPORT void* _XFopenFile(path, mode) _Xconst char* path; _Xconst char* mode; @@ -3427,6 +3481,7 @@ return ret; } +_X_EXPORT int _XAccessFile(path) _Xconst char* path; { @@ -3448,8 +3503,12 @@ #ifdef WIN32 #undef _Xdebug +_X_EXPORT int _Xdebug = 0; + +_X_EXPORT int *_Xdebug_p = &_Xdebug; + void (**_XCreateMutex_fn_p)(LockInfoPtr) = &_XCreateMutex_fn; void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn; void (**_XLockMutex_fn_p)(LockInfoPtr Index: libX11/src/Xrm.c =================================================================== --- libX11.orig/src/Xrm.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/Xrm.c 2007-05-26 23:56:22.000000000 +0800 @@ -329,6 +329,7 @@ /* The rest will be automatically initialized to zero. */ }; +_X_EXPORT void XrmInitialize(void) { XrmQString = XrmPermStringToQuark("String"); @@ -336,6 +337,7 @@ } #ifndef _XP_PRINT_SERVER_ +_X_EXPORT XrmDatabase XrmGetDatabase( Display *display) { @@ -346,6 +348,7 @@ return retval; } +_X_EXPORT void XrmSetDatabase( Display *display, XrmDatabase database) @@ -361,6 +364,7 @@ } #endif /* !_XP_PRINT_SERVER_ */ +_X_EXPORT void XrmStringToQuarkList( register _Xconst char *name, @@ -394,6 +398,7 @@ *quarks = NULLQUARK; } +_X_EXPORT void XrmStringToBindingQuarkList( register _Xconst char *name, @@ -765,6 +770,7 @@ GROW(pprev); } +_X_EXPORT void XrmCombineDatabase( XrmDatabase from, XrmDatabase *into, Bool override) @@ -814,6 +820,7 @@ } } +_X_EXPORT void XrmMergeDatabases( XrmDatabase from, XrmDatabase *into) { @@ -1014,6 +1021,7 @@ #undef NEWTABLE } +_X_EXPORT void XrmQPutResource( XrmDatabase *pdb, XrmBindingList bindings, @@ -1027,6 +1035,7 @@ _XUnlockMutex(&(*pdb)->linfo); } +_X_EXPORT void XrmPutResource( XrmDatabase *pdb, @@ -1044,6 +1053,7 @@ _XUnlockMutex(&(*pdb)->linfo); } +_X_EXPORT void XrmQPutStringResource( XrmDatabase *pdb, @@ -1524,6 +1534,7 @@ (*db->methods->mbfinish)(db->mbstate); } +_X_EXPORT void XrmPutStringResource( XrmDatabase *pdb, @@ -1544,6 +1555,7 @@ } +_X_EXPORT void XrmPutLineResource( XrmDatabase *pdb, @@ -1555,6 +1567,7 @@ _XUnlockMutex(&(*pdb)->linfo); } +_X_EXPORT XrmDatabase XrmGetStringDatabase( _Xconst char *data) @@ -1659,6 +1672,7 @@ Xfree(str); } +_X_EXPORT XrmDatabase XrmGetFileDatabase( _Xconst char *filename) @@ -1677,6 +1691,7 @@ return db; } +_X_EXPORT Status XrmCombineFileDatabase( _Xconst char *filename, @@ -1950,6 +1965,7 @@ /* call the proc for every value in the database, arbitrary order. * stop if the proc returns True. */ +_X_EXPORT Bool XrmEnumerateDatabase( XrmDatabase db, XrmNameList names, @@ -2077,6 +2093,7 @@ #endif /* DEBUG */ +_X_EXPORT void XrmPutFileDatabase( XrmDatabase db, @@ -2246,6 +2263,7 @@ return False; } +_X_EXPORT Bool XrmQGetSearchList( XrmDatabase db, XrmNameList names, @@ -2291,6 +2309,7 @@ return True; } +_X_EXPORT Bool XrmQGetSearchResource( XrmSearchList searchList, register XrmName name, @@ -2529,6 +2548,7 @@ return False; } +_X_EXPORT Bool XrmQGetResource( XrmDatabase db, XrmNameList names, @@ -2571,6 +2591,7 @@ return False; } +_X_EXPORT Bool XrmGetResource(db, name_str, class_str, pType_str, pValue) XrmDatabase db; @@ -2631,6 +2652,7 @@ Xfree((char *)table); } +_X_EXPORT const char * XrmLocaleOfDatabase( XrmDatabase db) @@ -2642,6 +2664,7 @@ return retval; } +_X_EXPORT void XrmDestroyDatabase( XrmDatabase db) { Index: libX11/src/evtomask.c =================================================================== --- libX11.orig/src/evtomask.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/evtomask.c 2007-05-26 23:56:22.000000000 +0800 @@ -30,11 +30,15 @@ #include #endif #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 have to export it. */ +_X_EXPORT long const _Xevent_to_mask [LASTEvent] = { 0, /* no event 0 */ 0, /* no event 1 */ Index: libX11/src/globals.c =================================================================== --- libX11.orig/src/globals.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/globals.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,11 +58,15 @@ */ #if !defined(UNIXCPP) || defined(ANSICPP) #define ZEROINIT(t,var,val) SetZero(t,var,val); \ + _X_EXPORT \ SetZero (long, _libX_##var##Flag, 0); \ + _X_EXPORT \ SetZero (void *, _libX_##var##Ptr, NULL) #else /* else pcc concatenation */ #define ZEROINIT(t,var,val) SetZero(t,var,val); \ + _X_EXPORT \ SetZero (long, _libX_/**/var/**/Flag, 0); \ + _X_EXPORT \ SetZero (void *, _libX_/**/var/**/Ptr, NULL) #endif /* concat ANSI C vs. pcc */ Index: libX11/src/locking.c =================================================================== --- libX11.orig/src/locking.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/locking.c 2007-05-26 23:56:22.000000000 +0800 @@ -596,7 +596,7 @@ xthread_t (*_x11_thr_self)() = __x11_thr_self; #endif - +_X_EXPORT Status XInitThreads() { if (_Xglobal_lock) Index: libX11/src/os2Stubs.c =================================================================== --- libX11.orig/src/os2Stubs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/os2Stubs.c 2007-05-26 23:56:22.000000000 +0800 @@ -50,6 +50,7 @@ #include #include +_X_EXPORT char *__XOS2RedirRoot(char *fname) { /* This adds a further redirection by allowing the ProjectRoot Index: libX11/src/xcms/AddDIC.c =================================================================== --- libX11.orig/src/xcms/AddDIC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/AddDIC.c 2007-05-26 23:56:22.000000000 +0800 @@ -56,6 +56,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsAddColorSpace(XcmsColorSpace *pCS) /* Index: libX11/src/xcms/AddSF.c =================================================================== --- libX11.orig/src/xcms/AddSF.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/AddSF.c 2007-05-26 23:56:22.000000000 +0800 @@ -56,6 +56,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsAddFunctionSet(XcmsFunctionSet *pNewFS) /* Index: libX11/src/xcms/CCC.c =================================================================== --- libX11.orig/src/xcms/CCC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/CCC.c 2007-05-26 23:56:22.000000000 +0800 @@ -86,6 +86,7 @@ * SYNOPSIS */ +_X_EXPORT XcmsCCC XcmsCreateCCC( Display *dpy, @@ -172,6 +173,7 @@ * * SYNOPSIS */ +_X_EXPORT XcmsCCC XcmsDefaultCCC( Display *dpy, @@ -254,6 +256,7 @@ * * SYNOPSIS */ +_X_EXPORT void XcmsFreeCCC(XcmsCCC ccc) /* Index: libX11/src/xcms/CvCols.c =================================================================== --- libX11.orig/src/xcms/CvCols.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/CvCols.c 2007-05-26 23:56:22.000000000 +0800 @@ -713,6 +713,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsConvertColors( XcmsCCC ccc, Index: libX11/src/xcms/HVC.c =================================================================== --- libX11.orig/src/xcms/HVC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVC.c 2007-05-26 23:56:22.000000000 +0800 @@ -329,6 +329,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCToCIEuvY( XcmsCCC ccc, @@ -450,6 +451,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIEuvYToTekHVC( XcmsCCC ccc, Index: libX11/src/xcms/HVCGcC.c =================================================================== --- libX11.orig/src/xcms/HVCGcC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCGcC.c 2007-05-26 23:56:22.000000000 +0800 @@ -65,6 +65,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsTekHVCClipC ( Index: libX11/src/xcms/HVCGcV.c =================================================================== --- libX11.orig/src/xcms/HVCGcV.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCGcV.c 2007-05-26 23:56:22.000000000 +0800 @@ -65,6 +65,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsTekHVCClipV ( Index: libX11/src/xcms/HVCGcVC.c =================================================================== --- libX11.orig/src/xcms/HVCGcVC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCGcVC.c 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsTekHVCClipVC ( Index: libX11/src/xcms/HVCMnV.c =================================================================== --- libX11.orig/src/xcms/HVCMnV.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCMnV.c 2007-05-26 23:56:22.000000000 +0800 @@ -70,6 +70,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCQueryMinV ( XcmsCCC ccc, Index: libX11/src/xcms/HVCMxC.c =================================================================== --- libX11.orig/src/xcms/HVCMxC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCMxC.c 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCQueryMaxC( XcmsCCC ccc, Index: libX11/src/xcms/HVCMxV.c =================================================================== --- libX11.orig/src/xcms/HVCMxV.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCMxV.c 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCQueryMaxV( XcmsCCC ccc, Index: libX11/src/xcms/HVCMxVC.c =================================================================== --- libX11.orig/src/xcms/HVCMxVC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCMxVC.c 2007-05-26 23:56:22.000000000 +0800 @@ -181,6 +181,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCQueryMaxVC ( XcmsCCC ccc, Index: libX11/src/xcms/HVCMxVs.c =================================================================== --- libX11.orig/src/xcms/HVCMxVs.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCMxVs.c 2007-05-26 23:56:22.000000000 +0800 @@ -66,6 +66,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCQueryMaxVSamples( XcmsCCC ccc, Index: libX11/src/xcms/HVCWpAj.c =================================================================== --- libX11.orig/src/xcms/HVCWpAj.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/HVCWpAj.c 2007-05-26 23:56:22.000000000 +0800 @@ -66,6 +66,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsTekHVCWhiteShiftColors( XcmsCCC ccc, Index: libX11/src/xcms/IdOfPr.c =================================================================== --- libX11.orig/src/xcms/IdOfPr.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/IdOfPr.c 2007-05-26 23:56:22.000000000 +0800 @@ -48,6 +48,7 @@ * * SYNOPSIS */ +_X_EXPORT XcmsColorFormat XcmsFormatOfPrefix(char *prefix) /* Index: libX11/src/xcms/LRGB.c =================================================================== --- libX11.orig/src/xcms/LRGB.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LRGB.c 2007-05-26 23:56:22.000000000 +0800 @@ -1467,6 +1467,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIEXYZToRGBi( @@ -1589,6 +1590,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsRGBiToCIEXYZ( @@ -1642,6 +1644,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsRGBiToRGB( @@ -1725,6 +1728,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsRGBToRGBi( Index: libX11/src/xcms/Lab.c =================================================================== --- libX11.orig/src/xcms/Lab.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/Lab.c 2007-05-26 23:56:22.000000000 +0800 @@ -231,6 +231,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabToCIEXYZ( XcmsCCC ccc, @@ -334,6 +335,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIEXYZToCIELab( XcmsCCC ccc, Index: libX11/src/xcms/LabGcC.c =================================================================== --- libX11.orig/src/xcms/LabGcC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabGcC.c 2007-05-26 23:56:22.000000000 +0800 @@ -52,6 +52,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELabClipab ( Index: libX11/src/xcms/LabGcL.c =================================================================== --- libX11.orig/src/xcms/LabGcL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabGcL.c 2007-05-26 23:56:22.000000000 +0800 @@ -52,6 +52,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELabClipL ( Index: libX11/src/xcms/LabGcLC.c =================================================================== --- libX11.orig/src/xcms/LabGcLC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabGcLC.c 2007-05-26 23:56:22.000000000 +0800 @@ -60,6 +60,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELabClipLab ( Index: libX11/src/xcms/LabMnL.c =================================================================== --- libX11.orig/src/xcms/LabMnL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabMnL.c 2007-05-26 23:56:22.000000000 +0800 @@ -61,6 +61,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabQueryMinL( XcmsCCC ccc, Index: libX11/src/xcms/LabMxC.c =================================================================== --- libX11.orig/src/xcms/LabMxC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabMxC.c 2007-05-26 23:56:22.000000000 +0800 @@ -64,6 +64,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabQueryMaxC( XcmsCCC ccc, Index: libX11/src/xcms/LabMxL.c =================================================================== --- libX11.orig/src/xcms/LabMxL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabMxL.c 2007-05-26 23:56:22.000000000 +0800 @@ -61,6 +61,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabQueryMaxL( XcmsCCC ccc, Index: libX11/src/xcms/LabMxLC.c =================================================================== --- libX11.orig/src/xcms/LabMxLC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabMxLC.c 2007-05-26 23:56:22.000000000 +0800 @@ -171,6 +171,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabQueryMaxLC ( XcmsCCC ccc, Index: libX11/src/xcms/LabWpAj.c =================================================================== --- libX11.orig/src/xcms/LabWpAj.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LabWpAj.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELabWhiteShiftColors( XcmsCCC ccc, Index: libX11/src/xcms/Luv.c =================================================================== --- libX11.orig/src/xcms/Luv.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/Luv.c 2007-05-26 23:56:22.000000000 +0800 @@ -232,6 +232,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvToCIEuvY( XcmsCCC ccc, @@ -324,6 +325,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIEuvYToCIELuv( XcmsCCC ccc, Index: libX11/src/xcms/LuvGcC.c =================================================================== --- libX11.orig/src/xcms/LuvGcC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvGcC.c 2007-05-26 23:56:22.000000000 +0800 @@ -52,6 +52,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELuvClipuv ( Index: libX11/src/xcms/LuvGcL.c =================================================================== --- libX11.orig/src/xcms/LuvGcL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvGcL.c 2007-05-26 23:56:22.000000000 +0800 @@ -52,6 +52,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELuvClipL ( Index: libX11/src/xcms/LuvGcLC.c =================================================================== --- libX11.orig/src/xcms/LuvGcLC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvGcLC.c 2007-05-26 23:56:22.000000000 +0800 @@ -60,6 +60,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIELuvClipLuv ( Index: libX11/src/xcms/LuvMnL.c =================================================================== --- libX11.orig/src/xcms/LuvMnL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvMnL.c 2007-05-26 23:56:22.000000000 +0800 @@ -61,6 +61,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvQueryMinL( XcmsCCC ccc, Index: libX11/src/xcms/LuvMxC.c =================================================================== --- libX11.orig/src/xcms/LuvMxC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvMxC.c 2007-05-26 23:56:22.000000000 +0800 @@ -64,6 +64,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvQueryMaxC( XcmsCCC ccc, Index: libX11/src/xcms/LuvMxL.c =================================================================== --- libX11.orig/src/xcms/LuvMxL.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvMxL.c 2007-05-26 23:56:22.000000000 +0800 @@ -61,6 +61,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvQueryMaxL( XcmsCCC ccc, Index: libX11/src/xcms/LuvMxLC.c =================================================================== --- libX11.orig/src/xcms/LuvMxLC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvMxLC.c 2007-05-26 23:56:22.000000000 +0800 @@ -171,6 +171,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvQueryMaxLC ( XcmsCCC ccc, Index: libX11/src/xcms/LuvWpAj.c =================================================================== --- libX11.orig/src/xcms/LuvWpAj.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/LuvWpAj.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIELuvWhiteShiftColors( XcmsCCC ccc, Index: libX11/src/xcms/OfCCC.c =================================================================== --- libX11.orig/src/xcms/OfCCC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/OfCCC.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Display * XcmsDisplayOfCCC( XcmsCCC ccc) @@ -78,6 +79,7 @@ * SYNOPSIS */ +_X_EXPORT Visual * XcmsVisualOfCCC( XcmsCCC ccc) @@ -101,6 +103,7 @@ * SYNOPSIS */ +_X_EXPORT int XcmsScreenNumberOfCCC( XcmsCCC ccc) @@ -124,6 +127,7 @@ * SYNOPSIS */ +_X_EXPORT XcmsColor * XcmsScreenWhitePointOfCCC( XcmsCCC ccc) @@ -147,6 +151,7 @@ * SYNOPSIS */ +_X_EXPORT XcmsColor * XcmsClientWhitePointOfCCC( XcmsCCC ccc) Index: libX11/src/xcms/PrOfId.c =================================================================== --- libX11.orig/src/xcms/PrOfId.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/PrOfId.c 2007-05-26 23:56:22.000000000 +0800 @@ -48,6 +48,7 @@ * * SYNOPSIS */ +_X_EXPORT char * XcmsPrefixOfFormat( XcmsColorFormat id) Index: libX11/src/xcms/QBlack.c =================================================================== --- libX11.orig/src/xcms/QBlack.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QBlack.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsQueryBlack( XcmsCCC ccc, Index: libX11/src/xcms/QBlue.c =================================================================== --- libX11.orig/src/xcms/QBlue.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QBlue.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsQueryBlue( XcmsCCC ccc, Index: libX11/src/xcms/QGreen.c =================================================================== --- libX11.orig/src/xcms/QGreen.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QGreen.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsQueryGreen( XcmsCCC ccc, Index: libX11/src/xcms/QRed.c =================================================================== --- libX11.orig/src/xcms/QRed.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QRed.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsQueryRed( XcmsCCC ccc, Index: libX11/src/xcms/QWhite.c =================================================================== --- libX11.orig/src/xcms/QWhite.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QWhite.c 2007-05-26 23:56:22.000000000 +0800 @@ -55,6 +55,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsQueryWhite( XcmsCCC ccc, Index: libX11/src/xcms/QuCol.c =================================================================== --- libX11.orig/src/xcms/QuCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QuCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsQueryColor( Display *dpy, Index: libX11/src/xcms/QuCols.c =================================================================== --- libX11.orig/src/xcms/QuCols.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/QuCols.c 2007-05-26 23:56:22.000000000 +0800 @@ -53,6 +53,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsQueryColors( Display *dpy, Index: libX11/src/xcms/SetCCC.c =================================================================== --- libX11.orig/src/xcms/SetCCC.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/SetCCC.c 2007-05-26 23:56:22.000000000 +0800 @@ -56,6 +56,7 @@ * SYNOPSIS */ +_X_EXPORT Status XcmsSetWhitePoint( XcmsCCC ccc, @@ -89,6 +90,7 @@ * SYNOPSIS */ +_X_EXPORT XcmsCompressionProc XcmsSetCompressionProc( XcmsCCC ccc, @@ -118,6 +120,7 @@ * SYNOPSIS */ +_X_EXPORT XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc( XcmsCCC ccc, Index: libX11/src/xcms/StCol.c =================================================================== --- libX11.orig/src/xcms/StCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/StCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsStoreColor( Display *dpy, Index: libX11/src/xcms/StCols.c =================================================================== --- libX11.orig/src/xcms/StCols.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/StCols.c 2007-05-26 23:56:22.000000000 +0800 @@ -54,6 +54,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsStoreColors( Display *dpy, Index: libX11/src/xcms/cmsAllCol.c =================================================================== --- libX11.orig/src/xcms/cmsAllCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/cmsAllCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -48,6 +48,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsAllocColor( Display *dpy, Index: libX11/src/xcms/cmsAllNCol.c =================================================================== --- libX11.orig/src/xcms/cmsAllNCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/cmsAllNCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -50,6 +50,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsAllocNamedColor ( Display *dpy, Index: libX11/src/xcms/cmsCmap.c =================================================================== --- libX11.orig/src/xcms/cmsCmap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/cmsCmap.c 2007-05-26 23:56:22.000000000 +0800 @@ -411,6 +411,7 @@ * * SYNOPSIS */ +_X_EXPORT XcmsCCC XcmsCCCOfColormap( Display *dpy, @@ -480,6 +481,7 @@ return(NULL); } +_X_EXPORT XcmsCCC XcmsSetCCCOfColormap( Display *dpy, Colormap cmap, Index: libX11/src/xcms/cmsLkCol.c =================================================================== --- libX11.orig/src/xcms/cmsLkCol.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/cmsLkCol.c 2007-05-26 23:56:22.000000000 +0800 @@ -50,6 +50,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsLookupColor ( Display *dpy, Index: libX11/src/xcms/uvY.c =================================================================== --- libX11.orig/src/xcms/uvY.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/uvY.c 2007-05-26 23:56:22.000000000 +0800 @@ -226,6 +226,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIEuvYToCIEXYZ( XcmsCCC ccc, @@ -341,6 +342,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIEXYZToCIEuvY( XcmsCCC ccc, Index: libX11/src/xcms/xyY.c =================================================================== --- libX11.orig/src/xcms/xyY.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xcms/xyY.c 2007-05-26 23:56:22.000000000 +0800 @@ -234,6 +234,7 @@ * * SYNOPSIS */ +_X_EXPORT Status XcmsCIExyYToCIEXYZ( XcmsCCC ccc, @@ -340,6 +341,7 @@ * * SYNOPSIS */ +_X_EXPORT /* ARGSUSED */ Status XcmsCIEXYZToCIExyY( Index: libX11/src/xkb/XKB.c =================================================================== --- libX11.orig/src/xkb/XKB.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKB.c 2007-05-26 23:56:22.000000000 +0800 @@ -39,6 +39,7 @@ XkbInternAtomFunc _XkbInternAtomFunc= XInternAtom; XkbGetAtomNameFunc _XkbGetAtomNameFunc= XGetAtomName; +_X_EXPORT Bool XkbQueryExtension( Display *dpy, int * opcodeReturn, @@ -62,6 +63,7 @@ return True; } +_X_EXPORT Bool XkbLibraryVersion(int *libMajorRtrn,int *libMinorRtrn) { @@ -82,6 +84,7 @@ return supported; } +_X_EXPORT Bool XkbSelectEvents( Display * dpy, unsigned int deviceSpec, @@ -132,6 +135,7 @@ return True; } +_X_EXPORT Bool XkbSelectEventDetails( Display * dpy, unsigned deviceSpec, @@ -224,6 +228,7 @@ return True; } +_X_EXPORT Bool XkbLockModifiers( Display * dpy, unsigned int deviceSpec, @@ -255,6 +260,7 @@ return True; } +_X_EXPORT Bool XkbLatchModifiers( Display * dpy, unsigned int deviceSpec, @@ -288,6 +294,7 @@ return True; } +_X_EXPORT Bool XkbLockGroup(Display *dpy,unsigned int deviceSpec,unsigned int group) { @@ -316,6 +323,7 @@ return True; } +_X_EXPORT Bool XkbLatchGroup(Display *dpy,unsigned int deviceSpec,unsigned int group) { @@ -346,6 +354,7 @@ return True; } +_X_EXPORT unsigned XkbSetXlibControls(Display *dpy,unsigned affect,unsigned values) { @@ -359,6 +368,7 @@ return dpy->xkb_info->xlib_ctrls; } +_X_EXPORT unsigned XkbGetXlibControls(Display *dpy) { @@ -369,6 +379,7 @@ return dpy->xkb_info->xlib_ctrls; } +_X_EXPORT unsigned int XkbXlibControlsImplemented(void) { @@ -379,6 +390,7 @@ #endif } +_X_EXPORT Bool XkbSetDebuggingFlags( Display * dpy, unsigned int mask, @@ -428,6 +440,7 @@ return True; } +_X_EXPORT Bool XkbComputeEffectiveMap( XkbDescPtr xkb, XkbKeyTypePtr type, @@ -474,6 +487,7 @@ return True; } +_X_EXPORT Status XkbGetState(Display *dpy,unsigned deviceSpec,XkbStatePtr rtrn) { @@ -514,6 +528,7 @@ return Success; } +_X_EXPORT Bool XkbSetDetectableAutoRepeat(Display *dpy,Bool detectable,Bool *supported) { @@ -547,6 +562,7 @@ return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0); } +_X_EXPORT Bool XkbGetDetectableAutoRepeat(Display *dpy,Bool *supported) { @@ -578,6 +594,7 @@ return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0); } +_X_EXPORT Bool XkbSetAutoResetControls( Display * dpy, unsigned changes, @@ -614,6 +631,7 @@ return ((rep.value&XkbPCF_AutoResetControlsMask)!=0); } +_X_EXPORT Bool XkbGetAutoResetControls( Display * dpy, unsigned * auto_ctrls, @@ -649,6 +667,7 @@ return ((rep.value&XkbPCF_AutoResetControlsMask)!=0); } +_X_EXPORT Bool XkbSetPerClientControls( Display * dpy, unsigned change, @@ -683,6 +702,7 @@ return ((rep.value&value_hold)!=0); } +_X_EXPORT Bool XkbGetPerClientControls( Display * dpy, unsigned * ctrls) @@ -718,6 +738,7 @@ return (True); } +_X_EXPORT Display * XkbOpenDisplay( char * name, int * ev_rtrn, @@ -762,6 +783,7 @@ return dpy; } +_X_EXPORT void XkbSetAtomFuncs(XkbInternAtomFunc getAtom,XkbGetAtomNameFunc getName) { Index: libX11/src/xkb/XKBAlloc.c =================================================================== --- libX11.orig/src/xkb/XKBAlloc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBAlloc.c 2007-05-26 23:56:22.000000000 +0800 @@ -60,6 +60,7 @@ /***===================================================================***/ /*ARGSUSED*/ +_X_EXPORT Status XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI) { @@ -106,7 +107,7 @@ return Success; } - +_X_EXPORT void XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap) { @@ -134,6 +135,7 @@ /***===================================================================***/ +_X_EXPORT Status XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases) { @@ -214,6 +216,7 @@ return Success; } +_X_EXPORT void XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap) { @@ -263,6 +266,7 @@ /***===================================================================***/ /*ARGSUSED*/ +_X_EXPORT Status XkbAllocControls(XkbDescPtr xkb,unsigned which) { @@ -278,6 +282,7 @@ } /*ARGSUSED*/ +_X_EXPORT void XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap) { @@ -303,6 +308,7 @@ return Success; } +_X_EXPORT void XkbFreeIndicatorMaps(XkbDescPtr xkb) { @@ -315,6 +321,7 @@ /***====================================================================***/ +_X_EXPORT XkbDescRec * XkbAllocKeyboard(void) { @@ -326,6 +333,7 @@ return xkb; } +_X_EXPORT void XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll) { @@ -354,6 +362,7 @@ /***====================================================================***/ +_X_EXPORT XkbDeviceLedInfoPtr XkbAddDeviceLedInfo(XkbDeviceInfoPtr devi,unsigned ledClass,unsigned ledId) { @@ -392,6 +401,7 @@ return devli; } +_X_EXPORT Status XkbResizeDeviceButtonActions(XkbDeviceInfoPtr devi,unsigned newTotal) { @@ -425,6 +435,7 @@ return Success; } +_X_EXPORT /*ARGSUSED*/ XkbDeviceInfoPtr XkbAllocDeviceInfo(unsigned deviceSpec,unsigned nButtons,unsigned szLeds) @@ -464,7 +475,7 @@ return devi; } - +_X_EXPORT void XkbFreeDeviceInfo(XkbDeviceInfoPtr devi,unsigned which,Bool freeDevI) { Index: libX11/src/xkb/XKBBell.c =================================================================== --- libX11.orig/src/xkb/XKBBell.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBBell.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,7 +36,7 @@ #include #include "XKBlibint.h" - +_X_EXPORT Bool XkbDeviceBell( Display * dpy, Window window, @@ -73,6 +73,7 @@ return True; } +_X_EXPORT Bool XkbForceDeviceBell( Display * dpy, int deviceID, @@ -107,6 +108,7 @@ return True; } +_X_EXPORT Bool XkbDeviceBellEvent( Display * dpy, Window window, @@ -143,6 +145,7 @@ return True; } +_X_EXPORT Bool XkbBell(Display *dpy,Window window,int percent,Atom name) { @@ -155,6 +158,7 @@ percent,name); } +_X_EXPORT Bool XkbForceBell(Display *dpy,int percent) { @@ -167,6 +171,7 @@ percent); } +_X_EXPORT Bool XkbBellEvent(Display *dpy,Window window,int percent,Atom name) { Index: libX11/src/xkb/XKBBind.c =================================================================== --- libX11.orig/src/xkb/XKBBind.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBBind.c 2007-05-26 23:56:22.000000000 +0800 @@ -66,6 +66,7 @@ int mlen; /* length of modifier list */ }; +_X_EXPORT KeySym XkbKeycodeToKeysym(Display *dpy, #if NeedWidePrototypes @@ -189,6 +190,7 @@ return 0; } +_X_EXPORT unsigned XkbKeysymToModifiers(Display *dpy,KeySym ks) { @@ -218,6 +220,7 @@ return mods; } +_X_EXPORT KeySym XLookupKeysym(register XKeyEvent *event, int col) { @@ -249,6 +252,7 @@ return XkbLookupKeySym(dpy,key,mods,mods_rtrn,keysym_rtrn); } +_X_EXPORT Bool XkbLookupKeySym( register Display * dpy, KeyCode key, @@ -263,6 +267,7 @@ keysym_rtrn); } +_X_EXPORT Bool XkbTranslateKeyCode( register XkbDescPtr xkb, KeyCode key, @@ -342,6 +347,7 @@ return (syms[col]!=NoSymbol); } +_X_EXPORT Status XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event) { @@ -574,6 +580,7 @@ return; } +_X_EXPORT int XkbTranslateKeySym( register Display * dpy, register KeySym * sym_rtrn, @@ -810,7 +817,7 @@ return XkbTranslateKeySym(dpy,keysym,new_mods,buffer,nbytes,NULL); } - +_X_EXPORT int XkbLookupKeyBinding( Display * dpy, register KeySym sym, @@ -839,6 +846,7 @@ return 0; } +_X_EXPORT char XkbToControl( char ch ) { Index: libX11/src/xkb/XKBCompat.c =================================================================== --- libX11.orig/src/xkb/XKBCompat.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBCompat.c 2007-05-26 23:56:22.000000000 +0800 @@ -109,6 +109,7 @@ return BadLength; } +_X_EXPORT Status XkbGetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb) { @@ -210,6 +211,7 @@ return True; } +_X_EXPORT Bool XkbSetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb,Bool updateActions) { Index: libX11/src/xkb/XKBCtrls.c =================================================================== --- libX11.orig/src/xkb/XKBCtrls.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBCtrls.c 2007-05-26 23:56:22.000000000 +0800 @@ -51,6 +51,7 @@ return req; } +_X_EXPORT Bool XkbSetAutoRepeatRate( Display *dpy, unsigned int deviceSpec, @@ -72,6 +73,7 @@ return True; } +_X_EXPORT Bool XkbGetAutoRepeatRate( Display * dpy, unsigned int deviceSpec, @@ -104,6 +106,7 @@ return True; } +_X_EXPORT Bool XkbSetServerInternalMods( Display * dpy, unsigned deviceSpec, @@ -129,6 +132,7 @@ return True; } +_X_EXPORT Bool XkbSetIgnoreLockMods( Display * dpy, unsigned int deviceSpec, @@ -154,6 +158,7 @@ return True; } +_X_EXPORT Bool XkbChangeEnabledControls( Display * dpy, unsigned deviceSpec, @@ -175,6 +180,7 @@ return True; } +_X_EXPORT Status XkbGetControls(Display *dpy, unsigned long which, XkbDescPtr xkb) { @@ -271,6 +277,7 @@ return Success; } +_X_EXPORT Bool XkbSetControls(Display *dpy, unsigned long which, XkbDescPtr xkb) { @@ -343,6 +350,7 @@ /***====================================================================***/ +_X_EXPORT void XkbNoteControlsChanges( XkbControlsChangesPtr old, XkbControlsNotifyEvent * new, Index: libX11/src/xkb/XKBExtDev.c =================================================================== --- libX11.orig/src/xkb/XKBExtDev.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBExtDev.c 2007-05-26 23:56:22.000000000 +0800 @@ -40,6 +40,7 @@ /***====================================================================***/ +_X_EXPORT extern void XkbNoteDeviceChanges( XkbDeviceChangesPtr old, XkbExtensionDeviceNotifyEvent * new, @@ -217,6 +218,7 @@ return BadLength; } +_X_EXPORT XkbDeviceInfoPtr XkbGetDeviceInfo( Display * dpy, unsigned which, @@ -266,6 +268,7 @@ return devi; } +_X_EXPORT Status XkbGetDeviceInfoChanges( Display * dpy, XkbDeviceInfoPtr devi, @@ -326,6 +329,7 @@ return status; } +_X_EXPORT Status XkbGetDeviceButtonActions( Display * dpy, XkbDeviceInfoPtr devi, @@ -367,6 +371,7 @@ return status; } +_X_EXPORT Status XkbGetDeviceLedInfo( Display * dpy, XkbDeviceInfoPtr devi, @@ -656,6 +661,7 @@ return wire-start; } +_X_EXPORT Bool XkbSetDeviceInfo( Display * dpy, unsigned which, @@ -711,6 +717,7 @@ return ok; } +_X_EXPORT Bool XkbChangeDeviceInfo( Display * dpy, XkbDeviceInfoPtr devi, @@ -759,6 +766,7 @@ return ok; } +_X_EXPORT Bool XkbSetDeviceLedInfo( Display * dpy, XkbDeviceInfoPtr devi, @@ -769,6 +777,7 @@ return False; } +_X_EXPORT Bool XkbSetDeviceButtonActions( Display * dpy, XkbDeviceInfoPtr devi, Index: libX11/src/xkb/XKBGAlloc.c =================================================================== --- libX11.orig/src/xkb/XKBGAlloc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBGAlloc.c 2007-05-26 23:56:22.000000000 +0800 @@ -172,6 +172,7 @@ return; } +_X_EXPORT void XkbFreeGeomProperties( XkbGeometryPtr geom, int first, @@ -187,6 +188,7 @@ /***====================================================================***/ +_X_EXPORT void XkbFreeGeomKeyAliases( XkbGeometryPtr geom, int first, @@ -212,6 +214,7 @@ return; } +_X_EXPORT void XkbFreeGeomColors(XkbGeometryPtr geom,int first,int count,Bool freeAll) { @@ -224,6 +227,7 @@ /***====================================================================***/ +_X_EXPORT void XkbFreeGeomPoints(XkbOutlinePtr outline,int first,int count,Bool freeAll) { @@ -246,6 +250,7 @@ return; } +_X_EXPORT void XkbFreeGeomOutlines(XkbShapePtr shape,int first,int count,Bool freeAll) { @@ -269,6 +274,7 @@ return; } +_X_EXPORT void XkbFreeGeomShapes(XkbGeometryPtr geom,int first,int count,Bool freeAll) { @@ -281,6 +287,7 @@ /***====================================================================***/ +_X_EXPORT void XkbFreeGeomOverlayKeys(XkbOverlayRowPtr row,int first,int count,Bool freeAll) { @@ -303,6 +310,7 @@ return; } +_X_EXPORT void XkbFreeGeomOverlayRows(XkbOverlayPtr overlay,int first,int count,Bool freeAll) { @@ -325,6 +333,7 @@ return; } +_X_EXPORT void XkbFreeGeomOverlays(XkbSectionPtr section,int first,int count,Bool freeAll) { @@ -337,6 +346,7 @@ /***====================================================================***/ +_X_EXPORT void XkbFreeGeomKeys(XkbRowPtr row,int first,int count,Bool freeAll) { @@ -359,6 +369,7 @@ return; } +_X_EXPORT void XkbFreeGeomRows(XkbSectionPtr section,int first,int count,Bool freeAll) { @@ -384,6 +395,7 @@ return; } +_X_EXPORT void XkbFreeGeomSections(XkbGeometryPtr geom,int first,int count,Bool freeAll) { @@ -426,6 +438,7 @@ return; } +_X_EXPORT void XkbFreeGeomDoodads(XkbDoodadPtr doodads,int nDoodads,Bool freeAll) { @@ -442,6 +455,7 @@ return; } +_X_EXPORT void XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap) { @@ -548,90 +562,105 @@ &(r)->num_keys,&(r)->sz_keys,\ (n),sizeof(XkbOverlayKeyRec)) +_X_EXPORT Status XkbAllocGeomProps(XkbGeometryPtr geom,int nProps) { return _XkbAllocProps(geom,nProps); } +_X_EXPORT Status XkbAllocGeomColors(XkbGeometryPtr geom,int nColors) { return _XkbAllocColors(geom,nColors); } +_X_EXPORT Status XkbAllocGeomKeyAliases(XkbGeometryPtr geom,int nKeyAliases) { return _XkbAllocKeyAliases(geom,nKeyAliases); } +_X_EXPORT Status XkbAllocGeomShapes(XkbGeometryPtr geom,int nShapes) { return _XkbAllocShapes(geom,nShapes); } +_X_EXPORT Status XkbAllocGeomSections(XkbGeometryPtr geom,int nSections) { return _XkbAllocSections(geom,nSections); } +_X_EXPORT Status XkbAllocGeomOverlays(XkbSectionPtr section,int nOverlays) { return _XkbAllocOverlays(section,nOverlays); } +_X_EXPORT Status XkbAllocGeomOverlayRows(XkbOverlayPtr overlay,int nRows) { return _XkbAllocOverlayRows(overlay,nRows); } +_X_EXPORT Status XkbAllocGeomOverlayKeys(XkbOverlayRowPtr row,int nKeys) { return _XkbAllocOverlayKeys(row,nKeys); } +_X_EXPORT Status XkbAllocGeomDoodads(XkbGeometryPtr geom,int nDoodads) { return _XkbAllocDoodads(geom,nDoodads); } +_X_EXPORT Status XkbAllocGeomSectionDoodads(XkbSectionPtr section,int nDoodads) { return _XkbAllocDoodads(section,nDoodads); } +_X_EXPORT Status XkbAllocGeomOutlines(XkbShapePtr shape,int nOL) { return _XkbAllocOutlines(shape,nOL); } +_X_EXPORT Status XkbAllocGeomRows(XkbSectionPtr section,int nRows) { return _XkbAllocRows(section,nRows); } +_X_EXPORT Status XkbAllocGeomPoints(XkbOutlinePtr ol,int nPts) { return _XkbAllocPoints(ol,nPts); } +_X_EXPORT Status XkbAllocGeomKeys(XkbRowPtr row,int nKeys) { return _XkbAllocKeys(row,nKeys); } +_X_EXPORT Status XkbAllocGeometry(XkbDescPtr xkb,XkbGeometrySizesPtr sizes) { @@ -677,6 +706,7 @@ /***====================================================================***/ +_X_EXPORT XkbPropertyPtr XkbAddGeomProperty(XkbGeometryPtr geom,char *name,char *value) { @@ -715,6 +745,7 @@ return prop; } +_X_EXPORT XkbKeyAliasPtr XkbAddGeomKeyAlias(XkbGeometryPtr geom,char *aliasStr,char *realStr) { @@ -742,6 +773,7 @@ return alias; } +_X_EXPORT XkbColorPtr XkbAddGeomColor(XkbGeometryPtr geom,char *spec,unsigned int pixel) { @@ -770,6 +802,7 @@ return color; } +_X_EXPORT XkbOutlinePtr XkbAddGeomOutline(XkbShapePtr shape,int sz_points) { @@ -789,6 +822,7 @@ return outline; } +_X_EXPORT XkbShapePtr XkbAddGeomShape(XkbGeometryPtr geom,Atom name,int sz_outlines) { @@ -816,6 +850,7 @@ return shape; } +_X_EXPORT XkbKeyPtr XkbAddGeomKey(XkbRowPtr row) { @@ -829,6 +864,7 @@ return key; } +_X_EXPORT XkbRowPtr XkbAddGeomRow(XkbSectionPtr section,int sz_keys) { @@ -847,6 +883,7 @@ return row; } +_X_EXPORT XkbSectionPtr XkbAddGeomSection( XkbGeometryPtr geom, Atom name, @@ -887,6 +924,7 @@ return section; } +_X_EXPORT XkbDoodadPtr XkbAddGeomDoodad(XkbGeometryPtr geom,XkbSectionPtr section,Atom name) { @@ -925,6 +963,7 @@ return doodad; } +_X_EXPORT XkbOverlayKeyPtr XkbAddGeomOverlayKey( XkbOverlayPtr overlay, XkbOverlayRowPtr row, @@ -960,6 +999,7 @@ return key; } +_X_EXPORT XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr overlay,int row_under,int sz_keys) { @@ -992,6 +1032,7 @@ return row; } +_X_EXPORT XkbOverlayPtr XkbAddGeomOverlay(XkbSectionPtr section,Atom name,int sz_rows) { Index: libX11/src/xkb/XKBGeom.c =================================================================== --- libX11.orig/src/xkb/XKBGeom.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBGeom.c 2007-05-26 23:56:22.000000000 +0800 @@ -60,6 +60,7 @@ return; } +_X_EXPORT Bool XkbComputeShapeBounds(XkbShapePtr shape) { @@ -82,6 +83,7 @@ return True; } +_X_EXPORT Bool XkbComputeShapeTop(XkbShapePtr shape,XkbBoundsPtr bounds) { @@ -107,6 +109,7 @@ return True; } +_X_EXPORT Bool XkbComputeRowBounds(XkbGeometryPtr geom,XkbSectionPtr section,XkbRowPtr row) { @@ -144,6 +147,7 @@ return True; } +_X_EXPORT Bool XkbComputeSectionBounds(XkbGeometryPtr geom,XkbSectionPtr section) { @@ -200,6 +204,7 @@ /***====================================================================***/ +_X_EXPORT char * XkbFindOverlayForKey(XkbGeometryPtr geom,XkbSectionPtr wanted,char *under) { @@ -638,6 +643,7 @@ return Success; } +_X_EXPORT Status XkbGetGeometry(Display *dpy,XkbDescPtr xkb) { @@ -666,6 +672,7 @@ return status; } +_X_EXPORT Status XkbGetNamedGeometry(Display *dpy,XkbDescPtr xkb,Atom name) { Index: libX11/src/xkb/XKBGetByName.c =================================================================== --- libX11.orig/src/xkb/XKBGetByName.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBGetByName.c 2007-05-26 23:56:22.000000000 +0800 @@ -38,6 +38,7 @@ /***====================================================================***/ +_X_EXPORT XkbDescPtr XkbGetKeyboardByName( Display * dpy, unsigned deviceSpec, @@ -211,6 +212,7 @@ return NULL; } +_X_EXPORT XkbDescPtr XkbGetKeyboard(Display *dpy,unsigned which,unsigned deviceSpec) { Index: libX11/src/xkb/XKBGetMap.c =================================================================== --- libX11.orig/src/xkb/XKBGetMap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBGetMap.c 2007-05-26 23:56:22.000000000 +0800 @@ -526,6 +526,7 @@ return _XkbReadGetMapReply(dpy,&rep,xkb,NULL); } +_X_EXPORT Status XkbGetUpdatedMap(Display *dpy,unsigned which,XkbDescPtr xkb) { @@ -549,6 +550,7 @@ return Success; } +_X_EXPORT XkbDescPtr XkbGetMap(Display *dpy,unsigned which,unsigned deviceSpec) { @@ -572,6 +574,7 @@ return xkb; } +_X_EXPORT Status XkbGetKeyTypes(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb) { @@ -596,6 +599,7 @@ return status; } +_X_EXPORT Status XkbGetKeyActions(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb) { @@ -621,6 +625,7 @@ return status; } +_X_EXPORT Status XkbGetKeySyms(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb) { @@ -672,6 +677,7 @@ return status; } +_X_EXPORT Status XkbGetVirtualMods(Display *dpy,unsigned which,XkbDescPtr xkb) { @@ -728,6 +734,7 @@ return status; } +_X_EXPORT Status XkbGetKeyModifierMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb) { @@ -760,6 +767,7 @@ return status; } +_X_EXPORT Status XkbGetKeyVirtualModMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb) { @@ -793,6 +801,7 @@ return status; } +_X_EXPORT Status XkbGetMapChanges(Display *dpy,XkbDescPtr xkb,XkbMapChangesPtr changes) { Index: libX11/src/xkb/XKBList.c =================================================================== --- libX11.orig/src/xkb/XKBList.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBList.c 2007-05-26 23:56:22.000000000 +0800 @@ -94,6 +94,7 @@ /***====================================================================***/ +_X_EXPORT XkbComponentListPtr XkbListComponents( Display * dpy, unsigned deviceSpec, @@ -228,6 +229,7 @@ return NULL; } +_X_EXPORT void XkbFreeComponentList(XkbComponentListPtr list) { Index: libX11/src/xkb/XKBMAlloc.c =================================================================== --- libX11.orig/src/xkb/XKBMAlloc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBMAlloc.c 2007-05-26 23:56:22.000000000 +0800 @@ -142,6 +142,7 @@ return Success; } +_X_EXPORT Status XkbAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions) { @@ -236,6 +237,7 @@ /***====================================================================***/ +_X_EXPORT Status XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into) { @@ -277,6 +279,7 @@ return Success; } +_X_EXPORT Status XkbCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types) { @@ -291,6 +294,7 @@ return Success; } +_X_EXPORT XkbKeyTypePtr XkbAddKeyType( XkbDescPtr xkb, Atom name, @@ -368,6 +372,7 @@ return type; } +_X_EXPORT Status XkbResizeKeyType( XkbDescPtr xkb, int type_ndx, @@ -566,6 +571,7 @@ return Success; } +_X_EXPORT KeySym * XkbResizeKeySyms(XkbDescPtr xkb,int key,int needed) { @@ -646,6 +652,7 @@ return old_flags; } +_X_EXPORT Status XkbChangeKeycodeRange( XkbDescPtr xkb, int minKC, @@ -846,6 +853,7 @@ return Success; } +_X_EXPORT XkbAction * XkbResizeKeyActions(XkbDescPtr xkb,int key,int needed) { @@ -896,6 +904,7 @@ return &xkb->server->acts[xkb->server->key_acts[key]]; } +_X_EXPORT void XkbFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap) { @@ -954,6 +963,7 @@ return; } +_X_EXPORT void XkbFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap) { Index: libX11/src/xkb/XKBMisc.c =================================================================== --- libX11.orig/src/xkb/XKBMisc.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xkb/XKBMisc.c 2007-05-26 23:56:22.000000000 +0800 @@ -107,6 +107,7 @@ } }; +_X_EXPORT Status XkbInitCanonicalKeyTypes(XkbDescPtr xkb,unsigned which,int keypadVMod) { @@ -157,6 +158,7 @@ #define CORE_SYM(i) (i #include "XKBlibint.h" +_X_EXPORT Status XkbGetIndicatorState(Display *dpy,unsigned deviceSpec,unsigned *pStateRtrn) { @@ -111,6 +112,7 @@ return Success; } +_X_EXPORT Bool XkbGetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb) { @@ -151,6 +153,7 @@ return status; } +_X_EXPORT Bool XkbSetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb) { @@ -196,6 +199,7 @@ return True; } +_X_EXPORT Bool XkbGetNamedDeviceIndicator( Display * dpy, unsigned device, @@ -251,6 +255,7 @@ return True; } +_X_EXPORT Bool XkbGetNamedIndicator( Display * dpy, Atom name, @@ -265,6 +270,7 @@ pMapRtrn,pRealRtrn); } +_X_EXPORT Bool XkbSetNamedDeviceIndicator( Display * dpy, unsigned device, @@ -322,6 +328,7 @@ return True; } +_X_EXPORT Bool XkbSetNamedIndicator( Display * dpy, Atom name, Index: libX11/src/xlibi18n/ICWrap.c =================================================================== --- libX11.orig/src/xlibi18n/ICWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/ICWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -150,6 +150,7 @@ args->name = (char*)NULL; } +_X_EXPORT /*ARGSUSED*/ XVaNestedList XVaCreateNestedList(int dummy, ...) @@ -169,6 +170,7 @@ return (XVaNestedList)args; } +_X_EXPORT char * XSetIMValues(XIM im, ...) { @@ -196,6 +198,7 @@ return ret; } +_X_EXPORT char * XGetIMValues(XIM im, ...) { @@ -228,6 +231,7 @@ * and return a pointer to the input context. */ +_X_EXPORT XIC XCreateIC(XIM im, ...) { @@ -262,6 +266,7 @@ /* * Free the input context. */ +_X_EXPORT void XDestroyIC(ic) XIC ic; @@ -281,6 +286,7 @@ Xfree ((char *) ic); } +_X_EXPORT char * XGetICValues(XIC ic, ...) { @@ -311,6 +317,7 @@ return ret; } +_X_EXPORT char * XSetICValues(XIC ic, ...) { @@ -345,6 +352,7 @@ * Require the input manager to focus the focus window attached to the ic * argument. */ +_X_EXPORT void XSetICFocus(ic) XIC ic; @@ -357,6 +365,7 @@ * Require the input manager to unfocus the focus window attached to the ic * argument. */ +_X_EXPORT void XUnsetICFocus(ic) XIC ic; @@ -368,6 +377,7 @@ /* * Return the XIM associated with the input context. */ +_X_EXPORT XIM XIMOfIC(ic) XIC ic; @@ -375,6 +385,7 @@ return ic->core.im; } +_X_EXPORT char * XmbResetIC(ic) XIC ic; @@ -384,6 +395,7 @@ return (char *)NULL; } +_X_EXPORT wchar_t * XwcResetIC(ic) XIC ic; @@ -393,6 +405,7 @@ return (wchar_t *)NULL; } +_X_EXPORT char * Xutf8ResetIC(ic) XIC ic; @@ -406,6 +419,7 @@ return (char *)NULL; } +_X_EXPORT int XmbLookupString(ic, ev, buffer, nbytes, keysym, status) XIC ic; @@ -421,6 +435,7 @@ return XLookupNone; } +_X_EXPORT int XwcLookupString(ic, ev, buffer, nchars, keysym, status) XIC ic; @@ -436,6 +451,7 @@ return XLookupNone; } +_X_EXPORT int Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status) XIC ic; Index: libX11/src/xlibi18n/IMWrap.c =================================================================== --- libX11.orig/src/xlibi18n/IMWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/IMWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -121,6 +121,7 @@ * a XIM object and return a pointer the newly created XIM back to the caller. */ +_X_EXPORT XIM XOpenIM( display, rdb, res_name, res_class ) Display *display; @@ -138,6 +139,7 @@ /* * Close the connection to the input manager, and free the XIM structure */ +_X_EXPORT Status XCloseIM(im) XIM im; @@ -157,6 +159,7 @@ /* * Return the Display associated with the input method. */ +_X_EXPORT Display * XDisplayOfIM(im) XIM im; @@ -167,6 +170,7 @@ /* * Return the Locale associated with the input method. */ +_X_EXPORT char * XLocaleOfIM(im) XIM im; @@ -178,6 +182,7 @@ * Register to a input method instantiation callback to prepare the * on-demand input method instantiation. */ +_X_EXPORT Bool XRegisterIMInstantiateCallback( Display *display, @@ -199,6 +204,7 @@ /* * Unregister to a input method instantiation callback. */ +_X_EXPORT Bool XUnregisterIMInstantiateCallback( Display *display, Index: libX11/src/xlibi18n/lcStd.c =================================================================== --- libX11.orig/src/xlibi18n/lcStd.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/lcStd.c 2007-05-26 23:56:22.000000000 +0800 @@ -197,7 +197,7 @@ return ret; } - +_X_EXPORT int _Xmbtowc( wchar_t *wstr, @@ -213,6 +213,7 @@ return _Xlcmbtowc((XLCd) NULL, wstr, str, len); } +_X_EXPORT int _Xmblen( #ifdef ISC @@ -227,6 +228,7 @@ return _Xmbtowc((wchar_t *) NULL, str, len); } +_X_EXPORT int _Xwctomb( char *str, Index: libX11/src/xlibi18n/lcWrap.c =================================================================== --- libX11.orig/src/xlibi18n/lcWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/lcWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -73,6 +73,7 @@ LockInfoPtr _Xi18n_lock; #endif +_X_EXPORT char * XSetLocaleModifiers( const char *modifiers) @@ -95,6 +96,7 @@ return (char *)modifiers; } +_X_EXPORT Bool XSupportsLocale() { @@ -376,6 +378,7 @@ return (*lcd->methods->init_parse_info)(lcd, state); } +_X_EXPORT int XmbTextPropertyToTextList( Display *dpy, @@ -392,6 +395,7 @@ count_ret); } +_X_EXPORT int XwcTextPropertyToTextList( Display *dpy, @@ -408,6 +412,7 @@ count_ret); } +_X_EXPORT int Xutf8TextPropertyToTextList( Display *dpy, @@ -424,6 +429,7 @@ list_ret, count_ret); } +_X_EXPORT int XmbTextListToTextProperty( Display *dpy, @@ -441,6 +447,7 @@ text_prop); } +_X_EXPORT int XwcTextListToTextProperty( Display *dpy, @@ -458,6 +465,7 @@ text_prop); } +_X_EXPORT int Xutf8TextListToTextProperty( Display *dpy, @@ -475,6 +483,7 @@ style, text_prop); } +_X_EXPORT void XwcFreeStringList( wchar_t **list) @@ -487,6 +496,7 @@ (*lcd->methods->wc_free_string_list)(lcd, list); } +_X_EXPORT const char * XDefaultString() { Index: libX11/src/xlibi18n/mbWMProps.c =================================================================== --- libX11.orig/src/xlibi18n/mbWMProps.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/mbWMProps.c 2007-05-26 23:56:22.000000000 +0800 @@ -36,6 +36,7 @@ #include #include +_X_EXPORT void XmbSetWMProperties ( Display *dpy, Index: libX11/src/xlibi18n/mbWrap.c =================================================================== --- libX11.orig/src/xlibi18n/mbWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/mbWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ #include "Xlibint.h" #include "Xlcint.h" +_X_EXPORT void XmbDrawText( Display *dpy, @@ -91,6 +92,7 @@ } } +_X_EXPORT void XmbDrawString( Display *dpy, @@ -106,7 +108,7 @@ (char *)text, text_len); } - +_X_EXPORT void XmbDrawImageString( Display *dpy, @@ -122,6 +124,7 @@ (char *)text, text_len); } +_X_EXPORT int XmbTextEscapement( XFontSet font_set, @@ -132,6 +135,7 @@ (char *)text, text_len); } +_X_EXPORT int XmbTextExtents( XFontSet font_set, @@ -146,6 +150,7 @@ overall_logical_extents); } +_X_EXPORT Status XmbTextPerCharExtents( XFontSet font_set, Index: libX11/src/xlibi18n/utf8WMProps.c =================================================================== --- libX11.orig/src/xlibi18n/utf8WMProps.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/utf8WMProps.c 2007-05-26 23:56:22.000000000 +0800 @@ -58,6 +58,7 @@ #include #include +_X_EXPORT void Xutf8SetWMProperties ( Display *dpy, Index: libX11/src/xlibi18n/utf8Wrap.c =================================================================== --- libX11.orig/src/xlibi18n/utf8Wrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/utf8Wrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -80,6 +80,7 @@ #include "Xlibint.h" #include "Xlcint.h" +_X_EXPORT void Xutf8DrawText( Display *dpy, @@ -113,6 +114,7 @@ } } +_X_EXPORT void Xutf8DrawString( Display *dpy, @@ -128,7 +130,7 @@ (char *)text, text_len); } - +_X_EXPORT void Xutf8DrawImageString( Display *dpy, @@ -144,6 +146,7 @@ (char *)text, text_len); } +_X_EXPORT int Xutf8TextEscapement( XFontSet font_set, @@ -154,6 +157,7 @@ (char *)text, text_len); } +_X_EXPORT int Xutf8TextExtents( XFontSet font_set, @@ -168,6 +172,7 @@ overall_logical_extents); } +_X_EXPORT Status Xutf8TextPerCharExtents( XFontSet font_set, Index: libX11/src/xlibi18n/wcWrap.c =================================================================== --- libX11.orig/src/xlibi18n/wcWrap.c 2007-05-26 23:55:44.000000000 +0800 +++ libX11/src/xlibi18n/wcWrap.c 2007-05-26 23:56:22.000000000 +0800 @@ -59,6 +59,7 @@ #include "Xlibint.h" #include "Xlcint.h" +_X_EXPORT void XwcDrawText( Display *dpy, @@ -92,6 +93,7 @@ } } +_X_EXPORT void XwcDrawString( Display *dpy, @@ -107,6 +109,7 @@ text, text_len); } +_X_EXPORT void XwcDrawImageString( Display *dpy, @@ -122,6 +125,7 @@ text, text_len); } +_X_EXPORT int XwcTextEscapement( XFontSet font_set, @@ -131,6 +135,7 @@ return (*font_set->methods->wc_escapement) (font_set, text, text_len); } +_X_EXPORT int XwcTextExtents( XFontSet font_set, @@ -144,6 +149,7 @@ overall_logical_extents); } +_X_EXPORT Status XwcTextPerCharExtents( XFontSet font_set,