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

Cleaned out tabstops, other minor style nitpicks.

Browse source
This commit is contained in:
Ryan C. Gordon 2012-12-11 11:28:29 -05:00
parent 0b1237e790
commit f8eaaf3a51
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
test/testjoystick.c
View file

@ -66,7 +66,7 @@ WatchJoystick(SDL_Joystick * joystick)
SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE); SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE);
SDL_RenderClear(screen); SDL_RenderClear(screen);
SDL_RenderPresent(screen); SDL_RenderPresent(screen);
SDL_RaiseWindow(window); SDL_RaiseWindow(window);
/* Print info about the joystick we are watching */ /* Print info about the joystick we are watching */
name = SDL_JoystickName(joystick); name = SDL_JoystickName(joystick);
@ -229,30 +229,31 @@ main(int argc, char *argv[])
} }
if (argv[1]) { if (argv[1]) {
int nreportederror = 0; SDL_bool reportederror = SDL_FALSE;
SDL_bool keepGoing = SDL_TRUE; SDL_bool keepGoing = SDL_TRUE;
SDL_Event event; SDL_Event event;
joystick = SDL_JoystickOpen(atoi(argv[1])); joystick = SDL_JoystickOpen(atoi(argv[1]));
while ( keepGoing ) { while ( keepGoing ) {
if (joystick == NULL) { if (joystick == NULL) {
if ( nreportederror == 0 ) { if ( !reportederror ) {
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());
nreportederror = 1; reportederror = SDL_TRUE;
} }
} else { } else {
nreportederror = 0; reportederror = SDL_FALSE;
keepGoing = WatchJoystick(joystick); keepGoing = WatchJoystick(joystick);
SDL_JoystickClose(joystick); SDL_JoystickClose(joystick);
}
if (keepGoing) {
joystick = NULL;
SDL_WaitEvent( &event );
if ( event.type == SDL_JOYDEVICEADDED )
joystick = SDL_JoystickOpen(atoi(argv[1]));
} }
}
} if (keepGoing) {
joystick = NULL;
SDL_WaitEvent( &event );
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;