From 2f7cb7306709d5266688e05a066701d309323035 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 26 Dec 2008 18:36:30 +1100 Subject: [PATCH] XKB: Add XkbRMLVOSet XkbRMLVOSet is just a set of strings for rules, model, layout, variant and options; use that in preference to XkbRF_VarDefsRec, which is a hideously complicated monster that somehow managed to not include the actual rules. While we're at it, clean up xkbrules.h so it doesn't require xkbstr.h. Signed-off-by: Daniel Stone --- include/xkbrules.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/xkbrules.h b/include/xkbrules.h index ff77ddc77..e8917f076 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -29,6 +29,14 @@ /***====================================================================***/ +typedef struct _XkbRMLVOSet { + char * rules; + char * model; + char * layout; + char * variant; + char * options; +} XkbRMLVOSet; + typedef struct _XkbRF_VarDefs { char * model; char * layout; @@ -103,10 +111,13 @@ typedef struct _XkbRF_Rules { _XFUNCPROTOBEGIN +/* Seems preferable to dragging xkbstr.h in. */ +struct _XkbComponentNames; + extern _X_EXPORT Bool XkbRF_GetComponents( XkbRF_RulesPtr /* rules */, XkbRF_VarDefsPtr /* var_defs */, - XkbComponentNamesPtr /* names */ + struct _XkbComponentNames * /* names */ ); extern _X_EXPORT XkbRF_RulePtr XkbRF_AddRule(