aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorMichael Riss <Michael.Riss@gmx.de>2013-02-11 22:03:25 +0100
committerMichael Riss <Michael.Riss@gmx.de>2013-03-06 10:43:17 +0100
commit0b364c0894cafda3c925639a9835c67c36bbc882 (patch)
tree3997aaadf7639b6727c58234fca03b66603a31f1 /src/library_sdl.js
parent97407b218c6d816e964f1faa1420db46ea1fec3c (diff)
Improved fullscreen functionality.
- the requestFullScreen function now has two boolean arguments: "doLockPointer" and "doResizeCanvas" - when using "doResizeCanvas", the SDL application gets notified via the "SDL_VIDEORESIZE" event of the new resolution, the old resolution setting is saved and gets restored when the canvas returns to windowed mode - when setting "doLockPointer" to false the mouse pointer remains visible in fullscreen mode and allows e.g. RTS (Real Time Strategy) type games - the SDL application can check via the "SDL_FULLSCREEN" flag in the flags field of the SDL_Surface struct whether the canvas is currently in fullscreen mode or not. - depending on the browser the SDL application can switch out of the fullscreen mode with the "SDL_WM_ToggleFullScreen(SDL_Surface*);" call (currently chrome supports it, firefox does not) - Also, the requestFullScreen has been fixed to avoid repeated adding of the event listeners every time requestFullScreen is called. - src/shell.html got changed to demonstrate all variants to switch to fullscreen mode Note: Due to the security model of web browsers, the SDL model cannot be fully supported. What is not possible? - Initiating the switch to fullscreen from the SDL application. - Initiating the pointer lock from the SDL application when *not* in fullscreen mode How to work around the limitations? All the actions that cannot be initiated by the SDL application have to be initiated by the web browser instead. A good practice should be to start the application in windowed mode and have a button situated close to the canvas which switches the canvas into fullscreen mode and also changes the canvas size to fullscreen resolution. This way, the SDL application receives a SDL_VIDEORESIZE event and can check in the even handler whether it is now in fullscreen mode and take further actions. When leaving fullscreen mode the old windowed canvas resolution gets restored and triggers another SDL_VIDEORESIZE event which - again - can be used to adapt the application to windowed mode. Signed-off-by: Michael Riss <Michael.Riss@gmx.de>
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index d707a8bf..ec3c5455 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -661,8 +661,8 @@ var LibrarySDL = {
{{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*0', '0', '0', 'i32') }}} // TODO
{{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*1', '0', '0', 'i32') }}} // TODO
{{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*2', '0', '0', 'void*') }}}
- {{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*3', '0', 'SDL.defaults.width', 'i32') }}}
- {{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*4', '0', 'SDL.defaults.height', 'i32') }}}
+ {{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*3', '0', 'Module[\'canvas\'].width', 'i32') }}}
+ {{{ makeSetValue('ret+Runtime.QUANTUM_SIZE*4', '0', 'Module[\'canvas\'].height', 'i32') }}}
return ret;
},
@@ -919,7 +919,11 @@ var LibrarySDL = {
},
SDL_ShowCursor: function(toggle) {
- // TODO
+ if(toggle){
+ Module['canvas'].exitPointerLock();
+ } else {
+ Module['canvas'].requestPointerLock();
+ }
},
SDL_GetError: function() {
@@ -1075,6 +1079,10 @@ var LibrarySDL = {
},
SDL_WM_GrabInput: function() {},
+
+ SDL_WM_ToggleFullScreen: function(surf) {
+ Module['canvas'].cancelFullScreen();
+ },
// SDL_Image