ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-26 00:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Common framework now accepts --usable-bounds command line argument.

Browse source
This commit is contained in:
Ryan C. Gordon 2020-01-30 13:47:48 -05:00
parent 80e7e2eb9d
commit 66579dbd1a
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/test/SDL_test_common.c
View file

@ -35,7 +35,7 @@ static const char *video_usage[] = {
"[--min-geometry WxH]", "[--max-geometry WxH]", "[--logical WxH]", "[--min-geometry WxH]", "[--max-geometry WxH]", "[--logical WxH]",
"[--scale N]", "[--depth N]", "[--refresh R]", "[--vsync]", "[--noframe]", "[--scale N]", "[--depth N]", "[--refresh R]", "[--vsync]", "[--noframe]",
"[--resize]", "[--minimize]", "[--maximize]", "[--grab]", "[--resize]", "[--minimize]", "[--maximize]", "[--grab]",
"[--allow-highdpi]" "[--allow-highdpi]", "[--usable-bounds]"
}; };
static const char *audio_usage[] = { static const char *audio_usage[] = {
@ -282,6 +282,15 @@ SDLTest_CommonArg(SDLTest_CommonState * state, int index)
state->window_y = SDL_atoi(y); state->window_y = SDL_atoi(y);
return 2; return 2;
} }
if (SDL_strcasecmp(argv[index], "--usable-bounds") == 0) {
/* !!! FIXME: this is a bit of a hack, but I don't want to add a
!!! FIXME: flag to the public structure in 2.0.x */
state->window_x = -1;
state->window_y = -1;
state->window_w = -1;
state->window_h = -1;
return 1;
}
if (SDL_strcasecmp(argv[index], "--geometry") == 0) { if (SDL_strcasecmp(argv[index], "--geometry") == 0) {
char *w, *h; char *w, *h;
++index; ++index;
@ -959,6 +968,15 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
} }
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
char title[1024]; char title[1024];
SDL_Rect r = {
state->window_x, state->window_y,
state->window_w, state->window_h
};
/* !!! FIXME: hack to make --usable-bounds work for now. */
if ((r.x == -1) && (r.y == -1) && (r.w == -1) && (r.h == -1)) {
SDL_GetDisplayUsableBounds(state->display, &r);
}
if (state->num_windows > 1) { if (state->num_windows > 1) {
SDL_snprintf(title, SDL_arraysize(title), "%s %d", SDL_snprintf(title, SDL_arraysize(title), "%s %d",
@ -967,9 +985,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
SDL_strlcpy(title, state->window_title, SDL_arraysize(title)); SDL_strlcpy(title, state->window_title, SDL_arraysize(title));
} }
state->windows[i] = state->windows[i] =
SDL_CreateWindow(title, state->window_x, state->window_y, SDL_CreateWindow(title, r.x, r.y, r.w, r.h, state->window_flags);
state->window_w, state->window_h,
state->window_flags);
if (!state->windows[i]) { if (!state->windows[i]) {
SDL_Log("Couldn't create window: %s\n", SDL_Log("Couldn't create window: %s\n",
SDL_GetError()); SDL_GetError());