[Scummvm-cvs-logs] SF.net SVN: scummvm: [27206] scummvm/trunk

[anotherguest at users.sourceforge.net]

Revision: 27206
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27206&view=rev
Author:   anotherguest
Date:     2007-06-08 11:09:24 -0700 (Fri, 08 Jun 2007)

Log Message:
-----------
Updated Symbian OS Prediction handling
Updated AGI to only enable predictive input after dictionary was found.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/engines/agi/predictive.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-06-08 18:07:39 UTC (rev 27205)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-06-08 18:09:24 UTC (rev 27206)
@@ -88,8 +88,10 @@
 			else {
 			
 			}
-
-			return;
+			break;
+		case kFeatureDisableKeyFiltering:
+			GUI::Actions::Instance()->beginMapping(enable);
+			break;;
 		default:
 			OSystem_SDL::setFeatureState(f, enable);
 	}
@@ -345,16 +347,21 @@
 				}
 
 				return true;
-
+			case GUI::ACTION_MULTI: {
+				GUI::Key &key = GUI::Actions::Instance()->getKeyAction(loop);
+				// if key code is pause, then change event to interactive or just fall through
+				if(key.keycode() == SDLK_PAUSE) {
+					event.type = Common::EVENT_PREDICTIVE_DIALOG;
+					return true;
+					}
+				}
 			case GUI::ACTION_SAVE:
 			case GUI::ACTION_SKIP:
-			case GUI::ACTION_MULTI:
 			case GUI::ACTION_SKIP_TEXT:
 			case GUI::ACTION_PAUSE:
 			case GUI::ACTION_SWAPCHAR:
 			case GUI::ACTION_FASTMODE:
-			case GUI::ACTION_DEBUGGER:
-				{
+			case GUI::ACTION_DEBUGGER: {
 					GUI::Key &key = GUI::Actions::Instance()->getKeyAction(loop);
 					ev.key.keysym.sym = (SDLKey) key.ascii();
 					ev.key.keysym.scancode= key.keycode();

Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp	2007-06-08 18:07:39 UTC (rev 27205)
+++ scummvm/trunk/engines/agi/predictive.cpp	2007-06-08 18:09:24 UTC (rev 27206)
@@ -121,9 +121,6 @@
 	bool navigationwithkeys = false;
 	bool processkey;
 
-	_predictiveDialogRunning = true;
-	_system->setFeatureState(OSystem::kFeatureDisableKeyFiltering, true);
-	
 	// FIXME: Move this to a more appropriate place.
 	initAsciiToNumTable();
 
@@ -153,6 +150,9 @@
 		if (!_searchTreeRoot)
 			return false;
 	}
+	
+	_predictiveDialogRunning = true;
+	_system->setFeatureState(OSystem::kFeatureDisableKeyFiltering, true);
 
 	memset(repeatcount, 0, MAXWORDLEN);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.