[Scummvm-cvs-logs] scummvm master -> f28ced2e962e2241b511737111a1905af77b62a9
tsoliman
tarek at bashasoliman.com
Fri Feb 5 08:16:42 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f28ced2e96 MAEMO: Fix default bindings
Commit: f28ced2e962e2241b511737111a1905af77b62a9
https://github.com/scummvm/scummvm/commit/f28ced2e962e2241b511737111a1905af77b62a9
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2016-02-05T01:06:54-06:00
Commit Message:
MAEMO: Fix default bindings
This code depended on the off by one
bug fixed in 9b8b737
Changed paths:
backends/platform/maemo/maemo.cpp
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 5fdcdda..dc10549 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -52,31 +52,31 @@ OSystem_SDL_Maemo::~OSystem_SDL_Maemo() {
#ifdef ENABLE_KEYMAPPER
static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymapperDefaultBindings, Model _model) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "REM", "HOME");
- _keymapperDefaultBindings->setDefaultBinding("global", "REM", "HOME");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "REMP", "HOME");
+ _keymapperDefaultBindings->setDefaultBinding("global", "REMP", "HOME");
if (_model.hasMenuKey && _model.hasHwKeyboard) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "FUL", "FULLSCREEN");
- _keymapperDefaultBindings->setDefaultBinding("global", "FUL", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "FULS", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("global", "FULS", "FULLSCREEN");
}
if (_model.hasHwKeyboard) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "C+ZOOMMINUS");
- _keymapperDefaultBindings->setDefaultBinding("global", "VIR", "C+ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "VIRT", "C+ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("global", "VIRT", "C+ZOOMMINUS");
} else {
- _keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "FULLSCREEN");
- _keymapperDefaultBindings->setDefaultBinding("global", "VIR", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "VIRT", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("global", "VIRT", "FULLSCREEN");
}
if (_model.hasMenuKey )
- _keymapperDefaultBindings->setDefaultBinding("global", "MEN", "MENU");
+ _keymapperDefaultBindings->setDefaultBinding("global", "MENU", "MENU");
else
- _keymapperDefaultBindings->setDefaultBinding("global", "MEN", "S+C+M");
+ _keymapperDefaultBindings->setDefaultBinding("global", "MENU", "S+C+M");
- _keymapperDefaultBindings->setDefaultBinding("gui", "CLO", "ESCAPE");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "CLOS", "ESCAPE");
- _keymapperDefaultBindings->setDefaultBinding("maemo", "RCL", "ZOOMPLUS");
- _keymapperDefaultBindings->setDefaultBinding("maemo", "CLK", "ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("maemo", "RCLK", "ZOOMPLUS");
+ _keymapperDefaultBindings->setDefaultBinding("maemo", "CLKM", "ZOOMMINUS");
}
#endif
More information about the Scummvm-git-logs
mailing list