Allow mapping to arrow keys and f-keys

Conflicts:

	commands.js

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/keyboardUtils.js b/lib/keyboardUtils.js
index a47d273f..27ad5e42 100644
--- a/lib/keyboardUtils.js
+++ b/lib/keyboardUtils.js
@@ -1,4 +1,6 @@
-var keyCodes = { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32 };
+var keyCodes = { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, f1: 112, f12: 123};
+var keyNames = { 37: "left", 38: "up", 39: "right", 40: "down" }
+
 
 // This is a mapping of the incorrect keyIdentifiers generated by Webkit on Windows during keydown events to
 // the correct identifiers, which are correctly generated on Mac. We require this mapping to properly handle
@@ -26,7 +28,18 @@ else
   platform = "Windows";
 
 function getKeyChar(event) {
-    if (event.keyIdentifier.slice(0, 2) != "U+") { return ""; }
+    // Not a letter
+    if (event.keyIdentifier.slice(0, 2) != "U+") {
+        // Named key
+        if (keyNames[event.keyCode]) {
+          return keyNames[event.keyCode];
+        }
+        // F-key
+        if (event.keyCode >= keyCodes.f1 && event.keyCode <= keyCodes.f12) {
+          return "f" + (1 + event.keyCode - keyCodes.f1);
+        }
+        return "";
+    }
     var keyIdentifier = event.keyIdentifier;
     // On Windows, the keyIdentifiers for non-letter keys are incorrect. See
     // https://bugs.webkit.org/show_bug.cgi?id=19906 for more details.
@@ -48,4 +61,4 @@ function isPrimaryModifierKey(event) {
 function isEscape(event) {
   return event.keyCode == keyCodes.ESC ||
     (event.ctrlKey && getKeyChar(event) == '['); // c-[ is mapped to ESC in Vim by default.
-}
\ No newline at end of file
+}