#4082 add 'display'

Xpra-org · Dec 28, 2023 · b67c0ca · b67c0ca
1 parent a5ba8f3
commit b67c0ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/xpra/client/mixins/network_listener.py b/xpra/client/mixins/network_listener.py
@@ -13,7 +13,7 @@
 from xpra.util.str_fn import csv, bytestostr
 from xpra.util.env import envint, envbool, envfloat
 from xpra.common import ConnectionMessage
-from xpra.os_util import get_machine_id, gi_import, WIN32
+from xpra.os_util import get_machine_id, gi_import, WIN32, POSIX, OSX
 from xpra.net.bytestreams import log_new_connection
 from xpra.net.socket_util import create_sockets, add_listen_socket, accept_connection, setup_local_sockets
 from xpra.net.net_util import get_network_caps
@@ -208,6 +208,9 @@ def send_info() -> None:
                 info = self.get_info()
                 info["network"] = get_network_caps()
                 info["session-type"] = (get_session_type() or get_generic_os_name()) + " client"
+                display = os.environ.get("WAYLAND_DISPLAY") or os.environ.get("DISPLAY")
+                if display and POSIX and not OSX:
+                    info["display"] = display
                 hello_reply(info)
 
             # run in UI thread:

diff --git a/xpra/util/system.py b/xpra/util/system.py
@@ -200,7 +200,7 @@ def do_get_generic_os_name() -> str:
     for k,v in {
             "linux"     : "Linux",
             "darwin"    : "MacOS",
-            "win"       : "Win32",
+            "win"       : "MS Windows",
             "freebsd"   : "FreeBSD",
     }.items():
         if sys.platform.startswith(k):