diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-06-23 16:23:24 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-06-25 10:32:08 +1000 |
| commit | 1326d5add46278f2be98b25d8527eab62d41351d (patch) | |
| tree | 97426014543e9f4aad912d0e8a670d12858ecca9 /test | |
| parent | c09bf36306e45ea699e3a494e829bf684fd60e02 (diff) | |
| download | xorg-lib-libxkbcommon-1326d5add46278f2be98b25d8527eab62d41351d.tar.gz | |
test: untangle interactive-x11 from the test headers
Use the new tools headers and create a custom internal lib for the x11 tool.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/interactive-x11.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/interactive-x11.c b/test/interactive-x11.c index a2369ff..8d312b7 100644 --- a/test/interactive-x11.c +++ b/test/interactive-x11.c @@ -28,7 +28,7 @@ #include <xcb/xkb.h> #include "xkbcommon/xkbcommon-x11.h" -#include "test.h" +#include "tools-common.h" /* * Note: This program only handles the core keyboard device for now. @@ -239,8 +239,8 @@ process_event(xcb_generic_event_t *gevent, struct keyboard *kbd) xcb_key_press_event_t *event = (xcb_key_press_event_t *) gevent; xkb_keycode_t keycode = event->detail; - test_print_keycode_state(kbd->state, NULL, keycode, - XKB_CONSUMED_MODE_XKB); + tools_print_keycode_state(kbd->state, NULL, keycode, + XKB_CONSUMED_MODE_XKB); /* Exit on ESC. */ if (keycode == 9) @@ -354,7 +354,7 @@ main(int argc, char *argv[]) goto err_conn; } - ctx = test_get_context(0); + ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!ctx) { ret = -1; fprintf(stderr, "Couldn't create xkb context\n"); @@ -380,9 +380,9 @@ main(int argc, char *argv[]) goto err_core_kbd; } - test_disable_stdin_echo(); + tools_disable_stdin_echo(); ret = loop(conn, &core_kbd); - test_enable_stdin_echo(); + tools_enable_stdin_echo(); err_core_kbd: deinit_kbd(&core_kbd); |