Changeset f59212cc in mainline for uspace/app/nav/menu.c

Timestamp:

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

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

c632c96

Parents:

5bbb4453

git-author:

Jiri Svoboda <jiri@…> (2021-10-19 20:54:17)

git-committer:

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

Message:

Add File / Open, properly deliver menu events to Navigator

File:

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

uspace/app/nav/menu.c

@@ -43 +43 @@
 #include "nav.h"
 
-static void nav_file_exit(ui_menu_entry_t *, void *);
-
 /** Create navigator menu.
  *
@@ -55 +53 @@
         nav_menu_t *menu;
         ui_menu_t *mfile;
+        ui_menu_entry_t *mopen;
+        ui_menu_entry_t *mfsep;
         ui_menu_entry_t *mexit;
         gfx_rect_t arect;
@@ -76 +76 @@
                 goto error;
 
+        rc = ui_menu_entry_create(mfile, "Open", "Enter", &mopen);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_entry_set_cb(mopen, nav_menu_file_open, (void *) menu);
+
+        rc = ui_menu_entry_sep_create(mfile, &mfsep);
+        if (rc != EOK)
+                goto error;
+
         rc = ui_menu_entry_create(mfile, "Exit", "Ctrl-Q", &mexit);
         if (rc != EOK)
                 goto error;
 
-        ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) menu);
+        ui_menu_entry_set_cb(mexit, nav_menu_file_exit, (void *) menu);
 
         ui_window_get_app_rect(menu->window, &arect);
@@ -94 +104 @@
         nav_menu_destroy(menu);
         return rc;
+}
+
+/** Set navigator menu callbacks.
+ *
+ * @param menu Menu
+ * @param cb Callbacks
+ * @param arg Argument to callback functions
+ */
+void nav_menu_set_cb(nav_menu_t *menu, nav_menu_cb_t *cb, void *arg)
+{
+        menu->cb = cb;
+        menu->cb_arg = arg;
 }
 
@@ -118 +140 @@
 }
 
+/** File / Open menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (navigator_t *)
+ */
+void nav_menu_file_open(ui_menu_entry_t *mentry, void *arg)
+{
+        nav_menu_t *menu = (nav_menu_t *)arg;
+
+        if (menu->cb != NULL && menu->cb->file_open != NULL)
+                menu->cb->file_open(menu->cb_arg);
+}
+
 /** File / Exit menu entry selected.
  *
@@ -123 +158 @@
  * @param arg Argument (navigator_t *)
  */
-static void nav_file_exit(ui_menu_entry_t *mentry, void *arg)
+void nav_menu_file_exit(ui_menu_entry_t *mentry, void *arg)
 {
-        navigator_t *navigator = (navigator_t *) arg;
+        nav_menu_t *menu = (nav_menu_t *)arg;
 
-        ui_quit(navigator->ui);
+        if (menu->cb != NULL && menu->cb->file_exit != NULL)
+                menu->cb->file_exit(menu->cb_arg);
 }