[Scummvm-cvs-logs] SF.net SVN: scummvm: [27642] scummvm/trunk/backends/platform

[fingolfin at users.sourceforge.net]

Revision: 27642
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27642&view=rev
Author:   fingolfin
Date:     2007-06-22 16:43:17 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
Produce 'correct' keycode/ascii values for function keys

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
    scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/trunk/backends/platform/gp32/gp32_osys.cpp

Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp	2007-06-22 23:27:32 UTC (rev 27641)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp	2007-06-22 23:43:17 UTC (rev 27642)
@@ -262,14 +262,14 @@
 			case vchrLaunch:
 				event.type = Common::EVENT_KEYDOWN;
 				event.kbd.keycode = Common::KEYCODE_ESCAPE;
-				event.kbd.ascii = Common::KEYCODE_ESCAPE;
+				event.kbd.ascii = Common::ASCII_ESCAPE;
 				event.kbd.flags = 0;
 				return true;
 
 			// F5 = menu
 			case vchrMenu:
 				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = Common::ASCII_F5;	// FIXME: Should be changed to KEYCODE_F5
+				event.kbd.keycode = Common::KEYCODE_F5;
 				event.kbd.ascii = Common::ASCII_F5;
 				event.kbd.flags = 0;
 				return true;
@@ -411,8 +411,13 @@
 
 			// F1 -> F10 key
 			if  (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
-				key = (key == '0') ? 324 : (Common::ASCII_F1 + key - '1');
-				mask = 0;
+				key = (key - '0' + 10 - 1) % 10;	// '0' -> 9, '1' -> 0, '2' -> 1, ...
+				_wasKey = true;
+				event.type = Common::EVENT_KEYDOWN;
+				event.kbd.keycode = Common::KEYCODE_F1 + key;
+				event.kbd.ascii = Common::ASCII_F1 + key;
+				event.kbd.flags = 0;
+				return true;
 
 #ifdef STDLIB_TRACE_MEMORY
 			// print memory

Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp	2007-06-22 23:27:32 UTC (rev 27641)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp	2007-06-22 23:43:17 UTC (rev 27642)
@@ -46,7 +46,7 @@
 		// F5 = menu
 		case vchrThumbWheelBack:
 			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = Common::ASCII_F5;	// FIXME: Should be KEYCODE_F5
+			event.kbd.keycode = Common::KEYCODE_F5;
 			event.kbd.ascii = Common::ASCII_F5;
 			event.kbd.flags = 0;
 			return true;

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2007-06-22 23:27:32 UTC (rev 27641)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2007-06-22 23:43:17 UTC (rev 27642)
@@ -1253,7 +1253,7 @@
 		
 		if ((getKeysChanged() & KEY_START)) {
 			event.type = getKeyEvent(KEY_START);
-			event.kbd.keycode = Common::ASCII_F5;		// FIXME: Should be KEYCODE_F5
+			event.kbd.keycode = Common::KEYCODE_F5;
 			event.kbd.ascii = Common::ASCII_F5;
 			event.kbd.flags = 0;
 			system->addEvent(event);

Modified: scummvm/trunk/backends/platform/gp32/gp32_osys.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_osys.cpp	2007-06-22 23:27:32 UTC (rev 27641)
+++ scummvm/trunk/backends/platform/gp32/gp32_osys.cpp	2007-06-22 23:43:17 UTC (rev 27642)
@@ -529,7 +529,7 @@
 			if (_overlayVisible)
 				event.kbd.keycode = event.kbd.ascii = 13;
 			else {
-				event.kbd.keycode = Common::ASCII_F5;	// FIXME: Should be KEYCODE_F5
+				event.kbd.keycode = Common::KEYCODE_F5;
 				event.kbd.ascii = Common::ASCII_F5;
 			}
 			return true;
@@ -603,7 +603,7 @@
 			if (_overlayVisible)
 				event.kbd.keycode = event.kbd.ascii = 13;
 			else {
-				event.kbd.keycode = Common::ASCII_F5;	// FIXME: Should be KEYCODE_F5
+				event.kbd.keycode = Common::KEYCODE_F5;
 				event.kbd.ascii = Common::ASCII_F5;
 			}
 			return true;


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