StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move xkb_context struct to xkb-priv.h 

So we can print more intelligent debugging messages without needing
helper functions for the failed_includes array.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-08-03 03:12:52 +02:00
parent 3e8370b028
commit 226cb22c80
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/context.c
View File

@ -35,24 +35,6 @@
#include "xkb-priv.h"
#include "atom.h"
struct xkb_context {
int refcnt;
ATTR_PRINTF(3, 0) void (*log_fn)(struct xkb_context *ctx, int priority,
const char *fmt, va_list args);
int log_priority;
int log_verbosity;
void *user_data;
darray(char *) includes;
darray(char *) failed_includes;
/* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
unsigned file_id;
struct atom_table *atom_table;
};
/**
* Append one directory to the context's include path.
*/

18
src/xkb-priv.h
View File

@ -110,6 +110,24 @@ enum xkb_file_type {
FILE_TYPE_RULES = (1 << 6),
};
struct xkb_context {
int refcnt;
ATTR_PRINTF(3, 0) void (*log_fn)(struct xkb_context *ctx, int priority,
const char *fmt, va_list args);
int log_priority;
int log_verbosity;
void *user_data;
darray(char *) includes;
darray(char *) failed_includes;
/* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
unsigned file_id;
struct atom_table *atom_table;
};
/* Files needed for a complete keymap. */
#define REQUIRED_FILE_TYPES (FILE_TYPE_TYPES | FILE_TYPE_COMPAT | \
FILE_TYPE_SYMBOLS | FILE_TYPE_KEYCODES)