diff options
| author | Kenny Root <kenny@the-b.org> | 2008-11-11 20:55:19 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2008-11-11 20:55:19 +0000 |
| commit | 08a38b062e02b314c9951cd983df24bb392ac0a8 (patch) | |
| tree | bd49c3ed09810a0c4af186d8e08a4f71e968de82 /src | |
| parent | 1a2f49f29cd051d27cc87c08c4da67175b2ea3fe (diff) | |
| download | connectbot-08a38b062e02b314c9951cd983df24bb392ac0a8.tar.gz connectbot-08a38b062e02b314c9951cd983df24bb392ac0a8.tar.bz2 connectbot-08a38b062e02b314c9951cd983df24bb392ac0a8.zip | |
* Fix crash if you tried to bring up menu when making a shortcut on the desktop
* Fix CTRL keys so CTRL-\, et al., are supported.
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/connectbot/HostListActivity.java | 8 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index 805c7b1..15560d3 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -320,11 +320,13 @@ public class HostListActivity extends ListActivity { public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - sortcolor.setVisible(!sortedByColor); - sortlast.setVisible(sortedByColor); + if (sortcolor != null) + sortcolor.setVisible(!sortedByColor); - return true; + if (sortlast != null) + sortlast.setVisible(sortedByColor); + return true; } @Override diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 162ef4e..3dfba29 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -658,15 +658,13 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal int key = keymap.get(keyCode, metaState); - //Log.d(TAG, Integer.toString(event.getMetaState())); - if (ctrlPressed) { - //if((event.getMetaState() & KeyEvent.META_SYM_ON) != 0) { - // Support CTRL-A through CTRL-Z - if (key >= 0x61 && key <= 0x79) + // Support CTRL-a through CTRL-z + if (key >= 0x61 && key <= 0x7A) key -= 0x60; - else if (key >= 0x40 && key <= 0x59) - key -= 0x39; + // Support CTRL-A through CTRL-_ + else if (key >= 0x41 && key <= 0x5F) + key -= 0x40; else if (key == 0x20) key = 0x00; ctrlPressed = false; |