Commit f525f9f0403c4881f32e65234d2647cd67dc826c
2020-06-23T16:25:50
test: disentangle interactive-wayland from the test headers Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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
diff --git a/meson.build b/meson.build
index 1f9fb78..b89d58f 100644
--- a/meson.build
+++ b/meson.build
@@ -501,7 +501,10 @@ You can disable the Wayland demo programs with -Denable-wayland=false.''')
wayland_scanner_code_gen.process(xdg_shell_xml),
wayland_scanner_client_header_gen.process(xdg_shell_xml),
]
- executable('interactive-wayland', 'test/interactive-wayland.c', xdg_shell_sources, dependencies: [test_dep, wayland_client_dep])
+ executable('interactive-wayland',
+ 'test/interactive-wayland.c',
+ xdg_shell_sources,
+ dependencies: [tools_dep, wayland_client_dep])
endif
# xkeyboard-config "verifier"
diff --git a/test/interactive-wayland.c b/test/interactive-wayland.c
index ab83e71..0ffccd0 100644
--- a/test/interactive-wayland.c
+++ b/test/interactive-wayland.c
@@ -33,7 +33,7 @@
#include <sys/mman.h>
#include "xkbcommon/xkbcommon.h"
-#include "test.h"
+#include "tools-common.h"
#include <wayland-client.h>
#include "xdg-shell-client-protocol.h"
@@ -377,8 +377,8 @@ kbd_key(void *data, struct wl_keyboard *wl_kbd, uint32_t serial, uint32_t time,
return;
printf("%s: ", seat->name_str);
- test_print_keycode_state(seat->state, NULL, key + 8,
- XKB_CONSUMED_MODE_XKB);
+ tools_print_keycode_state(seat->state, NULL, key + 8,
+ XKB_CONSUMED_MODE_XKB);
/* Exit on ESC. */
if (xkb_state_key_get_one_sym(seat->state, key + 8) == XKB_KEY_Escape)
@@ -669,7 +669,7 @@ main(int argc, char *argv[])
goto err_out;
}
- inter.ctx = test_get_context(0);
+ inter.ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!inter.ctx) {
ret = -1;
fprintf(stderr, "Couldn't create xkb context\n");
@@ -698,11 +698,11 @@ main(int argc, char *argv[])
surface_create(&inter);
- test_disable_stdin_echo();
+ tools_disable_stdin_echo();
do {
ret = wl_display_dispatch(inter.dpy);
} while (ret >= 0 && !terminate);
- test_enable_stdin_echo();
+ tools_enable_stdin_echo();
wl_registry_destroy(registry);
err_conn: