pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We have the correct window, we don't have to search for it, duh. :)

Browse source
This commit is contained in:
Sam Lantinga 2011-02-19 11:26:49 -08:00
parent 234bc0aa5d
commit 009af96ce0
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
test/common.c
View file

@ -1018,19 +1018,22 @@ CommonEvent(CommonState * state, SDL_Event * event, int *done)
case SDLK_g: case SDLK_g:
if (event->key.keysym.mod & KMOD_CTRL) { if (event->key.keysym.mod & KMOD_CTRL) {
/* Ctrl-G toggle grab */ /* Ctrl-G toggle grab */
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
if (window) {
SDL_SetWindowGrab(window, !SDL_GetWindowGrab(window));
}
} }
break; break;
case SDLK_m: case SDLK_m:
if (event->key.keysym.mod & KMOD_CTRL) { if (event->key.keysym.mod & KMOD_CTRL) {
/* Ctrl-M maximize */ /* Ctrl-M maximize */
for (i = 0; i < state->num_windows; ++i) { SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
Uint32 flags = SDL_GetWindowFlags(state->windows[i]); if (window) {
if (flags & SDL_WINDOW_INPUT_FOCUS) { Uint32 flags = SDL_GetWindowFlags(window);
if (flags & SDL_WINDOW_MAXIMIZED) { if (flags & SDL_WINDOW_MAXIMIZED) {
SDL_RestoreWindow(state->windows[i]); SDL_RestoreWindow(window);
} else { } else {
SDL_MaximizeWindow(state->windows[i]); SDL_MaximizeWindow(window);
}
} }
} }
} }
@ -1038,25 +1041,22 @@ CommonEvent(CommonState * state, SDL_Event * event, int *done)
case SDLK_z: case SDLK_z:
if (event->key.keysym.mod & KMOD_CTRL) { if (event->key.keysym.mod & KMOD_CTRL) {
/* Ctrl-Z minimize */ /* Ctrl-Z minimize */
for (i = 0; i < state->num_windows; ++i) { SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
Uint32 flags = SDL_GetWindowFlags(state->windows[i]); if (window) {
if (flags & SDL_WINDOW_INPUT_FOCUS) { SDL_MinimizeWindow(window);
SDL_MinimizeWindow(state->windows[i]);
}
} }
} }
break; break;
case SDLK_RETURN: case SDLK_RETURN:
if (event->key.keysym.mod & KMOD_CTRL) { if (event->key.keysym.mod & KMOD_CTRL) {
/* Ctrl-Enter toggle fullscreen */ /* Ctrl-Enter toggle fullscreen */
for (i = 0; i < state->num_windows; ++i) { SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
Uint32 flags = SDL_GetWindowFlags(state->windows[i]); if (window) {
if (flags & SDL_WINDOW_INPUT_FOCUS) { Uint32 flags = SDL_GetWindowFlags(window);
if (flags & SDL_WINDOW_FULLSCREEN) { if (flags & SDL_WINDOW_FULLSCREEN) {
SDL_SetWindowFullscreen(state->windows[i], SDL_FALSE); SDL_SetWindowFullscreen(window, SDL_FALSE);
} else { } else {
SDL_SetWindowFullscreen(state->windows[i], SDL_TRUE); SDL_SetWindowFullscreen(window, SDL_TRUE);
}
} }
} }
} }