From 014c20099d0199445cedc6e3504e4309176c56ae Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Wed, 22 Oct 2014 22:46:51 +0300 Subject: Refactor code to snake_style, turn renderers into plugins, and start wayland (cairo) renderer. --- test/bmMenuNew.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'test/bmMenuNew.c') diff --git a/test/bmMenuNew.c b/test/bmMenuNew.c index ebab314..bccfbc8 100644 --- a/test/bmMenuNew.c +++ b/test/bmMenuNew.c @@ -1,25 +1,31 @@ #include #include #include +#include #include #include -int main(int argc, char **argv) +int +main(int argc, char **argv) { (void)argc, (void)argv; + if (!bm_init()) + return EXIT_FAILURE; + // TEST: Instance bmMenu with all possible draw modes. { - bmDrawMode i; - for (i = 0; i < BM_DRAW_MODE_LAST; ++i) { - if (i == BM_DRAW_MODE_CURSES && !isatty(STDIN_FILENO)) { + uint32_t count; + const struct bm_renderer **renderers = bm_get_renderers(&count); + for (int32_t i = 0; i < count; ++i) { + if (!strcmp(bm_renderer_get_name(renderers[i]), "curses") && !isatty(STDIN_FILENO)) { printf("Skipping test for mode BM_DRAW_MODE_CURSES, as not running on terminal.\n"); continue; } - bmMenu *menu = bmMenuNew(i); + struct bm_menu *menu = bm_menu_new(bm_renderer_get_name(renderers[i])); assert(menu); - bmMenuRender(menu); - bmMenuFree(menu); + bm_menu_render(menu); + bm_menu_free(menu); } } -- cgit v1.2.3-70-g09d2