summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/X11/extensions/XKBbells.h5
-rw-r--r--include/X11/extensions/XKBconfig.h28
-rw-r--r--include/X11/extensions/XKBfile.h121
-rw-r--r--include/X11/extensions/XKBrules.h30
4 files changed, 10 insertions, 174 deletions
diff --git a/include/X11/extensions/XKBbells.h b/include/X11/extensions/XKBbells.h
index 2b6865f..b38568f 100644
--- a/include/X11/extensions/XKBbells.h
+++ b/include/X11/extensions/XKBbells.h
@@ -27,6 +27,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/lib/xkbfile/XKBbells.h,v 3.3 2003/11/17 22:20:23 dawes Exp $ */
#define XkbBN_Info "Info"
#define XkbBN_Warning "Warning"
@@ -124,21 +125,17 @@
_XFUNCPROTOBEGIN
extern Bool XkbStdBell(
-#if NeedFunctionPrototypes
Display * /* dpy */,
Window /* win */,
int /* percent */,
int /* bellDef */
-#endif
);
extern Bool XkbStdBellEvent(
-#if NeedFunctionPrototypes
Display * /* dpy */,
Window /* win */,
int /* percent */,
int /* bellDef */
-#endif
);
_XFUNCPROTOEND
diff --git a/include/X11/extensions/XKBconfig.h b/include/X11/extensions/XKBconfig.h
index f139125..c59e992 100644
--- a/include/X11/extensions/XKBconfig.h
+++ b/include/X11/extensions/XKBconfig.h
@@ -27,7 +27,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.5 2001/01/17 19:43:39 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */
typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr;
@@ -35,13 +35,11 @@ typedef struct _XkbConfigField *XkbConfigFieldPtr;
typedef struct _XkbConfigFields *XkbConfigFieldsPtr;
typedef Bool (*XkbConfigParseFunc)(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbConfigFieldsPtr /* fields */,
XkbConfigFieldPtr /* field */,
XkbDescPtr /* xkb */,
XkbConfigRtrnPtr /* rtrn */
-#endif
);
#define XkbCF_Check 0
@@ -50,12 +48,10 @@ typedef Bool (*XkbConfigParseFunc)(
#define XkbCF_Destroy 3
typedef Bool (*XkbConfigFinishFunc)(
-#if NeedFunctionPrototypes
XkbConfigFieldsPtr /* fields */,
XkbDescPtr /* xkb */,
XkbConfigRtrnPtr /* rtrn */,
int /* what */
-#endif
);
typedef struct _XkbConfigRtrnPriv {
@@ -214,91 +210,69 @@ extern XkbConfigFieldsPtr XkbCFDflts;
_XFUNCPROTOBEGIN
extern int XkbCFScan(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbCFScanResultPtr /* val_rtrn */,
XkbConfigRtrnPtr /* rtrn */
-#endif
);
extern XkbConfigFieldsPtr XkbCFDup(
-#if NeedFunctionPrototypes
XkbConfigFieldsPtr /* fields */
-#endif
);
extern XkbConfigFieldsPtr XkbCFFree(
-#if NeedFunctionPrototypes
XkbConfigFieldsPtr /* fields */,
Bool /* all */
-#endif
);
extern XkbConfigUnboundModPtr XkbCFAddModByName(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
int /* what */,
char * /* name */,
Bool /* merge */,
XkbConfigUnboundModPtr /* last */
-#endif
);
extern Bool XkbCFBindMods(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
XkbDescPtr /* xkb */
-#endif
);
extern Bool XkbCFApplyMods(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
int /* what */,
XkbConfigModInfoPtr /* info */
-#endif
);
extern Bool XkbCFApplyRtrnValues(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
XkbConfigFieldsPtr /* fields */,
XkbDescPtr /* xkb */
-#endif
);
extern XkbConfigRtrnPrivPtr XkbCFAddPrivate(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
XkbConfigFieldsPtr /* fields */,
XPointer /* ptr */
-#endif
);
extern void XkbCFFreeRtrn(
-#if NeedFunctionPrototypes
XkbConfigRtrnPtr /* rtrn */,
XkbConfigFieldsPtr /* fields */,
XkbDescPtr /* xkb */
-#endif
);
extern Bool XkbCFParse(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbConfigFieldsPtr /* fields */,
XkbDescPtr /* xkb */,
XkbConfigRtrnPtr /* rtrn */
-#endif
);
extern void XkbCFReportError(
-#if NeedFunctionPrototypes
FILE * /* file */,
char * /* name */,
int /* error */,
int /* line */
-#endif
);
_XFUNCPROTOEND
diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
index 2c7de2d..b894da0 100644
--- a/include/X11/extensions/XKBfile.h
+++ b/include/X11/extensions/XKBfile.h
@@ -1,3 +1,5 @@
+/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.7 2003/11/17 22:20:23 dawes Exp $ */
+
#ifndef _XKBFILE_H_
#define _XKBFILE_H_ 1
@@ -45,14 +47,12 @@ typedef struct _XkbFileInfo {
} XkbFileInfo,*XkbFileInfoPtr;
typedef void (*XkbFileAddOnFunc)(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
int /* fileSection */,
void * /* priv */
-#endif
);
/***====================================================================***/
@@ -95,153 +95,113 @@ extern unsigned _XkbErrData;
_XFUNCPROTOBEGIN
extern char * XkbIndentText(
-#if NeedFunctionPrototypes
unsigned /* size */
-#endif
);
extern char * XkbAtomText(
-#if NeedFunctionPrototypes
Display * /* dpy */,
Atom /* atm */,
unsigned /* format */
-#endif
);
extern char * XkbKeysymText(
-#if NeedFunctionPrototypes
KeySym /* sym */,
unsigned /* format */
-#endif
);
extern char * XkbStringText(
-#if NeedFunctionPrototypes
char * /* str */,
unsigned /* format */
-#endif
);
extern char * XkbKeyNameText(
-#if NeedFunctionPrototypes
char * /* name */,
unsigned /* format */
-#endif
);
extern char *
XkbModIndexText(
-#if NeedFunctionPrototypes
unsigned /* ndx */,
unsigned /* format */
-#endif
);
extern char *
XkbModMaskText(
-#if NeedFunctionPrototypes
unsigned /* mask */,
unsigned /* format */
-#endif
);
extern char * XkbVModIndexText(
-#if NeedFunctionPrototypes
Display * /* dpy */,
XkbDescPtr /* xkb */,
unsigned /* ndx */,
unsigned /* format */
-#endif
);
extern char * XkbVModMaskText(
-#if NeedFunctionPrototypes
Display * /* dpy */,
XkbDescPtr /* xkb */,
unsigned /* modMask */,
unsigned /* mask */,
unsigned /* format */
-#endif
);
extern char * XkbConfigText(
-#if NeedFunctionPrototypes
unsigned /* config */,
unsigned /* format */
-#endif
);
extern char * XkbSIMatchText(
-#if NeedFunctionPrototypes
unsigned /* type */,
unsigned /* format */
-#endif
);
extern char * XkbIMWhichStateMaskText(
-#if NeedFunctionPrototypes
unsigned /* use_which */,
unsigned /* format */
-#endif
);
extern char * XkbAccessXDetailText(
-#if NeedFunctionPrototypes
unsigned /* state */,
unsigned /* format */
-#endif
);
extern char * XkbNKNDetailMaskText(
-#if NeedFunctionPrototypes
unsigned /* detail */,
unsigned /* format */
-#endif
);
extern char * XkbControlsMaskText(
-#if NeedFunctionPrototypes
unsigned /* ctrls */,
unsigned /* format */
-#endif
);
extern char * XkbGeomFPText(
-#if NeedFunctionPrototypes
int /* val */,
unsigned /* format */
-#endif
);
extern char * XkbDoodadTypeText(
-#if NeedFunctionPrototypes
unsigned /* type */,
unsigned /* format */
-#endif
);
extern char * XkbActionTypeText(
-#if NeedFunctionPrototypes
unsigned /* type */,
unsigned /* format */
-#endif
);
extern char * XkbActionText(
-#if NeedFunctionPrototypes
Display * /* dpy */,
XkbDescPtr /* xkb */,
XkbAction * /* action */,
unsigned /* format */
-#endif
);
extern char * XkbBehaviorText(
-#if NeedFunctionPrototypes
XkbDescPtr /* xkb */,
XkbBehavior * /* behavior */,
unsigned /* format */
-#endif
);
/***====================================================================***/
@@ -256,27 +216,21 @@ extern char * XkbBehaviorText(
(((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound))
extern unsigned _XkbKSCheckCase(
-#if NeedFunctionPrototypes
KeySym /* sym */
-#endif
);
extern int XkbFindKeycodeByName(
-#if NeedFunctionPrototypes
XkbDescPtr /* xkb */,
char * /* name */,
Bool /* use_aliases */
-#endif
);
extern Bool XkbLookupGroupAndLevel(
-#if NeedFunctionPrototypes
XkbDescPtr /* xkb */,
int /* key */,
int * /* mods_inout */,
int * /* grp_inout */,
int * /* lvl_rtrn */
-#endif
);
/***====================================================================***/
@@ -284,10 +238,8 @@ extern Bool XkbLookupGroupAndLevel(
#ifndef XKB_IN_SERVER
extern Bool XkbLookupCanonicalRGBColor(
-#if NeedFunctionPrototypes
char * /* def */,
XColor * /* color */
-#endif
);
#endif
@@ -295,39 +247,29 @@ extern Bool XkbLookupCanonicalRGBColor(
/***====================================================================***/
extern char * XkbAtomGetString(
-#if NeedFunctionPrototypes
Display * /* dpy */,
Atom /* atm */
-#endif
);
extern Atom XkbInternAtom(
-#if NeedFunctionPrototypes
Display * /* dpy */,
char * /* name */,
Bool /* onlyIfExists */
-#endif
);
extern Status XkbChangeKbdDisplay(
-#if NeedFunctionPrototypes
Display * /* newDpy */,
XkbFileInfo * /* result */
-#endif
);
extern Atom XkbChangeAtomDisplay(
-#if NeedFunctionPrototypes
Display * /* oldDpy */,
Display * /* newDpy */,
Atom /* atm */
-#endif
);
extern void XkbInitAtoms(
-#if NeedFunctionPrototypes
Display * /* dpy */
-#endif
);
/***====================================================================***/
@@ -349,17 +291,13 @@ typedef struct _XkbDrawable {
extern XkbDrawablePtr
XkbGetOrderedDrawables(
-#if NeedFunctionPrototypes
XkbGeometryPtr /* geom */,
XkbSectionPtr /* section */
-#endif
);
extern void
XkbFreeOrderedDrawables(
-#if NeedFunctionPrototypes
XkbDrawablePtr /* draw */
-#endif
);
#endif
@@ -367,231 +305,186 @@ XkbFreeOrderedDrawables(
/***====================================================================***/
extern unsigned XkbConvertGetByNameComponents(
-#if NeedFunctionPrototypes
Bool /* toXkm */,
unsigned /* orig */
-#endif
);
extern unsigned XkbConvertXkbComponents(
-#if NeedFunctionPrototypes
Bool /* toXkm */,
unsigned /* orig */
-#endif
);
extern Bool XkbDetermineFileType(
-#if NeedFunctionPrototypes
XkbFileInfo * /* xkb */,
int /* format */,
int * /* opts_missing */
-#endif
);
extern Bool XkbNameMatchesPattern(
-#if NeedFunctionPrototypes
char * /* name */,
char * /* pattern */
-#endif
);
/***====================================================================***/
extern Bool XkbWriteXKBKeycodes(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBKeyTypes(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBCompatMap(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBSymbols(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBGeometry(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBSemantics(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBLayout(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBKeymap(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteXKBFile(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
-#endif
);
extern Bool XkbWriteCFile(
-#if NeedFunctionPrototypes
FILE * /* file */,
char * /* name */,
XkbFileInfo * /* info */
-#endif
);
extern Bool XkbWriteXKMFile(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbFileInfo * /* result */
-#endif
);
extern Bool XkbWriteToServer(
-#if NeedFunctionPrototypes
XkbFileInfo * /* result */
-#endif
);
extern void XkbEnsureSafeMapName(
-#if NeedFunctionPrototypes
char * /* name */
-#endif
);
extern Bool XkbWriteXKBKeymapForNames(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbComponentNamesPtr /* names */,
Display * /* dpy */,
XkbDescPtr /* xkb */,
unsigned /* want */,
unsigned /* need */
-#endif
+);
+
+extern Status XkbMergeFile(
+ XkbDescPtr /* xkb */,
+ XkbFileInfo /* finfo */
);
/***====================================================================***/
extern Bool XkmProbe(
-#if NeedFunctionPrototypes
FILE * /* file */
-#endif
);
extern unsigned XkbReadFromServer(
-#if NeedFunctionPrototypes
Display * /* dpy */,
unsigned /* need */,
unsigned /* want */,
XkbFileInfo * /* result */
-#endif
);
extern unsigned XkmReadFile(
-#if NeedFunctionPrototypes
FILE * /* file */,
unsigned /* need */,
unsigned /* want */,
XkbFileInfo * /* result */
-#endif
);
#ifdef _XKMFORMAT_H_
extern Bool XkmReadTOC(
-#if NeedFunctionPrototypes
FILE * /* file */,
xkmFileInfo * /* file_info */,
int /* max_toc */,
xkmSectionInfo * /* toc */
-#endif
);
extern xkmSectionInfo *XkmFindTOCEntry(
-#if NeedFunctionPrototypes
xkmFileInfo * /* finfo */,
xkmSectionInfo * /* toc */,
unsigned /* type */
-#endif
);
extern Bool XkmReadFileSection(
-#if NeedFunctionPrototypes
FILE * /* file */,
xkmSectionInfo * /* toc */,
XkbFileInfo * /* result */,
unsigned * /* loaded_rtrn */
-#endif
);
extern char * XkmReadFileSectionName(
-#if NeedFunctionPrototypes
FILE * /* file */,
xkmSectionInfo * /* toc */
-#endif
);
#endif /* _XKMFORMAT_H */
diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h
index 61f1551..5ded708 100644
--- a/include/X11/extensions/XKBrules.h
+++ b/include/X11/extensions/XKBrules.h
@@ -27,7 +27,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */
/***====================================================================***/
@@ -106,96 +106,72 @@ typedef struct _XkbRF_Rules {
_XFUNCPROTOBEGIN
extern Bool XkbRF_GetComponents(
-#if NeedFunctionPrototypes
XkbRF_RulesPtr /* rules */,
XkbRF_VarDefsPtr /* var_defs */,
XkbComponentNamesPtr /* names */
-#endif
);
extern XkbRF_RulePtr XkbRF_AddRule(
-#if NeedFunctionPrototypes
XkbRF_RulesPtr /* rules */
-#endif
);
extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules);
extern Bool XkbRF_LoadRules(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbRF_RulesPtr /* rules */
-#endif
);
extern Bool XkbRF_LoadRulesByName(
-#if NeedFunctionPrototypes
char * /* base */,
char * /* locale */,
XkbRF_RulesPtr /* rules */
-#endif
);
/***====================================================================***/
extern XkbRF_VarDescPtr XkbRF_AddVarDesc(
-#if NeedFunctionPrototypes
XkbRF_DescribeVarsPtr /* vars */
-#endif
);
extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy(
-#if NeedFunctionPrototypes
XkbRF_DescribeVarsPtr /* vars */,
XkbRF_VarDescPtr /* copy_from */
-#endif
);
extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe(
-#if NeedFunctionPrototypes
XkbRF_RulesPtr /* rules */,
char * /* name */
-#endif
);
extern Bool XkbRF_LoadDescriptions(
-#if NeedFunctionPrototypes
FILE * /* file */,
XkbRF_RulesPtr /* rules */
-#endif
);
extern Bool XkbRF_LoadDescriptionsByName(
-#if NeedFunctionPrototypes
char * /* base */,
char * /* locale */,
XkbRF_RulesPtr /* rules */
-#endif
);
extern XkbRF_RulesPtr XkbRF_Load(
-#if NeedFunctionPrototypes
char * /* base */,
char * /* locale */,
Bool /* wantDesc */,
Bool /* wantRules */
-#endif
);
extern XkbRF_RulesPtr XkbRF_Create(
-#if NeedFunctionPrototypes
int /* sz_rules */,
int /* sz_extra */
-#endif
);
/***====================================================================***/
extern void XkbRF_Free(
-#if NeedFunctionPrototypes
XkbRF_RulesPtr /* rules */,
Bool /* freeRules */
-#endif
);
@@ -207,19 +183,15 @@ extern void XkbRF_Free(
#ifndef XKB_IN_SERVER
extern Bool XkbRF_GetNamesProp(
-#if NeedFunctionPrototypes
Display * /* dpy */,
char ** /* rules_file_rtrn */,
XkbRF_VarDefsPtr /* var_defs_rtrn */
-#endif
);
extern Bool XkbRF_SetNamesProp(
-#if NeedFunctionPrototypes
Display * /* dpy */,
char * /* rules_file */,
XkbRF_VarDefsPtr /* var_defs */
-#endif
);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 00:40:55 +0000