Ticket #1492: hotkeys3.patch

binaries/data/mods/public/gui/session/input.js

@@ -146 +146 @@
     return false;
 }
 
-function initBuildingPlacementView(ev)
+function initBuildingPlacementView()
 {
     if (placementSupport.mode === "wall")
     {
@@ -1054 +1054 @@
                 var sptr = ev.hotkey.split(".");
                 var now = new Date();
                 if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey) && ev.hotkey.indexOf("selection.group.select.") == 0) {
-                    performGroup("snap", sptr[3], ev);
+                    performGroup("snap", sptr[3]);
                 }
                 else
                 {
-                    performGroup(sptr[2], sptr[3], ev);
+                    performGroup(sptr[2], sptr[3]);
 
                     doublePressTimer = now.getTime();
                     prevHotkey = ev.hotkey;
@@ -1214 +1214 @@
         {
         case "mousemotion":
             placementSupport.position = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
-            initBuildingPlacementView(ev);
+            initBuildingPlacementView();
             return false; // continue processing mouse motion
 
         case "mousebuttondown":
@@ -1264 +1264 @@
                 if (ev.hotkey.indexOf("selection.group.action.") == 0)
                 {   // can switch buildings
                     var sptr = ev.hotkey.split(".");
-                    performGroup(sptr[2], sptr[3], ev);
+                    performGroup(sptr[2], sptr[3]);
                 }
             }
             break;
@@ -1623 +1623 @@
             break;
         case ACTION_BUILD:
             if (state.buildEntities && state.buildEntities.length) {
-                inputState = INPUT_PRESELECTEDACTION;
+                if (inputState != INPUT_BUILDING_PLACEMENT)
+                    inputState = INPUT_PRESELECTEDACTION;
                 return state.buildEntities;
             }
             break;
@@ -1662 +1663 @@
 }
 
 // Performs the specified group
-function performGroup(action, nr, ev)
+function performGroup(action, nr)
 {
     if (nr == "reset")
     {
@@ -1744 +1745 @@
                     // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
                     startBuildingPlacement(lst);
                     placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
-                    initBuildingPlacementView(ev);
+                    initBuildingPlacementView();
                 }
                 break;
             case ACTION_TRAIN:
@@ -1858 +1859 @@
         {
             if (!getActionForSelection(player, [newEntity]).length)
                 resetPreselectedAction();
+            else if (preSelectedAction == ACTION_BUILD)
+                updateBuildingPlacementPreview();
 
             lastEntity = newEntity;
             g_Selection.reset();

binaries/data/config/default.cfg

@@ -202 +202 @@
 hotkey.selection.group.action.10 = "Shift+L"
 hotkey.selection.group.action.11 = Colon
 hotkey.selection.group.action.12 = DoubleQuote
-hotkey.selection.group.reset.action = ForwardSlash
+hotkey.selection.group.action.reset = ForwardSlash
 
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units

binaries/data/mods/public/gui/session/input.js

@@ -185 +185 @@
 
 function resetPreselectedAction()
 {
-    placementSupport.Reset();
+    preSelectedAction = ACTION_NONE;
     inputState = INPUT_NORMAL;
     _optionsOfpreSelected = [];
+    placementSupport.Reset(); // or a hotkey may leave a building snapshot
+    updateCursorAndTooltip();
 
 }
 
@@ -1070 +1072 @@
         switch (ev.type)
         {
         case "mousebuttondown":
-            if (ev.button == SDL_BUTTON_LEFT && preSelectedAction != ACTION_NONE)
+            if (ev.button == SDL_BUTTON_LEFT && preSelectedAction)
             {
                 var action = determineAction(ev.x, ev.y);
                 resetPreselectedAction();
@@ -1078 +1080 @@
                     break;
                 return doAction(action, ev);
             }
-            else if (ev.button == SDL_BUTTON_RIGHT && preSelectedAction != ACTION_NONE)
+            else if (ev.button == SDL_BUTTON_RIGHT)
             {
                 resetPreselectedAction();
                 break;
@@ -1638 +1640 @@
             if (!hasClass(state, "Unit") || hasClass(state, "Animal") || state.garrisonHolder)
                 break;
 
-            if (preSelectedAction == STANCE)
+            if (preSelectedAction == ACTION_STANCE)
                 return ["violent", "aggressive", "passive", "defensive", "standground"];
             if (ret.length) // minimimum is 2 units for formation to be enabled
                 return Engine.GuiInterfaceCall("GetAvailableFormations");
@@ -1662 +1664 @@
 // Performs the specified group
 function performGroup(action, nr, ev)
 {
+    if (nr == "reset")
+    {
+        resetPreselectedAction();
+        return;
+    }
     switch (action)
     {
     case "snap":
@@ -1795 +1802 @@
             }
         }
         break;
-    case "reset":
-        resetPreselectedAction();
-        break;
     }
 }