From f81fe6b29f3998c4dbb1a941b38b7d93d7f2c7c3 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 27 Aug 2018 16:35:36 -0700
Subject: [PATCH] add more inputs to controller mapping

---
 .../src/input-plugins/KeyboardMouseDevice.cpp |  2 +
 scripts/system/edit.js                        | 64 ++++++++++++-------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index ddd51e9b9b..539546dd96 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -304,6 +304,8 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Control), "Control"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Delete), "Delete"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Backspace), QKeySequence(Qt::Key_Backspace).toString()));
+        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_BracketLeft), "BracketLeft"));
+        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_BracketRight), "BracketRight"));
 
         availableInputs.append(Input::NamedPair(makeInput(Qt::LeftButton), "LeftMouseButton"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::MiddleButton), "MiddleMouseButton"));
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 776c09addd..e145c1ab3d 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1863,28 +1863,7 @@ var keyReleaseEvent = function (event) {
         cameraManager.keyReleaseEvent(event);
     }
     // since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items
-    if (event.text === 'd' && event.isControl) {
-        selectionManager.clearSelections();
-    } else if (event.text === "t") {
-        selectionDisplay.toggleSpaceMode();
-    } else if (event.text === "f") {
-        if (isActive) {
-            if (selectionManager.hasSelection()) {
-                cameraManager.enable();
-                cameraManager.focus(selectionManager.worldPosition,
-                    selectionManager.worldDimensions,
-                    Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
-            }
-        }
-    } else if (event.text === '[') {
-        if (isActive) {
-            cameraManager.enable();
-        }
-    } else if (event.text === 'g') {
-        if (isActive && selectionManager.hasSelection()) {
-            grid.moveToSelection();
-        }
-    } else if (event.key === KEY_P && event.isControl && !event.isAutoRepeat ) {
+    if (event.key === KEY_P && event.isControl && !event.isAutoRepeat) {
         if (event.isShifted) {
             unparentSelectedEntities();
         } else {
@@ -1900,9 +1879,46 @@ function deleteKey(value) {
         deleteSelectedEntities();
     }
 }
+function deselectKey(value) {
+    if (value === 0) { // on release
+        selectionManager.clearSelections();
+    }
+}
+function toggleKey(value) {
+    if (value === 0) { // on release
+        selectionDisplay.toggleSpaceMode();
+    }
+}
+function focusKey(value) {
+    if (value === 0) { // on release
+        if (selectionManager.hasSelection()) {
+            cameraManager.enable();
+            cameraManager.focus(selectionManager.worldPosition, 
+                                selectionManager.worldDimensions, 
+                                Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
+        }
+    }
+}
+function cameraKey(value) {
+    if (value === 0) { // on release
+        cameraManager.enable();
+    }
+}
+function gridKey(value) {
+    if (value === 0) { // on release
+        if (selectionManager.hasSelection()) {
+            grid.moveToSelection();
+        }
+    }
+}
 var mapping = Controller.newMapping(CONTROLLER_MAPPING_NAME);
-mapping.from([Controller.Hardware.Keyboard.Delete]).when([Controller.Hardware.Application.PlatformWindows]).peek().to(deleteKey);
-mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware.Application.PlatformMac]).peek().to(deleteKey);
+mapping.from([Controller.Hardware.Keyboard.Delete]).when([Controller.Hardware.Application.PlatformWindows]).to(deleteKey);
+mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware.Application.PlatformMac]).to(deleteKey);
+mapping.from([Controller.Hardware.Keyboard.D]).when([Controller.Hardware.Keyboard.Control]).to(deselectKey);
+mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
+mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
+mapping.from([Controller.Hardware.Keyboard.BracketLeft]).to(cameraKey);
+mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey);
 
 function recursiveAdd(newParentID, parentData) {
     if (parentData.children !== undefined) {