<div dir="ltr">Thanks, every time I tried XWayland I though a thing like this was needed. I have a few comments though: <div class="gmail_extra"> <div class="gmail_quote">2013/8/13 Maksim Melnikau <<a href="mailto:maxposedon@gmail.com" target="_blank">maxposedon@gmail.com</a>> <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Signed-off-by: Maksim Melnikau <<a href="mailto:maxposedon@gmail.com">maxposedon@gmail.com</a>> --- man/weston.man | 3 +++ src/weston-launch.c | 4 ++++ src/xwayland/launcher.c | 9 +++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/man/weston.man b/man/weston.man index 39d854b..94c87d3 100644 --- a/man/weston.man +++ b/man/weston.man @@ -240,6 +240,9 @@ If set, specifies the directory where to look for .B XDG_RUNTIME_DIR The directory for Weston's socket and lock files. Wayland clients will automatically use this. +.TP +.B XSERVER_PATH +Override xserver to run. . .\" *************************************************************** .SH DIAGNOSTICS diff --git a/src/weston-launch.c b/src/weston-launch.c index 7264f7e..2b26c9c 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -504,6 +504,7 @@ setup_session(struct weston_launch *wl) { char **env; char *term; + char *xserver; int i; if (wl->tty != STDIN_FILENO) { @@ -514,9 +515,12 @@ setup_session(struct weston_launch *wl) } term = getenv("TERM"); + xserver = getenv("XSERVER_PATH"); </blockquote><div>I'm not sure XSERVER_PATH is a good name. I would at least put a WESTON_ or before it, as it's specific to it.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> clearenv(); if (term) setenv("TERM", term, 1); + if(xserver) </blockquote><div>style: put a space after the 'if'.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> + setenv("XSERVER_PATH", xserver, 1); setenv("USER", wl->pw->pw_name, 1); setenv("LOGNAME", wl->pw->pw_name, 1); setenv("HOME", wl->pw->pw_dir, 1); diff --git a/src/xwayland/launcher.c b/src/xwayland/launcher.c index b639479..ae1fcb1 100644 --- a/src/xwayland/launcher.c +++ b/src/xwayland/launcher.c @@ -42,6 +42,7 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data) struct weston_xserver *wxs = data; char display[8], s[8]; int sv[2], client_fd; + char *xserver = NULL; if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) { weston_log("socketpair failed\n"); @@ -62,8 +63,12 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data) snprintf(display, sizeof display, ":%d", wxs->display); - if (execl(XSERVER_PATH, - XSERVER_PATH, + xserver = getenv("XSERVER_PATH"); + if(!xserver) </blockquote><div>also here.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> + xserver = XSERVER_PATH; + + if (execl(xserver, + xserver, display, "-wayland", "-rootless", -- 1.8.3.2 _______________________________________________ wayland-devel mailing list <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> </blockquote></div> </div></div>