encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup SDL_EventState

This commit is contained in:
pionere 2022-01-19 12:51:26 +01:00 committed by Ryan C. Gordon
parent 32c7d5d352
commit e2f70a2dff
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/events/SDL_events.c
View File

@ -1236,8 +1236,7 @@ SDL_FilterEvents(SDL_EventFilter filter, void *userdata)
Uint8 Uint8
SDL_EventState(Uint32 type, int state) SDL_EventState(Uint32 type, int state)
{ {
const SDL_bool isdnd = ((state == SDL_DISABLE) || (state == SDL_ENABLE)) && const SDL_bool isde = (state == SDL_DISABLE) || (state == SDL_ENABLE);
((type == SDL_DROPFILE) || (type == SDL_DROPTEXT));
Uint8 current_state; Uint8 current_state;
Uint8 hi = ((type >> 8) & 0xff); Uint8 hi = ((type >> 8) & 0xff);
Uint8 lo = (type & 0xff); Uint8 lo = (type & 0xff);
@ -1249,44 +1248,32 @@ SDL_EventState(Uint32 type, int state)
current_state = SDL_ENABLE; current_state = SDL_ENABLE;
} }
if (state != current_state) if (isde && state != current_state) {
{ if (state == SDL_DISABLE) {
switch (state) {
case SDL_DISABLE:
/* Disable this event type and discard pending events */ /* Disable this event type and discard pending events */
if (!SDL_disabled_events[hi]) { if (!SDL_disabled_events[hi]) {
SDL_disabled_events[hi] = (SDL_DisabledEventBlock*) SDL_calloc(1, sizeof(SDL_DisabledEventBlock)); SDL_disabled_events[hi] = (SDL_DisabledEventBlock*) SDL_calloc(1, sizeof(SDL_DisabledEventBlock));
if (!SDL_disabled_events[hi]) { }
/* Out of memory, nothing we can do... */ /* Out of memory, nothing we can do... */
break; if (SDL_disabled_events[hi]) {
}
}
SDL_disabled_events[hi]->bits[lo/32] |= (1 << (lo&31)); SDL_disabled_events[hi]->bits[lo/32] |= (1 << (lo&31));
SDL_FlushEvent(type); SDL_FlushEvent(type);
break; }
case SDL_ENABLE: } else { // state == SDL_ENABLE
SDL_disabled_events[hi]->bits[lo/32] &= ~(1 << (lo&31)); SDL_disabled_events[hi]->bits[lo/32] &= ~(1 << (lo&31));
break;
default:
/* Querying state... */
break;
} }
#if !SDL_JOYSTICK_DISABLED #if !SDL_JOYSTICK_DISABLED
if (state == SDL_DISABLE || state == SDL_ENABLE) {
SDL_CalculateShouldUpdateJoysticks(); SDL_CalculateShouldUpdateJoysticks();
}
#endif #endif
#if !SDL_SENSOR_DISABLED #if !SDL_SENSOR_DISABLED
if (state == SDL_DISABLE || state == SDL_ENABLE) {
SDL_CalculateShouldUpdateSensors(); SDL_CalculateShouldUpdateSensors();
}
#endif #endif
} }
/* turn off drag'n'drop support if we've disabled the events. /* turn off drag'n'drop support if we've disabled the events.
This might change some UI details at the OS level. */ This might change some UI details at the OS level. */
if (isdnd) { if (isde && ((type == SDL_DROPFILE) || (type == SDL_DROPTEXT))) {
SDL_ToggleDragAndDropSupport(); SDL_ToggleDragAndDropSupport();
} }