Fix SDL_SetVideoMode to always call browser.setCanvasSize (#7321)

In reference to #7212, I removed the condition so browser.setCanvasSize is always called even if canvas already have the same size with what SDL_SetVideoMode want to set. Also add an interactive test case for this scenario.

fixes #7212

Author: FMFluke

AUTHORS

@@ -364,4 +364,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Zoltán Žarkov <[email protected]>
 * Roman Yurchak <[email protected]>
 * Hampton Maxwell <[email protected]>
+* Sirapop Wongstapornpat <[email protected]>
 * Matt Kane <[email protected]>

src/library_sdl.js

@@ -1477,11 +1477,9 @@ var LibrarySDL = {
       });
     }
 
-    if (width !== canvas.width || height !== canvas.height) {
-      SDL.settingVideoMode = true; // SetVideoMode itself should not trigger resize events
-      Browser.setCanvasSize(width, height);
-      SDL.settingVideoMode = false;
-    }
+    SDL.settingVideoMode = true; // SetVideoMode itself should not trigger resize events
+    Browser.setCanvasSize(width, height);
+    SDL.settingVideoMode = false;
 
     // Free the old surface first if there is one
     if (SDL.screen) {

tests/sdl_fullscreen_samecanvassize.c

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <stdio.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include <assert.h>
+#include <emscripten.h>
+
+int result = 1;
+
+SDL_Surface *screen = 0;
+
+int inFullscreen = 0;
+
+int wasFullscreen = 0;
+
+int finished = 0;
+
+void render() {
+  int width, height, isfs;
+  emscripten_get_canvas_size(&width, &height, &isfs);
+  SDL_Rect rect = { 0, 0, width, height };
+  SDL_FillRect(screen, &rect, 0xff00ffff);
+}
+
+void mainloop() {
+  render();
+
+  if (finished) return;
+
+  SDL_Event event;
+  int isInFullscreen = EM_ASM_INT(return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement));
+  if (isInFullscreen && !wasFullscreen) {
+    printf("Successfully transitioned to fullscreen mode!\n");
+    wasFullscreen = isInFullscreen;
+  }
+
+  if (wasFullscreen && !isInFullscreen) {
+    printf("Exited fullscreen. Test succeeded.\n");
+#ifdef REPORT_RESULT
+    REPORT_RESULT(1);
+#endif
+    wasFullscreen = isInFullscreen;
+    finished = 1;
+    return;
+  }
+
+  int haveEvent = SDL_PollEvent(&event);
+  if (haveEvent) {
+    switch(event.type) {
+      case SDL_MOUSEBUTTONDOWN: {
+        SDL_WM_ToggleFullScreen(screen);
+        inFullscreen = 1 - inFullscreen;
+        if (inFullscreen == 0) {
+          result = wasFullscreen;
+          if (result) {
+            printf("Exited fullscreen. Test succeeded.\n");
+          } else {
+            printf("Exited fullscreen. Test failed, fullscreen transition did not happen!\n");
+          }
+#ifdef REPORT_RESULT
+          REPORT_RESULT(result);
+#endif
+          finished = 1;
+          return;
+        } else {
+          printf("Entering fullscreen...\n");
+        }
+        break;
+      }
+    }
+  }
+}
+
+int main() {
+  int w, h, fs;
+  emscripten_get_canvas_size(&w, &h, &fs);
+  printf("w:%d,h:%d\n", w,h);
+
+  SDL_Init(SDL_INIT_VIDEO);
+
+  screen = SDL_SetVideoMode(w, h, 32, SDL_HWSURFACE); //set with the same size with canvas. this used to break full screen
+
+  printf("You should see a yellow canvas.\n");
+  printf("Click on the canvas to enter full screen, and then click on the canvas again to finish the test.\n");
+  printf("When in full screen, you should see the whole screen filled yellow, and after exiting, the yellow canvas should be restored in the window.\n");
+  emscripten_set_main_loop(mainloop, 0, 0);
+  return 0;
+}

tests/test_interactive.py

@@ -37,6 +37,9 @@ def test_sdl_touch(self):
   def test_sdl_wm_togglefullscreen(self):
     self.btest('sdl_wm_togglefullscreen.c', expected='1')
 
+  def test_sdl_fullscreen_samecanvassize(self):
+    self.btest('sdl_fullscreen_samecanvassize.c', expected='1')
+
   def test_sdl2_togglefullscreen(self):
     self.btest('sdl_togglefullscreen.c', expected='1', args=['-s', 'USE_SDL=2'])