# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1405483180 25200
# Node ID db26984b69f5a72897eeac2047e2c5b25cdd0c42
# Parent  79e6adde6fde01144521997a040a376a2eab7af7
update version; add cursor movement keys to the soft function keypad

diff -r 79e6adde6fde -r db26984b69f5 AndroidManifest.xml
--- a/AndroidManifest.xml	Tue Jul 15 14:23:00 2014 -0700
+++ b/AndroidManifest.xml	Tue Jul 15 20:59:40 2014 -0700
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.8.6-1"
-	android:versionCode="1861"
+	android:versionName="1.8.7-1"
+	android:versionCode="1871"
 	android:installLocation="auto">
 
 	<uses-sdk android:targetSdkVersion="15" android:minSdkVersion="8" />
diff -r 79e6adde6fde -r db26984b69f5 deployment.connections
--- a/deployment.connections	Tue Jul 15 14:23:00 2014 -0700
+++ b/deployment.connections	Tue Jul 15 20:59:40 2014 -0700
@@ -32,7 +32,7 @@
 
 tn5250://pub1.rzkh.de:23#battleship
     encryption5250=NONE
-    fontsize=12.5
+    fontsize=20
     fixed_size=true
     fixed_width=80
     fixed_height=25
diff -r 79e6adde6fde -r db26984b69f5 src/com/five_ten_sg/connectbot/service/TerminalBridge.java
--- a/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Tue Jul 15 14:23:00 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Tue Jul 15 20:59:40 2014 -0700
@@ -1259,7 +1259,7 @@
      * Function keys dialog
      */
     public boolean showFKeysDialog() {
-        final String []pickerStrings = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24"};
+        final String []pickerStrings = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", "←", "→", "↑", "↓", "tab", "ins", "del", "ret"};
         final HashMap<String,Integer> keymap = new HashMap<String,Integer>();
         keymap.put("F1", vt320.KEY_F1);
         keymap.put("F2", vt320.KEY_F2);
@@ -1285,6 +1285,14 @@
         keymap.put("F22", vt320.KEY_F22);
         keymap.put("F23", vt320.KEY_F23);
         keymap.put("F24", vt320.KEY_F24);
+        keymap.put("←",   vt320.KEY_LEFT);
+        keymap.put("→",   vt320.KEY_RIGHT);
+        keymap.put("↑",   vt320.KEY_UP);
+        keymap.put("↓",   vt320.KEY_DOWN);
+        keymap.put("tab", vt320.KEY_TAB);
+        keymap.put("ins", vt320.KEY_INSERT);
+        keymap.put("del", vt320.KEY_DELETE);
+        keymap.put("ret", vt320.KEY_ENTER);
 
         CharSequence str = "";
         Editable content = Editable.Factory.getInstance().newEditable(str);
diff -r 79e6adde6fde -r db26984b69f5 xml/510connectbot.in
--- a/xml/510connectbot.in	Tue Jul 15 14:23:00 2014 -0700
+++ b/xml/510connectbot.in	Tue Jul 15 20:59:40 2014 -0700
@@ -24,7 +24,7 @@
 
     <refentry id="x@PACKAGE@.1">
         <refentryinfo>
-            <date>2014-07-14</date>
+            <date>2014-07-15</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -90,16 +90,19 @@
                 </para></listitem>
 
                 <listitem><para>
-                    On a per-host basis, you can either set the font size which allows
-                    the number of rows/columns to change depending on the visibility
-                    of the soft keyboard, or you can set the number of rows and colums
-                    and the initial font will be picked based on the screen size.
+                    On a per-host basis, you can either allow the font size to change
+                    the number of rows/columns depending on the visibility
+                    of the soft keyboard, or you can fix the number of rows and colums.
                 </para></listitem>
 
                 <listitem><para>
                     The configurable hardware buttons can now change the font size.
                 </para></listitem>
 
+                <listitem><para>
+                    The soft function keypad now includes the cursor movement keys.
+                </para></listitem>
+
             </itemizedlist>
         </refsect1>
 
@@ -331,4 +334,136 @@
         </refsect1>
     </refentry>
 
+    <refentry id="@PACKAGE@.deployment.1">
+        <refentryinfo>
+            <date>2014-07-15</date>
+            <author>
+                <firstname>Carl</firstname>
+                <surname>Byington</surname>
+                <affiliation><orgname>510 Software Group</orgname></affiliation>
+            </author>
+        </refentryinfo>
+
+        <refmeta>
+            <refentrytitle>@PACKAGE@.deployment</refentrytitle>
+            <manvolnum>5</manvolnum>
+            <refmiscinfo>@PACKAGE@ @VERSION@</refmiscinfo>
+        </refmeta>
+
+        <refnamediv id='name.5'>
+            <refname>@PACKAGE@.deployment</refname>
+            <refpurpose>deployment file for @PACKAGE@</refpurpose>
+        </refnamediv>
+
+        <refsect1 id='description.5'>
+            <title>Description</title>
+
+            <para>The <command>@PACKAGE@.conf</command> deployment
+            file is show by this example. Comments start with # and
+            extend to the end of the line.  </para>
+
+            <literallayout class="monospaced"><![CDATA[
+#
+# available host keys:
+#
+# nickname          (string)
+# color             (string)    ("red", "green", "blue", "gray")
+# fontsize          (float)
+# fixed_size        (boolean)
+# fixed_width       (integer)
+# fixed_height      (integer)
+# pubkeyid          (integer)   (-2, -1)    -2=none, -1=any
+# useauthagent      (string)    ("no", "confirm", "yes")
+# postlogin         (string)
+# compression       (boolean)
+# httpproxy         (string)
+# wantsession       (boolean)
+# stayconnected     (boolean)
+# delkey            (string)    ("del", "backspace")
+# encoding          (string)    ("UTF-8", etc)
+# username          (string)
+# hostname          (string)
+# port              (integer)
+# monitor           (string)
+# emulation         (string)    ("xterm-color", "xterm-256color", "xterm", "vt100", "ansi", "screen", or other answerback string)
+# encryption5250    (string)
+# library5250       (string)
+# menu5250          (string)
+# program5250       (string)
+# wantx11forward    (boolean)
+# x11host           (string)
+# x11port           (integer)
+
+
+tn5250://pub1.rzkh.de:23#battleship
+    encryption5250=NONE
+    fontsize=20
+    fixed_size=true
+    fixed_width=80
+    fixed_height=25
+
+
+#
+# global settings are under global:// tag
+#
+# available global keys:
+#
+#   memkeys                     (boolean)
+#   connPersist                 (boolean)
+#   emulation                   (string) ("xterm-color", "xterm-256color", "xterm", "vt100", "ansi", "screen")
+#   scrollback                  (integer)
+#   rotation                    (string) ("Default", "Force landscape", "Force portrait", "Automatic")
+#   shiftfkeys                  (boolean)
+#   ctrlfkeys                   (boolean)
+#   keymode                     (string) ("Use right-side keys", "Use left-side keys", "none")
+#   camera                      (string) ("CTRL", "Esc", "Tab", "Screen Capture", "Ctrl+A then Space", "Ctrl+A", "Esc+A", "Monitor Key", "Soft Function Keypad", "Increase Font Size", "Decrease Font Size", "None")
+#   volup                       (string) ("CTRL", "Esc", "Tab", "Screen Capture", "Ctrl+A then Space", "Ctrl+A", "Esc+A", "Monitor Key", "Soft Function Keypad", "Increase Font Size", "Decrease Font Size", "None")
+#   voldn                       (string) ("CTRL", "Esc", "Tab", "Screen Capture", "Ctrl+A then Space", "Ctrl+A", "Esc+A", "Monitor Key", "Soft Function Keypad", "Increase Font Size", "Decrease Font Size", "None")
+#   search                      (string) ("CTRL", "Esc", "Tab", "Screen Capture", "Ctrl+A then Space", "Ctrl+A", "Esc+A", "Monitor Key", "Soft Function Keypad", "Increase Font Size", "Decrease Font Size", "None")
+#   ptt                         (string) ("CTRL", "Esc", "Tab", "Screen Capture", "Ctrl+A then Space", "Ctrl+A", "Esc+A", "Monitor Key", "Soft Function Keypad", "Increase Font Size", "Decrease Font Size", "None")
+#   keepalive                   (boolean)
+#   wifilock                    (boolean)
+#   bumpyarrows                 (boolean)
+#   extended_longpress          (boolean)
+#   ctrl_string                 (string)
+#   picker_string               (string)
+#   picker_keep_open            (boolean)
+#   list_custom_keymap          (string)    ("none", "full", "asus_tf", "sgh_i927", "sgh_i927_ics", "se_xppro")
+#   bell                        (boolean)
+#   bellVolume                  (float)
+#   bellVibrate                 (boolean)
+#   bellNotification            (boolean)
+#   screen_capture_folder       (string)
+#   screen_capture_popup        (boolean)
+#   file_dialog                 (string)
+#   download_folder             (string)
+#   remote_upload_folder        (string)
+#   upload_dest_prompt          (boolean)
+#   background_file_transfer    (boolean)
+#   debug_keycodes              (boolean)
+#
+
+global://
+    emulation=xterm-256color
+    scrollback=200
+    rotation=Force landscape
+    camera=None
+    volup=Soft Function Keypad
+    voldn=Tab
+    search=None
+    ptt=Monitor Key
+
+#
+# end
+]]></literallayout>
+        </refsect1>
+
+        <refsect1 id='version.5'>
+            <title>Version</title>
+            <para>
+                @VERSION@
+            </para>
+        </refsect1>
+
+    </refentry>
 </reference>