launch: Let window manager deal with WAYLAND_DISPLAY

michaelforney · Nov 10, 2018 · c0e9489 · c0e9489
1 parent 93ef48f
commit c0e9489
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/example/wm.c b/example/wm.c
@@ -249,13 +249,16 @@ quit(void *data, uint32_t time, uint32_t value, uint32_t state)
 int
 main(int argc, char *argv[])
 {
-	display = wl_display_create();
+	const char *socket;
 
+	display = wl_display_create();
 	if (!display)
 		return EXIT_FAILURE;
 
-	if (wl_display_add_socket(display, NULL) != 0)
+	socket = wl_display_add_socket_auto(display);
+	if (!socket)
 		return EXIT_FAILURE;
+	setenv("WAYLAND_DISPLAY", socket, 1);
 
 	if (!swc_initialize(display, NULL, &manager))
 		return EXIT_FAILURE;

diff --git a/launch/launch.c b/launch/launch.c
@@ -79,7 +79,7 @@ die(const char *format, ...);
 
 static void __attribute__((noreturn)) usage(const char *name)
 {
-	fprintf(stderr, "usage: %s [-n] [-s socket] [-t tty] [--] server [args...]\n", name);
+	fprintf(stderr, "usage: %s [-n] [-t tty] [--] server [args...]\n", name);
 	exit(2);
 }
 
@@ -431,14 +431,11 @@ main(int argc, char *argv[])
 	sigset_t set;
 	posix_spawnattr_t attr;
 
-	while ((option = getopt(argc, argv, "ns:t:")) != -1) {
+	while ((option = getopt(argc, argv, "nt:")) != -1) {
 		switch (option) {
 		case 'n':
 			nflag = true;
 			break;
-		case 's':
-			setenv("WAYLAND_DISPLAY", optarg, true);
-			break;
 		case 't':
 			vt = optarg;
 			break;