mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-05-17 02:08:27 +00:00
Update for SDL3 coding style (#6717)
I updated .clang-format and ran clang-format 14 over the src and test directories to standardize the code base. In general I let clang-format have it's way, and added markup to prevent formatting of code that would break or be completely unreadable if formatted. The script I ran for the src directory is added as build-scripts/clang-format-src.sh This fixes: #6592 #6593 #6594
This commit is contained in:
Sam Lantinga
GitHub
parent
14b902faca
commit
5750bcb174
781 changed files with 51659 additions and 55763 deletions
|
|
@ -42,7 +42,7 @@ static const char *audio_usage[] = {
|
|||
"[--channels N]", "[--samples N]"
|
||||
};
|
||||
|
||||
static void SDL_snprintfcat(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... )
|
||||
static void SDL_snprintfcat(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
|
||||
{
|
||||
size_t length = SDL_strlen(text);
|
||||
va_list ap;
|
||||
|
|
@ -112,18 +112,16 @@ SDLTest_CommonCreateState(char **argv, Uint32 flags)
|
|||
return state;
|
||||
}
|
||||
|
||||
#define SEARCHARG(dim) \
|
||||
while (*dim && *dim != ',') { \
|
||||
++dim; \
|
||||
} \
|
||||
if (!*dim) { \
|
||||
return -1; \
|
||||
} \
|
||||
#define SEARCHARG(dim) \
|
||||
while (*dim && *dim != ',') { \
|
||||
++dim; \
|
||||
} \
|
||||
if (!*dim) { \
|
||||
return -1; \
|
||||
} \
|
||||
*dim++ = '\0';
|
||||
|
||||
|
||||
int
|
||||
SDLTest_CommonArg(SDLTest_CommonState * state, int index)
|
||||
int SDLTest_CommonArg(SDLTest_CommonState *state, int index)
|
||||
{
|
||||
char **argv = state->argv;
|
||||
|
||||
|
|
@ -259,7 +257,7 @@ SDLTest_CommonArg(SDLTest_CommonState * state, int index)
|
|||
}
|
||||
if (SDL_strcasecmp(argv[index], "--windows") == 0) {
|
||||
++index;
|
||||
if (!argv[index] || !SDL_isdigit((unsigned char) *argv[index])) {
|
||||
if (!argv[index] || !SDL_isdigit((unsigned char)*argv[index])) {
|
||||
return -1;
|
||||
}
|
||||
if (!(state->window_flags & SDL_WINDOW_FULLSCREEN)) {
|
||||
|
|
@ -535,7 +533,7 @@ SDLTest_CommonArg(SDLTest_CommonState * state, int index)
|
|||
if (!argv[index]) {
|
||||
return -1;
|
||||
}
|
||||
state->audiospec.channels = (Uint8) SDL_atoi(argv[index]);
|
||||
state->audiospec.channels = (Uint8)SDL_atoi(argv[index]);
|
||||
return 2;
|
||||
}
|
||||
if (SDL_strcasecmp(argv[index], "--samples") == 0) {
|
||||
|
|
@ -543,27 +541,25 @@ SDLTest_CommonArg(SDLTest_CommonState * state, int index)
|
|||
if (!argv[index]) {
|
||||
return -1;
|
||||
}
|
||||
state->audiospec.samples = (Uint16) SDL_atoi(argv[index]);
|
||||
state->audiospec.samples = (Uint16)SDL_atoi(argv[index]);
|
||||
return 2;
|
||||
}
|
||||
if (SDL_strcasecmp(argv[index], "--trackmem") == 0) {
|
||||
/* Already handled in SDLTest_CommonCreateState() */
|
||||
return 1;
|
||||
}
|
||||
if ((SDL_strcasecmp(argv[index], "-h") == 0)
|
||||
|| (SDL_strcasecmp(argv[index], "--help") == 0)) {
|
||||
if ((SDL_strcasecmp(argv[index], "-h") == 0) || (SDL_strcasecmp(argv[index], "--help") == 0)) {
|
||||
/* Print the usage message */
|
||||
return -1;
|
||||
}
|
||||
if (SDL_strcmp(argv[index], "-NSDocumentRevisionsDebugMode") == 0) {
|
||||
/* Debug flag sent by Xcode */
|
||||
/* Debug flag sent by Xcode */
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const char **options)
|
||||
void SDLTest_CommonLogUsage(SDLTest_CommonState *state, const char *argv0, const char **options)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -589,8 +585,7 @@ SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const cha
|
|||
}
|
||||
}
|
||||
|
||||
static const char *
|
||||
BuildCommonUsageString(char **pstr, const char **strlist, const int numitems, const char **strlist2, const int numitems2)
|
||||
static const char *BuildCommonUsageString(char **pstr, const char **strlist, const int numitems, const char **strlist2, const int numitems2)
|
||||
{
|
||||
char *str = *pstr;
|
||||
if (str == NULL) {
|
||||
|
|
@ -604,19 +599,19 @@ BuildCommonUsageString(char **pstr, const char **strlist, const int numitems, co
|
|||
len += SDL_strlen(strlist2[i]) + 1;
|
||||
}
|
||||
}
|
||||
str = (char *) SDL_calloc(1, len);
|
||||
str = (char *)SDL_calloc(1, len);
|
||||
if (str == NULL) {
|
||||
return ""; /* oh well. */
|
||||
return ""; /* oh well. */
|
||||
}
|
||||
SDL_strlcat(str, "[--trackmem] ", len);
|
||||
for (i = 0; i < numitems-1; i++) {
|
||||
for (i = 0; i < numitems - 1; i++) {
|
||||
SDL_strlcat(str, strlist[i], len);
|
||||
SDL_strlcat(str, " ", len);
|
||||
}
|
||||
SDL_strlcat(str, strlist[i], len);
|
||||
if (strlist2) {
|
||||
SDL_strlcat(str, " ", len);
|
||||
for (i = 0; i < numitems2-1; i++) {
|
||||
for (i = 0; i < numitems2 - 1; i++) {
|
||||
SDL_strlcat(str, strlist2[i], len);
|
||||
SDL_strlcat(str, " ", len);
|
||||
}
|
||||
|
|
@ -632,22 +627,21 @@ static char *common_usage_audio = NULL;
|
|||
static char *common_usage_videoaudio = NULL;
|
||||
|
||||
const char *
|
||||
SDLTest_CommonUsage(SDLTest_CommonState * state)
|
||||
SDLTest_CommonUsage(SDLTest_CommonState *state)
|
||||
{
|
||||
|
||||
switch (state->flags & (SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
|
||||
case SDL_INIT_VIDEO:
|
||||
return BuildCommonUsageString(&common_usage_video, video_usage, SDL_arraysize(video_usage), NULL, 0);
|
||||
case SDL_INIT_AUDIO:
|
||||
return BuildCommonUsageString(&common_usage_audio, audio_usage, SDL_arraysize(audio_usage), NULL, 0);
|
||||
case (SDL_INIT_VIDEO | SDL_INIT_AUDIO):
|
||||
return BuildCommonUsageString(&common_usage_videoaudio, video_usage, SDL_arraysize(video_usage), audio_usage, SDL_arraysize(audio_usage));
|
||||
default:
|
||||
return "[--trackmem]";
|
||||
case SDL_INIT_VIDEO:
|
||||
return BuildCommonUsageString(&common_usage_video, video_usage, SDL_arraysize(video_usage), NULL, 0);
|
||||
case SDL_INIT_AUDIO:
|
||||
return BuildCommonUsageString(&common_usage_audio, audio_usage, SDL_arraysize(audio_usage), NULL, 0);
|
||||
case (SDL_INIT_VIDEO | SDL_INIT_AUDIO):
|
||||
return BuildCommonUsageString(&common_usage_videoaudio, video_usage, SDL_arraysize(video_usage), audio_usage, SDL_arraysize(audio_usage));
|
||||
default:
|
||||
return "[--trackmem]";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SDL_bool
|
||||
SDLTest_CommonDefaultArgs(SDLTest_CommonState *state, const int argc, char **argv)
|
||||
{
|
||||
|
|
@ -663,8 +657,7 @@ SDLTest_CommonDefaultArgs(SDLTest_CommonState *state, const int argc, char **arg
|
|||
return SDL_TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintDisplayOrientation(char* text, size_t maxlen, SDL_DisplayOrientation orientation)
|
||||
static void SDLTest_PrintDisplayOrientation(char *text, size_t maxlen, SDL_DisplayOrientation orientation)
|
||||
{
|
||||
switch (orientation) {
|
||||
case SDL_ORIENTATION_UNKNOWN:
|
||||
|
|
@ -688,8 +681,7 @@ SDLTest_PrintDisplayOrientation(char* text, size_t maxlen, SDL_DisplayOrientatio
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintWindowFlag(char* text, size_t maxlen, Uint32 flag)
|
||||
static void SDLTest_PrintWindowFlag(char *text, size_t maxlen, Uint32 flag)
|
||||
{
|
||||
switch (flag) {
|
||||
case SDL_WINDOW_FULLSCREEN:
|
||||
|
|
@ -767,8 +759,7 @@ SDLTest_PrintWindowFlag(char* text, size_t maxlen, Uint32 flag)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintWindowFlags(char* text, size_t maxlen, Uint32 flags)
|
||||
static void SDLTest_PrintWindowFlags(char *text, size_t maxlen, Uint32 flags)
|
||||
{
|
||||
const Uint32 window_flags[] = {
|
||||
SDL_WINDOW_FULLSCREEN,
|
||||
|
|
@ -810,8 +801,7 @@ SDLTest_PrintWindowFlags(char* text, size_t maxlen, Uint32 flags)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintButtonMask(char* text, size_t maxlen, Uint32 flags)
|
||||
static void SDLTest_PrintButtonMask(char *text, size_t maxlen, Uint32 flags)
|
||||
{
|
||||
int i;
|
||||
int count = 0;
|
||||
|
|
@ -827,8 +817,7 @@ SDLTest_PrintButtonMask(char* text, size_t maxlen, Uint32 flags)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintRendererFlag(char *text, size_t maxlen, Uint32 flag)
|
||||
static void SDLTest_PrintRendererFlag(char *text, size_t maxlen, Uint32 flag)
|
||||
{
|
||||
switch (flag) {
|
||||
case SDL_RENDERER_SOFTWARE:
|
||||
|
|
@ -849,8 +838,7 @@ SDLTest_PrintRendererFlag(char *text, size_t maxlen, Uint32 flag)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintPixelFormat(char *text, size_t maxlen, Uint32 format)
|
||||
static void SDLTest_PrintPixelFormat(char *text, size_t maxlen, Uint32 format)
|
||||
{
|
||||
switch (format) {
|
||||
case SDL_PIXELFORMAT_UNKNOWN:
|
||||
|
|
@ -958,8 +946,7 @@ SDLTest_PrintPixelFormat(char *text, size_t maxlen, Uint32 format)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintRenderer(SDL_RendererInfo * info)
|
||||
static void SDLTest_PrintRenderer(SDL_RendererInfo *info)
|
||||
{
|
||||
int i, count;
|
||||
char text[1024];
|
||||
|
|
@ -983,7 +970,7 @@ SDLTest_PrintRenderer(SDL_RendererInfo * info)
|
|||
SDL_Log("%s\n", text);
|
||||
|
||||
SDL_snprintf(text, sizeof(text), " Texture formats (%" SDL_PRIu32 "): ", info->num_texture_formats);
|
||||
for (i = 0; i < (int) info->num_texture_formats; ++i) {
|
||||
for (i = 0; i < (int)info->num_texture_formats; ++i) {
|
||||
if (i > 0) {
|
||||
SDL_snprintfcat(text, sizeof(text), ", ");
|
||||
}
|
||||
|
|
@ -997,8 +984,7 @@ SDLTest_PrintRenderer(SDL_RendererInfo * info)
|
|||
}
|
||||
}
|
||||
|
||||
static SDL_Surface *
|
||||
SDLTest_LoadIcon(const char *file)
|
||||
static SDL_Surface *SDLTest_LoadIcon(const char *file)
|
||||
{
|
||||
SDL_Surface *icon;
|
||||
|
||||
|
|
@ -1011,14 +997,13 @@ SDLTest_LoadIcon(const char *file)
|
|||
|
||||
if (icon->format->palette) {
|
||||
/* Set the colorkey */
|
||||
SDL_SetColorKey(icon, 1, *((Uint8 *) icon->pixels));
|
||||
SDL_SetColorKey(icon, 1, *((Uint8 *)icon->pixels));
|
||||
}
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
static SDL_HitTestResult SDLCALL
|
||||
SDLTest_ExampleHitTestCallback(SDL_Window *win, const SDL_Point *area, void *data)
|
||||
static SDL_HitTestResult SDLCALL SDLTest_ExampleHitTestCallback(SDL_Window *win, const SDL_Point *area, void *data)
|
||||
{
|
||||
int w, h;
|
||||
const int RESIZE_BORDER = 8;
|
||||
|
|
@ -1032,25 +1017,25 @@ SDLTest_ExampleHitTestCallback(SDL_Window *win, const SDL_Point *area, void *dat
|
|||
if (area->y < RESIZE_BORDER) {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_TOPLEFT\n");
|
||||
return SDL_HITTEST_RESIZE_TOPLEFT;
|
||||
} else if (area->y >= (h-RESIZE_BORDER)) {
|
||||
} else if (area->y >= (h - RESIZE_BORDER)) {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_BOTTOMLEFT\n");
|
||||
return SDL_HITTEST_RESIZE_BOTTOMLEFT;
|
||||
} else {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_LEFT\n");
|
||||
return SDL_HITTEST_RESIZE_LEFT;
|
||||
}
|
||||
} else if (area->x >= (w-RESIZE_BORDER)) {
|
||||
} else if (area->x >= (w - RESIZE_BORDER)) {
|
||||
if (area->y < RESIZE_BORDER) {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_TOPRIGHT\n");
|
||||
return SDL_HITTEST_RESIZE_TOPRIGHT;
|
||||
} else if (area->y >= (h-RESIZE_BORDER)) {
|
||||
} else if (area->y >= (h - RESIZE_BORDER)) {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_BOTTOMRIGHT\n");
|
||||
return SDL_HITTEST_RESIZE_BOTTOMRIGHT;
|
||||
} else {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_RIGHT\n");
|
||||
return SDL_HITTEST_RESIZE_RIGHT;
|
||||
}
|
||||
} else if (area->y >= (h-RESIZE_BORDER)) {
|
||||
} else if (area->y >= (h - RESIZE_BORDER)) {
|
||||
SDL_Log("SDL_HITTEST_RESIZE_BOTTOM\n");
|
||||
return SDL_HITTEST_RESIZE_BOTTOM;
|
||||
} else if (area->y < RESIZE_BORDER) {
|
||||
|
|
@ -1064,7 +1049,7 @@ SDLTest_ExampleHitTestCallback(SDL_Window *win, const SDL_Point *area, void *dat
|
|||
}
|
||||
|
||||
SDL_bool
|
||||
SDLTest_CommonInit(SDLTest_CommonState * state)
|
||||
SDLTest_CommonInit(SDLTest_CommonState *state)
|
||||
{
|
||||
int i, j, m, n, w, h;
|
||||
SDL_DisplayMode fullscreen_mode;
|
||||
|
|
@ -1200,7 +1185,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
|
||||
#if SDL_VIDEO_DRIVER_WINDOWS && !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
|
||||
/* Print the D3D9 adapter index */
|
||||
adapterIndex = SDL_Direct3D9GetAdapterIndex( i );
|
||||
adapterIndex = SDL_Direct3D9GetAdapterIndex(i);
|
||||
SDL_Log("D3D9 Adapter Index: %d", adapterIndex);
|
||||
|
||||
/* Print the DXGI adapter and output indices */
|
||||
|
|
@ -1246,14 +1231,14 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
fullscreen_mode.refresh_rate = state->refresh_rate;
|
||||
|
||||
state->windows =
|
||||
(SDL_Window **) SDL_calloc(state->num_windows,
|
||||
sizeof(*state->windows));
|
||||
(SDL_Window **)SDL_calloc(state->num_windows,
|
||||
sizeof(*state->windows));
|
||||
state->renderers =
|
||||
(SDL_Renderer **) SDL_calloc(state->num_windows,
|
||||
(SDL_Renderer **)SDL_calloc(state->num_windows,
|
||||
sizeof(*state->renderers));
|
||||
state->targets =
|
||||
(SDL_Texture **) SDL_calloc(state->num_windows,
|
||||
sizeof(*state->targets));
|
||||
(SDL_Texture **)SDL_calloc(state->num_windows,
|
||||
sizeof(*state->targets));
|
||||
if (!state->windows || !state->renderers) {
|
||||
SDL_Log("Out of memory!\n");
|
||||
return SDL_FALSE;
|
||||
|
|
@ -1305,8 +1290,8 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
}
|
||||
|
||||
/* Add resize/drag areas for windows that are borderless and resizable */
|
||||
if ((state->window_flags & (SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) ==
|
||||
(SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) {
|
||||
if ((state->window_flags & (SDL_WINDOW_RESIZABLE | SDL_WINDOW_BORDERLESS)) ==
|
||||
(SDL_WINDOW_RESIZABLE | SDL_WINDOW_BORDERLESS)) {
|
||||
SDL_SetWindowHitTest(state->windows[i], SDLTest_ExampleHitTestCallback, NULL);
|
||||
}
|
||||
|
||||
|
|
@ -1324,9 +1309,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
SDL_SetWindowMouseRect(state->windows[i], &state->confine);
|
||||
}
|
||||
|
||||
if (!state->skip_renderer
|
||||
&& (state->renderdriver
|
||||
|| !(state->window_flags & (SDL_WINDOW_OPENGL | SDL_WINDOW_VULKAN | SDL_WINDOW_METAL)))) {
|
||||
if (!state->skip_renderer && (state->renderdriver || !(state->window_flags & (SDL_WINDOW_OPENGL | SDL_WINDOW_VULKAN | SDL_WINDOW_METAL)))) {
|
||||
m = -1;
|
||||
if (state->renderdriver) {
|
||||
SDL_RendererInfo info;
|
||||
|
|
@ -1345,7 +1328,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
}
|
||||
}
|
||||
state->renderers[i] = SDL_CreateRenderer(state->windows[i],
|
||||
m, state->render_flags);
|
||||
m, state->render_flags);
|
||||
if (!state->renderers[i]) {
|
||||
SDL_Log("Couldn't create renderer: %s\n",
|
||||
SDL_GetError());
|
||||
|
|
@ -1402,28 +1385,29 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
|||
return SDL_TRUE;
|
||||
}
|
||||
|
||||
static const char *
|
||||
DisplayOrientationName(int orientation)
|
||||
static const char *DisplayOrientationName(int orientation)
|
||||
{
|
||||
switch (orientation)
|
||||
{
|
||||
#define CASE(X) case SDL_ORIENTATION_##X: return #X
|
||||
switch (orientation) {
|
||||
#define CASE(X) \
|
||||
case SDL_ORIENTATION_##X: \
|
||||
return #X
|
||||
CASE(UNKNOWN);
|
||||
CASE(LANDSCAPE);
|
||||
CASE(LANDSCAPE_FLIPPED);
|
||||
CASE(PORTRAIT);
|
||||
CASE(PORTRAIT_FLIPPED);
|
||||
#undef CASE
|
||||
default: return "???";
|
||||
default:
|
||||
return "???";
|
||||
}
|
||||
}
|
||||
|
||||
static const char *
|
||||
ControllerAxisName(const SDL_GameControllerAxis axis)
|
||||
static const char *ControllerAxisName(const SDL_GameControllerAxis axis)
|
||||
{
|
||||
switch (axis)
|
||||
{
|
||||
#define AXIS_CASE(ax) case SDL_CONTROLLER_AXIS_##ax: return #ax
|
||||
switch (axis) {
|
||||
#define AXIS_CASE(ax) \
|
||||
case SDL_CONTROLLER_AXIS_##ax: \
|
||||
return #ax
|
||||
AXIS_CASE(INVALID);
|
||||
AXIS_CASE(LEFTX);
|
||||
AXIS_CASE(LEFTY);
|
||||
|
|
@ -1432,16 +1416,17 @@ ControllerAxisName(const SDL_GameControllerAxis axis)
|
|||
AXIS_CASE(TRIGGERLEFT);
|
||||
AXIS_CASE(TRIGGERRIGHT);
|
||||
#undef AXIS_CASE
|
||||
default: return "???";
|
||||
default:
|
||||
return "???";
|
||||
}
|
||||
}
|
||||
|
||||
static const char *
|
||||
ControllerButtonName(const SDL_GameControllerButton button)
|
||||
static const char *ControllerButtonName(const SDL_GameControllerButton button)
|
||||
{
|
||||
switch (button)
|
||||
{
|
||||
#define BUTTON_CASE(btn) case SDL_CONTROLLER_BUTTON_##btn: return #btn
|
||||
switch (button) {
|
||||
#define BUTTON_CASE(btn) \
|
||||
case SDL_CONTROLLER_BUTTON_##btn: \
|
||||
return #btn
|
||||
BUTTON_CASE(INVALID);
|
||||
BUTTON_CASE(A);
|
||||
BUTTON_CASE(B);
|
||||
|
|
@ -1459,12 +1444,12 @@ ControllerButtonName(const SDL_GameControllerButton button)
|
|||
BUTTON_CASE(DPAD_LEFT);
|
||||
BUTTON_CASE(DPAD_RIGHT);
|
||||
#undef BUTTON_CASE
|
||||
default: return "???";
|
||||
default:
|
||||
return "???";
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_PrintEvent(SDL_Event * event)
|
||||
static void SDLTest_PrintEvent(SDL_Event *event)
|
||||
{
|
||||
switch (event->type) {
|
||||
case SDL_DISPLAYEVENT:
|
||||
|
|
@ -1596,11 +1581,11 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
break;
|
||||
case SDL_JOYDEVICEADDED:
|
||||
SDL_Log("SDL EVENT: Joystick index %" SDL_PRIs32 " attached",
|
||||
event->jdevice.which);
|
||||
event->jdevice.which);
|
||||
break;
|
||||
case SDL_JOYDEVICEREMOVED:
|
||||
SDL_Log("SDL EVENT: Joystick %" SDL_PRIs32 " removed",
|
||||
event->jdevice.which);
|
||||
event->jdevice.which);
|
||||
break;
|
||||
case SDL_JOYBALLMOTION:
|
||||
SDL_Log("SDL EVENT: Joystick %" SDL_PRIs32 ": ball %d moved by %d,%d",
|
||||
|
|
@ -1608,41 +1593,40 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
event->jball.yrel);
|
||||
break;
|
||||
case SDL_JOYHATMOTION:
|
||||
{
|
||||
const char *position = "UNKNOWN";
|
||||
switch (event->jhat.value) {
|
||||
case SDL_HAT_CENTERED:
|
||||
position = "CENTER";
|
||||
break;
|
||||
case SDL_HAT_UP:
|
||||
position = "UP";
|
||||
break;
|
||||
case SDL_HAT_RIGHTUP:
|
||||
position = "RIGHTUP";
|
||||
break;
|
||||
case SDL_HAT_RIGHT:
|
||||
position = "RIGHT";
|
||||
break;
|
||||
case SDL_HAT_RIGHTDOWN:
|
||||
position = "RIGHTDOWN";
|
||||
break;
|
||||
case SDL_HAT_DOWN:
|
||||
position = "DOWN";
|
||||
break;
|
||||
case SDL_HAT_LEFTDOWN:
|
||||
position = "LEFTDOWN";
|
||||
break;
|
||||
case SDL_HAT_LEFT:
|
||||
position = "LEFT";
|
||||
break;
|
||||
case SDL_HAT_LEFTUP:
|
||||
position = "LEFTUP";
|
||||
break;
|
||||
}
|
||||
SDL_Log("SDL EVENT: Joystick %" SDL_PRIs32 ": hat %d moved to %s",
|
||||
event->jhat.which, event->jhat.hat, position);
|
||||
{
|
||||
const char *position = "UNKNOWN";
|
||||
switch (event->jhat.value) {
|
||||
case SDL_HAT_CENTERED:
|
||||
position = "CENTER";
|
||||
break;
|
||||
case SDL_HAT_UP:
|
||||
position = "UP";
|
||||
break;
|
||||
case SDL_HAT_RIGHTUP:
|
||||
position = "RIGHTUP";
|
||||
break;
|
||||
case SDL_HAT_RIGHT:
|
||||
position = "RIGHT";
|
||||
break;
|
||||
case SDL_HAT_RIGHTDOWN:
|
||||
position = "RIGHTDOWN";
|
||||
break;
|
||||
case SDL_HAT_DOWN:
|
||||
position = "DOWN";
|
||||
break;
|
||||
case SDL_HAT_LEFTDOWN:
|
||||
position = "LEFTDOWN";
|
||||
break;
|
||||
case SDL_HAT_LEFT:
|
||||
position = "LEFT";
|
||||
break;
|
||||
case SDL_HAT_LEFTUP:
|
||||
position = "LEFTUP";
|
||||
break;
|
||||
}
|
||||
break;
|
||||
SDL_Log("SDL EVENT: Joystick %" SDL_PRIs32 ": hat %d moved to %s",
|
||||
event->jhat.which, event->jhat.hat, position);
|
||||
} break;
|
||||
case SDL_JOYBUTTONDOWN:
|
||||
SDL_Log("SDL EVENT: Joystick %" SDL_PRIs32 ": button %d pressed",
|
||||
event->jbutton.which, event->jbutton.button);
|
||||
|
|
@ -1653,28 +1637,28 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
break;
|
||||
case SDL_CONTROLLERDEVICEADDED:
|
||||
SDL_Log("SDL EVENT: Controller index %" SDL_PRIs32 " attached",
|
||||
event->cdevice.which);
|
||||
event->cdevice.which);
|
||||
break;
|
||||
case SDL_CONTROLLERDEVICEREMOVED:
|
||||
SDL_Log("SDL EVENT: Controller %" SDL_PRIs32 " removed",
|
||||
event->cdevice.which);
|
||||
event->cdevice.which);
|
||||
break;
|
||||
case SDL_CONTROLLERAXISMOTION:
|
||||
SDL_Log("SDL EVENT: Controller %" SDL_PRIs32 " axis %d ('%s') value: %d",
|
||||
event->caxis.which,
|
||||
event->caxis.axis,
|
||||
ControllerAxisName((SDL_GameControllerAxis)event->caxis.axis),
|
||||
event->caxis.value);
|
||||
event->caxis.which,
|
||||
event->caxis.axis,
|
||||
ControllerAxisName((SDL_GameControllerAxis)event->caxis.axis),
|
||||
event->caxis.value);
|
||||
break;
|
||||
case SDL_CONTROLLERBUTTONDOWN:
|
||||
SDL_Log("SDL EVENT: Controller %" SDL_PRIs32 "button %d ('%s') down",
|
||||
event->cbutton.which, event->cbutton.button,
|
||||
ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
|
||||
event->cbutton.which, event->cbutton.button,
|
||||
ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
|
||||
break;
|
||||
case SDL_CONTROLLERBUTTONUP:
|
||||
SDL_Log("SDL EVENT: Controller %" SDL_PRIs32 " button %d ('%s') up",
|
||||
event->cbutton.which, event->cbutton.button,
|
||||
ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
|
||||
event->cbutton.which, event->cbutton.button,
|
||||
ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
|
||||
break;
|
||||
case SDL_CLIPBOARDUPDATE:
|
||||
SDL_Log("SDL EVENT: Clipboard updated");
|
||||
|
|
@ -1682,8 +1666,8 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
|
||||
case SDL_FINGERMOTION:
|
||||
SDL_Log("SDL EVENT: Finger: motion touch=%ld, finger=%ld, x=%f, y=%f, dx=%f, dy=%f, pressure=%f",
|
||||
(long) event->tfinger.touchId,
|
||||
(long) event->tfinger.fingerId,
|
||||
(long)event->tfinger.touchId,
|
||||
(long)event->tfinger.fingerId,
|
||||
event->tfinger.x, event->tfinger.y,
|
||||
event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure);
|
||||
break;
|
||||
|
|
@ -1691,16 +1675,16 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
case SDL_FINGERUP:
|
||||
SDL_Log("SDL EVENT: Finger: %s touch=%ld, finger=%ld, x=%f, y=%f, dx=%f, dy=%f, pressure=%f",
|
||||
(event->type == SDL_FINGERDOWN) ? "down" : "up",
|
||||
(long) event->tfinger.touchId,
|
||||
(long) event->tfinger.fingerId,
|
||||
(long)event->tfinger.touchId,
|
||||
(long)event->tfinger.fingerId,
|
||||
event->tfinger.x, event->tfinger.y,
|
||||
event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure);
|
||||
break;
|
||||
case SDL_DOLLARGESTURE:
|
||||
SDL_Log("SDL_EVENT: Dollar gesture detect: %ld", (long) event->dgesture.gestureId);
|
||||
SDL_Log("SDL_EVENT: Dollar gesture detect: %ld", (long)event->dgesture.gestureId);
|
||||
break;
|
||||
case SDL_DOLLARRECORD:
|
||||
SDL_Log("SDL_EVENT: Dollar gesture record: %ld", (long) event->dgesture.gestureId);
|
||||
SDL_Log("SDL_EVENT: Dollar gesture record: %ld", (long)event->dgesture.gestureId);
|
||||
break;
|
||||
case SDL_MULTIGESTURE:
|
||||
SDL_Log("SDL_EVENT: Multi gesture fingers: %d", event->mgesture.numFingers);
|
||||
|
|
@ -1755,8 +1739,7 @@ SDLTest_PrintEvent(SDL_Event * event)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDLTest_ScreenShot(SDL_Renderer *renderer)
|
||||
static void SDLTest_ScreenShot(SDL_Renderer *renderer)
|
||||
{
|
||||
SDL_Rect viewport;
|
||||
SDL_Surface *surface;
|
||||
|
|
@ -1768,11 +1751,11 @@ SDLTest_ScreenShot(SDL_Renderer *renderer)
|
|||
SDL_RenderGetViewport(renderer, &viewport);
|
||||
surface = SDL_CreateRGBSurface(viewport.w, viewport.h, 24,
|
||||
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
|
||||
0x00FF0000, 0x0000FF00, 0x000000FF,
|
||||
0x00FF0000, 0x0000FF00, 0x000000FF,
|
||||
#else
|
||||
0x000000FF, 0x0000FF00, 0x00FF0000,
|
||||
0x000000FF, 0x0000FF00, 0x00FF0000,
|
||||
#endif
|
||||
0x00000000);
|
||||
0x00000000);
|
||||
if (surface == NULL) {
|
||||
SDL_Log("Couldn't create surface: %s\n", SDL_GetError());
|
||||
return;
|
||||
|
|
@ -1792,8 +1775,7 @@ SDLTest_ScreenShot(SDL_Renderer *renderer)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
FullscreenTo(int index, int windowId)
|
||||
static void FullscreenTo(int index, int windowId)
|
||||
{
|
||||
Uint32 flags;
|
||||
struct SDL_Rect rect = { 0, 0, 0, 0 };
|
||||
|
|
@ -1802,20 +1784,19 @@ FullscreenTo(int index, int windowId)
|
|||
return;
|
||||
}
|
||||
|
||||
SDL_GetDisplayBounds( index, &rect );
|
||||
SDL_GetDisplayBounds(index, &rect);
|
||||
|
||||
flags = SDL_GetWindowFlags(window);
|
||||
if (flags & SDL_WINDOW_FULLSCREEN) {
|
||||
SDL_SetWindowFullscreen( window, 0);
|
||||
SDL_Delay( 15 );
|
||||
SDL_SetWindowFullscreen(window, 0);
|
||||
SDL_Delay(15);
|
||||
}
|
||||
|
||||
SDL_SetWindowPosition( window, rect.x, rect.y );
|
||||
SDL_SetWindowFullscreen( window, SDL_WINDOW_FULLSCREEN );
|
||||
SDL_SetWindowPosition(window, rect.x, rect.y);
|
||||
SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN);
|
||||
}
|
||||
|
||||
void
|
||||
SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
||||
void SDLTest_CommonEvent(SDLTest_CommonState *state, SDL_Event *event, int *done)
|
||||
{
|
||||
int i;
|
||||
static SDL_MouseMotionEvent lastEvent;
|
||||
|
|
@ -1832,27 +1813,26 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
case SDL_WINDOWEVENT:
|
||||
switch (event->window.event) {
|
||||
case SDL_WINDOWEVENT_CLOSE:
|
||||
{
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
|
||||
if (window) {
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
if (window == state->windows[i]) {
|
||||
if (state->targets[i]) {
|
||||
SDL_DestroyTexture(state->targets[i]);
|
||||
state->targets[i] = NULL;
|
||||
}
|
||||
if (state->renderers[i]) {
|
||||
SDL_DestroyRenderer(state->renderers[i]);
|
||||
state->renderers[i] = NULL;
|
||||
}
|
||||
SDL_DestroyWindow(state->windows[i]);
|
||||
state->windows[i] = NULL;
|
||||
break;
|
||||
{
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
|
||||
if (window) {
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
if (window == state->windows[i]) {
|
||||
if (state->targets[i]) {
|
||||
SDL_DestroyTexture(state->targets[i]);
|
||||
state->targets[i] = NULL;
|
||||
}
|
||||
if (state->renderers[i]) {
|
||||
SDL_DestroyRenderer(state->renderers[i]);
|
||||
state->renderers[i] = NULL;
|
||||
}
|
||||
SDL_DestroyWindow(state->windows[i]);
|
||||
state->windows[i] = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case SDL_WINDOWEVENT_FOCUS_LOST:
|
||||
if (state->flash_on_focus_loss) {
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
|
||||
|
|
@ -1865,24 +1845,25 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
break;
|
||||
}
|
||||
break;
|
||||
case SDL_KEYDOWN: {
|
||||
case SDL_KEYDOWN:
|
||||
{
|
||||
SDL_bool withControl = !!(event->key.keysym.mod & KMOD_CTRL);
|
||||
SDL_bool withShift = !!(event->key.keysym.mod & KMOD_SHIFT);
|
||||
SDL_bool withAlt = !!(event->key.keysym.mod & KMOD_ALT);
|
||||
|
||||
switch (event->key.keysym.sym) {
|
||||
/* Add hotkeys here */
|
||||
case SDLK_PRINTSCREEN: {
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
|
||||
if (window) {
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
if (window == state->windows[i]) {
|
||||
SDLTest_ScreenShot(state->renderers[i]);
|
||||
}
|
||||
case SDLK_PRINTSCREEN:
|
||||
{
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
|
||||
if (window) {
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
if (window == state->windows[i]) {
|
||||
SDLTest_ScreenShot(state->renderers[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case SDLK_EQUALS:
|
||||
if (withControl) {
|
||||
/* Ctrl-+ double the size of the window */
|
||||
|
|
@ -1890,7 +1871,7 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
if (window) {
|
||||
int w, h;
|
||||
SDL_GetWindowSize(window, &w, &h);
|
||||
SDL_SetWindowSize(window, w*2, h*2);
|
||||
SDL_SetWindowSize(window, w * 2, h * 2);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -1901,7 +1882,7 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
if (window) {
|
||||
int w, h;
|
||||
SDL_GetWindowSize(window, &w, &h);
|
||||
SDL_SetWindowSize(window, w/2, h/2);
|
||||
SDL_SetWindowSize(window, w / 2, h / 2);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -1925,8 +1906,8 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
}
|
||||
SDL_Log("Centering on display %d\n", dest);
|
||||
SDL_SetWindowPosition(window,
|
||||
SDL_WINDOWPOS_CENTERED_DISPLAY(dest),
|
||||
SDL_WINDOWPOS_CENTERED_DISPLAY(dest));
|
||||
SDL_WINDOWPOS_CENTERED_DISPLAY(dest),
|
||||
SDL_WINDOWPOS_CENTERED_DISPLAY(dest));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1989,10 +1970,10 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
SDL_GetWindowSize(state->windows[i], &w, &h);
|
||||
SDL_RenderGetClipRect(state->renderers[i], &clip);
|
||||
if (SDL_RectEmpty(&clip)) {
|
||||
clip.x = w/4;
|
||||
clip.y = h/4;
|
||||
clip.w = w/2;
|
||||
clip.h = h/2;
|
||||
clip.x = w / 4;
|
||||
clip.y = h / 4;
|
||||
clip.w = w / 2;
|
||||
clip.h = h / 2;
|
||||
SDL_RenderSetClipRect(state->renderers[i], &clip);
|
||||
} else {
|
||||
SDL_RenderSetClipRect(state->renderers[i], NULL);
|
||||
|
|
@ -2042,7 +2023,7 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
case SDLK_k:
|
||||
if (withControl) {
|
||||
/* Ctrl-K toggle keyboard grab */
|
||||
SDL_Window* window = SDL_GetWindowFromID(event->key.windowID);
|
||||
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
|
||||
if (window) {
|
||||
SDL_SetWindowKeyboardGrab(window, !SDL_GetWindowKeyboardGrab(window) ? SDL_TRUE : SDL_FALSE);
|
||||
}
|
||||
|
|
@ -2177,7 +2158,7 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
|
||||
|
||||
SDL_snprintf(message, sizeof(message), "(%" SDL_PRIs32 ", %" SDL_PRIs32 "), rel (%" SDL_PRIs32 ", %" SDL_PRIs32 ")\n",
|
||||
lastEvent.x, lastEvent.y, lastEvent.xrel, lastEvent.yrel);
|
||||
lastEvent.x, lastEvent.y, lastEvent.xrel, lastEvent.yrel);
|
||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Last mouse position", message, window);
|
||||
break;
|
||||
}
|
||||
|
|
@ -2200,8 +2181,7 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
SDLTest_CommonQuit(SDLTest_CommonState * state)
|
||||
void SDLTest_CommonQuit(SDLTest_CommonState *state)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -2240,8 +2220,7 @@ SDLTest_CommonQuit(SDLTest_CommonState * state)
|
|||
SDLTest_LogAllocations();
|
||||
}
|
||||
|
||||
void
|
||||
SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window, int * usedHeight)
|
||||
void SDLTest_CommonDrawWindowInfo(SDL_Renderer *renderer, SDL_Window *window, int *usedHeight)
|
||||
{
|
||||
char text[1024];
|
||||
int textY = 0;
|
||||
|
|
@ -2329,7 +2308,7 @@ SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window, int *
|
|||
|
||||
if (0 == SDL_GetWindowDisplayMode(window, &mode)) {
|
||||
SDL_snprintf(text, sizeof(text), "SDL_GetWindowDisplayMode: %dx%d@%dHz (%s)",
|
||||
mode.w, mode.h, mode.refresh_rate, SDL_GetPixelFormatName(mode.format));
|
||||
mode.w, mode.h, mode.refresh_rate, SDL_GetPixelFormatName(mode.format));
|
||||
SDLTest_DrawString(renderer, 0, textY, text);
|
||||
textY += lineHeight;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue