Merge pull request #2059 from unxed/minor-fix

Better detect wayland on WSL
elfmz · Mar 11, 2024 · 010f994 · 010f994
2 parents 627f877 + a568761
commit 010f994
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/WinPort/src/Backend/TTY/TTYBackend.cpp b/WinPort/src/Backend/TTY/TTYBackend.cpp
@@ -226,8 +226,9 @@ void TTYBackend::ReaderThread()
 				// disable xi on Wayland as it not work there anyway and also causes delays
 				const char *xdg_st = getenv("XDG_SESSION_TYPE");
 				bool on_wayland = (xdg_st && strcasecmp(xdg_st, "wayland") == 0);
+				char *wayland_display = getenv("WAYLAND_DISPLAY");
 
-				_ttyx = StartTTYX(_full_exe_path, !strstr(_nodetect, "xi") && !on_wayland);
+				_ttyx = StartTTYX(_full_exe_path, !strstr(_nodetect, "xi") && !on_wayland && !wayland_display);
 			}
 			if (_ttyx) {
 				if (!_ext_clipboard) {
@@ -302,7 +303,8 @@ void TTYBackend::ReaderLoop()
 
 		// Enable esc expiration on Wayland as Xi not work there
 		const char *xdg_st = getenv("XDG_SESSION_TYPE");
-		if ((xdg_st && strcasecmp(xdg_st, "wayland") == 0) && !_esc_expiration) {
+		char *wayland_display = getenv("WAYLAND_DISPLAY");
+		if (!_esc_expiration && ((xdg_st && strcasecmp(xdg_st, "wayland") == 0) || wayland_display)) {
 			_esc_expiration = 100;
 		}