Changing up how multikey works to better fit with built in robotjs and kbmrobot standards.

jg · jg · commit 7a3e1ec91da6 · 2017-02-09T09:26:43.000-06:00
diff --git a/gui/index.html b/gui/index.html
@@ -143,10 +143,14 @@ <h3>Type Specific</h3>
                     </div>
                 </div>
                 <div class="multi-button" style="display:none">
-                    <label class="col-form-label">Buttons to Press</label>
-                    <div class="multi-button-array">
+                    <div class="multi-button-key">
+                        <label class="col-form-label">Primary Key</label>
                         <input class="form-control" type="text" placeholder="W" name="buttonPress" data-toggle="tooltip" data-placement="left" title="A key that will be pressed.">
                     </div>
+                    <div class="multi-button-array">
+                        <label class="col-form-label">Modifiers</label>
+                        <input class="form-control" type="text" placeholder="shift" name="buttonPress" data-toggle="tooltip" data-placement="left" title="A modifier to press with the primary key. Accepts: control, alt, shift, or command(mac).">
+                    </div>
                     <div class="multi-button-add-wrap">
                         <button class="btn multi-button-add" type="button" data-toggle="tooltip" data-placement="left" title="Add another key."><i class="fa fa-plus-circle" aria-hidden="true"></i></button>
                         <button class="btn multi-button-del" type="button" data-toggle="tooltip" data-placement="bottom" title="Delete last key."><i class="fa fa-minus-circle" aria-hidden="true"></i></button>
diff --git a/gui/js/form-validation.js b/gui/js/form-validation.js
@@ -135,6 +135,23 @@ function gameButtonValidation(){
       source: availableButtons,
       appendTo: ".game-button-counter"
     });
+    $( ".multi-button-key input" ).autocomplete({
+      source: availableButtons,
+      appendTo: ".multi-button-key"
+    });
+}
+
+// Load up autocomplete for game buttons
+function gameButtonModifierValidation(){
+    // First destory any pre-existing auto completes.
+
+   // This is a list of all valid buttons for bot robotjs and kbm robot.
+    var availableButtons = [
+    "alt",
+    "control",
+    "command",
+    "shift",
+    ];
     $( ".multi-button-array input" ).autocomplete({
       source: availableButtons,
       appendTo: ".multi-button-array"
@@ -143,10 +160,12 @@ function gameButtonValidation(){
 
 // Exports
 exports.gameValidate = gameButtonValidation;
+exports.gameModifierValidate = gameButtonModifierValidation;
 exports.clearValidate = clearValidate;
 
 // On App Load
 $(document).ready(function () {
     buttonMenuValidate();
     gameButtonValidation();
+    gameButtonModifierValidation();
 });
diff --git a/gui/js/interactive/interactive-board.js b/gui/js/interactive/interactive-board.js
@@ -151,22 +151,29 @@ function gameControlTypeSelect(){
 // Game Control Multi Add
 // This throws in a new input field for the multi button game controls.
 function gameControlMultiAdd(){
-    var itemHTML = `
-        <input class="form-control" type="text" placeholder="W" name="buttonPress" data-toggle="tooltip" data-placement="left" title="A key that will be pressed.">
-    `;
-    $('.multi-button-array').append(itemHTML);
+    if( $('.multi-button-array input').length < 3){
+        var itemHTML = `
+        <input class="form-control" type="text" placeholder="shift" name="buttonPress" data-toggle="tooltip" data-placement="left" title="A modifier to press with the primary key. Accepts: control, alt, shift, or command(mac).">
+        `;
+        $('.multi-button-array').append(itemHTML);
 
-    // Setup autocomplete on new field.
-    jqValidate.gameValidate();
+        // Setup autocomplete on new field.
+        jqValidate.gameModifierValidate();
 
-    // Setup tooltips
-    $('.multi-button-array input[data-toggle="tooltip"]').tooltip()
+        // Setup tooltips
+        $('.multi-button-array input[data-toggle="tooltip"]').tooltip()
+    } else {
+        errorLogger.log("Sorry, you can only have three modifiers per button.");
+    }
 }
 
 // Game Control Multi Delete
 // This just deletes the last field in the multi button field list.
 function gameControlMultiDel(){
-    $('.multi-button-array input').last().remove();
+    // Dont delete the last one.
+    if( $('.multi-button-array input').length > 1){
+        $('.multi-button-array input').last().remove();
+    }
 }
 
 // Button Submission
@@ -204,12 +211,13 @@ function buttonSubmission(){
                 var typeSettings = { "press": buttonPressed, "opposite": buttonOpposite};
             } else {
                 // User has chosen the multi button option.
+                var buttonPressed = $('.multi-button-key input').val();
                 var buttonArray = [];
                 $('.multi-button-array > input').each(function(){
                     var val = $(this).val();
                     buttonArray.push(val);
                 }) 
-                var typeSettings = { "press": buttonArray, "opposite": ""};
+                var typeSettings = { "press": buttonPressed, "opposite": "", "modifiers": buttonArray};
             }
         } else if (buttonType == "Sound"){
             var filePath = $('.sound-file input').val();
@@ -420,15 +428,17 @@ function editButton(buttonID){
     if(buttonType === "Game Controls"){
         var press = typeSettings.press;
         var opposite = typeSettings.opposite;
-        if(press instanceof Array){
+        var modifiers = typeSettings.modifiers;
+        if(modifiers instanceof Array){
             // Multi Button
 
             // Clear everything already there.
-            $('.multi-button-array').empty();
+            $('.multi-button-key input').val(press);
+            $('.multi-button-array input').remove();
 
             // Add in the appropriate html.
-            for(var item in press){
-                var key = press[item];
+            for(var item in modifiers){
+                var key = modifiers[item];
 
                 // Add in a new input field.
                 gameControlMultiAdd();
diff --git a/lib/interactive/game-controls/tactile/tactileProcessor.js b/lib/interactive/game-controls/tactile/tactileProcessor.js
@@ -29,38 +29,27 @@ function tactile(report) {
         var typeSettings = button['typeSettings'];
         var key = typeSettings['press'];
         var oppositeKey = typeSettings['opposite'];
+        var modifiers = typeSettings['modifiers'];
 
-        // If there is more than one key that should be pressed...
-        if (key instanceof Array && isNaN(press) === false && press !== null){
-            // These keys all need to be tapped.
-            for(var i in key){
-                var transKey = keyTranslator.translate(key[i]);
-                tactileTap(transKey, press, buttonID);
-            }
-        } else if (key instanceof Array && isNaN(holding) === false && holding !== null){
-            // These keys all need to be held.
-            for(var i in key){
-                var transKey = keyTranslator.translate(key[i]);
-                tactileHold(transKey, holding, buttonID);
-            }
+        // Route button to correct handler for it's purpose.
+        if(modifiers !== undefined && modifiers instanceof Array){
+            // Multikey button
+            multiKey(key, modifiers, buttonID);
         } else if (oppositeKey !== "") {
-            // Not an array, does it have an opposite key to compare against?
-            var key = keyTranslator.translate(key);
-            var oppositeKey = keyTranslator.translate(oppositeKey);
+            // Key comparison
             movement(key, oppositeKey, buttonID);
         } else if ( isNaN(holding) === false && holding !== null) {
-            // Not an array, and we're getting holding stats. Hold this button.
-            var key = keyTranslator.translate(key);
+            // Holding key
             tactileHold(key, holding, buttonID);
         } else {
-            // Not an array, and we're getting press stats. Just press this one.
-            var key = keyTranslator.translate(key);
+            // Tap it
             tactileTap(key, press, buttonID);
         }
     } else {
         // This button doesnt have press frequency or holding checked in dev lab.
         errorLog.log('Button '+rawid+' does not have press frequency or holding checked in the dev lab.');
     }
+
 }
 
 // Button Saves
@@ -105,8 +94,28 @@ function buttonSave(report) {
     }
 }
 
+// Tactile Key Tap.
+function multiKey(key, modifiers, buttonID) {
+    var key = keyTranslator.translate(key);
+
+    // Scrub the modifiers list and make a clean array.
+    var cleanModifiers = [];
+    for (var i in modifiers){
+        var cleanButton = keyTranslator.translate(modifiers[i]);
+        cleanModifiers.push(cleanButton);
+    }
+
+    emulate.keyToggle(key, "down", cleanModifiers);
+
+    setTimeout(function() {
+        emulate.keyToggle(key, "up", cleanModifiers);
+    }, 30);
+}
+
 // Movement Keys
 function movement(key, oppositeKey, buttonID) {
+    var key = keyTranslator.translate(key);
+    var oppositeKey = keyTranslator.translate(oppositeKey);
 
     // Get saved states for related keys.
     var keyOne = global.buttonSaves[key] || 0;
@@ -164,12 +173,10 @@ function tactileTap(key, press, buttonID) {
 
         setTimeout(function() {
             emulate.keyToggle(key, "up");
-        }, 40);
+        }, 30);
     }
 }
 
-
-
 // Export main function
 exports.tactile = tactile;
 exports.buttonSaves = buttonSave;
