# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1434746517 25200
# Node ID 208b310323182459b7ef05474914b15d4558561a
# Parent  0dd7fbeba5b188fc70b57ff31725854c8a701ff4
fix f11 and f12 keys on full hardware keyboards

diff -r 0dd7fbeba5b1 -r 208b31032318 src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java
--- a/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Thu Apr 09 11:34:15 2015 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Fri Jun 19 13:41:57 2015 -0700
@@ -321,10 +321,7 @@
                 if (k != 0) {
                     if ((orgMetaState & HC_META_CTRL_ON) != 0) {
                         k = keyAsControl(k);
-
-                        if (k != k0)
-                            sendCtrl = true;
-
+                        if (k != k0) sendCtrl = true;
                         // send F1-F10 via CTRL-1 through CTRL-0
                         if (!sendCtrl && sendFunctionKey(keyCode))
                             return true;
@@ -349,10 +346,7 @@
                 if (k != 0) {
                     if ((orgMetaState & HC_META_CTRL_ON) != 0) {
                         k = keyAsControl(k);
-
-                        if (k != k0)
-                            buffer.write(k);
-
+                        if (k != k0) buffer.write(k);
                         return true;
                     }
                     else if ((orgMetaState & KeyEvent.META_ALT_ON) != 0) {
@@ -796,11 +790,11 @@
                 return true;
 
             case KeyEvent.KEYCODE_F11:
-                buffer.keyPressed(vt320.KEY_F10, ' ', 0);
+                buffer.keyPressed(vt320.KEY_F11, ' ', 0);
                 return true;
 
             case KeyEvent.KEYCODE_F12:
-                buffer.keyPressed(vt320.KEY_F10, ' ', 0);
+                buffer.keyPressed(vt320.KEY_F12, ' ', 0);
                 return true;
 
             case KeyEvent.KEYCODE_INSERT:
@@ -1183,7 +1177,7 @@
 
     protected boolean fullKeyboard() {
         if (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_FULL) ||
-                (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_ASUS_TF)))
+           (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_ASUS_TF)))
             return true;
 
         return false;
diff -r 0dd7fbeba5b1 -r 208b31032318 src/com/five_ten_sg/connectbot/util/PreferenceConstants.java
--- a/src/com/five_ten_sg/connectbot/util/PreferenceConstants.java	Thu Apr 09 11:34:15 2015 -0700
+++ b/src/com/five_ten_sg/connectbot/util/PreferenceConstants.java	Fri Jun 19 13:41:57 2015 -0700
@@ -107,6 +107,7 @@
 
     /* Device keyboard mapping */
     public static final String CUSTOM_KEYMAP = "list_custom_keymap";
+    // must match arrays.xml/list_custom_keymap_values
     public static final String CUSTOM_KEYMAP_DISABLED = "none";
     public static final String CUSTOM_KEYMAP_FULL = "full";
     public static final String CUSTOM_KEYMAP_ASUS_TF = "asus_tf";