Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle the SDL events strictly in turn #8912

Merged
merged 7 commits into from
Jul 14, 2024
Merged

Handle the SDL events strictly in turn #8912

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
780c181
Handle the SDL events strictly in turn
oleg-derevenetz Jul 3, 2024
424f81c
Disable generation of fake touch events from mouse events
oleg-derevenetz Jul 4, 2024
4b68488
Merge branch master into surface-duo-keyboard-fix
oleg-derevenetz Jul 6, 2024
eaf2b88
Merge branch master into surface-duo-keyboard-fix
oleg-derevenetz Jul 7, 2024
9538679
Make the error messages for SDL_SetHint() calls uniform
oleg-derevenetz Jul 7, 2024
e22c93b
Merge branch master into surface-duo-keyboard-fix
oleg-derevenetz Jul 10, 2024
e78fc81
Merge branch master into surface-duo-keyboard-fix
oleg-derevenetz Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 88 additions & 86 deletions src/engine/localevent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,99 +387,101 @@ namespace EventProcessing
updateDisplay = false;

SDL_Event event;
if ( !SDL_PollEvent( &event ) ) {
// There are no new events, just carry on
return true;
}

while ( SDL_PollEvent( &event ) ) {
switch ( event.type ) {
case SDL_WINDOWEVENT:
if ( event.window.event == SDL_WINDOWEVENT_CLOSE ) {
// A special case since we need to exit the loop.
if ( allowExit ) {
// Try to perform clear exit to catch all memory leaks, for example.
return false;
}
break;
}
if ( onWindowEvent( event.window ) ) {
updateDisplay = true;
}
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
onKeyboardEvent( eventHandler, event.key );
break;
case SDL_MOUSEMOTION:
onMouseMotionEvent( eventHandler, event.motion );
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
onMouseButtonEvent( eventHandler, event.button );
break;
case SDL_MOUSEWHEEL:
onMouseWheelEvent( eventHandler, event.wheel );
break;
case SDL_CONTROLLERDEVICEREMOVED:
onControllerRemovedEvent( event.jdevice );
break;
case SDL_CONTROLLERDEVICEADDED:
onControllerAddedEvent( event.jdevice );
break;
case SDL_JOYAXISMOTION:
case SDL_JOYBALLMOTION:
case SDL_JOYHATMOTION:
case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP:
case SDL_JOYDEVICEADDED:
case SDL_JOYDEVICEREMOVED:
case SDL_CONTROLLERDEVICEREMAPPED:
// SDL requires joystick events to be enabled in order to handle controller events.
// This is because the controller related code depends on the joystick related code.
// See SDL_gamecontroller.c within SDL source code for implementation details.
break;
case SDL_CONTROLLERAXISMOTION:
onControllerAxisEvent( eventHandler, event.caxis );
break;
case SDL_CONTROLLERBUTTONDOWN:
case SDL_CONTROLLERBUTTONUP:
onControllerButtonEvent( eventHandler, event.cbutton );
break;
case SDL_FINGERDOWN:
case SDL_FINGERUP:
case SDL_FINGERMOTION:
onTouchEvent( eventHandler, event.tfinger );
break;
case SDL_RENDER_TARGETS_RESET:
// We need to just update the screen. This event usually happens when we switch between fullscreen and windowed modes.
updateDisplay = true;
break;
case SDL_RENDER_DEVICE_RESET:
onRenderDeviceResetEvent();
updateDisplay = true;
break;
case SDL_TEXTINPUT:
// Keyboard events on Android should be processed here. Use event.text.text to extract text input.
break;
case SDL_TEXTEDITING:
// An event when a user pressed a button on a keyboard. Not all buttons are supported. This event should be used mainly on Android devices.
break;
case SDL_QUIT:
// Each new event should be processed separately in turn
switch ( event.type ) {
case SDL_WINDOWEVENT:
if ( event.window.event == SDL_WINDOWEVENT_CLOSE ) {
if ( allowExit ) {
// Try to perform clear exit to catch all memory leaks, for example.
return false;
}
break;
case SDL_APP_LOWMEMORY:
// According to SDL this event can only happen on Android or iOS.
// We need to deallocate some memory but we need to be careful not to deallocate images that are in use at the moment.
// As of now we have no logic for this so we at least log this event.
DEBUG_LOG( DBG_ENGINE, DBG_WARN, "OS indicates low memory. Release some resources." )
break;
default:
// If this assertion blows up then we included an event type but we didn't add logic for it.
assert( eventTypeStatus.count( event.type ) == 0 );

// This is a new event type which we do not handle. It might have been added in a newer version of SDL.
break;
}
if ( onWindowEvent( event.window ) ) {
updateDisplay = true;
}
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
onKeyboardEvent( eventHandler, event.key );
break;
case SDL_MOUSEMOTION:
onMouseMotionEvent( eventHandler, event.motion );
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
onMouseButtonEvent( eventHandler, event.button );
break;
case SDL_MOUSEWHEEL:
onMouseWheelEvent( eventHandler, event.wheel );
break;
case SDL_CONTROLLERDEVICEREMOVED:
onControllerRemovedEvent( event.jdevice );
break;
case SDL_CONTROLLERDEVICEADDED:
onControllerAddedEvent( event.jdevice );
break;
case SDL_JOYAXISMOTION:
case SDL_JOYBALLMOTION:
case SDL_JOYHATMOTION:
case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP:
case SDL_JOYDEVICEADDED:
case SDL_JOYDEVICEREMOVED:
case SDL_CONTROLLERDEVICEREMAPPED:
// SDL requires joystick events to be enabled in order to handle controller events.
// This is because the controller related code depends on the joystick related code.
// See SDL_gamecontroller.c within SDL source code for implementation details.
break;
case SDL_CONTROLLERAXISMOTION:
onControllerAxisEvent( eventHandler, event.caxis );
break;
case SDL_CONTROLLERBUTTONDOWN:
case SDL_CONTROLLERBUTTONUP:
onControllerButtonEvent( eventHandler, event.cbutton );
break;
case SDL_FINGERDOWN:
case SDL_FINGERUP:
case SDL_FINGERMOTION:
onTouchEvent( eventHandler, event.tfinger );
break;
case SDL_RENDER_TARGETS_RESET:
// We need to just update the screen. This event usually happens when we switch between fullscreen and windowed modes.
updateDisplay = true;
break;
case SDL_RENDER_DEVICE_RESET:
onRenderDeviceResetEvent();
updateDisplay = true;
break;
case SDL_TEXTINPUT:
oleg-derevenetz marked this conversation as resolved.
Show resolved Hide resolved
// Keyboard events on Android should be processed here. Use event.text.text to extract text input.
break;
case SDL_TEXTEDITING:
// An event when a user pressed a button on a keyboard. Not all buttons are supported. This event should be used mainly on Android devices.
break;
case SDL_QUIT:
if ( allowExit ) {
// Try to perform clear exit to catch all memory leaks, for example.
return false;
}
break;
case SDL_APP_LOWMEMORY:
// According to SDL this event can only happen on Android or iOS.
// We need to deallocate some memory but we need to be careful not to deallocate images that are in use at the moment.
// As of now we have no logic for this so we at least log this event.
DEBUG_LOG( DBG_ENGINE, DBG_WARN, "OS indicates low memory. Release some resources." )
break;
default:
// If this assertion blows up then we included an event type but we didn't add logic for it.
assert( eventTypeStatus.count( event.type ) == 0 );

// This is a new event type which we do not handle. It might have been added in a newer version of SDL.
break;
}

return true;
Expand Down
Loading