pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow testjoystick to quit, instead of looping on hotplug events forever.

Browse source
This commit is contained in:
Ryan C. Gordon 2012-12-11 11:26:08 -05:00
parent d935bb9d4d
commit 0b1237e790
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
test/testjoystick.c
View file

@ -36,13 +36,14 @@ DrawRect(SDL_Renderer *r, const int x, const int y, const int w, const int h)
SDL_RenderFillRect(r, &area); SDL_RenderFillRect(r, &area);
} }
void static SDL_bool
WatchJoystick(SDL_Joystick * joystick) WatchJoystick(SDL_Joystick * joystick)
{ {
SDL_Window *window = NULL; SDL_Window *window = NULL;
SDL_Renderer *screen = NULL; SDL_Renderer *screen = NULL;
const char *name = NULL; const char *name = NULL;
int done = 0; SDL_bool retval = SDL_FALSE;
SDL_bool done = SDL_FALSE;
SDL_Event event; SDL_Event event;
int i; int i;
@ -52,14 +53,14 @@ WatchJoystick(SDL_Joystick * joystick)
SCREEN_HEIGHT, SDL_WINDOW_SHOWN); SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
if (window == NULL) { if (window == NULL) {
fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError()); fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError());
return; return SDL_FALSE;
} }
screen = SDL_CreateRenderer(window, -1, 0); screen = SDL_CreateRenderer(window, -1, 0);
if (screen == NULL) { if (screen == NULL) {
fprintf(stderr, "Couldn't create renderer: %s\n", SDL_GetError()); fprintf(stderr, "Couldn't create renderer: %s\n", SDL_GetError());
SDL_DestroyWindow(window); SDL_DestroyWindow(window);
return; return SDL_FALSE;
} }
SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE); SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE);
@ -122,7 +123,7 @@ WatchJoystick(SDL_Joystick * joystick)
} }
/* Fall through to signal quit */ /* Fall through to signal quit */
case SDL_QUIT: case SDL_QUIT:
done = 1; done = SDL_TRUE;
break; break;
default: default:
break; break;
@ -184,11 +185,15 @@ WatchJoystick(SDL_Joystick * joystick)
SDL_RenderPresent(screen); SDL_RenderPresent(screen);
done = SDL_JoystickGetAttached( joystick ) == 0; if (SDL_JoystickGetAttached( joystick ) == 0) {
done = SDL_TRUE;
retval = SDL_TRUE; /* keep going, wait for reattach. */
}
} }
SDL_DestroyRenderer(screen); SDL_DestroyRenderer(screen);
SDL_DestroyWindow(window); SDL_DestroyWindow(window);
return retval;
} }
int int
@ -225,9 +230,10 @@ main(int argc, char *argv[])
if (argv[1]) { if (argv[1]) {
int nreportederror = 0; int nreportederror = 0;
SDL_bool keepGoing = SDL_TRUE;
SDL_Event event; SDL_Event event;
joystick = SDL_JoystickOpen(atoi(argv[1])); joystick = SDL_JoystickOpen(atoi(argv[1]));
while ( 1 ) { while ( keepGoing ) {
if (joystick == NULL) { if (joystick == NULL) {
if ( nreportederror == 0 ) { if ( nreportederror == 0 ) {
printf("Couldn't open joystick %d: %s\n", atoi(argv[1]), SDL_GetError()); printf("Couldn't open joystick %d: %s\n", atoi(argv[1]), SDL_GetError());
@ -235,17 +241,19 @@ main(int argc, char *argv[])
} }
} else { } else {
nreportederror = 0; nreportederror = 0;
WatchJoystick(joystick); keepGoing = WatchJoystick(joystick);
SDL_JoystickClose(joystick); SDL_JoystickClose(joystick);
} }
joystick = NULL; if (keepGoing) {
SDL_WaitEvent( &event ); joystick = NULL;
if ( event.type == SDL_JOYDEVICEADDED ) SDL_WaitEvent( &event );
joystick = SDL_JoystickOpen(atoi(argv[1])); if ( event.type == SDL_JOYDEVICEADDED )
joystick = SDL_JoystickOpen(atoi(argv[1]));
}
} }
} }
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK);
return (0); return 0;
} }