Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-31 01:05:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed DisplayServer to WindowServer.

Browse Source
This commit is contained in:
Relintai 2023-12-12 14:51:08 +01:00
parent a99e07563d
commit 70f749688b
4 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/os/os.h
View File

@ -101,7 +101,7 @@ public:
RENDER_SEPARATE_THREAD RENDER_SEPARATE_THREAD
}; };
//DisplayServer //WindowServer
struct VideoMode { struct VideoMode {
int width, height; int width, height;
bool fullscreen; bool fullscreen;
@ -186,7 +186,7 @@ public:
virtual String get_clipboard() const; virtual String get_clipboard() const;
virtual bool has_clipboard() const; virtual bool has_clipboard() const;
//DisplayServer //WindowServer
virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0) = 0; virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0) = 0;
virtual VideoMode get_video_mode(int p_screen = 0) const = 0; virtual VideoMode get_video_mode(int p_screen = 0) const = 0;
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const = 0; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const = 0;
@ -219,7 +219,7 @@ public:
// Returned by get_screen_refresh_rate if the method fails. // Returned by get_screen_refresh_rate if the method fails.
const float SCREEN_REFRESH_RATE_FALLBACK = -1.0; const float SCREEN_REFRESH_RATE_FALLBACK = -1.0;
//DisplayServer //WindowServer
virtual int get_screen_count() const { return 1; } virtual int get_screen_count() const { return 1; }
virtual int get_current_screen() const { return 0; } virtual int get_current_screen() const { return 0; }
virtual void set_current_screen(int p_screen) {} virtual void set_current_screen(int p_screen) {}
@ -282,11 +282,11 @@ public:
virtual Array get_display_cutouts() const { return Array(); } virtual Array get_display_cutouts() const { return Array(); }
//DisplayServer //WindowServer
virtual void set_borderless_window(bool p_borderless) {} virtual void set_borderless_window(bool p_borderless) {}
virtual bool get_borderless_window() { return false; } virtual bool get_borderless_window() { return false; }
//DisplayServer //WindowServer
virtual bool get_window_per_pixel_transparency_enabled() const { return false; } virtual bool get_window_per_pixel_transparency_enabled() const { return false; }
virtual void set_window_per_pixel_transparency_enabled(bool p_enabled) {} virtual void set_window_per_pixel_transparency_enabled(bool p_enabled) {}
@ -544,7 +544,7 @@ public:
return FAILED; return FAILED;
} }
//DisplayServer //WindowServer
virtual void set_no_window_mode(bool p_enable); virtual void set_no_window_mode(bool p_enable);
virtual bool is_no_window_mode_enabled() const; virtual bool is_no_window_mode_enabled() const;
@ -566,13 +566,13 @@ public:
ScreenOrientation get_screen_orientation_from_string(const String &p_orientation) const; ScreenOrientation get_screen_orientation_from_string(const String &p_orientation) const;
virtual void enable_for_stealing_focus(ProcessID pid) {} virtual void enable_for_stealing_focus(ProcessID pid) {}
//DisplayServer //WindowServer
virtual void move_window_to_foreground() {} virtual void move_window_to_foreground() {}
virtual void release_rendering_thread(); virtual void release_rendering_thread();
virtual void make_rendering_thread(); virtual void make_rendering_thread();
//DisplayServer //WindowServer
virtual void swap_buffers(); virtual void swap_buffers();
virtual void set_native_icon(const String &p_filename); virtual void set_native_icon(const String &p_filename);

6
servers/register_server_types.cpp
View File

@ -67,7 +67,7 @@
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
#include "servers/display_server.h" #include "servers/window_server.h"
static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsage> *r_usage) { static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsage> *r_usage) {
List<RS::TextureInfo> tinfo; List<RS::TextureInfo> tinfo;
@ -113,7 +113,7 @@ void register_server_types() {
ClassDB::register_virtual_class<RenderingServer>(); ClassDB::register_virtual_class<RenderingServer>();
ClassDB::register_virtual_class<DisplayServer>(); ClassDB::register_virtual_class<WindowServer>();
ClassDB::register_class<AudioServer>(); ClassDB::register_class<AudioServer>();
@ -228,7 +228,7 @@ void unregister_server_types() {
void register_server_singletons() { void register_server_singletons() {
Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("DisplayServer", DisplayServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("WindowServer", WindowServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton()));

100
servers/display_server.cpp → servers/window_server.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/ /*************************************************************************/
/* DisplayServer.cpp */ /* WindowServer.cpp */
/*************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* GODOT ENGINE */
@ -28,20 +28,20 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "display_server.h" #include "window_server.h"
DisplayServer *DisplayServer::singleton = nullptr; WindowServer *WindowServer::singleton = nullptr;
DisplayServer *(*DisplayServer::create_func)() = nullptr; WindowServer *(*WindowServer::create_func)() = nullptr;
int64_t DisplayServer::get_native_handle_bind(HandleType p_handle_type) { int64_t WindowServer::get_native_handle_bind(HandleType p_handle_type) {
return (int64_t)get_native_handle(p_handle_type); return (int64_t)get_native_handle(p_handle_type);
} }
DisplayServer *DisplayServer::get_singleton() { WindowServer *WindowServer::get_singleton() {
return singleton; return singleton;
} }
DisplayServer *DisplayServer::create() { WindowServer *WindowServer::create() {
ERR_FAIL_COND_V(singleton, nullptr); ERR_FAIL_COND_V(singleton, nullptr);
if (create_func) { if (create_func) {
@ -51,47 +51,47 @@ DisplayServer *DisplayServer::create() {
return nullptr; return nullptr;
} }
void DisplayServer::_bind_methods() { void WindowServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_screen_count"), &DisplayServer::get_screen_count); ClassDB::bind_method(D_METHOD("get_screen_count"), &WindowServer::get_screen_count);
ClassDB::bind_method(D_METHOD("get_current_screen"), &DisplayServer::get_current_screen); ClassDB::bind_method(D_METHOD("get_current_screen"), &WindowServer::get_current_screen);
ClassDB::bind_method(D_METHOD("set_current_screen", "screen"), &DisplayServer::set_current_screen); ClassDB::bind_method(D_METHOD("set_current_screen", "screen"), &WindowServer::set_current_screen);
ClassDB::bind_method(D_METHOD("get_screen_position", "screen"), &DisplayServer::get_screen_position, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("get_screen_position", "screen"), &WindowServer::get_screen_position, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_screen_size", "screen"), &DisplayServer::get_screen_size, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("get_screen_size", "screen"), &WindowServer::get_screen_size, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_screen_dpi", "screen"), &DisplayServer::get_screen_dpi, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("get_screen_dpi", "screen"), &WindowServer::get_screen_dpi, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_screen_scale", "screen"), &DisplayServer::get_screen_scale, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("get_screen_scale", "screen"), &WindowServer::get_screen_scale, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_screen_max_scale"), &DisplayServer::get_screen_max_scale); ClassDB::bind_method(D_METHOD("get_screen_max_scale"), &WindowServer::get_screen_max_scale);
ClassDB::bind_method(D_METHOD("get_screen_refresh_rate", "screen"), &DisplayServer::get_screen_refresh_rate, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("get_screen_refresh_rate", "screen"), &WindowServer::get_screen_refresh_rate, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_window_position"), &DisplayServer::get_window_position); ClassDB::bind_method(D_METHOD("get_window_position"), &WindowServer::get_window_position);
ClassDB::bind_method(D_METHOD("set_window_position", "position"), &DisplayServer::set_window_position); ClassDB::bind_method(D_METHOD("set_window_position", "position"), &WindowServer::set_window_position);
ClassDB::bind_method(D_METHOD("get_window_size"), &DisplayServer::get_window_size); ClassDB::bind_method(D_METHOD("get_window_size"), &WindowServer::get_window_size);
ClassDB::bind_method(D_METHOD("get_max_window_size"), &DisplayServer::get_max_window_size); ClassDB::bind_method(D_METHOD("get_max_window_size"), &WindowServer::get_max_window_size);
ClassDB::bind_method(D_METHOD("get_min_window_size"), &DisplayServer::get_min_window_size); ClassDB::bind_method(D_METHOD("get_min_window_size"), &WindowServer::get_min_window_size);
ClassDB::bind_method(D_METHOD("set_max_window_size", "size"), &DisplayServer::set_max_window_size); ClassDB::bind_method(D_METHOD("set_max_window_size", "size"), &WindowServer::set_max_window_size);
ClassDB::bind_method(D_METHOD("set_min_window_size", "size"), &DisplayServer::set_min_window_size); ClassDB::bind_method(D_METHOD("set_min_window_size", "size"), &WindowServer::set_min_window_size);
ClassDB::bind_method(D_METHOD("set_window_size", "size"), &DisplayServer::set_window_size); ClassDB::bind_method(D_METHOD("set_window_size", "size"), &WindowServer::set_window_size);
ClassDB::bind_method(D_METHOD("set_window_fullscreen", "enabled"), &DisplayServer::set_window_fullscreen); ClassDB::bind_method(D_METHOD("set_window_fullscreen", "enabled"), &WindowServer::set_window_fullscreen);
ClassDB::bind_method(D_METHOD("is_window_fullscreen"), &DisplayServer::is_window_fullscreen); ClassDB::bind_method(D_METHOD("is_window_fullscreen"), &WindowServer::is_window_fullscreen);
ClassDB::bind_method(D_METHOD("set_window_resizable", "enabled"), &DisplayServer::set_window_resizable); ClassDB::bind_method(D_METHOD("set_window_resizable", "enabled"), &WindowServer::set_window_resizable);
ClassDB::bind_method(D_METHOD("is_window_resizable"), &DisplayServer::is_window_resizable); ClassDB::bind_method(D_METHOD("is_window_resizable"), &WindowServer::is_window_resizable);
ClassDB::bind_method(D_METHOD("set_window_minimized", "enabled"), &DisplayServer::set_window_minimized); ClassDB::bind_method(D_METHOD("set_window_minimized", "enabled"), &WindowServer::set_window_minimized);
ClassDB::bind_method(D_METHOD("is_window_minimized"), &DisplayServer::is_window_minimized); ClassDB::bind_method(D_METHOD("is_window_minimized"), &WindowServer::is_window_minimized);
ClassDB::bind_method(D_METHOD("set_window_maximized", "enabled"), &DisplayServer::set_window_maximized); ClassDB::bind_method(D_METHOD("set_window_maximized", "enabled"), &WindowServer::set_window_maximized);
ClassDB::bind_method(D_METHOD("is_window_maximized"), &DisplayServer::is_window_maximized); ClassDB::bind_method(D_METHOD("is_window_maximized"), &WindowServer::is_window_maximized);
ClassDB::bind_method(D_METHOD("set_window_always_on_top", "enabled"), &DisplayServer::set_window_always_on_top); ClassDB::bind_method(D_METHOD("set_window_always_on_top", "enabled"), &WindowServer::set_window_always_on_top);
ClassDB::bind_method(D_METHOD("is_window_always_on_top"), &DisplayServer::is_window_always_on_top); ClassDB::bind_method(D_METHOD("is_window_always_on_top"), &WindowServer::is_window_always_on_top);
ClassDB::bind_method(D_METHOD("is_window_focused"), &DisplayServer::is_window_focused); ClassDB::bind_method(D_METHOD("is_window_focused"), &WindowServer::is_window_focused);
ClassDB::bind_method(D_METHOD("request_attention"), &DisplayServer::request_attention); ClassDB::bind_method(D_METHOD("request_attention"), &WindowServer::request_attention);
ClassDB::bind_method(D_METHOD("get_real_window_size"), &DisplayServer::get_real_window_size); ClassDB::bind_method(D_METHOD("get_real_window_size"), &WindowServer::get_real_window_size);
ClassDB::bind_method(D_METHOD("center_window"), &DisplayServer::center_window); ClassDB::bind_method(D_METHOD("center_window"), &WindowServer::center_window);
ClassDB::bind_method(D_METHOD("move_window_to_foreground"), &DisplayServer::move_window_to_foreground); ClassDB::bind_method(D_METHOD("move_window_to_foreground"), &WindowServer::move_window_to_foreground);
ClassDB::bind_method(D_METHOD("get_native_handle", "handle_type"), &DisplayServer::get_native_handle_bind); ClassDB::bind_method(D_METHOD("get_native_handle", "handle_type"), &WindowServer::get_native_handle_bind);
ClassDB::bind_method(D_METHOD("set_borderless_window", "borderless"), &DisplayServer::set_borderless_window); ClassDB::bind_method(D_METHOD("set_borderless_window", "borderless"), &WindowServer::set_borderless_window);
ClassDB::bind_method(D_METHOD("get_borderless_window"), &DisplayServer::get_borderless_window); ClassDB::bind_method(D_METHOD("get_borderless_window"), &WindowServer::get_borderless_window);
ClassDB::bind_method(D_METHOD("get_window_per_pixel_transparency_enabled"), &DisplayServer::get_window_per_pixel_transparency_enabled); ClassDB::bind_method(D_METHOD("get_window_per_pixel_transparency_enabled"), &WindowServer::get_window_per_pixel_transparency_enabled);
ClassDB::bind_method(D_METHOD("set_window_per_pixel_transparency_enabled", "enabled"), &DisplayServer::set_window_per_pixel_transparency_enabled); ClassDB::bind_method(D_METHOD("set_window_per_pixel_transparency_enabled", "enabled"), &WindowServer::set_window_per_pixel_transparency_enabled);
ADD_PROPERTY(PropertyInfo(Variant::INT, "current_screen"), "set_current_screen", "get_current_screen"); ADD_PROPERTY(PropertyInfo(Variant::INT, "current_screen"), "set_current_screen", "get_current_screen");
@ -136,10 +136,10 @@ void DisplayServer::_bind_methods() {
BIND_ENUM_CONSTANT(WINDOW_VIEW); BIND_ENUM_CONSTANT(WINDOW_VIEW);
BIND_ENUM_CONSTANT(OPENGL_CONTEXT); BIND_ENUM_CONSTANT(OPENGL_CONTEXT);
//ClassDB::bind_method(D_METHOD("force_sync"), &DisplayServer::sync); //ClassDB::bind_method(D_METHOD("force_sync"), &WindowServer::sync);
//ClassDB::bind_method(D_METHOD("is_render_loop_enabled"), &DisplayServer::is_render_loop_enabled); //ClassDB::bind_method(D_METHOD("is_render_loop_enabled"), &WindowServer::is_render_loop_enabled);
//ClassDB::bind_method(D_METHOD("set_render_loop_enabled", "enabled"), &DisplayServer::set_render_loop_enabled); //ClassDB::bind_method(D_METHOD("set_render_loop_enabled", "enabled"), &WindowServer::set_render_loop_enabled);
//ADD_PROPERTY(PropertyInfo(Variant::BOOL, "render_loop_enabled"), "set_render_loop_enabled", "is_render_loop_enabled"); //ADD_PROPERTY(PropertyInfo(Variant::BOOL, "render_loop_enabled"), "set_render_loop_enabled", "is_render_loop_enabled");
//BIND_CONSTANT(NO_INDEX_ARRAY); //BIND_CONSTANT(NO_INDEX_ARRAY);
@ -149,11 +149,11 @@ void DisplayServer::_bind_methods() {
//ADD_SIGNAL(MethodInfo("frame_pre_draw")); //ADD_SIGNAL(MethodInfo("frame_pre_draw"));
} }
DisplayServer::DisplayServer() { WindowServer::WindowServer() {
//ERR_FAIL_COND(singleton); //ERR_FAIL_COND(singleton);
singleton = this; singleton = this;
} }
DisplayServer::~DisplayServer() { WindowServer::~WindowServer() {
singleton = nullptr; singleton = nullptr;
} }

20
servers/display_server.h → servers/window_server.h
View File

@ -34,10 +34,10 @@
#include "core/containers/rid.h" #include "core/containers/rid.h"
#include "core/object/object.h" #include "core/object/object.h"
class DisplayServer : public Object { class WindowServer : public Object {
GDCLASS(DisplayServer, Object); GDCLASS(WindowServer, Object);
static DisplayServer *singleton; static WindowServer *singleton;
public: public:
const float SCREEN_REFRESH_RATE_FALLBACK = -1.0; const float SCREEN_REFRESH_RATE_FALLBACK = -1.0;
@ -100,7 +100,7 @@ public:
virtual void request_attention() {} virtual void request_attention() {}
virtual void center_window() {} virtual void center_window() {}
//DisplayServer //WindowServer
enum HandleType { enum HandleType {
DISPLAY_HANDLE, // X11::Display* ... DISPLAY_HANDLE, // X11::Display* ...
WINDOW_HANDLE, // HWND, X11::Window*, NSWindow*, UIWindow*, Android activity ... WINDOW_HANDLE, // HWND, X11::Window*, NSWindow*, UIWindow*, Android activity ...
@ -125,18 +125,18 @@ public:
virtual void swap_buffers() {} virtual void swap_buffers() {}
protected: protected:
static DisplayServer *(*create_func)(); static WindowServer *(*create_func)();
static void _bind_methods(); static void _bind_methods();
public: public:
static DisplayServer *get_singleton(); static WindowServer *get_singleton();
static DisplayServer *create(); static WindowServer *create();
DisplayServer(); WindowServer();
virtual ~DisplayServer(); virtual ~WindowServer();
}; };
VARIANT_ENUM_CAST(DisplayServer::HandleType); VARIANT_ENUM_CAST(WindowServer::HandleType);
#endif #endif