godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include Display Server Type in Copy System Info 

Add info about X11 or Wayland to System Information on LinuxBSD.

(cherry picked from commit 1712b78e18)
This commit is contained in:
Markus Sauermann 2023-07-12 23:12:31 +02:00 committed by Yuri Sizov
parent 2c154348fc
commit 2d607d7c5c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_node.cpp
View File

@ -4376,6 +4376,9 @@ String EditorNode::_get_system_info() const {
godot_version += " " + hash; godot_version += " " + hash;
} }
#ifdef LINUXBSD_ENABLED
const String display_server = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").capitalize().replace(" ", ""); // `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
#endif // LINUXBSD_ENABLED
String driver_name = GLOBAL_GET("rendering/rendering_device/driver"); String driver_name = GLOBAL_GET("rendering/rendering_device/driver");
String rendering_method = GLOBAL_GET("rendering/renderer/rendering_method"); String rendering_method = GLOBAL_GET("rendering/renderer/rendering_method");
@ -4428,6 +4431,11 @@ String EditorNode::_get_system_info() const {
} else { } else {
info.push_back(distribution_name); info.push_back(distribution_name);
} }
#ifdef LINUXBSD_ENABLED
if (!display_server.is_empty()) {
info.push_back(display_server);
}
#endif // LINUXBSD_ENABLED
info.push_back(vformat("%s (%s)", driver_name, rendering_method)); info.push_back(vformat("%s (%s)", driver_name, rendering_method));
String graphics; String graphics;