godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52603 from Faless/js/3.x_fix_input_buffered 

[3.x] [HTML5] Fix input not working when buffered.
This commit is contained in:
Fabio Alessandrelli 2021-09-14 11:48:01 +02:00 committed by GitHub
parent f85ad007c0 98b42ca958
commit a33635200a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform/javascript/os_javascript.cpp
View File

@ -267,6 +267,10 @@ EM_BOOL OS_JavaScript::keydown_callback(int p_event_type, const EmscriptenKeyboa
return false; return false;
} }
os->input->parse_input_event(ev); os->input->parse_input_event(ev);
// Make sure to flush all events so we can call restricted APIs inside the event.
os->input->flush_buffered_events();
// Resume audio context after input in case autoplay was denied. // Resume audio context after input in case autoplay was denied.
os->resume_audio(); os->resume_audio();
return true; return true;
@ -276,13 +280,22 @@ EM_BOOL OS_JavaScript::keypress_callback(int p_event_type, const EmscriptenKeybo
OS_JavaScript *os = get_singleton(); OS_JavaScript *os = get_singleton();
os->deferred_key_event->set_unicode(p_event->charCode); os->deferred_key_event->set_unicode(p_event->charCode);
os->input->parse_input_event(os->deferred_key_event); os->input->parse_input_event(os->deferred_key_event);
// Make sure to flush all events so we can call restricted APIs inside the event.
os->input->flush_buffered_events();
return true; return true;
} }
EM_BOOL OS_JavaScript::keyup_callback(int p_event_type, const EmscriptenKeyboardEvent *p_event, void *p_user_data) { EM_BOOL OS_JavaScript::keyup_callback(int p_event_type, const EmscriptenKeyboardEvent *p_event, void *p_user_data) {
OS_JavaScript *os = get_singleton();
Ref<InputEventKey> ev = setup_key_event(p_event); Ref<InputEventKey> ev = setup_key_event(p_event);
ev->set_pressed(false); ev->set_pressed(false);
get_singleton()->input->parse_input_event(ev); os->input->parse_input_event(ev);
// Make sure to flush all events so we can call restricted APIs inside the event.
os->input->flush_buffered_events();
return ev->get_scancode() != KEY_UNKNOWN && ev->get_scancode() != 0; return ev->get_scancode() != KEY_UNKNOWN && ev->get_scancode() != 0;
} }
@ -363,8 +376,13 @@ EM_BOOL OS_JavaScript::mouse_button_callback(int p_event_type, const EmscriptenM
ev->set_button_mask(mask); ev->set_button_mask(mask);
os->input->parse_input_event(ev); os->input->parse_input_event(ev);
// Make sure to flush all events so we can call restricted APIs inside the event.
os->input->flush_buffered_events();
// Resume audio context after input in case autoplay was denied. // Resume audio context after input in case autoplay was denied.
os->resume_audio(); os->resume_audio();
// Prevent multi-click text selection and wheel-click scrolling anchor. // Prevent multi-click text selection and wheel-click scrolling anchor.
// Context menu is prevented through contextmenu event. // Context menu is prevented through contextmenu event.
return true; return true;
@ -629,6 +647,10 @@ EM_BOOL OS_JavaScript::touch_press_callback(int p_event_type, const EmscriptenTo
os->input->parse_input_event(ev); os->input->parse_input_event(ev);
} }
// Make sure to flush all events so we can call restricted APIs inside the event.
os->input->flush_buffered_events();
// Resume audio context after input in case autoplay was denied. // Resume audio context after input in case autoplay was denied.
os->resume_audio(); os->resume_audio();
return true; return true;
@ -954,6 +976,8 @@ bool OS_JavaScript::main_loop_iterate() {
godot_js_os_fs_sync(&OS_JavaScript::fs_sync_callback); godot_js_os_fs_sync(&OS_JavaScript::fs_sync_callback);
} }
input->flush_buffered_events();
if (godot_js_display_gamepad_sample() == OK) if (godot_js_display_gamepad_sample() == OK)
process_joypads(); process_joypads();