ec->option_idle_time = option_idle_time;
ec->idle_time = option_idle_time;
- if (shell_init(ec) < 0)
- exit(EXIT_FAILURE);
-
if (xserver)
weston_xserver_init(ec);
+ if (shell_init(ec) < 0)
+ exit(EXIT_FAILURE);
+
if (wl_display_add_socket(display, option_socket_name)) {
fprintf(stderr, "failed to add socket: %m\n");
exit(EXIT_FAILURE);
{
struct wl_display *display = compositor->wl_display;
struct weston_xserver *mxs;
- char lockfile[256];
+ char lockfile[256], display_name[8];
mxs = malloc(sizeof *mxs);
memset(mxs, 0, sizeof *mxs);
return -1;
}
- fprintf(stderr, "xserver listening on display :%d\n", mxs->display);
+ snprintf(display_name, sizeof display_name, ":%d", mxs->display);
+ fprintf(stderr, "xserver listening on display %s\n", display_name);
+ setenv("DISPLAY", display_name, 1);
mxs->loop = wl_display_get_event_loop(display);
mxs->abstract_source =