diff options
| author | Ran Benita <ran234@gmail.com> | 2012-06-30 00:49:41 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-07-01 00:51:56 +0300 |
| commit | 37f4384947939784d1eb4b29bb201974b14f95bb (patch) | |
| tree | e27c861fa9973dc2d762040c8c14133a7174b853 /test/rules-file.c | |
| parent | 337c3007acf83eb818d6737fbb1c8e87758f7d86 (diff) | |
| download | xorg-lib-libxkbcommon-37f4384947939784d1eb4b29bb201974b14f95bb.tar.gz | |
rules: remove support for keymap rule
This commit removes the ability to specify a keymap *in a rules file*,
e.g. in /usr/share/X11/xkb/rules/evdev or somesuch. This is unused in
xkeyboard-data, and the current code has never even supported it,
because xkb_map_new_from_kccgst (which is no longer exposed in the API)
checks to see that one of the usual components (e.g. symbols, types, ..)
has been filled, while the rules parser, on the other hand, doesn't
allow to specify a keymap and other stuff at the same time.
( The idea was to remove xkb_map_new_from_kccgst entirely, but it's used
by a test so it can stay. )
tl;dr: dead code. Of course passing a keymap file to
xkb_map_new_from_file still works.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'test/rules-file.c')
| -rw-r--r-- | test/rules-file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/rules-file.c b/test/rules-file.c index 90981a2..8e301b2 100644 --- a/test/rules-file.c +++ b/test/rules-file.c @@ -40,7 +40,6 @@ struct test_data { const char *options; /* Expected output */ - const char *keymap; const char *keycodes; const char *types; const char *compat; @@ -73,7 +72,7 @@ test_rules(struct xkb_context *ctx, struct test_data *data) if (data->should_fail) fprintf(stderr, "Expecting: NULL\n"); else - fprintf(stderr, "Expecting: %s\t%s\t%s\t%s\t%s\n", data->keymap, + fprintf(stderr, "Expecting: %s\t%s\t%s\t%s\n", data->keycodes, data->types, data->compat, data->symbols); kccgst = xkb_components_from_rules(ctx, &rmlvo); @@ -82,16 +81,14 @@ test_rules(struct xkb_context *ctx, struct test_data *data) return data->should_fail; } - fprintf(stderr, "Received : %s\t%s\t%s\t%s\t%s\n", kccgst->keymap, + fprintf(stderr, "Received : %s\t%s\t%s\t%s\n", kccgst->keycodes, kccgst->types, kccgst->compat, kccgst->symbols); - passed = streq(kccgst->keymap, data->keymap) && - streq(kccgst->keycodes, data->keycodes) && + passed = streq(kccgst->keycodes, data->keycodes) && streq(kccgst->types, data->types) && streq(kccgst->compat, data->compat) && streq(kccgst->symbols, data->symbols); - free(kccgst->keymap); free(kccgst->keycodes); free(kccgst->types); free(kccgst->compat); |