Changeset b1f0a14 in mainline for uspace/app/launcher/launcher.c

Timestamp:

2023-01-22T11:05:28Z (15 months 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/app/launcher/launcher.c (modified) (10 diffs)

uspace/app/launcher/launcher.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -59 +59 @@
 
 static void wnd_close(ui_window_t *, void *);
+static void wnd_pos(ui_window_t *, void *, pos_event_t *);
 
 static ui_window_cb_t window_cb = {
-        .close = wnd_close
+        .close = wnd_close,
+        .pos = wnd_pos
 };
 
@@ -70 +72 @@
 };
 
-static int app_launchl(const char *, ...);
+static int app_launchl(launcher_t *, const char *, ...);
 
 /** Window close button was clicked.
@@ -84 +86 @@
 }
 
+/** Window received position event.
+ *
+ * @param window Window
+ * @param arg Argument (launcher)
+ * @param event Position event
+ */
+static void wnd_pos(ui_window_t *window, void *arg, pos_event_t *event)
+{
+        launcher_t *launcher = (launcher_t *) arg;
+
+        /* Remember ID of device that sent the last event */
+        launcher->ev_pos_id = event->pos_id;
+
+        ui_window_def_pos(window, event);
+}
+
 /** Push button was clicked.
  *
@@ -94 +112 @@
 
         if (pbutton == launcher->pb1) {
-                app_launchl("/app/terminal", "-c", "/app/nav", NULL);
+                app_launchl(launcher, "/app/terminal", "-c", "/app/nav", NULL);
         } else if (pbutton == launcher->pb2) {
-                app_launchl("/app/terminal", "-c", "/app/edit", NULL);
+                app_launchl(launcher, "/app/terminal", "-c", "/app/edit", NULL);
         } else if (pbutton == launcher->pb3) {
-                app_launchl("/app/terminal", NULL);
+                app_launchl(launcher, "/app/terminal", NULL);
         } else if (pbutton == launcher->pb4) {
-                app_launchl("/app/calculator", NULL);
+                app_launchl(launcher, "/app/calculator", NULL);
         } else if (pbutton == launcher->pb5) {
-                app_launchl("/app/uidemo", NULL);
+                app_launchl(launcher, "/app/uidemo", NULL);
         } else if (pbutton == launcher->pb6) {
-                app_launchl("/app/gfxdemo", "ui", NULL);
-        }
-}
-
-static int app_launchl(const char *app, ...)
+                app_launchl(launcher, "/app/gfxdemo", "ui", NULL);
+        }
+}
+
+static int app_launchl(launcher_t *launcher, const char *app, ...)
 {
         errno_t rc;
@@ -117 +135 @@
         const char **argv;
         const char **argp;
+        char *dspec;
         int cnt = 0;
         int i;
+        int rv;
 
         va_start(ap, app);
@@ -137 +157 @@
         *argp++ = app;
 
-        if (str_cmp(display_spec, UI_DISPLAY_DEFAULT) != 0) {
-                *argp++ = "-d";
-                *argp++ = display_spec;
-        }
+        rv = asprintf(&dspec, "%s?idev=%zu", display_spec,
+            (size_t)launcher->ev_pos_id);
+        if (rv < 0) {
+                printf("Out of memory.\n");
+                return -1;
+        }
+
+        /* TODO Might be omitted if default display AND only one seat */
+        *argp++ = "-d";
+        *argp++ = dspec;
 
         va_start(ap, app);
@@ -192 +218 @@
         gfx_rect_t rect;
         gfx_coord2_t off;
+        const char *dspec = UI_DISPLAY_DEFAULT;
+        char *qmark;
         errno_t rc;
 
@@ -204 +232 @@
                         }
 
-                        display_spec = argv[i++];
+                        dspec = argv[i++];
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -212 +240 @@
         }
 
-        rc = ui_create(display_spec, &ui);
+        display_spec = str_dup(dspec);
+        if (display_spec == NULL) {
+                printf("Out of memory.\n");
+                return 1;
+        }
+
+        /* Remove additional arguments */
+        qmark = str_chr(display_spec, '?');
+        if (qmark != NULL)
+                *qmark = '\0';
+
+        rc = ui_create(dspec, &ui);
         if (rc != EOK) {
                 printf("Error creating UI on display %s.\n", display_spec);