Changeset b1397ab in mainline for uspace/lib/tbarcfg

Timestamp:

2023-11-09T13:02:16Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

e0d874b7

Parents:

40eab9f

git-author:

Jiri Svoboda <jiri@…> (2023-11-08 18:01:53)

git-committer:

Jiri Svoboda <jiri@…> (2023-11-09 13:02:16)

Message:

Start menu editor is editing

You can change an entry and it will be saved to the configuration repo.
(Cannot create/delete yet). To see the change in the editor, you need
to restart it. To see the change in the taskbar, you need to restart it.

Location:

uspace/lib/tbarcfg

Files:

• include/tbarcfg/tbarcfg.h (modified) (1 diff)
• private/tbarcfg.h (modified) (3 diffs)
• src/tbarcfg.c (modified) (6 diffs)

uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h

@@ -46 +46 @@
 extern const char *smenu_entry_get_caption(smenu_entry_t *);
 extern const char *smenu_entry_get_cmd(smenu_entry_t *);
+extern errno_t smenu_entry_set_caption(smenu_entry_t *, const char *);
+extern errno_t smenu_entry_set_cmd(smenu_entry_t *, const char *);
+extern errno_t smenu_entry_save(smenu_entry_t *);
 
 #endif

uspace/lib/tbarcfg/private/tbarcfg.h

@@ -44 +44 @@
 /** Taskbar configuration */
 struct tbarcfg {
+        /** Repository session */
+        sif_sess_t *repo;
         /** List of start menu entries (smenu_entry_t) */
         list_t entries;
@@ -54 +56 @@
         /** Link to @c smenu->entries */
         link_t lentries;
+        /** SIF node (persistent storage) */
+        sif_node_t *nentry;
         /** Entry caption (with accelerator markup) */
         char *caption;
@@ -60 +64 @@
 };
 
-extern errno_t smenu_entry_create(tbarcfg_t *, const char *,
+extern errno_t smenu_entry_create(tbarcfg_t *, sif_node_t *, const char *,
     const char *);
 

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -71 +71 @@
                 goto error;
 
+        tbcfg->repo = repo;
+
         rnode = sif_get_root(repo);
         nentries = sif_node_first_child(rnode);
@@ -99 +101 @@
                 }
 
-                rc = smenu_entry_create(tbcfg, caption, cmd);
+                rc = smenu_entry_create(tbcfg, nentry, caption, cmd);
                 if (rc != EOK)
                         goto error;
@@ -122 +124 @@
 void tbarcfg_close(tbarcfg_t *tbcfg)
 {
+        (void)sif_close(tbcfg->repo);
 }
 
@@ -176 +179 @@
 }
 
+/** Set start menu entry caption.
+ *
+ * Note: To make the change visible to others and persistent,
+ * you must call @c smenu_entry_save()
+ *
+ * @param entry Start menu entry
+ * @param caption New caption
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t smenu_entry_set_caption(smenu_entry_t *entry, const char *caption)
+{
+        char *dcap;
+
+        dcap = str_dup(caption);
+        if (dcap == NULL)
+                return ENOMEM;
+
+        free(entry->caption);
+        entry->caption = dcap;
+        return EOK;
+}
+
+/** Set start menu entry command.
+ *
+ * Note: To make the change visible to others and persistent,
+ * you must call @c smenu_entry_save()
+ *
+ * @param entry Start menu entry
+ * @param cmd New command
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t smenu_entry_set_cmd(smenu_entry_t *entry, const char *cmd)
+{
+        char *dcmd;
+
+        dcmd = str_dup(cmd);
+        if (dcmd == NULL)
+                return ENOMEM;
+
+        free(entry->cmd);
+        entry->cmd = dcmd;
+        return EOK;
+}
+
+/** 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;
+        errno_t rc;
+
+        rc = sif_trans_begin(entry->smenu->repo, &trans);
+        if (rc != EOK)
+                goto error;
+
+        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_trans_end(trans);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        if (trans != NULL)
+                sif_trans_abort(trans);
+        return rc;
+}
+
 /** Create a start menu entry and append it to the start menu (internal).
  *
@@ -181 +260 @@
  *
  * @param smenu Start menu
+ * @param nentry Backing SIF node
  * @param caption Caption
  * @param cmd Command to run
  */
-errno_t smenu_entry_create(tbarcfg_t *smenu, const char *caption,
-    const char *cmd)
+errno_t smenu_entry_create(tbarcfg_t *smenu, sif_node_t *nentry,
+    const char *caption, const char *cmd)
 {
         smenu_entry_t *entry;
@@ -195 +275 @@
                 goto error;
         }
+
+        entry->nentry = nentry;
 
         entry->caption = str_dup(caption);