Changeset b279899 in mainline for uspace/lib/tbarcfg/src/tbarcfg.c

Timestamp:

2023-10-17T12:18:10Z (7 months 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.

File:

• uspace/lib/tbarcfg/src/tbarcfg.c (moved) (moved from uspace/lib/startmenu/src/startmenu.c ) (10 diffs)

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libstartmenu
+/** @addtogroup libtbarcfg
  * @{
  */
 /**
- * @file Start menu
+ * @file Task bar configuration
  */
 
 #include <errno.h>
 #include <sif.h>
-#include <startmenu/startmenu.h>
+#include <tbarcfg/tbarcfg.h>
 #include <stdlib.h>
 #include <str.h>
-#include "../private/startmenu.h"
-
-/** Open start menu.
+#include "../private/tbarcfg.h"
+
+/** Open task bar configuration.
  *
  * @param repopath Pathname of the menu repository
- * @param rsmenu Place to store pointer to start menu
+ * @param rtbcfg Place to store pointer to task bar configuration
  * @return EOK on success or an error code
  */
-errno_t startmenu_open(const char *repopath, startmenu_t **rsmenu)
-{
-        startmenu_t *smenu;
+errno_t tbarcfg_open(const char *repopath, tbarcfg_t **rtbcfg)
+{
+        tbarcfg_t *tbcfg;
         sif_sess_t *repo = NULL;
         sif_node_t *rnode;
@@ -59 +59 @@
         errno_t rc;
 
-        smenu = calloc(1, sizeof(startmenu_t));
-        if (smenu == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        list_initialize(&smenu->entries);
+        tbcfg = calloc(1, sizeof(tbarcfg_t));
+        if (tbcfg == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        list_initialize(&tbcfg->entries);
 
         rc = sif_open(repopath, &repo);
@@ -99 +99 @@
                 }
 
-                rc = startmenu_entry_create(smenu, caption, cmd);
+                rc = smenu_entry_create(tbcfg, caption, cmd);
                 if (rc != EOK)
                         goto error;
@@ -106 +106 @@
         }
 
-        *rsmenu = smenu;
+        *rtbcfg = tbcfg;
         return EOK;
 error:
         if (repo != NULL)
                 sif_close(repo);
-        if (smenu != NULL)
-                free(smenu);
+        if (tbcfg != NULL)
+                free(tbcfg);
         return rc;
 }
 
-/** Close start menu.
- *
- * @param smenu Start menu
- */
-void startmenu_close(startmenu_t *smenu)
+/** Close task bar configuration.
+ *
+ * @param tbcfg Start menu
+ */
+void tbarcfg_close(tbarcfg_t *tbcfg)
 {
 }
@@ -126 +126 @@
 /** Get first start menu entry.
  *
- * @param smenu Start menu
+ * @param tbcfg Task bar configuration
  * @return First entry or @c NULL if the menu is empty
  */
-startmenu_entry_t *startmenu_first(startmenu_t *smenu)
+smenu_entry_t *tbarcfg_smenu_first(tbarcfg_t *tbcfg)
 {
         link_t *link;
 
-        link = list_first(&smenu->entries);
+        link = list_first(&tbcfg->entries);
         if (link == NULL)
                 return NULL;
 
-        return list_get_instance(link, startmenu_entry_t, lentries);
+        return list_get_instance(link, smenu_entry_t, lentries);
 }
 
@@ -145 +145 @@
  * @return Next entry or @c NULL if @a cur is the last entry
  */
-startmenu_entry_t *startmenu_next(startmenu_entry_t *cur)
+smenu_entry_t *tbarcfg_smenu_next(smenu_entry_t *cur)
 {
         link_t *link;
@@ -153 +153 @@
                 return NULL;
 
-        return list_get_instance(link, startmenu_entry_t, lentries);
+        return list_get_instance(link, smenu_entry_t, lentries);
 }
 
@@ -161 +161 @@
  * @return Caption (with accelerator markup)
  */
-const char *startmenu_entry_get_caption(startmenu_entry_t *entry)
+const char *smenu_entry_get_caption(smenu_entry_t *entry)
 {
         return entry->caption;
@@ -171 +171 @@
  * @return Command to run
  */
-const char *startmenu_entry_get_cmd(startmenu_entry_t *entry)
+const char *smenu_entry_get_cmd(smenu_entry_t *entry)
 {
         return entry->cmd;
@@ -184 +184 @@
  * @param cmd Command to run
  */
-errno_t startmenu_entry_create(startmenu_t *smenu, const char *caption,
+errno_t smenu_entry_create(tbarcfg_t *smenu, const char *caption,
     const char *cmd)
 {
-        startmenu_entry_t *entry;
+        smenu_entry_t *entry;
         errno_t rc;
 
-        entry = calloc(1, sizeof(startmenu_entry_t));
+        entry = calloc(1, sizeof(smenu_entry_t));
         if (entry == NULL) {
                 rc = ENOMEM;