diff options
| author | Kenny Root <kenny@the-b.org> | 2010-08-23 16:17:29 -0500 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2010-08-23 16:19:04 -0500 |
| commit | 571ea527b3ec322745535248dd44ceb38d2b6040 (patch) | |
| tree | 92406618ee8547c8359911b7774f034d8055bf9f /src/org | |
| parent | 1edeea0009311fa83a8f7a714054d14152847ac7 (diff) | |
| download | connectbot-571ea527b3ec322745535248dd44ceb38d2b6040.tar.gz connectbot-571ea527b3ec322745535248dd44ceb38d2b6040.tar.bz2 connectbot-571ea527b3ec322745535248dd44ceb38d2b6040.zip | |
Revert "Disambiguate key input"
This reverts commit a59f26b1459248cffccb4d57800211fbc6d48e01..1edeea0009311fa83a8f7a714054d14152847ac7.
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/connectbot/service/TerminalKeyListener.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/org/connectbot/service/TerminalKeyListener.java b/src/org/connectbot/service/TerminalKeyListener.java index 3349fbe..e768134 100644 --- a/src/org/connectbot/service/TerminalKeyListener.java +++ b/src/org/connectbot/service/TerminalKeyListener.java @@ -161,13 +161,13 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha bridge.resetScrollPosition(); - int curMetaState = event.getMetaState(); - int key = keymap.get(keyCode, curMetaState); - boolean printing = (key != 0 || key == KeyEvent.KEYCODE_SPACE); + boolean printing = (keymap.isPrintingKey(keyCode) || keyCode == KeyEvent.KEYCODE_SPACE); // otherwise pass through to existing session // print normal keys if (printing) { + int curMetaState = event.getMetaState(); + metaState &= ~(META_SLASH | META_TAB); if ((metaState & META_SHIFT_MASK) != 0) { @@ -182,6 +182,8 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha bridge.redraw(); } + int key = keymap.get(keyCode, curMetaState); + if ((metaState & META_CTRL_MASK) != 0) { metaState &= ~META_CTRL_ON; bridge.redraw(); |