[Scummvm-cvs-logs] scummvm master -> d5d2b39e08238505ec76e9593dd5dfc39820b9c0

digitall dgturner at iee.org
Sun Oct 26 17:45:56 CET 2014


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

Summary:
e738de70e5 WII: missing ASCII codes for some keys
d5d2b39e08 Merge pull request #524 from AReim1982/WII-1.7.0-Beta-2


Commit: e738de70e51a1b348759d38756660e161567f991
    https://github.com/scummvm/scummvm/commit/e738de70e51a1b348759d38756660e161567f991
Author: Alexander Reim (alexander at areim.de)
Date: 2014-10-23T09:19:48+02:00

Commit Message:
WII: missing ASCII codes for some keys

Changed paths:
    backends/platform/wii/osystem_events.cpp



diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 0563639..13f5d1f 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -70,73 +70,73 @@
 #endif
 
 #ifdef USE_WII_KBD
-static int keymap[][2] = {
-	{ KS_Return, Common::KEYCODE_RETURN },
-	{ KS_Up, Common::KEYCODE_UP },
-	{ KS_Down, Common::KEYCODE_DOWN },
-	{ KS_Left, Common::KEYCODE_LEFT },
-	{ KS_Right, Common::KEYCODE_RIGHT },
-	{ KS_Shift_L, Common::KEYCODE_LSHIFT },
-	{ KS_Shift_R, Common::KEYCODE_RSHIFT },
-	{ KS_Control_L, Common::KEYCODE_LCTRL },
-	{ KS_Control_R, Common::KEYCODE_RCTRL },
-	{ KS_Alt_L, Common::KEYCODE_LALT },
-	{ KS_Alt_R, Common::KEYCODE_RALT },
-	{ KS_Meta_L, Common::KEYCODE_LMETA },
-	{ KS_Meta_R, Common::KEYCODE_RMETA },
-	{ KS_KP_0, Common::KEYCODE_KP0 },
-	{ KS_KP_1, Common::KEYCODE_KP1 },
-	{ KS_KP_2, Common::KEYCODE_KP2 },
-	{ KS_KP_3, Common::KEYCODE_KP3 },
-	{ KS_KP_4, Common::KEYCODE_KP4 },
-	{ KS_KP_5, Common::KEYCODE_KP5 },
-	{ KS_KP_6, Common::KEYCODE_KP6 },
-	{ KS_KP_7, Common::KEYCODE_KP7 },
-	{ KS_KP_8, Common::KEYCODE_KP8 },
-	{ KS_KP_9, Common::KEYCODE_KP9 },
-	{ KS_Home, Common::KEYCODE_HOME },
-	{ KS_Insert, Common::KEYCODE_INSERT },
-	{ KS_End, Common::KEYCODE_END },
-	{ KS_Prior, Common::KEYCODE_PAGEUP },
-	{ KS_Next, Common::KEYCODE_PAGEDOWN },
-	{ KS_f1, Common::KEYCODE_F1 },
-	{ KS_f2, Common::KEYCODE_F2 },
-	{ KS_f3, Common::KEYCODE_F3 },
-	{ KS_f4, Common::KEYCODE_F4 },
-	{ KS_f5, Common::KEYCODE_F5 },
-	{ KS_f6, Common::KEYCODE_F6 },
-	{ KS_f7, Common::KEYCODE_F7 },
-	{ KS_f8, Common::KEYCODE_F8 },
-	{ KS_f9, Common::KEYCODE_F9 },
-	{ KS_f10, Common::KEYCODE_F10 },
-	{ KS_f11, Common::KEYCODE_F11 },
-	{ KS_f12, Common::KEYCODE_F12 },
-	{ KS_f13, Common::KEYCODE_F13 },
-	{ KS_f14, Common::KEYCODE_F14 },
-	{ KS_f15, Common::KEYCODE_F15 },
-	{ KS_F1, Common::KEYCODE_F1 },
-	{ KS_F2, Common::KEYCODE_F2 },
-	{ KS_F3, Common::KEYCODE_F3 },
-	{ KS_F4, Common::KEYCODE_F4 },
-	{ KS_F5, Common::KEYCODE_F5 },
-	{ KS_F6, Common::KEYCODE_F6 },
-	{ KS_F7, Common::KEYCODE_F7 },
-	{ KS_F8, Common::KEYCODE_F8 },
-	{ KS_F9, Common::KEYCODE_F9 },
-	{ KS_F10, Common::KEYCODE_F10 },
-	{ KS_F11, Common::KEYCODE_F11 },
-	{ KS_F12, Common::KEYCODE_F12 },
-	{ KS_F13, Common::KEYCODE_F13 },
-	{ KS_F14, Common::KEYCODE_F14 },
-	{ KS_F15, Common::KEYCODE_F15 },
-	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_DIVIDE },
-	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY },
-	{ KS_KP_Add, Common::KEYCODE_KP_PLUS },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS },
-	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS },
-	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER },
-	{ 0, 0 }
+static int keymap[][3] = {
+	{ KS_Return, Common::KEYCODE_RETURN, Common::ASCII_RETURN },
+	{ KS_Up, Common::KEYCODE_UP, 0 },
+	{ KS_Down, Common::KEYCODE_DOWN, 0 },
+	{ KS_Left, Common::KEYCODE_LEFT, 0 },
+	{ KS_Right, Common::KEYCODE_RIGHT, 0 },
+	{ KS_Shift_L, Common::KEYCODE_LSHIFT, 0 },
+	{ KS_Shift_R, Common::KEYCODE_RSHIFT, 0 },
+	{ KS_Control_L, Common::KEYCODE_LCTRL, 0 },
+	{ KS_Control_R, Common::KEYCODE_RCTRL, 0 },
+	{ KS_Alt_L, Common::KEYCODE_LALT, 0 },
+	{ KS_Alt_R, Common::KEYCODE_RALT, 0 },
+	{ KS_Meta_L, Common::KEYCODE_LMETA, 0 },
+	{ KS_Meta_R, Common::KEYCODE_RMETA, 0 },
+	{ KS_KP_0, Common::KEYCODE_KP0, '0' },
+	{ KS_KP_1, Common::KEYCODE_KP1, '1' },
+	{ KS_KP_2, Common::KEYCODE_KP2, '2' },
+	{ KS_KP_3, Common::KEYCODE_KP3, '3' },
+	{ KS_KP_4, Common::KEYCODE_KP4, '4' },
+	{ KS_KP_5, Common::KEYCODE_KP5, '5' },
+	{ KS_KP_6, Common::KEYCODE_KP6, '6' },
+	{ KS_KP_7, Common::KEYCODE_KP7, '7' },
+	{ KS_KP_8, Common::KEYCODE_KP8, '8' },
+	{ KS_KP_9, Common::KEYCODE_KP9, '9' },
+	{ KS_Home, Common::KEYCODE_HOME, 0 },
+	{ KS_Insert, Common::KEYCODE_INSERT, 0 },
+	{ KS_End, Common::KEYCODE_END, 0 },
+	{ KS_Prior, Common::KEYCODE_PAGEUP, 0 },
+	{ KS_Next, Common::KEYCODE_PAGEDOWN, 0 },
+	{ KS_f1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_f2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_f3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_f4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_f5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_f6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_f7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_f8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_f9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_f10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_f11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_f12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_f13, Common::KEYCODE_F13, 0 },
+	{ KS_f14, Common::KEYCODE_F14, 0 },
+	{ KS_f15, Common::KEYCODE_F15, 0 },
+	{ KS_F1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_F2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_F3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_F4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_F5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_F6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_F7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_F8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_F9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_F10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_F11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_F12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_F13, Common::KEYCODE_F13, 0 },
+	{ KS_F14, Common::KEYCODE_F14, 0 },
+	{ KS_F15, Common::KEYCODE_F15, 0 },
+	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD, '.' },
+	{ KS_KP_Divide, Common::KEYCODE_KP_DIVIDE, '/' },
+	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY, '*' },
+	{ KS_KP_Add, Common::KEYCODE_KP_PLUS, '+' },
+	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS, '-' },
+	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS, '=' },
+	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER, Common::ASCII_RETURN },
+	{ 0, 0, 0 }
 };
 #endif
 
@@ -262,7 +262,7 @@ bool OSystem_Wii::pollKeyboard(Common::Event &event) {
 	while (keymap[i][0] != 0) {
 		if (keymap[i][0] == kbdEvent.symbol) {
 			event.kbd.keycode = static_cast<Common::KeyCode>(keymap[i][1]);
-			event.kbd.ascii = 0;
+			event.kbd.ascii = keymap[i][2];
 			return true;
 		}
 


Commit: d5d2b39e08238505ec76e9593dd5dfc39820b9c0
    https://github.com/scummvm/scummvm/commit/d5d2b39e08238505ec76e9593dd5dfc39820b9c0
Author: David Turner (dgturner at iee.org)
Date: 2014-10-26T16:45:05Z

Commit Message:
Merge pull request #524 from AReim1982/WII-1.7.0-Beta-2

WII: missing ASCII codes for some keys

Changed paths:
    backends/platform/wii/osystem_events.cpp









More information about the Scummvm-git-logs mailing list