Skip to content

Decouple DisplayServer from as much of the codebase as possible #116976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akien-mga wants to merge 4 commits into
base: master
Choose a base branch
from
+4,987 −4,706
Open

Decouple DisplayServer from as much of the codebase as possible #116976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a447ac9
Move DisplayServer enums and typedefs to DisplayServerEnums
akien-mga Feb 26, 2026
769e80a
Add DisplayServerEnums commit to the git blame ignore list
akien-mga Mar 3, 2026
8c0f175
Decouple RenderingServer from as much of the codebase as possible
akien-mga Feb 26, 2026
76f4588
Refactor DisplayServer declaration with API sections
akien-mga Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,6 @@ f5a290ac462765afca34e64dd39f883511510147

# Style: Add `class_db.h` includes explicitly
e380a417526c11f15a9ddb3997292409b10da2af

# Move DisplayServer enums and typedefs to DisplayServerEnums
a447ac95ec170ee117c2eae55f1bfff0d0cf0dce
4 changes: 2 additions & 2 deletions core/config/project_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,10 +1756,10 @@ ProjectSettings::ProjectSettings() {

_add_builtin_input_map();

// Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum.
// Keep the enum values in sync with the `DisplayServerEnums::ScreenOrientation` enum.
custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::INT, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait,Reverse Landscape,Reverse Portrait,Sensor Landscape,Sensor Portrait,Sensor");
GLOBAL_DEF("display/window/subwindows/embed_subwindows", true);
// Keep the enum values in sync with the `DisplayServer::VSyncMode` enum.
// Keep the enum values in sync with the `DisplayServerEnums::VSyncMode` enum.
custom_prop_info["display/window/vsync/vsync_mode"] = PropertyInfo(Variant::INT, "display/window/vsync/vsync_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Adaptive,Mailbox");

GLOBAL_DEF("display/window/frame_pacing/android/enable_frame_pacing", true);
Expand Down
3 changes: 2 additions & 1 deletion core/input/input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
class GamepadMotion;

namespace InputClassEnums {
// Keep synced with "DisplayServer::MouseMode" enum.
// Keep synced with DisplayServerEnums::MouseMode enum.
enum MouseMode : int {
MOUSE_MODE_VISIBLE,
MOUSE_MODE_HIDDEN,
Expand All @@ -51,6 +51,7 @@ enum MouseMode : int {
MOUSE_MODE_MAX,
};

// Keep synced with DisplayServerEnums and Control enums.
#undef CursorShape
enum CursorShape : int {
CURSOR_ARROW,
Expand Down
30 changes: 16 additions & 14 deletions drivers/accesskit/accessibility_server_accesskit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
#include "accessibility_server_accesskit.h"

#ifdef ACCESSKIT_DYNAMIC
#include "core/config/engine.h"
#include "core/io/file_access.h"
#include "core/os/os.h"
#endif

#include "servers/text/text_server.h"
Expand All @@ -52,7 +54,7 @@ _FORCE_INLINE_ accesskit_action AccessibilityServerAccessKit::_accessibility_act
return ACCESSKIT_ACTION_CLICK;
}

bool AccessibilityServerAccessKit::window_create(DisplayServer::WindowID p_window_id, void *p_handle) {
bool AccessibilityServerAccessKit::window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) {
ERR_FAIL_COND_V(windows.has(p_window_id), false);

WindowData &wd = windows[p_window_id];
Expand Down Expand Up @@ -84,7 +86,7 @@ bool AccessibilityServerAccessKit::window_create(DisplayServer::WindowID p_windo
}
}

void AccessibilityServerAccessKit::window_destroy(DisplayServer::WindowID p_window_id) {
void AccessibilityServerAccessKit::window_destroy(DisplayServerEnums::WindowID p_window_id) {
WindowData *wd = windows.getptr(p_window_id);
ERR_FAIL_NULL(wd);

Expand All @@ -105,7 +107,7 @@ void AccessibilityServerAccessKit::window_destroy(DisplayServer::WindowID p_wind
}

void AccessibilityServerAccessKit::_accessibility_deactivation_callback(void *p_user_data) {
DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(window_id);
ERR_FAIL_NULL(wd);

Expand All @@ -126,7 +128,7 @@ void AccessibilityServerAccessKit::_accessibility_deactivation_callback(void *p_
}

void AccessibilityServerAccessKit::_accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data) {
DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
ERR_FAIL_COND(!static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.has(window_id));

RID rid = RID::from_uint64(p_request->target);
Expand Down Expand Up @@ -218,7 +220,7 @@ void AccessibilityServerAccessKit::_accessibility_action_callback(struct accessk
}

accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_initial_tree_update_callback(void *p_user_data) {
DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(window_id);
ERR_FAIL_NULL_V(wd, nullptr);

Expand All @@ -243,15 +245,15 @@ accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_initial_tree
return tree_update;
}

void AccessibilityServerAccessKit::set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
void AccessibilityServerAccessKit::set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
ERR_FAIL_NULL(wd);

wd->activate = p_activate_callable;
wd->deactivate = p_deativate_callable;
}

void AccessibilityServerAccessKit::window_activation_completed(DisplayServer::WindowID p_window_id) {
void AccessibilityServerAccessKit::window_activation_completed(DisplayServerEnums::WindowID p_window_id) {
WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
if (!wd) {
return;
Expand All @@ -262,7 +264,7 @@ void AccessibilityServerAccessKit::window_activation_completed(DisplayServer::Wi
wd->initial_update_completed = true;
}

void AccessibilityServerAccessKit::window_deactivation_completed(DisplayServer::WindowID p_window_id) {
void AccessibilityServerAccessKit::window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) {
WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
if (!wd) {
return;
Expand All @@ -286,7 +288,7 @@ void AccessibilityServerAccessKit::window_deactivation_completed(DisplayServer::
wd->initial_update_completed = false;
}

RID AccessibilityServerAccessKit::create_element(DisplayServer::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) {
RID AccessibilityServerAccessKit::create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) {
AccessibilityElement *ae = memnew(AccessibilityElement);
ae->role = _accessibility_role(p_role);
ae->window_id = p_window_id;
Expand Down Expand Up @@ -609,15 +611,15 @@ void AccessibilityServerAccessKit::update_set_focus(const RID &p_id) {
}
}

RID AccessibilityServerAccessKit::get_window_root(DisplayServer::WindowID p_window_id) const {
RID AccessibilityServerAccessKit::get_window_root(DisplayServerEnums::WindowID p_window_id) const {
const WindowData *wd = windows.getptr(p_window_id);
ERR_FAIL_NULL_V(wd, RID());

return wd->root_id;
}

accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_build_tree_update(void *p_user_data) {
DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;

ERR_FAIL_COND_V(!static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.has(window_id), nullptr);
WindowData &wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows[window_id];
Expand Down Expand Up @@ -654,7 +656,7 @@ accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_build_tree_u
void AccessibilityServerAccessKit::update_if_active(const Callable &p_callable) {
ERR_FAIL_COND(!p_callable.is_valid());
update_cb = p_callable;
for (KeyValue<DisplayServer::WindowID, WindowData> &window : windows) {
for (KeyValue<DisplayServerEnums::WindowID, WindowData> &window : windows) {
#ifdef WINDOWS_ENABLED
accesskit_windows_queued_events *events = accesskit_windows_subclassing_adapter_update_if_active(window.value.adapter, _accessibility_build_tree_update, (void *)(size_t)window.key);
if (events) {
Expand Down Expand Up @@ -691,7 +693,7 @@ _FORCE_INLINE_ void AccessibilityServerAccessKit::_ensure_node(const RID &p_id,
}
}

void AccessibilityServerAccessKit::set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
void AccessibilityServerAccessKit::set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
#ifdef LINUXBSD_ENABLED
const WindowData *wd = windows.getptr(p_window_id);
ERR_FAIL_NULL(wd);
Expand All @@ -702,7 +704,7 @@ void AccessibilityServerAccessKit::set_window_rect(DisplayServer::WindowID p_win
#endif
}

void AccessibilityServerAccessKit::set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) {
void AccessibilityServerAccessKit::set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) {
const WindowData *wd = windows.getptr(p_window_id);
ERR_FAIL_NULL(wd);

Expand Down
22 changes: 11 additions & 11 deletions drivers/accesskit/accessibility_server_accesskit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class AccessibilityServerAccessKit : public AccessibilityServer {
struct AccessibilityElement {
HashMap<accesskit_action, Callable> actions;

DisplayServer::WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
RID parent;
LocalVector<RID> children;
Vector3i run;
Expand Down Expand Up @@ -94,7 +94,7 @@ class AccessibilityServerAccessKit : public AccessibilityServer {

RID focus;

HashMap<DisplayServer::WindowID, WindowData> windows;
HashMap<DisplayServerEnums::WindowID, WindowData> windows;

HashMap<AccessibilityServerEnums::AccessibilityRole, accesskit_role> role_map;
HashMap<AccessibilityServerEnums::AccessibilityAction, accesskit_action> action_map;
Expand All @@ -116,10 +116,10 @@ class AccessibilityServerAccessKit : public AccessibilityServer {
public:
bool is_supported() const override { return true; }

bool window_create(DisplayServer::WindowID p_window_id, void *p_handle) override;
void window_destroy(DisplayServer::WindowID p_window_id) override;
bool window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) override;
void window_destroy(DisplayServerEnums::WindowID p_window_id) override;

RID create_element(DisplayServer::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) override;
RID create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) override;
RID create_sub_element(const RID &p_parent_rid, AccessibilityServerEnums::AccessibilityRole p_role, int p_insert_pos = -1) override;
virtual RID create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) override;
bool has_element(const RID &p_id) const override;
Expand All @@ -131,13 +131,13 @@ class AccessibilityServerAccessKit : public AccessibilityServer {
void update_if_active(const Callable &p_callable) override;

void update_set_focus(const RID &p_id) override;
RID get_window_root(DisplayServer::WindowID p_window_id) const override;
RID get_window_root(DisplayServerEnums::WindowID p_window_id) const override;

void set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override;
void set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) override;
void set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) override;
void window_activation_completed(DisplayServer::WindowID p_window_id) override;
void window_deactivation_completed(DisplayServer::WindowID p_window_id) override;
void set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override;
void set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) override;
void set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) override;
void window_activation_completed(DisplayServerEnums::WindowID p_window_id) override;
void window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) override;

void update_set_role(const RID &p_id, AccessibilityServerEnums::AccessibilityRole p_role) override;
void update_set_name(const RID &p_id, const String &p_name) override;
Expand Down
Loading