Changeset 7d78e466 in mainline

Timestamp:

2023-10-07T15:50:59Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9bec33a

Parents:

4d58bac

Message:

Load start menu from file using libstartmenu

Location:

uspace

Files:

• app/taskbar/meson.build (modified) (2 diffs)
• app/taskbar/startmenu.sif (added)
• app/taskbar/taskbar.c (modified) (1 diff)
• app/taskbar/tbsmenu.c (modified) (5 diffs)
• app/taskbar/tbsmenu.h (modified) (1 diff)
• lib/meson.build (modified) (1 diff)
• lib/startmenu/doc/doxygroups.h (added)
• lib/startmenu/include/startmenu/startmenu.h (added)
• lib/startmenu/include/types/startmenu/startmenu.h (added)
• lib/startmenu/meson.build (added)
• lib/startmenu/private/startmenu.h (added)
• lib/startmenu/src/startmenu.c (added)
• lib/startmenu/test/main.c (added)
• lib/startmenu/test/startmenu.c (added)

uspace/app/taskbar/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'ui', 'wndmgt' ]
+deps = [ 'startmenu', 'ui', 'wndmgt' ]
 src = files(
         'clock.c',
@@ -47 +47 @@
         'test/wndlist.c',
 )
+
+if install_nonessential_data
+        installed_data += { 'name': 'startmenu.sif', 'dir': '/cfg' }
+endif

uspace/app/taskbar/taskbar.c

@@ -173 +173 @@
         }
 
+        rc = tbsmenu_load(taskbar->tbsmenu, "/cfg/startmenu.sif");
+        if (rc != EOK) {
+                printf("Error loading start menu from '%s'.\n",
+                    "/cfg/startmenu.sif");
+                goto error;
+        }
+
         if (ui_is_textmode(taskbar->ui)) {
                 rect.p0.x = params.rect.p0.x + 1;

uspace/app/taskbar/tbsmenu.c

@@ -34 +34 @@
 
 #include <gfx/coord.h>
+#include <startmenu/startmenu.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -71 +72 @@
         ui_resource_t *res = ui_window_get_res(window);
         tbsmenu_t *tbsmenu = NULL;
-        ui_menu_entry_t *tentry;
         errno_t rc;
 
@@ -96 +96 @@
 
         ui_menu_set_cb(tbsmenu->smenu, &tbsmenu_smenu_cb, (void *)tbsmenu);
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "~N~avigator", "", &tentry);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "Text ~E~ditor", "", &tentry);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "~T~erminal", "", &tentry);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "~C~alculator", "", &tentry);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "~U~I Demo", "", &tentry);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_menu_entry_create(tbsmenu->smenu, "~G~FX Demo", "", &tentry);
-        if (rc != EOK)
-                goto error;
 
         tbsmenu->window = window;
@@ -135 +111 @@
 }
 
-/** Set window list rectangle.
- *
- * @param tbsmenu Window list
+/** Load start menu from repository.
+ *
+ * @param tbsmenu Start menu
+ * @param Repository path
+ * @return EOK on success or an error code
+ */
+errno_t tbsmenu_load(tbsmenu_t *tbsmenu, const char *repopath)
+{
+        ui_menu_entry_t *tentry;
+        startmenu_t *smenu = NULL;
+        startmenu_entry_t *sme;
+        const char *caption;
+        const char *cmd;
+        errno_t rc;
+
+        rc = startmenu_open(repopath, &smenu);
+        if (rc != EOK)
+                goto error;
+
+        sme = startmenu_first(smenu);
+        while (sme != NULL) {
+                caption = startmenu_entry_get_caption(sme);
+                cmd = startmenu_entry_get_cmd(sme);
+
+                rc = ui_menu_entry_create(tbsmenu->smenu, caption, "", &tentry);
+                if (rc != EOK)
+                        goto error;
+
+                (void)cmd;
+
+                sme = startmenu_next(sme);
+        }
+
+        startmenu_close(smenu);
+        return EOK;
+error:
+        if (smenu != NULL)
+                startmenu_close(smenu);
+        return rc;
+}
+
+/** Set start menu rectangle.
+ *
+ * @param tbsmenu Start menu
  * @param rect Rectangle
  */
@@ -170 +187 @@
 }
 
-/** Remove entry from window list.
- *
- * @param tbsmenu Window list
- * @param entry Window list entry
- * @param paint @c true to repaint window list
+/** Remove entry from strat menu.
+ *
+ * @param tbsmenu Start menu
+ * @param entry Start menu entry
+ * @param paint @c true to repaint start menu
  * @return @c EOK on success or an error code
  */

uspace/app/taskbar/tbsmenu.h

@@ -47 +47 @@
 
 extern errno_t tbsmenu_create(ui_window_t *, ui_fixed_t *, tbsmenu_t **);
+extern errno_t tbsmenu_load(tbsmenu_t *, const char *);
 extern void tbsmenu_set_rect(tbsmenu_t *, gfx_rect_t *);
 extern void tbsmenu_destroy(tbsmenu_t *);

uspace/lib/meson.build

@@ -80 +80 @@
         'scsi',
         'sif',
+        'startmenu',
         'trackmod',
         'untar',