Merged the FSNode branch with trunk r27031:27680

svn-id: r27681

4 files changed, 55 insertions, 46 deletions

diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index bc7f0eecde..2b3c2c18fe 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -52,14 +52,14 @@
 static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode)
 {
 	if (key >= SDLK_F1 && key <= SDLK_F9) {
-		return key - SDLK_F1 + 315;
+		return key - SDLK_F1 + Common::ASCII_F1;
 	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
 		return key - SDLK_KP0 + '0';
 	} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
 		return key;
 	} else if (unicode) {
 		return unicode;
-	} else if (key >= 'a' && key <= 'z' && mod & KMOD_SHIFT) {
+	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) {
 		return key & ~0x20;
 	} else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
 		return 0;
@@ -265,7 +265,7 @@ bool OSystem_SDL::pollEvent(Common::Event &event) {
 				return true;
 
 			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = ev.key.keysym.sym;
+			event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
 			event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
 
 			return true;
@@ -278,7 +278,7 @@ bool OSystem_SDL::pollEvent(Common::Event &event) {
 				return true;
 
 			event.type = Common::EVENT_KEYUP;
-			event.kbd.keycode = ev.key.keysym.sym;
+			event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
 			event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
 			b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
 
@@ -337,19 +337,19 @@ bool OSystem_SDL::pollEvent(Common::Event &event) {
 				event.type = Common::EVENT_KEYDOWN;
 				switch (ev.jbutton.button) {
 				case JOY_BUT_ESCAPE:
-					event.kbd.keycode = SDLK_ESCAPE;
+					event.kbd.keycode = Common::KEYCODE_ESCAPE;
 					event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_PERIOD:
-					event.kbd.keycode = SDLK_PERIOD;
+					event.kbd.keycode = Common::KEYCODE_PERIOD;
 					event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_SPACE:
-					event.kbd.keycode = SDLK_SPACE;
+					event.kbd.keycode = Common::KEYCODE_SPACE;
 					event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_F5:
-					event.kbd.keycode = SDLK_F5;
+					event.kbd.keycode = Common::KEYCODE_F5;
 					event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 					break;
 				}
@@ -367,19 +367,19 @@ bool OSystem_SDL::pollEvent(Common::Event &event) {
 				event.type = Common::EVENT_KEYUP;
 				switch (ev.jbutton.button) {
 				case JOY_BUT_ESCAPE:
-					event.kbd.keycode = SDLK_ESCAPE;
+					event.kbd.keycode = Common::KEYCODE_ESCAPE;
 					event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_PERIOD:
-					event.kbd.keycode = SDLK_PERIOD;
+					event.kbd.keycode = Common::KEYCODE_PERIOD;
 					event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_SPACE:
-					event.kbd.keycode = SDLK_SPACE;
+					event.kbd.keycode = Common::KEYCODE_SPACE;
 					event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 					break;
 				case JOY_BUT_F5:
-					event.kbd.keycode = SDLK_F5;
+					event.kbd.keycode = Common::KEYCODE_F5;
 					event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 					break;
 				}
@@ -455,21 +455,21 @@ bool OSystem_SDL::remapKey(SDL_Event &ev,Common::Event &event) {
 	// Map menu key to f5 (scumm menu)
 	if (ev.key.keysym.sym == 306) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_F5;
+		event.kbd.keycode = Common::KEYCODE_F5;
 		event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 		return true;
 	}
 	// Map action key to action
 	if (ev.key.keysym.sym == 291) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_TAB;
+		event.kbd.keycode = Common::KEYCODE_TAB;
 		event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
 		return true;
 	}
 	// Map OK key to skip cinematic
 	if (ev.key.keysym.sym == 292) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_ESCAPE;
+		event.kbd.keycode = Common::KEYCODE_ESCAPE;
 		event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 		return true;
 	}
@@ -485,7 +485,7 @@ bool OSystem_SDL::remapKey(SDL_Event &ev,Common::Event &event) {
 	// Map menu key (f11) to f5 (scumm menu)
 	if (ev.key.keysym.sym == SDLK_F11) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_F5;
+		event.kbd.keycode = Common::KEYCODE_F5;
 		event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 	}
 	// Nap center (space) to tab (default action )
@@ -493,13 +493,13 @@ bool OSystem_SDL::remapKey(SDL_Event &ev,Common::Event &event) {
 	//
 	else if (ev.key.keysym.sym == SDLK_SPACE) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_TAB;
+		event.kbd.keycode = Common::KEYCODE_TAB;
 		event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
 	}
 	// Since we stole space (pause) above we'll rebind it to the tab key on the keyboard
 	else if (ev.key.keysym.sym == SDLK_TAB) {
 		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = SDLK_SPACE;
+		event.kbd.keycode = Common::KEYCODE_SPACE;
 		event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 	} else {
 	// Let the events fall through if we didn't change them, this may not be the best way to
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 212eb43585..f93c806aa8 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -761,22 +761,6 @@ void OSystem_SDL::setAspectRatioCorrection(bool enable) {
 	}
 }
 
-void OSystem_SDL::clearScreen() {
-	assert (_transactionMode == kTransactionNone);
-
-	// Try to lock the screen surface
-	if (SDL_LockSurface(_screen) == -1)
-		error("SDL_LockSurface failed: %s", SDL_GetError());
-
-	byte *dst = (byte *)_screen->pixels;
-
-	// Clear the screen
-	memset(dst, 0, _screenWidth * _screenHeight);
-
-	// Unlock the screen surface
-	SDL_UnlockSurface(_screen);
-}
-
 void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) {
 	assert (_transactionMode == kTransactionNone);
 	assert(src);
@@ -848,24 +832,44 @@ void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int
 	SDL_UnlockSurface(_screen);
 }
 
-bool OSystem_SDL::grabRawScreen(Graphics::Surface *surf) {
-	assert(_screen);
-	assert(surf);
+Graphics::Surface *OSystem_SDL::lockScreen() {
+	assert (_transactionMode == kTransactionNone);
 
-	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+	// Lock the graphics mutex
+	lockMutex(_graphicsMutex);
 
-	surf->create(_screenWidth, _screenHeight, _screen->format->BytesPerPixel);
+	// paranoia check
+	assert(!_screenIsLocked);
+	_screenIsLocked = true;
 
 	// Try to lock the screen surface
 	if (SDL_LockSurface(_screen) == -1)
 		error("SDL_LockSurface failed: %s", SDL_GetError());
 
-	memcpy(surf->pixels, _screen->pixels, _screenWidth * _screenHeight * _screen->format->BytesPerPixel);
+	_framebuffer.pixels = _screen->pixels;
+	_framebuffer.w = _screen->w;
+	_framebuffer.h = _screen->h;
+	_framebuffer.pitch = _screen->pitch;
+	_framebuffer.bytesPerPixel = 1;
+
+	return &_framebuffer;
+}
+
+void OSystem_SDL::unlockScreen() {
+	assert (_transactionMode == kTransactionNone);
+
+	// paranoia check
+	assert(_screenIsLocked);
+	_screenIsLocked = false;
 
 	// Unlock the screen surface
 	SDL_UnlockSurface(_screen);
 
-	return true;
+	// Trigger a full screen update
+	_forceFull = true;
+
+	// Finally unlock the graphics mutex
+	unlockMutex(_graphicsMutex);
 }
 
 void OSystem_SDL::addDirtyRect(int x, int y, int w, int h, bool realCoordinates) {
@@ -1597,6 +1601,8 @@ void OSystem_SDL::displayMessageOnOSD(const char *msg) {
 	assert (_transactionMode == kTransactionNone);
 	assert(msg);
 
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
+
 	uint i;
 
 	// Lock the OSD surface for drawing
diff --git a/backends/platform/sdl/sdl-common.h b/backends/platform/sdl/sdl-common.h
index e66ca71e7f..4795b22a53 100644
--- a/backends/platform/sdl/sdl-common.h
+++ b/backends/platform/sdl/sdl-common.h
@@ -92,11 +92,8 @@ public:
 	// The screen will not be updated to reflect the new bitmap
 	virtual void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h); // overloaded by CE backend (FIXME)
 
-	// Copies the screen to a buffer
-	bool grabRawScreen(Graphics::Surface *surf);
-
-	// Clear the screen
-	void clearScreen();
+	virtual Graphics::Surface *lockScreen();
+	virtual void unlockScreen();
 
 	// Update the dirty areas of the screen
 	void updateScreen();
@@ -218,6 +215,8 @@ protected:
 
 	// unseen game screen
 	SDL_Surface *_screen;
+	
+	// TODO: We could get rid of the following two vars and just use _screen instead
 	int _screenWidth, _screenHeight;
 
 	// temporary screen (for scalers)
@@ -274,6 +273,9 @@ protected:
 	int _mode;
 	int _transactionMode;
 	bool _fullscreen;
+	
+	bool _screenIsLocked;
+	Graphics::Surface _framebuffer;
 
 	/** Current video mode flags (see DF_* constants) */
 	uint32 _modeFlags;
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 0fe16e0520..fe78bd4236 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -243,6 +243,7 @@ OSystem_SDL::OSystem_SDL()
 	_savefile(0),
 	_mixer(0),
 	_timer(0),
+	_screenIsLocked(false),
 	_graphicsMutex(0), _transactionMode(kTransactionNone) {
 
 	// allocate palette storage