Skip to content

Commit 0bd4944

Browse files
NintorchNintorch
committed
Optimize files that #include input.h header
1 parent 77579f9 commit 0bd4944

File tree

62 files changed

+178
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+178
-108
lines changed

‎core/debugger/remote_debugger.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,12 +424,12 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
424424
}
425425
send_message("debug_enter", msg);
426426

427-
Input::MouseMode mouse_mode = Input::MOUSE_MODE_VISIBLE;
427+
Input::MouseMode mouse_mode = Input::MouseMode::MOUSE_MODE_VISIBLE;
428428

429429
if (Thread::get_caller_id() == Thread::get_main_id()) {
430430
mouse_mode = Input::get_singleton()->get_mouse_mode();
431-
if (mouse_mode != Input::MOUSE_MODE_VISIBLE) {
432-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
431+
if (mouse_mode != Input::MouseMode::MOUSE_MODE_VISIBLE) {
432+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
433433
}
434434
} else {
435435
MutexLock mutex_lock(mutex);
@@ -630,7 +630,7 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
630630
send_message("debug_exit", Array());
631631

632632
if (Thread::get_caller_id() == Thread::get_main_id()) {
633-
if (mouse_mode != Input::MOUSE_MODE_VISIBLE) {
633+
if (mouse_mode != Input::MouseMode::MOUSE_MODE_VISIBLE) {
634634
Input::get_singleton()->set_mouse_mode(mouse_mode);
635635
}
636636
} else {

‎core/input/input.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ bool Input::is_mouse_mode_override_enabled() {
118118
}
119119

120120
void Input::_bind_methods() {
121+
using namespace InputClassEnums;
122+
121123
ClassDB::bind_method(D_METHOD("is_anything_pressed"), &Input::is_anything_pressed);
122124
ClassDB::bind_method(D_METHOD("is_key_pressed", "keycode"), &Input::is_key_pressed);
123125
ClassDB::bind_method(D_METHOD("is_physical_key_pressed", "keycode"), &Input::is_physical_key_pressed);

‎core/input/input.h‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,40 @@
4040

4141
class GamepadMotion;
4242

43+
namespace InputClassEnums {
44+
// Keep synced with "DisplayServer::MouseMode" enum.
45+
enum MouseMode : int {
46+
MOUSE_MODE_VISIBLE,
47+
MOUSE_MODE_HIDDEN,
48+
MOUSE_MODE_CAPTURED,
49+
MOUSE_MODE_CONFINED,
50+
MOUSE_MODE_CONFINED_HIDDEN,
51+
MOUSE_MODE_MAX,
52+
};
53+
54+
#undef CursorShape
55+
enum CursorShape : int {
56+
CURSOR_ARROW,
57+
CURSOR_IBEAM,
58+
CURSOR_POINTING_HAND,
59+
CURSOR_CROSS,
60+
CURSOR_WAIT,
61+
CURSOR_BUSY,
62+
CURSOR_DRAG,
63+
CURSOR_CAN_DROP,
64+
CURSOR_FORBIDDEN,
65+
CURSOR_VSIZE,
66+
CURSOR_HSIZE,
67+
CURSOR_BDIAGSIZE,
68+
CURSOR_FDIAGSIZE,
69+
CURSOR_MOVE,
70+
CURSOR_VSPLIT,
71+
CURSOR_HSPLIT,
72+
CURSOR_HELP,
73+
CURSOR_MAX
74+
};
75+
} //namespace InputClassEnums
76+
4377
class Input : public Object {
4478
GDCLASS(Input, Object);
4579
_THREAD_SAFE_CLASS_
@@ -49,37 +83,9 @@ class Input : public Object {
4983
static constexpr uint64_t MAX_EVENT = 32;
5084

5185
public:
52-
// Keep synced with "DisplayServer::MouseMode" enum.
53-
enum MouseMode {
54-
MOUSE_MODE_VISIBLE,
55-
MOUSE_MODE_HIDDEN,
56-
MOUSE_MODE_CAPTURED,
57-
MOUSE_MODE_CONFINED,
58-
MOUSE_MODE_CONFINED_HIDDEN,
59-
MOUSE_MODE_MAX,
60-
};
61-
62-
#undef CursorShape
63-
enum CursorShape {
64-
CURSOR_ARROW,
65-
CURSOR_IBEAM,
66-
CURSOR_POINTING_HAND,
67-
CURSOR_CROSS,
68-
CURSOR_WAIT,
69-
CURSOR_BUSY,
70-
CURSOR_DRAG,
71-
CURSOR_CAN_DROP,
72-
CURSOR_FORBIDDEN,
73-
CURSOR_VSIZE,
74-
CURSOR_HSIZE,
75-
CURSOR_BDIAGSIZE,
76-
CURSOR_FDIAGSIZE,
77-
CURSOR_MOVE,
78-
CURSOR_VSPLIT,
79-
CURSOR_HSPLIT,
80-
CURSOR_HELP,
81-
CURSOR_MAX
82-
};
86+
// TODO: When we migrate to C++20, replace these with "using enum" and skip prefixing MouseMode and CursorShape in other files.
87+
using MouseMode = InputClassEnums::MouseMode;
88+
using CursorShape = InputClassEnums::CursorShape;
8389

8490
class JoypadFeatures {
8591
public:
@@ -217,7 +223,7 @@ class Input : public Object {
217223

218224
int fallback_mapping = -1; // Index of the guid in map_db.
219225

220-
CursorShape default_shape = CURSOR_ARROW;
226+
CursorShape default_shape = CursorShape::CURSOR_ARROW;
221227

222228
enum JoyType {
223229
TYPE_BUTTON,
@@ -426,7 +432,7 @@ class Input : public Object {
426432
CursorShape get_default_cursor_shape() const;
427433
void set_default_cursor_shape(CursorShape p_shape);
428434
CursorShape get_current_cursor_shape() const;
429-
void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
435+
void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CursorShape::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
430436

431437
void parse_mapping(const String &p_mapping);
432438
void joy_button(int p_device, JoyButton p_button, bool p_pressed);

‎editor/docks/filesystem_dock.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "filesystem_dock.h"
3232

3333
#include "core/config/project_settings.h"
34+
#include "core/input/input.h"
3435
#include "core/io/dir_access.h"
3536
#include "core/io/file_access.h"
3637
#include "core/io/resource_loader.h"

‎editor/gui/editor_spin_slider.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
115115
grabbing_spinner_dist_cache += diff_x * grabbing_spinner_speed;
116116

117117
if (!grabbing_spinner && Math::abs(grabbing_spinner_dist_cache) > 4 * grabbing_spinner_speed * EDSCALE) {
118-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
118+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
119119
grabbing_spinner = true;
120120
}
121121

@@ -166,7 +166,7 @@ void EditorSpinSlider::_grab_start() {
166166
void EditorSpinSlider::_grab_end() {
167167
if (grabbing_spinner_attempt) {
168168
if (grabbing_spinner) {
169-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
169+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
170170
Input::get_singleton()->warp_mouse(grabbing_spinner_mouse_pos);
171171
mouse_over_grabber = true;
172172
queue_redraw();
@@ -493,7 +493,7 @@ void EditorSpinSlider::_notification(int p_what) {
493493
case NOTIFICATION_EXIT_TREE: {
494494
if (grabbing_spinner) {
495495
grabber->hide();
496-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
496+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
497497
Input::get_singleton()->warp_mouse(grabbing_spinner_mouse_pos);
498498
grabbing_spinner = false;
499499
grabbing_spinner_attempt = false;

‎editor/gui/editor_zoom_widget.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "editor_zoom_widget.h"
3232

33+
#include "core/input/input.h"
3334
#include "core/os/keyboard.h"
3435
#include "core/string/translation_server.h"
3536
#include "editor/settings/editor_settings.h"

‎editor/inspector/editor_inspector.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "editor_inspector.h"
3232
#include "editor_inspector.compat.inc"
3333

34+
#include "core/input/input.h"
3435
#include "core/os/keyboard.h"
3536
#include "editor/debugger/editor_debugger_inspector.h"
3637
#include "editor/doc/doc_tools.h"

‎editor/inspector/editor_properties_array_dict.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ void EditorPropertyArray::_reorder_button_down(int p_slot_index) {
933933
reorder_to_index = reorder_slot.index;
934934
// Ideally it'd to be able to show the mouse but I had issues with
935935
// Control's `mouse_exit()`/`mouse_entered()` signals not getting called.
936-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
936+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
937937
}
938938

939939
void EditorPropertyArray::_reorder_button_up() {
@@ -954,7 +954,7 @@ void EditorPropertyArray::_reorder_button_up() {
954954
emit_changed(get_edited_property(), array);
955955
}
956956

957-
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
957+
Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
958958

959959
ERR_FAIL_NULL(reorder_slot.reorder_button);
960960
reorder_slot.reorder_button->warp_mouse(reorder_slot.reorder_button->get_size() / 2.0f);

‎editor/inspector/editor_resource_picker.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "editor_resource_picker.h"
3232

33+
#include "core/input/input.h"
3334
#include "editor/audio/audio_stream_preview.h"
3435
#include "editor/doc/editor_help.h"
3536
#include "editor/docks/filesystem_dock.h"

‎editor/project_manager/project_list.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "project_list.h"
3232

3333
#include "core/config/project_settings.h"
34+
#include "core/input/input.h"
3435
#include "core/io/dir_access.h"
3536
#include "core/os/time.h"
3637
#include "core/version.h"

0 commit comments

Comments
 (0)