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

Timestamp:

2024-02-21T20:26:35Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

95e2967

Parents:

5f3188b8

Message:

Start menu separator entry support

File:

• uspace/lib/tbarcfg/src/tbarcfg.c (modified) (12 diffs)

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -108 +108 @@
         sif_node_t *nentry;
         const char *ntype;
+        const char *separator;
         const char *caption;
         const char *cmd;
@@ -143 +144 @@
                 }
 
-                caption = sif_node_get_attr(nentry, "caption");
-                if (caption == NULL) {
+                separator = sif_node_get_attr(nentry, "separator");
+                if (separator != NULL && str_cmp(separator, "y") != 0) {
                         rc = EIO;
                         goto error;
                 }
 
-                cmd = sif_node_get_attr(nentry, "cmd");
-                if (cmd == NULL) {
-                        rc = EIO;
-                        goto error;
+                if (separator == NULL) {
+                        caption = sif_node_get_attr(nentry, "caption");
+                        if (caption == NULL) {
+                                rc = EIO;
+                                goto error;
+                        }
+
+                        cmd = sif_node_get_attr(nentry, "cmd");
+                        if (cmd == NULL) {
+                                rc = EIO;
+                                goto error;
+                        }
+
+                        terminal = sif_node_get_attr(nentry, "terminal");
+                        if (terminal == NULL)
+                                terminal = "n";
+
+                        rc = smenu_entry_new(tbcfg, nentry, caption, cmd,
+                            str_cmp(terminal, "y") == 0, NULL);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rc = smenu_entry_sep_new(tbcfg, nentry, NULL);
+                        if (rc != EOK)
+                                goto error;
                 }
-
-                terminal = sif_node_get_attr(nentry, "terminal");
-                if (terminal == NULL)
-                        terminal = "n";
-
-                rc = smenu_entry_new(tbcfg, nentry, caption, cmd,
-                    str_cmp(terminal, "y") == 0, NULL);
-                if (rc != EOK)
-                        goto error;
 
                 nentry = sif_node_next_child(nentry);
@@ -266 +279 @@
 const char *smenu_entry_get_caption(smenu_entry_t *entry)
 {
+        assert(!entry->separator);
         return entry->caption;
 }
@@ -276 +290 @@
 const char *smenu_entry_get_cmd(smenu_entry_t *entry)
 {
+        assert(!entry->separator);
         return entry->cmd;
 }
 
-/** Get start menu start in terminal flag.
+/** Get start menu entry start in terminal flag.
  *
  * @param entry Start menu entry
@@ -286 +301 @@
 bool smenu_entry_get_terminal(smenu_entry_t *entry)
 {
+        assert(!entry->separator);
         return entry->terminal;
+}
+
+/** Get start menu entry separator flag.
+ *
+ * @param entry Start menu entry
+ * @return Separator flag
+ */
+bool smenu_entry_get_separator(smenu_entry_t *entry)
+{
+        return entry->separator;
 }
 
@@ -301 +327 @@
 {
         char *dcap;
+
+        assert(!entry->separator);
 
         dcap = str_dup(caption);
@@ -324 +352 @@
         char *dcmd;
 
+        assert(!entry->separator);
+
         dcmd = str_dup(cmd);
         if (dcmd == NULL)
@@ -343 +373 @@
 void smenu_entry_set_terminal(smenu_entry_t *entry, bool terminal)
 {
+        assert(!entry->separator);
         entry->terminal = terminal;
 }
@@ -355 +386 @@
         errno_t rc;
 
-        rc = sif_node_set_attr(trans, entry->nentry, "cmd", entry->cmd);
-        if (rc != EOK)
-                goto error;
-
-        rc = sif_node_set_attr(trans, entry->nentry, "caption", entry->caption);
-        if (rc != EOK)
-                goto error;
-
-        rc = sif_node_set_attr(trans, entry->nentry, "terminal",
-            entry->terminal ? "y" : "n");
-        if (rc != EOK)
-                goto error;
+        if (entry->separator) {
+                rc = sif_node_set_attr(trans, entry->nentry, "separator", "y");
+                if (rc != EOK)
+                        goto error;
+        } else {
+                sif_node_unset_attr(trans, entry->nentry, "separator");
+
+                rc = sif_node_set_attr(trans, entry->nentry, "cmd", entry->cmd);
+                if (rc != EOK)
+                        goto error;
+
+                rc = sif_node_set_attr(trans, entry->nentry, "caption",
+                    entry->caption);
+                if (rc != EOK)
+                        goto error;
+
+                rc = sif_node_set_attr(trans, entry->nentry, "terminal",
+                    entry->terminal ? "y" : "n");
+                if (rc != EOK)
+                        goto error;
+        }
 
         return EOK;
@@ -457 +497 @@
 }
 
+/** Allocate a start menu separator entry and append it to the start menu
+ * (internal).
+ *
+ * This only creates the entry in memory, but does not update the repository.
+ *
+ * @param smenu Start menu
+ * @param nentry Backing SIF node
+ * @param rentry Place to store pointer to new entry or @c NULL
+ */
+errno_t smenu_entry_sep_new(tbarcfg_t *smenu, sif_node_t *nentry,
+    smenu_entry_t **rentry)
+{
+        smenu_entry_t *entry;
+        errno_t rc;
+
+        entry = calloc(1, sizeof(smenu_entry_t));
+        if (entry == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        entry->nentry = nentry;
+        entry->separator = true;
+
+        entry->smenu = smenu;
+        list_append(&entry->lentries, &smenu->entries);
+        if (rentry != NULL)
+                *rentry = entry;
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** Delete start menu entry.
  *
@@ -467 +541 @@
 {
         list_remove(&entry->lentries);
-        free(entry->caption);
-        free(entry->cmd);
+        if (entry->caption != NULL)
+                free(entry->caption);
+        if (entry->cmd != NULL)
+                free(entry->cmd);
         free(entry);
 }
@@ -527 +603 @@
 }
 
+/** Create new start menu separator entry.
+ *
+ * @param smenu Start menu
+ * @param nentry Backing SIF node
+ * @param rentry Place to store pointer to new entry or @c NULL
+ */
+errno_t smenu_entry_sep_create(tbarcfg_t *smenu, smenu_entry_t **rentry)
+{
+        sif_node_t *nentry;
+        smenu_entry_t *entry;
+        errno_t rc;
+        sif_trans_t *trans = NULL;
+
+        rc = sif_trans_begin(smenu->repo, &trans);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_node_append_child(trans, smenu->nentries, "entry",
+            &nentry);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_node_set_attr(trans, nentry, "separator", "y");
+        if (rc != EOK)
+                goto error;
+
+        rc = smenu_entry_sep_new(smenu, nentry, &entry);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_trans_end(trans);
+        if (rc != EOK)
+                goto error;
+
+        if (rentry != NULL)
+                *rentry = entry;
+        return EOK;
+error:
+        if (trans != NULL)
+                sif_trans_abort(trans);
+        return rc;
+}
+
 /** Destroy start menu entry.
  *