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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jun 24 20:49:48 CEST 2007


Revision: 27695
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27695&view=rev
Author:   fingolfin
Date:     2007-06-24 11:49:48 -0700 (Sun, 24 Jun 2007)

Log Message:
-----------
Use keycodes instead of the (bad) ascii code for function keys in the DC backend

Modified Paths:
--------------
    scummvm/trunk/backends/platform/dc/input.cpp
    scummvm/trunk/backends/platform/dc/selector.cpp
    scummvm/trunk/backends/platform/dc/softkbd.cpp

Modified: scummvm/trunk/backends/platform/dc/input.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/input.cpp	2007-06-24 17:55:47 UTC (rev 27694)
+++ scummvm/trunk/backends/platform/dc/input.cpp	2007-06-24 18:49:48 UTC (rev 27695)
@@ -48,7 +48,7 @@
       if(!(buttons & 4)) lmb++;
       if(!(buttons & 2)) rmb++;
 
-      if(!(buttons & 8)) newkey = Common::ASCII_F5;
+      if(!(buttons & 8)) newkey = Common::KEYCODE_F5;
       else if(!(buttons & 512)) newkey = ' ';
       else if(!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
 
@@ -69,7 +69,7 @@
       if(!(buttons & 4)) lmb++;
       if(!(buttons & 2)) rmb++;
 
-      if(!(buttons & 8)) newkey = Common::ASCII_F5;
+      if(!(buttons & 8)) newkey = Common::KEYCODE_F5;
 
       mouse_x += pad->cond.mouse.axis1;
       mouse_y += pad->cond.mouse.axis2;
@@ -101,7 +101,7 @@
 		    "=\xAF`{ }+*\xBD<>?" :
 		    "-^@[ ];:\xA7,./")[key - 0x2d];
 	else if(key >= 0x3a && key <= 0x43)
-	  newkey = key+(Common::ASCII_F1-0x3a);
+	  newkey = key+(Common::KEYCODE_F1-0x3a);
 	else if(key >= 0x54 && key <= 0x57)
 	  newkey = "/*-+"[key-0x54];
 	else switch(key) {

Modified: scummvm/trunk/backends/platform/dc/selector.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/selector.cpp	2007-06-24 17:55:47 UTC (rev 27694)
+++ scummvm/trunk/backends/platform/dc/selector.cpp	2007-06-24 18:49:48 UTC (rev 27695)
@@ -364,7 +364,7 @@
     event = handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
     setimask(mask);
 
-    if(event==-Common::EVENT_LBUTTONDOWN || event==13 || event==Common::ASCII_F5) {
+    if(event==-Common::EVENT_LBUTTONDOWN || event==Common::KEYCODE_ENTER || event==Common::KEYCODE_F5) {
       int selected_game = top_game + selector_pos;
 
       for(int fade=0; fade<=256; fade+=4) {

Modified: scummvm/trunk/backends/platform/dc/softkbd.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/softkbd.cpp	2007-06-24 17:55:47 UTC (rev 27694)
+++ scummvm/trunk/backends/platform/dc/softkbd.cpp	2007-06-24 18:49:48 UTC (rev 27695)
@@ -52,7 +52,7 @@
 
 static const short key_codes[] =
   {
-    Common::KEYCODE_ESCAPE, Common::ASCII_F1, Common::ASCII_F2, Common::ASCII_F3, Common::ASCII_F4, Common::ASCII_F5, Common::ASCII_F6, Common::ASCII_F7, Common::ASCII_F8, Common::ASCII_F9, Common::ASCII_F10,
+    Common::KEYCODE_ESCAPE, Common::KEYCODE_F1, Common::KEYCODE_F2, Common::KEYCODE_F3, Common::KEYCODE_F4, Common::KEYCODE_F5, Common::KEYCODE_F6, Common::KEYCODE_F7, Common::KEYCODE_F8, Common::KEYCODE_F9, Common::KEYCODE_F10,
     K('1','!'), K('2','"'), K('3','#'), K('4','$'), K('5','%'),
     K('6','&'), K('7','\''), K('8','('), K('9',')'), K('0','~'), K('-','='),
     K('q','Q'), K('w','W'), K('e','E'), K('r','R'), K('t','T'),


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




More information about the Scummvm-git-logs mailing list