Changes in uspace/app/taskbar/tbsmenu.c [e63e74a:95fc538] in mainline

File:

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

uspace/app/taskbar/tbsmenu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2023 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;
 
@@ -141 +139 @@
         sme = tbarcfg_smenu_first(tbcfg);
         while (sme != NULL) {
-                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;
-                }
+                caption = smenu_entry_get_caption(sme);
+                cmd = smenu_entry_get_cmd(sme);
+
+                rc = tbsmenu_add(tbsmenu, caption, cmd, &tentry);
+                if (rc != EOK)
+                        goto error;
 
                 (void)tentry;
@@ -237 +226 @@
  * @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, bool terminal, tbsmenu_entry_t **rentry)
+    const char *cmd, tbsmenu_entry_t **rentry)
 {
         errno_t rc;
@@ -262 +250 @@
                 goto error;
         }
-
-        entry->terminal = terminal;
 
         rc = ui_menu_entry_create(tbsmenu->smenu, caption, "", &entry->mentry);
@@ -285 +271 @@
 }
 
-/** 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.
  *
@@ -483 +438 @@
         }
 
-        cmd->argv[cnt] = NULL;
-
         return EOK;
 }
@@ -512 +465 @@
         int retval;
         bool suspended;
-        int i;
-        int cnt;
-        char **cp;
-        const char **targv = NULL;
         errno_t rc;
         ui_t *ui;
@@ -533 +482 @@
         suspended = true;
 
-        /* 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_spawnv(&id, &wait, cmd.argv[0], (const char *const *)
+            cmd.argv);
+        if (rc != EOK)
+                goto error;
 
         rc = task_wait(&wait, &texit, &retval);
@@ -578 +499 @@
         return EOK;
 error:
-        if (targv != NULL)
-                free(targv);
         tbsmenu_cmd_fini(&cmd);
-        if (suspended) {
-                rc = ui_resume(ui);
-                if (rc != EOK) {
-                        printf("Failed to resume UI.\n");
-                        exit(1);
-                }
-        }
+        if (suspended)
+                (void) ui_resume(ui);
         (void) ui_paint(ui);
         return rc;