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 #inclu