test: added SDLTest_CommonDefaultArgs()
This is for test apps that don't need custom command line arguments; it lets
us reduce the boilerplate code a tiny bit.
diff --git a/include/SDL_test_common.h b/include/SDL_test_common.h
index c6f4cfb..feb70ac 100644
--- a/include/SDL_test_common.h
+++ b/include/SDL_test_common.h
@@ -159,6 +159,17 @@
SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state);
/**
+ * \brief Easy argument handling when test app doesn't need any custom args.
+ *
+ * \param state The common state describing the test window to create.
+ * \param argc argc, as supplied to SDL_main
+ * \param argv argv, as supplied to SDL_main
+ *
+ * \returns False if app should quit, true otherwise.
+ */
+SDL_bool SDLTest_CommonDefaultArgs(SDLTest_CommonState * state, const int argc, char **argv);
+
+/**
* \brief Common event handler for test windows.
*
* \param state The common state used to create test window.
diff --git a/src/test/SDL_test_common.c b/src/test/SDL_test_common.c
index 4c275b7..f7e94ab 100644
--- a/src/test/SDL_test_common.c
+++ b/src/test/SDL_test_common.c
@@ -489,6 +489,21 @@
}
}
+SDL_bool
+SDLTest_CommonDefaultArgs(SDLTest_CommonState *state, const int argc, char **argv)
+{
+ int i = 1;
+ while (i < argc) {
+ const int consumed = SDLTest_CommonArg(state, i);
+ if (consumed == 0) {
+ SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
+ return SDL_FALSE;
+ }
+ i += consumed;
+ }
+ return SDL_TRUE;
+}
+
static void
SDLTest_PrintRendererFlag(char *text, size_t maxlen, Uint32 flag)
{
diff --git a/test/testgesture.c b/test/testgesture.c
index 90e7212..a41604a 100644
--- a/test/testgesture.c
+++ b/test/testgesture.c
@@ -268,9 +268,6 @@
int main(int argc, char* argv[])
{
- int i;
-
- /* !!! FIXME: there should be an SDLTest_CommonDefaultArgs() so apps don't need this. */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
return 1;
@@ -281,16 +278,8 @@
state->window_h = HEIGHT;
state->skip_renderer = SDL_TRUE;
- for (i = 1; i < argc;) {
- const int consumed = SDLTest_CommonArg(state, i);
- if (consumed == 0) {
- SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
- return 1;
- }
- i += consumed;
- }
-
- if (!SDLTest_CommonInit(state)) {
+ if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
+ SDLTest_CommonQuit(state);
return 1;
}
diff --git a/test/testrendercopyex.c b/test/testrendercopyex.c
index 8dd67ce..fc01b65 100644
--- a/test/testrendercopyex.c
+++ b/test/testrendercopyex.c
@@ -174,18 +174,10 @@
if (!state) {
return 1;
}
- for (i = 1; i < argc;) {
- int consumed;
- consumed = SDLTest_CommonArg(state, i);
- if (consumed == 0) {
- SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
- return 1;
- }
- i += consumed;
- }
- if (!SDLTest_CommonInit(state)) {
- quit(2);
+ if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
+ SDLTest_CommonQuit(state);
+ return 1;
}
drawstates = SDL_stack_alloc(DrawState, state->num_windows);
diff --git a/test/testscale.c b/test/testscale.c
index a243641..3639277 100644
--- a/test/testscale.c
+++ b/test/testscale.c
@@ -164,18 +164,10 @@
if (!state) {
return 1;
}
- for (i = 1; i < argc;) {
- int consumed;
- consumed = SDLTest_CommonArg(state, i);
- if (consumed == 0) {
- SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
- return 1;
- }
- i += consumed;
- }
- if (!SDLTest_CommonInit(state)) {
- quit(2);
+ if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
+ SDLTest_CommonQuit(state);
+ return 1;
}
drawstates = SDL_stack_alloc(DrawState, state->num_windows);
diff --git a/test/testvulkan.c b/test/testvulkan.c
index 6514e68..a0c1113 100644
--- a/test/testvulkan.c
+++ b/test/testvulkan.c
@@ -1119,7 +1119,7 @@
int main(int argc, char *argv[])
{
int fsaa, accel;
- int i, done;
+ int done;
SDL_DisplayMode mode;
SDL_Event event;
Uint32 then, now, frames;
@@ -1138,27 +1138,15 @@
{
return 1;
}
- for(i = 1; i < argc;)
- {
- int consumed;
-
- consumed = SDLTest_CommonArg(state, i);
- if(consumed < 0)
- {
- SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
- quit(1);
- }
- i += consumed;
- }
/* Set Vulkan parameters */
state->window_flags |= SDL_WINDOW_VULKAN;
state->num_windows = 1;
state->skip_renderer = 1;
- if(!SDLTest_CommonInit(state))
- {
- quit(2);
+ if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
+ SDLTest_CommonQuit(state);
+ return 1;
}
SDL_GetCurrentDisplayMode(0, &mode);
diff --git a/test/testwm2.c b/test/testwm2.c
index 2064aa6..9ec867b 100644
--- a/test/testwm2.c
+++ b/test/testwm2.c
@@ -129,21 +129,10 @@
if (!state) {
return 1;
}
- for (i = 1; i < argc;) {
- int consumed;
- consumed = SDLTest_CommonArg(state, i);
- if (consumed == 0) {
- consumed = -1;
- }
- if (consumed < 0) {
- SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
- quit(1);
- }
- i += consumed;
- }
- if (!SDLTest_CommonInit(state)) {
- quit(2);
+ if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
+ SDLTest_CommonQuit(state);
+ return 1;
}
SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
