[Scummvm-cvs-logs] scummvm master -> 0b17a67a30a48ffed7b4fe0c34854baad45492fa

[m-kiewitz]

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:
0b17a67a30 SCI: Revert revert the keyboard handling changes


Commit: 0b17a67a30a48ffed7b4fe0c34854baad45492fa
    https://github.com/scummvm/scummvm/commit/0b17a67a30a48ffed7b4fe0c34854baad45492fa
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-01T15:04:03+01:00

Commit Message:
SCI: Revert revert the keyboard handling changes

It seems the issues on AmigaOS aren't actually caused by the new
code. Reverting the revert.

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index e8744b8..90ddaaf 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -214,8 +214,6 @@ SciEvent EventManager::getScummVMEvent() {
 		//((ev.kbd.flags & Common::KBD_CAPS) ? SCI_KEYMOD_CAPSLOCK : 0) |
 		//((ev.kbd.flags & Common::KBD_SCRL) ? SCI_KEYMOD_SCRLOCK : 0) |
 
-	// FIXME: this hack should also not be here, see below
-#if 0
 	if (input.data >= Common::KEYCODE_KP0 && input.data <= Common::KEYCODE_KP9) {
 		if (!(ev.kbd.flags & Common::KBD_NUM)) {
 			// HACK: Num-Lock not enabled
@@ -224,15 +222,8 @@ SciEvent EventManager::getScummVMEvent() {
 			input.character = 0;
 		}
 	}
-#endif
-
-	// FIXME: using .ascii (.character) in here somewhat works on Windows+Linux, but it seems that
-	//        at least SDL on AmigaOS returns valid .ascii characters when Fx keys are pressed etc.
-	//        Check bug #7009. For now I reverted my changes. This needs to get fixed properly in backend / SDL itself.
-	//        On Windows .ascii field gets values, when Fx keys are pressed as well, but it's above 0xFF.
-	//        On AmigaOS it seems to return a value <= 0xFF.
-	//if ((input.character) && (input.character <= 0xFF)) {
-	if (!(input.data & 0xFF00)) {
+
+	if ((input.character) && (input.character <= 0xFF)) {
 		// Directly accept most common keys without conversion
 		if ((input.character >= 0x80) && (input.character <= 0xFF)) {
 			// If there is no extended font, we will just clear the