aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Zickner <[email protected]>2004-11-03 10:16:42 +0000
committerHolger Zickner <[email protected]>2004-11-03 10:16:42 +0000
commit2b3cf2cdb6af56d43638063a7eaac6914369a335 (patch)
treeff7a602f196d2f5fe78c116e7656deb90bf9c494
parent5634134db18049e3d44e0aa4cda7b871a4ea7a40 (diff)
bugfix 1056765
allow use of character and modifier keys simultaneously
-rw-r--r--src/jake2/sys/KBD.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/jake2/sys/KBD.java b/src/jake2/sys/KBD.java
index b88e2e3..3272090 100644
--- a/src/jake2/sys/KBD.java
+++ b/src/jake2/sys/KBD.java
@@ -2,7 +2,7 @@
* KBD.java
* Copyright (C) 2004
*
- * $Id: KBD.java,v 1.4 2004-11-03 08:53:27 hzi Exp $
+ * $Id: KBD.java,v 1.5 2004-11-03 10:16:42 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -212,7 +212,11 @@ public final class KBD {
case KeyEvent.VK_DEAD_CIRCUMFLEX: key = '`'; break;
default:
- key = ev.getKeyChar();
+ if ((ev.getModifiers() & (InputEvent.ALT_MASK | InputEvent.CTRL_MASK)) != 0) {
+ key = ev.getKeyCode();
+ } else {
+ key = ev.getKeyChar();
+ }
if (key >= 'A' && key <= 'Z')
key = key - 'A' + 'a';
break;