1From 2f72b0bd1cef367cfc26fcb73b6cff32945c383c Mon Sep 17 00:00:00 2001
2From: Jeffy Chen <jeffy.chen@rock-chips.com>
3Date: Wed, 5 Jan 2022 14:56:17 +0800
4Subject: [PATCH 01/79] Revert "compositor: avoid setting
5 WAYLAND_DISPLAY=wayland-0"
6
7This reverts commit ae69381b6eb43ab63992906d1bf29ffd2b4df10d.
8
9Use "wayland-0" by default.
10
11Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
12---
13 compositor/main.c | 23 +++++++++--------------
14 1 file changed, 9 insertions(+), 14 deletions(-)
15
16diff --git a/compositor/main.c b/compositor/main.c
17index 322f2ff..d7eb422 100644
18--- a/compositor/main.c
19+++ b/compositor/main.c
20@@ -869,29 +869,24 @@ handle_primary_client_destroyed(struct wl_listener *listener, void *data)
21 static int
22 weston_create_listening_socket(struct wl_display *display, const char *socket_name)
23 {
24-	char name_candidate[16];
25-
26 	if (socket_name) {
27 		if (wl_display_add_socket(display, socket_name)) {
28 			weston_log("fatal: failed to add socket: %s\n",
29 				   strerror(errno));
30 			return -1;
31 		}
32-
33-		setenv("WAYLAND_DISPLAY", socket_name, 1);
34-		return 0;
35 	} else {
36-		for (int i = 1; i <= 32; i++) {
37-			sprintf(name_candidate, "wayland-%d", i);
38-			if (wl_display_add_socket(display, name_candidate) >= 0) {
39-				setenv("WAYLAND_DISPLAY", name_candidate, 1);
40-				return 0;
41-			}
42+		socket_name = wl_display_add_socket_auto(display);
43+		if (!socket_name) {
44+			weston_log("fatal: failed to add socket: %s\n",
45+				   strerror(errno));
46+			return -1;
47 		}
48-		weston_log("fatal: failed to add socket: %s\n",
49-			   strerror(errno));
50-		return -1;
51 	}
52+
53+	setenv("WAYLAND_DISPLAY", socket_name, 1);
54+
55+	return 0;
56 }
57
58 WL_EXPORT void *
59--
602.20.1
61
62