Changeset 28ca31ed in mainline for uspace/lib/tbarcfg/src/tbarcfg.c

Timestamp:

2024-02-13T20:13:48Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

10657856

Parents:

242e3c3

Message:

Moving start menu entry up and down

File:

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

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -101 +101 @@
  * @return EOK on success or an error code
  */
-#include <stdio.h>
 errno_t tbarcfg_open(const char *repopath, tbarcfg_t **rtbcfg)
 {
@@ -160 +159 @@
                         terminal = "n";
 
-                printf("terminal=%s\n", terminal);
-
                 rc = smenu_entry_new(tbcfg, nentry, caption, cmd,
                     str_cmp(terminal, "y") == 0, NULL);
@@ -230 +227 @@
 }
 
+/** Get last start menu entry.
+ *
+ * @param tbcfg Taskbar configuration
+ * @return Previous entry or @c NULL if the menu is empty
+ */
+smenu_entry_t *tbarcfg_smenu_last(tbarcfg_t *tbcfg)
+{
+        link_t *link;
+
+        link = list_last(&tbcfg->entries);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, smenu_entry_t, lentries);
+}
+
+/** Get previous start menu entry.
+ *
+ * @param cur Current entry
+ * @return Previous entry or @c NULL if @a cur is the last entry
+ */
+smenu_entry_t *tbarcfg_smenu_prev(smenu_entry_t *cur)
+{
+        link_t *link;
+
+        link = list_prev(&cur->lentries, &cur->smenu->entries);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, smenu_entry_t, lentries);
+}
+
 /** Get start menu entry caption.
  *
@@ -317 +346 @@
 }
 
-/** Save any changes to start menu entry.
- *
- * @param entry Start menu entry
- */
-errno_t smenu_entry_save(smenu_entry_t *entry)
-{
-        sif_trans_t *trans = NULL;
-        errno_t rc;
-
-        rc = sif_trans_begin(entry->smenu->repo, &trans);
-        if (rc != EOK)
-                goto error;
+/** Save start menu entry using transaction.
+ *
+ * @param entry Start menu entry
+ * @param trans Transaction
+ */
+static errno_t smenu_entry_save_trans(smenu_entry_t *entry, sif_trans_t *trans)
+{
+        errno_t rc;
 
         rc = sif_node_set_attr(trans, entry->nentry, "cmd", entry->cmd);
@@ -340 +365 @@
         rc = sif_node_set_attr(trans, entry->nentry, "terminal",
             entry->terminal ? "y" : "n");
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Save any changes to start menu entry.
+ *
+ * @param entry Start menu entry
+ */
+errno_t smenu_entry_save(smenu_entry_t *entry)
+{
+        sif_trans_t *trans = NULL;
+        errno_t rc;
+
+        rc = sif_trans_begin(entry->smenu->repo, &trans);
+        if (rc != EOK)
+                goto error;
+
+        rc = smenu_entry_save_trans(entry, trans);
         if (rc != EOK)
                 goto error;
@@ -463 +510 @@
                 goto error;
 
-        rc = smenu_entry_new(smenu, nentry, caption, cmd, terminal ? "y" : "n",
-            &entry);
+        rc = smenu_entry_new(smenu, nentry, caption, cmd, terminal, &entry);
         if (rc != EOK)
                 goto error;
@@ -481 +527 @@
 }
 
-/** Destroy start menu entry..
+/** Destroy start menu entry.
  *
  * @param entry Start menu entry
@@ -509 +555 @@
 }
 
+/** Move start menu entry up.
+ *
+ * @param entry Start menu entry
+ * @return EOK on success or an error code
+ */
+errno_t smenu_entry_move_up(smenu_entry_t *entry)
+{
+        errno_t rc;
+        sif_trans_t *trans = NULL;
+        sif_node_t *nnode = NULL;
+        sif_node_t *old_node;
+        smenu_entry_t *prev;
+
+        rc = sif_trans_begin(entry->smenu->repo, &trans);
+        if (rc != EOK)
+                goto error;
+
+        prev = tbarcfg_smenu_prev(entry);
+        if (prev == NULL) {
+                /* Entry is already at first position, nothing to do. */
+                return EOK;
+        }
+
+        rc = sif_node_insert_before(trans, prev->nentry, "entry", &nnode);
+        if (rc != EOK)
+                goto error;
+
+        old_node = entry->nentry;
+        entry->nentry = nnode;
+
+        rc = smenu_entry_save_trans(entry, trans);
+        if (rc != EOK) {
+                entry->nentry = old_node;
+                goto error;
+        }
+
+        sif_node_destroy(trans, old_node);
+
+        rc = sif_trans_end(trans);
+        if (rc != EOK) {
+                entry->nentry = old_node;
+                goto error;
+        }
+
+        list_remove(&entry->lentries);
+        list_insert_before(&entry->lentries, &prev->lentries);
+        return EOK;
+error:
+        if (nnode != NULL)
+                sif_node_destroy(trans, nnode);
+        if (trans != NULL)
+                sif_trans_abort(trans);
+        return rc;
+}
+
+/** Move start menu entry down.
+ *
+ * @param entry Start menu entry
+ * @return EOK on success or an error code
+ */
+errno_t smenu_entry_move_down(smenu_entry_t *entry)
+{
+        errno_t rc;
+        sif_trans_t *trans = NULL;
+        sif_node_t *nnode = NULL;
+        sif_node_t *old_node;
+        smenu_entry_t *next;
+
+        rc = sif_trans_begin(entry->smenu->repo, &trans);
+        if (rc != EOK)
+                goto error;
+
+        next = tbarcfg_smenu_next(entry);
+        if (next == NULL) {
+                /* Entry is already at last position, nothing to do. */
+                return EOK;
+        }
+
+        rc = sif_node_insert_after(trans, next->nentry, "entry", &nnode);
+        if (rc != EOK)
+                goto error;
+
+        old_node = entry->nentry;
+        entry->nentry = nnode;
+
+        rc = smenu_entry_save_trans(entry, trans);
+        if (rc != EOK) {
+                entry->nentry = old_node;
+                goto error;
+        }
+
+        sif_node_destroy(trans, old_node);
+
+        rc = sif_trans_end(trans);
+        if (rc != EOK) {
+                entry->nentry = old_node;
+                goto error;
+        }
+
+        list_remove(&entry->lentries);
+        list_insert_after(&entry->lentries, &next->lentries);
+        return EOK;
+error:
+        if (nnode != NULL)
+                sif_node_destroy(trans, nnode);
+        if (trans != NULL)
+                sif_trans_abort(trans);
+        return rc;
+}
+
 /** @}
  */