diff options
Diffstat (limited to 'include/X11/extensions/XKBrules.h')
| -rw-r--r-- | include/X11/extensions/XKBrules.h | 71 |
1 files changed, 18 insertions, 53 deletions
diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h index ffc5138..61f1551 100644 --- a/include/X11/extensions/XKBrules.h +++ b/include/X11/extensions/XKBrules.h @@ -27,6 +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 $ */ /***====================================================================***/ @@ -53,6 +54,9 @@ typedef struct _XkbRF_DescribeVars { } XkbRF_DescribeVarsRec,*XkbRF_DescribeVarsPtr; typedef struct _XkbRF_Rule { + int number; + int layout_num; + int variant_num; char * model; char * layout; char * variant; @@ -67,10 +71,17 @@ typedef struct _XkbRF_Rule { 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_Delayed (1L<<2) +#define XkbRF_Option (1L<<2) #define XkbRF_Append (1L<<3) -#define XkbRF_Invalid (1L<<4) +#define XkbRF_Normal (1L<<4) +#define XkbRF_Invalid (1L<<5) typedef struct _XkbRF_Rules { XkbRF_DescribeVarsRec models; @@ -85,63 +96,15 @@ typedef struct _XkbRF_Rules { 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_ApplyRule( -#if NeedFunctionPrototypes - XkbRF_RulePtr /* rule */, - XkbComponentNamesPtr /* names */ -#endif -); - -extern Bool XkbRF_CheckApplyRule( -#if NeedFunctionPrototypes - XkbRF_RulePtr /* rule */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */ -#endif -); - -extern void XkbRF_ClearPartialMatches( -#if NeedFunctionPrototypes - XkbRF_RulesPtr /* rules */ -#endif -); - -extern Bool XkbRF_ApplyPartialMatches( -#if NeedFunctionPrototypes - XkbRF_RulesPtr /* rules */, - XkbComponentNamesPtr /* names */ -#endif -); - -extern void XkbRF_CheckApplyDelayedRules( -#if NeedFunctionPrototypes - XkbRF_RulesPtr /* rules */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */ -#endif -); - -extern Bool XkbRF_CheckApplyRules( -#if NeedFunctionPrototypes - XkbRF_RulesPtr /* rules */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */ -#endif -); - -extern char * XkbRF_SubstituteVars( -#if NeedFunctionPrototypes - char * /* p_name */, - XkbRF_VarDefsPtr /* defs */ -#endif -); - extern Bool XkbRF_GetComponents( #if NeedFunctionPrototypes XkbRF_RulesPtr /* rules */, @@ -156,6 +119,8 @@ extern XkbRF_RulePtr XkbRF_AddRule( #endif ); +extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); + extern Bool XkbRF_LoadRules( #if NeedFunctionPrototypes FILE * /* file */, |