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