aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2
diff options
context:
space:
mode:
authorHolger Zickner <[email protected]>2005-06-06 13:32:06 +0000
committerHolger Zickner <[email protected]>2005-06-06 13:32:06 +0000
commit684416e41caa0cf877bbdb2b70d914970d44c7cb (patch)
tree15608533a7fd76d4eff80a6313885ff7d33f1d6e /src/jake2
parent578f8e93e01f36186a6199abfac7fd9ceb2a3575 (diff)
handle keys with AltGr properly
Diffstat (limited to 'src/jake2')
-rw-r--r--src/jake2/client/Key.java5
-rw-r--r--src/jake2/sys/JOGLKBD.java7
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jake2/client/Key.java b/src/jake2/client/Key.java
index 087aec1..f2cfc97 100644
--- a/src/jake2/client/Key.java
+++ b/src/jake2/client/Key.java
@@ -2,7 +2,7 @@
* Key.java
* Copyright (C) 2003
*
- * $Id: Key.java,v 1.7 2004-10-28 18:15:25 cawe Exp $
+ * $Id: Key.java,v 1.8 2005-06-06 13:30:40 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -424,14 +424,17 @@ public class Key extends Globals {
switch (Globals.cls.key_dest) {
case Defines.key_message :
Key.Message(key);
+ key_repeats[key] = 0;
break;
case Defines.key_menu :
Menu.Keydown(key);
+ key_repeats[key] = 0;
break;
case Defines.key_game :
case Defines.key_console :
Key.Console(key);
+ key_repeats[key] = 0;
break;
default :
Com.Error(Defines.ERR_FATAL, "Bad cls.key_dest");
diff --git a/src/jake2/sys/JOGLKBD.java b/src/jake2/sys/JOGLKBD.java
index 52d59c0..5f08133 100644
--- a/src/jake2/sys/JOGLKBD.java
+++ b/src/jake2/sys/JOGLKBD.java
@@ -197,11 +197,8 @@ final public class JOGLKBD extends KBD
case KeyEvent.VK_DEAD_CIRCUMFLEX: key = '`'; break;
default:
-// if ((ev.getModifiers() & (InputEvent.ALT_MASK | InputEvent.CTRL_MASK)) != 0) {
-// key = ev.getKeyCode();
-// } else {
- key = ev.getKeyChar();
-// }
+ key = ev.getKeyChar();
+
if (key >= 'A' && key <= 'Z')
key = key - 'A' + 'a';
break;