commit 9d5380755475a4eefcc798884f437b275012e287
author David Reveman <reveman@chromium.org> Thu Apr 05 15:57:45 2018
committer David Reveman <reveman@chromium.org> Thu Apr 05 18:20:40 2018
tree 003ed47e032eecf13209de47a46982d49503724f
parent 04b5ec37f9e000542a1ab0999c5b60b6f81db224

Add xwayland path setting.

This makes it possible to use SOMMELIER_XWAYLAND_PATH and
--xwayland-path=PATH to specific the full path to the Xwayland
binary.

Bug: 826923
Change-Id: I0156f18976a3c4e43a70de95b49eca398368cad6
Reviewed-on: https://chromium-review.googlesource.com/997995
Tested-by: David Reveman <reveman@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>

sommelier.c

diff --git a/sommelier.c b/sommelier.c
index 65e408f..fd365a2 100644
--- a/sommelier.c
+++ b/sommelier.c
@@ -52,7 +52,7 @@
 #include "xdg-shell-unstable-v6-server-protocol.h"
 
 #ifndef XWAYLAND_PATH
-#define XWAYLAND_PATH "/usr/bin"
+#define XWAYLAND_PATH "/usr/bin/Xwayland"
 #endif
 
 struct xwl;
@@ -6466,6 +6466,7 @@
          "  --accelerators=ACCELERATORS\tList of keyboard accelerators\n"
          "  --app-id=ID\t\t\tForced application ID for X11 clients\n"
          "  --x-display=DISPLAY\t\tX11 display to listen on\n"
+         "  --xwayland-path=PATH\t\tPath to Xwayland executable\n"
          "  --no-exit-with-child\t\tKeep process alive after child exists\n"
          "  --no-clipboard-manager\tDisable X11 clipboard manager\n"
          "  --frame-color=COLOR\t\tWindow frame color for X11 clients\n"
@@ -6582,6 +6583,7 @@
   const char *shm_driver = getenv("SOMMELIER_SHM_DRIVER");
   const char *data_driver = getenv("SOMMELIER_DATA_DRIVER");
   const char *accelerators = getenv("SOMMELIER_ACCELERATORS");
+  const char *xwayland_path = getenv("SOMMELIER_XWAYLAND_PATH");
   const char *socket_name = "wayland-0";
   const char *runtime_dir;
   struct wl_event_loop *event_loop;
@@ -6653,6 +6655,10 @@
       xdisplay = atoi(s);
       // Automatically enable X forwarding if X display is specified.
       xwl.xwayland = 1;
+    } else if (strstr(arg, "--xwayland-path") == arg) {
+      const char *s = strchr(arg, '=');
+      ++s;
+      xwayland_path = s;
     } else if (strstr(arg, "--no-exit-with-child") == arg) {
       xwl.exit_with_child = 0;
     } else if (strstr(arg, "--no-clipboard-manager") == arg) {
@@ -7050,16 +7056,20 @@
       assert(pid != -1);
       if (pid == 0) {
         char display_str[8], display_fd_str[8], wm_fd_str[8];
+        char xwayland_path_str[1024];
         char *args[32];
         int i = 0;
         int fd;
 
+        snprintf(xwayland_path_str, sizeof(xwayland_path_str), "%s",
+                 xwayland_path ? xwayland_path : XWAYLAND_PATH);
+        args[i++] = xwayland_path_str;
+
         fd = dup(ds[1]);
         snprintf(display_fd_str, sizeof(display_fd_str), "%d", fd);
         fd = dup(wm[1]);
         snprintf(wm_fd_str, sizeof(wm_fd_str), "%d", fd);
 
-        args[i++] = XWAYLAND_PATH "/Xwayland";
         if (xdisplay > 0) {
           snprintf(display_str, sizeof(display_str), ":%d", xdisplay);
           args[i++] = display_str;
@@ -7080,7 +7090,7 @@
         args[i++] = wm_fd_str;
         args[i++] = NULL;
 
-        xwl_execvp(XWAYLAND_PATH "/Xwayland", args, sv[1]);
+        xwl_execvp(args[0], args, sv[1]);
         _exit(EXIT_FAILURE);
       }
       close(wm[1]);