Commit 1eda9e44b1f1a883016fe4dc0129155ecd1e389a
2012-08-03T02:51:40
test: Use test_compile_*() in interactive Signed-off-by: Daniel Stone <daniel@fooishbar.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/test/interactive.c b/test/interactive.c
index 6bd6a4f..d132d15 100644
--- a/test/interactive.c
+++ b/test/interactive.c
@@ -415,15 +415,12 @@ main(int argc, char *argv[])
struct keyboard *kbds;
struct xkb_context *ctx;
struct xkb_keymap *keymap;
- struct xkb_rule_names names = {
- .rules = "evdev",
- .model = "evdev",
- .layout = "us",
- .variant = "",
- .options = "",
- };
+ const char *rules = NULL;
+ const char *model = NULL;
+ const char *layout = NULL;
+ const char *variant = NULL;
+ const char *options = NULL;
const char *keymap_path = NULL;
- FILE *file;
struct sigaction act;
setlocale(LC_ALL, "");
@@ -431,19 +428,19 @@ main(int argc, char *argv[])
while ((opt = getopt(argc, argv, "r:m:l:v:o:k:")) != -1) {
switch (opt) {
case 'r':
- names.rules = optarg;
+ rules = optarg;
break;
case 'm':
- names.model = optarg;
+ model = optarg;
break;
case 'l':
- names.layout = optarg;
+ layout = optarg;
break;
case 'v':
- names.variant = optarg;
+ variant = optarg;
break;
case 'o':
- names.options = optarg;
+ options = optarg;
break;
case 'k':
keymap_path = optarg;
@@ -465,20 +462,11 @@ main(int argc, char *argv[])
goto err_out;
}
- if (keymap_path) {
- file = fopen(keymap_path, "r");
- if (!file) {
- fprintf(stderr, "Couldn't open file %s: %s\n",
- keymap_path, strerror(errno));
- ret = -1;
- goto err_ctx;
- }
- keymap = xkb_map_new_from_file(ctx, file,
- XKB_KEYMAP_FORMAT_TEXT_V1, 0);
- }
- else {
- keymap = xkb_map_new_from_names(ctx, &names, 0);
- }
+ if (keymap_path)
+ keymap = test_compile_file(ctx, keymap_path);
+ else
+ keymap = test_compile_rules(ctx, rules, model, layout, variant,
+ options);
if (!keymap) {
ret = -1;
fprintf(stderr, "Couldn't create xkb keymap\n");