diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-04-23 18:42:09 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-04-23 18:42:09 +0000 |
| commit | c6349f43193b74a3c09945f3093a871b0157ba47 (patch) | |
| tree | aea173c19da6fa57e24eb4633ff815feb7ae3fa0 /include | |
| parent | c3c4ddc682950a01b80825021f3e2503ab01ea7f (diff) | |
| download | xorg-lib-libX11-c6349f43193b74a3c09945f3093a871b0157ba47.tar.gz | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/ImUtil.h | 2 | ||||
| -rw-r--r-- | include/X11/XKBlib.h | 272 | ||||
| -rw-r--r-- | include/X11/Xcms.h | 182 | ||||
| -rw-r--r-- | include/X11/Xlib.h | 1051 | ||||
| -rw-r--r-- | include/X11/Xlibint.h | 483 | ||||
| -rw-r--r-- | include/X11/Xlocale.h | 13 | ||||
| -rw-r--r-- | include/X11/Xresource.h | 71 | ||||
| -rw-r--r-- | include/X11/Xutil.h | 231 |
8 files changed, 613 insertions, 1692 deletions
diff --git a/include/X11/ImUtil.h b/include/X11/ImUtil.h index 3a00e3c6..89f03811 100644 --- a/include/X11/ImUtil.h +++ b/include/X11/ImUtil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/X11/ImUtil.h,v 1.3 2003/04/23 22:04:58 torrey Exp $ */ +/* $XFree86: xc/lib/X11/ImUtil.h,v 1.2 2003/04/15 22:10:07 herrb Exp $ */ #ifndef _IMUTIL_H_ #define _IMUTIL_H_ diff --git a/include/X11/XKBlib.h b/include/X11/XKBlib.h index 0369c8c6..6a5dc8a7 100644 --- a/include/X11/XKBlib.h +++ b/include/X11/XKBlib.h @@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/X11/XKBlib.h,v 3.5 2003/04/17 02:06:31 dawes Exp $ */ #ifndef _XKBLIB_H_ #define _XKBLIB_H_ @@ -294,86 +295,67 @@ typedef struct _XkbKbdDpyState XkbKbdDpyStateRec,*XkbKbdDpyStatePtr; _XFUNCPROTOBEGIN extern Bool XkbIgnoreExtension( -#if NeedFunctionPrototypes Bool /* ignore */ -#endif ); extern Display *XkbOpenDisplay( -#if NeedFunctionPrototypes char * /* name */, int * /* ev_rtrn */, int * /* err_rtrn */, int * /* major_rtrn */, int * /* minor_rtrn */, int * /* reason */ -#endif ); extern Bool XkbQueryExtension( -#if NeedFunctionPrototypes Display * /* dpy */, int * /* opcodeReturn */, int * /* eventBaseReturn */, int * /* errorBaseReturn */, int * /* majorRtrn */, int * /* minorRtrn */ -#endif ); extern Bool XkbUseExtension( -#if NeedFunctionPrototypes Display * /* dpy */, int * /* major_rtrn */, int * /* minor_rtrn */ -#endif ); extern Bool XkbLibraryVersion( -#if NeedFunctionPrototypes int * /* libMajorRtrn */, int * /* libMinorRtrn */ -#endif ); extern unsigned int XkbSetXlibControls( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned int /* affect */, unsigned int /* values */ -#endif ); extern unsigned int XkbGetXlibControls( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); +extern unsigned int XkbXlibControlsImplemented(void); + typedef Atom (*XkbInternAtomFunc)( -#if NeedFunctionPrototypes Display * /* dpy */, _Xconst char * /* name */, Bool /* only_if_exists */ -#endif ); typedef char * (*XkbGetAtomNameFunc)( -#if NeedFunctionPrototypes Display * /* dpy */, Atom /* atom */ -#endif ); extern void XkbSetAtomFuncs( -#if NeedFunctionPrototypes XkbInternAtomFunc /* getAtom */, XkbGetAtomNameFunc /* getName */ -#endif ); extern KeySym XkbKeycodeToKeysym( -#if NeedFunctionPrototypes Display * /* dpy */, #if NeedWidePrototypes unsigned int /* kc */, @@ -382,87 +364,69 @@ extern KeySym XkbKeycodeToKeysym( #endif int /* group */, int /* level */ -#endif ); extern unsigned int XkbKeysymToModifiers( -#if NeedFunctionPrototypes Display * /* dpy */, KeySym /* ks */ -#endif ); extern Bool XkbLookupKeySym( -#if NeedFunctionPrototypes Display * /* dpy */, KeyCode /* keycode */, unsigned int /* modifiers */, unsigned int * /* modifiers_return */, KeySym * /* keysym_return */ -#endif ); extern int XkbLookupKeyBinding( -#if NeedFunctionPrototypes Display * /* dpy */, KeySym /* sym_rtrn */, unsigned int /* mods */, char * /* buffer */, int /* nbytes */, int * /* extra_rtrn */ -#endif ); extern Bool XkbTranslateKeyCode( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, KeyCode /* keycode */, unsigned int /* modifiers */, unsigned int * /* modifiers_return */, KeySym * /* keysym_return */ -#endif ); extern int XkbTranslateKeySym( -#if NeedFunctionPrototypes Display * /* dpy */, register KeySym * /* sym_return */, unsigned int /* modifiers */, char * /* buffer */, int /* nbytes */, int * /* extra_rtrn */ -#endif ); extern Bool XkbSetAutoRepeatRate( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* delay */, unsigned int /* interval */ -#endif ); extern Bool XkbGetAutoRepeatRate( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int * /* delayRtrn */, unsigned int * /* intervalRtrn */ -#endif ); extern Bool XkbChangeEnabledControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ -#endif ); extern Bool XkbDeviceBell( -#if NeedFunctionPrototypes Display * /* dpy */, Window /* win */, int /* deviceSpec */, @@ -470,21 +434,17 @@ extern Bool XkbDeviceBell( int /* bellID */, int /* percent */, Atom /* name */ -#endif ); extern Bool XkbForceDeviceBell( -#if NeedFunctionPrototypes Display * /* dpy */, int /* deviceSpec */, int /* bellClass */, int /* bellID */, int /* percent */ -#endif ); extern Bool XkbDeviceBellEvent( -#if NeedFunctionPrototypes Display * /* dpy */, Window /* win */, int /* deviceSpec */, @@ -492,101 +452,78 @@ extern Bool XkbDeviceBellEvent( int /* bellID */, int /* percent */, Atom /* name */ -#endif ); extern Bool XkbBell( -#if NeedFunctionPrototypes Display * /* dpy */, Window /* win */, int /* percent */, Atom /* name */ -#endif ); extern Bool XkbForceBell( -#if NeedFunctionPrototypes Display * /* dpy */, int /* percent */ -#endif ); extern Bool XkbBellEvent( -#if NeedFunctionPrototypes Display * /* dpy */, Window /* win */, int /* percent */, Atom /* name */ -#endif ); extern Bool XkbSelectEvents( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceID */, unsigned int /* affect */, unsigned int /* values */ -#endif ); extern Bool XkbSelectEventDetails( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceID */, unsigned int /* eventType */, unsigned long /* affect */, unsigned long /* details */ -#endif ); extern void XkbNoteMapChanges( -#if NeedFunctionPrototypes XkbMapChangesPtr /* old */, XkbMapNotifyEvent * /* new */, unsigned int /* wanted */ -#endif ); extern void XkbNoteNameChanges( -#if NeedFunctionPrototypes XkbNameChangesPtr /* old */, XkbNamesNotifyEvent * /* new */, unsigned int /* wanted */ -#endif ); extern Status XkbGetIndicatorState( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int * /* pStateRtrn */ -#endif ); extern Status XkbGetDeviceIndicatorState( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, unsigned int /* ledID */, unsigned int * /* pStateRtrn */ -#endif ); extern Status XkbGetIndicatorMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ -#endif ); extern Bool XkbSetIndicatorMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ -#endif ); #define XkbNoteIndicatorMapChanges(o,n,w) \ @@ -599,18 +536,15 @@ extern Bool XkbSetIndicatorMap( (XkbSetIndicatorMap((d),(c)->map_changes,x)) extern Bool XkbGetNamedIndicator( -#if NeedFunctionPrototypes Display * /* dpy */, Atom /* name */, int * /* pNdxRtrn */, Bool * /* pStateRtrn */, XkbIndicatorMapPtr /* pMapRtrn */, Bool * /* pRealRtrn */ -#endif ); extern Bool XkbGetNamedDeviceIndicator( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, @@ -620,22 +554,18 @@ extern Bool XkbGetNamedDeviceIndicator( Bool * /* pStateRtrn */, XkbIndicatorMapPtr /* pMapRtrn */, Bool * /* pRealRtrn */ -#endif ); extern Bool XkbSetNamedIndicator( -#if NeedFunctionPrototypes Display * /* dpy */, Atom /* name */, Bool /* changeState */, Bool /* state */, Bool /* createNewMap */, XkbIndicatorMapPtr /* pMap */ -#endif ); extern Bool XkbSetNamedDeviceIndicator( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, @@ -645,696 +575,548 @@ extern Bool XkbSetNamedDeviceIndicator( Bool /* state */, Bool /* createNewMap */, XkbIndicatorMapPtr /* pMap */ -#endif ); extern Bool XkbLockModifiers( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ -#endif ); extern Bool XkbLatchModifiers( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affect */, unsigned int /* values */ -#endif ); extern Bool XkbLockGroup( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ -#endif ); extern Bool XkbLatchGroup( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* group */ -#endif ); extern Bool XkbSetServerInternalMods( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affectReal */, unsigned int /* realValues */, unsigned int /* affectVirtual */, unsigned int /* virtualValues */ -#endif ); extern Bool XkbSetIgnoreLockMods( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, unsigned int /* affectReal */, unsigned int /* realValues */, unsigned int /* affectVirtual */, unsigned int /* virtualValues */ -#endif ); extern Bool XkbVirtualModsToReal( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* virtual_mask */, unsigned int * /* mask_rtrn */ -#endif ); extern Bool XkbComputeEffectiveMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, unsigned char * /* map_rtrn */ -#endif ); extern Status XkbInitCanonicalKeyTypes( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, int /* keypadVMod */ -#endif ); extern XkbDescPtr XkbAllocKeyboard( -#if NeedFunctionPrototypes void -#endif ); extern void XkbFreeKeyboard( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeDesc */ -#endif ); extern Status XkbAllocClientMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nTypes */ -#endif ); extern Status XkbAllocServerMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nActions */ -#endif ); extern void XkbFreeClientMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ -#endif ); extern void XkbFreeServerMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ -#endif ); extern XkbKeyTypePtr XkbAddKeyType( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, Atom /* name */, int /* map_count */, Bool /* want_preserve */, int /* num_lvls */ -#endif ); extern Status XkbAllocIndicatorMaps( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */ -#endif ); extern void XkbFreeIndicatorMaps( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */ -#endif ); extern XkbDescPtr XkbGetMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ -#endif ); extern Status XkbGetUpdatedMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ -#endif ); extern Status XkbGetMapChanges( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDescPtr /* xkb */, XkbMapChangesPtr /* changes */ -#endif ); extern Status XkbRefreshKeyboardMapping( -#if NeedFunctionPrototypes XkbMapNotifyEvent * /* event */ -#endif ); extern Status XkbGetKeyTypes( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ -#endif ); extern Status XkbGetKeySyms( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ -#endif ); extern Status XkbGetKeyActions( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* first */, unsigned int /* num */, XkbDescPtr /* xkb */ -#endif ); extern Status XkbGetKeyBehaviors( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ -#endif ); extern Status XkbGetVirtualMods( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ -#endif ); extern Status XkbGetKeyExplicitComponents( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ -#endif ); extern Status XkbGetKeyModifierMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* firstKey */, unsigned int /* nKeys */, XkbDescPtr /* desc */ -#endif +); + +extern Status XkbGetKeyVirtualModMap( + Display * /* dpy */, + unsigned int /* first */, + unsigned int /* num */, + XkbDescPtr /* xkb */ ); extern Status XkbAllocControls( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which*/ -#endif ); extern void XkbFreeControls( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern Status XkbGetControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ -#endif ); extern Bool XkbSetControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned long /* which */, XkbDescPtr /* desc */ -#endif ); extern void XkbNoteControlsChanges( -#if NeedFunctionPrototypes XkbControlsChangesPtr /* old */, XkbControlsNotifyEvent * /* new */, unsigned int /* wanted */ -#endif ); #define XkbGetControlsChanges(d,x,c) XkbGetControls(d,(c)->changed_ctrls,x) #define XkbChangeControls(d,x,c) XkbSetControls(d,(c)->changed_ctrls,x) extern Status XkbAllocCompatMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nInterpret */ -#endif ); extern void XkbFreeCompatMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern Status XkbGetCompatMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* xkb */ -#endif ); extern Bool XkbSetCompatMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* xkb */, Bool /* updateActions */ -#endif ); extern XkbSymInterpretPtr XkbAddSymInterpret( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbSymInterpretPtr /* si */, Bool /* updateMap */, XkbChangesPtr /* changes */ -#endif ); extern Status XkbAllocNames( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, int /* nTotalRG */, int /* nTotalAliases */ -#endif ); extern Status XkbGetNames( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ -#endif ); extern Bool XkbSetNames( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, unsigned int /* firstType */, unsigned int /* nTypes */, XkbDescPtr /* desc */ -#endif ); extern Bool XkbChangeNames( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDescPtr /* xkb */, XkbNameChangesPtr /* changes */ -#endif ); extern void XkbFreeNames( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern Status XkbGetState( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, XkbStatePtr /* rtrnState */ -#endif ); extern Bool XkbSetMap( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDescPtr /* desc */ -#endif ); extern Bool XkbChangeMap( -#if NeedFunctionPrototypes Display* /* dpy */, XkbDescPtr /* desc */, XkbMapChangesPtr /* changes */ -#endif ); extern Bool XkbSetDetectableAutoRepeat( -#if NeedFunctionPrototypes Display * /* dpy */, Bool /* detectable */, Bool * /* supported */ -#endif ); extern Bool XkbGetDetectableAutoRepeat( -#if NeedFunctionPrototypes Display * /* dpy */, Bool * /* supported */ -#endif ); extern Bool XkbSetAutoResetControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* changes */, unsigned int * /* auto_ctrls */, unsigned int * /* auto_values */ -#endif ); extern Bool XkbGetAutoResetControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int * /* auto_ctrls */, unsigned int * /* auto_ctrl_values */ -#endif ); extern Bool XkbSetPerClientControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* change */, unsigned int * /* values */ -#endif ); extern Bool XkbGetPerClientControls( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int * /* ctrls */ -#endif ); extern Status XkbCopyKeyType( -#if NeedFunctionPrototypes XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */ -#endif ); extern Status XkbCopyKeyTypes( -#if NeedFunctionPrototypes XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */, int /* num_types */ -#endif ); extern Status XkbResizeKeyType( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* type_ndx */, int /* map_count */, Bool /* want_preserve */, int /* new_num_lvls */ -#endif ); extern KeySym *XkbResizeKeySyms( -#if NeedFunctionPrototypes XkbDescPtr /* desc */, int /* forKey */, int /* symsNeeded */ -#endif ); extern XkbAction *XkbResizeKeyActions( -#if NeedFunctionPrototypes XkbDescPtr /* desc */, int /* forKey */, int /* actsNeeded */ -#endif ); extern Status XkbChangeTypesOfKey( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* key */, int /* num_groups */, unsigned int /* groups */, int * /* newTypes */, XkbMapChangesPtr /* pChanges */ -#endif +); + +extern Status XkbChangeKeycodeRange( + XkbDescPtr /* xkb */, + int /* minKC */, + int /* maxKC */, + XkbChangesPtr /* changes */ ); /***====================================================================***/ extern XkbComponentListPtr XkbListComponents( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, XkbComponentNamesPtr /* ptrns */, int * /* max_inout */ -#endif ); extern void XkbFreeComponentList( -#if NeedFunctionPrototypes XkbComponentListPtr /* list */ -#endif ); extern XkbDescPtr XkbGetKeyboard( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */ -#endif ); extern XkbDescPtr XkbGetKeyboardByName( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* deviceSpec */, XkbComponentNamesPtr /* names */, unsigned int /* want */, unsigned int /* need */, Bool /* load */ -#endif ); /***====================================================================***/ extern int XkbKeyTypesForCoreSymbols( /* returns # of groups */ -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, /* keyboard device */ int /* map_width */, /* width of core KeySym array */ KeySym * /* core_syms */, /* always mapWidth symbols */ unsigned int /* protected */, /* explicit key types */ int * /* types_inout */, /* always four type indices */ KeySym * /* xkb_syms_rtrn */ /* must have enough space */ -#endif ); extern Bool XkbApplyCompatMapToKey( /* False only on error */ -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, /* keymap to be edited */ KeyCode /* key */, /* key to be updated */ XkbChangesPtr /* changes */ /* resulting changes to map */ -#endif ); extern Bool XkbUpdateMapFromCore( /* False only on error */ -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, /* XKB keyboard to be edited */ KeyCode /* first_key */, /* first changed key */ int /* num_keys */, /* number of changed keys */ int /* map_width */, /* width of core keymap */ KeySym * /* core_keysyms */, /* symbols from core keymap */ XkbChangesPtr /* changes */ /* resulting changes */ -#endif ); /***====================================================================***/ extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, unsigned int /* ledId */ -#endif ); extern Status XkbResizeDeviceButtonActions( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* newTotal */ -#endif ); extern XkbDeviceInfoPtr XkbAllocDeviceInfo( -#if NeedFunctionPrototypes unsigned int /* deviceSpec */, unsigned int /* nButtons */, unsigned int /* szLeds */ -#endif ); extern void XkbFreeDeviceInfo( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* which */, Bool /* freeDevI */ -#endif ); extern void XkbNoteDeviceChanges( -#if NeedFunctionPrototypes XkbDeviceChangesPtr /* old */, XkbExtensionDeviceNotifyEvent * /* new */, unsigned int /* wanted */ -#endif ); extern XkbDeviceInfoPtr XkbGetDeviceInfo( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, unsigned int /* deviceSpec */, unsigned int /* ledClass */, unsigned int /* ledID */ -#endif ); extern Status XkbGetDeviceInfoChanges( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDeviceInfoPtr /* devi */, XkbDeviceChangesPtr /* changes */ -#endif ); extern Status XkbGetDeviceButtonActions( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDeviceInfoPtr /* devi */, Bool /* all */, unsigned int /* first */, unsigned int /* nBtns */ -#endif ); extern Status XkbGetDeviceLedInfo( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass (class, XIDflt, XIAll) */, unsigned int /* ledId (id, XIDflt, XIAll) */, unsigned int /* which (XkbXI_Indicator{Names,Map}Mask */ -#endif ); extern Bool XkbSetDeviceInfo( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* which */, XkbDeviceInfoPtr /* devi */ -#endif ); extern Bool XkbChangeDeviceInfo( -#if NeedFunctionPrototypes Display* /* dpy */, XkbDeviceInfoPtr /* desc */, XkbDeviceChangesPtr /* changes */ -#endif ); extern Bool XkbSetDeviceLedInfo( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, unsigned int /* ledID */, unsigned int /* which */ -#endif ); extern Bool XkbSetDeviceButtonActions( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDeviceInfoPtr /* devi */, unsigned int /* first */, unsigned int /* nBtns */ -#endif ); /***====================================================================***/ extern char XkbToControl( -#if NeedFunctionPrototypes char /* c */ -#endif ); /***====================================================================***/ extern Bool XkbSetDebuggingFlags( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned int /* mask */, unsigned int /* flags */, @@ -1343,7 +1125,25 @@ extern Bool XkbSetDebuggingFlags( unsigned int /* ctrls */, unsigned int * /* rtrn_flags */, unsigned int * /* rtrn_ctrls */ -#endif +); + +extern Bool XkbApplyVirtualModChanges( + XkbDescPtr /* xkb */, + unsigned int /* changed */, + XkbChangesPtr /* changes */ +); + +extern Bool XkbUpdateActionVirtualMods( + XkbDescPtr /* xkb */, + XkbAction * /* act */, + unsigned int /* changed */ +); + +extern void XkbUpdateKeyTypeVirtualMods( + XkbDescPtr /* xkb */, + XkbKeyTypePtr /* type */, + unsigned int /* changed */, + XkbChangesPtr /* changes */ ); _XFUNCPROTOEND diff --git a/include/X11/Xcms.h b/include/X11/Xcms.h index d9e9c3b4..779bc52f 100644 --- a/include/X11/Xcms.h +++ b/include/X11/Xcms.h @@ -27,6 +27,7 @@ * DESCRIPTION * Public include file for X Color Management System */ +/* $XFree86: xc/lib/X11/Xcms.h,v 1.7 2003/11/03 03:46:26 dawes Exp $ */ #ifndef _XCMS_H_ #define _XCMS_H_ @@ -199,17 +200,14 @@ typedef struct _XcmsPerScrnInfo { typedef struct _XcmsCCC *XcmsCCC; typedef Status (*XcmsCompressionProc)( /* Gamut Compression Proc */ -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); typedef Status (*XcmsWhiteAdjustProc)( /* White Point Adjust Proc */ -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -217,7 +215,6 @@ typedef Status (*XcmsWhiteAdjustProc)( /* White Point Adjust Proc */ XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); /* @@ -238,31 +235,54 @@ typedef struct _XcmsCCC { } XcmsCCCRec; typedef Status (*XcmsScreenInitProc)( /* Screen Initialization Proc */ -#if NeedFunctionPrototypes Display* /* dpy */, int /* screen_number */, XcmsPerScrnInfo* /* screen_info */ -#endif ); typedef void (*XcmsScreenFreeProc)( -#if NeedFunctionPrototypes XPointer /* screenData */ -#endif ); /* * Function List Pointer -- pointer to an array of function pointers. * The end of list is indicated by a NULL pointer. */ -typedef Status (*XcmsConversionProc)(); +/* + * XXX: The use of the XcmsConversionProc type is broken. The + * device-independent colour conversion code uses it as: + +typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, + unsigned int); + + * while the device-dependent code uses it as: + +typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, unsigned int, + Bool *); + + * Until this is reworked, it's probably best to leave it unprotoized. + * The code works regardless. + */ +typedef Status (*XcmsDDConversionProc)( /* using device-dependent version */ + XcmsCCC /* ccc */, + XcmsColor* /* pcolors_in_out */, + unsigned int /* ncolors */, + Bool* /* pCompressed */ + ); + +typedef Status (*XcmsDIConversionProc)( /* using device-independent version */ + XcmsCCC /* ccc */, + XcmsColor* /* white_point */, + XcmsColor* /* pcolors_in_out */, + unsigned int /* ncolors */ + ); + +typedef XcmsDIConversionProc XcmsConversionProc; typedef XcmsConversionProc *XcmsFuncListPtr; typedef int (*XcmsParseStringProc)( /* Color String Parsing Proc */ -#if NeedFunctionPrototypes char* /* color_string */, XcmsColor* /* color_return */ -#endif ); /* @@ -270,7 +290,7 @@ typedef int (*XcmsParseStringProc)( /* Color String Parsing Proc */ * or Device-Dependent) */ typedef struct _XcmsColorSpace { - char *prefix; /* Prefix of string format. */ + const char *prefix; /* Prefix of string format. */ XcmsColorFormat id; /* Format ID number. */ XcmsParseStringProc parseString; /* String format parsing function */ @@ -317,120 +337,93 @@ typedef struct _XcmsFunctionSet { _XFUNCPROTOBEGIN extern Status XcmsAddColorSpace ( -#if NeedFunctionPrototypes XcmsColorSpace* /* pColorSpace */ -#endif ); extern Status XcmsAddFunctionSet ( -#if NeedFunctionPrototypes XcmsFunctionSet* /* functionSet */ -#endif ); extern Status XcmsAllocColor ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* color_in_out */, XcmsColorFormat /* result_format */ -#endif ); extern Status XcmsAllocNamedColor ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, _Xconst char* /* color_string */, XcmsColor* /* color_scrn_return */, XcmsColor* /* color_exact_return */, XcmsColorFormat /* result_format */ -#endif ); extern XcmsCCC XcmsCCCOfColormap ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */ -#endif ); extern Status XcmsCIELabClipab( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELabClipL( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELabClipLab( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELabQueryMaxC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* L_star */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELabQueryMaxL ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELabQueryMaxLC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELabQueryMinL ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELabToCIEXYZ ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIELabWhiteShiftColors( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -438,85 +431,67 @@ extern Status XcmsCIELabWhiteShiftColors( XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELuvClipL( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELuvClipLuv( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELuvClipuv( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIELuvQueryMaxC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* L_star */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELuvQueryMaxL ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELuvQueryMaxLC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELuvQueryMinL ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue_angle */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsCIELuvToCIEuvY ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIELuvWhiteShiftColors( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -524,99 +499,77 @@ extern Status XcmsCIELuvWhiteShiftColors( XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIEXYZToCIELab ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIEXYZToCIEuvY ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIEXYZToCIExyY ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIEXYZToRGBi ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsCIEuvYToCIELuv ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIEuvYToCIEXYZ ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIEuvYToTekHVC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsCIExyYToCIEXYZ ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern XcmsColor *XcmsClientWhitePointOfCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); extern Status XcmsConvertColors ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colorArry_in_out */, unsigned int /* nColors */, XcmsColorFormat /* targetFormat */, Bool* /* compArry_return */ -#endif ); extern XcmsCCC XcmsCreateCCC ( -#if NeedFunctionPrototypes Display* /* dpy */, int /* screenNumber */, Visual* /* visual */, @@ -625,283 +578,215 @@ extern XcmsCCC XcmsCreateCCC ( XPointer /* gamutCompClientData */, XcmsWhiteAdjustProc /* whitePtAdjProc */, XPointer /* whitePtAdjClientData */ -#endif ); extern XcmsCCC XcmsDefaultCCC ( -#if NeedFunctionPrototypes Display* /* dpy */, int /* screenNumber */ -#endif ); extern Display *XcmsDisplayOfCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); extern XcmsColorFormat XcmsFormatOfPrefix ( -#if NeedFunctionPrototypes char* /* prefix */ -#endif ); extern void XcmsFreeCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); extern Status XcmsLookupColor ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, _Xconst char* /* color_string */, XcmsColor* /* pColor_exact_in_out */, XcmsColor* /* pColor_scrn_in_out */, XcmsColorFormat /* result_format */ -#endif ); extern char *XcmsPrefixOfFormat ( -#if NeedFunctionPrototypes XcmsColorFormat /* id */ -#endif ); extern Status XcmsQueryBlack ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsQueryBlue ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsQueryColor ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* pColor_in_out */, XcmsColorFormat /* result_format */ -#endif ); extern Status XcmsQueryColors ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* colorArry_in_out */, unsigned int /* nColors */, XcmsColorFormat /* result_format */ -#endif ); extern Status XcmsQueryGreen ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsQueryRed ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsQueryWhite ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColorFormat /* target_format */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsRGBiToCIEXYZ ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsRGBiToRGB ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsRGBToRGBi ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern int XcmsScreenNumberOfCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); extern XcmsColor *XcmsScreenWhitePointOfCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); extern XcmsCCC XcmsSetCCCOfColormap( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsCCC /* ccc */ -#endif ); extern XcmsCompressionProc XcmsSetCompressionProc ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsCompressionProc /* compression_proc */, XPointer /* client_data */ -#endif ); extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsWhiteAdjustProc /* white_adjust_proc */, XPointer /* client_data */ -#endif ); extern Status XcmsSetWhitePoint ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* color */ -#endif ); extern Status XcmsStoreColor ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* pColor_in */ -#endif ); extern Status XcmsStoreColors ( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XcmsColor* /* colorArry_in */, unsigned int /* nColors */, Bool* /* compArry_return */ -#endif ); extern Status XcmsTekHVCClipC( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsTekHVCClipV( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsTekHVCClipVC( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, unsigned int /* index */, Bool* /* compression_flags_return */ -#endif ); extern Status XcmsTekHVCQueryMaxC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* value */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsTekHVCQueryMaxV ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsTekHVCQueryMaxVC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsTekHVCQueryMaxVSamples ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsColor* /* colors_return */, unsigned int /* nsamples */ -#endif ); extern Status XcmsTekHVCQueryMinV ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsFloat /* hue */, XcmsFloat /* chroma */, XcmsColor* /* color_return */ -#endif ); extern Status XcmsTekHVCToCIEuvY ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* white_point */, XcmsColor* /* colors */, unsigned int /* ncolors */ -#endif ); extern Status XcmsTekHVCWhiteShiftColors( -#if NeedFunctionPrototypes XcmsCCC /* ccc */, XcmsColor* /* initial_white_point*/, XcmsColor* /* target_white_point*/, @@ -909,13 +794,10 @@ extern Status XcmsTekHVCWhiteShiftColors( XcmsColor* /* colors_in_out */, unsigned int /* ncolors */, Bool* /* compression_flags_return */ -#endif ); extern Visual *XcmsVisualOfCCC ( -#if NeedFunctionPrototypes XcmsCCC /* ccc */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index 0cf9d86e..09059f69 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1,3 +1,4 @@ +/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.2 2004-04-23 18:43:24 eich Exp $ */ /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* @@ -24,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/X11/Xlib.h,v 3.25 2003/11/17 22:20:10 dawes Exp $ */ /* @@ -51,6 +53,10 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ +#if defined(SCO325) || defined(__USLC__) +#include <stdint.h> +#endif + #include <X11/X.h> /* applications should not depend on these two headers being included! */ @@ -59,16 +65,47 @@ in this Software without prior written authorization from The Open Group. #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV +#ifndef SCO324 +#ifndef ISC #define X_WCHAR #endif #endif +#endif +#endif #ifndef X_WCHAR #include <stddef.h> #else +#ifdef __UNIXOS2__ +#include <stdlib.h> +#else /* replace this with #include or typedef appropriate for your system */ typedef unsigned long wchar_t; #endif +#endif + +#if defined(ISC) && defined(USE_XMBTOWC) +#define wctomb(a,b) _Xwctomb(a,b) +#define mblen(a,b) _Xmblen(a,b) +#ifndef USE_XWCHAR_STRING +#define mbtowc(a,b,c) _Xmbtowc(a,b,c) +#endif +#endif + +extern int +_Xmblen( +#ifdef ISC + char const *str, + size_t len +#else + char *str, + int len +#endif + ); + +/* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +#define X_HAVE_UTF8_STRING 1 typedef char *XPointer; @@ -145,7 +182,9 @@ typedef char *XPointer; typedef struct _XExtData { int number; /* number returned by XRegisterExtension */ struct _XExtData *next; /* next item on list of data for structure */ - int (*free_private)(); /* called to free private storage */ + int (*free_private)( /* called to free private storage */ + struct _XExtData *extension + ); XPointer private_data; /* data private to this extension. */ } XExtData; @@ -340,6 +379,16 @@ typedef struct { } XHostAddress; /* + * Data structure for ServerFamilyInterpreted addresses in host routines + */ +typedef struct { + int typelength; /* length of type string, in bytes */ + int valuelength; /* length of value string, in bytes */ + char *type; /* pointer to where to find the type string */ + char *value; /* pointer to where to find the address */ +} XServerInterpretedAddress; + +/* * Data structure for "image" data, used by image manipulation routines. */ typedef struct _XImage { @@ -359,20 +408,22 @@ typedef struct _XImage { unsigned long blue_mask; XPointer obdata; /* hook for the object routines to hang on */ struct funcs { /* image manipulation routines */ - struct _XImage *(*create_image)(); -#if NeedFunctionPrototypes + struct _XImage *(*create_image)( + struct _XDisplay* /* display */, + Visual* /* visual */, + unsigned int /* depth */, + int /* format */, + int /* offset */, + char* /* data */, + unsigned int /* width */, + unsigned int /* height */, + int /* bitmap_pad */, + int /* bytes_per_line */); int (*destroy_image) (struct _XImage *); unsigned long (*get_pixel) (struct _XImage *, int, int); int (*put_pixel) (struct _XImage *, int, int, unsigned long); struct _XImage *(*sub_image)(struct _XImage *, int, int, unsigned int, unsigned int); int (*add_pixel) (struct _XImage *, long); -#else - int (*destroy_image)(); - unsigned long (*get_pixel)(); - int (*put_pixel)(); - struct _XImage *(*sub_image)(); - int (*add_pixel)(); -#endif } f; } XImage; @@ -489,7 +540,9 @@ _XDisplay XID private4; XID private5; int private6; - XID (*resource_alloc)();/* allocator function */ + XID (*resource_alloc)( /* allocator function */ + struct _XDisplay* + ); int byte_order; /* screen byte order, LSBFirst, MSBFirst */ int bitmap_unit; /* padding and data requirements */ int bitmap_pad; /* padding requirements on bitmaps */ @@ -508,7 +561,9 @@ _XDisplay XPointer private14; unsigned max_request_size; /* maximum number 32 bit words in request*/ struct _XrmHashBucketRec *db; - int (*private15)(); + int (*private15)( + struct _XDisplay* + ); char *display_name; /* "host:display" string used on this connect*/ int default_screen; /* default screen for operations */ int nscreens; /* number of screens on this server*/ @@ -528,9 +583,7 @@ Display, #endif *_XPrivDisplay; -#if NeedFunctionPrototypes /* prototypes require event type definitions */ #undef _XEVENT_ -#endif #ifndef _XEVENT_ /* * Definitions of specific events. @@ -541,7 +594,7 @@ typedef struct { Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* "event" window it is reported relative to */ - Window root; /* root window that the event occured on */ + Window root; /* root window that the event occurred on */ Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ @@ -559,7 +612,7 @@ typedef struct { Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* "event" window it is reported relative to */ - Window root; /* root window that the event occured on */ + Window root; /* root window that the event occurred on */ Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ @@ -577,7 +630,7 @@ typedef struct { Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* "event" window reported relative to */ - Window root; /* root window that the event occured on */ + Window root; /* root window that the event occurred on */ Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ @@ -594,7 +647,7 @@ typedef struct { Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* "event" window reported relative to */ - Window root; /* root window that the event occured on */ + Window root; /* root window that the event occurred on */ Window subwindow; /* child window */ Time time; /* milliseconds */ int x, y; /* pointer x, y coordinates in event window */ @@ -1037,7 +1090,9 @@ typedef struct { XRectangle max_logical_extent; } XFontSetExtents; +/* unused: typedef void (*XOMProc)(); + */ typedef struct _XOM *XOM; typedef struct _XOC *XOC, *XFontSet; @@ -1091,11 +1146,27 @@ typedef struct { char **font_name_list; } XOMFontInfo; -typedef void (*XIMProc)(); - typedef struct _XIM *XIM; typedef struct _XIC *XIC; +typedef void (*XIMProc)( + XIM, + XPointer, + XPointer +); + +typedef Bool (*XICProc)( + XIC, + XPointer, + XPointer +); + +typedef void (*XIDProc)( + Display*, + XPointer, + XPointer +); + typedef unsigned long XIMStyle; typedef struct { @@ -1163,17 +1234,18 @@ typedef struct { #define XLookupKeySym 3 #define XLookupBoth 4 -#if NeedFunctionPrototypes typedef void *XVaNestedList; -#else -typedef XPointer XVaNestedList; -#endif typedef struct { XPointer client_data; XIMProc callback; } XIMCallback; +typedef struct { + XPointer client_data; + XICProc callback; +} XICCallback; + typedef unsigned long XIMFeedback; #define XIMReverse 1L @@ -1324,32 +1396,25 @@ _XFUNCPROTOBEGIN extern int _Xdebug; extern XFontStruct *XLoadQueryFont( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* name */ -#endif ); extern XFontStruct *XQueryFont( -#if NeedFunctionPrototypes Display* /* display */, XID /* font_ID */ -#endif ); extern XTimeCoord *XGetMotionEvents( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Time /* start */, Time /* stop */, int* /* nevents_return */ -#endif ); extern XModifierKeymap *XDeleteModifiermapEntry( -#if NeedFunctionPrototypes XModifierKeymap* /* modmap */, #if NeedWidePrototypes unsigned int /* keycode_entry */, @@ -1357,17 +1422,13 @@ extern XModifierKeymap *XDeleteModifiermapEntry( KeyCode /* keycode_entry */, #endif int /* modifier */ -#endif ); extern XModifierKeymap *XGetModifierMapping( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern XModifierKeymap *XInsertModifiermapEntry( -#if NeedFunctionPrototypes XModifierKeymap* /* modmap */, #if NeedWidePrototypes unsigned int /* keycode_entry */, @@ -1375,17 +1436,13 @@ extern XModifierKeymap *XInsertModifiermapEntry( KeyCode /* keycode_entry */, #endif int /* modifier */ -#endif ); extern XModifierKeymap *XNewModifiermap( -#if NeedFunctionPrototypes int /* max_keys_per_mod */ -#endif ); extern XImage *XCreateImage( -#if NeedFunctionPrototypes Display* /* display */, Visual* /* visual */, unsigned int /* depth */, @@ -1396,15 +1453,11 @@ extern XImage *XCreateImage( unsigned int /* height */, int /* bitmap_pad */, int /* bytes_per_line */ -#endif ); extern Status XInitImage( -#if NeedFunctionPrototypes XImage* /* image */ -#endif ); extern XImage *XGetImage( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, int /* x */, @@ -1413,10 +1466,8 @@ extern XImage *XGetImage( unsigned int /* height */, unsigned long /* plane_mask */, int /* format */ -#endif ); extern XImage *XGetSubImage( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, int /* x */, @@ -1428,117 +1479,87 @@ extern XImage *XGetSubImage( XImage* /* dest_image */, int /* dest_x */, int /* dest_y */ -#endif ); /* * X function declarations. */ extern Display *XOpenDisplay( -#if NeedFunctionPrototypes _Xconst char* /* display_name */ -#endif ); extern void XrmInitialize( -#if NeedFunctionPrototypes void -#endif ); extern char *XFetchBytes( -#if NeedFunctionPrototypes Display* /* display */, int* /* nbytes_return */ -#endif ); extern char *XFetchBuffer( -#if NeedFunctionPrototypes Display* /* display */, int* /* nbytes_return */, int /* buffer */ -#endif ); extern char *XGetAtomName( -#if NeedFunctionPrototypes Display* /* display */, Atom /* atom */ -#endif ); extern Status XGetAtomNames( -#if NeedFunctionPrototypes Display* /* dpy */, Atom* /* atoms */, int /* count */, char** /* names_return */ -#endif ); extern char *XGetDefault( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* program */, _Xconst char* /* option */ -#endif ); extern char *XDisplayName( -#if NeedFunctionPrototypes _Xconst char* /* string */ -#endif ); extern char *XKeysymToString( -#if NeedFunctionPrototypes KeySym /* keysym */ -#endif ); extern int (*XSynchronize( -#if NeedFunctionPrototypes Display* /* display */, Bool /* onoff */ -#endif -))(); +))( + Display* /* display */ +); extern int (*XSetAfterFunction( -#if NeedFunctionPrototypes Display* /* display */, int (*) ( -#if NeedNestedPrototypes Display* /* display */ -#endif ) /* procedure */ -#endif -))(); +))( + Display* /* display */ +); extern Atom XInternAtom( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* atom_name */, Bool /* only_if_exists */ -#endif ); extern Status XInternAtoms( -#if NeedFunctionPrototypes Display* /* dpy */, char** /* names */, int /* count */, Bool /* onlyIfExists */, Atom* /* atoms_return */ -#endif ); extern Colormap XCopyColormapAndFree( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */ -#endif ); extern Colormap XCreateColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Visual* /* visual */, int /* alloc */ -#endif ); extern Cursor XCreatePixmapCursor( -#if NeedFunctionPrototypes Display* /* display */, Pixmap /* source */, Pixmap /* mask */, @@ -1546,70 +1567,52 @@ extern Cursor XCreatePixmapCursor( XColor* /* background_color */, unsigned int /* x */, unsigned int /* y */ -#endif ); extern Cursor XCreateGlyphCursor( -#if NeedFunctionPrototypes Display* /* display */, Font /* source_font */, Font /* mask_font */, unsigned int /* source_char */, unsigned int /* mask_char */, - XColor* /* foreground_color */, - XColor* /* background_color */ -#endif + XColor _Xconst * /* foreground_color */, + XColor _Xconst * /* background_color */ ); extern Cursor XCreateFontCursor( -#if NeedFunctionPrototypes Display* /* display */, unsigned int /* shape */ -#endif ); extern Font XLoadFont( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* name */ -#endif ); extern GC XCreateGC( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, unsigned long /* valuemask */, XGCValues* /* values */ -#endif ); extern GContext XGContextFromGC( -#if NeedFunctionPrototypes GC /* gc */ -#endif ); extern void XFlushGC( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */ -#endif ); extern Pixmap XCreatePixmap( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, unsigned int /* width */, unsigned int /* height */, unsigned int /* depth */ -#endif ); extern Pixmap XCreateBitmapFromData( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, _Xconst char* /* data */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern Pixmap XCreatePixmapFromBitmapData( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, char* /* data */, @@ -1618,10 +1621,8 @@ extern Pixmap XCreatePixmapFromBitmapData( unsigned long /* fg */, unsigned long /* bg */, unsigned int /* depth */ -#endif ); extern Window XCreateSimpleWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* parent */, int /* x */, @@ -1631,16 +1632,12 @@ extern Window XCreateSimpleWindow( unsigned int /* border_width */, unsigned long /* border */, unsigned long /* background */ -#endif ); extern Window XGetSelectionOwner( -#if NeedFunctionPrototypes Display* /* display */, Atom /* selection */ -#endif ); extern Window XCreateWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* parent */, int /* x */, @@ -1653,60 +1650,44 @@ extern Window XCreateWindow( Visual* /* visual */, unsigned long /* valuemask */, XSetWindowAttributes* /* attributes */ -#endif ); extern Colormap *XListInstalledColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int* /* num_return */ -#endif ); extern char **XListFonts( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* pattern */, int /* maxnames */, int* /* actual_count_return */ -#endif ); extern char **XListFontsWithInfo( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* pattern */, int /* maxnames */, int* /* count_return */, XFontStruct** /* info_return */ -#endif ); extern char **XGetFontPath( -#if NeedFunctionPrototypes Display* /* display */, int* /* npaths_return */ -#endif ); extern char **XListExtensions( -#if NeedFunctionPrototypes Display* /* display */, int* /* nextensions_return */ -#endif ); extern Atom *XListProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int* /* num_prop_return */ -#endif ); extern XHostAddress *XListHosts( -#if NeedFunctionPrototypes Display* /* display */, int* /* nhosts_return */, Bool* /* state_return */ -#endif ); extern KeySym XKeycodeToKeysym( -#if NeedFunctionPrototypes Display* /* display */, #if NeedWidePrototypes unsigned int /* keycode */, @@ -1714,16 +1695,12 @@ extern KeySym XKeycodeToKeysym( KeyCode /* keycode */, #endif int /* index */ -#endif ); extern KeySym XLookupKeysym( -#if NeedFunctionPrototypes XKeyEvent* /* key_event */, int /* index */ -#endif ); extern KeySym *XGetKeyboardMapping( -#if NeedFunctionPrototypes Display* /* display */, #if NeedWidePrototypes unsigned int /* first_keycode */, @@ -1732,382 +1709,262 @@ extern KeySym *XGetKeyboardMapping( #endif int /* keycode_count */, int* /* keysyms_per_keycode_return */ -#endif ); extern KeySym XStringToKeysym( -#if NeedFunctionPrototypes _Xconst char* /* string */ -#endif ); extern long XMaxRequestSize( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern long XExtendedMaxRequestSize( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern char *XResourceManagerString( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern char *XScreenResourceString( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern unsigned long XDisplayMotionBufferSize( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern VisualID XVisualIDFromVisual( -#if NeedFunctionPrototypes Visual* /* visual */ -#endif ); /* multithread routines */ extern Status XInitThreads( -#if NeedFunctionPrototypes void -#endif ); extern void XLockDisplay( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern void XUnlockDisplay( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); /* routines for dealing with extensions */ extern XExtCodes *XInitExtension( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* name */ -#endif ); extern XExtCodes *XAddExtension( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern XExtData *XFindOnExtensionList( -#if NeedFunctionPrototypes XExtData** /* structure */, int /* number */ -#endif ); extern XExtData **XEHeadOfExtensionList( -#if NeedFunctionPrototypes XEDataObject /* object */ -#endif ); /* these are routines for which there are also macros */ extern Window XRootWindow( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern Window XDefaultRootWindow( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern Window XRootWindowOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern Visual *XDefaultVisual( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern Visual *XDefaultVisualOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern GC XDefaultGC( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern GC XDefaultGCOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern unsigned long XBlackPixel( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern unsigned long XWhitePixel( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern unsigned long XAllPlanes( -#if NeedFunctionPrototypes void -#endif ); extern unsigned long XBlackPixelOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern unsigned long XWhitePixelOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern unsigned long XNextRequest( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern unsigned long XLastKnownRequestProcessed( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern char *XServerVendor( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern char *XDisplayString( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern Colormap XDefaultColormap( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern Colormap XDefaultColormapOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern Display *XDisplayOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern Screen *XScreenOfDisplay( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern Screen *XDefaultScreenOfDisplay( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern long XEventMaskOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XScreenNumberOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */ -#if NeedFunctionPrototypes Display* /* display */, XErrorEvent* /* error_event */ -#endif ); extern XErrorHandler XSetErrorHandler ( -#if NeedFunctionPrototypes XErrorHandler /* handler */ -#endif ); typedef int (*XIOErrorHandler) ( /* WARNING, this type not in Xlib spec */ -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern XIOErrorHandler XSetIOErrorHandler ( -#if NeedFunctionPrototypes XIOErrorHandler /* handler */ -#endif ); extern XPixmapFormatValues *XListPixmapFormats( -#if NeedFunctionPrototypes Display* /* display */, int* /* count_return */ -#endif ); extern int *XListDepths( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */, int* /* count_return */ -#endif ); /* ICCCM routines for things that don't require special include files; */ /* other declarations are given in Xutil.h */ extern Status XReconfigureWMWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* screen_number */, unsigned int /* mask */, XWindowChanges* /* changes */ -#endif ); extern Status XGetWMProtocols( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom** /* protocols_return */, int* /* count_return */ -#endif ); extern Status XSetWMProtocols( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom* /* protocols */, int /* count */ -#endif ); extern Status XIconifyWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* screen_number */ -#endif ); extern Status XWithdrawWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* screen_number */ -#endif ); extern Status XGetCommand( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, char*** /* argv_return */, int* /* argc_return */ -#endif ); extern Status XGetWMColormapWindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window** /* windows_return */, int* /* count_return */ -#endif ); extern Status XSetWMColormapWindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window* /* colormap_windows */, int /* count */ -#endif ); extern void XFreeStringList( -#if NeedFunctionPrototypes char** /* list */ -#endif ); extern int XSetTransientForHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window /* prop_window */ -#endif ); /* The following are given in alphabetical order */ extern int XActivateScreenSaver( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XAddHost( -#if NeedFunctionPrototypes Display* /* display */, XHostAddress* /* host */ -#endif ); extern int XAddHosts( -#if NeedFunctionPrototypes Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ -#endif ); extern int XAddToExtensionList( -#if NeedFunctionPrototypes struct _XExtData** /* structure */, XExtData* /* ext_data */ -#endif ); extern int XAddToSaveSet( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern Status XAllocColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, XColor* /* screen_in_out */ -#endif ); extern Status XAllocColorCells( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, Bool /* contig */, @@ -2115,11 +1972,9 @@ extern Status XAllocColorCells( unsigned int /* nplanes */, unsigned long* /* pixels_return */, unsigned int /* npixels */ -#endif ); extern Status XAllocColorPlanes( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, Bool /* contig */, @@ -2131,119 +1986,89 @@ extern Status XAllocColorPlanes( unsigned long* /* rmask_return */, unsigned long* /* gmask_return */, unsigned long* /* bmask_return */ -#endif ); extern Status XAllocNamedColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, _Xconst char* /* color_name */, XColor* /* screen_def_return */, XColor* /* exact_def_return */ -#endif ); extern int XAllowEvents( -#if NeedFunctionPrototypes Display* /* display */, int /* event_mode */, Time /* time */ -#endif ); extern int XAutoRepeatOff( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XAutoRepeatOn( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XBell( -#if NeedFunctionPrototypes Display* /* display */, int /* percent */ -#endif ); extern int XBitmapBitOrder( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XBitmapPad( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XBitmapUnit( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XCellsOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XChangeActivePointerGrab( -#if NeedFunctionPrototypes Display* /* display */, unsigned int /* event_mask */, Cursor /* cursor */, Time /* time */ -#endif ); extern int XChangeGC( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* valuemask */, XGCValues* /* values */ -#endif ); extern int XChangeKeyboardControl( -#if NeedFunctionPrototypes Display* /* display */, unsigned long /* value_mask */, XKeyboardControl* /* values */ -#endif ); extern int XChangeKeyboardMapping( -#if NeedFunctionPrototypes Display* /* display */, int /* first_keycode */, int /* keysyms_per_keycode */, KeySym* /* keysyms */, int /* num_codes */ -#endif ); extern int XChangePointerControl( -#if NeedFunctionPrototypes Display* /* display */, Bool /* do_accel */, Bool /* do_threshold */, int /* accel_numerator */, int /* accel_denominator */, int /* threshold */ -#endif ); extern int XChangeProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom /* property */, @@ -2252,99 +2077,75 @@ extern int XChangeProperty( int /* mode */, _Xconst unsigned char* /* data */, int /* nelements */ -#endif ); extern int XChangeSaveSet( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* change_mode */ -#endif ); extern int XChangeWindowAttributes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned long /* valuemask */, XSetWindowAttributes* /* attributes */ -#endif ); extern Bool XCheckIfEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event_return */, Bool (*) ( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* event */, XPointer /* arg */ -#endif ) /* predicate */, XPointer /* arg */ -#endif ); extern Bool XCheckMaskEvent( -#if NeedFunctionPrototypes Display* /* display */, long /* event_mask */, XEvent* /* event_return */ -#endif ); extern Bool XCheckTypedEvent( -#if NeedFunctionPrototypes Display* /* display */, int /* event_type */, XEvent* /* event_return */ -#endif ); extern Bool XCheckTypedWindowEvent( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* event_type */, XEvent* /* event_return */ -#endif ); extern Bool XCheckWindowEvent( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, long /* event_mask */, XEvent* /* event_return */ -#endif ); extern int XCirculateSubwindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* direction */ -#endif ); extern int XCirculateSubwindowsDown( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XCirculateSubwindowsUp( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XClearArea( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* x */, @@ -2352,50 +2153,38 @@ extern int XClearArea( unsigned int /* width */, unsigned int /* height */, Bool /* exposures */ -#endif ); extern int XClearWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XCloseDisplay( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XConfigureWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned int /* value_mask */, XWindowChanges* /* values */ -#endif ); extern int XConnectionNumber( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XConvertSelection( -#if NeedFunctionPrototypes Display* /* display */, Atom /* selection */, Atom /* target */, Atom /* property */, Window /* requestor */, Time /* time */ -#endif ); extern int XCopyArea( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* src */, Drawable /* dest */, @@ -2406,20 +2195,16 @@ extern int XCopyArea( unsigned int /* height */, int /* dest_x */, int /* dest_y */ -#endif ); extern int XCopyGC( -#if NeedFunctionPrototypes Display* /* display */, GC /* src */, unsigned long /* valuemask */, GC /* dest */ -#endif ); extern int XCopyPlane( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* src */, Drawable /* dest */, @@ -2431,129 +2216,93 @@ extern int XCopyPlane( int /* dest_x */, int /* dest_y */, unsigned long /* plane */ -#endif ); extern int XDefaultDepth( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDefaultDepthOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XDefaultScreen( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XDefineCursor( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Cursor /* cursor */ -#endif ); extern int XDeleteProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom /* property */ -#endif ); extern int XDestroyWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XDestroySubwindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XDoesBackingStore( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern Bool XDoesSaveUnders( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XDisableAccessControl( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XDisplayCells( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDisplayHeight( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDisplayHeightMM( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDisplayKeycodes( -#if NeedFunctionPrototypes Display* /* display */, int* /* min_keycodes_return */, int* /* max_keycodes_return */ -#endif ); extern int XDisplayPlanes( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDisplayWidth( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDisplayWidthMM( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */ -#endif ); extern int XDrawArc( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2563,21 +2312,17 @@ extern int XDrawArc( unsigned int /* height */, int /* angle1 */, int /* angle2 */ -#endif ); extern int XDrawArcs( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XArc* /* arcs */, int /* narcs */ -#endif ); extern int XDrawImageString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2585,11 +2330,9 @@ extern int XDrawImageString( int /* y */, _Xconst char* /* string */, int /* length */ -#endif ); extern int XDrawImageString16( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2597,11 +2340,9 @@ extern int XDrawImageString16( int /* y */, _Xconst XChar2b* /* string */, int /* length */ -#endif ); extern int XDrawLine( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2609,43 +2350,35 @@ extern int XDrawLine( int /* y1 */, int /* x2 */, int /* y2 */ -#endif ); extern int XDrawLines( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XPoint* /* points */, int /* npoints */, int /* mode */ -#endif ); extern int XDrawPoint( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, int /* x */, int /* y */ -#endif ); extern int XDrawPoints( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XPoint* /* points */, int /* npoints */, int /* mode */ -#endif ); extern int XDrawRectangle( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2653,31 +2386,25 @@ extern int XDrawRectangle( int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XDrawRectangles( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XRectangle* /* rectangles */, int /* nrectangles */ -#endif ); extern int XDrawSegments( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XSegment* /* segments */, int /* nsegments */ -#endif ); extern int XDrawString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2685,11 +2412,9 @@ extern int XDrawString( int /* y */, _Xconst char* /* string */, int /* length */ -#endif ); extern int XDrawString16( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2697,11 +2422,9 @@ extern int XDrawString16( int /* y */, _Xconst XChar2b* /* string */, int /* length */ -#endif ); extern int XDrawText( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2709,11 +2432,9 @@ extern int XDrawText( int /* y */, XTextItem* /* items */, int /* nitems */ -#endif ); extern int XDrawText16( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2721,32 +2442,24 @@ extern int XDrawText16( int /* y */, XTextItem16* /* items */, int /* nitems */ -#endif ); extern int XEnableAccessControl( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XEventsQueued( -#if NeedFunctionPrototypes Display* /* display */, int /* mode */ -#endif ); extern Status XFetchName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, char** /* window_name_return */ -#endif ); extern int XFillArc( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2756,21 +2469,17 @@ extern int XFillArc( unsigned int /* height */, int /* angle1 */, int /* angle2 */ -#endif ); extern int XFillArcs( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XArc* /* arcs */, int /* narcs */ -#endif ); extern int XFillPolygon( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2778,11 +2487,9 @@ extern int XFillPolygon( int /* npoints */, int /* shape */, int /* mode */ -#endif ); extern int XFillRectangle( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -2790,117 +2497,85 @@ extern int XFillRectangle( int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XFillRectangles( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, XRectangle* /* rectangles */, int /* nrectangles */ -#endif ); extern int XFlush( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XForceScreenSaver( -#if NeedFunctionPrototypes Display* /* display */, int /* mode */ -#endif ); extern int XFree( -#if NeedFunctionPrototypes void* /* data */ -#endif ); extern int XFreeColormap( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */ -#endif ); extern int XFreeColors( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, unsigned long* /* pixels */, int /* npixels */, unsigned long /* planes */ -#endif ); extern int XFreeCursor( -#if NeedFunctionPrototypes Display* /* display */, Cursor /* cursor */ -#endif ); extern int XFreeExtensionList( -#if NeedFunctionPrototypes char** /* list */ -#endif ); extern int XFreeFont( -#if NeedFunctionPrototypes Display* /* display */, XFontStruct* /* font_struct */ -#endif ); extern int XFreeFontInfo( -#if NeedFunctionPrototypes char** /* names */, XFontStruct* /* free_info */, int /* actual_count */ -#endif ); extern int XFreeFontNames( -#if NeedFunctionPrototypes char** /* list */ -#endif ); extern int XFreeFontPath( -#if NeedFunctionPrototypes char** /* list */ -#endif ); extern int XFreeGC( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */ -#endif ); extern int XFreeModifiermap( -#if NeedFunctionPrototypes XModifierKeymap* /* modmap */ -#endif ); extern int XFreePixmap( -#if NeedFunctionPrototypes Display* /* display */, Pixmap /* pixmap */ -#endif ); extern int XGeometry( -#if NeedFunctionPrototypes Display* /* display */, int /* screen */, _Xconst char* /* position */, @@ -2914,48 +2589,38 @@ extern int XGeometry( int* /* y_return */, int* /* width_return */, int* /* height_return */ -#endif ); extern int XGetErrorDatabaseText( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* name */, _Xconst char* /* message */, _Xconst char* /* default_string */, char* /* buffer_return */, int /* length */ -#endif ); extern int XGetErrorText( -#if NeedFunctionPrototypes Display* /* display */, int /* code */, char* /* buffer_return */, int /* length */ -#endif ); extern Bool XGetFontProperty( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, Atom /* atom */, unsigned long* /* value_return */ -#endif ); extern Status XGetGCValues( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* valuemask */, XGCValues* /* values_return */ -#endif ); extern Status XGetGeometry( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, Window* /* root_return */, @@ -2965,69 +2630,53 @@ extern Status XGetGeometry( unsigned int* /* height_return */, unsigned int* /* border_width_return */, unsigned int* /* depth_return */ -#endif ); extern Status XGetIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, char** /* icon_name_return */ -#endif ); extern int XGetInputFocus( -#if NeedFunctionPrototypes Display* /* display */, Window* /* focus_return */, int* /* revert_to_return */ -#endif ); extern int XGetKeyboardControl( -#if NeedFunctionPrototypes Display* /* display */, XKeyboardState* /* values_return */ -#endif ); extern int XGetPointerControl( -#if NeedFunctionPrototypes Display* /* display */, int* /* accel_numerator_return */, int* /* accel_denominator_return */, int* /* threshold_return */ -#endif ); extern int XGetPointerMapping( -#if NeedFunctionPrototypes Display* /* display */, unsigned char* /* map_return */, int /* nmap */ -#endif ); extern int XGetScreenSaver( -#if NeedFunctionPrototypes Display* /* display */, int* /* timeout_return */, int* /* interval_return */, int* /* prefer_blanking_return */, int* /* allow_exposures_return */ -#endif ); extern Status XGetTransientForHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window* /* prop_window_return */ -#endif ); extern int XGetWindowProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom /* property */, @@ -3040,19 +2689,15 @@ extern int XGetWindowProperty( unsigned long* /* nitems_return */, unsigned long* /* bytes_after_return */, unsigned char** /* prop_return */ -#endif ); extern Status XGetWindowAttributes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XWindowAttributes* /* window_attributes_return */ -#endif ); extern int XGrabButton( -#if NeedFunctionPrototypes Display* /* display */, unsigned int /* button */, unsigned int /* modifiers */, @@ -3063,11 +2708,9 @@ extern int XGrabButton( int /* keyboard_mode */, Window /* confine_to */, Cursor /* cursor */ -#endif ); extern int XGrabKey( -#if NeedFunctionPrototypes Display* /* display */, int /* keycode */, unsigned int /* modifiers */, @@ -3075,22 +2718,18 @@ extern int XGrabKey( Bool /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */ -#endif ); extern int XGrabKeyboard( -#if NeedFunctionPrototypes Display* /* display */, Window /* grab_window */, Bool /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */, Time /* time */ -#endif ); extern int XGrabPointer( -#if NeedFunctionPrototypes Display* /* display */, Window /* grab_window */, Bool /* owner_events */, @@ -3100,236 +2739,171 @@ extern int XGrabPointer( Window /* confine_to */, Cursor /* cursor */, Time /* time */ -#endif ); extern int XGrabServer( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XHeightMMOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XHeightOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XIfEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event_return */, Bool (*) ( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* event */, XPointer /* arg */ -#endif ) /* predicate */, XPointer /* arg */ -#endif ); extern int XImageByteOrder( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XInstallColormap( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */ -#endif ); extern KeyCode XKeysymToKeycode( -#if NeedFunctionPrototypes Display* /* display */, KeySym /* keysym */ -#endif ); extern int XKillClient( -#if NeedFunctionPrototypes Display* /* display */, XID /* resource */ -#endif ); extern Status XLookupColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, _Xconst char* /* color_name */, XColor* /* exact_def_return */, XColor* /* screen_def_return */ -#endif ); extern int XLowerWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XMapRaised( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XMapSubwindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XMapWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XMaskEvent( -#if NeedFunctionPrototypes Display* /* display */, long /* event_mask */, XEvent* /* event_return */ -#endif ); extern int XMaxCmapsOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XMinCmapsOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XMoveResizeWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* x */, int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XMoveWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, int /* x */, int /* y */ -#endif ); extern int XNextEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event_return */ -#endif ); extern int XNoOp( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern Status XParseColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, _Xconst char* /* spec */, XColor* /* exact_def_return */ -#endif ); extern int XParseGeometry( -#if NeedFunctionPrototypes _Xconst char* /* parsestring */, int* /* x_return */, int* /* y_return */, unsigned int* /* width_return */, unsigned int* /* height_return */ -#endif ); extern int XPeekEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event_return */ -#endif ); extern int XPeekIfEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event_return */, Bool (*) ( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* event */, XPointer /* arg */ -#endif ) /* predicate */, XPointer /* arg */ -#endif ); extern int XPending( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XPlanesOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ - -#endif ); extern int XProtocolRevision( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XProtocolVersion( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XPutBackEvent( -#if NeedFunctionPrototypes Display* /* display */, XEvent* /* event */ -#endif ); extern int XPutImage( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -3340,28 +2914,22 @@ extern int XPutImage( int /* dest_y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XQLength( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern Status XQueryBestCursor( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, unsigned int /* width */, unsigned int /* height */, unsigned int* /* width_return */, unsigned int* /* height_return */ -#endif ); extern Status XQueryBestSize( -#if NeedFunctionPrototypes Display* /* display */, int /* class */, Drawable /* which_screen */, @@ -3369,67 +2937,53 @@ extern Status XQueryBestSize( unsigned int /* height */, unsigned int* /* width_return */, unsigned int* /* height_return */ -#endif ); extern Status XQueryBestStipple( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* which_screen */, unsigned int /* width */, unsigned int /* height */, unsigned int* /* width_return */, unsigned int* /* height_return */ -#endif ); extern Status XQueryBestTile( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* which_screen */, unsigned int /* width */, unsigned int /* height */, unsigned int* /* width_return */, unsigned int* /* height_return */ -#endif ); extern int XQueryColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, XColor* /* def_in_out */ -#endif ); extern int XQueryColors( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, XColor* /* defs_in_out */, int /* ncolors */ -#endif ); extern Bool XQueryExtension( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* name */, int* /* major_opcode_return */, int* /* first_event_return */, int* /* first_error_return */ -#endif ); extern int XQueryKeymap( -#if NeedFunctionPrototypes Display* /* display */, char [32] /* keys_return */ -#endif ); extern Bool XQueryPointer( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window* /* root_return */, @@ -3439,11 +2993,9 @@ extern Bool XQueryPointer( int* /* win_x_return */, int* /* win_y_return */, unsigned int* /* mask_return */ -#endif ); extern int XQueryTextExtents( -#if NeedFunctionPrototypes Display* /* display */, XID /* font_ID */, _Xconst char* /* string */, @@ -3452,11 +3004,9 @@ extern int XQueryTextExtents( int* /* font_ascent_return */, int* /* font_descent_return */, XCharStruct* /* overall_return */ -#endif ); extern int XQueryTextExtents16( -#if NeedFunctionPrototypes Display* /* display */, XID /* font_ID */, _Xconst XChar2b* /* string */, @@ -3465,29 +3015,23 @@ extern int XQueryTextExtents16( int* /* font_ascent_return */, int* /* font_descent_return */, XCharStruct* /* overall_return */ -#endif ); extern Status XQueryTree( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window* /* root_return */, Window* /* parent_return */, Window** /* children_return */, unsigned int* /* nchildren_return */ -#endif ); extern int XRaiseWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XReadBitmapFile( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, _Xconst char* /* filename */, @@ -3496,184 +3040,140 @@ extern int XReadBitmapFile( Pixmap* /* bitmap_return */, int* /* x_hot_return */, int* /* y_hot_return */ -#endif ); extern int XReadBitmapFileData( -#if NeedFunctionPrototypes _Xconst char* /* filename */, unsigned int* /* width_return */, unsigned int* /* height_return */, unsigned char** /* data_return */, int* /* x_hot_return */, int* /* y_hot_return */ -#endif ); extern int XRebindKeysym( -#if NeedFunctionPrototypes Display* /* display */, KeySym /* keysym */, KeySym* /* list */, int /* mod_count */, _Xconst unsigned char* /* string */, int /* bytes_string */ -#endif ); extern int XRecolorCursor( -#if NeedFunctionPrototypes Display* /* display */, Cursor /* cursor */, XColor* /* foreground_color */, XColor* /* background_color */ -#endif ); extern int XRefreshKeyboardMapping( -#if NeedFunctionPrototypes XMappingEvent* /* event_map */ -#endif ); extern int XRemoveFromSaveSet( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XRemoveHost( -#if NeedFunctionPrototypes Display* /* display */, XHostAddress* /* host */ -#endif ); extern int XRemoveHosts( -#if NeedFunctionPrototypes Display* /* display */, XHostAddress* /* hosts */, int /* num_hosts */ -#endif ); extern int XReparentWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Window /* parent */, int /* x */, int /* y */ -#endif ); extern int XResetScreenSaver( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XResizeWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XRestackWindows( -#if NeedFunctionPrototypes Display* /* display */, Window* /* windows */, int /* nwindows */ -#endif ); extern int XRotateBuffers( -#if NeedFunctionPrototypes Display* /* display */, int /* rotate */ -#endif ); extern int XRotateWindowProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Atom* /* properties */, int /* num_prop */, int /* npositions */ -#endif ); extern int XScreenCount( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XSelectInput( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, long /* event_mask */ -#endif ); extern Status XSendEvent( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Bool /* propagate */, long /* event_mask */, XEvent* /* event_send */ -#endif ); extern int XSetAccessControl( -#if NeedFunctionPrototypes Display* /* display */, int /* mode */ -#endif ); extern int XSetArcMode( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* arc_mode */ -#endif ); extern int XSetBackground( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* background */ -#endif ); extern int XSetClipMask( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Pixmap /* pixmap */ -#endif ); extern int XSetClipOrigin( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* clip_x_origin */, int /* clip_y_origin */ -#endif ); extern int XSetClipRectangles( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* clip_x_origin */, @@ -3681,314 +3181,240 @@ extern int XSetClipRectangles( XRectangle* /* rectangles */, int /* n */, int /* ordering */ -#endif ); extern int XSetCloseDownMode( -#if NeedFunctionPrototypes Display* /* display */, int /* close_mode */ -#endif ); extern int XSetCommand( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, char** /* argv */, int /* argc */ -#endif ); extern int XSetDashes( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* dash_offset */, _Xconst char* /* dash_list */, int /* n */ -#endif ); extern int XSetFillRule( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* fill_rule */ -#endif ); extern int XSetFillStyle( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* fill_style */ -#endif ); extern int XSetFont( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Font /* font */ -#endif ); extern int XSetFontPath( -#if NeedFunctionPrototypes Display* /* display */, char** /* directories */, int /* ndirs */ -#endif ); extern int XSetForeground( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* foreground */ -#endif ); extern int XSetFunction( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* function */ -#endif ); extern int XSetGraphicsExposures( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Bool /* graphics_exposures */ -#endif ); extern int XSetIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* icon_name */ -#endif ); extern int XSetInputFocus( -#if NeedFunctionPrototypes Display* /* display */, Window /* focus */, int /* revert_to */, Time /* time */ -#endif ); extern int XSetLineAttributes( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned int /* line_width */, int /* line_style */, int /* cap_style */, int /* join_style */ -#endif ); extern int XSetModifierMapping( -#if NeedFunctionPrototypes Display* /* display */, XModifierKeymap* /* modmap */ -#endif ); extern int XSetPlaneMask( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* plane_mask */ -#endif ); extern int XSetPointerMapping( -#if NeedFunctionPrototypes Display* /* display */, _Xconst unsigned char* /* map */, int /* nmap */ -#endif ); extern int XSetScreenSaver( -#if NeedFunctionPrototypes Display* /* display */, int /* timeout */, int /* interval */, int /* prefer_blanking */, int /* allow_exposures */ -#endif ); extern int XSetSelectionOwner( -#if NeedFunctionPrototypes Display* /* display */, Atom /* selection */, Window /* owner */, Time /* time */ -#endif ); extern int XSetState( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, unsigned long /* foreground */, unsigned long /* background */, int /* function */, unsigned long /* plane_mask */ -#endif ); extern int XSetStipple( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Pixmap /* stipple */ -#endif ); extern int XSetSubwindowMode( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* subwindow_mode */ -#endif ); extern int XSetTSOrigin( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, int /* ts_x_origin */, int /* ts_y_origin */ -#endif ); extern int XSetTile( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Pixmap /* tile */ -#endif ); extern int XSetWindowBackground( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned long /* background_pixel */ -#endif ); extern int XSetWindowBackgroundPixmap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Pixmap /* background_pixmap */ -#endif ); extern int XSetWindowBorder( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned long /* border_pixel */ -#endif ); extern int XSetWindowBorderPixmap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Pixmap /* border_pixmap */ -#endif ); extern int XSetWindowBorderWidth( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, unsigned int /* width */ -#endif ); extern int XSetWindowColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, Colormap /* colormap */ -#endif ); extern int XStoreBuffer( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* bytes */, int /* nbytes */, int /* buffer */ -#endif ); extern int XStoreBytes( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* bytes */, int /* nbytes */ -#endif ); extern int XStoreColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, XColor* /* color */ -#endif ); extern int XStoreColors( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, XColor* /* color */, int /* ncolors */ -#endif ); extern int XStoreName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* window_name */ -#endif ); extern int XStoreNamedColor( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */, _Xconst char* /* color */, unsigned long /* pixel */, int /* flags */ -#endif ); extern int XSync( -#if NeedFunctionPrototypes Display* /* display */, Bool /* discard */ -#endif ); extern int XTextExtents( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* nchars */, @@ -3996,11 +3422,9 @@ extern int XTextExtents( int* /* font_ascent_return */, int* /* font_descent_return */, XCharStruct* /* overall_return */ -#endif ); extern int XTextExtents16( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* nchars */, @@ -4008,27 +3432,21 @@ extern int XTextExtents16( int* /* font_ascent_return */, int* /* font_descent_return */, XCharStruct* /* overall_return */ -#endif ); extern int XTextWidth( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ -#endif ); extern int XTextWidth16( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* count */ -#endif ); extern Bool XTranslateCoordinates( -#if NeedFunctionPrototypes Display* /* display */, Window /* src_w */, Window /* dest_w */, @@ -4037,90 +3455,66 @@ extern Bool XTranslateCoordinates( int* /* dest_x_return */, int* /* dest_y_return */, Window* /* child_return */ -#endif ); extern int XUndefineCursor( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XUngrabButton( -#if NeedFunctionPrototypes Display* /* display */, unsigned int /* button */, unsigned int /* modifiers */, Window /* grab_window */ -#endif ); extern int XUngrabKey( -#if NeedFunctionPrototypes Display* /* display */, int /* keycode */, unsigned int /* modifiers */, Window /* grab_window */ -#endif ); extern int XUngrabKeyboard( -#if NeedFunctionPrototypes Display* /* display */, Time /* time */ -#endif ); extern int XUngrabPointer( -#if NeedFunctionPrototypes Display* /* display */, Time /* time */ -#endif ); extern int XUngrabServer( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XUninstallColormap( -#if NeedFunctionPrototypes Display* /* display */, Colormap /* colormap */ -#endif ); extern int XUnloadFont( -#if NeedFunctionPrototypes Display* /* display */, Font /* font */ -#endif ); extern int XUnmapSubwindows( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XUnmapWindow( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern int XVendorRelease( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); extern int XWarpPointer( -#if NeedFunctionPrototypes Display* /* display */, Window /* src_w */, Window /* dest_w */, @@ -4130,32 +3524,24 @@ extern int XWarpPointer( unsigned int /* src_height */, int /* dest_x */, int /* dest_y */ -#endif ); extern int XWidthMMOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XWidthOfScreen( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern int XWindowEvent( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, long /* event_mask */, XEvent* /* event_return */ -#endif ); extern int XWriteBitmapFile( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* filename */, Pixmap /* bitmap */, @@ -4163,194 +3549,152 @@ extern int XWriteBitmapFile( unsigned int /* height */, int /* x_hot */, int /* y_hot */ -#endif ); -extern Bool XSupportsLocale( -#if NeedFunctionPrototypes - void -#endif -); +extern Bool XSupportsLocale (void); extern char *XSetLocaleModifiers( -#if NeedFunctionPrototypes - _Xconst char* /* modifier_list */ -#endif + const char* /* modifier_list */ ); extern XOM XOpenOM( -#if NeedFunctionPrototypes Display* /* display */, struct _XrmHashBucketRec* /* rdb */, _Xconst char* /* res_name */, _Xconst char* /* res_class */ -#endif ); extern Status XCloseOM( -#if NeedFunctionPrototypes XOM /* om */ -#endif ); extern char *XSetOMValues( -#if NeedVarargsPrototypes XOM /* om */, ... -#endif ); extern char *XGetOMValues( -#if NeedVarargsPrototypes XOM /* om */, ... -#endif ); extern Display *XDisplayOfOM( -#if NeedFunctionPrototypes XOM /* om */ -#endif ); extern char *XLocaleOfOM( -#if NeedFunctionPrototypes XOM /* om */ -#endif ); extern XOC XCreateOC( -#if NeedVarargsPrototypes XOM /* om */, ... -#endif ); extern void XDestroyOC( -#if NeedFunctionPrototypes XOC /* oc */ -#endif ); extern XOM XOMOfOC( -#if NeedFunctionPrototypes XOC /* oc */ -#endif ); extern char *XSetOCValues( -#if NeedVarargsPrototypes XOC /* oc */, ... -#endif ); extern char *XGetOCValues( -#if NeedVarargsPrototypes XOC /* oc */, ... -#endif ); extern XFontSet XCreateFontSet( -#if NeedFunctionPrototypes Display* /* display */, _Xconst char* /* base_font_name_list */, char*** /* missing_charset_list */, int* /* missing_charset_count */, char** /* def_string */ -#endif ); extern void XFreeFontSet( -#if NeedFunctionPrototypes Display* /* display */, XFontSet /* font_set */ -#endif ); extern int XFontsOfFontSet( -#if NeedFunctionPrototypes XFontSet /* font_set */, XFontStruct*** /* font_struct_list */, char*** /* font_name_list */ -#endif ); extern char *XBaseFontNameListOfFontSet( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern char *XLocaleOfFontSet( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern Bool XContextDependentDrawing( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern Bool XDirectionalDependentDrawing( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern Bool XContextualDrawing( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern XFontSetExtents *XExtentsOfFontSet( -#if NeedFunctionPrototypes XFontSet /* font_set */ -#endif ); extern int XmbTextEscapement( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */ -#endif ); extern int XwcTextEscapement( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */ -#endif +); + +extern int Xutf8TextEscapement( + XFontSet /* font_set */, + _Xconst char* /* text */, + int /* bytes_text */ ); extern int XmbTextExtents( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, XRectangle* /* overall_ink_return */, XRectangle* /* overall_logical_return */ -#endif ); extern int XwcTextExtents( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */, XRectangle* /* overall_ink_return */, XRectangle* /* overall_logical_return */ -#endif +); + +extern int Xutf8TextExtents( + XFontSet /* font_set */, + _Xconst char* /* text */, + int /* bytes_text */, + XRectangle* /* overall_ink_return */, + XRectangle* /* overall_logical_return */ ); extern Status XmbTextPerCharExtents( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst char* /* text */, int /* bytes_text */, @@ -4360,11 +3704,9 @@ extern Status XmbTextPerCharExtents( int* /* num_chars */, XRectangle* /* overall_ink_return */, XRectangle* /* overall_logical_return */ -#endif ); extern Status XwcTextPerCharExtents( -#if NeedFunctionPrototypes XFontSet /* font_set */, _Xconst wchar_t* /* text */, int /* num_wchars */, @@ -4374,11 +3716,21 @@ extern Status XwcTextPerCharExtents( int* /* num_chars */, XRectangle* /* overall_ink_return */, XRectangle* /* overall_logical_return */ -#endif +); + +extern Status Xutf8TextPerCharExtents( + XFontSet /* font_set */, + _Xconst char* /* text */, + int /* bytes_text */, + XRectangle* /* ink_extents_buffer */, + XRectangle* /* logical_extents_buffer */, + int /* buffer_size */, + int* /* num_chars */, + XRectangle* /* overall_ink_return */, + XRectangle* /* overall_logical_return */ ); extern void XmbDrawText( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -4386,11 +3738,9 @@ extern void XmbDrawText( int /* y */, XmbTextItem* /* text_items */, int /* nitems */ -#endif ); extern void XwcDrawText( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, GC /* gc */, @@ -4398,11 +3748,19 @@ extern void XwcDrawText( int /* y */, XwcTextItem* /* text_items */, int /* nitems */ -#endif +); + +extern void Xutf8DrawText( + Display* /* display */, + Drawable /* d */, + GC /* gc */, + int /* x */, + int /* y */, + XmbTextItem* /* text_items */, + int /* nitems */ ); extern void XmbDrawString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -4411,11 +3769,9 @@ extern void XmbDrawString( int /* y */, _Xconst char* /* text */, int /* bytes_text */ -#endif ); extern void XwcDrawString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -4424,11 +3780,20 @@ extern void XwcDrawString( int /* y */, _Xconst wchar_t* /* text */, int /* num_wchars */ -#endif +); + +extern void Xutf8DrawString( + Display* /* display */, + Drawable /* d */, + XFontSet /* font_set */, + GC /* gc */, + int /* x */, + int /* y */, + _Xconst char* /* text */, + int /* bytes_text */ ); extern void XmbDrawImageString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -4437,11 +3802,9 @@ extern void XmbDrawImageString( int /* y */, _Xconst char* /* text */, int /* bytes_text */ -#endif ); extern void XwcDrawImageString( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* d */, XFontSet /* font_set */, @@ -4450,197 +3813,197 @@ extern void XwcDrawImageString( int /* y */, _Xconst wchar_t* /* text */, int /* num_wchars */ -#endif +); + +extern void Xutf8DrawImageString( + Display* /* display */, + Drawable /* d */, + XFontSet /* font_set */, + GC /* gc */, + int /* x */, + int /* y */, + _Xconst char* /* text */, + int /* bytes_text */ ); extern XIM XOpenIM( -#if NeedFunctionPrototypes Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, char* /* res_class */ -#endif ); extern Status XCloseIM( -#if NeedFunctionPrototypes XIM /* im */ -#endif ); extern char *XGetIMValues( -#if NeedVarargsPrototypes XIM /* im */, ... -#endif +); + +extern char *XSetIMValues( + XIM /* im */, ... ); extern Display *XDisplayOfIM( -#if NeedFunctionPrototypes XIM /* im */ -#endif ); extern char *XLocaleOfIM( -#if NeedFunctionPrototypes XIM /* im*/ -#endif ); extern XIC XCreateIC( -#if NeedVarargsPrototypes XIM /* im */, ... -#endif ); extern void XDestroyIC( -#if NeedFunctionPrototypes XIC /* ic */ -#endif ); extern void XSetICFocus( -#if NeedFunctionPrototypes XIC /* ic */ -#endif ); extern void XUnsetICFocus( -#if NeedFunctionPrototypes XIC /* ic */ -#endif ); extern wchar_t *XwcResetIC( -#if NeedFunctionPrototypes XIC /* ic */ -#endif ); extern char *XmbResetIC( -#if NeedFunctionPrototypes XIC /* ic */ -#endif +); + +extern char *Xutf8ResetIC( + XIC /* ic */ ); extern char *XSetICValues( -#if NeedVarargsPrototypes XIC /* ic */, ... -#endif ); extern char *XGetICValues( -#if NeedVarargsPrototypes XIC /* ic */, ... -#endif ); extern XIM XIMOfIC( -#if NeedFunctionPrototypes XIC /* ic */ -#endif ); extern Bool XFilterEvent( -#if NeedFunctionPrototypes XEvent* /* event */, Window /* window */ -#endif ); extern int XmbLookupString( -#if NeedFunctionPrototypes XIC /* ic */, XKeyPressedEvent* /* event */, char* /* buffer_return */, int /* bytes_buffer */, KeySym* /* keysym_return */, Status* /* status_return */ -#endif ); extern int XwcLookupString( -#if NeedFunctionPrototypes XIC /* ic */, XKeyPressedEvent* /* event */, wchar_t* /* buffer_return */, int /* wchars_buffer */, KeySym* /* keysym_return */, Status* /* status_return */ -#endif +); + +extern int Xutf8LookupString( + XIC /* ic */, + XKeyPressedEvent* /* event */, + char* /* buffer_return */, + int /* bytes_buffer */, + KeySym* /* keysym_return */, + Status* /* status_return */ ); extern XVaNestedList XVaCreateNestedList( -#if NeedVarargsPrototypes int /*unused*/, ... -#endif ); /* internal connections for IMs */ extern Bool XRegisterIMInstantiateCallback( -#if NeedFunctionPrototypes Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, char* /* res_class */, - XIMProc /* callback */, - XPointer* /* client_data */ -#endif + XIDProc /* callback */, + XPointer /* client_data */ ); extern Bool XUnregisterIMInstantiateCallback( -#if NeedFunctionPrototypes Display* /* dpy */, struct _XrmHashBucketRec* /* rdb */, char* /* res_name */, char* /* res_class */, - XIMProc /* callback */, - XPointer* /* client_data */ -#endif + XIDProc /* callback */, + XPointer /* client_data */ ); typedef void (*XConnectionWatchProc)( -#if NeedFunctionPrototypes Display* /* dpy */, XPointer /* client_data */, int /* fd */, Bool /* opening */, /* open or close flag */ XPointer* /* watch_data */ /* open sets, close uses */ -#endif ); extern Status XInternalConnectionNumbers( -#if NeedFunctionPrototypes Display* /* dpy */, int** /* fd_return */, int* /* count_return */ -#endif ); extern void XProcessInternalConnection( -#if NeedFunctionPrototypes Display* /* dpy */, int /* fd */ -#endif ); extern Status XAddConnectionWatch( -#if NeedFunctionPrototypes Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ -#endif ); extern void XRemoveConnectionWatch( -#if NeedFunctionPrototypes Display* /* dpy */, XConnectionWatchProc /* callback */, XPointer /* client_data */ +); + +extern void XSetAuthorization( + char * /* name */, + int /* namelen */, + char * /* data */, + int /* datalen */ +); + +extern int _Xmbtowc( + wchar_t * /* wstr */, +#ifdef ISC + char const * /* str */, + size_t /* len */ +#else + char * /* str */, + int /* len */ #endif ); +extern int _Xwctomb( + char * /* str */, + wchar_t /* wc */ +); + _XFUNCPROTOEND #endif /* _XLIB_H_ */ diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h index 3f3826b6..c1966ada 100644 --- a/include/X11/Xlibint.h +++ b/include/X11/Xlibint.h @@ -27,6 +27,10 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/X11/Xlibint.h,v 3.27 2003/05/27 22:26:26 tsi Exp $ */ + +#ifndef _XLIBINT_H_ +#define _XLIBINT_H_ 1 /* * Xlibint.h - Header definition and support file for the internal @@ -36,10 +40,8 @@ from The Open Group. * Warning, there be dragons here.... */ -#ifndef _XLIBINT_H_ -#define _XLIBINT_H_ - #include <X11/Xlib.h> +#include <X11/Xproto.h> /* to declare xEvent */ #ifdef WIN32 #define _XFlush _XFlushIt @@ -76,7 +78,9 @@ struct _XDisplay XID resource_mask; /* resource ID mask bits */ XID resource_id; /* allocator current ID */ int resource_shift; /* allocator shift to correct bits */ - XID (*resource_alloc)(); /* allocator function */ + XID (*resource_alloc)( /* allocator function */ + struct _XDisplay* + ); int byte_order; /* screen byte order, LSBFirst, MSBFirst */ int bitmap_unit; /* padding and data requirements */ int bitmap_pad; /* padding requirements on bitmaps */ @@ -95,7 +99,9 @@ struct _XDisplay char *bufmax; /* Output buffer maximum+1 address. */ unsigned max_request_size; /* maximum number 32 bit words in request*/ struct _XrmHashBucketRec *db; - int (*synchandler)(); /* Synchronization handler */ + int (*synchandler)( /* Synchronization handler */ + struct _XDisplay* + ); char *display_name; /* "host:display" string used on this connect*/ int default_screen; /* default screen for operations */ int nscreens; /* number of screens on this server*/ @@ -120,14 +126,26 @@ struct _XDisplay * list to find the right procedure for each event might be * expensive if many extensions are being used. */ - Bool (*event_vec[128])(); /* vector for wire to event */ - Status (*wire_vec[128])(); /* vector for event to wire */ + Bool (*event_vec[128])( /* vector for wire to event */ + Display * /* dpy */, + XEvent * /* re */, + xEvent * /* event */ + ); + Status (*wire_vec[128])( /* vector for event to wire */ + Display * /* dpy */, + XEvent * /* re */, + xEvent * /* event */ + ); KeySym lock_meaning; /* for XLookupString */ struct _XLockInfo *lock; /* multi-thread state, display lock */ struct _XInternalAsync *async_handlers; /* for internal async */ unsigned long bigreq_size; /* max size of big requests */ struct _XLockPtrs *lock_fns; /* pointers to threads functions */ - void (*idlist_alloc)(); /* XID list allocator function */ + void (*idlist_alloc)( /* XID list allocator function */ + Display * /* dpy */, + XID * /* ids */, + int /* count */ + ); /* things above this line should not move, for binary compatibility */ struct _XKeytrans *key_bindings; /* for XLookupString */ Font cursor_font; /* for XCreateFontCursor */ @@ -135,7 +153,11 @@ struct _XDisplay unsigned int mode_switch; /* keyboard group modifiers */ unsigned int num_lock; /* keyboard numlock modifiers */ struct _XContextDB *context_db; /* context database */ - Bool (**error_vec)(); /* vector for wire to error */ + Bool (**error_vec)( /* vector for wire to error */ + Display * /* display */, + XErrorEvent * /* he */, + xError * /* we */ + ); /* * Xcms information */ @@ -154,7 +176,9 @@ struct _XDisplay struct _XConnWatchInfo *conn_watchers; /* XAddConnectionWatch */ int watcher_count; /* number of conn_watchers */ XPointer filedes; /* struct pollfd cache for _XWaitForReadable */ - int (*savedsynchandler)(); /* user synchandler when Xlib usurps */ + int (*savedsynchandler)( /* user synchandler when Xlib usurps */ + Display * /* dpy */ + ); XID resource_max; /* allocator max ID */ int xcmisc_opcode; /* major opcode for XC-MISC */ struct _XkbInfoRec *xkb_info; /* XKB info */ @@ -186,10 +210,8 @@ typedef struct _XSQEvent #define NEED_REPLIES #endif -#if NeedFunctionPrototypes /* prototypes require event type definitions */ #define NEED_EVENTS #define NEED_REPLIES -#endif #include <X11/Xproto.h> #ifdef __sgi #define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ @@ -204,18 +226,12 @@ typedef struct _XSQEvent #undef dirty #endif -#ifndef X_NOT_STDC_ENV #include <stdlib.h> #include <string.h> -#else -char *malloc(), *realloc(), *calloc(); -void exit(); -#ifdef SYSV -#include <string.h> -#else -#include <strings.h> -#endif -#endif + +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN /* * The following definitions can be used for locking requests in multi-threaded @@ -227,16 +243,27 @@ void exit(); * declarations for C Threads locking */ -#include <X11/Xfuncproto.h> +typedef struct _LockInfoRec *LockInfoPtr; +/* interfaces for locking.c */ struct _XLockPtrs { /* used by all, including extensions; do not move */ - void (*lock_display)(); - void (*unlock_display)(); + void (*lock_display)( + Display *dpy +#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char *file + , int line +#endif + ); + void (*unlock_display)( + Display *dpy +#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char *file + , int line +#endif + ); }; -typedef struct _LockInfoRec *LockInfoPtr; - #if defined(WIN32) && !defined(_XLIBINT_) #define _XCreateMutex_fn (*_XCreateMutex_fn_p) #define _XFreeMutex_fn (*_XFreeMutex_fn_p) @@ -247,32 +274,24 @@ typedef struct _LockInfoRec *LockInfoPtr; /* in XlibInt.c */ extern void (*_XCreateMutex_fn)( -#if NeedFunctionPrototypes LockInfoPtr /* lock */ -#endif ); extern void (*_XFreeMutex_fn)( -#if NeedFunctionPrototypes LockInfoPtr /* lock */ -#endif ); extern void (*_XLockMutex_fn)( -#if NeedFunctionPrototypes LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) , char * /* file */ , int /* line */ #endif -#endif ); extern void (*_XUnlockMutex_fn)( -#if NeedFunctionPrototypes LockInfoPtr /* lock */ #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) , char * /* file */ , int /* line */ #endif -#endif ); extern LockInfoPtr _Xglobal_lock; @@ -323,16 +342,11 @@ extern LockInfoPtr _Xglobal_lock; #endif -#ifndef NULL -#define NULL 0 -#endif +#include <stddef.h> + #define LOCKED 1 #define UNLOCKED 0 -#ifdef X_NOT_STDC_ENV -extern int errno; /* Internal system error number. */ -#endif - #ifndef BUFSIZE #define BUFSIZE 2048 /* X output buffer size. */ #endif @@ -372,6 +386,7 @@ extern int errno; /* Internal system error number. */ #define XlibDisplayReadEvents (1L << 5) /* in _XReadEvents */ #define XlibDisplayReply (1L << 5) /* in _XReply */ #define XlibDisplayWriting (1L << 6) /* in _XFlushInt, _XSend */ +#define XlibDisplayDfltRMDB (1L << 7) /* mark if RM db from XGetDefault */ /* * X Protocol packetizing macros. @@ -407,7 +422,7 @@ extern int errno; /* Internal system error number. */ * */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\ @@ -433,7 +448,7 @@ extern int errno; /* Internal system error number. */ /* GetReqExtra is the same as GetReq, but allocates "n" additional bytes after the request. "n" must be a multiple of 4! */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReqExtra(name, n, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\ @@ -462,7 +477,7 @@ extern int errno; /* Internal system error number. */ * "rid" is the name of the resource. */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define GetResReq(name, rid, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\ @@ -490,7 +505,7 @@ extern int errno; /* Internal system error number. */ * GetEmptyReq is for those requests that have no arguments * at all. */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define GetEmptyReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\ @@ -563,7 +578,7 @@ extern int errno; /* Internal system error number. */ #define SyncHandle() \ if (dpy->synchandler) (*dpy->synchandler)(dpy) -extern void _XFlushGCCache(); +extern void _XFlushGCCache(Display *dpy, GC gc); #define FlushGC(dpy, gc) \ if ((gc)->dirty) _XFlushGCCache((dpy), (gc)) /* @@ -575,12 +590,13 @@ extern void _XFlushGCCache(); * "len" is the length of the data buffer. */ #ifndef DataRoutineIsProcedure -#define Data(dpy, data, len) \ +#define Data(dpy, data, len) {\ if (dpy->bufptr + (len) <= dpy->bufmax) {\ memcpy(dpy->bufptr, data, (int)len);\ dpy->bufptr += ((len) + 3) & ~3;\ } else\ - _XSend(dpy, data, len) + _XSend(dpy, data, len);\ + } #endif /* DataRoutineIsProcedure */ @@ -602,6 +618,7 @@ extern void _XFlushGCCache(); if (dpy->bufptr + (n) > dpy->bufmax) \ _XFlush (dpy); \ ptr = (type) dpy->bufptr; \ + (void)ptr; \ dpy->bufptr += (n); #ifdef WORD64 @@ -613,6 +630,16 @@ extern void _XFlushGCCache(); #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len)) #ifdef LONG64 #define Data32(dpy, data, len) _XData32(dpy, (long *)data, len) +extern int _XData32( + Display *dpy, + register long *data, + unsigned len +); +extern void _XRead32( + Display *dpy, + register long *data, + long len +); #else #define Data32(dpy, data, len) Data((dpy), (char *)(data), (len)) #define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len)) @@ -712,13 +739,11 @@ typedef struct _XInternalAsync { * The handler returns True iff it handled this reply. */ Bool (*handler)( -#if NeedNestedPrototypes Display* /* dpy */, xReply* /* rep */, char* /* buf */, int /* len */, XPointer /* data */ -#endif ); XPointer data; } _XAsyncHandler; @@ -733,7 +758,7 @@ typedef struct _XAsyncEState { int error_count; } _XAsyncErrorState; -extern void _XDeqAsyncHandler(); +extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler); #define DeqAsyncHandler(dpy,handler) { \ if (dpy->async_handlers == (handler)) \ dpy->async_handlers = (handler)->next; \ @@ -741,131 +766,180 @@ extern void _XDeqAsyncHandler(); _XDeqAsyncHandler(dpy, handler); \ } +typedef void (*FreeFuncType) ( + Display* /* display */ +); + +typedef int (*FreeModmapType) ( + XModifierKeymap* /* modmap */ +); + /* * This structure is private to the library. */ typedef struct _XFreeFuncs { - void (*atoms)(); /* _XFreeAtomTable */ - int (*modifiermap)(); /* XFreeModifierMap */ - void (*key_bindings)(); /* _XFreeKeyBindings */ - void (*context_db)(); /* _XFreeContextDB */ - void (*defaultCCCs)(); /* _XcmsFreeDefaultCCCs */ - void (*clientCmaps)(); /* _XcmsFreeClientCmaps */ - void (*intensityMaps)(); /* _XcmsFreeIntensityMaps */ - void (*im_filters)(); /* _XFreeIMFilters */ - void (*xkb)(); /* _XkbFreeInfo */ + FreeFuncType atoms; /* _XFreeAtomTable */ + FreeModmapType modifiermap; /* XFreeModifierMap */ + FreeFuncType key_bindings; /* _XFreeKeyBindings */ + FreeFuncType context_db; /* _XFreeContextDB */ + FreeFuncType defaultCCCs; /* _XcmsFreeDefaultCCCs */ + FreeFuncType clientCmaps; /* _XcmsFreeClientCmaps */ + FreeFuncType intensityMaps; /* _XcmsFreeIntensityMaps */ + FreeFuncType im_filters; /* _XFreeIMFilters */ + FreeFuncType xkb; /* _XkbFreeInfo */ } _XFreeFuncRec; +/* types for InitExt.c */ +typedef int (*CreateGCType) ( + Display* /* display */, + GC /* gc */, + XExtCodes* /* codes */ +); + +typedef int (*CopyGCType)( + Display* /* display */, + GC /* gc */, + XExtCodes* /* codes */ +); + +typedef int (*FlushGCType) ( + Display* /* display */, + GC /* gc */, + XExtCodes* /* codes */ +); + +typedef int (*FreeGCType) ( + Display* /* display */, + GC /* gc */, + XExtCodes* /* codes */ +); + +typedef int (*CreateFontType) ( + Display* /* display */, + XFontStruct* /* fs */, + XExtCodes* /* codes */ +); + +typedef int (*FreeFontType) ( + Display* /* display */, + XFontStruct* /* fs */, + XExtCodes* /* codes */ +); + +typedef int (*CloseDisplayType) ( + Display* /* display */, + XExtCodes* /* codes */ +); + +typedef int (*ErrorType) ( + Display* /* display */, + xError* /* err */, + XExtCodes* /* codes */, + int* /* ret_code */ +); + +typedef char* (*ErrorStringType) ( + Display* /* display */, + int /* code */, + XExtCodes* /* codes */, + char* /* buffer */, + int /* nbytes */ +); + +typedef void (*PrintErrorType)( + Display* /* display */, + XErrorEvent* /* ev */, + void* /* fp */ +); + +typedef void (*BeforeFlushType)( + Display* /* display */, + XExtCodes* /* codes */, + _Xconst char* /* data */, + long /* len */ +); + /* * This structure is private to the library. */ -typedef struct _XExten { /* private to extension mechanism */ - struct _XExten *next; /* next in list */ - XExtCodes codes; /* public information, all extension told */ - int (*create_GC)(); /* routine to call when GC created */ - int (*copy_GC)(); /* routine to call when GC copied */ - int (*flush_GC)(); /* routine to call when GC flushed */ - int (*free_GC)(); /* routine to call when GC freed */ - int (*create_Font)(); /* routine to call when Font created */ - int (*free_Font)(); /* routine to call when Font freed */ - int (*close_display)(); /* routine to call when connection closed */ - int (*error)(); /* who to call when an error occurs */ - char *(*error_string)(); /* routine to supply error string */ - char *name; /* name of this extension */ - void (*error_values)(); /* routine to supply error values */ - void (*before_flush)(); /* routine to call when sending data */ - struct _XExten *next_flush; /* next in list of those with flushes */ +typedef struct _XExten { /* private to extension mechanism */ + struct _XExten *next; /* next in list */ + XExtCodes codes; /* public information, all extension told */ + CreateGCType create_GC; /* routine to call when GC created */ + CopyGCType copy_GC; /* routine to call when GC copied */ + FlushGCType flush_GC; /* routine to call when GC flushed */ + FreeGCType free_GC; /* routine to call when GC freed */ + CreateFontType create_Font; /* routine to call when Font created */ + FreeFontType free_Font; /* routine to call when Font freed */ + CloseDisplayType close_display; /* routine to call when connection closed */ + ErrorType error; /* who to call when an error occurs */ + ErrorStringType error_string; /* routine to supply error string */ + char *name; /* name of this extension */ + PrintErrorType error_values; /* routine to supply error values */ + BeforeFlushType before_flush; /* routine to call when sending data */ + struct _XExten *next_flush; /* next in list of those with flushes */ } _XExtension; /* extension hooks */ -_XFUNCPROTOBEGIN - #ifdef DataRoutineIsProcedure -extern void Data(); +extern void Data(Display *dpy, char *data, long len); #endif extern int _XError( -#if NeedFunctionPrototypes Display* /* dpy */, xError* /* rep */ -#endif ); extern int _XIOError( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern int (*_XIOErrorFunction)( -#if NeedNestedPrototypes Display* /* dpy */ -#endif ); extern int (*_XErrorFunction)( -#if NeedNestedPrototypes Display* /* dpy */, XErrorEvent* /* error_event */ -#endif ); extern void _XEatData( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned long /* n */ -#endif ); extern char *_XAllocScratch( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned long /* nbytes */ -#endif ); extern char *_XAllocTemp( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned long /* nbytes */ -#endif ); extern void _XFreeTemp( -#if NeedFunctionPrototypes Display* /* dpy */, char* /* buf */, unsigned long /* nbytes */ -#endif ); extern Visual *_XVIDtoVisual( -#if NeedFunctionPrototypes Display* /* dpy */, VisualID /* id */ -#endif ); extern unsigned long _XSetLastRequestRead( -#if NeedFunctionPrototypes Display* /* dpy */, xGenericReply* /* rep */ -#endif ); extern int _XGetHostname( -#if NeedFunctionPrototypes char* /* buf */, int /* maxlen */ -#endif ); extern Screen *_XScreenOfWindow( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* w */ -#endif ); extern Bool _XAsyncErrorHandler( -#if NeedFunctionPrototypes Display* /* dpy */, xReply* /* rep */, char* /* buf */, int /* len */, XPointer /* data */ -#endif ); extern char *_XGetAsyncReply( -#if NeedFunctionPrototypes Display* /* dpy */, char* /* replbuf */, xReply* /* rep */, @@ -873,347 +947,270 @@ extern char *_XGetAsyncReply( int /* len */, int /* extra */, Bool /* discard */ -#endif +); +extern void _XGetAsyncData( + Display* /* dpy */, + char * /* data */, + char * /* buf */, + int /* len */, + int /* skip */, + int /* datalen */, + int /* discardtotal */ ); extern void _XFlush( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern int _XEventsQueued( -#if NeedFunctionPrototypes Display* /* dpy */, int /* mode */ -#endif ); extern void _XReadEvents( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern int _XRead( -#if NeedFunctionPrototypes Display* /* dpy */, char* /* data */, long /* size */ -#endif ); extern void _XReadPad( -#if NeedFunctionPrototypes Display* /* dpy */, char* /* data */, long /* size */ -#endif ); extern void _XSend( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst char* /* data */, long /* size */ -#endif ); extern Status _XReply( -#if NeedFunctionPrototypes Display* /* dpy */, xReply* /* rep */, int /* extra */, Bool /* discard */ -#endif ); extern void _XEnq( -#if NeedFunctionPrototypes Display* /* dpy */, xEvent* /* event */ -#endif ); extern void _XDeq( -#if NeedFunctionPrototypes Display* /* dpy */, _XQEvent* /* prev */, _XQEvent* /* qelt */ -#endif +); + +extern Bool _XUnknownWireEvent( + Display* /* dpy */, + XEvent* /* re */, + xEvent* /* event */ +); +extern Status _XUnknownNativeEvent( + Display* /* dpy */, + XEvent* /* re */, + xEvent* /* event */ +); + +extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event); +extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we); +extern Bool _XPollfdCacheInit(Display *dpy); +extern void _XPollfdCacheAdd(Display *dpy, int fd); +extern void _XPollfdCacheDel(Display *dpy, int fd); +extern XID _XAllocID(Display *dpy); +extern void _XAllocIDs(Display *dpy, XID *ids, int count); + +extern int _XFreeExtData( + XExtData* /* extension */ ); extern int (*XESetCreateGC( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, GC, XExtCodes* -#endif ); extern int (*XESetCopyGC( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, GC, XExtCodes* -#endif ); extern int (*XESetFlushGC( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, GC, XExtCodes* -#endif ); extern int (*XESetFreeGC( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, GC, XExtCodes* -#endif ); extern int (*XESetCreateFont( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, XFontStruct* /* fs */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XFontStruct*, XExtCodes* -#endif ); extern int (*XESetFreeFont( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, XFontStruct* /* fs */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XFontStruct*, XExtCodes* -#endif ); extern int (*XESetCloseDisplay( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, XExtCodes* /* codes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XExtCodes* -#endif ); extern int (*XESetError( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, int (*) ( -#if NeedNestedPrototypes Display* /* display */, xError* /* err */, XExtCodes* /* codes */, int* /* ret_code */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, xError*, XExtCodes*, int* -#endif ); extern char* (*XESetErrorString( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, char* (*) ( -#if NeedNestedPrototypes Display* /* display */, int /* code */, XExtCodes* /* codes */, char* /* buffer */, int /* nbytes */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, int, XExtCodes*, char*, int -#endif ); extern void (*XESetPrintErrorValues ( -#if NeedFunctionPrototypes Display* /* display */, int /* extension */, void (*)( -#if NeedNestedPrototypes Display* /* display */, XErrorEvent* /* ev */, void* /* fp */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XErrorEvent*, void* -#endif ); extern Bool (*XESetWireToEvent( -#if NeedFunctionPrototypes Display* /* display */, int /* event_number */, Bool (*) ( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* re */, xEvent* /* event */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XEvent*, xEvent* -#endif ); extern Status (*XESetEventToWire( -#if NeedFunctionPrototypes Display* /* display */, int /* event_number */, Status (*) ( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* re */, xEvent* /* event */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XEvent*, xEvent* -#endif ); extern Bool (*XESetWireToError( -#if NeedFunctionPrototypes Display* /* display */, int /* error_number */, Bool (*) ( -#if NeedNestedPrototypes Display* /* display */, XErrorEvent* /* he */, xError* /* we */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes Display*, XErrorEvent*, xError* -#endif ); extern void (*XESetBeforeFlush( -#if NeedFunctionPrototypes Display* /* display */, int /* error_number */, void (*) ( -#if NeedNestedPrototypes Display* /* display */, XExtCodes* /* codes */, - char* /* data */, + _Xconst char* /* data */, long /* len */ -#endif ) /* proc */ -#endif ))( -#if NeedNestedPrototypes - Display*, XExtCodes*, char*, long -#endif + Display*, XExtCodes*, _Xconst char*, long ); /* internal connections for IMs */ typedef void (*_XInternalConnectionProc)( -#if NeedFunctionPrototypes Display* /* dpy */, int /* fd */, XPointer /* call_data */ -#endif ); extern Status _XRegisterInternalConnection( -#if NeedFunctionPrototypes Display* /* dpy */, int /* fd */, _XInternalConnectionProc /* callback */, XPointer /* call_data */ -#endif ); extern void _XUnregisterInternalConnection( -#if NeedFunctionPrototypes Display* /* dpy */, int /* fd */ -#endif ); /* Display structure has pointers to these */ @@ -1232,47 +1229,75 @@ struct _XConnWatchInfo { /* info from XAddConnectionWatch */ struct _XConnWatchInfo *next; }; +#ifdef __UNIXOS2__ +extern char* __XOS2RedirRoot( + char* +); +#endif + extern int _XTextHeight( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst char* /* string */, int /* count */ -#endif ); extern int _XTextHeight16( -#if NeedFunctionPrototypes XFontStruct* /* font_struct */, _Xconst XChar2b* /* string */, int /* count */ -#endif ); -#if defined(WIN32) || defined(__EMX__) /* || defined(OS2) */ +#if defined(WIN32) + extern int _XOpenFile( -#if NeedFunctionPrototypes _Xconst char* /* path */, int /* flags */ -#endif ); extern void* _XFopenFile( -#if NeedFunctionPrototypes _Xconst char* /* path */, _Xconst char* /* mode */ -#endif ); extern int _XAccessFile( -#if NeedFunctionPrototypes _Xconst char* /* path */ -#endif ); #else #define _XOpenFile(path,flags) open(path,flags) #define _XFopenFile(path,mode) fopen(path,mode) #endif +/* EvToWire.c */ +extern Status _XEventToWire(Display *dpy, XEvent *re, xEvent *event); + +extern int _XF86LoadQueryLocaleFont( + Display* /* dpy */, + _Xconst char* /* name*/, + XFontStruct** /* xfp*/, + Font* /* fidp */ +); + +extern void _XProcessWindowAttributes ( + register Display *dpy, + xChangeWindowAttributesReq *req, + register unsigned long valuemask, + register XSetWindowAttributes *attributes); + +extern int _XDefaultError( + Display *dpy, + XErrorEvent *event); + +extern int _XDefaultIOError( + Display *dpy); + +extern void _XSetClipRectangles ( + register Display *dpy, + GC gc, + int clip_x_origin, int clip_y_origin, + XRectangle *rectangles, + int n, + int ordering); + _XFUNCPROTOEND #endif /* _XLIBINT_H_ */ diff --git a/include/X11/Xlocale.h b/include/X11/Xlocale.h index 77702b1b..61d2f7a8 100644 --- a/include/X11/Xlocale.h +++ b/include/X11/Xlocale.h @@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/X11/Xlocale.h,v 1.4 2001/12/14 19:54:09 dawes Exp $ */ #ifndef _XLOCALE_H_ #define _XLOCALE_H_ @@ -34,12 +35,6 @@ from The Open Group. #include <X11/Xosdefs.h> #ifndef X_LOCALE -#ifdef X_NOT_STDC_ENV -#define X_LOCALE -#endif -#endif - -#ifndef X_LOCALE #include <locale.h> #else @@ -52,18 +47,14 @@ from The Open Group. _XFUNCPROTOBEGIN extern char *_Xsetlocale( -#if NeedFunctionPrototypes int /* category */, _Xconst char* /* name */ -#endif ); _XFUNCPROTOEND #define setlocale _Xsetlocale -#ifndef NULL -#define NULL 0 -#endif +#include <stddef.h> #endif /* X_LOCALE */ diff --git a/include/X11/Xresource.h b/include/X11/Xresource.h index b195bb51..ce121374 100644 --- a/include/X11/Xresource.h +++ b/include/X11/Xresource.h @@ -46,13 +46,14 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/X11/Xresource.h,v 3.8 2001/12/14 19:54:10 dawes Exp $ */ #ifndef _XRESOURCE_H_ #define _XRESOURCE_H_ -/* You must include <X11/Xlib.h> before including this file */ - +#ifndef _XP_PRINT_SERVER_ #include <X11/Xlib.h> +#endif /**************************************************************** **************************************************************** @@ -73,9 +74,7 @@ _XFUNCPROTOBEGIN ****************************************************************/ extern char *Xpermalloc( -#if NeedFunctionPrototypes unsigned int /* size */ -#endif ); /**************************************************************** @@ -84,7 +83,7 @@ extern char *Xpermalloc( * ****************************************************************/ -typedef int XrmQuark, *XrmQuarkList; +typedef int XrmQuark, *XrmQuarkList; #define NULLQUARK ((XrmQuark) 0) typedef char *XrmString; @@ -92,28 +91,20 @@ typedef char *XrmString; /* find quark for string, create new quark if none already exists */ extern XrmQuark XrmStringToQuark( -#if NeedFunctionPrototypes _Xconst char* /* string */ -#endif ); extern XrmQuark XrmPermStringToQuark( -#if NeedFunctionPrototypes _Xconst char* /* string */ -#endif ); /* find string for quark */ extern XrmString XrmQuarkToString( -#if NeedFunctionPrototypes XrmQuark /* quark */ -#endif ); extern XrmQuark XrmUniqueQuark( -#if NeedFunctionPrototypes void -#endif ); #define XrmStringsEqual(a1, a2) (strcmp(a1, a2) == 0) @@ -128,18 +119,14 @@ extern XrmQuark XrmUniqueQuark( typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList; extern void XrmStringToQuarkList( -#if NeedFunctionPrototypes _Xconst char* /* string */, XrmQuarkList /* quarks_return */ -#endif ); extern void XrmStringToBindingQuarkList( -#if NeedFunctionPrototypes _Xconst char* /* string */, XrmBindingList /* bindings_return */, XrmQuarkList /* quarks_return */ -#endif ); /**************************************************************** @@ -191,92 +178,72 @@ typedef struct _XrmHashBucketRec *XrmDatabase; extern void XrmDestroyDatabase( -#if NeedFunctionPrototypes XrmDatabase /* database */ -#endif ); extern void XrmQPutResource( -#if NeedFunctionPrototypes XrmDatabase* /* database */, XrmBindingList /* bindings */, XrmQuarkList /* quarks */, XrmRepresentation /* type */, XrmValue* /* value */ -#endif ); extern void XrmPutResource( -#if NeedFunctionPrototypes XrmDatabase* /* database */, _Xconst char* /* specifier */, _Xconst char* /* type */, XrmValue* /* value */ -#endif ); extern void XrmQPutStringResource( -#if NeedFunctionPrototypes XrmDatabase* /* database */, XrmBindingList /* bindings */, XrmQuarkList /* quarks */, _Xconst char* /* value */ -#endif ); extern void XrmPutStringResource( -#if NeedFunctionPrototypes XrmDatabase* /* database */, _Xconst char* /* specifier */, _Xconst char* /* value */ -#endif ); extern void XrmPutLineResource( -#if NeedFunctionPrototypes XrmDatabase* /* database */, _Xconst char* /* line */ -#endif ); extern Bool XrmQGetResource( -#if NeedFunctionPrototypes XrmDatabase /* database */, XrmNameList /* quark_name */, XrmClassList /* quark_class */, XrmRepresentation* /* quark_type_return */, XrmValue* /* value_return */ -#endif ); extern Bool XrmGetResource( -#if NeedFunctionPrototypes XrmDatabase /* database */, _Xconst char* /* str_name */, _Xconst char* /* str_class */, char** /* str_type_return */, XrmValue* /* value_return */ -#endif ); extern Bool XrmQGetSearchList( -#if NeedFunctionPrototypes XrmDatabase /* database */, XrmNameList /* names */, XrmClassList /* classes */, XrmSearchList /* list_return */, int /* list_length */ -#endif ); extern Bool XrmQGetSearchResource( -#if NeedFunctionPrototypes XrmSearchList /* list */, XrmName /* name */, XrmClass /* class */, XrmRepresentation* /* type_return */, XrmValue* /* value_return */ -#endif ); /**************************************************************** @@ -285,88 +252,70 @@ extern Bool XrmQGetSearchResource( * ****************************************************************/ +#ifndef _XP_PRINT_SERVER_ + extern void XrmSetDatabase( -#if NeedFunctionPrototypes Display* /* display */, XrmDatabase /* database */ -#endif ); extern XrmDatabase XrmGetDatabase( -#if NeedFunctionPrototypes Display* /* display */ -#endif ); +#endif /* !_XP_PRINT_SERVER_ */ + extern XrmDatabase XrmGetFileDatabase( -#if NeedFunctionPrototypes _Xconst char* /* filename */ -#endif ); extern Status XrmCombineFileDatabase( -#if NeedFunctionPrototypes _Xconst char* /* filename */, XrmDatabase* /* target */, Bool /* override */ -#endif ); extern XrmDatabase XrmGetStringDatabase( -#if NeedFunctionPrototypes _Xconst char* /* data */ /* null terminated string */ -#endif ); extern void XrmPutFileDatabase( -#if NeedFunctionPrototypes XrmDatabase /* database */, _Xconst char* /* filename */ -#endif ); extern void XrmMergeDatabases( -#if NeedFunctionPrototypes XrmDatabase /* source_db */, XrmDatabase* /* target_db */ -#endif ); extern void XrmCombineDatabase( -#if NeedFunctionPrototypes XrmDatabase /* source_db */, XrmDatabase* /* target_db */, Bool /* override */ -#endif ); #define XrmEnumAllLevels 0 #define XrmEnumOneLevel 1 extern Bool XrmEnumerateDatabase( -#if NeedFunctionPrototypes XrmDatabase /* db */, XrmNameList /* name_prefix */, XrmClassList /* class_prefix */, int /* mode */, Bool (*)( -#if NeedNestedPrototypes XrmDatabase* /* db */, XrmBindingList /* bindings */, XrmQuarkList /* quarks */, XrmRepresentation* /* type */, XrmValue* /* value */, XPointer /* closure */ -#endif ) /* proc */, XPointer /* closure */ -#endif ); -extern char *XrmLocaleOfDatabase( -#if NeedFunctionPrototypes +extern const char *XrmLocaleOfDatabase( XrmDatabase /* database */ -#endif ); @@ -397,14 +346,12 @@ typedef struct { extern void XrmParseCommand( -#if NeedFunctionPrototypes XrmDatabase* /* database */, XrmOptionDescList /* table */, int /* table_count */, _Xconst char* /* name */, int* /* argc_in_out */, char** /* argv_in_out */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h index 17438e89..931cfd0f 100644 --- a/include/X11/Xutil.h +++ b/include/X11/Xutil.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/X11/Xutil.h,v 3.6 2003/04/13 19:22:20 dawes Exp $ */ #ifndef _XUTIL_H_ #define _XUTIL_H_ @@ -167,7 +168,9 @@ typedef enum { XStringStyle, /* STRING */ XCompoundTextStyle, /* COMPOUND_TEXT */ XTextStyle, /* text in owner's encoding (current locale)*/ - XStdICCTextStyle /* STRING, else COMPOUND_TEXT */ + XStdICCTextStyle, /* STRING, else COMPOUND_TEXT */ + /* The following is an XFree86 extension, introduced in November 2000 */ + XUTF8StringStyle /* UTF8_STRING */ } XICCEncodingStyle; typedef struct { @@ -181,6 +184,24 @@ typedef struct { char *res_class; } XClassHint; +#ifdef XUTIL_DEFINE_FUNCTIONS +extern int XDestroyImage( + XImage *ximage); +extern unsigned long XGetPixel( + XImage *ximage, + int x, int y); +extern int XPutPixel( + XImage *ximage, + int x, int y, + unsigned long pixel); +extern XImage *XSubImage( + XImage *ximage, + int x, int y, + unsigned int width, unsigned int height); +extern int XAddPixel( + XImage *ximage, + long value); +#else /* * These macros are used to give some sugar to the image routines so that * naive people are more comfortable with them. @@ -195,6 +216,7 @@ typedef struct { ((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height))) #define XAddPixel(ximage, value) \ ((*((ximage)->f.add_pixel))((ximage), (value))) +#endif /* * Compose sequence status structure, used in calling XLookupString. @@ -227,6 +249,8 @@ typedef struct _XComposeStatus { #define IsModifierKey(keysym) \ ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \ + || (((KeySym)(keysym) >= XK_ISO_Lock) && \ + ((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \ || ((KeySym)(keysym) == XK_Mode_switch) \ || ((KeySym)(keysym) == XK_Num_Lock)) /* @@ -326,344 +350,257 @@ _XFUNCPROTOBEGIN /* The following declarations are alphabetized. */ extern XClassHint *XAllocClassHint ( -#if NeedFunctionPrototypes void -#endif ); extern XIconSize *XAllocIconSize ( -#if NeedFunctionPrototypes void -#endif ); extern XSizeHints *XAllocSizeHints ( -#if NeedFunctionPrototypes void -#endif ); extern XStandardColormap *XAllocStandardColormap ( -#if NeedFunctionPrototypes void -#endif ); extern XWMHints *XAllocWMHints ( -#if NeedFunctionPrototypes void -#endif ); extern int XClipBox( -#if NeedFunctionPrototypes Region /* r */, XRectangle* /* rect_return */ -#endif ); extern Region XCreateRegion( -#if NeedFunctionPrototypes void -#endif ); -extern char *XDefaultString( -#if NeedFunctionPrototypes - void -#endif -); +extern const char *XDefaultString (void); extern int XDeleteContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */ -#endif ); extern int XDestroyRegion( -#if NeedFunctionPrototypes Region /* r */ -#endif ); extern int XEmptyRegion( -#if NeedFunctionPrototypes Region /* r */ -#endif ); extern int XEqualRegion( -#if NeedFunctionPrototypes Region /* r1 */, Region /* r2 */ -#endif ); extern int XFindContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, XPointer* /* data_return */ -#endif ); extern Status XGetClassHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XClassHint* /* class_hints_return */ -#endif ); extern Status XGetIconSizes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize** /* size_list_return */, int* /* count_return */ -#endif ); extern Status XGetNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */ -#endif ); extern Status XGetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap** /* stdcmap_return */, int* /* count_return */, Atom /* property */ -#endif ); extern Status XGetSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, Atom /* property */ -#endif ); extern Status XGetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, Atom /* property */ -#endif ); extern Status XGetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, XTextProperty* /* text_prop_return */, Atom /* property */ -#endif ); extern XVisualInfo *XGetVisualInfo( -#if NeedFunctionPrototypes Display* /* display */, long /* vinfo_mask */, XVisualInfo* /* vinfo_template */, int* /* nitems_return */ -#endif ); extern Status XGetWMClientMachine( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern XWMHints *XGetWMHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern Status XGetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */ -#endif ); extern Status XGetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */, Atom /* property */ -#endif ); extern Status XGetZoomHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* zhints_return */ -#endif ); extern int XIntersectRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern void XConvertCase( -#if NeedFunctionPrototypes KeySym /* sym */, KeySym* /* lower */, KeySym* /* upper */ -#endif ); extern int XLookupString( -#if NeedFunctionPrototypes XKeyEvent* /* event_struct */, char* /* buffer_return */, int /* bytes_buffer */, KeySym* /* keysym_return */, XComposeStatus* /* status_in_out */ -#endif ); extern Status XMatchVisualInfo( -#if NeedFunctionPrototypes Display* /* display */, int /* screen */, int /* depth */, int /* class */, XVisualInfo* /* vinfo_return */ -#endif ); extern int XOffsetRegion( -#if NeedFunctionPrototypes Region /* r */, int /* dx */, int /* dy */ -#endif ); extern Bool XPointInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */ -#endif ); extern Region XPolygonRegion( -#if NeedFunctionPrototypes XPoint* /* points */, int /* n */, int /* fill_rule */ -#endif ); extern int XRectInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XSaveContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, _Xconst char* /* data */ -#endif ); extern int XSetClassHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XClassHint* /* class_hints */ -#endif ); extern int XSetIconSizes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize* /* size_list */, int /* count */ -#endif ); extern int XSetNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* stdcmaps */, int /* count */, Atom /* property */ -#endif ); extern int XSetSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); extern int XSetStandardProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -672,60 +609,46 @@ extern int XSetStandardProperties( char** /* argv */, int /* argc */, XSizeHints* /* hints */ -#endif ); extern void XSetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */, Atom /* property */ -#endif ); extern void XSetWMClientMachine( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern int XSetWMHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XWMHints* /* wm_hints */ -#endif ); extern void XSetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* window_name */, @@ -735,11 +658,9 @@ extern void XSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif ); extern void XmbSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -749,137 +670,132 @@ extern void XmbSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif +); + +extern void Xutf8SetWMProperties( + Display* /* display */, + Window /* w */, + _Xconst char* /* window_name */, + _Xconst char* /* icon_name */, + char** /* argv */, + int /* argc */, + XSizeHints* /* normal_hints */, + XWMHints* /* wm_hints */, + XClassHint* /* class_hints */ ); extern void XSetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); extern int XSetRegion( -#if NeedFunctionPrototypes Display* /* display */, GC /* gc */, Region /* r */ -#endif ); extern void XSetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap */, Atom /* property */ -#endif ); extern int XSetZoomHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* zhints */ -#endif ); extern int XShrinkRegion( -#if NeedFunctionPrototypes Region /* r */, int /* dx */, int /* dy */ -#endif ); extern Status XStringListToTextProperty( -#if NeedFunctionPrototypes char** /* list */, int /* count */, XTextProperty* /* text_prop_return */ -#endif ); extern int XSubtractRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XmbTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - char** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern int XwcTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - wchar_t** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + wchar_t** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return +); + +extern int Xutf8TextListToTextProperty( + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern void XwcFreeStringList( -#if NeedFunctionPrototypes - wchar_t** /* list */ -#endif + wchar_t** list ); extern Status XTextPropertyToStringList( -#if NeedFunctionPrototypes XTextProperty* /* text_prop */, char*** /* list_return */, int* /* count_return */ -#endif ); extern int XmbTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - char*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); extern int XwcTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - wchar_t*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + wchar_t*** list_return, + int* count_return +); + +extern int Xutf8TextPropertyToTextList( + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); extern int XUnionRectWithRegion( -#if NeedFunctionPrototypes XRectangle* /* rectangle */, Region /* src_region */, Region /* dest_region_return */ -#endif ); extern int XUnionRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XWMGeometry( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */, _Xconst char* /* user_geometry */, @@ -891,15 +807,12 @@ extern int XWMGeometry( int* /* width_return */, int* /* height_return */, int* /* gravity_return */ -#endif ); extern int XXorRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); _XFUNCPROTOEND |