commit 945422f052e76ed0446d9992c65205f19cd148cd from: marcus date: Wed Mar 20 11:09:55 2002 UTC escape fix, next try. commit - 7643f4bc0eacacb075dbbbc4176cae1a13b47e4e commit + 945422f052e76ed0446d9992c65205f19cd148cd blob - 7b243d0741195ed5c849d2b0cfc9c7a79e3f069f blob + 95004f9689ca96c3df4917ef22308f421413f8f0 --- de/mud/terminal/vt320.java +++ de/mud/terminal/vt320.java @@ -690,7 +690,6 @@ public abstract class vt320 extends VDU implements Key case KeyEvent.VK_PAGE_UP: writeSpecial(PrevScn[xind]); break; case KeyEvent.VK_INSERT: writeSpecial(Insert[xind]); break; case KeyEvent.VK_DELETE: writeSpecial(Remove[xind]); break; - case KeyEvent.VK_ESCAPE: writeSpecial(Escape[xind]); break; case KeyEvent.VK_BACK_SPACE: writeSpecial(BackSpace[xind]); break; case KeyEvent.VK_HOME: writeSpecial(KeyHome[xind]); break; case KeyEvent.VK_END: writeSpecial(KeyEnd[xind]); break; @@ -757,9 +756,6 @@ public abstract class vt320 extends VDU implements Key if (localecho) putString("\r\n"); // bad hack } - if (keyCode == KeyEvent.VK_ESCAPE) // handled in keyPressed - return; - // FIXME: on german PC keyboards you have to use Alt-Ctrl-q to get an @, // so we can't just use it here... will probably break some other VMS // codes. -Marcus @@ -816,6 +812,10 @@ public abstract class vt320 extends VDU implements Key if(control) { fmap = FunctionKeyCtrl; xind=2; } if(alt) { fmap = FunctionKeyAlt; xind=3; } + if (keyCode == KeyEvent.VK_ESCAPE) { + writeSpecial(Escape[xind]); + return; + } if(evt.isActionKey()) switch(keyCode) { case KeyEvent.VK_NUMPAD0: writeSpecial(Numpad[0]); return; case KeyEvent.VK_NUMPAD1: writeSpecial(Numpad[1]); return;