Mercurial > sdl-ios-xcode

changeset 3502:98a819296cdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Whenever a window becomes fullscreen, shown, unminimized, and has input focus it will change the display to the corresponding fullscreen video mode. If it loses any of those properties the desktop mode will be restored.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 01 Dec 2009 08:56:12 +0000
parents 467e67d301f3
children 7931094e4c48
files src/events/SDL_keyboard.c src/events/SDL_windowevents.c src/video/SDL_sysvideo.h src/video/SDL_video.c
diffstat 4 files changed, 116 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/src/events/SDL_keyboard.c	Tue Dec 01 06:15:10 2009 +0000
+++ b/src/events/SDL_keyboard.c	Tue Dec 01 08:56:12 2009 +0000
@@ -652,17 +652,16 @@
     int i;
     SDL_bool focus;
 
-    if (!keyboard || (keyboard->focus == windowID)) {
+    if (!keyboard) {
         return;
     }
 
     /* See if the current window has lost focus */
-    if (keyboard->focus) {
+    if (keyboard->focus && keyboard->focus != windowID) {
         focus = SDL_FALSE;
         for (i = 0; i < SDL_num_keyboards; ++i) {
-            SDL_Keyboard *check;
             if (i != index) {
-                check = SDL_GetKeyboard(i);
+                SDL_Keyboard *check = SDL_GetKeyboard(i);
                 if (check && check->focus == keyboard->focus) {
                     focus = SDL_TRUE;
                     break;
@@ -678,21 +677,8 @@
     keyboard->focus = windowID;
 
     if (keyboard->focus) {
-        focus = SDL_FALSE;
-        for (i = 0; i < SDL_num_keyboards; ++i) {
-            SDL_Keyboard *check;
-            if (i != index) {
-                check = SDL_GetKeyboard(i);
-                if (check && check->focus == keyboard->focus) {
-                    focus = SDL_TRUE;
-                    break;
-                }
-            }
-        }
-        if (!focus) {
-            SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_GAINED,
-                                0, 0);
-        }
+        SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_GAINED,
+                            0, 0);
     }
 }
 
--- a/src/events/SDL_windowevents.c	Tue Dec 01 06:15:10 2009 +0000
+++ b/src/events/SDL_windowevents.c	Tue Dec 01 08:56:12 2009 +0000
@@ -86,6 +86,7 @@
             return 0;
         }
         window->flags |= SDL_WINDOW_MINIMIZED;
+        SDL_OnWindowMinimized(window);
         break;
     case SDL_WINDOWEVENT_MAXIMIZED:
         if (window->flags & SDL_WINDOW_MAXIMIZED) {
@@ -98,6 +99,7 @@
             return 0;
         }
         window->flags &= ~(SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED);
+        SDL_OnWindowRestored(window);
         break;
     case SDL_WINDOWEVENT_ENTER:
         if (window->flags & SDL_WINDOW_MOUSE_FOCUS) {
--- a/src/video/SDL_sysvideo.h	Tue Dec 01 06:15:10 2009 +0000
+++ b/src/video/SDL_sysvideo.h	Tue Dec 01 08:56:12 2009 +0000
@@ -147,6 +147,7 @@
 #define FULLSCREEN_VISIBLE(W) \
     (((W)->flags & SDL_WINDOW_FULLSCREEN) && \
      ((W)->flags & SDL_WINDOW_SHOWN) && \
+     ((W)->flags & SDL_WINDOW_INPUT_FOCUS) && \
      !((W)->flags & SDL_WINDOW_MINIMIZED))
 
 /*
@@ -160,6 +161,7 @@
     SDL_DisplayMode *display_modes;
     SDL_DisplayMode desktop_mode;
     SDL_DisplayMode current_mode;
+    SDL_bool updating_fullscreen;
     SDL_Palette *palette;
 
     Uint16 *gamma;
@@ -426,6 +428,8 @@
 extern void SDL_OnWindowShown(SDL_Window * window);
 extern void SDL_OnWindowHidden(SDL_Window * window);
 extern void SDL_OnWindowResized(SDL_Window * window);
+extern void SDL_OnWindowMinimized(SDL_Window * window);
+extern void SDL_OnWindowRestored(SDL_Window * window);
 extern void SDL_OnWindowFocusGained(SDL_Window * window);
 extern void SDL_OnWindowFocusLost(SDL_Window * window);
 extern SDL_WindowID SDL_GetFocusWindow(void);
--- a/src/video/SDL_video.c	Tue Dec 01 06:15:10 2009 +0000
+++ b/src/video/SDL_video.c	Tue Dec 01 08:56:12 2009 +0000
@@ -599,30 +599,31 @@
     SDL_DisplayMode current_mode;
     int i, ncolors;
 
-    if (!mode) {
-        mode = &display->desktop_mode;
-    }
-    display_mode = *mode;
-
-    /* Default to the current mode */
-    if (!display_mode.format) {
-        display_mode.format = display->current_mode.format;
-    }
-    if (!display_mode.w) {
-        display_mode.w = display->current_mode.w;
-    }
-    if (!display_mode.h) {
-        display_mode.h = display->current_mode.h;
-    }
-    if (!display_mode.refresh_rate) {
-        display_mode.refresh_rate = display->current_mode.refresh_rate;
-    }
-
-    /* Get a good video mode, the closest one possible */
-    if (!SDL_GetClosestDisplayModeForDisplay(display, &display_mode, &display_mode)) {
-        SDL_SetError("No video mode large enough for %dx%d",
-                     display_mode.w, display_mode.h);
-        return -1;
+    if (mode) {
+        display_mode = *mode;
+
+        /* Default to the current mode */
+        if (!display_mode.format) {
+            display_mode.format = display->current_mode.format;
+        }
+        if (!display_mode.w) {
+            display_mode.w = display->current_mode.w;
+        }
+        if (!display_mode.h) {
+            display_mode.h = display->current_mode.h;
+        }
+        if (!display_mode.refresh_rate) {
+            display_mode.refresh_rate = display->current_mode.refresh_rate;
+        }
+
+        /* Get a good video mode, the closest one possible */
+        if (!SDL_GetClosestDisplayModeForDisplay(display, &display_mode, &display_mode)) {
+            SDL_SetError("No video mode large enough for %dx%d",
+                         display_mode.w, display_mode.h);
+            return -1;
+        }
+    } else {
+        display_mode = display->desktop_mode;
     }
 
     /* See if there's anything left to do */
@@ -719,6 +720,63 @@
     return 0;
 }
 
+static void
+SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool attempt)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
+    int i;
+
+    /* See if we're already processing a window */
+    if (display->updating_fullscreen) {
+        return;
+    }
+
+    display->updating_fullscreen = SDL_TRUE;
+
+    /* See if we even want to do anything here */
+    if ((window->flags & SDL_WINDOW_FULLSCREEN) &&
+        (window->flags & SDL_WINDOW_SHOWN)) {
+        if (attempt) {
+            /* We just gained some state, try to gain all states */
+            if (window->flags & SDL_WINDOW_MINIMIZED) {
+                SDL_RestoreWindow(window->id);
+            } else {
+                SDL_RaiseWindow(window->id);
+            }
+        } else {
+            /* We just lost some state, try to release all states */
+            SDL_MinimizeWindow(window->id);
+        }
+    }
+
+    if (FULLSCREEN_VISIBLE(window)) {
+        /* Hide any other fullscreen windows */
+        for (i = 0; i < display->num_windows; ++i) {
+            SDL_Window *other = &display->windows[i];
+            if (other != window && FULLSCREEN_VISIBLE(other)) {
+                SDL_MinimizeWindow(other->id);
+            }
+        }
+    }
+
+    display->updating_fullscreen = SDL_FALSE;
+
+    /* See if there are any fullscreen windows */
+    for (i = 0; i < display->num_windows; ++i) {
+        window = &display->windows[i];
+        if (FULLSCREEN_VISIBLE(window)) {
+            SDL_DisplayMode fullscreen_mode;
+            if (SDL_GetWindowDisplayMode(window->id, &fullscreen_mode) == 0) {
+                SDL_SetDisplayModeForDisplay(display, &fullscreen_mode);
+                return;
+            }
+        }
+    }
+
+    /* Nope, restore the desktop mode */
+    SDL_SetDisplayModeForDisplay(display, NULL);
+}
+
 int
 SDL_SetPaletteForDisplay(SDL_VideoDisplay * display, const SDL_Color * colors, int firstcolor, int ncolors)
 {
@@ -1223,6 +1281,9 @@
     }
     if (_this->RaiseWindow) {
         _this->RaiseWindow(_this, window);
+    } else {
+        /* FIXME: What we really want is a way to request focus */
+        SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0);
     }
 }
 
@@ -1289,29 +1350,11 @@
     if (fullscreen) {
         window->flags |= SDL_WINDOW_FULLSCREEN;
 
-        if (FULLSCREEN_VISIBLE(window)) {
-            SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
-            SDL_DisplayMode fullscreen_mode;
-
-            /* Hide any other fullscreen windows */
-            int i;
-            for (i = 0; i < display->num_windows; ++i) {
-                SDL_Window *other = &display->windows[i];
-                if (other->id != windowID && FULLSCREEN_VISIBLE(other)) {
-                    SDL_MinimizeWindow(other->id);
-                }
-            }
-
-            if (SDL_GetWindowDisplayMode(windowID, &fullscreen_mode) == 0) {
-                SDL_SetDisplayModeForDisplay(display, &fullscreen_mode);
-            }
-        }
+        SDL_UpdateFullscreenMode(window, SDL_TRUE);
     } else {
         window->flags &= ~SDL_WINDOW_FULLSCREEN;
 
-        if (FULLSCREEN_VISIBLE(window)) {
-            SDL_SetDisplayMode(NULL);
-        }
+        SDL_UpdateFullscreenMode(window, SDL_FALSE);
     }
     return 0;
 }
@@ -1354,17 +1397,14 @@
 void
 SDL_OnWindowShown(SDL_Window * window)
 {
-    if (window->flags & SDL_WINDOW_FULLSCREEN) {
-        SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0);
-    }
+    SDL_RaiseWindow(window->id);
+    SDL_UpdateFullscreenMode(window, SDL_TRUE);
 }
 
 void
 SDL_OnWindowHidden(SDL_Window * window)
 {
-    if (window->flags & SDL_WINDOW_FULLSCREEN) {
-        SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0);
-    }
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
 }
 
 void
@@ -1378,13 +1418,24 @@
 }
 
 void
+SDL_OnWindowMinimized(SDL_Window * window)
+{
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
+}
+
+void
+SDL_OnWindowRestored(SDL_Window * window)
+{
+    SDL_RaiseWindow(window->id);
+    SDL_UpdateFullscreenMode(window, SDL_TRUE);
+}
+
+void
 SDL_OnWindowFocusGained(SDL_Window * window)
 {
     SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
 
-    if (FULLSCREEN_VISIBLE(window)) {
-        SDL_SetDisplayMode(&window->fullscreen_mode);
-    }
+    SDL_UpdateFullscreenMode(window, SDL_TRUE);
     if (display->gamma && _this->SetDisplayGammaRamp) {
         _this->SetDisplayGammaRamp(_this, display, display->gamma);
     }
@@ -1399,10 +1450,7 @@
 {
     SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
 
-    if (FULLSCREEN_VISIBLE(window)) {
-        SDL_MinimizeWindow(window->id);
-        SDL_SetDisplayMode(NULL);
-    }
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
     if (display->gamma && _this->SetDisplayGammaRamp) {
         _this->SetDisplayGammaRamp(_this, display, display->saved_gamma);
     }