Changeset 806d761 in mainline for uspace/lib/tbarcfg/src/tbarcfg.c

Timestamp:

2024-02-07T23:44:59Z (11 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.

File:

• uspace/lib/tbarcfg/src/tbarcfg.c (modified) (12 diffs)

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -101 +101 @@
  * @return EOK on success or an error code
  */
+#include <stdio.h>
 errno_t tbarcfg_open(const char *repopath, tbarcfg_t **rtbcfg)
 {
@@ -110 +111 @@
         const char *caption;
         const char *cmd;
+        const char *terminal = NULL;
         errno_t rc;
 
@@ -154 +156 @@
                 }
 
-                rc = smenu_entry_new(tbcfg, nentry, caption, cmd, NULL);
+                terminal = sif_node_get_attr(nentry, "terminal");
+                if (terminal == NULL)
+                        terminal = "n";
+
+                printf("terminal=%s\n", terminal);
+
+                rc = smenu_entry_new(tbcfg, nentry, caption, cmd,
+                    str_cmp(terminal, "y") == 0, NULL);
                 if (rc != EOK)
                         goto error;
@@ -233 +242 @@
 /** Get start menu entry command.
  *
- * @param entr Start menu entry
+ * @param entry Start menu entry
  * @return Command to run
  */
@@ -239 +248 @@
 {
         return entry->cmd;
+}
+
+/** Get start menu start in terminal flag.
+ *
+ * @param entry Start menu entry
+ * @return Start in terminal flag
+ */
+bool smenu_entry_get_terminal(smenu_entry_t *entry)
+{
+        return entry->terminal;
 }
 
@@ -285 +304 @@
 }
 
+/** Set start menu entry start in terminal flag.
+ *
+ * Note: To make the change visible to others and persistent,
+ * you must call @c smenu_entry_save()
+ *
+ * @param entry Start menu entry
+ * @param terminal Start in terminal flag
+ */
+void smenu_entry_set_terminal(smenu_entry_t *entry, bool terminal)
+{
+        entry->terminal = terminal;
+}
+
 /** Save any changes to start menu entry.
  *
@@ -303 +335 @@
 
         rc = sif_node_set_attr(trans, entry->nentry, "caption", entry->caption);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_node_set_attr(trans, entry->nentry, "terminal",
+            entry->terminal ? "y" : "n");
         if (rc != EOK)
                 goto error;
@@ -325 +362 @@
  * @param caption Caption
  * @param cmd Command to run
+ * @param terminal Start in terminal
  * @param rentry Place to store pointer to new entry or @c NULL
  */
 errno_t smenu_entry_new(tbarcfg_t *smenu, sif_node_t *nentry,
-    const char *caption, const char *cmd, smenu_entry_t **rentry)
+    const char *caption, const char *cmd, bool terminal, smenu_entry_t **rentry)
 {
         smenu_entry_t *entry;
@@ -352 +390 @@
                 goto error;
         }
+
+        entry->terminal = terminal;
 
         entry->smenu = smenu;
@@ -391 +431 @@
  * @param caption Caption
  * @param cmd Command to run
+ * @param terminal Start in terminal
  * @param rentry Place to store pointer to new entry or @c NULL
  */
 errno_t smenu_entry_create(tbarcfg_t *smenu, const char *caption,
-    const char *cmd, smenu_entry_t **rentry)
+    const char *cmd, bool terminal, smenu_entry_t **rentry)
 {
         sif_node_t *nentry;
@@ -418 +459 @@
                 goto error;
 
-        rc = smenu_entry_new(smenu, nentry, caption, cmd, &entry);
+        rc = sif_node_set_attr(trans, nentry, "terminal", terminal ? "y" : "n");
+        if (rc != EOK)
+                goto error;
+
+        rc = smenu_entry_new(smenu, nentry, caption, cmd, terminal ? "y" : "n",
+            &entry);
         if (rc != EOK)
                 goto error;