From dec7875a6e23212021e4d9080330a42832dfe02a Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 15 Jun 2021 01:40:19 +0000
Subject: [PATCH] update SDL soruce to 2.0.14
---
source/test/testjoystick.c | 369 ++++++++++++++++++++++------------------------------
1 files changed, 154 insertions(+), 215 deletions(-)
diff --git a/source/test/testjoystick.c b/source/test/testjoystick.c
index dea08bb..f838af7 100644
--- a/source/test/testjoystick.c
+++ b/source/test/testjoystick.c
@@ -32,9 +32,62 @@
#define SCREEN_HEIGHT 480
#endif
-SDL_Renderer *screen = NULL;
-SDL_bool retval = SDL_FALSE;
-SDL_bool done = SDL_FALSE;
+static SDL_Window *window = NULL;
+static SDL_Renderer *screen = NULL;
+static SDL_Joystick *joystick = NULL;
+static SDL_bool done = SDL_FALSE;
+
+static void
+PrintJoystick(SDL_Joystick *joystick)
+{
+ const char *type;
+ char guid[64];
+
+ SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick);
+ SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), guid, sizeof (guid));
+ switch (SDL_JoystickGetType(joystick)) {
+ case SDL_JOYSTICK_TYPE_GAMECONTROLLER:
+ type = "Game Controller";
+ break;
+ case SDL_JOYSTICK_TYPE_WHEEL:
+ type = "Wheel";
+ break;
+ case SDL_JOYSTICK_TYPE_ARCADE_STICK:
+ type = "Arcade Stick";
+ break;
+ case SDL_JOYSTICK_TYPE_FLIGHT_STICK:
+ type = "Flight Stick";
+ break;
+ case SDL_JOYSTICK_TYPE_DANCE_PAD:
+ type = "Dance Pad";
+ break;
+ case SDL_JOYSTICK_TYPE_GUITAR:
+ type = "Guitar";
+ break;
+ case SDL_JOYSTICK_TYPE_DRUM_KIT:
+ type = "Drum Kit";
+ break;
+ case SDL_JOYSTICK_TYPE_ARCADE_PAD:
+ type = "Arcade Pad";
+ break;
+ case SDL_JOYSTICK_TYPE_THROTTLE:
+ type = "Throttle";
+ break;
+ default:
+ type = "Unknown";
+ break;
+ }
+ SDL_Log("Joystick\n");
+ SDL_Log(" name: %s\n", SDL_JoystickName(joystick));
+ SDL_Log(" type: %s\n", type);
+ SDL_Log(" axes: %d\n", SDL_JoystickNumAxes(joystick));
+ SDL_Log(" balls: %d\n", SDL_JoystickNumBalls(joystick));
+ SDL_Log(" hats: %d\n", SDL_JoystickNumHats(joystick));
+ SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
+ SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
+ SDL_Log(" guid: %s\n", guid);
+ SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
+}
static void
DrawRect(SDL_Renderer *r, const int x, const int y, const int w, const int h)
@@ -48,72 +101,97 @@
{
SDL_Event event;
int i;
- SDL_Joystick *joystick = (SDL_Joystick *)arg;
- /* blank screen, set up for drawing this frame. */
+ /* blank screen, set up for drawing this frame. */
SDL_SetRenderDrawColor(screen, 0x0, 0x0, 0x0, SDL_ALPHA_OPAQUE);
- SDL_RenderClear(screen);
+ SDL_RenderClear(screen);
- while (SDL_PollEvent(&event)) {
- switch (event.type) {
+ while (SDL_PollEvent(&event)) {
+ switch (event.type) {
- case SDL_JOYDEVICEREMOVED:
- SDL_Log("Joystick device %d removed.\n", (int) event.jdevice.which);
- SDL_Log("Our instance ID is %d\n", (int) SDL_JoystickInstanceID(joystick));
- break;
-
- case SDL_JOYAXISMOTION:
- SDL_Log("Joystick %d axis %d value: %d\n",
- event.jaxis.which,
- event.jaxis.axis, event.jaxis.value);
- break;
- case SDL_JOYHATMOTION:
- SDL_Log("Joystick %d hat %d value:",
- event.jhat.which, event.jhat.hat);
- if (event.jhat.value == SDL_HAT_CENTERED)
- SDL_Log(" centered");
- if (event.jhat.value & SDL_HAT_UP)
- SDL_Log(" up");
- if (event.jhat.value & SDL_HAT_RIGHT)
- SDL_Log(" right");
- if (event.jhat.value & SDL_HAT_DOWN)
- SDL_Log(" down");
- if (event.jhat.value & SDL_HAT_LEFT)
- SDL_Log(" left");
- SDL_Log("\n");
- break;
- case SDL_JOYBALLMOTION:
- SDL_Log("Joystick %d ball %d delta: (%d,%d)\n",
- event.jball.which,
- event.jball.ball, event.jball.xrel, event.jball.yrel);
- break;
- case SDL_JOYBUTTONDOWN:
- SDL_Log("Joystick %d button %d down\n",
- event.jbutton.which, event.jbutton.button);
- /* First button triggers a 0.5 second full strength rumble */
- if (event.jbutton.button == 0) {
- SDL_JoystickRumble(joystick, 0xFFFF, 0xFFFF, 500);
+ case SDL_JOYDEVICEADDED:
+ SDL_Log("Joystick device %d added.\n", (int) event.jdevice.which);
+ if (!joystick) {
+ joystick = SDL_JoystickOpen(event.jdevice.which);
+ if (joystick) {
+ PrintJoystick(joystick);
+ } else {
+ SDL_Log("Couldn't open joystick: %s\n", SDL_GetError());
}
- break;
- case SDL_JOYBUTTONUP:
- SDL_Log("Joystick %d button %d up\n",
- event.jbutton.which, event.jbutton.button);
- break;
- case SDL_KEYDOWN:
- if ((event.key.keysym.sym != SDLK_ESCAPE) &&
- (event.key.keysym.sym != SDLK_AC_BACK)) {
- break;
- }
- /* Fall through to signal quit */
- case SDL_FINGERDOWN:
- case SDL_MOUSEBUTTONDOWN:
- case SDL_QUIT:
- done = SDL_TRUE;
- break;
- default:
+ }
+ break;
+
+ case SDL_JOYDEVICEREMOVED:
+ SDL_Log("Joystick device %d removed.\n", (int) event.jdevice.which);
+ if (event.jdevice.which == SDL_JoystickInstanceID(joystick)) {
+ SDL_JoystickClose(joystick);
+ joystick = SDL_JoystickOpen(0);
+ }
+ break;
+
+ case SDL_JOYAXISMOTION:
+ SDL_Log("Joystick %d axis %d value: %d\n",
+ event.jaxis.which,
+ event.jaxis.axis, event.jaxis.value);
+ break;
+ case SDL_JOYHATMOTION:
+ SDL_Log("Joystick %d hat %d value:",
+ event.jhat.which, event.jhat.hat);
+ if (event.jhat.value == SDL_HAT_CENTERED)
+ SDL_Log(" centered");
+ if (event.jhat.value & SDL_HAT_UP)
+ SDL_Log(" up");
+ if (event.jhat.value & SDL_HAT_RIGHT)
+ SDL_Log(" right");
+ if (event.jhat.value & SDL_HAT_DOWN)
+ SDL_Log(" down");
+ if (event.jhat.value & SDL_HAT_LEFT)
+ SDL_Log(" left");
+ SDL_Log("\n");
+ break;
+ case SDL_JOYBALLMOTION:
+ SDL_Log("Joystick %d ball %d delta: (%d,%d)\n",
+ event.jball.which,
+ event.jball.ball, event.jball.xrel, event.jball.yrel);
+ break;
+ case SDL_JOYBUTTONDOWN:
+ SDL_Log("Joystick %d button %d down\n",
+ event.jbutton.which, event.jbutton.button);
+ /* First button triggers a 0.5 second full strength rumble */
+ if (event.jbutton.button == 0) {
+ SDL_JoystickRumble(joystick, 0xFFFF, 0xFFFF, 500);
+ }
+ break;
+ case SDL_JOYBUTTONUP:
+ SDL_Log("Joystick %d button %d up\n",
+ event.jbutton.which, event.jbutton.button);
+ break;
+ case SDL_KEYDOWN:
+ /* Press the L key to lag for 3 seconds, to see what happens
+ when SDL doesn't service the event loop quickly. */
+ if (event.key.keysym.sym == SDLK_l) {
+ SDL_Log("Lagging for 3 seconds...\n");
+ SDL_Delay(3000);
break;
}
+
+ if ((event.key.keysym.sym != SDLK_ESCAPE) &&
+ (event.key.keysym.sym != SDLK_AC_BACK)) {
+ break;
+ }
+ /* Fall through to signal quit */
+ case SDL_FINGERDOWN:
+ case SDL_MOUSEBUTTONDOWN:
+ case SDL_QUIT:
+ done = SDL_TRUE;
+ break;
+ default:
+ break;
}
+ }
+
+ if (joystick) {
+
/* Update visual joystick state */
SDL_SetRenderDrawColor(screen, 0x00, 0xFF, 0x00, SDL_ALPHA_OPAQUE);
for (i = 0; i < SDL_JoystickNumButtons(joystick); ++i) {
@@ -172,13 +250,9 @@
DrawRect(screen, x, y, 8, 8);
}
+ }
- SDL_RenderPresent(screen);
-
- if (SDL_JoystickGetAttached( joystick ) == 0) {
- done = SDL_TRUE;
- retval = SDL_TRUE; /* keep going, wait for reattach. */
- }
+ SDL_RenderPresent(screen);
#ifdef __EMSCRIPTEN__
if (done) {
@@ -187,14 +261,19 @@
#endif
}
-static SDL_bool
-WatchJoystick(SDL_Joystick * joystick)
+int
+main(int argc, char *argv[])
{
- SDL_Window *window = NULL;
- const char *name = NULL;
+ SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
- retval = SDL_FALSE;
- done = SDL_FALSE;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ /* Initialize SDL (Note: video is required to start event loop) */
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ exit(1);
+ }
/* Create a window to display joystick axis position */
window = SDL_CreateWindow("Joystick Test", SDL_WINDOWPOS_CENTERED,
@@ -215,159 +294,19 @@
SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE);
SDL_RenderClear(screen);
SDL_RenderPresent(screen);
- SDL_RaiseWindow(window);
-
- /* Print info about the joystick we are watching */
- name = SDL_JoystickName(joystick);
- SDL_Log("Watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick),
- name ? name : "Unknown Joystick");
- SDL_Log("Joystick has %d axes, %d hats, %d balls, and %d buttons\n",
- SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick),
- SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick));
/* Loop, getting joystick events! */
#ifdef __EMSCRIPTEN__
- emscripten_set_main_loop_arg(loop, joystick, 0, 1);
+ emscripten_set_main_loop_arg(loop, NULL, 0, 1);
#else
while (!done) {
- loop(joystick);
+ loop(NULL);
}
#endif
SDL_DestroyRenderer(screen);
- screen = NULL;
SDL_DestroyWindow(window);
- return retval;
-}
-int
-main(int argc, char *argv[])
-{
- const char *name, *type;
- int i;
- SDL_Joystick *joystick;
-
- SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
-
- /* Enable standard application logging */
- SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
-
- /* Initialize SDL (Note: video is required to start event loop) */
- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
- exit(1);
- }
-
- /* Print information about the joysticks */
- SDL_Log("There are %d joysticks attached\n", SDL_NumJoysticks());
- for (i = 0; i < SDL_NumJoysticks(); ++i) {
- name = SDL_JoystickNameForIndex(i);
- SDL_Log("Joystick %d: %s\n", i, name ? name : "Unknown Joystick");
- joystick = SDL_JoystickOpen(i);
- if (joystick == NULL) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_JoystickOpen(%d) failed: %s\n", i,
- SDL_GetError());
- } else {
- char guid[64];
- SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick);
- SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick),
- guid, sizeof (guid));
- switch (SDL_JoystickGetType(joystick)) {
- case SDL_JOYSTICK_TYPE_GAMECONTROLLER:
- type = "Game Controller";
- break;
- case SDL_JOYSTICK_TYPE_WHEEL:
- type = "Wheel";
- break;
- case SDL_JOYSTICK_TYPE_ARCADE_STICK:
- type = "Arcade Stick";
- break;
- case SDL_JOYSTICK_TYPE_FLIGHT_STICK:
- type = "Flight Stick";
- break;
- case SDL_JOYSTICK_TYPE_DANCE_PAD:
- type = "Dance Pad";
- break;
- case SDL_JOYSTICK_TYPE_GUITAR:
- type = "Guitar";
- break;
- case SDL_JOYSTICK_TYPE_DRUM_KIT:
- type = "Drum Kit";
- break;
- case SDL_JOYSTICK_TYPE_ARCADE_PAD:
- type = "Arcade Pad";
- break;
- case SDL_JOYSTICK_TYPE_THROTTLE:
- type = "Throttle";
- break;
- default:
- type = "Unknown";
- break;
- }
- SDL_Log(" type: %s\n", type);
- SDL_Log(" axes: %d\n", SDL_JoystickNumAxes(joystick));
- SDL_Log(" balls: %d\n", SDL_JoystickNumBalls(joystick));
- SDL_Log(" hats: %d\n", SDL_JoystickNumHats(joystick));
- SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
- SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
- SDL_Log(" guid: %s\n", guid);
- SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
- SDL_JoystickClose(joystick);
- }
- }
-
-#if defined(__ANDROID__) || defined(__IPHONEOS__)
- if (SDL_NumJoysticks() > 0) {
-#else
- if (argv[1]) {
-#endif
- SDL_bool reportederror = SDL_FALSE;
- SDL_bool keepGoing = SDL_TRUE;
- SDL_Event event;
- int device;
-#if defined(__ANDROID__) || defined(__IPHONEOS__)
- device = 0;
-#else
- device = atoi(argv[1]);
-#endif
- joystick = SDL_JoystickOpen(device);
- if (joystick != NULL) {
- SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick);
- }
-
- while ( keepGoing ) {
- if (joystick == NULL) {
- if ( !reportederror ) {
- SDL_Log("Couldn't open joystick %d: %s\n", device, SDL_GetError());
- keepGoing = SDL_FALSE;
- reportederror = SDL_TRUE;
- }
- } else {
- reportederror = SDL_FALSE;
- keepGoing = WatchJoystick(joystick);
- SDL_JoystickClose(joystick);
- }
-
- joystick = NULL;
- if (keepGoing) {
- SDL_Log("Waiting for attach\n");
- }
- while (keepGoing) {
- SDL_WaitEvent(&event);
- if ((event.type == SDL_QUIT) || (event.type == SDL_FINGERDOWN)
- || (event.type == SDL_MOUSEBUTTONDOWN)) {
- keepGoing = SDL_FALSE;
- } else if (event.type == SDL_JOYDEVICEADDED) {
- device = event.jdevice.which;
- joystick = SDL_JoystickOpen(device);
- if (joystick != NULL) {
- SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick);
- }
- break;
- }
- }
- }
- }
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK);
return 0;
--
Gitblit v1.9.3