fullfill x11/xxx_2w.h

imutil_2w:add undefined apis.
xcms_2w:add undefined apis.
xkblib_2w:add undefined apis.
xlibint_2w:add undefined apis.
xlocale_2w:add undefined apis.
xutil_2w:add undefined apis.

Add apis declared in ImUtil.h,Xcms_2w.h,XKBlib.h,Xlibint.h,Xlcale.h,Xutil.h
 into x11_2w.
And define each api with RETURN_XXXX function.

diff --git a/src/x11/ImUtil.h b/src/x11/ImUtil.h
index ffdba1a..7d78904 100755 (executable)
--- a/src/x11/ImUtil.h
+++ b/src/x11/ImUtil.h
@@ -27,4 +27,5 @@ extern void
 _XInitImageFuncPtrs(
     register XImage *image);
 
+#include "imutil_2w.h"
 #endif /* _X11_IMUTIL_H_ */

diff --git a/src/x11/XKBlib.h b/src/x11/XKBlib.h
index 8f6c72c..4451128 100755 (executable)
--- a/src/x11/XKBlib.h
+++ b/src/x11/XKBlib.h
@@ -1144,6 +1144,7 @@ extern void XkbUpdateKeyTypeVirtualMods(
        XkbChangesPtr           /* changes */
 );
 
+#include "xkblib_2w.h"
 _XFUNCPROTOEND
 
 #endif /* _X11_XKBLIB_H_ */

diff --git a/src/x11/Xcms.h b/src/x11/Xcms.h
index 8151fd1..91bdd3a 100755 (executable)
--- a/src/x11/Xcms.h
+++ b/src/x11/Xcms.h
@@ -798,6 +798,7 @@ extern Visual *XcmsVisualOfCCC (
     XcmsCCC            /* ccc */
 );
 
+#include "xcms_2w.h"
 _XFUNCPROTOEND
 
 #endif /* _X11_XCMS_H_ */

diff --git a/src/x11/Xlibint.h b/src/x11/Xlibint.h
index 80edeec..b3adf9d 100755 (executable)
--- a/src/x11/Xlibint.h
+++ b/src/x11/Xlibint.h
@@ -1364,6 +1364,7 @@ extern void xlocaledir(
     int buf_len
 );
 
+#include "xlibint_2w.h"
 _XFUNCPROTOEND
 
 #endif /* _X11_XLIBINT_H_ */

diff --git a/src/x11/Xlocale.h b/src/x11/Xlocale.h
index 98946e5..2adb0ae 100755 (executable)
--- a/src/x11/Xlocale.h
+++ b/src/x11/Xlocale.h
@@ -48,6 +48,7 @@ extern char *_Xsetlocale(
     int /* category */,
     _Xconst char* /* name */
 );
+#include "xlocale_2w.h"
 _XFUNCPROTOEND
 
 #define setlocale _Xsetlocale

diff --git a/src/x11/Xutil.h b/src/x11/Xutil.h
index 8cab50e..be9882b 100755 (executable)
--- a/src/x11/Xutil.h
+++ b/src/x11/Xutil.h
@@ -821,6 +821,7 @@ extern int XXorRegion(
     Region             /* dr_return */
 );
 
+#include "xutil_2w.h"
 _XFUNCPROTOEND
 
 #endif /* _X11_XUTIL_H_ */

diff --git a/src/x11/imutil_2w.h b/src/x11/imutil_2w.h
index e69de29..d6752a9 100755 (executable)
--- a/src/x11/imutil_2w.h
+++ b/src/x11/imutil_2w.h
@@ -0,0 +1,33 @@
+#ifndef _X11_IMUTIL_2W_H
+#define _X11_IMUTIL_2W_H
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+#include "x2w_general.h"
+
+#define _XGetScanlinePad(a,b)             \
+        RETURN_INT("_XGetScanlinePad")
+
+#define _XGetBitsPerPixel(a,b)           \
+        RETURN_INT("_XGetBitsPerPixel")
+
+#define _XSetImage(a,b,c,d)               \
+        RETURN_INT("_XSetImage")
+
+#define _XReverse_Bytes(a,b)              \
+        RETURN_INT("_XReverse_Bytes")
+
+#define _XInitImageFuncPtrs(a)            \
+        RETURN_VOID("_XInitImageFuncPtrs")
+
+
+
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

diff --git a/src/x11/xcms_2w.h b/src/x11/xcms_2w.h
index e69de29..b1dd8d3 100755 (executable)
--- a/src/x11/xcms_2w.h
+++ b/src/x11/xcms_2w.h
@@ -0,0 +1,222 @@
+#ifndef _XCMS_2W_H
+#define _XCMS_2W_H
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "x2w_general.h"
+
+#define XcmsAddColorSpace(a)         \
+       RETURN_INT("XcmsAddColorSpace")
+
+#define XcmsAddFunctionSet(a)         \
+       RETURN_INT("XcmsAddFunctionSet")
+
+#define XcmsAllocColor(a,b,c,d)         \
+       RETURN_INT("XcmsAllocColor")
+
+#define XcmsAllocNamedColor(a,b,c,d,e,f)         \
+       RETURN_INT("XcmsAllocNamedColor")
+
+#define XcmsCCCOfColormap(a,b)         \
+       RETURN_INT("XcmsCCCOfColormap")
+
+#define XcmsCIELabClipab(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELabClipab")
+
+#define XcmsCIELabClipL(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELabClipL")
+
+#define XcmsCIELabClipLab(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELabClipLab")
+
+#define XcmsCIELabQueryMaxC(a,b,c,d)         \
+       RETURN_INT("XcmsCIELabQueryMaxC")
+
+#define XcmsCIELabQueryMaxL(a,b,c,d)         \
+       RETURN_INT("XcmsCIELabQueryMaxL")
+
+#define XcmsCIELabQueryMaxLC(a,b,c)         \
+       RETURN_INT("XcmsCIELabQueryMaxLC")
+
+#define XcmsCIELabQueryMinL(a,b,c,d)         \
+       RETURN_INT("XcmsCIELabQueryMinL")
+
+#define XcmsCIELabToCIEXYZ(a,b,c,d)         \
+       RETURN_INT("XcmsCIELabToCIEXYZ")
+
+#define XcmsCIELabWhiteShiftColors(a,b,c,d,e,f,g)         \
+       RETURN_INT("XcmsCIELabWhiteShiftColors")
+
+#define XcmsCIELuvClipL(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELuvClipL")
+
+#define XcmsCIELuvClipLuv(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELuvClipLuv")
+
+#define XcmsCIELuvClipuv(a,b,c,d,e)         \
+       RETURN_INT("XcmsCIELuvClipuv")
+
+#define XcmsCIELuvQueryMaxC(a,b,c,d)         \
+       RETURN_INT("XcmsCIELuvQueryMaxC")
+
+#define XcmsCIELuvQueryMaxL(a,b,c,d)         \
+       RETURN_INT("XcmsCIELuvQueryMaxL")
+
+#define XcmsCIELuvQueryMaxLC(a,b,c)         \
+       RETURN_INT("XcmsCIELuvQueryMaxLC")
+
+#define XcmsCIELuvQueryMinL(a,b,c,d)         \
+       RETURN_INT("XcmsCIELuvQueryMinL")
+
+#define XcmsCIELuvToCIEuvY(a,b,c,d)         \
+       RETURN_INT("XcmsCIELuvToCIEuvY")
+
+#define XcmsCIELuvWhiteShiftColors(a,b,c,d,e,f,g)         \
+       RETURN_INT("XcmsCIELuvWhiteShiftColors")
+
+#define XcmsCIEXYZToCIELab(a,b,c,d)         \
+       RETURN_INT("XcmsCIEXYZToCIELab")
+
+#define XcmsCIEXYZToCIEuvY(a,b,c,d)         \
+       RETURN_INT("XcmsCIEXYZToCIEuvY")
+
+#define XcmsCIEXYZToCIExyY(a,b,c,d)         \
+       RETURN_INT("XcmsCIEXYZToCIExyY")
+
+#define XcmsCIEXYZToRGBi(a,b,c,d)         \
+       RETURN_INT("XcmsCIEXYZToRGBi")
+
+#define XcmsCIEuvYToCIELuv(a,b,c,d)         \
+       RETURN_INT("XcmsCIEuvYToCIELuv")
+
+#define XcmsCIEuvYToCIEXYZ(a,b,c,d)         \
+       RETURN_INT("XcmsCIEuvYToCIEXYZ")
+
+#define XcmsCIEuvYToTekHVC(a,b,c,d)         \
+       RETURN_INT("XcmsCIEuvYToTekHVC")
+
+#define XcmsCIExyYToCIEXYZ(a,b,c,d)         \
+       RETURN_INT("XcmsCIExyYToCIEXYZ")
+
+#define XcmsClientWhitePointOfCCC(a)         \
+       RETURN_POINTER("XcmsClientWhitePointOfCCC")
+
+#define XcmsConvertColors(a,b,c,d,e)         \
+       RETURN_INT("XcmsConvertColors")
+
+#define XcmsCreateCCC(a,b,c,d,e,f,g,h)         \
+       RETURN_INT("XcmsCreateCCC")
+
+#define XcmsDefaultCCC(a,b)         \
+       RETURN_INT("XcmsDefaultCCC")
+
+#define XcmsDisplayOfCCC(a)         \
+       RETURN_POINTER("XcmsDisplayOfCCC")
+
+#define XcmsFormatOfPrefix(a)         \
+       RETURN_INT("XcmsFormatOfPrefix")
+
+#define XcmsFreeCCC(a)         \
+       RETURN_VOID("XcmsFreeCCC")
+
+#define XcmsLookupColor(a,b,c,d,e,f)         \
+       RETURN_INT("XcmsLookupColor")
+
+#define XcmsPrefixOfFormat(a)         \
+       RETURN_POINTER("XcmsPrefixOfFormat")
+
+#define XcmsQueryBlack(a,b,c)         \
+       RETURN_INT("XcmsQueryBlack")
+
+#define XcmsQueryBlue(a,b,c)         \
+       RETURN_INT("XcmsQueryBlue")
+
+#define XcmsQueryColor(a,b,c,d)         \
+       RETURN_INT("XcmsQueryColor")
+
+#define XcmsQueryColors(a,b,c,d,e)         \
+       RETURN_INT("XcmsQueryColors")
+
+#define XcmsQueryGreen(a,b,c)         \
+       RETURN_INT("XcmsQueryGreen")
+
+#define XcmsQueryRed(a,b,c)         \
+       RETURN_INT("XcmsQueryRed")
+
+#define XcmsQueryWhite(a,b,c)         \
+       RETURN_INT("XcmsQueryWhite")
+
+#define XcmsRGBiToCIEXYZ(a,b,c,d)         \
+       RETURN_INT("XcmsRGBiToCIEXYZ")
+
+#define XcmsRGBiToRGB(a,b,c,d)         \
+       RETURN_INT("XcmsRGBiToRGB")
+
+#define XcmsRGBToRGBi(a,b,c,d)         \
+       RETURN_INT("XcmsRGBToRGBi")
+
+#define XcmsScreenNumberOfCCC(a)         \
+       RETURN_INT("XcmsScreenNumberOfCCC")
+
+#define XcmsScreenWhitePointOfCCC(a)         \
+       RETURN_POINTER("XcmsScreenWhitePointOfCCC")
+
+#define XcmsSetCCCOfColormap(a,b,c)         \
+       RETURN_INT("XcmsSetCCCOfColormap")
+
+#define XcmsSetCompressionProc(a,b,c)         \
+       RETURN_INT("XcmsSetCompressionProc")
+
+#define XcmsSetWhiteAdjustProc(a,b,c)         \
+       RETURN_INT("XcmsSetWhiteAdjustProc")
+
+#define XcmsSetWhitePoint(a,b)         \
+       RETURN_INT("XcmsSetWhitePoint")
+
+#define XcmsStoreColor(a,b,c)         \
+       RETURN_INT("XcmsStoreColor")
+
+#define XcmsStoreColors(a,b,c,d,e)         \
+       RETURN_INT("XcmsStoreColors")
+
+#define XcmsTekHVCClipC(a,b,c,d,e)         \
+       RETURN_INT("XcmsTekHVCClipC")
+
+#define XcmsTekHVCClipV(a,b,c,d,e)         \
+       RETURN_INT("XcmsTekHVCClipV")
+
+#define XcmsTekHVCClipVC(a,b,c,d,e)         \
+       RETURN_INT("XcmsTekHVCClipVC")
+
+#define XcmsTekHVCQueryMaxC(a,b,c,d)         \
+       RETURN_INT("XcmsTekHVCQueryMaxC")
+
+#define XcmsTekHVCQueryMaxV(a,b,c,d)         \
+       RETURN_INT("XcmsTekHVCQueryMaxV")
+
+#define XcmsTekHVCQueryMaxVC(a,b,c)         \
+       RETURN_INT("XcmsTekHVCQueryMaxVC")
+
+#define XcmsTekHVCQueryMaxVSamples(a,b,c,d)         \
+       RETURN_INT("XcmsTekHVCQueryMaxVSamples")
+
+#define XcmsTekHVCQueryMinV(a,b,c,d)         \
+       RETURN_INT("XcmsTekHVCQueryMinV")
+
+#define XcmsTekHVCToCIEuvY(a,b,c,d)         \
+       RETURN_INT("XcmsTekHVCToCIEuvY")
+
+#define XcmsTekHVCWhiteShiftColors(a,b,c,d,e,f,g)         \
+       RETURN_INT("XcmsTekHVCWhiteShiftColors")
+
+#define XcmsVisualOfCCC(a)         \
+       RETURN_POINTER("XcmsVisualOfCCC")
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

diff --git a/src/x11/xkblib_2w.h b/src/x11/xkblib_2w.h
index e69de29..79a3128 100755 (executable)
--- a/src/x11/xkblib_2w.h
+++ b/src/x11/xkblib_2w.h
@@ -0,0 +1,394 @@
+#ifndef _XKBLIB_2W_H_
+#define _XKBLIB_2W_H_
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "x2w_general.h"
+
+#define XkbIgnoreExtension(a)         \
+       RETURN_INT("XkbIgnoreExtension")
+
+#define XkbOpenDisplay(a,b,c,d,e,f)         \
+       RETURN_POINTER("XkbOpenDisplay")
+
+#define XkbQueryExtension(a,b,c,d,e,f)         \
+       RETURN_INT("XkbQueryExtension")
+
+#define XkbUseExtension(a,b,c)         \
+       RETURN_INT("XkbUseExtension")
+
+#define XkbLibraryVersion(a,b)         \
+       RETURN_INT("XkbLibraryVersion")
+
+#define XkbSetXlibControls(a,b,c)         \
+       RETURN_INT("XkbSetXlibControls")
+
+#define XkbGetXlibControls(a)         \
+       RETURN_INT("XkbGetXlibControls")
+
+#define XkbXlibControlsImplemented(a)         \
+       RETURN_INT("XkbXlibControlsImplemented")
+
+#define XkbSetAtomFuncs(a,b)         \
+       RETURN_VOID("XkbSetAtomFuncs")
+
+#define XkbKeycodeToKeysym(a,b,c,d,e)         \
+       RETURN_INT("XkbKeycodeToKeysym")
+
+#define XkbKeysymToModifiers(a,b)         \
+       RETURN_INT("XkbKeysymToModifiers")
+
+#define XkbLookupKeySym(a,b,c,d,e)         \
+       RETURN_INT("XkbLookupKeySym")
+
+#define XkbLookupKeyBinding(a,b,c,d,e,f)         \
+       RETURN_INT("XkbLookupKeyBinding")
+
+#define XkbTranslateKeyCode(a,b,c,d,e)         \
+       RETURN_INT("XkbTranslateKeyCode")
+
+#define XkbTranslateKeySym(a,b,c,d,e,f)         \
+       RETURN_INT("XkbTranslateKeySym")
+
+#define XkbSetAutoRepeatRate(a,b,c,d)         \
+       RETURN_INT("XkbSetAutoRepeatRate")
+
+#define XkbGetAutoRepeatRate(a,b,c,d)         \
+       RETURN_INT("XkbGetAutoRepeatRate")
+
+#define XkbChangeEnabledControls(a,b,c,d)         \
+       RETURN_INT("XkbChangeEnabledControls")
+
+#define XkbDeviceBell(a,b,c,d,e,f,g)         \
+       RETURN_INT("XkbDeviceBell")
+
+#define XkbForceDeviceBell(a,b,c,d,e)         \
+       RETURN_INT("XkbForceDeviceBell")
+
+#define XkbDeviceBellEvent(a,b,c,d,e,f,g)         \
+       RETURN_INT("XkbDeviceBellEvent")
+
+#define XkbBell(a,b,c,d)         \
+       RETURN_INT("XkbBell")
+
+#define XkbForceBell(a,b)         \
+       RETURN_INT("XkbForceBell")
+
+#define XkbBellEvent(a,b,c,d)         \
+       RETURN_INT("XkbBellEvent")
+
+#define XkbSelectEvents(a,b,c,d)         \
+       RETURN_INT("XkbSelectEvents")
+
+#define XkbSelectEventDetails(a,b,c,d,e)         \
+       RETURN_INT("XkbSelectEventDetails")
+
+#define XkbNoteMapChanges(a,b,c)         \
+       RETURN_VOID("XkbNoteMapChanges")
+
+#define XkbNoteNameChanges(a,b,c)         \
+       RETURN_VOID("XkbNoteNameChanges")
+
+#define XkbGetIndicatorState(a,b,c)         \
+       RETURN_INT("XkbGetIndicatorState")
+
+#define XkbGetDeviceIndicatorState(a,b,c,d,e)         \
+       RETURN_INT("XkbGetDeviceIndicatorState")
+
+#define XkbGetIndicatorMap(a,b,c)         \
+       RETURN_INT("XkbGetIndicatorMap")
+
+#define XkbSetIndicatorMap(a,b,c)         \
+       RETURN_INT("XkbSetIndicatorMap")
+
+#define XkbNoteIndicatorMapChanges(a,b,c)         \
+       RETURN_INT("XkbNoteIndicatorMapChanges")
+
+#define XkbNoteIndicatorStateChanges(a,b,c)         \
+        RETURN_INT("XkbNoteIndicatorStateChanges")
+
+#define XkbGetIndicatorMapChanges(a,b,c)         \
+        RETURN_INT("XkbGetIndicatorMapChanges")
+
+#define XkbChangeIndicatorMaps(a,b,c)         \
+        RETURN_INT("XkbChangeIndicatorMaps")
+
+#define XkbGetNamedIndicator(a,b,c,d,e,f)         \
+        RETURN_INT("XkbGetNamedIndicator")
+
+
+
+#define XkbGetNamedDeviceIndicator(a,b,c,d,e,f,g,h,i)         \
+       RETURN_INT("XkbGetNamedDeviceIndicator")
+
+#define XkbSetNamedIndicator(a,b,c,d,e,f)         \
+       RETURN_INT("XkbSetNamedIndicator")
+
+#define XkbSetNamedDeviceIndicator(a,b,c,d,e,f,g,h,i)         \
+       RETURN_INT("XkbSetNamedDeviceIndicator")
+
+#define XkbLockModifiers(a,b,c,d)         \
+       RETURN_INT("XkbLockModifiers")
+
+#define XkbLatchModifiers(a,b,c,d)         \
+       RETURN_INT("XkbLatchModifiers")
+
+#define XkbLockGroup(a,b,c)         \
+       RETURN_INT("XkbLockGroup")
+
+#define XkbLatchGroup(a,b,c)         \
+       RETURN_INT("XkbLatchGroup")
+
+#define XkbSetServerInternalMods(a,b,c,d,e,f)         \
+       RETURN_INT("XkbSetServerInternalMods")
+
+#define XkbSetIgnoreLockMods(a,b,c,d,e,f)         \
+       RETURN_INT("XkbSetIgnoreLockMods")
+
+#define XkbVirtualModsToReal(a,b,c)         \
+       RETURN_INT("XkbVirtualModsToReal")
+
+#define XkbComputeEffectiveMap(a,b,c)         \
+       RETURN_INT("XkbComputeEffectiveMap")
+
+#define XkbInitCanonicalKeyTypes(a,b,c)         \
+       RETURN_INT("XkbInitCanonicalKeyTypes")
+
+#define XkbAllocKeyboard(a)         \
+       RETURN_INT("XkbAllocKeyboard")
+
+#define XkbFreeKeyboard(a,b,c)         \
+       RETURN_VOID("XkbFreeKeyboard")
+
+#define XkbAllocClientMap(a,b,c)         \
+       RETURN_INT("XkbAllocClientMap")
+
+#define XkbAllocServerMap(a,b,c)         \
+       RETURN_INT("XkbAllocServerMap")
+
+#define XkbFreeClientMap(a,b,c)         \
+       RETURN_VOID("XkbFreeClientMap")
+
+#define XkbFreeServerMap(a,b,c)         \
+       RETURN_VOID("XkbFreeServerMap")
+
+#define XkbAddKeyType(a,b,c,d,e)         \
+       RETURN_INT("XkbAddKeyType")
+
+#define XkbAllocIndicatorMaps(a)         \
+       RETURN_INT("XkbAllocIndicatorMaps")
+
+#define XkbFreeIndicatorMaps(a)         \
+       RETURN_VOID("XkbFreeIndicatorMaps")
+
+#define XkbGetMap(a,b,c)         \
+       RETURN_INT("XkbGetMap")
+
+#define XkbGetUpdatedMap(a,b,c)         \
+       RETURN_INT("XkbGetUpdatedMap")
+
+#define XkbGetMapChanges(a,b,c)         \
+       RETURN_INT("XkbGetMapChanges")
+
+#define XkbRefreshKeyboardMapping(a)         \
+       RETURN_INT("XkbRefreshKeyboardMapping")
+
+#define XkbGetKeyTypes(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyTypes")
+
+#define XkbGetKeySyms(a,b,c,d)         \
+       RETURN_INT("XkbGetKeySyms")
+
+#define XkbGetKeyActions(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyActions")
+
+#define XkbGetKeyBehaviors(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyBehaviors")
+
+#define XkbGetVirtualMods(a,b,c)         \
+       RETURN_INT("XkbGetVirtualMods")
+
+#define XkbGetKeyExplicitComponents(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyExplicitComponents")
+
+#define XkbGetKeyModifierMap(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyModifierMap")
+
+#define XkbGetKeyVirtualModMap(a,b,c,d)         \
+       RETURN_INT("XkbGetKeyVirtualModMap")
+
+#define XkbAllocControls(a,b)         \
+       RETURN_INT("XkbAllocControls")
+
+#define XkbFreeControls(a,b,c)         \
+       RETURN_VOID("XkbFreeControls")
+
+#define XkbGetControls(a,b,c)         \
+       RETURN_INT("XkbGetControls")
+
+#define XkbSetControls(a,b,c)         \
+       RETURN_INT("XkbSetControls")
+
+#define XkbNoteControlsChanges(a,b,c)         \
+       RETURN_VOID("XkbNoteControlsChanges")
+
+#define XkbGetControlsChanges(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q)         \
+       RETURN_INT("XkbGetControlsChanges")
+
+#define XkbFreeCompatMap(a,b,c)         \
+       RETURN_VOID("XkbFreeCompatMap")
+
+#define XkbGetCompatMap(a,b,c)         \
+       RETURN_INT("XkbGetCompatMap")
+
+#define XkbSetCompatMap(a,b,c,d)         \
+       RETURN_INT("XkbSetCompatMap")
+
+#define XkbAddSymInterpret(a,b,c,d)         \
+       RETURN_INT("XkbAddSymInterpret")
+
+#define XkbAllocNames(a,b,c,d)         \
+       RETURN_INT("XkbAllocNames")
+
+#define XkbGetNames(a,b,c)         \
+       RETURN_INT("XkbGetNames")
+
+#define XkbSetNames(a,b,c,d,e)         \
+       RETURN_INT("XkbSetNames")
+
+#define XkbChangeNames(a,b,c)         \
+       RETURN_INT("XkbChangeNames")
+
+#define XkbFreeNames(a,b,c)         \
+       RETURN_VOID("XkbFreeNames")
+
+#define XkbGetState(a,b,c)         \
+       RETURN_INT("XkbGetState")
+
+#define XkbSetMap(a,b,c)         \
+       RETURN_INT("XkbSetMap")
+
+#define XkbChangeMap(a,b,c)         \
+       RETURN_INT("XkbChangeMap")
+
+#define XkbSetDetectableAutoRepeat(a,b,c)         \
+       RETURN_INT("XkbSetDetectableAutoRepeat")
+
+#define XkbGetDetectableAutoRepeat(a,b)         \
+       RETURN_INT("XkbGetDetectableAutoRepeat")
+
+#define XkbSetAutoResetControls(a,b,c,d)         \
+       RETURN_INT("XkbSetAutoResetControls")
+
+#define XkbGetAutoResetControls(a,b,c)         \
+       RETURN_INT("XkbGetAutoResetControls")
+
+#define XkbSetPerClientControls(a,b,c)         \
+       RETURN_INT("XkbSetPerClientControls")
+
+#define XkbGetPerClientControls(a,b)         \
+       RETURN_INT("XkbGetPerClientControls")
+
+#define XkbCopyKeyType(a,b)         \
+       RETURN_INT("XkbCopyKeyType")
+
+#define XkbCopyKeyTypes(a,b,c)         \
+       RETURN_INT("XkbCopyKeyTypes")
+
+#define XkbResizeKeyType(a,b,c,d,e)         \
+       RETURN_INT("XkbResizeKeyType")
+
+#define XkbResizeKeySyms(a,b,c)         \
+       RETURN_POINTER("XkbResizeKeySyms")
+
+#define XkbResizeKeyActions(a,b,c)         \
+       RETURN_POINTER("XkbResizeKeyActions")
+
+#define XkbChangeTypesOfKey(a,b,c,d,e,f)         \
+       RETURN_INT("XkbChangeTypesOfKey")
+
+#define XkbChangeKeycodeRange(a,b,c,d)         \
+       RETURN_INT("XkbChangeKeycodeRange")
+
+#define XkbListComponents(a,b,c,d)         \
+       RETURN_INT("XkbListComponents")
+
+#define XkbFreeComponentList(a)         \
+       RETURN_VOID("XkbFreeComponentList")
+
+#define XkbGetKeyboard(a,b,c)         \
+       RETURN_INT("XkbGetKeyboard")
+
+#define XkbGetKeyboardByName(a,b,c,d,e,f)         \
+       RETURN_INT("XkbGetKeyboardByName")
+
+#define XkbKeyTypesForCoreSymbols(a)         \
+       RETURN_INT("XkbKeyTypesForCoreSymbols")
+
+#define XkbApplyCompatMapToKey(a)         \
+       RETURN_INT("XkbApplyCompatMapToKey")
+
+#define XkbUpdateMapFromCore(a)         \
+       RETURN_INT("XkbUpdateMapFromCore")
+
+#define XkbAddDeviceLedInfo(a,b,c)         \
+       RETURN_INT("XkbAddDeviceLedInfo")
+
+#define XkbResizeDeviceButtonActions(a,b)         \
+       RETURN_INT("XkbResizeDeviceButtonActions")
+
+#define XkbAllocDeviceInfo(a,b,c)         \
+       RETURN_INT("XkbAllocDeviceInfo")
+
+#define XkbFreeDeviceInfo(a,b,c)         \
+       RETURN_VOID("XkbFreeDeviceInfo")
+
+#define XkbNoteDeviceChanges(a,b,c)         \
+       RETURN_VOID("XkbNoteDeviceChanges")
+
+#define XkbGetDeviceInfo(a,b,c,d,e)         \
+       RETURN_INT("XkbGetDeviceInfo")
+
+#define XkbGetDeviceInfoChanges(a,b,c)         \
+       RETURN_INT("XkbGetDeviceInfoChanges")
+
+#define XkbGetDeviceButtonActions(a,b,c,d,e)         \
+       RETURN_INT("XkbGetDeviceButtonActions")
+
+#define XkbGetDeviceLedInfo(a,b,c,d,e)         \
+       RETURN_INT("XkbGetDeviceLedInfo")
+
+#define XkbSetDeviceInfo(a,b,c)         \
+       RETURN_INT("XkbSetDeviceInfo")
+
+#define XkbChangeDeviceInfo(a,b,c)         \
+       RETURN_INT("XkbChangeDeviceInfo")
+
+#define XkbSetDeviceLedInfo(a,b,c,d,e)         \
+       RETURN_INT("XkbSetDeviceLedInfo")
+
+#define XkbSetDeviceButtonActions(a,b,c,d)         \
+       RETURN_INT("XkbSetDeviceButtonActions")
+
+#define XkbToControl(a)         \
+       RETURN_INT("XkbToControl")
+
+#define XkbSetDebuggingFlags(a,b,c,d,e,f,g,h)         \
+       RETURN_INT("XkbSetDebuggingFlags")
+
+#define XkbApplyVirtualModChanges(a,b,c)         \
+       RETURN_INT("XkbApplyVirtualModChanges")
+
+#define XkbUpdateActionVirtualMods(a,b,c)         \
+       RETURN_INT("XkbUpdateActionVirtualMods")
+
+#define XkbUpdateKeyTypeVirtualMods(a,b,c,d)         \
+       RETURN_VOID("XkbUpdateKeyTypeVirtualMods")
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

diff --git a/src/x11/xlibint_2w.h b/src/x11/xlibint_2w.h
index e69de29..494ab6c 100755 (executable)
--- a/src/x11/xlibint_2w.h
+++ b/src/x11/xlibint_2w.h
@@ -0,0 +1,255 @@
+#ifndef _X11_XLOCALE_2W_H
+#define _X11_XLOCALE_2W_H
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "x2w_general.h"
+
+#define _XGetRequest(a,b,c)         \
+       RETURN_POINTER("_XGetRequest")
+
+#define _XData32(a,b,c)         \
+       RETURN_INT("_XData32")
+
+#define _XRead32(a,b,c)         \
+       RETURN_VOID("_XRead32")
+
+#define _XDeqAsyncHandler(a,b)         \
+       RETURN_VOID("_XDeqAsyncHandler")
+
+#define _XError(a,b)         \
+       RETURN_INT("_XError")
+
+#define _XIOError(a)         \
+       RETURN_INT("_XIOError")
+
+#define _XIOErrorFunction(a)         \
+       RETURN_POINTER("_XIOErrorFunction")
+
+#define _XErrorFunction(a,b)         \
+       RETURN_INT("_XErrorFunction")
+
+#define _XEatData(a,b)         \
+       RETURN_VOID("_XEatData")
+
+#define _XAllocScratch(a,b)         \
+       RETURN_POINTER("_XAllocScratch")
+
+#define _XAllocTemp(a,b)         \
+       RETURN_POINTER("_XAllocTemp")
+
+#define _XFreeTemp(a,b,c)         \
+       RETURN_VOID("_XFreeTemp")
+
+#define _XVIDtoVisual(a,b)         \
+       RETURN_POINTER("_XVIDtoVisual")
+
+#define _XSetLastRequestRead(a,b)         \
+       RETURN_INT("_XSetLastRequestRead")
+
+#define _XGetHostname(a,b)         \
+       RETURN_INT("_XGetHostname")
+
+#define _XScreenOfWindow(a,b)         \
+       RETURN_POINTER("_XScreenOfWindow")
+
+#define _XAsyncErrorHandler(a,b,c,d,e)         \
+       RETURN_INT("_XAsyncErrorHandler")
+
+#define _XGetAsyncReply(a,b,c,d,e,f,g)         \
+       RETURN_POINTER("_XGetAsyncReply")
+
+#define _XGetAsyncData(a,b,c,d,e,f,g)         \
+       RETURN_VOID("_XGetAsyncData")
+
+#define _XFlush(a)         \
+       RETURN_VOID("_XFlush")
+
+#define _XEventsQueued(a,b)         \
+       RETURN_INT("_XEventsQueued")
+
+#define _XReadEvents(a)         \
+       RETURN_VOID("_XReadEvents")
+
+#define _XRead(a,b,c)         \
+       RETURN_INT("_XRead")
+
+#define _XReadPad(a,b,c)         \
+       RETURN_VOID("_XReadPad")
+
+#define _XSend(a,b,c)         \
+       RETURN_VOID("_XSend")
+
+#define _XReply(a,b,c,d)         \
+       RETURN_INT("_XReply")
+
+#define _XEnq(a,b)         \
+       RETURN_VOID("_XEnq")
+
+#define _XDeq(a,b,c)         \
+       RETURN_VOID("_XDeq")
+
+#define _XUnknownWireEvent(a,b,c)         \
+       RETURN_INT("_XUnknownWireEvent")
+
+#define _XUnknownWireEventCookie(a,b,c)         \
+       RETURN_INT("_XUnknownWireEventCookie")
+
+#define _XUnknownCopyEventCookie(a,b,c)         \
+       RETURN_INT("_XUnknownCopyEventCookie")
+
+#define _XUnknownNativeEvent(a,b,c)         \
+       RETURN_INT("_XUnknownNativeEvent")
+
+#define _XWireToEvent(a,b,c)         \
+       RETURN_INT("_XWireToEvent")
+
+#define _XDefaultWireError(a,b,c)         \
+       RETURN_INT("_XDefaultWireError")
+
+#define _XPollfdCacheInit(a)         \
+       RETURN_INT("_XPollfdCacheInit")
+
+#define _XPollfdCacheAdd(a,b)         \
+       RETURN_VOID("_XPollfdCacheAdd")
+
+#define _XPollfdCacheDel(a,b)         \
+       RETURN_VOID("_XPollfdCacheDel")
+
+#define _XAllocID(a)         \
+       RETURN_INT("_XAllocID")
+
+#define _XAllocIDs(a,b,c)         \
+       RETURN_VOID("_XAllocIDs")
+
+#define _XFreeExtData(a)         \
+       RETURN_INT("_XFreeExtData")
+
+#define XESetCreateGC(a,b,c)         \
+       RETURN_POINTER("XESetCreateGC")
+
+#define XESetCopyGC(a,b,c)         \
+       RETURN_POINTER("XESetCopyGC")
+
+#define XESetFlushGC(a,b,c)         \
+       RETURN_POINTER("XESetFlushGC")
+
+#define XESetFreeGC(a,b,c)         \
+       RETURN_POINTER("XESetFreeGC")
+
+#define XESetCreateFont(a,b,c)         \
+       RETURN_POINTER("XESetCreateFont")
+
+#define XESetFreeFont(a,b,c)         \
+       RETURN_POINTER("XESetFreeFont")
+
+#define XESetCloseDisplay(a,b)         \
+       RETURN_POINTER("XESetCloseDisplay")
+
+#define XESetError(a,b,c,d)         \
+       RETURN_POINTER("XESetError")
+
+#define XESetErrorString(a,b,c,d,e)         \
+       RETURN_POINTER("XESetErrorString")
+
+#define XESetPrintErrorValues(a,b,c)         \
+       RETURN_POINTER("XESetPrintErrorValues")
+
+#define XESetWireToEvent(a,b,c)         \
+       RETURN_POINTER("XESetWireToEvent")
+
+#define XESetWireToEventCookie(a,b,c)         \
+       RETURN_POINTER("XESetWireToEventCookie")
+
+#define XESetCopyEventCookie(a,b,c)         \
+       RETURN_POINTER("XESetCopyEventCookie")
+
+#define XESetEventToWire(a,b,c)         \
+       RETURN_POINTER("XESetEventToWire")
+
+#define XESetWireToError(a,b,c)         \
+       RETURN_POINTER("XESetWireToError")
+
+#define XESetBeforeFlush(a,b,c,d)         \
+       RETURN_POINTER("XESetBeforeFlush")
+
+#define _XRegisterInternalConnection(a,b,c,d)         \
+       RETURN_INT("_XRegisterInternalConnection")
+
+#define _XUnregisterInternalConnection(a,b)         \
+       RETURN_VOID("_XUnregisterInternalConnection")
+
+#define _XProcessInternalConnection(a,b)         \
+       RETURN_VOID("_XProcessInternalConnection")
+
+#define __XOS2RedirRoot(a)         \
+       RETURN_INT("__XOS2RedirRoot")
+
+#define _XTextHeight(a,b,c)         \
+       RETURN_INT("_XTextHeight")
+
+#define _XTextHeight16(a,b,c)         \
+       RETURN_INT("_XTextHeight16")
+
+#define _XOpenFile(a,b)         \
+       RETURN_INT("_XOpenFile")
+
+#define _XOpenFileMode(a,b,c)         \
+       RETURN_INT("_XOpenFileMode")
+
+#define _XFopenFile(a,b)         \
+       RETURN_VOID("_XFopenFile")
+
+#define _XAccessFile(a)         \
+       RETURN_INT("_XAccessFile")
+
+#define _XEventToWire(a,b,c)         \
+       RETURN_INT("_XEventToWire")
+
+#define _XF86LoadQueryLocaleFont(a,b,c,d)         \
+       RETURN_INT("_XF86LoadQueryLocaleFont")
+
+#define _XProcessWindowAttributes(a,b,c,d)         \
+       RETURN_VOID("_XProcessWindowAttributes")
+
+#define _XDefaultError(a,b)         \
+       RETURN_INT("_XDefaultError")
+
+#define _XDefaultIOError(a)         \
+       RETURN_INT("_XDefaultIOError")
+
+#define _XSetClipRectangles(a,b,c,d,e,f,g)         \
+       RETURN_VOID("_XSetClipRectangles")
+
+#define _XGetWindowAttributes(a,b,c)         \
+       RETURN_INT("_XGetWindowAttributes")
+
+#define _XPutBackEvent(a,b)         \
+       RETURN_INT("_XPutBackEvent")
+
+#define _XIsEventCookie(a,b)         \
+       RETURN_INT("_XIsEventCookie")
+
+#define _XFreeEventCookies(a)         \
+       RETURN_VOID("_XFreeEventCookies")
+
+#define _XStoreEventCookie(a,b)         \
+       RETURN_VOID("_XStoreEventCookie")
+
+#define _XFetchEventCookie(a,b)         \
+       RETURN_INT("_XFetchEventCookie")
+
+#define _XCopyEventCookie(a,b,c)         \
+       RETURN_INT("_XCopyEventCookie")
+
+#define xlocaledir(a,b)         \
+       RETURN_VOID("xlocaledir")
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

diff --git a/src/x11/xlocale_2w.h b/src/x11/xlocale_2w.h
index e69de29..13a8795 100755 (executable)
--- a/src/x11/xlocale_2w.h
+++ b/src/x11/xlocale_2w.h
@@ -0,0 +1,22 @@
+#ifndef _X11_XLOCALE_2W_H
+#define _X11_XLOCALE_2W_H
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "x2w_general.h"
+
+
+#define _Xsetlocale(a,b)   \
+        RETURN_POINTER("Xsetlocale")
+
+
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

diff --git a/src/x11/xutil_2w.h b/src/x11/xutil_2w.h
index e69de29..8778054 100755 (executable)
--- a/src/x11/xutil_2w.h
+++ b/src/x11/xutil_2w.h
@@ -0,0 +1,245 @@
+#ifndef _X11_XUTIL_2W_H
+#define _X11_XUTIL_2W_H
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "x2w_general.h"
+
+#define XDestroyImage(a)         \
+       RETURN_INT("XDestroyImage")
+
+#define XGetPixel(a,b,c)         \
+       RETURN_INT("XGetPixel")
+
+#define XPutPixel(a,b,c,d)         \
+       RETURN_INT("XPutPixel")
+
+#define XSubImage(a,b,c,d,e)         \
+       RETURN_POINTER("XSubImage")
+
+#define XAddPixel(a,b)         \
+       RETURN_INT("XAddPixel")
+
+#define XAllocClassHint(a)         \
+       RETURN_POINTER("XAllocClassHint")
+
+#define XAllocIconSize(a)         \
+       RETURN_POINTER("XAllocIconSize")
+
+#define XAllocSizeHints(a)         \
+       RETURN_POINTER("XAllocSizeHints")
+
+#define XAllocStandardColormap(a)         \
+       RETURN_POINTER("XAllocStandardColormap")
+
+#define XAllocWMHints(a)         \
+       RETURN_POINTER("XAllocWMHints")
+
+#define XClipBox(a,b)         \
+       RETURN_INT("XClipBox")
+
+#define XCreateRegion(a)         \
+       RETURN_INT("XCreateRegion")
+
+#define XDefaultString(a)         \
+       RETURN_POINTER("XDefaultString")
+
+#define XDeleteContext(a,b,c)         \
+       RETURN_INT("XDeleteContext")
+
+#define XDestroyRegion(a)         \
+       RETURN_INT("XDestroyRegion")
+
+#define XEmptyRegion(a)         \
+       RETURN_INT("XEmptyRegion")
+
+#define XEqualRegion(a,b)         \
+       RETURN_INT("XEqualRegion")
+
+#define XFindContext(a,b,c,d)         \
+       RETURN_INT("XFindContext")
+
+#define XGetClassHint(a,b,c)         \
+       RETURN_INT("XGetClassHint")
+
+#define XGetIconSizes(a,b,c,d)         \
+       RETURN_INT("XGetIconSizes")
+
+#define XGetNormalHints(a,b,c)         \
+       RETURN_INT("XGetNormalHints")
+
+#define XGetRGBColormaps(a,b,c,d,e)         \
+       RETURN_INT("XGetRGBColormaps")
+
+#define XGetSizeHints(a,b,c,d)         \
+       RETURN_INT("XGetSizeHints")
+
+#define XGetStandardColormap(a,b,c,d)         \
+       RETURN_INT("XGetStandardColormap")
+
+#define XGetTextProperty(a,b,c,d)         \
+       RETURN_INT("XGetTextProperty")
+
+#define XGetVisualInfo(a,b,c,d)         \
+       RETURN_POINTER("XGetVisualInfo")
+
+#define XGetWMClientMachine(a,b,c)         \
+       RETURN_INT("XGetWMClientMachine")
+
+#define XGetWMHints(a,b)         \
+       RETURN_POINTER("XGetWMHints")
+
+#define XGetWMIconName(a,b,c)         \
+       RETURN_INT("XGetWMIconName")
+
+#define XGetWMName(a,b,c)         \
+       RETURN_INT("XGetWMName")
+
+#define XGetWMNormalHints(a,b,c,d)         \
+       RETURN_INT("XGetWMNormalHints")
+
+#define XGetWMSizeHints(a,b,c,d,e)         \
+       RETURN_INT("XGetWMSizeHints")
+
+#define XGetZoomHints(a,b,c)         \
+       RETURN_INT("XGetZoomHints")
+
+#define XIntersectRegion(a,b,c)         \
+       RETURN_INT("XIntersectRegion")
+
+#define XConvertCase(a,b,c)         \
+       RETURN_VOID("XConvertCase")
+
+#define XLookupString(a,b,c,d,e)         \
+       RETURN_INT("XLookupString")
+
+#define XMatchVisualInfo(a,b,c,d,e)         \
+       RETURN_INT("XMatchVisualInfo")
+
+#define XOffsetRegion(a,b,c)         \
+       RETURN_INT("XOffsetRegion")
+
+#define XPointInRegion(a,b,c)         \
+       RETURN_INT("XPointInRegion")
+
+#define XPolygonRegion(a,b,c)         \
+       RETURN_INT("XPolygonRegion")
+
+#define XRectInRegion(a,b,c,d,e)         \
+       RETURN_INT("XRectInRegion")
+
+#define XSaveContext(a,b,c,d)         \
+       RETURN_INT("XSaveContext")
+
+#define XSetClassHint(a,b,c)         \
+       RETURN_INT("XSetClassHint")
+
+#define XSetIconSizes(a,b,c,d)         \
+       RETURN_INT("XSetIconSizes")
+
+#define XSetNormalHints(a,b,c)         \
+       RETURN_INT("XSetNormalHints")
+
+#define XSetRGBColormaps(a,b,c,d,e)         \
+       RETURN_VOID("XSetRGBColormaps")
+
+#define XSetSizeHints(a,b,c,d)         \
+       RETURN_INT("XSetSizeHints")
+
+#define XSetStandardProperties(a,b,c,d,e,f,g,h)         \
+       RETURN_INT("XSetStandardProperties")
+
+#define XSetTextProperty(a,b,c,d)         \
+       RETURN_VOID("XSetTextProperty")
+
+#define XSetWMClientMachine(a,b,c)         \
+       RETURN_VOID("XSetWMClientMachine")
+
+#define XSetWMHints(a,b,c)         \
+       RETURN_INT("XSetWMHints")
+
+#define XSetWMIconName(a,b,c)         \
+       RETURN_VOID("XSetWMIconName")
+
+#define XSetWMName(a,b,c)         \
+       RETURN_VOID("XSetWMName")
+
+#define XSetWMNormalHints(a,b,c)         \
+       RETURN_VOID("XSetWMNormalHints")
+
+#define XSetWMProperties(a,b,c,d,e,f,g,h,i)         \
+       RETURN_VOID("XSetWMProperties")
+
+#define XmbSetWMProperties(a,b,c,d,e,f,g,h,i)         \
+       RETURN_VOID("XmbSetWMProperties")
+
+#define Xutf8SetWMProperties(a,b,c,d,e,f,g,h,i)         \
+       RETURN_VOID("Xutf8SetWMProperties")
+
+#define XSetWMSizeHints(a,b,c,d)         \
+       RETURN_VOID("XSetWMSizeHints")
+
+#define XSetRegion(a,b,c)         \
+       RETURN_INT("XSetRegion")
+
+#define XSetStandardColormap(a,b,c,d)         \
+       RETURN_VOID("XSetStandardColormap")
+
+#define XSetZoomHints(a,b,c)         \
+       RETURN_INT("XSetZoomHints")
+
+#define XShrinkRegion(a,b,c)         \
+       RETURN_INT("XShrinkRegion")
+
+#define XStringListToTextProperty(a,b,c)         \
+       RETURN_INT("XStringListToTextProperty")
+
+#define XSubtractRegion(a,b,c)         \
+       RETURN_INT("XSubtractRegion")
+
+#define XmbTextListToTextProperty(a,b,c,d,e)         \
+       RETURN_INT("XmbTextListToTextProperty")
+
+#define XwcTextListToTextProperty(a,b,c,d,e)         \
+       RETURN_INT("XwcTextListToTextProperty")
+
+#define Xutf8TextListToTextProperty(a,b,c,d,e)         \
+       RETURN_INT("Xutf8TextListToTextProperty")
+
+#define XwcFreeStringList(a)         \
+       RETURN_VOID("XwcFreeStringList")
+
+#define XTextPropertyToStringList(a,b,c)         \
+       RETURN_INT("XTextPropertyToStringList")
+
+#define XmbTextPropertyToTextList(a,b,c,d)         \
+       RETURN_INT("XmbTextPropertyToTextList")
+
+#define XwcTextPropertyToTextList(a,b,c,d)         \
+       RETURN_INT("XwcTextPropertyToTextList")
+
+#define Xutf8TextPropertyToTextList(a,b,c,d)         \
+       RETURN_INT("Xutf8TextPropertyToTextList")
+
+#define XUnionRectWithRegion(a,b,c)         \
+       RETURN_INT("XUnionRectWithRegion")
+
+#define XUnionRegion(a,b,c)         \
+       RETURN_INT("XUnionRegion")
+
+#define XWMGeometry(a,b,c,d,e,f,g,h,i,j,k)         \
+       RETURN_INT("XWMGeometry")
+
+#define XXorRegion(a,b,c)         \
+       RETURN_INT("XXorRegion")
+
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif