diff options
| author | Tudor Brindus <me@tbrindus.ca> | 2020-05-27 12:48:07 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-05-27 18:58:23 +0200 |
| commit | 704d675a36811bdf3de5c95d5e0e7ce2b57b3157 (patch) | |
| tree | d17475927b2ae46864a1dbecef1b5420bad3f1e4 | |
| parent | d71fed95da5af5a489d2ea68b87a306ddc4d238d (diff) | |
| download | sway-704d675a36811bdf3de5c95d5e0e7ce2b57b3157.tar.xz | |
Log Xwayland startup failures
Though unlikely, this commit makes server initialization totally
explicit in the logs.
| -rw-r--r-- | sway/server.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sway/server.c b/sway/server.c index ec30430c..cf36962b 100644 --- a/sway/server.c +++ b/sway/server.c @@ -196,16 +196,20 @@ bool server_start(struct sway_server *server) { server->xwayland.wlr_xwayland = wlr_xwayland_create(server->wl_display, server->compositor, config->xwayland == XWAYLAND_MODE_LAZY); - wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, - &server->xwayland_surface); - server->xwayland_surface.notify = handle_xwayland_surface; - wl_signal_add(&server->xwayland.wlr_xwayland->events.ready, - &server->xwayland_ready); - server->xwayland_ready.notify = handle_xwayland_ready; - - setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true); - - /* xcursor configured by the default seat */ + if (!server->xwayland.wlr_xwayland) { + sway_log(SWAY_ERROR, "Failed to start Xwayland"); + } else { + wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, + &server->xwayland_surface); + server->xwayland_surface.notify = handle_xwayland_surface; + wl_signal_add(&server->xwayland.wlr_xwayland->events.ready, + &server->xwayland_ready); + server->xwayland_ready.notify = handle_xwayland_ready; + + setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true); + + /* xcursor configured by the default seat */ + } } #endif |