test_file(const char *path)
{
int fd;
- struct xkb_context *context;
+ struct xkb_ctx *ctx;
struct xkb_keymap *keymap;
fd = open(path, O_RDONLY);
assert(fd >= 0);
- context = xkb_context_new(0);
- assert(context);
+ ctx = xkb_ctx_new(0);
+ assert(ctx);
fprintf(stderr, "\nCompiling path: %s\n", path);
- keymap = xkb_map_new_from_fd(context, fd, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+ keymap = xkb_map_new_from_fd(ctx, fd, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
close(fd);
if (!keymap) {
fprintf(stderr, "Failed to compile keymap\n");
- xkb_context_unref(context);
+ xkb_ctx_unref(ctx);
return 0;
}
xkb_map_unref(keymap);
- xkb_context_unref(context);
+ xkb_ctx_unref(ctx);
return 1;
}
static int
test_string(const char *string)
{
- struct xkb_context *context;
+ struct xkb_ctx *ctx;
struct xkb_keymap *keymap;
- context = xkb_context_new(0);
- assert(context);
+ ctx = xkb_ctx_new(0);
+ assert(ctx);
fprintf(stderr, "\nCompiling string\n");
- keymap = xkb_map_new_from_string(context, string,
- XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+ keymap = xkb_map_new_from_string(ctx, string, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
if (!keymap) {
- xkb_context_unref(context);
+ xkb_ctx_unref(ctx);
return 0;
}
xkb_map_unref(keymap);
- xkb_context_unref(context);
+ xkb_ctx_unref(ctx);
return 1;
}