[Scummvm-git-logs] scummvm master -> c73d66adb5d2ad963b745b1991772bf1d30b9ec7

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6ffc90412c SDL: mapKey changed as virtual function
a7ec02d887 ANDROIDSDL: fixed switching to capital letter
c73d66adb5 Merge pull request #834 from lubomyr/master


Commit: 6ffc90412cc8ef9af667d467197e36a5998e9ab4
    https://github.com/scummvm/scummvm/commit/6ffc90412cc8ef9af667d467197e36a5998e9ab4
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-09-20T19:48:14+03:00

Commit Message:
SDL: mapKey changed as virtual function

Changed paths:
    backends/events/sdl/sdl-events.h



diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 7e590ae..4526065 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -125,7 +125,7 @@ protected:
 	/**
 	 * Maps the ASCII value of key
 	 */
-	int mapKey(SDLKey key, SDLMod mod, Uint16 unicode);
+	virtual int mapKey(SDLKey key, SDLMod mod, Uint16 unicode);
 
 	/**
 	 * Configures the key modifiers flags status


Commit: a7ec02d887db18be42370bed85e8641c2f8d432b
    https://github.com/scummvm/scummvm/commit/a7ec02d887db18be42370bed85e8641c2f8d432b
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-09-21T14:09:00+03:00

Commit Message:
ANDROIDSDL: fixed switching to capital letter

Changed paths:
    backends/events/androidsdl/androidsdl-events.cpp
    backends/events/androidsdl/androidsdl-events.h



diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp
index 7ea8ff1..18e696a 100644
--- a/backends/events/androidsdl/androidsdl-events.cpp
+++ b/backends/events/androidsdl/androidsdl-events.cpp
@@ -82,4 +82,22 @@ bool AndroidSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	return false;
 }
 
+int AndroidSdlEventSource::mapKey(SDLKey sdlKey, SDLMod mod, Uint16 unicode) {
+	Common::KeyCode key = SDLToOSystemKeycode(sdlKey);
+	
+	if (key >= Common::KEYCODE_F1 && key <= Common::KEYCODE_F9) {
+		return key - Common::KEYCODE_F1 + Common::ASCII_F1;
+	} else if (key >= Common::KEYCODE_KP0 && key <= Common::KEYCODE_KP9) {
+		return key - Common::KEYCODE_KP0 + '0';
+	} else if (key >= Common::KEYCODE_UP && key <= Common::KEYCODE_PAGEDOWN) {
+		return key;
+	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) {
+		return key & ~0x20;
+	} else if (key >= Common::KEYCODE_NUMLOCK && key <= Common::KEYCODE_EURO) {
+		return 0;
+	} else {
+		return key;
+	}
+}
+
 #endif
diff --git a/backends/events/androidsdl/androidsdl-events.h b/backends/events/androidsdl/androidsdl-events.h
index bca712e..723a23b 100644
--- a/backends/events/androidsdl/androidsdl-events.h
+++ b/backends/events/androidsdl/androidsdl-events.h
@@ -32,6 +32,7 @@ class AndroidSdlEventSource : public SdlEventSource {
 protected:
 	virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
 	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
+	virtual int mapKey(SDLKey key, SDLMod mod, Uint16 unicode);
 };
 
 #endif


Commit: c73d66adb5d2ad963b745b1991772bf1d30b9ec7
    https://github.com/scummvm/scummvm/commit/c73d66adb5d2ad963b745b1991772bf1d30b9ec7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-23T17:07:54+02:00

Commit Message:
Merge pull request #834 from lubomyr/master

ANDROIDSDL: fixed switching to capital letter

Changed paths:
    backends/events/androidsdl/androidsdl-events.cpp
    backends/events/androidsdl/androidsdl-events.h
    backends/events/sdl/sdl-events.h