hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minimize include dependencies of display_server.h

Browse source 
- Removes `native_menu.h` dependency from `display_server.h`.
  It's now forward-declared in all DisplayServer implementations and should
  be included in the .cpp's.
- Removes some unused `rb_set.h` and `rb_map.h` dependencies, which leads to
  having to include them explicitly in half the scene and editor codebase...
  which shows how much we depend on `display_server.h`.
- Forward-declare `input_event.h`, so now we need only `keyboard.h`.
This commit is contained in:
Rémi Verschelde 2026-02-17 13:37:19 +01:00
parent 8a4df69e22
commit ad4b910a10
No known key found for this signature in database
GPG key ID: C3336907360768E1
59 changed files with 334 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

55
tests/display_server_mock.cpp Normal file
View file

@ -0,0 +1,55 @@
/**************************************************************************/
/* display_server_mock.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "display_server_mock.h"
#include "core/input/input.h"
#include "core/input/input_event.h"
#include "servers/rendering/dummy/rasterizer_dummy.h"
DisplayServer *DisplayServerMock::create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
r_error = OK;
RasterizerDummy::make_current();
return memnew(DisplayServerMock());
}
void DisplayServerMock::simulate_event(Ref<InputEvent> p_event) {
Ref<InputEvent> event = p_event;
Ref<InputEventMouse> me = p_event;
if (me.is_valid()) {
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) {
mm->set_relative(mm->get_position() - mouse_position);
event = mm;
}
_set_mouse_position(me->get_position());
}
Input::get_singleton()->parse_input_event(event);
}

22
tests/display_server_mock.h
View file

@ -32,8 +32,6 @@
#include "servers/display/display_server_headless.h"
#include "servers/rendering/dummy/rasterizer_dummy.h"
// Specialized DisplayServer for unittests based on DisplayServerHeadless, that
// additionally supports things like mouse enter/exit events and clipboard.
class DisplayServerMock : public DisplayServerHeadless {
@ -56,11 +54,7 @@ private:
return drivers;
}
static DisplayServer *create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
r_error = OK;
RasterizerDummy::make_current();
return memnew(DisplayServerMock());
}
static DisplayServer *create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
void _set_mouse_position(const Point2i &p_position) {
if (mouse_position == p_position) {
@ -105,19 +99,7 @@ public:
// The events will be delivered to Godot's Input-system.
// Mouse-events (Button & Motion) will additionally update the DisplayServer's mouse position.
// For Mouse motion events, the `relative`-property is set based on the distance to the previous mouse position.
void simulate_event(Ref<InputEvent> p_event) {
Ref<InputEvent> event = p_event;
Ref<InputEventMouse> me = p_event;
if (me.is_valid()) {
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) {
mm->set_relative(mm->get_position() - mouse_position);
event = mm;
}
_set_mouse_position(me->get_position());
}
Input::get_singleton()->parse_input_event(event);
}
void simulate_event(Ref<InputEvent> p_event);
// Returns the current cursor shape.
CursorShape get_cursor_shape() {

1
tests/test_main.cpp
View file

@ -31,6 +31,7 @@
#include "test_main.h"
#include "core/error/error_macros.h"
#include "core/input/input.h"
#include "core/io/dir_access.h"
#include "modules/modules_enabled.gen.h"