OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 16 insertions, 3 deletions

diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 5923e501cf..5d469eda7b 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -149,7 +149,7 @@ SciEvent EventManager::getScummVMEvent() {
 		found = em->pollEvent(ev);
 	}
 
-	if (found && !ev.synthetic && ev.type != Common::EVENT_MOUSEMOVE) {
+	if (found && ev.type != Common::EVENT_MOUSEMOVE) {
 		int modifiers = em->getModifierState();
 
 		// We add the modifier key status to buckybits
@@ -215,6 +215,11 @@ SciEvent EventManager::getScummVMEvent() {
 					else
 						input.character = SCI_KEY_TAB;
 				}
+				if (input.data == Common::KEYCODE_DELETE) {
+					// Delete key
+					input.type = SCI_EVENT_KEYBOARD;
+					input.data = input.character = SCI_KEY_DELETE;
+				}
 			} else if ((input.data >= Common::KEYCODE_F1) && input.data <= Common::KEYCODE_F10) {
 				// F1-F10
 				input.type = SCI_EVENT_KEYBOARD;
@@ -346,9 +351,17 @@ SciEvent EventManager::getScummVMEvent() {
 void EventManager::updateScreen() {
 	// Update the screen here, since it's called very often.
 	// Throttle the screen update rate to 60fps.
-	if (g_system->getMillis() - g_sci->getEngineState()->_screenUpdateTime >= 1000 / 60) {
+	EngineState *s = g_sci->getEngineState();
+	if (g_system->getMillis() - s->_screenUpdateTime >= 1000 / 60) {
 		g_system->updateScreen();
-		g_sci->getEngineState()->_screenUpdateTime = g_system->getMillis();
+		s->_screenUpdateTime = g_system->getMillis();
+		// Throttle the checking of shouldQuit() to 60fps as well, since 
+		// Engine::shouldQuit() invokes 2 virtual functions
+		// (EventManager::shouldQuit() and EventManager::shouldRTL()),
+		// which is very expensive to invoke constantly without any
+		// throttling at all.
+		if (g_engine->shouldQuit())
+			s->abortScriptProcessing = kAbortQuitGame;
 	}
 }