aboutsummaryrefslogtreecommitdiff
path: root/gui/Key.h
diff options
context:
space:
mode:
authorDavid Corrales2007-06-23 18:51:33 +0000
committerDavid Corrales2007-06-23 18:51:33 +0000
commitcacd7a28fd51d960947de88abbf30c487e66529d (patch)
treef3baa59853bfb307e452b86b9d93c4737b1fa6ab /gui/Key.h
parent0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff)
parent90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff)
downloadscummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'gui/Key.h')
-rw-r--r--gui/Key.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/gui/Key.h b/gui/Key.h
index 5b7db903ba..663293886b 100644
--- a/gui/Key.h
+++ b/gui/Key.h
@@ -32,13 +32,22 @@
namespace GUI {
+// TODO/FIXME: Make use of Common::KeyState from common/keyboard.h,
+// or even better, just completely replace this by it.
+// To be able to do that, though, the code using GUI::Key would need to
+// be adopted -- right now it uses SDL keycodes, and uses SDL_PushEvent
+// to generated fake events.
+
class Key {
public:
- Key(int ascii, int keycode = 0, int flags = 0);
+ Key(int ascii);
+ Key(int ascii, int keycode, int flags = 0);
Key();
- void setAscii(int ascii);
- void setKeycode(int keycode);
- void setFlags(int flags);
+
+ void setKey(int ascii);
+ void setKey(int ascii, int keycode);
+ void setKey(int ascii, int keycode, int flags);
+
int ascii();
int keycode();
int flags();