aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Lukas <georg@op-co.de>2010-03-24 03:57:31 +0000
committerKenny Root <kenny@the-b.org>2010-03-24 03:57:31 +0000
commit73724a3681682300cb08e3add36e73c05447a60f (patch)
tree882e94ee4441495b240ad1cea81e64b0211b8be7
parentb4146d8391e3dd4d9e323df286028ca2d8ae0f01 (diff)
downloadconnectbot-73724a3681682300cb08e3add36e73c05447a60f.tar.gz
connectbot-73724a3681682300cb08e3add36e73c05447a60f.tar.bz2
connectbot-73724a3681682300cb08e3add36e73c05447a60f.zip
Allow <Camera> to send Alt+A
From: Georg Lukas <georg@op-co.de> git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@495 df292f66-193f-0410-a5fc-6d59da041ff2
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/org/connectbot/service/TerminalKeyListener.java3
-rw-r--r--src/org/connectbot/util/PreferenceConstants.java1
4 files changed, 8 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 91eb8c5..cae8121 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -46,6 +46,7 @@
<item>@string/list_camera_ctrlaspace</item>
<item>@string/list_camera_ctrla</item>
<item>@string/list_camera_esc</item>
+ <item>@string/list_camera_esc_a</item>
<item>@string/list_camera_none</item>
</string-array>
@@ -53,6 +54,7 @@
<item>Ctrl+A then Space</item>
<item>Ctrl+A</item>
<item>Esc</item>
+ <item>Esc+A</item>
<item>None</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ef85c..49e88ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -371,6 +371,8 @@
<string name="list_camera_ctrla">Ctrl+A</string>
<!-- Selection to indicate pressing the Camera button should send the "Esc" key. -->
<string name="list_camera_esc">Esc</string>
+ <!-- Selection to indicate pressing the Camera button should send "Esc+A". -->
+ <string name="list_camera_esc_a">Esc+A</string>
<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
<string name="list_camera_none">None</string>
diff --git a/src/org/connectbot/service/TerminalKeyListener.java b/src/org/connectbot/service/TerminalKeyListener.java
index 21bd218..af752bf 100644
--- a/src/org/connectbot/service/TerminalKeyListener.java
+++ b/src/org/connectbot/service/TerminalKeyListener.java
@@ -276,6 +276,9 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
bridge.transport.write(0x01);
} else if(PreferenceConstants.CAMERA_ESC.equals(camera)) {
((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
+ } else if(PreferenceConstants.CAMERA_ESC_A.equals(camera)) {
+ ((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
+ bridge.transport.write('a');
}
break;
diff --git a/src/org/connectbot/util/PreferenceConstants.java b/src/org/connectbot/util/PreferenceConstants.java
index 261152a..ee1b95a 100644
--- a/src/org/connectbot/util/PreferenceConstants.java
+++ b/src/org/connectbot/util/PreferenceConstants.java
@@ -58,6 +58,7 @@ public class PreferenceConstants {
public static final String CAMERA_CTRLA_SPACE = "Ctrl+A then Space";
public static final String CAMERA_CTRLA = "Ctrl+A";
public static final String CAMERA_ESC = "Esc";
+ public static final String CAMERA_ESC_A = "Esc+A";
public static final String KEEP_ALIVE = "keepalive";