sway

commit 32ba8154b8f5f15b2c778dd404f3acb5becc1719
parent 56c388b51076c3d96363e6afb62d0138cd3dce36
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Mon, 15 Oct 2018 21:57:59 +1000

Sway clients: Exit gracefully when compositor is unavailable

Diffstat:
M
swaybar/bar.c
 | 
6
+++++-
M
swaybg/main.c
 | 
7
++++++-
M
swayidle/main.c
 | 
4
+++-
M
swaylock/main.c
 | 
6
+++++-
M
swaynag/swaynag.c
 | 
6
+++++-

5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/swaybar/bar.c b/swaybar/bar.c
@@ -586,7 +586,11 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 	}
 
 	bar->display = wl_display_connect(NULL);
-	assert(bar->display);
+	if (!bar->display) {
+		sway_abort("Unable to connect to the compositor. "
+				"If your compositor is running, check or set the "
+				"WAYLAND_DISPLAY environment variable.");
+	}
 
 	struct wl_registry *registry = wl_display_get_registry(bar->display);
 	wl_registry_add_listener(registry, &registry_listener, bar);
diff --git a/swaybg/main.c b/swaybg/main.c
@@ -222,7 +222,12 @@ int main(int argc, const char **argv) {
 	}
 
 	state.display = wl_display_connect(NULL);
-	assert(state.display);
+	if (!state.display) {
+		wlr_log(WLR_ERROR, "Unable to connect to the compositor. "
+				"If your compositor is running, check or set the "
+				"WAYLAND_DISPLAY environment variable.");
+		return 1;
+	}
 
 	struct wl_registry *registry = wl_display_get_registry(state.display);
 	wl_registry_add_listener(registry, &registry_listener, &state);
diff --git a/swayidle/main.c b/swayidle/main.c
@@ -388,7 +388,9 @@ int main(int argc, char *argv[]) {
 
 	state.display = wl_display_connect(NULL);
 	if (state.display == NULL) {
-		wlr_log(WLR_ERROR, "Failed to create display");
+		wlr_log(WLR_ERROR, "Unable to connect to the compositor. "
+				"If your compositor is running, check or set the "
+				"WAYLAND_DISPLAY environment variable.");
 		return -3;
 	}
 
diff --git a/swaylock/main.c b/swaylock/main.c
@@ -908,7 +908,11 @@ int main(int argc, char **argv) {
 	wl_list_init(&state.surfaces);
 	state.xkb.context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 	state.display = wl_display_connect(NULL);
-	assert(state.display);
+	if (!state.display) {
+		sway_abort("Unable to connect to the compositor. "
+				"If your compositor is running, check or set the "
+				"WAYLAND_DISPLAY environment variable.");
+	}
 
 	struct wl_registry *registry = wl_display_get_registry(state.display);
 	wl_registry_add_listener(registry, &registry_listener, &state);
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
@@ -342,7 +342,11 @@ static const struct wl_registry_listener registry_listener = {
 
 void swaynag_setup(struct swaynag *swaynag) {
 	swaynag->display = wl_display_connect(NULL);
-	assert(swaynag->display);
+	if (!swaynag->display) {
+		sway_abort("Unable to connect to the compositor. "
+				"If your compositor is running, check or set the "
+				"WAYLAND_DISPLAY environment variable.");
+	}
 
 	swaynag->scale = 1;
 	wl_list_init(&swaynag->outputs);