projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shorten context to ctx
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
xkbcomp.h
diff --git
a/src/xkbcomp/xkbcomp.h
b/src/xkbcomp/xkbcomp.h
index
1261c73
..
a4078a3
100644
(file)
--- a/
src/xkbcomp/xkbcomp.h
+++ b/
src/xkbcomp/xkbcomp.h
@@
-27,25
+27,11
@@
#ifndef XKBCOMP_H
#define XKBCOMP_H 1
#ifndef XKBCOMP_H
#define XKBCOMP_H 1
-#ifndef DEBUG_VAR
-#define DEBUG_VAR debugFlags
-#endif
-
-#include <X11/X.h>
-#include <X11/Xdefs.h>
-
-#include "utils.h"
-
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
-
-extern char *scanFile;
+#include "xkb-priv.h"
#define TypeUnknown 0
#define TypeBoolean 1
#define TypeInt 2
#define TypeUnknown 0
#define TypeBoolean 1
#define TypeInt 2
-#define TypeFloat 3
#define TypeString 4
#define TypeAction 5
#define TypeKeyName 6
#define TypeString 4
#define TypeAction 5
#define TypeKeyName 6
@@
-81,7
+67,6
@@
typedef struct _ParseCommon
#define ExprArrayRef 4
#define ExprKeysymList 5
#define ExprActionList 6
#define ExprArrayRef 4
#define ExprKeysymList 5
#define ExprActionList 6
-#define ExprCoord 7
#define OpAdd 20
#define OpSubtract 21
#define OpAdd 20
#define OpSubtract 21
@@
-149,18
+134,16
@@
typedef struct _Expr
int nSyms;
int szSyms;
char **syms;
int nSyms;
int szSyms;
char **syms;
+ int nLevels;
+ int szLevels;
+ int *symsMapIndex;
+ unsigned int *symsNumEntries;
} list;
} list;
- struct
- {
- int x;
- int y;
- } coord;
struct _Expr *child;
xkb_atom_t str;
unsigned uval;
int ival;
char keyName[5];
struct _Expr *child;
xkb_atom_t str;
unsigned uval;
int ival;
char keyName[5];
- void * ptr;
} value;
} ExprDef;
} value;
} ExprDef;
@@
-243,7
+226,7
@@
typedef struct _IndicatorNameDef
unsigned merge;
int ndx;
ExprDef *name;
unsigned merge;
int ndx;
ExprDef *name;
-
B
ool virtual;
+
b
ool virtual;
} IndicatorNameDef;
typedef struct _IndicatorMapDef
} IndicatorNameDef;
typedef struct _IndicatorMapDef
@@
-258,34
+241,30
@@
typedef struct _IndicatorMapDef
typedef struct _XkbFile
{
ParseCommon common;
typedef struct _XkbFile
{
ParseCommon common;
-
int
type;
+
unsigned
type;
char *topName;
char *name;
ParseCommon *defs;
int id;
unsigned flags;
char *topName;
char *name;
ParseCommon *defs;
int id;
unsigned flags;
- Bool compiled;
} XkbFile;
} XkbFile;
-extern struct xkb_
desc
*
-CompileKeymap(
XkbFile *file, unsigned merg
e);
+extern struct xkb_
keymap
*
+CompileKeymap(
struct xkb_ctx *ctx, XkbFile *fil
e);
-extern
B
ool
-CompileKeycodes(XkbFile *file, struct xkb_
desc * xkb
, unsigned merge);
+extern
b
ool
+CompileKeycodes(XkbFile *file, struct xkb_
keymap *keymap
, unsigned merge);
-extern
B
ool
-CompileKeyTypes(XkbFile *file, struct xkb_
desc * xkb
, unsigned merge);
+extern
b
ool
+CompileKeyTypes(XkbFile *file, struct xkb_
keymap *keymap
, unsigned merge);
typedef struct _LEDInfo *LEDInfoPtr;
typedef struct _LEDInfo *LEDInfoPtr;
-extern
B
ool
-CompileCompatMap(XkbFile *file, struct xkb_
desc * xkb
, unsigned merge,
+extern
b
ool
+CompileCompatMap(XkbFile *file, struct xkb_
keymap *keymap
, unsigned merge,
LEDInfoPtr *unboundLEDs);
LEDInfoPtr *unboundLEDs);
-extern Bool
-CompileSymbols(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
-
-extern Bool
-UpdateModifiersFromCompat(struct xkb_desc *xkb);
+extern bool
+CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
#endif /* XKBCOMP_H */
#endif /* XKBCOMP_H */