Changeset d92b8e8f in mainline for uspace/app/taskbar/taskbar.c

Timestamp:

2024-03-04T14:12:26Z (14 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

e229148

Parents:

ee3b28a9

git-author:

Jiri Svoboda <jiri@…> (2024-03-03 18:12:02)

git-committer:

Jiri Svoboda <jiri@…> (2024-03-04 14:12:26)

Message:

Start menu support for passing input device ID (multiseat)

File:

• uspace/app/taskbar/taskbar.c (modified) (4 diffs)

uspace/app/taskbar/taskbar.c

@@ -131 +131 @@
         gfx_rect_t scr_rect;
         gfx_rect_t rect;
+        char *dspec = NULL;
+        char *qmark;
         errno_t rc;
 
         taskbar = calloc(1, sizeof(taskbar_t));
         if (taskbar == NULL) {
+                printf("Out of memory.\n");
                 rc = ENOMEM;
                 goto error;
         }
+
+        dspec = str_dup(display_spec);
+        if (dspec == NULL) {
+                printf("Out of memory.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        /* Remove additional arguments */
+        qmark = str_chr(dspec, '?');
+        if (qmark != NULL)
+                *qmark = '\0';
 
         rc = ui_create(display_spec, &taskbar->ui);
@@ -198 +213 @@
         }
 
-        rc = tbsmenu_create(taskbar->window, taskbar->fixed, &taskbar->tbsmenu);
+        rc = tbsmenu_create(taskbar->window, taskbar->fixed, dspec,
+            &taskbar->tbsmenu);
         if (rc != EOK) {
                 printf("Error creating start menu.\n");
@@ -293 +309 @@
         }
 
+        free(dspec);
         *rtaskbar = taskbar;
         return EOK;
 error:
+        if (dspec != NULL)
+                free(dspec);
         if (taskbar->lst != NULL)
                 tbarcfg_listener_destroy(taskbar->lst);
@@ -308 +327 @@
         if (taskbar->ui != NULL)
                 ui_destroy(taskbar->ui);
+        free(taskbar);
         return rc;