[Scummvm-cvs-logs] SF.net SVN: scummvm:[39165] scummvm/branches/branch-0-13-0/backends/ platform/symbian
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Fri Mar 6 23:04:16 CET 2009
Revision: 39165
http://scummvm.svn.sourceforge.net/scummvm/?rev=39165&view=rev
Author: anotherguest
Date: 2009-03-06 22:04:16 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
Backport UI updates from trunk (return to global launcher mostly)
Modified Paths:
--------------
scummvm/branches/branch-0-13-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.cpp
scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.h
scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianOS.cpp
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2009-03-06 22:04:16 UTC (rev 39165)
@@ -4,7 +4,7 @@
@WorkingEngines = qw(
scumm agos sky queen gob groovie saga drascula
kyra lure agi touche parallaction cine
- cruise igor made m4 tinsel tucker sword1 sword2
+ cruise igor tinsel tucker sword1 sword2
);
@WorkingEngines_1st = qw(
@@ -26,8 +26,8 @@
@BrokenEngines = qw(
);
- @EnablableEngines1 = (@WorkingEngines_1st, @TestingEngines);
- @EnablableEngines = (@WorkingEngines_2nd, @TestingEngines);
+ #@EnablableEngines1 = (@WorkingEngines_1st, @TestingEngines);
+ @EnablableEngines = (@WorkingEngines, @TestingEngines);
@EnablableSubEngines = qw(
scumm_7_8
@@ -262,8 +262,8 @@
{
# the first one includes all SDKs & release-ready engines
- $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines_1st @EnablableSubEngines";
- $VariationSets{'ALL'}{'all2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines";
+ $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
+ #$VariationSets{'ALL'}{'all2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines";
# now one for each ready-for-release engine
if (0)
{
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2009-03-06 22:04:16 UTC (rev 39165)
@@ -128,3 +128,5 @@
LIBRARY gdi.lib hal.lib bitgdi.lib
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
library avkon.lib bafl.lib
+
+CAPABILITY LocalServices ReadUserData
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2009-03-06 22:04:16 UTC (rev 39165)
@@ -128,3 +128,5 @@
LIBRARY gdi.lib hal.lib bitgdi.lib
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
library avkon.lib bafl.lib
+
+CAPABILITY LocalServices ReadUserData
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.cpp 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.cpp 2009-03-06 22:04:16 UTC (rev 39165)
@@ -52,17 +52,20 @@
"Pause",
"Fast mode",
"Quit",
- "Debugger"
+ "Debugger",
+ "Global menu",
+ "Virtual keyboard",
+ "Key mapper"
};
#ifdef UIQ
-static const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, '9', 0, 0, SDLK_PAGEUP, 0, 0, 0, 0};
+static const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, '9', 0, 0, SDLK_PAGEUP, 0, 0, 0, 0, 0, 0, 0};
#elif defined (S60)
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9', 0, 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9', 0, 0, 0, 0, 0, 0, 0, '0', 0, 0};
#elif defined (S90)
-const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0 , 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0 , 0, 0, 0, 0, 0, 0, 0, 0 ,0};
#else
-const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0, 0, 0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0, 0, 0, '1', 0 ,0};
#endif
// creator function according to Factory Pattern
@@ -122,6 +125,14 @@
// Skip
_action_enabled[ACTION_SKIP] = true;
_key_action[ACTION_SKIP].setKey(SDLK_ESCAPE);
+
+ // Enable keymappings
+ _action_enabled[ACTION_KEYMAPPER] = true;
+ _key_action[ACTION_KEYMAPPER].setKey(Common::ASCII_F8, Common::KEYCODE_F8);
+
+ // Enable VKB
+ _action_enabled[ACTION_VKB] = true;
+ _key_action[ACTION_VKB].setKey(Common::ASCII_F7, Common::KEYCODE_F7);
}
void SymbianActions::initInstanceGame() {
@@ -145,12 +156,18 @@
bool is_drascula = (strncmp(gameid.c_str(), "drascula",8) == 0);
bool is_tucker = (gameid == "tucker");
bool is_groovie = (gameid == "groovie");
+ bool is_cruise = (gameid == "cruise");
Actions::initInstanceGame();
// Initialize keys for different actions
// Pause
- _key_action[ACTION_PAUSE].setKey(' ');
+ if(is_cruise) {
+ _key_action[ACTION_PAUSE].setKey('P');
+ }
+ else {
+ _key_action[ACTION_PAUSE].setKey(' ');
+ }
_action_enabled[ACTION_PAUSE] = true;
@@ -164,7 +181,7 @@
_key_action[ACTION_SAVE].setKey(Common::ASCII_F1, Common::KEYCODE_F1); // F1 key for FOTAQ
} else if (is_sky) {
_key_action[ACTION_SAVE].setKey(Common::ASCII_F5, Common::KEYCODE_F5);
- } else if (is_cine || is_drascula) {
+ } else if (is_cine || is_drascula || is_cruise) {
_key_action[ACTION_SAVE].setKey(Common::ASCII_F10, Common::KEYCODE_F10); // F10
} else if (is_agi) {
_key_action[ACTION_SAVE].setKey(Common::ASCII_ESCAPE, Common::KEYCODE_ESCAPE);
@@ -213,8 +230,10 @@
_action_enabled[ACTION_DEBUGGER] = true;
_key_action[ACTION_DEBUGGER].setKey('d', Common::KEYCODE_d, KMOD_CTRL);
+ // Enable global menu
+ _action_enabled[ACTION_MAINMENU] = true;
+ _key_action[ACTION_MAINMENU].setKey(Common::ASCII_F5, Common::KEYCODE_F5, KMOD_CTRL);
-
}
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.h
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.h 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianActions.h 2009-03-06 22:04:16 UTC (rev 39165)
@@ -52,6 +52,9 @@
ACTION_FASTMODE,
ACTION_QUIT,
ACTION_DEBUGGER,
+ ACTION_MAINMENU,
+ ACTION_VKB,
+ ACTION_KEYMAPPER,
ACTION_LAST
};
Modified: scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianOS.cpp 2009-03-06 21:41:13 UTC (rev 39164)
+++ scummvm/branches/branch-0-13-0/backends/platform/symbian/src/SymbianOS.cpp 2009-03-06 22:04:16 UTC (rev 39165)
@@ -426,7 +426,10 @@
case GUI::ACTION_PAUSE:
case GUI::ACTION_SWAPCHAR:
case GUI::ACTION_FASTMODE:
- case GUI::ACTION_DEBUGGER: {
+ case GUI::ACTION_DEBUGGER:
+ case GUI::ACTION_MAINMENU:
+ case GUI::ACTION_VKB:
+ case GUI::ACTION_KEYMAPPER:{
GUI::Key &key = GUI::Actions::Instance()->getKeyAction(loop);
ev.key.keysym.sym = (SDLKey) key.keycode();
ev.key.keysym.scancode = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list