miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emscripten: fixed fullscreen mode switching

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-12-18 23:55:56 +02:00
parent b1afbb0ee9
commit c2f53dfcde
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/video/sdl2_v.cpp
View File

@@ -30,7 +30,10 @@
#include "../safeguards.h" #include "../safeguards.h"
static bool old_ctrl_pressed; static bool old_ctrl_pressed = false;
#ifdef __EMSCRIPTEN__
static bool fullscreen_first_click = false;
#endif
void VideoDriver_SDL_Base::MakeDirty(int left, int top, int width, int height) void VideoDriver_SDL_Base::MakeDirty(int left, int top, int width, int height)
{ {
@@ -142,6 +145,9 @@ bool VideoDriver_SDL_Base::CreateMainWindow(uint w, uint h, uint flags)
if (_fullscreen) { if (_fullscreen) {
flags |= SDL_WINDOW_FULLSCREEN; flags |= SDL_WINDOW_FULLSCREEN;
#ifdef __EMSCRIPTEN__
fullscreen_first_click = true;
#endif
} }
int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED; int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED;
@@ -421,6 +427,21 @@ bool VideoDriver_SDL_Base::PollEvent()
_right_button_down = false; _right_button_down = false;
} }
HandleMouseEvents(); HandleMouseEvents();
#ifdef __EMSCRIPTEN__
if (fullscreen_first_click) {
fullscreen_first_click = false;
EM_ASM(
if (document.documentElement.requestFullscreen) {
console.log("Attempting to set fullscreen mode");
document.documentElement.requestFullscreen().then(() => {
console.log("Seting fullscreen mode success");
}).catch(err => {
console.error("Error setting fullscreen mode: " + err);
});
}
);
}
#endif
break; break;
case SDL_QUIT: case SDL_QUIT:
@@ -671,8 +692,7 @@ bool VideoDriver_SDL_Base::ToggleFullscreen(bool fullscreen)
SDL_GetWindowSize(this->sdl_window, &w, &h); SDL_GetWindowSize(this->sdl_window, &w, &h);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
// This apparently crashes the webapp on iPhone XS with iOS 14.4.2 EM_ASM( if (document.documentElement.requestFullscreen) { document.documentElement.requestFullscreen().then(() => {}).catch(err => {}); } );
EM_ASM( if (document.documentElement.requestFullscreen) { document.documentElement.requestFullscreen(); } );
#endif #endif
/* Find fullscreen window size */ /* Find fullscreen window size */
@@ -682,6 +702,10 @@ bool VideoDriver_SDL_Base::ToggleFullscreen(bool fullscreen)
} else { } else {
SDL_SetWindowSize(this->sdl_window, dm.w, dm.h); SDL_SetWindowSize(this->sdl_window, dm.w, dm.h);
} }
} else {
#ifdef __EMSCRIPTEN__
EM_ASM( if (document.exitFullscreen) { document.exitFullscreen().then(() => {}).catch(err => {}); } );
#endif
} }
Debug(driver, 1, "SDL2: Setting {}", fullscreen ? "fullscreen" : "windowed"); Debug(driver, 1, "SDL2: Setting {}", fullscreen ? "fullscreen" : "windowed");