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 <daniel@fooishbar.org>
This commit is contained in:
parent
3208eff2d7
commit
2f7cb73067
|
@ -29,6 +29,14 @@
|
||||||
|
|
||||||
/***====================================================================***/
|
/***====================================================================***/
|
||||||
|
|
||||||
|
typedef struct _XkbRMLVOSet {
|
||||||
|
char * rules;
|
||||||
|
char * model;
|
||||||
|
char * layout;
|
||||||
|
char * variant;
|
||||||
|
char * options;
|
||||||
|
} XkbRMLVOSet;
|
||||||
|
|
||||||
typedef struct _XkbRF_VarDefs {
|
typedef struct _XkbRF_VarDefs {
|
||||||
char * model;
|
char * model;
|
||||||
char * layout;
|
char * layout;
|
||||||
|
@ -103,10 +111,13 @@ typedef struct _XkbRF_Rules {
|
||||||
|
|
||||||
_XFUNCPROTOBEGIN
|
_XFUNCPROTOBEGIN
|
||||||
|
|
||||||
|
/* Seems preferable to dragging xkbstr.h in. */
|
||||||
|
struct _XkbComponentNames;
|
||||||
|
|
||||||
extern _X_EXPORT Bool XkbRF_GetComponents(
|
extern _X_EXPORT Bool XkbRF_GetComponents(
|
||||||
XkbRF_RulesPtr /* rules */,
|
XkbRF_RulesPtr /* rules */,
|
||||||
XkbRF_VarDefsPtr /* var_defs */,
|
XkbRF_VarDefsPtr /* var_defs */,
|
||||||
XkbComponentNamesPtr /* names */
|
struct _XkbComponentNames * /* names */
|
||||||
);
|
);
|
||||||
|
|
||||||
extern _X_EXPORT XkbRF_RulePtr XkbRF_AddRule(
|
extern _X_EXPORT XkbRF_RulePtr XkbRF_AddRule(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user