thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Change keyboard repeat to apply on unmapped events

Browse source 
The keyboard repeat event generator is used when building against SDL1.
Previously the repeat events would generate based on the event stream
produced by the keymapper which is not guaranteed to have matching up
and down events in the case the keymaps are changed while a key is
pressed.

Fixes #11417.
This commit is contained in:
Bastien Bouclet 2020-04-12 10:47:47 +02:00
parent 23fc7f52e0
commit 85e3fb38fb
6 changed files with 96 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backends/platform/sdl/sdl.cpp
View file

@ -85,6 +85,7 @@ OSystem_SDL::OSystem_SDL()
_logger(0),
_mixerManager(0),
_eventSource(0),
_eventSourceWrapper(nullptr),
_window(0) {
}
@ -106,6 +107,8 @@ OSystem_SDL::~OSystem_SDL() {
_window = 0;
delete _eventManager;
_eventManager = 0;
delete _eventSourceWrapper;
_eventSourceWrapper = nullptr;
delete _eventSource;
_eventSource = 0;
delete _audiocdManager;
@ -198,16 +201,17 @@ void OSystem_SDL::initBackend() {
// Create the default event source, in case a custom backend
// manager didn't provide one yet.
if (_eventSource == 0)
if (!_eventSource)
_eventSource = new SdlEventSource();
if (_eventManager == nullptr) {
DefaultEventManager *eventManager = new DefaultEventManager(_eventSource);
#if !SDL_VERSION_ATLEAST(2, 0, 0)
// SDL 1 does not generate its own keyboard repeat events.
eventManager->setGenerateKeyRepeatEvents(true);
// SDL 1 does not generate its own keyboard repeat events.
assert(!_eventSourceWrapper);
_eventSourceWrapper = makeKeyboardRepeatingEventSource(_eventSource);
#endif
_eventManager = eventManager;
if (!_eventManager) {
_eventManager = new DefaultEventManager(_eventSourceWrapper ? _eventSourceWrapper : _eventSource);
}