aboutsummaryrefslogtreecommitdiff
path: root/common/keyboard.h
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-26 15:49:45 -0400
committerMatthew Hoops2012-08-26 16:12:25 -0400
commitbb1e60e8b2f3bba06ae3b089097f94ea82a70c8a (patch)
treea434233367725fbb6dc7072776c312f52254d57f /common/keyboard.h
parent7a49b3669a0e18210a2f5409cb35da735f549b11 (diff)
parent857b92f8ffececa9c1f990d21a6a8d1630199a62 (diff)
downloadscummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.gz
scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.bz2
scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.zip
Merge remote branch 'upstream/master' into pegasus
Conflicts: AUTHORS devtools/credits.pl gui/credits.h
Diffstat (limited to 'common/keyboard.h')
-rw-r--r--common/keyboard.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/keyboard.h b/common/keyboard.h
index 64c6cc4d01..3262a15c3f 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -249,7 +249,10 @@ struct KeyState {
* ASCII-value of the pressed key (if any).
* This depends on modifiers, i.e. pressing the 'A' key results in
* different values here depending on the status of shift, alt and
- * caps lock.
+ * caps lock. This should be used rather than keycode for text input
+ * to avoid keyboard layout issues. For example you cannot assume that
+ * KEYCODE_0 without a modifier will be '0' (on AZERTY keyboards it is
+ * not).
*/
uint16 ascii;