Changeset 806d761 in mainline for uspace/app

Timestamp:

2024-02-07T23:44:59Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

242e3c3

Parents:

74cb6610

Message:

Start menu should have 'open in terminal' functionality

Makes it easier for the user and if we are running in console mode,
we correctly start the application, instead of failing to start a
terminal.

Location:

uspace/app

Files:

• taskbar-cfg/smeedit.c (modified) (11 diffs)
• taskbar-cfg/types/smeedit.h (modified) (3 diffs)
• taskbar/taskbar.sif (modified) (1 diff)
• taskbar/tbsmenu.c (modified) (9 diffs)
• taskbar/tbsmenu.h (modified) (2 diffs)
• taskbar/types/tbsmenu.h (modified) (3 diffs)

uspace/app/taskbar-cfg/smeedit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <ui/checkbox.h>
 #include <ui/fixed.h>
 #include <ui/resource.h>
@@ -94 +95 @@
         const char *cmd;
         const char *caption;
+        bool terminal;
         errno_t rc;
 
@@ -101 +103 @@
                 cmd = smenu_entry_get_cmd(smentry->entry);
                 caption = smenu_entry_get_caption(smentry->entry);
+                terminal = smenu_entry_get_terminal(smentry->entry);
         } else {
                 cmd = "";
                 caption = "";
+                terminal = false;
         }
 
@@ -122 +126 @@
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 50;
-                params.rect.p1.y = 12;
+                params.rect.p1.y = 13;
         } else {
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 370;
-                params.rect.p1.y = 200;
+                params.rect.p1.y = 230;
         }
 
@@ -255 +259 @@
         }
 
+        /* Start in terminal checkbox */
+
+        rc = ui_checkbox_create(res, "Start in terminal", &smee->cbterminal);
+        if (rc != EOK)
+                goto error;
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 3;
+                rect.p0.y = 8;
+                rect.p1.x = 6;
+                rect.p1.y = 9;
+        } else {
+                rect.p0.x = 10;
+                rect.p0.y = 155;
+                rect.p1.x = 360;
+                rect.p1.y = 170;
+        }
+
+        ui_checkbox_set_rect(smee->cbterminal, &rect);
+        ui_checkbox_set_checked(smee->cbterminal, terminal);
+
+        rc = ui_fixed_add(smee->fixed, ui_checkbox_ctl(smee->cbterminal));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                goto error;
+        }
+
         /* OK button */
 
@@ -264 +296 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 23;
-                rect.p0.y = 9;
+                rect.p0.y = 10;
                 rect.p1.x = 35;
-                rect.p1.y = 10;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 190;
-                rect.p0.y = 155;
+                rect.p0.y = 190;
                 rect.p1.x = 270;
-                rect.p1.y = 180;
+                rect.p1.y = 215;
         }
 
@@ -293 +325 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 36;
-                rect.p0.y = 9;
+                rect.p0.y = 10;
                 rect.p1.x = 48;
-                rect.p1.y = 10;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 280;
-                rect.p0.y = 155;
+                rect.p0.y = 190;
                 rect.p1.x = 360;
-                rect.p1.y = 180;
+                rect.p1.y = 215;
         }
 
@@ -349 +381 @@
         const char *cmd;
         const char *caption;
+        bool terminal;
         errno_t rc;
 
@@ -356 +389 @@
         cmd = ui_entry_get_text(smee->ecmd);
         caption = ui_entry_get_text(smee->ecaption);
+        terminal = ui_checkbox_get_checked(smee->cbterminal);
 
         if (smee->smentry == NULL) {
                 /* Create new entry */
                 rc = smenu_entry_create(smee->startmenu->tbarcfg->tbarcfg,
-                    caption, cmd, &entry);
+                    caption, cmd, terminal, &entry);
                 if (rc != EOK)
                         return;
@@ -379 +413 @@
                         return;
 
+                smenu_entry_set_terminal(smee->smentry->entry, terminal);
+                if (rc != EOK)
+                        return;
+
                 (void)smenu_entry_save(smee->smentry->entry);
                 startmenu_entry_update(smee->smentry);

uspace/app/taskbar-cfg/types/smeedit.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define TYPES_SMEEDIT_H
 
+#include <ui/checkbox.h>
 #include <ui/fixed.h>
 #include <ui/label.h>
@@ -61 +62 @@
         /** Command entry */
         ui_entry_t *ecmd;
-        /** OK buttion */
+        /** Start in terminal checkbox */
+        ui_checkbox_t *cbterminal;
+        /** OK button */
         ui_pbutton_t *bok;
         /** Cancel button */

uspace/app/taskbar/taskbar.sif

@@ -1 @@
-[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/terminal -c /app/nav]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/terminal -c /app/edit]){}[entry]([caption]=[~T~erminal][cmd]=[/app/terminal]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo ui]){}}}
+[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[~T~erminal][cmd]=[/app/terminal][terminal]=[n]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator][terminal]=[n]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo ui][terminal]=[n]){}}}

uspace/app/taskbar/tbsmenu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -131 +131 @@
         const char *caption;
         const char *cmd;
+        bool terminal;
         errno_t rc;
 
@@ -141 +142 @@
                 caption = smenu_entry_get_caption(sme);
                 cmd = smenu_entry_get_cmd(sme);
-
-                rc = tbsmenu_add(tbsmenu, caption, cmd, &tentry);
+                terminal = smenu_entry_get_terminal(sme);
+
+                rc = tbsmenu_add(tbsmenu, caption, cmd, terminal, &tentry);
                 if (rc != EOK)
                         goto error;
@@ -226 +228 @@
  * @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 +253 @@
                 goto error;
         }
+
+        entry->terminal = terminal;
 
         rc = ui_menu_entry_create(tbsmenu->smenu, caption, "", &entry->mentry);
@@ -438 +443 @@
         }
 
+        cmd->argv[cnt] = NULL;
+
         return EOK;
 }
@@ -465 +472 @@
         int retval;
         bool suspended;
+        int i;
+        int cnt;
+        char **cp;
+        const char **targv = NULL;
         errno_t rc;
         ui_t *ui;
@@ -482 +493 @@
         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++) {
+                        if (cmd.argv[i] != NULL)
+                                printf(" - '%s'\n", cmd.argv[i]);
+                        else
+                                printf(" - NULL\n");
+
+                        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 +543 @@
         return EOK;
 error:
+        if (targv != NULL)
+                free(targv);
         tbsmenu_cmd_fini(&cmd);
         if (suspended)

uspace/app/taskbar/tbsmenu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 extern bool tbsmenu_is_open(tbsmenu_t *);
 extern void tbsmenu_destroy(tbsmenu_t *);
-extern errno_t tbsmenu_add(tbsmenu_t *, const char *, const char *,
+extern errno_t tbsmenu_add(tbsmenu_t *, const char *, const char *, bool,
     tbsmenu_entry_t **);
 extern void tbsmenu_remove(tbsmenu_t *, tbsmenu_entry_t *, bool);

uspace/app/taskbar/types/tbsmenu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 #include <ui/window.h>
 
-/** Taskbar window list entry */
+/** Taskbar start menu entry */
 typedef struct {
         /** Containing start menu */
@@ -58 +58 @@
         /** Command to run */
         char *cmd;
+        /** Start in terminal */
+        bool terminal;
 } tbsmenu_entry_t;