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

File:

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

uspace/app/taskbar/tbsmenu.c

@@ -64 +64 @@
 static void tbsmenu_smenu_entry_cb(ui_menu_entry_t *, void *);
 static errno_t tbsmenu_entry_start(tbsmenu_entry_t *);
-static void tbsmenu_cmd_fini(tbsmenu_cmd_t *);
 
 /** Create taskbar start menu.
@@ -70 +69 @@
  * @param window Containing window
  * @param fixed Fixed layout to which start button will be added
- * @param dspec Display specification (for passing to applications)
  * @param rtbsmenu Place to store pointer to new start menu
  * @return @c EOK on success or an error code
  */
 errno_t tbsmenu_create(ui_window_t *window, ui_fixed_t *fixed,
-    const char *dspec, tbsmenu_t **rtbsmenu)
+    tbsmenu_t **rtbsmenu)
 {
         ui_resource_t *res = ui_window_get_res(window);
@@ -87 +85 @@
         }
 
-        tbsmenu->display_spec = str_dup(dspec);
-        if (tbsmenu->display_spec == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
         rc = ui_pbutton_create(res, "Start", &tbsmenu->sbutton);
         if (rc != EOK)
@@ -119 +111 @@
         return EOK;
 error:
-        if (tbsmenu != NULL && tbsmenu->display_spec != NULL)
-                free(tbsmenu->display_spec);
         if (tbsmenu != NULL)
                 ui_pbutton_destroy(tbsmenu->sbutton);
@@ -144 +134 @@
         bool terminal;
         errno_t rc;
-
-        if (tbsmenu->repopath != NULL)
-                free(tbsmenu->repopath);
-
-        tbsmenu->repopath = str_dup(repopath);
-        if (tbsmenu->repopath == NULL)
-                return ENOMEM;
-
-        /* Remove existing entries */
-        tentry = tbsmenu_first(tbsmenu);
-        while (tentry != NULL) {
-                tbsmenu_remove(tbsmenu, tentry, false);
-                tentry = tbsmenu_first(tbsmenu);
-        }
 
         rc = tbarcfg_open(repopath, &tbcfg);
@@ -194 +170 @@
 }
 
-/** Reload start menu from repository (or schedule reload).
- *
- * @param tbsmenu Start menu
- */
-void tbsmenu_reload(tbsmenu_t *tbsmenu)
-{
-        if (!tbsmenu_is_open(tbsmenu))
-                (void) tbsmenu_load(tbsmenu, tbsmenu->repopath);
-        else
-                tbsmenu->needs_reload = true;
-}
-
 /** Set start menu rectangle.
  *
@@ -234 +198 @@
 {
         ui_menu_close(tbsmenu->smenu);
-
-        if (tbsmenu->needs_reload)
-                (void) tbsmenu_load(tbsmenu, tbsmenu->repopath);
 }
 
@@ -486 +447 @@
 static errno_t tbsmenu_cmd_split(const char *str, tbsmenu_cmd_t *cmd)
 {
-        char *buf;
         char *arg;
         char *next;
         size_t cnt;
 
-        buf = str_dup(str);
-        if (buf == NULL)
+        cmd->buf = str_dup(str);
+        if (cmd->buf == NULL)
                 return ENOMEM;
 
         /* Count the entries */
         cnt = 0;
-        arg = str_tok(buf, " ", &next);
+        arg = str_tok(cmd->buf, " ", &next);
         while (arg != NULL) {
                 ++cnt;
@@ -504 +464 @@
 
         /* Need to copy again as buf was mangled */
-        free(buf);
-        buf = str_dup(str);
-        if (buf == NULL)
+        free(cmd->buf);
+        cmd->buf = str_dup(str);
+        if (cmd->buf == NULL)
                 return ENOMEM;
 
         cmd->argv = calloc(cnt + 1, sizeof(char *));
         if (cmd->argv == NULL) {
-                free(buf);
+                free(cmd->buf);
                 return ENOMEM;
         }
 
-        /* Copy individual arguments */
+        /* Fill in pointers */
         cnt = 0;
-        arg = str_tok(buf, " ", &next);
+        arg = str_tok(cmd->buf, " ", &next);
         while (arg != NULL) {
-                cmd->argv[cnt] = str_dup(arg);
-                if (cmd->argv[cnt] == NULL) {
-                        tbsmenu_cmd_fini(cmd);
-                        return ENOMEM;
-                }
-                ++cnt;
-
+                cmd->argv[cnt++] = arg;
                 arg = str_tok(next, " ", &next);
         }
@@ -540 +494 @@
 static void tbsmenu_cmd_fini(tbsmenu_cmd_t *cmd)
 {
-        char **cp;
-
-        /* Free all pointers in NULL-terminated list */
-        cp = cmd->argv;
-        while (*cp != NULL) {
-                free(*cp);
-                ++cp;
-        }
-
-        /* Free the array of pointers */
         free(cmd->argv);
-}
-
-/** Free command structure.
- *
- * @param cmd Command
- * @param entry Start menu entry
- * @param dspec Display specification
- * @return EOK on success or an error code
- */
-static errno_t tbsmenu_cmd_subst(tbsmenu_cmd_t *cmd, tbsmenu_entry_t *entry,
-    const char *dspec)
-{
-        char **cp;
-
-        (void)entry;
-
-        /* Walk NULL-terminated list of arguments */
-        cp = cmd->argv;
-        while (*cp != NULL) {
-                if (str_cmp(*cp, "%d") == 0) {
-                        /* Display specification */
-                        free(*cp);
-                        *cp = str_dup(dspec);
-                        if (*cp == NULL)
-                                return ENOMEM;
-                }
-                ++cp;
-        }
-
-        return EOK;
+        free(cmd->buf);
 }
 
@@ -601 +516 @@
         char **cp;
         const char **targv = NULL;
-        char *dspec = NULL;
-        sysarg_t idev_id;
-        int rv;
         errno_t rc;
         ui_t *ui;
@@ -610 +522 @@
         suspended = false;
 
-        idev_id = ui_menu_get_idev_id(entry->tbsmenu->smenu);
-
-        rv = asprintf(&dspec, "%s?idev=%zu",
-            entry->tbsmenu->display_spec, (size_t)idev_id);
-        if (rv < 0)
-                return ENOMEM;
-
-        /* Split command string into individual arguments */
         rc = tbsmenu_cmd_split(entry->cmd, &cmd);
-        if (rc != EOK) {
-                free(dspec);
+        if (rc != EOK)
                 return rc;
-        }
-
-        /* Substitute metacharacters in command */
-        rc = tbsmenu_cmd_subst(&cmd, entry, dspec);
-        if (rc != EOK)
-                goto error;
 
         /* Free up and clean console for the child task. */
@@ -645 +542 @@
                 }
 
-                targv = calloc(cnt + 5, sizeof(char **));
+                targv = calloc(cnt + 3, sizeof(char **));
                 if (targv == NULL)
                         goto error;
 
                 targv[0] = "/app/terminal";
-                targv[1] = "-d";
-                targv[2] = dspec;
-                targv[3] = "-c";
+                targv[1] = "-c";
 
                 for (i = 0; i <= cnt; i++) {
-                        targv[4 + i] = cmd.argv[i];
+                        targv[2 + i] = cmd.argv[i];
                 }
 
@@ -683 +578 @@
         return EOK;
 error:
-        free(dspec);
         if (targv != NULL)
                 free(targv);