diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 063f80b..5cc5503 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="187"> + android:versionCode="188"> <application android:icon="@drawable/icon" diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 4bf5c1a..a2d6e94 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -608,8 +608,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener { // try handling keymode shortcuts if (event.getRepeatCount() == 0) { - if ("Use right-side keys".equals(keymode)) { - switch(keyCode) { + if (PreferenceConstants.KEYMODE_RIGHT.equals(keymode)) { + switch (keyCode) { case KeyEvent.KEYCODE_ALT_RIGHT: metaState |= META_SLASH; return true; @@ -622,11 +622,9 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener { case KeyEvent.KEYCODE_ALT_LEFT: metaPress(META_ALT_ON); return true; - default: - break; } - } else if ("Use left-side keys".equals(keymode)) { - switch(keyCode) { + } else if (PreferenceConstants.KEYMODE_LEFT.equals(keymode)) { + switch (keyCode) { case KeyEvent.KEYCODE_ALT_LEFT: metaState |= META_SLASH; return true; @@ -639,8 +637,17 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener { case KeyEvent.KEYCODE_ALT_RIGHT: metaPress(META_ALT_ON); return true; - default: - break; + } + } else { + switch (keyCode) { + case KeyEvent.KEYCODE_ALT_LEFT: + case KeyEvent.KEYCODE_ALT_RIGHT: + metaPress(META_ALT_ON); + return true; + case KeyEvent.KEYCODE_SHIFT_LEFT: + case KeyEvent.KEYCODE_SHIFT_RIGHT: + metaPress(META_SHIFT_ON); + return true; } } } |