diff options
author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-02-05 16:25:06 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 15:42:13 +0100 |
commit | b19b0808940c8c54b102012be134a370b26e348e (patch) | |
tree | 63d951814f771e87508be7b0f8d4346d0079dc05 /src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h | |
parent | c6b555dac389f9a599a9ad342de56dea329fff60 (diff) |
Update bundled libxkbcommon version to 0.4.0
This release comes with important bug fixes. Also we can now
remove the workaround code which was needed for libxkbcommon 0.2.0.
Task-number: QTBUG-31712
Task-number: QTBUG-33732
Task-number: QTBUG-34056
Change-Id: I57caf7f803b9a01a15541a5ad82e464de3b8abbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h')
-rw-r--r-- | src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h | 58 |
1 files changed, 38 insertions, 20 deletions
diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h index 0ecd124145..8146b066d1 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h @@ -31,7 +31,19 @@ ParseCommon * AppendStmt(ParseCommon *to, ParseCommon *append); ExprDef * -ExprCreate(enum expr_op_type op, enum expr_value_type type); +ExprCreateString(xkb_atom_t str); + +ExprDef * +ExprCreateInteger(int ival); + +ExprDef * +ExprCreateBoolean(bool set); + +ExprDef * +ExprCreateKeyName(xkb_atom_t key_name); + +ExprDef * +ExprCreateIdent(xkb_atom_t ident); ExprDef * ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, @@ -40,6 +52,27 @@ ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, ExprDef * ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right); +ExprDef * +ExprCreateFieldRef(xkb_atom_t element, xkb_atom_t field); + +ExprDef * +ExprCreateArrayRef(xkb_atom_t element, xkb_atom_t field, ExprDef *entry); + +ExprDef * +ExprCreateAction(xkb_atom_t name, ExprDef *args); + +ExprDef * +ExprCreateMultiKeysymList(ExprDef *list); + +ExprDef * +ExprCreateKeysymList(xkb_keysym_t sym); + +ExprDef * +ExprAppendMultiKeysymList(ExprDef *list, ExprDef *append); + +ExprDef * +ExprAppendKeysymList(ExprDef *list, xkb_keysym_t sym); + KeycodeDef * KeycodeCreate(xkb_atom_t name, int64_t value); @@ -53,16 +86,16 @@ VarDef * VarCreate(ExprDef *name, ExprDef *value); VarDef * -BoolVarCreate(xkb_atom_t nameToken, unsigned set); +BoolVarCreate(xkb_atom_t ident, bool set); InterpDef * -InterpCreate(char *sym, ExprDef *match); +InterpCreate(xkb_keysym_t sym, ExprDef *match); KeyTypeDef * KeyTypeCreate(xkb_atom_t name, VarDef *body); SymbolsDef * -SymbolsCreate(xkb_atom_t keyName, ExprDef *symbols); +SymbolsCreate(xkb_atom_t keyName, VarDef *symbols); GroupCompatDef * GroupCompatCreate(int group, ExprDef *def); @@ -76,27 +109,12 @@ LedMapCreate(xkb_atom_t name, VarDef *body); LedNameDef * LedNameCreate(int ndx, ExprDef *name, bool virtual); -ExprDef * -ActionCreate(xkb_atom_t name, ExprDef *args); - -ExprDef * -CreateMultiKeysymList(ExprDef *list); - -ExprDef * -CreateKeysymList(char *sym); - -ExprDef * -AppendMultiKeysymList(ExprDef *list, ExprDef *append); - -ExprDef * -AppendKeysymList(ExprDef *list, char *sym); - IncludeStmt * IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge); XkbFile * XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name, - ParseCommon *defs, unsigned flags); + ParseCommon *defs, enum xkb_map_flags flags); void FreeStmt(ParseCommon *stmt); |