Merge pull request #514 from somaen/fullscreenSwap

GRIM: Add support for ALT-ENTER fullscreen-swapping.

backends/graphics/surfacesdl/surfacesdl-graphics.cpp

@@ -92,10 +92,22 @@ bool SurfaceSdlGraphicsManager::hasFeature(OSystem::Feature f) {
 }
 
 void SurfaceSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
+	switch (f) {
+		case OSystem::kFeatureFullscreenMode:
+			_fullscreen = enable;
+			break;
+		default:
+			break;
+	}
 }
 
 bool SurfaceSdlGraphicsManager::getFeatureState(OSystem::Feature f) {
-	return false;
+	switch (f) {
+		case OSystem::kFeatureFullscreenMode:
+			return _fullscreen;
+		default:
+			return false;
+	}
 }
 
 void SurfaceSdlGraphicsManager::launcherInitSize(uint w, uint h) {

engines/grim/gfx_base.h

@@ -76,11 +76,19 @@ public:
 	virtual byte *setupScreen(int screenW, int screenH, bool fullscreen) = 0;
 
 	/**
-	 *	Query whether the current context is hardware-accelerated
+	 * Query whether the current context is hardware-accelerated
 	 *
 	 * @return true if hw-accelerated, false otherwise
 	 */
 	virtual bool isHardwareAccelerated() = 0;
+	/**
+	 * Query whether the current context is fullscreen.
+	 *
+	 * @return true if fullscreen, false otherwise
+	 */
+	virtual bool isFullscreen() { return _isFullscreen; }
+	virtual uint getScreenWidth() { return _screenWidth; }
+	virtual uint getScreenHeight() { return _screenHeight; }
 
 	virtual void setupCamera(float fov, float nclip, float fclip, float roll) = 0;
 	virtual void positionCamera(Math::Vector3d pos, Math::Vector3d interest) = 0;

engines/grim/grim.cpp

@@ -76,10 +76,6 @@
 
 namespace Grim {
 
-// CHAR_KEY tests to see whether a keycode is for
-// a "character" handler or a "button" handler
-#define CHAR_KEY(k) ((k >= 'a' && k <= 'z') || (k >= 'A' && k <= 'Z') || (k >= '0' && k <= '9') || k == ' ')
-
 GrimEngine *g_grim = NULL;
 GfxBase *g_driver = NULL;
 int g_imuseState = -1;
@@ -332,50 +328,6 @@ void GrimEngine::handleUserPaint() {
 	}
 }
 
-void GrimEngine::handleChars(int operation, int key, int /*keyModifier*/, uint16 ascii) {
-	if (!CHAR_KEY(ascii))
-		return;
-
-	char keychar[2];
-	keychar[0] = ascii;
-	keychar[1] = 0;
-
-	LuaObjects objects;
-	objects.add(keychar);
-
-	if (!LuaBase::instance()->callback("characterHandler", objects)) {
-		error("handleChars: invalid handler");
-	}
-}
-
-void GrimEngine::handleControls(int operation, int key, int /*keyModifier*/, uint16 ascii) {
-	// If we're not supposed to handle the key then don't
-	if (!_controlsEnabled[key])
-		return;
-
-	LuaObjects objects;
-	objects.add(key);
-	if (operation == Common::EVENT_KEYDOWN) {
-		objects.add(1);
-		objects.add(1);
-	} else {
-		objects.addNil();
-		objects.add(0);
-	}
-	objects.add(0);
-	if (!LuaBase::instance()->callback("buttonHandler", objects)) {
-		error("handleControls: invalid keys handler");
-	}
-// 	if (!LuaBase::instance()->callback("axisHandler", objects)) {
-// 		error("handleControls: invalid joystick handler");
-// 	}
-
-	if (operation == Common::EVENT_KEYDOWN)
-		_controlsState[key] = true;
-	else if (operation == Common::EVENT_KEYUP)
-		_controlsState[key] = false;
-}
-
 void GrimEngine::cameraChangeHandle(int prev, int next) {
 	LuaObjects objects;
 	objects.add(prev);
@@ -622,6 +574,7 @@ void GrimEngine::mainLoop() {
 	_shortFrame = false;
 	bool resetShortFrame = false;
 	_changeHardwareState = false;
+	_changeFullscreenState = false;
 
 	for (;;) {
 		uint32 startTime = g_system->getMillis();
@@ -639,9 +592,18 @@ void GrimEngine::mainLoop() {
 			savegameSave();
 		}
 
-		if (_changeHardwareState) {
+		if (_changeHardwareState || _changeFullscreenState) {
 			_changeHardwareState = false;
+			bool fullscreen = g_driver->isFullscreen();	
+			if (_changeFullscreenState) {
+				fullscreen = !fullscreen;
+			}
+			g_system->setFeatureState(OSystem::kFeatureFullscreenMode, fullscreen);
+			g_registry->set("fullscreen", (fullscreen ? "true" : "false"));
 
+			uint screenWidth = g_driver->getScreenWidth();
+			uint screenHeight = g_driver->getScreenHeight();
+			
 			EngineMode mode = getMode();
 
 			_savegameFileName = "";
@@ -655,7 +617,7 @@ void GrimEngine::mainLoop() {
 				g_driver = CreateGfxOpenGL();
 			}
 
-			g_driver->setupScreen(640, 480, false);
+			g_driver->setupScreen(screenWidth, screenHeight, fullscreen);
 			savegameRestore();
 
 			if (mode == DrawMode) {
@@ -665,6 +627,7 @@ void GrimEngine::mainLoop() {
 				g_driver->dimScreen();
 			}
 			setMode(mode);
+			_changeFullscreenState = false;
 		}
 
 		g_imuse->flushTracks();

engines/grim/grim.h

@@ -203,6 +203,7 @@ private:
 	bool *_controlsState;
 
 	bool _changeHardwareState;
+	bool _changeFullscreenState;
 
 	Actor *_selectedActor;
 	Actor *_talkingActor;

engines/grim/grim_controls.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "common/events.h"
-
+#include "engines/grim/lua.h"
 #include "engines/grim/grim.h"
 
 namespace Grim {
@@ -267,5 +267,58 @@ const ControlDescriptor controls[] = {
 	{ NULL, 0 }
 };
 
+// CHAR_KEY tests to see whether a keycode is for
+// a "character" handler or a "button" handler
+#define CHAR_KEY(k) ((k >= 'a' && k <= 'z') || (k >= 'A' && k <= 'Z') || (k >= '0' && k <= '9') || k == ' ')
+
+void GrimEngine::handleChars(int operation, int key, int /*keyModifier*/, uint16 ascii) {
+	if (!CHAR_KEY(ascii))
+		return;
+
+	char keychar[2];
+	keychar[0] = ascii;
+	keychar[1] = 0;
+	
+	LuaObjects objects;
+	objects.add(keychar);
+	
+	if (!LuaBase::instance()->callback("characterHandler", objects)) {
+		error("handleChars: invalid handler");
+	}
+}
+
+void GrimEngine::handleControls(int operation, int key, int keyModifier, uint16 ascii) {
+	// Might also want to support keypad-enter?
+	if (keyModifier == Common::KBD_ALT && key == Common::KEYCODE_RETURN && operation == Common::EVENT_KEYDOWN) {
+		_changeFullscreenState = true;
+	}
+
+	// If we're not supposed to handle the key then don't	
+	if (!_controlsEnabled[key])
+		return;
+
+	LuaObjects objects;
+	objects.add(key);
+	if (operation == Common::EVENT_KEYDOWN) {
+		objects.add(1);
+		objects.add(1);
+	} else {
+		objects.addNil();
+		objects.add(0);
+	}
+	objects.add(0);
+	if (!LuaBase::instance()->callback("buttonHandler", objects)) {
+		error("handleControls: invalid keys handler");
+	}
+	// 	if (!LuaBase::instance()->callback("axisHandler", objects)) {
+	// 		error("handleControls: invalid joystick handler");
+	// 	}
+
+	if (operation == Common::EVENT_KEYDOWN)
+		_controlsState[key] = true;
+	else if (operation == Common::EVENT_KEYUP)
+		_controlsState[key] = false;
+}
+
 } // end of namespace Grim