Merged r3292:3293 from branches/SDL-1.2: testjoystick verbose info.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402539

test/testjoystick.c

@@ -157,7 +157,17 @@ main(int argc, char *argv[])
     printf("There are %d joysticks attached\n", SDL_NumJoysticks());
     for (i = 0; i < SDL_NumJoysticks(); ++i) {
         name = SDL_JoystickName(i);
-        printf("Joystick %d: %s\n", i, name ? name : "Unknown Joystick");
+        printf("Joystick %d: %s\n",i,name ? name : "Unknown Joystick");
+        joystick = SDL_JoystickOpen(i);
+        if (joystick == NULL) {
+            fprintf(stderr, "SDL_JoystickOpen(%d) failed: %s\n", i, SDL_GetError());
+        } else {
+            printf("       axes: %d\n", SDL_JoystickNumAxes(joystick));
+            printf("      balls: %d\n", SDL_JoystickNumBalls(joystick));
+            printf("       hats: %d\n", SDL_JoystickNumHats(joystick));
+            printf("    buttons: %d\n", SDL_JoystickNumButtons(joystick));
+            SDL_JoystickClose(joystick);
+        }
     }
 
     if (argv[1]) {