Changeset b279899 in mainline for uspace/app

Timestamp:

2023-10-17T12:18:10Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d4643db

Parents:

4030072

git-author:

Jiri Svoboda <jiri@…> (2023-10-16 18:17:59)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-17 12:18:10)

Message:

Rename startmenu library to tbarcfg

There may be other aspects of task bar that will need configuring
so let's widen the scope of the library a bit.

Location:

uspace/app/taskbar

Files:

• meson.build (modified) (2 diffs)
• taskbar.c (modified) (1 diff)
• taskbar.sif (moved) (moved from uspace/app/taskbar/startmenu.sif )
• tbsmenu.c (modified) (4 diffs)

uspace/app/taskbar/meson.build

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

uspace/app/taskbar/taskbar.c

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

uspace/app/taskbar/tbsmenu.c

@@ -34 +34 @@
 
 #include <gfx/coord.h>
-#include <startmenu/startmenu.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -40 +39 @@
 #include <str.h>
 #include <task.h>
+#include <tbarcfg/tbarcfg.h>
 #include <ui/fixed.h>
 #include <ui/menu.h>
@@ -127 +127 @@
 {
         tbsmenu_entry_t *tentry;
-        startmenu_t *smenu = NULL;
-        startmenu_entry_t *sme;
+        tbarcfg_t *tbcfg = NULL;
+        smenu_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);
+        rc = tbarcfg_open(repopath, &tbcfg);
+        if (rc != EOK)
+                goto error;
+
+        sme = tbarcfg_smenu_first(tbcfg);
         while (sme != NULL) {
-                caption = startmenu_entry_get_caption(sme);
-                cmd = startmenu_entry_get_cmd(sme);
+                caption = smenu_entry_get_caption(sme);
+                cmd = smenu_entry_get_cmd(sme);
 
                 rc = tbsmenu_add(tbsmenu, caption, cmd, &tentry);
@@ -148 +148 @@
                 (void)tentry;
 
-                sme = startmenu_next(sme);
-        }
-
-        startmenu_close(smenu);
+                sme = tbarcfg_smenu_next(sme);
+        }
+
+        tbarcfg_close(tbcfg);
         return EOK;
 error:
-        if (smenu != NULL)
-                startmenu_close(smenu);
+        if (tbcfg != NULL)
+                tbarcfg_close(tbcfg);
         return rc;
 }