RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-07 07:38:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly handle multiple joysticks

Browse source
This commit is contained in:
Victor Luchits 2013-07-24 23:03:22 +04:00 • committed by notaz
parent d1f5849cf4
commit 18306c325f
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
in_sdl.c
View file

@ -256,10 +256,11 @@ static int handle_joy_event(struct in_sdl_state *state, SDL_Event *event,
{ {
int kc = -1, down = 0, ret = 0; int kc = -1, down = 0, ret = 0;
/* FIXME: should ckeck .which */
/* TODO: remaining axis */ /* TODO: remaining axis */
switch (event->type) { switch (event->type) {
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
if (event->jaxis.which != state->joy_id)
return -2;
if (event->jaxis.axis > 1) if (event->jaxis.axis > 1)
break; break;
if (-16384 <= event->jaxis.value && event->jaxis.value <= 16384) { if (-16384 <= event->jaxis.value && event->jaxis.value <= 16384) {
@ -289,6 +290,8 @@ static int handle_joy_event(struct in_sdl_state *state, SDL_Event *event,
case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP: case SDL_JOYBUTTONUP:
if (event->jbutton.which != state->joy_id)
return -2;
kc = (int)event->jbutton.button + SDLK_WORLD_0; kc = (int)event->jbutton.button + SDLK_WORLD_0;
down = event->jbutton.state == SDL_PRESSED; down = event->jbutton.state == SDL_PRESSED;
ret = 1; ret = 1;
@ -316,30 +319,48 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
Uint32 mask = state->joy ? JOY_EVENTS : (SDL_ALLEVENTS & ~JOY_EVENTS); Uint32 mask = state->joy ? JOY_EVENTS : (SDL_ALLEVENTS & ~JOY_EVENTS);
int count, maxcount; int count, maxcount;
int i, ret, retval = 0; int i, ret, retval = 0;
int num_events, num_peeped_events;
SDL_Event *event;
maxcount = (one_kc != NULL) ? 1 : sizeof(events) / sizeof(events[0]); maxcount = (one_kc != NULL) ? 1 : sizeof(events) / sizeof(events[0]);
SDL_PumpEvents(); SDL_PumpEvents();
while (1) {
num_events = SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, mask);
for (num_peeped_events = 0; num_peeped_events < num_events; num_peeped_events += count) {
count = SDL_PeepEvents(events, maxcount, SDL_GETEVENT, mask); count = SDL_PeepEvents(events, maxcount, SDL_GETEVENT, mask);
if (count <= 0) if (count <= 0)
break; break;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
event = &events[i];
if (state->joy) if (state->joy)
ret = handle_joy_event(state, ret = handle_joy_event(state,
&events[i], one_kc, one_down); event, one_kc, one_down);
else else
ret = handle_event(state, ret = handle_event(state,
&events[i], one_kc, one_down); event, one_kc, one_down);
if (ret == -1) { if (ret < 0) {
if (ext_event_handler != NULL) switch (ret) {
ext_event_handler(&events[i]); case -2:
SDL_PushEvent(event);
break;
default:
if (ext_event_handler != NULL)
ext_event_handler(event);
break;
}
continue; continue;
} }
retval |= ret; retval |= ret;
if (one_kc != NULL && ret) if (one_kc != NULL && ret)
{
// don't lose events other devices might want to handle
for (i++; i < count; i++)
SDL_PushEvent(&events[i]);
goto out; goto out;
}
} }
} }