Changeset b1397ab in mainline for uspace/app/taskbar-cfg/startmenu.c

Timestamp:

2023-11-09T13:02:16Z (14 months 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.

File:

• uspace/app/taskbar-cfg/startmenu.c (modified) (4 diffs)

uspace/app/taskbar-cfg/startmenu.c

@@ -292 +292 @@
         smenu_entry_t *entry;
         startmenu_entry_t *smentry;
-        const char *caption;
-        const char *cmd;
         errno_t rc;
 
         entry = tbarcfg_smenu_first(tbarcfg);
         while (entry != NULL) {
-                caption = smenu_entry_get_caption(entry);
-                cmd = smenu_entry_get_cmd(entry);
-
-                rc = startmenu_insert(smenu, caption, cmd, &smentry);
+                rc = startmenu_insert(smenu, entry, &smentry);
                 if (rc != EOK)
                         return rc;
@@ -323 +318 @@
         while (lentry != NULL) {
                 entry = (startmenu_entry_t *)ui_list_entry_get_arg(lentry);
-                free(entry->caption);
-                free(entry->cmd);
                 free(entry);
                 ui_list_entry_delete(lentry);
@@ -338 +331 @@
  *
  * @param smenu Start menu configuration tab
- * @param caption Entry caption
- * @param cmd Command to run
- * @param rentry Place to store pointer to new entry or NULL
+ * @param entry Backing entry
+ * @param rsmentry Place to store pointer to new entry or NULL
  * @return EOK on success or an error code
  */
-errno_t startmenu_insert(startmenu_t *smenu, const char *caption,
-    const char *cmd, startmenu_entry_t **rentry)
-{
-        startmenu_entry_t *entry;
+errno_t startmenu_insert(startmenu_t *smenu, smenu_entry_t *entry,
+    startmenu_entry_t **rsmentry)
+{
+        startmenu_entry_t *smentry;
         ui_list_entry_attr_t attr;
         errno_t rc;
 
-        entry = calloc(1, sizeof(startmenu_entry_t));
-        if (entry == NULL)
+        smentry = calloc(1, sizeof(startmenu_entry_t));
+        if (smentry == NULL)
                 return ENOMEM;
 
-        entry->startmenu = smenu;
-        entry->caption = str_dup(caption);
-        if (entry->caption == NULL) {
-                free(entry);
-                return ENOMEM;
-        }
-
-        entry->cmd = str_dup(cmd);
-        if (entry->caption == NULL) {
-                free(entry->caption);
-                free(entry);
-                return ENOMEM;
-        }
-
+        smentry->startmenu = smenu;
+        smentry->entry = entry;
+
+        printf("startmenu_insert: smentry=%p entry=%p\n",
+            smentry, entry);
         ui_list_entry_attr_init(&attr);
-        attr.caption = caption;
-        attr.arg = (void *)entry;
-        rc = ui_list_entry_append(smenu->entries_list, &attr, &entry->lentry);
-        if (rc != EOK) {
-                free(entry->caption);
-                free(entry->cmd);
-                free(entry);
+        attr.caption = smenu_entry_get_caption(entry);
+        attr.arg = (void *)smentry;
+        rc = ui_list_entry_append(smenu->entries_list, &attr, &smentry->lentry);
+        if (rc != EOK) {
+                free(smentry);
                 return rc;
         }
 
-        if (rentry != NULL)
-                *rentry = entry;
+        if (rsmentry != NULL)
+                *rsmentry = smentry;
         return EOK;
 }
 
+/** Get selected start menu entry.
+ *
+ * @param smenu Start menu
+ * @return Selected entry
+ */
+startmenu_entry_t *startmenu_get_selected(startmenu_t *smenu)
+{
+        ui_list_entry_t *entry;
+
+        entry = ui_list_get_cursor(smenu->entries_list);
+        return (startmenu_entry_t *)ui_list_entry_get_arg(entry);
+}
+
 /** Edit selected menu entry.
  *
@@ -391 +385 @@
 {
         smeedit_t *smee;
+        startmenu_entry_t *smentry;
         errno_t rc;
 
-        rc = smeedit_create(smenu, &smee);
+        smentry = startmenu_get_selected(smenu);
+
+        printf("smeedit_create:entry=%p\n", smentry);
+        rc = smeedit_create(smenu, smentry, &smee);
         if (rc != EOK)
                 return;