[Scummvm-cvs-logs] SF.net SVN: scummvm:[46801] scummvm/trunk/engines/sci/event.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46801
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46801&view=rev
Author:   m_kiewitz
Date:     2009-12-31 16:50:26 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
SCI: keyboard events now dont use scancode anymore, fixing compatibility with foreign keyboard layouts (needs testing, cleanup will follow shortly after)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/event.cpp

Modified: scummvm/trunk/engines/sci/event.cpp
===================================================================
--- scummvm/trunk/engines/sci/event.cpp	2009-12-31 14:59:30 UTC (rev 46800)
+++ scummvm/trunk/engines/sci/event.cpp	2009-12-31 16:50:26 UTC (rev 46801)
@@ -397,23 +397,26 @@
 	if (event.type == SCI_EVENT_KEYBOARD) {
 		// Do we still have to translate the key?
 
-		event.character = event.data;
+		// TODO: Needs cleanup
+		//event.character = event.data;
 
 		// Scancodify if appropriate
 		if (event.modifiers & SCI_KEYMOD_ALT) {
-			event.character = altify(event.character);
+			event.character = altify(event.data);
 		} else if (event.modifiers & SCI_KEYMOD_CTRL) {
-			event.character = controlify(event.character);
+			event.character = event.data;
+			//event.character = controlify(event.data);
 		}
 
 		// Shift if appropriate
-		else if (((event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.modifiers & SCI_KEYMOD_CAPSLOCK))
-		         || (!(event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.modifiers & SCI_KEYMOD_CAPSLOCK)))
-			event.character = shiftify(event.character);
+		// else
+		//if (((event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.modifiers & SCI_KEYMOD_CAPSLOCK))
+		//         || (!(event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.modifiers & SCI_KEYMOD_CAPSLOCK)))
+		//	event.character = shiftify(event.character);
 
 		// Numlockify if appropriate
-		else if (event.modifiers & SCI_KEYMOD_NUMLOCK)
-			event.data = numlockify(event.data);
+		//else if (event.modifiers & SCI_KEYMOD_NUMLOCK)
+		//	event.data = numlockify(event.data);
 	}
 
 	return event;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.