Changeset 6aa85c1 in mainline for uspace/app/nav/nav.c

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

File:

• uspace/app/nav/nav.c (modified) (6 diffs)

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;
-}
-
 /** @}
  */