aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2010-08-23 11:32:26 -0500
committerKenny Root <kenny@the-b.org>2010-08-23 11:32:26 -0500
commita59f26b1459248cffccb4d57800211fbc6d48e01 (patch)
tree1d01d766867d6d5a78dcd7415d64b58dc13ede1e /src
parentdd054acb6df843c0d2c6bdcbbec037fffb378f80 (diff)
downloadconnectbot-a59f26b1459248cffccb4d57800211fbc6d48e01.tar.gz
connectbot-a59f26b1459248cffccb4d57800211fbc6d48e01.tar.bz2
connectbot-a59f26b1459248cffccb4d57800211fbc6d48e01.zip
Disambiguate key input
Patch from LatinSuD
Diffstat (limited to 'src')
-rw-r--r--src/org/connectbot/service/TerminalKeyListener.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/connectbot/service/TerminalKeyListener.java b/src/org/connectbot/service/TerminalKeyListener.java
index e768134..275353b 100644
--- a/src/org/connectbot/service/TerminalKeyListener.java
+++ b/src/org/connectbot/service/TerminalKeyListener.java
@@ -161,7 +161,9 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
bridge.resetScrollPosition();
- boolean printing = (keymap.isPrintingKey(keyCode) || keyCode == KeyEvent.KEYCODE_SPACE);
+ int curMetaState = event.getMetaState();
+ int key = keymap.get(keyCode, curMetaState);
+ boolean printing = (key != 0 || key == KeyEvent.KEYCODE_SPACE);
// otherwise pass through to existing session
// print normal keys
@@ -182,8 +184,6 @@ 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();