godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-27 15:57:02 +00:00
Code Releases Wiki Activity

[macOS] Process joypad input directly in the embedded process.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-08-14 11:51:59 +03:00
parent cb850f7719
commit b9bafbd2ca
8 changed files with 12 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
platform/macos/editor/embedded_process_macos.mm
View File

@@ -97,19 +97,6 @@ void EmbeddedProcessMacOS::embed_process(OS::ProcessID p_pid) {
_try_embed_process();
}
void EmbeddedProcessMacOS::_joy_connection_changed(int p_index, bool p_connected) const {
if (!script_debugger) {
return;
}
if (p_connected) {
String name = Input::get_singleton()->get_joy_name(p_index);
script_debugger->send_message("embed:joy_add", { p_index, name });
} else {
script_debugger->send_message("embed:joy_del", { p_index });
}
}
void EmbeddedProcessMacOS::reset() {
if (!ds) {
ds = static_cast<DisplayServerMacOS *>(DisplayServer::get_singleton());
@@ -218,9 +205,6 @@ EmbeddedProcessMacOS::EmbeddedProcessMacOS() :
layer_host->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
layer_host->set_custom_minimum_size(Size2(100, 100));
Input *input = Input::get_singleton();
input->connect(SNAME("joy_connection_changed"), callable_mp(this, &EmbeddedProcessMacOS::_joy_connection_changed));
// This shortcut allows a user to forcibly release a captured mouse from within the editor, regardless of whether
// the embedded process has implemented support to release the cursor.
ED_SHORTCUT("game_view/release_mouse", TTRC("Release Mouse"), KeyModifierMask::ALT | Key::ESCAPE);
@@ -339,6 +323,13 @@ void LayerHost::gui_input(const Ref<InputEvent> &p_event) {
}
}
Ref<InputEventJoypadMotion> jm = p_event;
Ref<InputEventJoypadButton> jb = p_event;
if (jm.is_valid() || jb.is_valid()) {
accept_event();
return;
}
PackedByteArray data;
if (encode_input_event(p_event, data)) {
script_debugger->send_message("embed:event", { data });