Changeset f2cb80a in mainline for uspace/app/taskbar/tbsmenu.c

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/app/taskbar/tbsmenu.c (modified) (10 diffs)

uspace/app/taskbar/tbsmenu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -129 +129 @@
         tbarcfg_t *tbcfg = NULL;
         smenu_entry_t *sme;
+        bool separator;
         const char *caption;
         const char *cmd;
+        bool terminal;
         errno_t rc;
 
@@ -139 +141 @@
         sme = tbarcfg_smenu_first(tbcfg);
         while (sme != NULL) {
-                caption = smenu_entry_get_caption(sme);
-                cmd = smenu_entry_get_cmd(sme);
-
-                rc = tbsmenu_add(tbsmenu, caption, cmd, &tentry);
-                if (rc != EOK)
-                        goto error;
+                separator = smenu_entry_get_separator(sme);
+                if (separator == false) {
+                        caption = smenu_entry_get_caption(sme);
+                        cmd = smenu_entry_get_cmd(sme);
+                        terminal = smenu_entry_get_terminal(sme);
+
+                        rc = tbsmenu_add(tbsmenu, caption, cmd, terminal,
+                            &tentry);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rc = tbsmenu_add_sep(tbsmenu, &tentry);
+                        if (rc != EOK)
+                                goto error;
+                }
 
                 (void)tentry;
@@ -226 +237 @@
  * @param caption Caption
  * @param cmd Command to run
+ * @param terminal Start in terminal
  * @param entry Start menu entry
  * @return @c EOK on success or an error code
  */
 errno_t tbsmenu_add(tbsmenu_t *tbsmenu, const char *caption,
-    const char *cmd, tbsmenu_entry_t **rentry)
+    const char *cmd, bool terminal, tbsmenu_entry_t **rentry)
 {
         errno_t rc;
@@ -250 +262 @@
                 goto error;
         }
+
+        entry->terminal = terminal;
 
         rc = ui_menu_entry_create(tbsmenu->smenu, caption, "", &entry->mentry);
@@ -271 +285 @@
 }
 
+/** Add separator entry to start menu.
+ *
+ * @param tbsmenu Start menu
+ * @param entry Start menu entry
+ * @return @c EOK on success or an error code
+ */
+errno_t tbsmenu_add_sep(tbsmenu_t *tbsmenu, tbsmenu_entry_t **rentry)
+{
+        errno_t rc;
+        tbsmenu_entry_t *entry;
+
+        entry = calloc(1, sizeof(tbsmenu_entry_t));
+        if (entry == NULL)
+                return ENOMEM;
+
+        rc = ui_menu_entry_sep_create(tbsmenu->smenu, &entry->mentry);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_entry_set_cb(entry->mentry, tbsmenu_smenu_entry_cb,
+            (void *)entry);
+
+        entry->tbsmenu = tbsmenu;
+        list_append(&entry->lentries, &tbsmenu->entries);
+        *rentry = entry;
+        return EOK;
+error:
+        free(entry);
+        return rc;
+}
+
 /** Remove entry from start menu.
  *
@@ -438 +483 @@
         }
 
+        cmd->argv[cnt] = NULL;
+
         return EOK;
 }
@@ -465 +512 @@
         int retval;
         bool suspended;
+        int i;
+        int cnt;
+        char **cp;
+        const char **targv = NULL;
         errno_t rc;
         ui_t *ui;
@@ -482 +533 @@
         suspended = true;
 
-        rc = task_spawnv(&id, &wait, cmd.argv[0], (const char *const *)
-            cmd.argv);
-        if (rc != EOK)
-                goto error;
+        /* Don't start in terminal if not running in a window */
+        if (entry->terminal && !ui_is_fullscreen(ui)) {
+                cnt = 0;
+                cp = cmd.argv;
+                while (*cp != NULL) {
+                        ++cnt;
+                        ++cp;
+                }
+
+                targv = calloc(cnt + 3, sizeof(char **));
+                if (targv == NULL)
+                        goto error;
+
+                targv[0] = "/app/terminal";
+                targv[1] = "-c";
+
+                for (i = 0; i <= cnt; i++) {
+                        targv[2 + i] = cmd.argv[i];
+                }
+
+                rc = task_spawnv(&id, &wait, targv[0], targv);
+                if (rc != EOK)
+                        goto error;
+
+                free(targv);
+                targv = NULL;
+        } else {
+                rc = task_spawnv(&id, &wait, cmd.argv[0], (const char *const *)
+                    cmd.argv);
+                if (rc != EOK)
+                        goto error;
+        }
 
         rc = task_wait(&wait, &texit, &retval);
@@ -499 +578 @@
         return EOK;
 error:
+        if (targv != NULL)
+                free(targv);
         tbsmenu_cmd_fini(&cmd);
-        if (suspended)
-                (void) ui_resume(ui);
+        if (suspended) {
+                rc = ui_resume(ui);
+                if (rc != EOK) {
+                        printf("Failed to resume UI.\n");
+                        exit(1);
+                }
+        }
         (void) ui_paint(ui);
         return rc;