Changeset b1f0a14 in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2023-01-22T11:05:28Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0161d16

Parents:

5d380b6

Message:

Pass input device ID via display specification argument

This allows launcher to start applications in the correct seat,
meaning the correct seat's focus will be changed to the newly
created window.

File:

• uspace/lib/ui/src/ui.c (modified) (10 diffs)

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 #include <str.h>
 #include <task.h>
+#include <types/common.h>
 #include <ui/clickmatic.h>
 #include <ui/ui.h>
@@ -65 +66 @@
  * @param ws Place to store window system type (protocol)
  * @param osvc Place to store pointer to output service name
- */
-static void ui_ospec_parse(const char *ospec, ui_winsys_t *ws,
-    const char **osvc)
+ * @param ridev_id Place to store input device ID
+ * @return EOK on success, EINVAL if syntax is invalid, ENOMEM if out of
+ *         memory
+ */
+static errno_t ui_ospec_parse(const char *ospec, ui_winsys_t *ws,
+    char **osvc, sysarg_t *ridev_id)
 {
         const char *cp;
+        const char *qm;
+        const char *endptr;
+        uint64_t idev_id;
+        errno_t rc;
+
+        *ridev_id = 0;
 
         cp = ospec;
@@ -75 +85 @@
                 ++cp;
 
+        /* Window system / protocol */
         if (*cp == '@') {
                 if (str_lcmp(ospec, "disp@", str_length("disp@")) == 0) {
@@ -88 +99 @@
                 }
 
-                if (cp[1] != '\0')
-                        *osvc = cp + 1;
-                else
-                        *osvc = NULL;
+                ++cp;
         } else {
                 *ws = ui_ws_display;
-                *osvc = ospec;
-        }
+        }
+
+        /* Output service is the part before question mark */
+        qm = str_chr(cp, '?');
+        if (qm != NULL) {
+                *osvc = str_ndup(cp, qm - cp);
+        } else {
+                /* No question mark */
+                *osvc = str_dup(cp);
+        }
+
+        if (*osvc == NULL)
+                return ENOMEM;
+
+        if (qm != NULL) {
+                /* The part after the question mark */
+                cp = qm + 1;
+
+                /* Input device ID parameter */
+                if (str_lcmp(cp, "idev=", str_length("idev=")) == 0) {
+                        cp += str_length("idev=");
+
+                        rc = str_uint64_t(cp, &endptr, 10, false, &idev_id);
+                        if (rc != EOK)
+                                goto error;
+
+                        *ridev_id = idev_id;
+                        cp = endptr;
+                }
+        }
+
+        if (*cp != '\0') {
+                rc = EINVAL;
+                goto error;
+        }
+
+        return EOK;
+error:
+        free(*osvc);
+        *osvc = NULL;
+        return rc;
 }
 
@@ -114 +161 @@
         console_gc_t *cgc;
         ui_winsys_t ws;
-        const char *osvc;
+        char *osvc;
         sysarg_t cols;
         sysarg_t rows;
+        sysarg_t idev_id;
         ui_t *ui;
 
-        ui_ospec_parse(ospec, &ws, &osvc);
+        rc = ui_ospec_parse(ospec, &ws, &osvc, &idev_id);
+        if (rc != EOK)
+                return rc;
 
         if (ws == ui_ws_display || ws == ui_ws_any) {
-                rc = display_open(osvc != NULL ? osvc : DISPLAY_DEFAULT,
-                    &display);
+                rc = display_open((str_cmp(osvc, "") != 0) ? osvc :
+                    DISPLAY_DEFAULT, &display);
                 if (rc != EOK)
                         goto disp_fail;
@@ -133 +183 @@
                 }
 
+                free(osvc);
                 ui->myoutput = true;
+                ui->idev_id = idev_id;
                 *rui = ui;
                 return EOK;
@@ -166 +218 @@
                 }
 
+                free(osvc);
+
                 ui->cgc = cgc;
                 ui->rect.p0.x = 0;
@@ -180 +234 @@
 cons_fail:
         if (ws == ui_ws_null) {
+                free(osvc);
                 rc = ui_create_disp(NULL, &ui);
                 if (rc != EOK)
@@ -189 +244 @@
         }
 
+        free(osvc);
         return EINVAL;
 }