From cf461c367d9e2f77896a485f3f6ad5b89a2fc7e2 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 13:25:42 +0100 Subject: XKBsrv.h: remove XKBSRV_NEED_FILE_FUNCS stuff Follow-up for 2a5364d5f --- debian/copyright | 2 - debian/copyright.in | 2 - nx-X11/include/extensions/Imakefile | 2 +- nx-X11/include/extensions/XKBfile.h | 492 ----------------------------------- nx-X11/include/extensions/XKBrules.h | 199 -------------- nx-X11/include/extensions/XKBsrv.h | 85 ------ 6 files changed, 1 insertion(+), 781 deletions(-) delete mode 100644 nx-X11/include/extensions/XKBfile.h delete mode 100644 nx-X11/include/extensions/XKBrules.h diff --git a/debian/copyright b/debian/copyright index a67118810..324eb31ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1475,10 +1475,8 @@ License: MIT~X11 Files: nx-X11/include/extensions/XKB.h nx-X11/include/extensions/XKBconfig.h - nx-X11/include/extensions/XKBfile.h nx-X11/include/extensions/XKBgeom.h nx-X11/include/extensions/XKBproto.h - nx-X11/include/extensions/XKBrules.h nx-X11/include/extensions/XKBsrv.h nx-X11/include/extensions/XKBstr.h nx-X11/include/extensions/XKM.h diff --git a/debian/copyright.in b/debian/copyright.in index 7beee8a27..315d1b1cf 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1514,10 +1514,8 @@ License: NTP (legal disclaimer) Files: nx-X11/include/extensions/XKB.h nx-X11/include/extensions/XKBconfig.h - nx-X11/include/extensions/XKBfile.h nx-X11/include/extensions/XKBgeom.h nx-X11/include/extensions/XKBproto.h - nx-X11/include/extensions/XKBrules.h nx-X11/include/extensions/XKBsrv.h nx-X11/include/extensions/XKBstr.h nx-X11/include/extensions/XKM.h diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 4c9a6e9e4..277ca634f 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -33,7 +33,7 @@ DAMAGEHEADERS = damagewire.h damageproto.h XRESHEADERS = XResproto.h #endif -XKBFILEHEADERS = XKMformat.h XKM.h XKBconfig.h XKBfile.h XKBrules.h +XKBFILEHEADERS = XKMformat.h XKM.h XKBconfig.h EXTRAHEADERS = \ $(SCREENSAVERHEADERS) \ diff --git a/nx-X11/include/extensions/XKBfile.h b/nx-X11/include/extensions/XKBfile.h deleted file mode 100644 index 045193813..000000000 --- a/nx-X11/include/extensions/XKBfile.h +++ /dev/null @@ -1,492 +0,0 @@ - -#ifndef _XKBFILE_H_ -#define _XKBFILE_H_ 1 - -/************************************************************ - Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ - -/***====================================================================***/ - -#define XkbXKMFile 0 -#define XkbCFile 1 -#define XkbXKBFile 2 -#define XkbMessage 3 - -#define XkbMapDefined (1<<0) -#define XkbStateDefined (1<<1) - -typedef struct _XkbFileInfo { - unsigned type; - unsigned defined; - XkbDescPtr xkb; -} XkbFileInfo,*XkbFileInfoPtr; - -typedef void (*XkbFileAddOnFunc)( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - int /* fileSection */, - void * /* priv */ -); - -/***====================================================================***/ - -#define _XkbSuccess 0 -#define _XkbErrMissingNames 1 -#define _XkbErrMissingTypes 2 -#define _XkbErrMissingReqTypes 3 -#define _XkbErrMissingSymbols 4 -#define _XkbErrMissingVMods 5 -#define _XkbErrMissingIndicators 6 -#define _XkbErrMissingCompatMap 7 -#define _XkbErrMissingSymInterps 8 -#define _XkbErrMissingGeometry 9 -#define _XkbErrIllegalDoodad 10 -#define _XkbErrIllegalTOCType 11 -#define _XkbErrIllegalContents 12 -#define _XkbErrEmptyFile 13 -#define _XkbErrFileNotFound 14 -#define _XkbErrFileCannotOpen 15 -#define _XkbErrBadValue 16 -#define _XkbErrBadMatch 17 -#define _XkbErrBadTypeName 18 -#define _XkbErrBadTypeWidth 19 -#define _XkbErrBadFileType 20 -#define _XkbErrBadFileVersion 21 -#define _XkbErrBadFileFormat 22 -#define _XkbErrBadAlloc 23 -#define _XkbErrBadLength 24 -#define _XkbErrXReqFailure 25 -#define _XkbErrBadImplementation 26 - -extern char * _XkbErrMessages[]; -extern unsigned _XkbErrCode; -extern char * _XkbErrLocation; -extern unsigned _XkbErrData; - -/***====================================================================***/ - -_XFUNCPROTOBEGIN - -extern char * XkbIndentText( - unsigned /* size */ -); - -extern char * XkbAtomText( - Display * /* dpy */, - Atom /* atm */, - unsigned /* format */ -); - -extern char * XkbKeysymText( - KeySym /* sym */, - unsigned /* format */ -); - -extern char * XkbStringText( - char * /* str */, - unsigned /* format */ -); - -extern char * XkbKeyNameText( - char * /* name */, - unsigned /* format */ -); - -extern char * -XkbModIndexText( - unsigned /* ndx */, - unsigned /* format */ -); - -extern char * -XkbModMaskText( - unsigned /* mask */, - unsigned /* format */ -); - -extern char * XkbVModIndexText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* ndx */, - unsigned /* format */ -); - -extern char * XkbVModMaskText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* modMask */, - unsigned /* mask */, - unsigned /* format */ -); - -extern char * XkbConfigText( - unsigned /* config */, - unsigned /* format */ -); - -extern char * XkbSIMatchText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbIMWhichStateMaskText( - unsigned /* use_which */, - unsigned /* format */ -); - -extern char * XkbAccessXDetailText( - unsigned /* state */, - unsigned /* format */ -); - -extern char * XkbNKNDetailMaskText( - unsigned /* detail */, - unsigned /* format */ -); - -extern char * XkbControlsMaskText( - unsigned /* ctrls */, - unsigned /* format */ -); - -extern char * XkbGeomFPText( - int /* val */, - unsigned /* format */ -); - -extern char * XkbDoodadTypeText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbActionTypeText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbActionText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - XkbAction * /* action */, - unsigned /* format */ -); - -extern char * XkbBehaviorText( - XkbDescPtr /* xkb */, - XkbBehavior * /* behavior */, - unsigned /* format */ -); - -/***====================================================================***/ - -#define _XkbKSLower (1<<0) -#define _XkbKSUpper (1<<1) - -#define XkbKSIsLower(k) (_XkbKSCheckCase(k)&_XkbKSLower) -#define XkbKSIsUpper(k) (_XkbKSCheckCase(k)&_XkbKSUpper) -#define XkbKSIsKeypad(k) (((k)>=XK_KP_Space)&&((k)<=XK_KP_Equal)) -#define XkbKSIsDeadKey(k) \ - (((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound)) - -extern unsigned _XkbKSCheckCase( - KeySym /* sym */ -); - -extern int XkbFindKeycodeByName( - XkbDescPtr /* xkb */, - char * /* name */, - Bool /* use_aliases */ -); - -extern Bool XkbLookupGroupAndLevel( - XkbDescPtr /* xkb */, - int /* key */, - int * /* mods_inout */, - int * /* grp_inout */, - int * /* lvl_rtrn */ -); - -/***====================================================================***/ - -#ifndef XKB_IN_SERVER - -extern Bool XkbLookupCanonicalRGBColor( - char * /* def */, - XColor * /* color */ -); - -#endif - -/***====================================================================***/ - -extern char * XkbAtomGetString( - Display * /* dpy */, - Atom /* atm */ -); - -extern Atom XkbInternAtom( - Display * /* dpy */, - char * /* name */, - Bool /* onlyIfExists */ -); - -extern Status XkbChangeKbdDisplay( - Display * /* newDpy */, - XkbFileInfo * /* result */ -); - -extern Atom XkbChangeAtomDisplay( - Display * /* oldDpy */, - Display * /* newDpy */, - Atom /* atm */ -); - -extern void XkbInitAtoms( - Display * /* dpy */ -); - -/***====================================================================***/ - -#ifdef _XKBGEOM_H_ - -#define XkbDW_Unknown 0 -#define XkbDW_Doodad 1 -#define XkbDW_Section 2 -typedef struct _XkbDrawable { - int type; - int priority; - union { - XkbDoodadPtr doodad; - XkbSectionPtr section; - } u; - struct _XkbDrawable * next; -} XkbDrawableRec,*XkbDrawablePtr; - -extern XkbDrawablePtr -XkbGetOrderedDrawables( - XkbGeometryPtr /* geom */, - XkbSectionPtr /* section */ -); - -extern void -XkbFreeOrderedDrawables( - XkbDrawablePtr /* draw */ -); - -#endif - -/***====================================================================***/ - -extern unsigned XkbConvertGetByNameComponents( - Bool /* toXkm */, - unsigned /* orig */ -); - -extern unsigned XkbConvertXkbComponents( - Bool /* toXkm */, - unsigned /* orig */ -); - -extern Bool XkbDetermineFileType( - XkbFileInfo * /* xkb */, - int /* format */, - int * /* opts_missing */ -); - -extern Bool XkbNameMatchesPattern( - char * /* name */, - char * /* pattern */ -); - -/***====================================================================***/ - -extern Bool XkbWriteXKBKeycodes( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBKeyTypes( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBCompatMap( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBSymbols( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBGeometry( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBSemantics( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBLayout( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBKeymap( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBFile( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteCFile( - FILE * /* file */, - char * /* name */, - XkbFileInfo * /* info */ -); - -extern Bool XkbWriteXKMFile( - FILE * /* file */, - XkbFileInfo * /* result */ -); - -extern Bool XkbWriteToServer( - XkbFileInfo * /* result */ -); - -extern void XkbEnsureSafeMapName( - char * /* name */ -); - -extern Bool XkbWriteXKBKeymapForNames( - FILE * /* file */, - XkbComponentNamesPtr /* names */, - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* want */, - unsigned /* need */ -); - -extern Status XkbMergeFile( - XkbDescPtr /* xkb */, - XkbFileInfo /* finfo */ -); - -/***====================================================================***/ - -extern Bool XkmProbe( - FILE * /* file */ -); - -extern unsigned XkbReadFromServer( - Display * /* dpy */, - unsigned /* need */, - unsigned /* want */, - XkbFileInfo * /* result */ -); - -extern unsigned XkmReadFile( - FILE * /* file */, - unsigned /* need */, - unsigned /* want */, - XkbFileInfo * /* result */ -); - -#ifdef _XKMFORMAT_H_ - -extern Bool XkmReadTOC( - FILE * /* file */, - xkmFileInfo * /* file_info */, - int /* max_toc */, - xkmSectionInfo * /* toc */ -); - -extern xkmSectionInfo *XkmFindTOCEntry( - xkmFileInfo * /* finfo */, - xkmSectionInfo * /* toc */, - unsigned /* type */ -); - -extern Bool XkmReadFileSection( - FILE * /* file */, - xkmSectionInfo * /* toc */, - XkbFileInfo * /* result */, - unsigned * /* loaded_rtrn */ -); - -extern char * XkmReadFileSectionName( - FILE * /* file */, - xkmSectionInfo * /* toc */ -); - -#endif /* _XKMFORMAT_H */ - -_XFUNCPROTOEND - -#endif /* _XKBFILE_H_ */ diff --git a/nx-X11/include/extensions/XKBrules.h b/nx-X11/include/extensions/XKBrules.h deleted file mode 100644 index 59d11cd88..000000000 --- a/nx-X11/include/extensions/XKBrules.h +++ /dev/null @@ -1,199 +0,0 @@ -#ifndef _XKBRULES_H_ -#define _XKBRULES_H_ 1 - -/************************************************************ - Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ - -/***====================================================================***/ - -typedef struct _XkbRF_VarDefs { - char * model; - char * layout; - char * variant; - char * options; - unsigned short sz_extra; - unsigned short num_extra; - char * extra_names; - char ** extra_values; -} XkbRF_VarDefsRec,*XkbRF_VarDefsPtr; - -typedef struct _XkbRF_VarDesc { - char * name; - char * desc; -} XkbRF_VarDescRec, *XkbRF_VarDescPtr; - -typedef struct _XkbRF_DescribeVars { - int sz_desc; - int num_desc; - XkbRF_VarDescPtr desc; -} XkbRF_DescribeVarsRec,*XkbRF_DescribeVarsPtr; - -typedef struct _XkbRF_Rule { - int number; - int layout_num; - int variant_num; - char * model; - char * layout; - char * variant; - char * option; - /* yields */ - char * keycodes; - char * symbols; - char * types; - char * compat; - char * geometry; - char * keymap; - unsigned flags; -} XkbRF_RuleRec,*XkbRF_RulePtr; - -typedef struct _XkbRF_Group { - int number; - char * name; - char * words; -} XkbRF_GroupRec, *XkbRF_GroupPtr; - -#define XkbRF_PendingMatch (1L<<1) -#define XkbRF_Option (1L<<2) -#define XkbRF_Append (1L<<3) -#define XkbRF_Normal (1L<<4) -#define XkbRF_Invalid (1L<<5) - -typedef struct _XkbRF_Rules { - XkbRF_DescribeVarsRec models; - XkbRF_DescribeVarsRec layouts; - XkbRF_DescribeVarsRec variants; - XkbRF_DescribeVarsRec options; - unsigned short sz_extra; - unsigned short num_extra; - char ** extra_names; - XkbRF_DescribeVarsPtr extra; - - unsigned short sz_rules; - unsigned short num_rules; - XkbRF_RulePtr rules; - unsigned short sz_groups; - unsigned short num_groups; - XkbRF_GroupPtr groups; -} XkbRF_RulesRec, *XkbRF_RulesPtr; - -/***====================================================================***/ - -_XFUNCPROTOBEGIN - -extern Bool XkbRF_GetComponents( - XkbRF_RulesPtr /* rules */, - XkbRF_VarDefsPtr /* var_defs */, - XkbComponentNamesPtr /* names */ -); - -extern XkbRF_RulePtr XkbRF_AddRule( - XkbRF_RulesPtr /* rules */ -); - -extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); - -extern Bool XkbRF_LoadRules( - FILE * /* file */, - XkbRF_RulesPtr /* rules */ -); - -extern Bool XkbRF_LoadRulesByName( - char * /* base */, - char * /* locale */, - XkbRF_RulesPtr /* rules */ -); - -/***====================================================================***/ - -extern XkbRF_VarDescPtr XkbRF_AddVarDesc( - XkbRF_DescribeVarsPtr /* vars */ -); - -extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy( - XkbRF_DescribeVarsPtr /* vars */, - XkbRF_VarDescPtr /* copy_from */ -); - -extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( - XkbRF_RulesPtr /* rules */, - char * /* name */ -); - -extern Bool XkbRF_LoadDescriptions( - FILE * /* file */, - XkbRF_RulesPtr /* rules */ -); - -extern Bool XkbRF_LoadDescriptionsByName( - char * /* base */, - char * /* locale */, - XkbRF_RulesPtr /* rules */ -); - -extern XkbRF_RulesPtr XkbRF_Load( - char * /* base */, - char * /* locale */, - Bool /* wantDesc */, - Bool /* wantRules */ -); - -extern XkbRF_RulesPtr XkbRF_Create( - int /* sz_rules */, - int /* sz_extra */ -); - -/***====================================================================***/ - -extern void XkbRF_Free( - XkbRF_RulesPtr /* rules */, - Bool /* freeRules */ -); - - -/***====================================================================***/ - -#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES" -#define _XKB_RF_NAMES_PROP_MAXLEN 1024 - -#ifndef XKB_IN_SERVER - -extern Bool XkbRF_GetNamesProp( - Display * /* dpy */, - char ** /* rules_file_rtrn */, - XkbRF_VarDefsPtr /* var_defs_rtrn */ -); - -extern Bool XkbRF_SetNamesProp( - Display * /* dpy */, - char * /* rules_file */, - XkbRF_VarDefsPtr /* var_defs */ -); - -#endif - -_XFUNCPROTOEND - -#endif /* _XKBRULES_H_ */ diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h index 81a07a588..6d369e2b2 100644 --- a/nx-X11/include/extensions/XKBsrv.h +++ b/nx-X11/include/extensions/XKBsrv.h @@ -1106,91 +1106,6 @@ extern void XkbSendNewKeyboardNotify( xkbNewKeyboardNotify * /* pNKN */ ); -#ifdef XKBSRV_NEED_FILE_FUNCS - -#include -#include -#include - -#define _XkbListKeymaps 0 -#define _XkbListKeycodes 1 -#define _XkbListTypes 2 -#define _XkbListCompat 3 -#define _XkbListSymbols 4 -#define _XkbListGeometry 5 -#define _XkbListNumComponents 6 - -typedef struct _XkbSrvListInfo { - int szPool; - int nPool; - char * pool; - - int maxRtrn; - int nTotal; - - char * pattern[_XkbListNumComponents]; - int nFound[_XkbListNumComponents]; -} XkbSrvListInfoRec,*XkbSrvListInfoPtr; - -char * -XkbGetRulesDflts( - XkbRF_VarDefsPtr /* defs */ -); - -extern void XkbSetRulesUsed( - XkbRF_VarDefsPtr /* defs */ -); - - -extern Status XkbDDXList( - DeviceIntPtr /* dev */, - XkbSrvListInfoPtr /* listing */, - ClientPtr /* client */ -); - -extern unsigned int XkbDDXLoadKeymapByNames( - DeviceIntPtr /* keybd */, - XkbComponentNamesPtr /* names */, - unsigned int /* want */, - unsigned int /* need */, - XkbFileInfoPtr /* finfoRtrn */, - char * /* keymapNameRtrn */, - int /* keymapNameRtrnLen */ -); - -extern Bool XkbDDXNamesFromRules( - DeviceIntPtr /* keybd */, - char * /* rules */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */ -); - -extern FILE *XkbDDXOpenConfigFile( - char * /* mapName */, - char * /* fileNameRtrn */, - int /* fileNameRtrnLen */ -); - -extern Bool XkbDDXApplyConfig( - XPointer /* cfg_in */, - XkbSrvInfoPtr /* xkbi */ -); - -extern XPointer XkbDDXPreloadConfig( - char ** /* rulesFileRtrn */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */, - DeviceIntPtr /* dev */ -); - -extern int _XkbStrCaseCmp( - char * /* str1 */, - char * /* str2 */ -); - -#endif /* XKBSRV_NEED_FILE_FUNCS */ - - _XFUNCPROTOEND #define XkbAtomGetString(d,s) NameForAtom(s) -- cgit v1.2.3