[Scummvm-cvs-logs] SF.net SVN: scummvm: [28792] scummvm/trunk/backends/platform/PalmOS/Src
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sat Sep 1 19:31:02 CEST 2007
Revision: 28792
http://scummvm.svn.sourceforge.net/scummvm/?rev=28792&view=rev
Author: chrilith
Date: 2007-09-01 10:31:01 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Some key related cleanup
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2007-09-01 17:28:15 UTC (rev 28791)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2007-09-01 17:31:01 UTC (rev 28792)
@@ -188,7 +188,7 @@
} else if (keyCurrentState & _keyExtra.bitUp) {
_keyExtraPressed |= _keyExtra.bitUp;
- event.kbd.keycode = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_UP;
} else if (keyCurrentState & _keyExtra.bitDown) {
_keyExtraPressed |= _keyExtra.bitDown;
@@ -233,7 +233,7 @@
#endif
if (ev.eType == keyUpEvent) {
- int k = 0;
+ Common::KeyCode k = Common::KEYCODE_INVALID;
switch (ev.data.keyUp.chr) {
// arrow keys
@@ -256,7 +256,7 @@
}
} else if (ev.eType == keyDownEvent) {
- int k = 0;
+ Common::KeyCode k = Common::KEYCODE_INVALID;
switch (ev.data.keyDown.chr) {
// ESC key
case vchrLaunch:
@@ -345,7 +345,7 @@
(3 * (3 * y / _screenHeight));
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = num;
+ event.kbd.keycode = (Common::KeyCode)num;
event.kbd.ascii = num;
event.kbd.flags = 0;
@@ -411,13 +411,8 @@
// F1 -> F10 key
if (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
- 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;
+ key = (key == '0') ? 324 : (315 + key - '1');
+ mask = 0;
#ifdef STDLIB_TRACE_MEMORY
// print memory
@@ -440,7 +435,7 @@
// other keys
_wasKey = true;
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = key;
+ event.kbd.keycode = (Common::KeyCode)key;
event.kbd.ascii = key;
event.kbd.flags = mask;
return true;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-09-01 17:28:15 UTC (rev 28791)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-09-01 17:31:01 UTC (rev 28792)
@@ -74,7 +74,7 @@
// skip text
case vchrActionDown:
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = '.';
+ event.kbd.keycode = Common::KEYCODE_PERIOD;
event.kbd.ascii = '.';
event.kbd.flags = 0;
return true;
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