aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
Diffstat (limited to 'backends')
-rw-r--r--backends/events/maemosdl/maemosdl-events.cpp28
-rwxr-xr-xbackends/platform/maemo/debian/rules1
-rw-r--r--backends/platform/maemo/maemo.cpp4
3 files changed, 27 insertions, 6 deletions
diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 6a62f53950..e111bf574b 100644
--- a/backends/events/maemosdl/maemosdl-events.cpp
+++ b/backends/events/maemosdl/maemosdl-events.cpp
@@ -52,8 +52,16 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
processMouseEvent(event, _km.x, _km.y);
return true;
} else if (ev.key.keysym.sym == SDLK_F8) {
- // handled in keyup
- return true;
+ if (ev.key.keysym.mod & KMOD_CTRL) {
+ event.type = Common::EVENT_KEYDOWN;
+ event.kbd.keycode = Common::KEYCODE_F7;
+ event.kbd.ascii = Common::ASCII_F7;
+ event.kbd.flags = 0;
+ return true;
+ } else {
+ // handled in keyup
+ return true;
+ }
}
break;
}
@@ -72,10 +80,18 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
processMouseEvent(event, _km.x, _km.y);
return true;
} else if (ev.key.keysym.sym == SDLK_F8) {
- _clickEnabled = !_clickEnabled;
- ((SurfaceSdlGraphicsManager*) _graphicsManager)->displayMessageOnOSD(
- _clickEnabled ? _("Clicking Enabled") : _("Clicking Disabled"));
- return true;
+ if (ev.key.keysym.mod & KMOD_CTRL) {
+ event.type = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_F7;
+ event.kbd.ascii = Common::ASCII_F7;
+ event.kbd.flags = 0;
+ return true;
+ } else {
+ _clickEnabled = !_clickEnabled;
+ ((SurfaceSdlGraphicsManager*) _graphicsManager)->displayMessageOnOSD(
+ _clickEnabled ? _("Clicking Enabled") : _("Clicking Disabled"));
+ return true;
+ }
}
break;
}
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 018f53bb11..7613df25b4 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -45,6 +45,7 @@ install: build
install -m0644 -d debian/scummvm/opt/scummvm/share
install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share
install -m0644 gui/themes/scummclassic.zip gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
+ install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
# for optified version we can also add engine datafiles
install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/m4.dat dists/engine-data/mads.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 8362c0785e..1fb7ad0691 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -23,11 +23,13 @@
#if defined(MAEMO)
#include "common/scummsys.h"
+#include "common/config-manager.h"
#include "backends/platform/maemo/maemo.h"
#include "backends/events/maemosdl/maemosdl-events.h"
#include "common/textconsole.h"
+
#include <SDL/SDL_syswm.h>
#include <X11/Xutil.h>
@@ -41,6 +43,8 @@ void OSystem_SDL_Maemo::initBackend() {
if (_eventSource == 0)
_eventSource = new MaemoSdlEventSource();
+ ConfMan.set("vkeybdpath", DATA_PATH);
+
// Call parent implementation of this method
OSystem_POSIX::initBackend();
}