Index: uspace/lib/ui/include/ui/menubar.h =================================================================== --- uspace/lib/ui/include/ui/menubar.h (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/include/ui/menubar.h (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -45,6 +45,7 @@ #include #include +#include -extern errno_t ui_menu_bar_create(ui_t *, ui_resource_t *, +extern errno_t ui_menu_bar_create(ui_t *, ui_window_t *, ui_menu_bar_t **); extern void ui_menu_bar_destroy(ui_menu_bar_t *); Index: uspace/lib/ui/include/ui/popup.h =================================================================== --- uspace/lib/ui/include/ui/popup.h (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/include/ui/popup.h (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -43,7 +43,8 @@ #include #include +#include extern void ui_popup_params_init(ui_popup_params_t *); -extern errno_t ui_popup_create(ui_t *, ui_popup_params_t *, +extern errno_t ui_popup_create(ui_t *, ui_window_t *, ui_popup_params_t *, ui_popup_t **); extern void ui_popup_set_cb(ui_popup_t *, ui_popup_cb_t *, void *); Index: uspace/lib/ui/private/menubar.h =================================================================== --- uspace/lib/ui/private/menubar.h (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/private/menubar.h (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -52,6 +52,6 @@ /** UI */ struct ui *ui; - /** UI resource (for window containing menu bar) */ - struct ui_resource *res; + /** UI window containing menu bar */ + struct ui_window *window; /** Menu bar rectangle */ gfx_rect_t rect; Index: uspace/lib/ui/private/popup.h =================================================================== --- uspace/lib/ui/private/popup.h (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/private/popup.h (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -52,4 +52,6 @@ /** Callback argument */ void *arg; + /** Parent window */ + struct ui_window *parent; /** Window */ struct ui_window *window; Index: uspace/lib/ui/src/menu.c =================================================================== --- uspace/lib/ui/src/menu.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/src/menu.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -49,4 +49,5 @@ #include #include +#include #include "../private/menubar.h" #include "../private/menu.h" @@ -170,9 +171,12 @@ ui_menu_geom_t *geom) { + ui_resource_t *res; gfx_coord2_t edim; gfx_coord_t frame_w; gfx_coord_t frame_h; - if (menu->mbar->res->textmode) { + res = ui_window_get_res(menu->mbar->window); + + if (res->textmode) { frame_w = menu_frame_w_text; frame_h = menu_frame_h_text; @@ -242,5 +246,6 @@ params.rect = geom.outer_rect; - rc = ui_popup_create(menu->mbar->ui, ¶ms, &popup); + rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, ¶ms, + &popup); if (rc != EOK) return rc; Index: uspace/lib/ui/src/menubar.c =================================================================== --- uspace/lib/ui/src/menubar.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/src/menubar.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -47,4 +47,5 @@ #include #include +#include #include "../private/menubar.h" #include "../private/resource.h" @@ -73,10 +74,9 @@ * * @param ui UI - * @param res UI resource + * @param window Window that will contain the menu bar * @param rmbar Place to store pointer to new menu bar * @return EOK on success, ENOMEM if out of memory */ -errno_t ui_menu_bar_create(ui_t *ui, ui_resource_t *res, - ui_menu_bar_t **rmbar) +errno_t ui_menu_bar_create(ui_t *ui, ui_window_t *window, ui_menu_bar_t **rmbar) { ui_menu_bar_t *mbar; @@ -94,5 +94,5 @@ mbar->ui = ui; - mbar->res = res; + mbar->window = window; list_initialize(&mbar->menus); *rmbar = mbar; @@ -149,4 +149,5 @@ errno_t ui_menu_bar_paint(ui_menu_bar_t *mbar) { + ui_resource_t *res; gfx_text_fmt_t fmt; gfx_coord2_t pos; @@ -161,15 +162,17 @@ errno_t rc; + res = ui_window_get_res(mbar->window); + /* Paint menu bar background */ - rc = gfx_set_color(mbar->res->gc, mbar->res->wnd_face_color); + rc = gfx_set_color(res->gc, res->wnd_face_color); if (rc != EOK) goto error; - rc = gfx_fill_rect(mbar->res->gc, &mbar->rect); + rc = gfx_fill_rect(res->gc, &mbar->rect); if (rc != EOK) goto error; - if (mbar->res->textmode) { + if (res->textmode) { hpad = menubar_hpad_text; vpad = menubar_vpad_text; @@ -188,5 +191,5 @@ while (menu != NULL) { caption = ui_menu_caption(menu); - width = gfx_text_width(mbar->res->font, caption) + 2 * hpad; + width = gfx_text_width(res->font, caption) + 2 * hpad; tpos.x = pos.x + hpad; tpos.y = pos.y + vpad; @@ -197,20 +200,20 @@ if (menu == mbar->selected) { - fmt.color = mbar->res->wnd_sel_text_color; - bg_color = mbar->res->wnd_sel_text_bg_color; + fmt.color = res->wnd_sel_text_color; + bg_color = res->wnd_sel_text_bg_color; } else { - fmt.color = mbar->res->wnd_text_color; - bg_color = mbar->res->wnd_face_color; + fmt.color = res->wnd_text_color; + bg_color = res->wnd_face_color; } - rc = gfx_set_color(mbar->res->gc, bg_color); + rc = gfx_set_color(res->gc, bg_color); if (rc != EOK) goto error; - rc = gfx_fill_rect(mbar->res->gc, &rect); + rc = gfx_fill_rect(res->gc, &rect); if (rc != EOK) goto error; - rc = gfx_puttext(mbar->res->font, &tpos, &fmt, caption); + rc = gfx_puttext(res->font, &tpos, &fmt, caption); if (rc != EOK) goto error; @@ -220,5 +223,5 @@ } - rc = gfx_update(mbar->res->gc); + rc = gfx_update(res->gc); if (rc != EOK) goto error; @@ -269,4 +272,5 @@ ui_evclaim_t ui_menu_bar_pos_event(ui_menu_bar_t *mbar, pos_event_t *event) { + ui_resource_t *res; gfx_coord2_t pos; gfx_rect_t rect; @@ -277,8 +281,10 @@ gfx_coord2_t ppos; + res = ui_window_get_res(mbar->window); + ppos.x = event->hpos; ppos.y = event->vpos; - if (mbar->res->textmode) { + if (res->textmode) { hpad = menubar_hpad_text; } else { @@ -291,5 +297,5 @@ while (menu != NULL) { caption = ui_menu_caption(menu); - width = gfx_text_width(mbar->res->font, caption) + 2 * hpad; + width = gfx_text_width(res->font, caption) + 2 * hpad; rect.p0 = pos; Index: uspace/lib/ui/src/menuentry.c =================================================================== --- uspace/lib/ui/src/menuentry.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/src/menuentry.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -46,4 +46,5 @@ #include #include +#include #include "../private/menubar.h" #include "../private/menuentry.h" @@ -209,5 +210,5 @@ * resource instead. */ - res = mentry->menu->mbar->res; + res = ui_window_get_res(mentry->menu->mbar->window); *caption_w = gfx_text_width(res->font, mentry->caption); @@ -235,5 +236,5 @@ * resource instead. */ - res = menu->mbar->res; + res = ui_window_get_res(menu->mbar->window); if (res->textmode) @@ -274,5 +275,5 @@ * resource instead. */ - res = mentry->menu->mbar->res; + res = ui_window_get_res(mentry->menu->mbar->window); if (res->textmode) { Index: uspace/lib/ui/src/popup.c =================================================================== --- uspace/lib/ui/src/popup.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/src/popup.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -67,10 +67,11 @@ * * @param ui User interface + * @param parent Parent window * @param params Popup parameters * @param rpopup Place to store pointer to new popup window * @return EOK on success or an error code */ -errno_t ui_popup_create(ui_t *ui, ui_popup_params_t *params, - ui_popup_t **rpopup) +errno_t ui_popup_create(ui_t *ui, ui_window_t *parent, + ui_popup_params_t *params, ui_popup_t **rpopup) { ui_popup_t *popup; @@ -93,4 +94,5 @@ popup->ui = ui; + popup->parent = parent; popup->window = window; Index: uspace/lib/ui/test/menu.c =================================================================== --- uspace/lib/ui/test/menu.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/test/menu.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -36,7 +36,6 @@ #include #include -#include #include -#include "../private/dummygc.h" +#include #include "../private/menu.h" #include "../private/menubar.h" @@ -78,7 +77,7 @@ PCUT_TEST(first_next) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu1 = NULL; @@ -87,14 +86,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -118,6 +118,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -125,7 +125,7 @@ PCUT_TEST(caption) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -133,14 +133,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -156,6 +157,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -163,7 +164,7 @@ PCUT_TEST(get_rect) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -173,14 +174,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -203,6 +205,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -210,8 +212,7 @@ PCUT_TEST(paint) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -220,17 +221,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -255,7 +254,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -263,7 +261,7 @@ PCUT_TEST(pos_event_inside) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -273,14 +271,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -299,6 +298,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -306,7 +305,7 @@ PCUT_TEST(get_geom) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -315,14 +314,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -346,6 +346,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } Index: uspace/lib/ui/test/menubar.c =================================================================== --- uspace/lib/ui/test/menubar.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/test/menubar.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -27,5 +27,4 @@ */ -#include #include #include @@ -35,7 +34,6 @@ #include #include -#include #include -#include "../private/dummygc.h" +#include #include "../private/menubar.h" @@ -84,20 +82,21 @@ { errno_t rc; - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; - ui_menu_bar_t *mbar = NULL; - gfx_rect_t rect; - - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; + ui_menu_bar_t *mbar = NULL; + gfx_rect_t rect; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -115,6 +114,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -122,20 +121,21 @@ PCUT_TEST(paint) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; - ui_menu_bar_t *mbar = NULL; - errno_t rc; - - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; + ui_menu_bar_t *mbar = NULL; + errno_t rc; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -145,6 +145,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -152,8 +152,7 @@ PCUT_TEST(pos_event_select) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -163,17 +162,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -200,7 +197,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -208,8 +204,7 @@ PCUT_TEST(select_same) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -217,17 +212,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -249,7 +242,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -257,8 +249,7 @@ PCUT_TEST(select_different) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu1 = NULL; @@ -267,17 +258,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -303,7 +292,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } Index: uspace/lib/ui/test/menuentry.c =================================================================== --- uspace/lib/ui/test/menuentry.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/test/menuentry.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -36,7 +36,6 @@ #include #include -#include #include -#include "../private/dummygc.h" +#include #include "../private/menuentry.h" @@ -54,22 +53,23 @@ PCUT_TEST(create_destroy) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; - ui_menu_bar_t *mbar = NULL; - ui_menu_t *menu = NULL; - ui_menu_entry_t *mentry = NULL; - errno_t rc; - - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; + ui_menu_bar_t *mbar = NULL; + ui_menu_t *menu = NULL; + ui_menu_entry_t *mentry = NULL; + errno_t rc; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -87,5 +87,6 @@ ui_menu_bar_destroy(mbar); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -93,22 +94,23 @@ PCUT_TEST(create_sep_destroy) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; - ui_menu_bar_t *mbar = NULL; - ui_menu_t *menu = NULL; - ui_menu_entry_t *mentry = NULL; - errno_t rc; - - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; + ui_menu_bar_t *mbar = NULL; + ui_menu_t *menu = NULL; + ui_menu_entry_t *mentry = NULL; + errno_t rc; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -126,5 +128,6 @@ ui_menu_bar_destroy(mbar); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -138,7 +141,7 @@ PCUT_TEST(set_cb) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -147,14 +150,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -175,6 +179,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -182,7 +186,7 @@ PCUT_TEST(first_next) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -192,14 +196,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -227,14 +232,14 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); -} - -/** ui_menu_entry_widths() / ui_menu_entry_height() */ + ui_window_destroy(window); + ui_destroy(ui); +} + +/** ui_menu_entry_column_widths() / ui_menu_entry_height() */ PCUT_TEST(widths_height) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -246,14 +251,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(NULL, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -278,6 +284,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -285,8 +291,7 @@ PCUT_TEST(paint) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -296,17 +301,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -334,7 +337,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -342,8 +344,7 @@ PCUT_TEST(press_release) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -354,17 +355,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -401,7 +400,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -409,8 +407,7 @@ PCUT_TEST(press_leave_release) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -421,17 +418,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -473,7 +468,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -481,8 +475,7 @@ PCUT_TEST(press_leave_enter_release) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -493,17 +486,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -550,7 +541,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -558,8 +548,7 @@ PCUT_TEST(pos_press_inside) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -570,17 +559,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -614,7 +601,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -622,8 +608,7 @@ PCUT_TEST(pos_press_outside) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -634,17 +619,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -678,7 +661,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -686,8 +668,7 @@ PCUT_TEST(pos_move_out) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -698,17 +679,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -745,7 +724,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } @@ -753,8 +731,7 @@ PCUT_TEST(pos_move_in) { - dummy_gc_t *dgc; - gfx_context_t *gc; - ui_t *ui = NULL; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_menu_bar_t *mbar = NULL; ui_menu_t *menu = NULL; @@ -765,17 +742,15 @@ errno_t rc; - rc = dummygc_create(&dgc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - gc = dummygc_get_ctx(dgc); - - rc = ui_create_disp(NULL, &ui); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - - rc = ui_resource_create(gc, false, &resource); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); - - rc = ui_menu_bar_create(ui, resource, &mbar); + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + rc = ui_menu_bar_create(ui, window, &mbar); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(mbar); @@ -809,7 +784,6 @@ ui_menu_bar_destroy(mbar); - ui_resource_destroy(resource); - ui_destroy(ui); - dummygc_destroy(dgc); + ui_window_destroy(window); + ui_destroy(ui); } Index: uspace/lib/ui/test/popup.c =================================================================== --- uspace/lib/ui/test/popup.c (revision 3c8c5808e19c14b9cbc2453181414284f31291a4) +++ uspace/lib/ui/test/popup.c (revision c68c18b9bb5f07126605a1631863634fac2f1ffb) @@ -106,5 +106,5 @@ ui_popup_params_init(¶ms); - rc = ui_popup_create(ui, ¶ms, &popup); + rc = ui_popup_create(ui, NULL, ¶ms, &popup); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(popup); @@ -135,5 +135,5 @@ ui_popup_params_init(¶ms); - rc = ui_popup_create(ui, ¶ms, &popup); + rc = ui_popup_create(ui, NULL, ¶ms, &popup); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(popup); @@ -222,5 +222,5 @@ ui_popup_params_init(¶ms); - rc = ui_popup_create(ui, ¶ms, &popup); + rc = ui_popup_create(ui, NULL, ¶ms, &popup); PCUT_ASSERT_ERRNO_VAL(EOK, rc); PCUT_ASSERT_NOT_NULL(popup);