Changeset 6aa85c1 in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b36ebb42

Parents:

5d466a1

git-author:

Jiri Svoboda <jiri@…> (2021-10-03 17:39:36)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Add panel class and add unit tests for all classes

Location:

uspace/app/nav

Files:

• main.c (added)
• menu.c (modified) (5 diffs)
• menu.h (modified) (1 diff)
• meson.build (modified) (1 diff)
• nav.c (modified) (6 diffs)
• nav.h (modified) (2 diffs)
• panel.c (added)
• panel.h (added)
• test/main.c (added)
• test/menu.c (added)
• test/nav.c (added)
• test/panel.c (added)

uspace/app/nav/menu.c

@@ -47 +47 @@
 /** Create navigator menu.
  *
- * @param navigator Navigator
+ * @param window Navigator window
  * @param rmenu Place to store pointer to new menu
  * @return EOK on success or an error code
  */
-errno_t nav_menu_create(navigator_t *navigator, nav_menu_t **rmenu)
+errno_t nav_menu_create(ui_window_t *window, nav_menu_t **rmenu)
 {
         nav_menu_t *menu;
@@ -64 +64 @@
                 return ENOMEM;
 
-        rc = ui_menu_bar_create(navigator->ui, navigator->window,
+        menu->window = window;
+        menu->ui = ui_window_get_ui(window);
+
+        rc = ui_menu_bar_create(menu->ui, menu->window,
             &menu->menubar);
         if (rc != EOK)
@@ -77 +80 @@
                 goto error;
 
-        ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) navigator);
+        ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) menu);
 
-        ui_window_get_app_rect(navigator->window, &arect);
+        ui_window_get_app_rect(menu->window, &arect);
 
         rect.p0 = arect.p0;
@@ -86 +89 @@
         ui_menu_bar_set_rect(menu->menubar, &rect);
 
-        rc = ui_fixed_add(navigator->fixed, ui_menu_bar_ctl(menu->menubar));
-        if (rc != EOK)
-                goto error;
-
-        menu->navigator = navigator;
         *rmenu = menu;
         return EOK;
@@ -104 +102 @@
 void nav_menu_destroy(nav_menu_t *menu)
 {
-        if (menu->menubar != NULL) {
-                ui_fixed_remove(menu->navigator->fixed,
-                    ui_menu_bar_ctl(menu->menubar));
+        if (menu->menubar != NULL)
                 ui_menu_bar_destroy(menu->menubar);
-        }
 
         free(menu);
+}
+
+/** Return base UI control for the menu bar.
+ *
+ * @param menu Navigator menu
+ * @return UI control
+ */
+ui_control_t *nav_menu_ctl(nav_menu_t *menu)
+{
+        return ui_menu_bar_ctl(menu->menubar);
 }
 

uspace/app/nav/menu.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <ui/control.h>
 #include <ui/menu.h>
 #include <ui/menubar.h>
 #include <ui/menuentry.h>
+#include <ui/ui.h>
+#include <ui/window.h>
 #include "nav.h"
 
 /** Navigator menu */
 typedef struct nav_menu {
-        navigator_t *navigator;
+        ui_t *ui;
+        ui_window_t *window;
         ui_menu_bar_t *menubar;
 } nav_menu_t;
 
-extern errno_t nav_menu_create(navigator_t *, nav_menu_t **);
+extern errno_t nav_menu_create(ui_window_t *, nav_menu_t **);
 extern void nav_menu_destroy(nav_menu_t *);
+extern ui_control_t *nav_menu_ctl(nav_menu_t *);
 
 #endif

uspace/app/nav/meson.build

@@ -29 +29 @@
 deps = [ 'ui' ]
 src = files(
+        'main.c',
         'menu.c',
         'nav.c',
+        'panel.c',
 )
+
+test_src = files(
+        'menu.c',
+        'nav.c',
+        'panel.c',
+        'test/main.c',
+        'test/menu.c',
+        'test/nav.c',
+        'test/panel.c',
+)

uspace/app/nav/nav.c

@@ -46 +46 @@
 #include "nav.h"
 
-static errno_t navigator_create(const char *, navigator_t **);
-static void navigator_destroy(navigator_t *);
-
 static void wnd_close(ui_window_t *, void *);
 
@@ -73 +70 @@
  * @return EOK on success or ane error code
  */
-static errno_t navigator_create(const char *display_spec,
+errno_t navigator_create(const char *display_spec,
     navigator_t **rnavigator)
 {
@@ -111 +108 @@
         ui_window_add(navigator->window, ui_fixed_ctl(navigator->fixed));
 
-        rc = nav_menu_create(navigator, &navigator->menu);
+        rc = nav_menu_create(navigator->window, &navigator->menu);
         if (rc != EOK)
                 goto error;
+
+        rc = ui_fixed_add(navigator->fixed, nav_menu_ctl(navigator->menu));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
 
         rc = ui_window_paint(navigator->window);
@@ -128 +131 @@
 }
 
-static void navigator_destroy(navigator_t *navigator)
+void navigator_destroy(navigator_t *navigator)
 {
+        ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));
+
         if (navigator->menu != NULL)
                 nav_menu_destroy(navigator->menu);
@@ -140 +145 @@
 
 /** Run navigator on the specified display. */
-static errno_t navigator_run(const char *display_spec)
+errno_t navigator_run(const char *display_spec)
 {
         navigator_t *navigator;
@@ -155 +160 @@
 }
 
-static void print_syntax(void)
-{
-        printf("Syntax: nav [-d <display-spec>]\n");
-}
-
-int main(int argc, char *argv[])
-{
-        const char *display_spec = UI_CONSOLE_DEFAULT;
-        errno_t rc;
-        int i;
-
-        i = 1;
-        while (i < argc && argv[i][0] == '-') {
-                if (str_cmp(argv[i], "-d") == 0) {
-                        ++i;
-                        if (i >= argc) {
-                                printf("Argument missing.\n");
-                                print_syntax();
-                                return 1;
-                        }
-
-                        display_spec = argv[i++];
-                } else {
-                        printf("Invalid option '%s'.\n", argv[i]);
-                        print_syntax();
-                        return 1;
-                }
-        }
-
-        if (i < argc) {
-                print_syntax();
-                return 1;
-        }
-
-        rc = navigator_run(display_spec);
-        if (rc != EOK)
-                return 1;
-
-        return 0;
-}
-
 /** @}
  */

uspace/app/nav/nav.h

@@ -37 +37 @@
 #define NAV_H
 
+#include <errno.h>
 #include <display.h>
 #include <ui/fixed.h>
@@ -54 +55 @@
 } navigator_t;
 
+extern errno_t navigator_create(const char *, navigator_t **);
+extern void navigator_destroy(navigator_t *);
+extern errno_t navigator_run(const char *);
+
+
 #endif