diff options
| author | Bastien Bouclet | 2017-09-09 16:43:55 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-11-19 16:12:50 +0100 |
| commit | 8beb519c5ea2964ce409aabbe03b54afe37e0ac1 (patch) | |
| tree | 7d33e93682ddba69ffdbf3625f9a6eab2c1df98f /backends | |
| parent | 7689fd7308020aac0bb788cafc524bd7f01077f4 (diff) | |
| download | scummvm-rg350-8beb519c5ea2964ce409aabbe03b54afe37e0ac1.tar.gz scummvm-rg350-8beb519c5ea2964ce409aabbe03b54afe37e0ac1.tar.bz2 scummvm-rg350-8beb519c5ea2964ce409aabbe03b54afe37e0ac1.zip | |
EVENTS: Rename synthetic to kbdRepeat
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/events/default/default-events.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/android/events.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/tizen/form.cpp | 1 | ||||
| -rw-r--r-- | backends/vkeybd/virtual-keyboard.cpp | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 667914b023..ad7cfced86 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -97,7 +97,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { } if (result) { - event.synthetic = false; + event.kbdRepeat = false; switch (event.type) { case Common::EVENT_KEYDOWN: _modifierState = event.kbd.flags; @@ -233,7 +233,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { if (_currentKeyDown.keycode != 0 && _keyRepeatTime < time) { // fire event event.type = Common::EVENT_KEYDOWN; - event.synthetic = true; + event.kbdRepeat = true; event.kbd.ascii = _currentKeyDown.ascii; event.kbd.keycode = (Common::KeyCode)_currentKeyDown.keycode; event.kbd.flags = _currentKeyDown.flags; diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index b146945a01..d13d381f95 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -443,7 +443,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, } if (arg5 > 0) - e.synthetic = true; + e.kbdRepeat = true; // map special keys to 'our' ascii codes switch (e.kbd.keycode) { diff --git a/backends/platform/tizen/form.cpp b/backends/platform/tizen/form.cpp index 2a9a3967cc..22e15f61c4 100644 --- a/backends/platform/tizen/form.cpp +++ b/backends/platform/tizen/form.cpp @@ -243,7 +243,6 @@ void TizenAppForm::pushEvent(Common::EventType type, const Point ¤tPositio void TizenAppForm::pushKey(Common::KeyCode keycode) { if (_eventQueueLock) { Common::Event e; - e.synthetic = false; e.kbd.keycode = keycode; e.kbd.ascii = keycode; e.kbd.flags = 0; diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp index ce19e9d462..80d7313a8c 100644 --- a/backends/vkeybd/virtual-keyboard.cpp +++ b/backends/vkeybd/virtual-keyboard.cpp @@ -242,7 +242,6 @@ void VirtualKeyboard::show() { // push keydown & keyup events into the event manager Event evt; - evt.synthetic = false; while (!_keyQueue.empty()) { evt.kbd = _keyQueue.pop(); evt.type = EVENT_KEYDOWN; |