test: disentangle interactive-wayland from the test headers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>master
parent
1326d5add4
commit
f525f9f040
|
@ -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_code_gen.process(xdg_shell_xml),
|
||||||
wayland_scanner_client_header_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
|
endif
|
||||||
|
|
||||||
# xkeyboard-config "verifier"
|
# xkeyboard-config "verifier"
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
|
||||||
#include "xkbcommon/xkbcommon.h"
|
#include "xkbcommon/xkbcommon.h"
|
||||||
#include "test.h"
|
#include "tools-common.h"
|
||||||
|
|
||||||
#include <wayland-client.h>
|
#include <wayland-client.h>
|
||||||
#include "xdg-shell-client-protocol.h"
|
#include "xdg-shell-client-protocol.h"
|
||||||
|
@ -377,7 +377,7 @@ kbd_key(void *data, struct wl_keyboard *wl_kbd, uint32_t serial, uint32_t time,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
printf("%s: ", seat->name_str);
|
printf("%s: ", seat->name_str);
|
||||||
test_print_keycode_state(seat->state, NULL, key + 8,
|
tools_print_keycode_state(seat->state, NULL, key + 8,
|
||||||
XKB_CONSUMED_MODE_XKB);
|
XKB_CONSUMED_MODE_XKB);
|
||||||
|
|
||||||
/* Exit on ESC. */
|
/* Exit on ESC. */
|
||||||
|
@ -669,7 +669,7 @@ main(int argc, char *argv[])
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
inter.ctx = test_get_context(0);
|
inter.ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||||
if (!inter.ctx) {
|
if (!inter.ctx) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
fprintf(stderr, "Couldn't create xkb context\n");
|
fprintf(stderr, "Couldn't create xkb context\n");
|
||||||
|
@ -698,11 +698,11 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
surface_create(&inter);
|
surface_create(&inter);
|
||||||
|
|
||||||
test_disable_stdin_echo();
|
tools_disable_stdin_echo();
|
||||||
do {
|
do {
|
||||||
ret = wl_display_dispatch(inter.dpy);
|
ret = wl_display_dispatch(inter.dpy);
|
||||||
} while (ret >= 0 && !terminate);
|
} while (ret >= 0 && !terminate);
|
||||||
test_enable_stdin_echo();
|
tools_enable_stdin_echo();
|
||||||
|
|
||||||
wl_registry_destroy(registry);
|
wl_registry_destroy(registry);
|
||||||
err_conn:
|
err_conn:
|
||||||
|
|
Loading…
Reference in New Issue