mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15861 from poke1024/macos-keybuffer

Browse Source 
On macOS, prevent key_event_buffer overflows
This commit is contained in:
Rémi Verschelde 2018-01-19 09:12:18 +01:00 committed by GitHub
commit fe2932a969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/osx/os_osx.h
View File

@ -52,10 +52,6 @@
class OS_OSX : public OS_Unix {
public:
enum {
KEY_EVENT_BUFFER_SIZE = 512
};
struct KeyEvent {
unsigned int osx_state;
bool pressed;
@ -64,7 +60,7 @@ public:
uint32_t unicode;
};
KeyEvent key_event_buffer[KEY_EVENT_BUFFER_SIZE];
Vector<KeyEvent> key_event_buffer;
int key_event_pos;
bool force_quit;

17
platform/osx/os_osx.mm
View File

@ -88,6 +88,15 @@ static void get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithM
state->set_metakey((p_osx_state & NSEventModifierFlagCommand));
}
static void push_to_key_event_buffer(const OS_OSX::KeyEvent &p_event) {
Vector<OS_OSX::KeyEvent> &buffer = OS_OSX::singleton->key_event_buffer;
if (OS_OSX::singleton->key_event_pos >= buffer.size()) {
buffer.resize(1 + OS_OSX::singleton->key_event_pos);
}
buffer[OS_OSX::singleton->key_event_pos++] = p_event;
}
static int mouse_x = 0;
static int mouse_y = 0;
static int prev_mouse_x = 0;
@ -446,7 +455,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
ke.scancode = 0;
ke.unicode = codepoint;
OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke;
push_to_key_event_buffer(ke);
}
[self cancelComposition];
}
@ -805,7 +814,7 @@ static int translateKey(unsigned int key) {
ke.scancode = latin_keyboard_keycode_convert(translateKey([event keyCode]));
ke.unicode = 0;
OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke;
push_to_key_event_buffer(ke);
}
if ((OS_OSX::singleton->im_position.x != 0) && (OS_OSX::singleton->im_position.y != 0))
@ -858,7 +867,7 @@ static int translateKey(unsigned int key) {
ke.scancode = latin_keyboard_keycode_convert(translateKey(key));
ke.unicode = 0;
OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke;
push_to_key_event_buffer(ke);
}
}
@ -874,7 +883,7 @@ static int translateKey(unsigned int key) {
ke.scancode = latin_keyboard_keycode_convert(translateKey([event keyCode]));
ke.unicode = 0;
OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke;
push_to_key_event_buffer(ke);
}
}