Ticket #1492: hotkeys_total.patch

source/graphics/GameView.cpp

@@ -1124 +1124 @@
         else if (hotkey == "click.left")
         {
             g_TouchInput.PressEvent(SDL_BUTTON_LEFT, g_mouse_x, g_mouse_y);
+            return IN_HANDLED;
         }
         else if (hotkey == "click.right")
         {
             g_TouchInput.PressEvent(SDL_BUTTON_RIGHT, g_mouse_x, g_mouse_y);
+            return IN_HANDLED;
         }
     }
 

source/graphics/GameView.cpp

@@ -744 +744 @@
         moveRightward = moveForward = 0;
     }
 
-    if (HotkeyIsPressed("click.left"))
-        g_TouchInput.PressEvent(SDL_BUTTON_LEFT, g_mouse_x, g_mouse_y);
-    else if (HotkeyIsPressed("click.right"))
-        g_TouchInput.PressEvent(SDL_BUTTON_RIGHT, g_mouse_x, g_mouse_y);
-
     if (g_Joystick.IsEnabled())
     {
         // This could all be improved with extra speed and sensitivity settings
@@ -1126 +1121 @@
             ResetCameraAngleZoom();
             return IN_HANDLED;
         }
+        else if (hotkey == "click.left")
+        {
+            g_TouchInput.PressEvent(SDL_BUTTON_LEFT, g_mouse_x, g_mouse_y);
+        }
+        else if (hotkey == "click.right")
+        {
+            g_TouchInput.PressEvent(SDL_BUTTON_RIGHT, g_mouse_x, g_mouse_y);
+        }
     }
 
     return IN_PASS;

binaries/data/config/default.cfg

@@ -193 +193 @@
 hotkey.selection.group.save.9 = "Ctrl+9"
 hotkey.selection.group.add.9 = "Shift+9"
 
+; action buttons
 hotkey.selection.group.action.0 = G
 hotkey.selection.group.action.1 = H
 hotkey.selection.group.action.2 = J
@@ -213 +214 @@
 hotkey.selection.group.garrison.0 = N
 hotkey.selection.group.ungarrison.0 = M
 
+hotkey.click.left = "Z"
+hotkey.click.right = "C"
+
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building

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

@@ -104 +104 @@
     }
 }
 
+function CancelBuilding() {
+    placementSupport.Reset();
+    Engine.EndPreview();
+}
+
 function updateBuildingPlacementPreview()
 {
     // The preview should be recomputed every turn, so that it responds to obstructions/fog/etc moving underneath it, or
@@ -535 +540 @@
         // TODO: play a sound?
         return false;
     }
+    Engine.EndPreview();
 
     // Start the construction
     Engine.PostNetworkCommand({
@@ -838 +844 @@
         case "mousebuttondown":
             if (ev.button == SDL_BUTTON_RIGHT)
             {
-                // Cancel building
-                placementSupport.Reset();
-                updateBuildingPlacementPreview();
-                
+                CancelBuilding();
                 inputState = INPUT_NORMAL;
                 return true;
             }
@@ -897 +900 @@
                             
                             inputState = INPUT_BUILDING_WALL_CLICK;
                         }
-                        else
-                        {
-                            placementSupport.Reset();
+                    else
+                    {
+                        CancelBuilding();
                             inputState = INPUT_NORMAL;
                         }
                     }
@@ -914 +917 @@
                 else if (ev.button == SDL_BUTTON_RIGHT)
                 {
                     // reset to normal input mode
-                    placementSupport.Reset();
-                    updateBuildingPlacementPreview();
+                    CancelBuilding();
                     
                     inputState = INPUT_NORMAL;
                     return true;
@@ -982 +984 @@
             if (ev.button == SDL_BUTTON_RIGHT)
             {
                 // Cancel building
-                placementSupport.Reset();
+                CancelBuilding();
                 inputState = INPUT_NORMAL;
                 return true;
             }
@@ -1162 +1164 @@
             else if (ev.button == SDL_BUTTON_RIGHT)
             {
                 // Cancel building
-                placementSupport.Reset();
+                CancelBuilding();
                 resetPreselectedAction();
                 return true;
             }
@@ -1402 +1404 @@
     // to start building a structure, then the highlight selection rings are kept during the construction of the building.
     // Gives the impression that somehow the hovered-over entity has something to do with the building you're constructing.
     
-    placementSupport.Reset();
+    CancelBuilding();
     
     // find out if we're building a wall, and change the entity appropriately if so
     var templateData = GetTemplateData(buildTemplate);

source/graphics/GameView.cpp

@@ -58 +58 @@
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
+#include "simulation2/components/ICmpTemplateManager.h"
 #include "lib/external_libraries/libsdl.h"
 
 extern int g_xres, g_yres;
+extern CStrW g_CursorName;
 
 // Maximum distance outside the edge of the map that the camera's
 // focus point can be moved
@@ -737 +739 @@
         moveForward += m->ViewScrollSpeed * deltaRealTime;
     if (HotkeyIsPressed("camera.down"))
         moveForward -= m->ViewScrollSpeed * deltaRealTime;
-    if (HotkeyIsPressed("session.queue")) {
-        SDL_WarpMouse(g_mouse_x + moveRightward*2, g_mouse_y - moveForward*2);
+    if (ICmpTemplateManager::isPreviewActive || HotkeyIsPressed("session.queue")) {
+        SDL_WarpMouse(g_mouse_x + moveRightward*4, g_mouse_y - moveForward*4);
         moveRightward = moveForward = 0;
     }
 
+    if (HotkeyIsPressed("click.left"))
+        g_TouchInput.PressEvent(SDL_BUTTON_LEFT, g_mouse_x, g_mouse_y);
+    else if (HotkeyIsPressed("click.right"))
+        g_TouchInput.PressEvent(SDL_BUTTON_RIGHT, g_mouse_x, g_mouse_y);
+
     if (g_Joystick.IsEnabled())
     {
         // This could all be improved with extra speed and sensitivity settings

source/gui/scripting/ScriptFunctions.cpp

@@ -51 +51 @@
 #include "simulation2/components/ICmpGuiInterface.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTemplateManager.h"
+#include "simulation2/components/CCmpTemplateManager.h"
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/helpers/Selection.h"
 
@@ -462 +463 @@
     return g_ProfileViewer.SaveToJS(guiManager->GetScriptInterface());
 }
 
+void EndPreview(void* UNUSED(cbdata))
+{
+    ICmpTemplateManager::isPreviewActive = false;
+}
+
 
 bool IsUserReportEnabled(void* UNUSED(cbdata))
 {
@@ -629 +635 @@
     scriptInterface.RegisterFunction<bool, std::string, &HotkeyIsPressed_>("HotkeyIsPressed");
     scriptInterface.RegisterFunction<void, std::wstring, &DisplayErrorDialog>("DisplayErrorDialog");
     scriptInterface.RegisterFunction<CScriptVal, &GetProfilerState>("GetProfilerState");
+    scriptInterface.RegisterFunction<void, &EndPreview>("EndPreview");
 
     // User report functions
     scriptInterface.RegisterFunction<bool, &IsUserReportEnabled>("IsUserReportEnabled");

source/ps/TouchInput.cpp

@@ -78 +78 @@
     }
 }
 
+void CTouchInput::PressEvent(int button, int x, int y)
+{
+    SDL_Event_ ev;
+    ev.ev.button.button = button;
+    ev.ev.button.x = x;
+    ev.ev.button.y = y;
+
+    ev.ev.type = SDL_MOUSEBUTTONDOWN;
+    ev.ev.button.state = SDL_PRESSED;
+    SDL_PushEvent(&ev.ev);
+
+    ev.ev.type = SDL_MOUSEBUTTONUP;
+    ev.ev.button.state = SDL_RELEASED;
+    SDL_PushEvent(&ev.ev);
+}
+
 void CTouchInput::OnFingerUp(int id, int x, int y)
 {
     debug_printf(L"finger up %d %d %d; state %d\n", id, x, y, m_State);
@@ -87 +103 @@
     if (m_State == STATE_FIRST_TOUCH && id == 0 && timer_Time() < m_FirstTouchTime + 0.5)
     {
         m_State = STATE_INACTIVE;
-
-        SDL_Event_ ev;
-        ev.ev.button.button = SDL_BUTTON_LEFT;
-        ev.ev.button.x = m_Pos[0].X;
-        ev.ev.button.y = m_Pos[0].Y;
-
-        ev.ev.type = SDL_MOUSEBUTTONDOWN;
-        ev.ev.button.state = SDL_PRESSED;
-        SDL_PushEvent(&ev.ev);
-
-        ev.ev.type = SDL_MOUSEBUTTONUP;
-        ev.ev.button.state = SDL_RELEASED;
-        SDL_PushEvent(&ev.ev);
+        PressEvent(SDL_BUTTON_LEFT, m_Pos[0].X, m_Pos[0].Y);
     }
     else if (m_State == STATE_ZOOMING && id == 1)
     {
@@ -166 +170 @@
     if (m_State == STATE_FIRST_TOUCH && t > m_FirstTouchTime + 1.0)
     {
         m_State = STATE_INACTIVE;
-
-        SDL_Event_ ev;
-        ev.ev.button.button = SDL_BUTTON_RIGHT;
-        ev.ev.button.x = m_Pos[0].X;
-        ev.ev.button.y = m_Pos[0].Y;
-
-        ev.ev.type = SDL_MOUSEBUTTONDOWN;
-        ev.ev.button.state = SDL_PRESSED;
-        SDL_PushEvent(&ev.ev);
-
-        ev.ev.type = SDL_MOUSEBUTTONUP;
-        ev.ev.button.state = SDL_RELEASED;
-        SDL_PushEvent(&ev.ev);
+        PressEvent(SDL_BUTTON_RIGHT, m_Pos[0].X, m_Pos[0].Y);
     }
 }
 

source/ps/TouchInput.h

@@ -28 +28 @@
  */
 class CTouchInput
 {
+    friend class CGameView;
 public:
     CTouchInput();
     ~CTouchInput();
@@ -48 +49 @@
     void OnFingerDown(int id, int x, int y);
     void OnFingerUp(int id, int x, int y);
     void OnFingerMotion(int id, int x, int y);
+    void PressEvent(int, int, int);
 
     // Mouse emulation state:
     enum

source/simulation2/components/CCmpTemplateManager.cpp

@@ -261 +261 @@
 
 bool CCmpTemplateManager::LoadTemplateFile(const std::string& templateName, int depth)
 {
+    if (templateName.find("preview|") == 0)
+        ICmpTemplateManager::isPreviewActive = true;
+
     // If this file was already loaded, we don't need to do anything
     if (m_TemplateFileData.find(templateName) != m_TemplateFileData.end())
         return true;

source/simulation2/components/ICmpTemplateManager.cpp

@@ -21 +21 @@
 
 #include "simulation2/system/InterfaceScripted.h"
 
+bool ICmpTemplateManager::isPreviewActive = false;
+
 BEGIN_INTERFACE_WRAPPER(TemplateManager)
 DEFINE_INTERFACE_METHOD_1("GetTemplate", const CParamNode*, ICmpTemplateManager, GetTemplate, std::string)
 DEFINE_INTERFACE_METHOD_1("GetCurrentTemplateName", std::string, ICmpTemplateManager, GetCurrentTemplateName, entity_id_t)

source/simulation2/components/ICmpTemplateManager.h

@@ -115 +115 @@
      * their new CParamNode), then automatically updating this.template of scripted components.
      */
 
+    /*
+     * is true if there is currently a preview active.
+     */
+    static bool isPreviewActive;
+
     DECLARE_INTERFACE_TYPE(TemplateManager)
 };
 

source/ps/Hotkey.cpp

@@ -74 +74 @@
         for( CConfigValueSet::iterator it = bindingsIt->second.begin(); it != bindingsIt->second.end(); ++it )
         {
             std::string hotkey;
-            if( it->GetString( hotkey ) )
-            {
-                std::vector<SKey> keyCombination;
-
-                CParserLine multikeyIdentifier;
-                multikeyIdentifier.ParseString( multikeyParser, hotkey );
-
-                // Iterate through multiple-key bindings (e.g. Ctrl+I)
+            if( !it->GetString( hotkey ) )
+                continue;
 
-                bool negateNext = false;
+            std::vector<SKey> keyCombination;
 
-                for( size_t t = 0; t < multikeyIdentifier.GetArgCount(); t++ )
-                {
+            CParserLine multikeyIdentifier;
+            multikeyIdentifier.ParseString( multikeyParser, hotkey );
 
-                    if( multikeyIdentifier.GetArgString( (int)t, hotkey ) )
-                    {
-                        if( hotkey == "_negate" )
-                        {
-                            negateNext = true;
-                            continue;
-                        }
+            // Iterate through multiple-key bindings (e.g. Ctrl+I)
 
-                        // Attempt decode as key name
-                        int mapping = FindKeyCode( hotkey );
+            bool negateNext = false;
 
-                        // Attempt to decode as a negation of a keyname
-                        // Yes, it's going a bit far, perhaps.
-                        // Too powerful for most uses, probably.
-                        // However, it got some hardcoding out of the engine.
-                        // Thus it makes me happy.
+            for( size_t t = 0; t < multikeyIdentifier.GetArgCount(); t++ )
+            {
+                if( !multikeyIdentifier.GetArgString( (int)t, hotkey ) )
+                    continue;
 
-                        if( !mapping )
-                        {
-                            LOGWARNING(L"Hotkey mapping used invalid key '%hs'", hotkey.c_str() );
-                            continue;
-                        }
+                if( hotkey == "_negate" )
+                {
+                    negateNext = true;
+                    continue;
+                }
 
-                        SKey key = { (SDLKEY)mapping, negateNext };
-                        keyCombination.push_back(key);
+                // Attempt decode as key name
+                int mapping = FindKeyCode( hotkey );
 
-                        negateNext = false;
+                // Attempt to decode as a negation of a keyname
+                // Yes, it's going a bit far, perhaps.
+                // Too powerful for most uses, probably.
+                // However, it got some hardcoding out of the engine.
+                // Thus it makes me happy.
 
-                    }
+                if( !mapping )
+                {
+                    LOGWARNING(L"Hotkey mapping used invalid key '%hs'", hotkey.c_str() );
+                    continue;
                 }
 
-                std::vector<SKey>::iterator itKey, itKey2;
+                SKey key = { (SDLKEY)mapping, negateNext };
+                keyCombination.push_back(key);
 
-                for( itKey = keyCombination.begin(); itKey != keyCombination.end(); ++itKey )
-                {
-                    SHotkeyMapping bindCode;
+                negateNext = false;
+            }
 
-                    bindCode.name = hotkeyName;
-                    bindCode.negated = itKey->negated;
+            std::vector<SKey>::iterator itKey, itKey2;
 
-                    for( itKey2 = keyCombination.begin(); itKey2 != keyCombination.end(); ++itKey2 )
-                    {
-                        // Push any auxiliary keys.
-                        if( itKey != itKey2 )
-                            bindCode.requires.push_back( *itKey2 );
-                    }
+            for( itKey = keyCombination.begin(); itKey != keyCombination.end(); ++itKey )
+            {
+                SHotkeyMapping bindCode;
 
-                    g_HotkeyMap[itKey->code].push_back( bindCode );
+                bindCode.name = hotkeyName;
+                bindCode.negated = itKey->negated;
+
+                for( itKey2 = keyCombination.begin(); itKey2 != keyCombination.end(); ++itKey2 )
+                {
+                    // Push any auxiliary keys.
+                    if( itKey != itKey2 )
+                        bindCode.requires.push_back( *itKey2 );
                 }
+
+                g_HotkeyMap[itKey->code].push_back( bindCode );
             }
         }
     }

source/graphics/GameView.cpp

@@ -58 +58 @@
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
+#include "lib/external_libraries/libsdl.h"
 
 extern int g_xres, g_yres;
 
@@ -736 +737 @@
         moveForward += m->ViewScrollSpeed * deltaRealTime;
     if (HotkeyIsPressed("camera.down"))
         moveForward -= m->ViewScrollSpeed * deltaRealTime;
+    if (HotkeyIsPressed("session.queue")) {
+        SDL_WarpMouse(g_mouse_x + moveRightward*2, g_mouse_y - moveForward*2);
+        moveRightward = moveForward = 0;
+    }
 
     if (g_Joystick.IsEnabled())
     {

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

@@ -1540 +1540 @@
                     openDeleteDialog(selection);
                 break;
             case "garrison":
-                inputState = INPUT_SELECTING;
+                inputState = INPUT_PRESELECTEDACTION;
                 preSelectedAction = ACTION_GARRISON;
                 break;
             case "repair":
-                inputState = INPUT_SELECTING;
+                inputState = INPUT_PRESELECTEDACTION;
                 preSelectedAction = ACTION_BUILD;
                 break;
             case "unload-all":

binaries/data/mods/public/gui/session/session.xml

@@ -776 +776 @@
         <object name="unitCommandPanel"
             size="0 100%-36 100% 100%-4"
             type="image"
-            z="30"
+            z="50"
         >
             <object size="0 0 100% 100%">
             <repeat count="6">

binaries/data/mods/public/gui/session/session.xml

@@ -85 +85 @@
     </object>
 
         <!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
-    <object hotkey="selection.idlewarrior">
-        <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
-    </object>
+        <object hotkey="selection.idlewarrior">
+            <action on="Press">findEntity(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"], 1);</action>
+        </object>
+
+        <!-- Select civilcenter -->
+        <object hotkey="selection.civilcenter">
+            <action on="Press">findEntity(["CivCentre"], 0);</action>
+        </object>
+        <!-- Select market -->
+        <object hotkey="selection.market">
+            <action on="Press">findEntity(["BarterMarket", "Market", "NavalMarket"], 0);</action>
+        </object>
+        <!-- Select dropsitefood -->
+        <object hotkey="selection.dropsitefood">
+            <action on="Press">findEntity(["CivCentre", "DropsiteFood"], 0);</action>
+        </object>
+        <!-- Select dropsitewood -->
+        <object hotkey="selection.dropsiteres">
+            <action on="Press">findEntity(["CivCentre", "DropsiteWood", "DropsiteStone", "DropsiteMetal"], 0);</action>
+        </object>
+        <!-- Select structure -->
+        <object hotkey="selection.structure">
+            <action on="Press">findEntity(["Structure"], 0);</action>
+        </object>
 
     <!-- ================================  ================================ -->
     <!-- Developer / Debug items -->
@@ -527 +548 @@
             >
             <!-- TODO: should highlight the button if there's non-zero idle workers -->
             <object size="0 0 100% 100%" type="image" sprite="idleWorker" ghost="true" />
-            <action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
+            <action on="Press">findEntity(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"], 1);</action>
             </object>
         </object>
         </object>
@@ -586 +607 @@
             </repeat>
             </object>
         </object>
-
         <!-- Stance Selection -->
         <object name="unitStancePanel"
             style="TranslucentPanel"

source/gui/MiniMap.cpp

@@ -44 +44 @@
 
 bool g_GameRestarted = false;
 
-static unsigned int ScaleColor(unsigned int color, float x)
+static unsigned int ScaleColor(unsigned int color, unsigned int val, unsigned int div)
 {
-    unsigned int r = unsigned(float(color & 0xff) * x);
-    unsigned int g = unsigned(float((color>>8) & 0xff) * x);
-    unsigned int b = unsigned(float((color>>16) & 0xff) * x);
+    unsigned int r = (color & 0xff) * val / div;
+    unsigned int g = ((color>>8) & 0xff) * val / div;
+    unsigned int b = ((color>>16) & 0xff) * val / div;
     return (0xff000000 | r | g<<8 | b<<16);
 }
 
@@ -483 +483 @@
     u32 y = 0;
     u32 w = m_MapSize - 1;
     u32 h = m_MapSize - 1;
-    float waterHeight = g_Renderer.GetWaterManager()->m_WaterHeight;
+    float waterHeight = g_Renderer.GetWaterManager()->m_WaterHeight * 4.0f;
 
     m_TerrainDirty = false;
 
@@ -492 +492 @@
         u32 *dataPtr = m_TerrainData + ((y + j) * (m_MapSize - 1)) + x;
         for(u32 i = 0; i < w; i++)
         {
-            float avgHeight = ( m_Terrain->GetVertexGroundLevel((int)i, (int)j)
+            float avgHeight = m_Terrain->GetVertexGroundLevel((int)i, (int)j)
                     + m_Terrain->GetVertexGroundLevel((int)i+1, (int)j)
                     + m_Terrain->GetVertexGroundLevel((int)i, (int)j+1)
-                    + m_Terrain->GetVertexGroundLevel((int)i+1, (int)j+1)
-                ) / 4.0f;
+                    + m_Terrain->GetVertexGroundLevel((int)i+1, (int)j+1);
 
             if(avgHeight < waterHeight)
             {
@@ -525 +524 @@
                     }
                 }
 
-                *dataPtr++ = ScaleColor(color, float(val) / 255.0f);
+                *dataPtr++ = ScaleColor(color, val, 255);
             }
         }
     }

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

@@ -90 +90 @@
         case "connected":
             obj.caption = "Connected to the server.";
             obj.hidden = false;
+            break;
         case "authenticated":
             obj.caption = "Connection to the server has been authenticated.";
             obj.hidden = false;
+            break;
         case "disconnected":
             obj.caption = "Connection to the server has been lost.\n\nThe game has ended.";
             obj.hidden = false;

libraries/spidermonkey/include-win32/js/jstracer.h

@@ -106 +106 @@
 
     void add(T a) {
         ensure(_len + 1);
-        JS_ASSERT(_len <= _max);
+        JS_ASSERT(_len < _max);
         _data[_len++] = a;
     }
 
     void add(T* chunk, unsigned size) {
         ensure(_len + size);
-        JS_ASSERT(_len <= _max);
+        JS_ASSERT(_len < _max);
         memcpy(&_data[_len], chunk, size * sizeof(T));
         _len += size;
     }

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

@@ -467 +467 @@
     {
         target = targets[0];
     }
+    if (Engine.HotkeyIsPressed("session.garrison"))
+        preSelectedAction = ACTION_GARRISON;
 
-    if (preSelectedAction != ACTION_NONE)
+    if (preSelectedAction & (ACTION_GARRISON|ACTION_BUILD))
     {
         switch (preSelectedAction)
         {
@@ -486 +488 @@
             break;
         }
     }
-    else if (Engine.HotkeyIsPressed("session.garrison") || preSelectedAction == ACTION_GARRISON)
-    {
-        if (getActionInfo("garrison", target).possible)
-            return {"type": "garrison", "cursor": "action-garrison", "target": target};
-        else
-            return  {"type": "none", "cursor": "action-garrison-disabled", "target": undefined};
-    }
     else
     {
         var actionInfo = undefined;
@@ -1123 +1118 @@
                     resetPreselectedAction();
                     return true;
                 }
-
                 var selectedEntity = ents[0];
-                var now = new Date();
 
                 // If camera following and we select different unit, stop
                 if (Engine.GetFollowedEntity() != selectedEntity)
                 {
                     Engine.CameraFollow(0);
                 }
-
-                if ((now.getTime() - doubleClickTimer < doubleClickTime) && (selectedEntity == prevClickedEntity))
-                {
-                    // Double click or triple click has occurred
-                    var showOffscreen = Engine.HotkeyIsPressed("selection.offscreen");
-                    var matchRank = true;
-                    var templateToMatch;
-
-                    // Check for double click or triple click
-                    if (!doubleClicked)
-                    {
-                        // If double click hasn't already occurred, this is a double click.
-                        // Select similar units regardless of rank
-                        templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).identity.selectionGroupName;
-                        if (templateToMatch)
-                        {
-                            matchRank = false;
-                        }
-                        else
-                        {   // No selection group name defined, so fall back to exact match
-                            templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).template;
-                        }
-
-                        doubleClicked = true;
-                        // Reset the timer so the user has an extra period 'doubleClickTimer' to do a triple-click
-                        doubleClickTimer = now.getTime();
-                    }
-                    else
-                    {
-                        // Double click has already occurred, so this is a triple click.
-                        // Select units matching exact template name (same rank)
-                        templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).template;
-                    }
-
-                    // TODO: Should we handle "control all units" here as well?
-                    ents = Engine.PickSimilarFriendlyEntities(templateToMatch, showOffscreen, matchRank, false);
-                }
-                else
-                {
-                    // It's single click right now but it may become double or triple click
-                    doubleClicked = false;
-                    doubleClickTimer = now.getTime();
-                    prevClickedEntity = selectedEntity;
-
-                    // We only want to include the first picked unit in the selection
-                    ents = [ents[0]];
-                }
-
-                // Update the list of selected units
-                if (Engine.HotkeyIsPressed("selection.add"))
-                {
-                    g_Selection.addList(ents);
-                }
-                else if (Engine.HotkeyIsPressed("selection.remove"))
-                {
-                    g_Selection.removeList(ents);
-                }
-                else
-                {
-                    g_Selection.reset();
-                    g_Selection.addList(ents);
-                }
-                resetPreselectedAction();
+                ClickSelected(ents, (selectedEntity == prevClickedEntity));
                 return true;
             }
             break;
@@ -1262 +1193 @@
     return false;
 }
 
+function ClickSelected(ents, is_same)
+{
+    var selectedEntity = ents[0];
+    var now = new Date();
+
+    if ((now.getTime() - doubleClickTimer < doubleClickTime) && is_same)
+    {
+        // Double click or triple click has occurred
+        var showOffscreen = Engine.HotkeyIsPressed("selection.offscreen");
+        var matchRank = true;
+        var templateToMatch;
+
+        // Check for double click or triple click
+        if (!doubleClicked)
+        {
+            // If double click hasn't already occurred, this is a double click.
+            // Select similar units regardless of rank
+            templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).identity.selectionGroupName;
+            if (templateToMatch)
+            {
+                matchRank = false;
+            }
+            else
+            {   // No selection group name defined, so fall back to exact match
+                templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).template;
+            }
+
+            doubleClicked = true;
+            // Reset the timer so the user has an extra period 'doubleClickTimer' to do a triple-click
+            doubleClickTimer = now.getTime();
+        }
+        else
+        {
+            // Double click has already occurred, so this is a triple click.
+            // Select units matching exact template name (same rank)
+            templateToMatch = Engine.GuiInterfaceCall("GetEntityState", selectedEntity).template;
+        }
+
+        // TODO: Should we handle "control all units" here as well?
+        ents = Engine.PickSimilarFriendlyEntities(templateToMatch, showOffscreen, matchRank, false);
+    }
+    else
+    {
+        // It's single click right now but it may become double or triple click
+        doubleClicked = false;
+        doubleClickTimer = now.getTime();
+        prevClickedEntity = selectedEntity;
+
+        // We only want to include the first picked unit in the selection
+        ents = [ents[0]];
+    }
+
+    // Update the list of selected units
+    if (Engine.HotkeyIsPressed("selection.add"))
+    {
+        g_Selection.addList(ents);
+    }
+    else if (Engine.HotkeyIsPressed("selection.remove"))
+    {
+        g_Selection.removeList(ents);
+    }
+    else
+    {
+        g_Selection.reset();
+        g_Selection.addList(ents);
+    }
+    resetPreselectedAction();
+}
+
 function doAction(action, ev)
 {
     var selection = g_Selection.toList();
@@ -1910 +1910 @@
     }
 }
 
+// mode 0 is to search for idle, 1 to search for any
 function findEntity(classes, mode)
 {
     var queued = Engine.HotkeyIsPressed("session.queue");
@@ -1918 +1919 @@
         return;
     }
     var player = Engine.GetPlayerID();
+
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)
     {
@@ -1929 +1931 @@
                 resetPreselectedAction();
             else if (preSelectedAction == ACTION_BUILD)
                 updateBuildingPlacementPreview();
-
             lastEntity = newEntity;
-            g_Selection.reset();
-            g_Selection.addList([lastEntity]);
-            Engine.CameraFollow(lastEntity);
+            ClickSelected([newEntity], 1);
             return;
         }
         lastEntity = 0;

binaries/data/config/default.cfg

@@ -203 +203 @@
 hotkey.selection.group.action.11 = "Ctrl+L"
 hotkey.selection.group.action.12 = "Ctrl+Semicolon"
 hotkey.selection.group.action.13 = "Ctrl+SingleQuote"
-hotkey.selection.group.action.reset = ForwardSlash
+hotkey.selection.group.reset.0 = ForwardSlash
+hotkey.selection.group.stance.0 = V
+hotkey.selection.group.formation.0 = B
+hotkey.selection.group.garrison.0 = N
+hotkey.selection.group.ungarrison.0 = M
 
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units

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

@@ -35 +35 @@
 const INPUT_PRESELECTEDACTION = 7;
 const INPUT_BUILDING_WALL_CLICK = 8;
 const INPUT_BUILDING_WALL_PATHING = 9;
+const INPUT_ACTION_STATE = 10;
 
 var inputState = INPUT_NORMAL;
 var placementSupport = new PlacementSupport();
@@ -1028 +1029 @@
     switch (inputState)
     {
     case INPUT_NORMAL:
+    case INPUT_ACTION_STATE:
         switch (ev.type)
         {
         case "mousemotion":
@@ -1538 +1540 @@
                     openDeleteDialog(selection);
                 break;
             case "garrison":
-                inputState = INPUT_PRESELECTEDACTION;
+                inputState = INPUT_SELECTING;
                 preSelectedAction = ACTION_GARRISON;
                 break;
             case "repair":
-                inputState = INPUT_PRESELECTEDACTION;
+                inputState = INPUT_SELECTING;
                 preSelectedAction = ACTION_BUILD;
                 break;
             case "unload-all":
@@ -1593 +1595 @@
     {
         var sptr = ev.hotkey.split(".");
         var now = new Date();
-        if (inputState = INPUT_NORMAL && (ev.hotkey == prevHotkey) &&
+        if ((inputState == INPUT_NORMAL) && (ev.hotkey == prevHotkey) &&
                 ev.hotkey.indexOf("selection.group.select.") == 0 &&
                 (now.getTime() - doublePressTimer < doublePressTime)) {
             performGroup("snap", sptr[3]);
@@ -1608 +1610 @@
 }
 
 // Performs the specified group
-function performGroup(action, nr)
+function performGroup(action, x)
 {
-    if (nr == "reset")
-    {
-        resetPreselectedAction();
-        return;
-    }
     switch (action)
     {
     case "snap":
@@ -1622 +1619 @@
     case "add":
         var toSelect = [];
         g_Groups.update();
-        for (var ent in g_Groups.groups[nr].ents)
+        for (var ent in g_Groups.groups[x].ents)
             toSelect.push(+ent);
 
         if (action != "add")
@@ -1632 +1629 @@
 
         if (action == "snap" && toSelect.length)
             Engine.CameraFollow(toSelect[0]);
-        break;
+        return;
     case "save":
         var selection = g_Selection.toList();
-        g_Groups.groups[nr].reset();
-        g_Groups.addEntities(nr, selection);
+        g_Groups.groups[x].reset();
+        g_Groups.addEntities(x, selection);
         updateGroups();
-        break;
+        return;
     case "action":
         var selection = g_Selection.toList();
         var player = Engine.GetPlayerID();
+        if (inputState != INPUT_ACTION_STATE)
+            preSelectedAction = getDefaultActionForSelection(player, selection);
+        break;
+    case "reset":
+        resetPreselectedAction();
+        return;
+    case "garrison":
+        preSelectedAction = ACTION_GARRISON;
+        inputState = INPUT_PRESELECTEDACTION;
+        return;
+    case "ungarrison":
+        preSelectedAction = ACTION_UNGARRISON;
+        inputState = INPUT_ACTION_STATE;
+        return;
+    case "stance":
+        preSelectedAction = ACTION_STANCE;
+        inputState = INPUT_ACTION_STATE;
+        return;
+    case "formation":
+        preSelectedAction = ACTION_FORMATION;
+        inputState = INPUT_ACTION_STATE;
+        return;
+    }
+    if (inputState == INPUT_ACTION_STATE)
+        inputState = INPUT_NORMAL;
+    if (preSelectedAction == ACTION_NONE)
+        return;
 
-        preSelectedAction = getDefaultActionForSelection(player, selection);
-        if (preSelectedAction == ACTION_NONE)
-            break;
+    var lst = selectAction(player, selection);
+    if (!lst) // shouldn't happen
+        return;
 
-        var lst = selectAction(player, selection);
-        if (!lst) // shouldn't happen
-            break;
+    if (preSelectedAction & ACTION_GARRISON)
+    {
+        if (++x > lst.length)
+            x = lst.length;
+    } else if (preSelectedAction != ACTION_UNGARRISON) {
+        if (x >= lst.length)
+            return;
+        lst = lst[x];
+    }
 
-        if (preSelectedAction & ACTION_GARRISON)
-        {
-            if (++nr > lst.length)
-                nr = lst.length;
-        } else if (preSelectedAction != ACTION_UNGARRISON) {
-            if (nr >= lst.length)
-                break;
-            lst = lst[nr];
+    switch (preSelectedAction)
+    {
+    case ACTION_BUILD:
+        var tmpl = GetTemplateData(lst);
+        if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+            // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
+            startBuildingPlacement(lst);
+            placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
+            initBuildingPlacementView();
         }
-
-        switch (preSelectedAction)
-        {
-        case ACTION_BUILD:
-            var tmpl = GetTemplateData(lst);
-            if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
-                // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
-                startBuildingPlacement(lst);
-                placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
-                initBuildingPlacementView();
-            }
-            break;
-        case ACTION_TRAIN:
-            var tmpl = GetTemplateData(lst);
-            if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
-                var ents = g_Selection.toList();
-                addTrainingToQueue(ents, lst);
-            }
-            break;
-        case ACTION_GARRISON: // we garison nr+1 count
-            g_Selection.reset();
-            lst.splice(nr, lst.length - nr)
-            g_Selection.addList(lst);
-            inputState = INPUT_PRESELECTEDACTION;
-            break;
-        case ACTION_UNGARRISON:
-            if (lst.length > 1 || nr == 0) {
-                if (nr >= lst.length)
-                    nr = lst.length - 1;
-                if (lst.length != 1 && nr == 0) {
-                    // unload all from all buildings
-                    for each (var gh in lst)
-                        unloadAll(gh);
-                } else {
-                    if (lst.length != 1)
-                        nr--;
-                    unloadAll(lst[nr]);
-                }
-                g_Selection.reset();
-                break;
+        break;
+    case ACTION_TRAIN:
+        var tmpl = GetTemplateData(lst);
+        if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+            var ents = g_Selection.toList();
+            addTrainingToQueue(ents, lst);
+        }
+        break;
+    case ACTION_GARRISON: // we garison x+1 count
+        g_Selection.reset();
+        lst.splice(x, lst.length - x)
+        g_Selection.addList(lst);
+        inputState = INPUT_PRESELECTEDACTION;
+        break;
+    case ACTION_UNGARRISON:
+        if (lst.length > 1 || x == 0) {
+            if (x >= lst.length)
+                x = lst.length - 1;
+            if (lst.length != 1 && x == 0) {
+                // unload all from all buildings
+                for each (var gh in lst)
+                    unloadAll(gh);
             } else {
-                lst = lst[0];
-                var state = GetEntityState(lst);
-                var gents = state.garrisonHolder.entities;
-                if (nr > gents.length)
-                    nr = gents.length;
-                while (nr--)
-                    Engine.PostNetworkCommand({"type": "unload", "entities": [gents[nr]], "garrisonHolder": lst});
-                // we could assign a key to follow them here
-                break;
+                if (lst.length != 1)
+                    x--;
+                unloadAll(lst[x]);
             }
-            break;
-        case ACTION_FORMATION:
-            ents = g_Selection.toList();
-            var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
-                "ents": g_Selection.toList(),
-                "formationName": lst
-            });
-            if (formationOk)
-                performFormation(ents, lst);
-            break
-        case ACTION_STANCE:
-            ents = g_Selection.toList();
-            performStance(ents, lst);
-            break;
-        case ACTION_BARTER: //TODO
-            break;
-        case ACTION_TRADER: //TODO
-            break;
+            g_Selection.reset();
+        } else {
+            lst = lst[0];
+            var state = GetEntityState(lst);
+            var gents = state.garrisonHolder.entities;
+            if (x > gents.length)
+                x = gents.length;
+            while (x--)
+                Engine.PostNetworkCommand({"type": "unload", "entities": [gents[x]], "garrisonHolder": lst});
+            // we could assign a key to follow them here
         }
         break;
+    case ACTION_FORMATION:
+        ents = g_Selection.toList();
+        var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
+            "ents": g_Selection.toList(),
+            "formationName": lst
+        });
+        if (formationOk)
+            performFormation(ents, lst);
+        break
+    case ACTION_STANCE:
+        ents = g_Selection.toList();
+        performStance(ents, lst);
+        break;
+    case ACTION_BARTER: //TODO
+        break;
+    case ACTION_TRADER: //TODO
+        break;
     }
 }
 
 // This returns a list of actions. Caller still has to check Technology availability
 function selectAction(player, selection)
 {
-    var ret = [];
     if (preSelectedAction == ACTION_FORMATION)
-    {
         return Engine.GuiInterfaceCall("GetAvailableFormations");
-    } else if (preSelectedAction == ACTION_STANCE)
-    {
+    else if (preSelectedAction == ACTION_STANCE)
         return ["violent", "aggressive", "passive", "defensive", "standground"];
-    }
+
+    var ret = [];
     for each (var ent in selection)
     {
         var state = GetEntityState(ent);

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

@@ -1066 +1066 @@
         switch (ev.type)
         {
         case "mousebuttondown":
-            if (ev.button == SDL_BUTTON_LEFT && preSelectedAction)
+            if (ev.button == SDL_BUTTON_LEFT && preSelectedAction != ACTION_NONE)
             {
                 var action = determineAction(ev.x, ev.y);
                 resetPreselectedAction();
@@ -1647 +1647 @@
         if (preSelectedAction == ACTION_NONE)
             break;
 
-        var lst = selectAction(player, selection, action);
+        var lst = selectAction(player, selection);
         if (!lst) // shouldn't happen
             break;
 
@@ -1734 +1734 @@
     }
 }
 
-function selectAction(player, selection, action)
+// This returns a list of actions. Caller still has to check Technology availability
+function selectAction(player, selection)
 {
     var ret = [];
-    if (action == ACTION_FORMATION)
+    if (preSelectedAction == ACTION_FORMATION)
     {
         return Engine.GuiInterfaceCall("GetAvailableFormations");
-    } else if (action == ACTION_STANCE)
+    } else if (preSelectedAction == ACTION_STANCE)
     {
         return ["violent", "aggressive", "passive", "defensive", "standground"];
     }
@@ -1786 +1787 @@
     return ret;
 }
 
-// This returns a list of actions. Caller still has to check Technology availability
 function getDefaultActionForSelection(player, selection)
 {
     var action;
@@ -1911 +1911 @@
         var newEntity = Engine.GuiInterfaceCall("FindEntity", data);
         if (newEntity && newEntity != lastEntity)
         {
-            if (!selectAction(player, [newEntity], preSelectedAction).length)
+            if (!selectAction(player, [newEntity]).length)
                 resetPreselectedAction();
             else if (preSelectedAction == ACTION_BUILD)
                 updateBuildingPlacementPreview();

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

@@ -1057 +1057 @@
             break;
 
         case "hotkeydown":
-            if (ev.hotkey && ev.hotkey.indexOf("selection.group.") == 0)
-            {
-                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]);
-                }
-                else
-                {
-                    performGroup(sptr[2], sptr[3]);
-
-                    doublePressTimer = now.getTime();
-                    prevHotkey = ev.hotkey;
-                }
-            }
+            handleHotkey(ev);
             break;
         }
         break;
@@ -1094 +1080 @@
                 break;
             }
         case "hotkeydown":
-            if (ev.hotkey && ev.hotkey.indexOf("selection.group.action.") == 0)
-            {
-                var sptr = ev.hotkey.split(".");
-                performGroup(sptr[2], sptr[3]);
-            }
+            handleHotkey(ev);
             break;
         default:
             // Slight hack: If selection is empty, reset the input state
@@ -1268 +1250 @@
                 updateBuildingPlacementPreview();
                 break;
             default:
-                if (ev.hotkey.indexOf("selection.group.action.") == 0)
-                {   // can switch buildings
-                    var sptr = ev.hotkey.split(".");
-                    performGroup(sptr[2], sptr[3]);
-                }
+                handleHotkey(ev); // to switch buildings
             }
             break;
 
@@ -1609 +1587 @@
     }
 }
 
-function selectAction(player, selection, action)
+function handleHotkey(ev)
 {
-    var ret = [];
-    if (action == ACTION_FORMATION)
-    {
-        return Engine.GuiInterfaceCall("GetAvailableFormations");
-    } else if (action == ACTION_STANCE)
-    {
-        return ["violent", "aggressive", "passive", "defensive", "standground"];
-    }
-    for each (var ent in selection)
+    if (ev.hotkey && ev.hotkey.indexOf("selection.group.") == 0)
     {
-        var state = GetEntityState(ent);
-        if (!state || (state.player != player && !g_DevSettings.controlAll))
-            continue;
-
-        switch (preSelectedAction)
+        var sptr = ev.hotkey.split(".");
+        var now = new Date();
+        if (inputState = INPUT_NORMAL && (ev.hotkey == prevHotkey) &&
+                ev.hotkey.indexOf("selection.group.select.") == 0 &&
+                (now.getTime() - doublePressTimer < doublePressTime)) {
+            performGroup("snap", sptr[3]);
+        }
+        else
         {
-        case ACTION_GARRISON:
-            if (state.buildEntities || (hasClass(state, "Unit") && !hasClass(state, "Animal") && !state.garrisonHolder)) {
-                inputState = INPUT_PRESELECTEDACTION;
-                ret.push(ent);
-            }
-            break;
-        case ACTION_BUILD:
-            if (state.buildEntities && state.buildEntities.length) {
-                if (inputState != INPUT_BUILDING_PLACEMENT)
-                    inputState = INPUT_PRESELECTEDACTION;
-                return state.buildEntities;
-            }
-            break;
-        case ACTION_TRAIN:
-            if (state.production && state.production.entities.length)
-                return state.production.entities;
-            break;
-        case ACTION_UNGARRISON:
-            if (state.garrisonHolder && state.garrisonHolder.entities && state.garrisonHolder.entities.length)
-                ret.push(ent);
-            break;
-        case ACTION_BARTER:
-            if (state.barterMarket)
-                ret.push(ent);
-            break;
-        case ACTION_TRADER:
-            if (state.trader)
-                ret.push([ent, state]);
-            break;
+            performGroup(sptr[2], sptr[3]);
+            doublePressTimer = now.getTime();
+            prevHotkey = ev.hotkey;
         }
     }
-    return ret;
-}
-
-// This returns a list of actions. Caller still has to check Technology availability
-function getDefaultActionForSelection(player, selection)
-{
-    var action;
-    var count = 0;
-    for each (var ent in selection)
-    {
-        var state = GetEntityState(ent);
-        if (!state || (state.player != player && !g_DevSettings.controlAll))
-            continue;
-
-        if (state.buildEntities && state.buildEntities.length)
-            return ACTION_BUILD; // by default
-
-        if (state.production && state.production.entities.length)
-            action |= ACTION_TRAIN;
-        else if (!hasClass(state, "Unit") || hasClass(state, "Animal") ||
-                !state.garrisonHolder) {
-            if (++count > 1) //only works with at least two units
-                action |= ACTION_FORMATION;
-        } else if (state.barterMarket)
-            action |= ACTION_BARTER;
-        else if (state.trader)
-            action |= ACTION_TRADER;
-    }
-    if (action & ACTION_TRAIN)
-        return ACTION_TRAIN;
-    else if (action & ACTION_FORMATION)
-        return ACTION_FORMATION;
-    else if (action & ACTION_BARTER) {
-        setupUnitBarterPanel(state);
-        return ACTION_BARTER;
-    } else if (action & ACTION_TRADER) {
-        setupUnitTradingPanel(state, selection);
-        return ACTION_TRADER;
-    }
-    return 0; //shouldn't happen
 }
 
 // Performs the specified group
@@ -1827 +1734 @@
     }
 }
 
+function selectAction(player, selection, action)
+{
+    var ret = [];
+    if (action == ACTION_FORMATION)
+    {
+        return Engine.GuiInterfaceCall("GetAvailableFormations");
+    } else if (action == ACTION_STANCE)
+    {
+        return ["violent", "aggressive", "passive", "defensive", "standground"];
+    }
+    for each (var ent in selection)
+    {
+        var state = GetEntityState(ent);
+        if (!state || (state.player != player && !g_DevSettings.controlAll))
+            continue;
+
+        switch (preSelectedAction)
+        {
+        case ACTION_GARRISON:
+            if (state.buildEntities || (hasClass(state, "Unit") && !hasClass(state, "Animal") && !state.garrisonHolder)) {
+                inputState = INPUT_PRESELECTEDACTION;
+                ret.push(ent);
+            }
+            break;
+        case ACTION_BUILD:
+            if (state.buildEntities && state.buildEntities.length) {
+                if (inputState != INPUT_BUILDING_PLACEMENT)
+                    inputState = INPUT_PRESELECTEDACTION;
+                return state.buildEntities;
+            }
+            break;
+        case ACTION_TRAIN:
+            if (state.production && state.production.entities.length)
+                return state.production.entities;
+            break;
+        case ACTION_UNGARRISON:
+            if (state.garrisonHolder && state.garrisonHolder.entities && state.garrisonHolder.entities.length)
+                ret.push(ent);
+            break;
+        case ACTION_BARTER:
+            if (state.barterMarket)
+                ret.push(ent);
+            break;
+        case ACTION_TRADER:
+            if (state.trader)
+                ret.push([ent, state]);
+            break;
+        }
+    }
+    return ret;
+}
+
+// This returns a list of actions. Caller still has to check Technology availability
+function getDefaultActionForSelection(player, selection)
+{
+    var action;
+    var count = 0;
+    for each (var ent in selection)
+    {
+        var state = GetEntityState(ent);
+        if (!state || (state.player != player && !g_DevSettings.controlAll))
+            continue;
+
+        if (state.buildEntities && state.buildEntities.length)
+            return ACTION_BUILD; // by default
+
+        if (state.production && state.production.entities.length)
+            action |= ACTION_TRAIN;
+        else if (!hasClass(state, "Unit") || hasClass(state, "Animal") ||
+                !state.garrisonHolder) {
+            if (++count > 1) //only works with at least two units
+                action |= ACTION_FORMATION;
+        } else if (state.barterMarket)
+            action |= ACTION_BARTER;
+        else if (state.trader)
+            action |= ACTION_TRADER;
+    }
+    if (action & ACTION_TRAIN)
+        return ACTION_TRAIN;
+    else if (action & ACTION_FORMATION)
+        return ACTION_FORMATION;
+    else if (action & ACTION_BARTER) {
+        setupUnitBarterPanel(state);
+        return ACTION_BARTER;
+    } else if (action & ACTION_TRADER) {
+        setupUnitTradingPanel(state, selection);
+        return ACTION_TRADER;
+    }
+    return 0; //shouldn't happen
+}
+
 // Performs the specified stance
 function performStance(entity, stanceName)
 {

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

@@ -666 +666 @@
         mouseY = ev.y;
         break;
     }
-    if (followQueue.lenght)
+    if (followQueue.length)
     {
         var gents = followQueue;
         var state = GetEntityState(gents[0]);
-        // FIXME this stalls until the selection actually occurs
         if (state.visibility == "hidden")
             return true;
         Engine.CameraFollow(0);
         Engine.CameraFollow(gents[0]);
         g_Selection.addList(gents);
         resetPreselectedAction();
-        followQueue = [];
+        followQueue = []; // for next time.
     }
     // Remember whether the mouse is over a GUI object or not
     mouseIsOverObject = (hoveredObject != null);
@@ -1784 +1783 @@
                 if (nr >= lst.length)
                     nr = lst.length - 1;
                 if (lst.length != 1 && nr == 0) {
-                    followQueue = [];
                     // unload all from all buildings
-                    for each (var gh in lst) {
-                        var s = GetEntityState(gh);
-                        var gs = s.garrisonHolder.entities;
-                        followQueue = followQueue.concat(gs);
+                    for each (var gh in lst)
                         unloadAll(gh);
-                    }
                 } else {
                     if (lst.length != 1)
                         nr--;
-                    lst = lst[nr];
-
-                    var state = GetEntityState(lst);
-                    var gents = state.garrisonHolder.entities;
-                    followQueue = gents;
-                    unloadAll(lst);
+                    unloadAll(lst[nr]);
                 }
                 g_Selection.reset();
                 break;
@@ -1953 +1942 @@
 
 function unloadAll(garrisonHolder)
 {
+    var state = GetEntityState(garrisonHolder);
+    var gents = state.garrisonHolder.entities;
+    followQueue = followQueue.concat(gents);
     Engine.PostNetworkCommand({"type": "unload-all", "garrisonHolder": garrisonHolder});
 }

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

@@ -23 +23 @@
 const ACTION_TRADER =128;
 var preSelectedAction = ACTION_NONE;
 
-// N.B. reset this after selecting different units or buildings
-var _optionsOfpreSelected = [];
+var followQueue = [];
 
 const INPUT_NORMAL = 0;
 const INPUT_SELECTING = 1;
@@ -36 +35 @@
 const INPUT_PRESELECTEDACTION = 7;
 const INPUT_BUILDING_WALL_CLICK = 8;
 const INPUT_BUILDING_WALL_PATHING = 9;
-const INPUT_FOLLOW_UNGARRISON = 10;
 
 var inputState = INPUT_NORMAL;
 var placementSupport = new PlacementSupport();
@@ -188 +186 @@
 {
     preSelectedAction = ACTION_NONE;
     inputState = INPUT_NORMAL;
-    _optionsOfpreSelected = [];
     placementSupport.Reset(); // or a hotkey may leave a building snapshot
     updateCursorAndTooltip();
 
@@ -669 +666 @@
         mouseY = ev.y;
         break;
     }
-    if (inputState == INPUT_FOLLOW_UNGARRISON)
+    if (followQueue.lenght)
     {
-        var gents = _optionsOfpreSelected;
+        var gents = followQueue;
         var state = GetEntityState(gents[0]);
         // FIXME this stalls until the selection actually occurs
         if (state.visibility == "hidden")
@@ -680 +677 @@
         Engine.CameraFollow(gents[0]);
         g_Selection.addList(gents);
         resetPreselectedAction();
+        followQueue = [];
     }
     // Remember whether the mouse is over a GUI object or not
     mouseIsOverObject = (hoveredObject != null);
@@ -1044 +1042 @@
             return false;
 
         case "mousebuttondown":
-            _optionsOfpreSelected = [];
             if (ev.button == SDL_BUTTON_LEFT)
             {
                 dragStart = [ ev.x, ev.y ];
@@ -1245 +1242 @@
                     placementSupport.position = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
                     dragStart = [ ev.x, ev.y ];
                     inputState = INPUT_BUILDING_CLICK;
-                    _optionsOfpreSelected = [];
                 }
                 return true;
             }
@@ -1614 +1610 @@
     }
 }
 
-// This returns a list of actions. Caller still has to check Technology availability
-function getActionForSelection(player, selection)
+function selectAction(player, selection, action)
 {
     var ret = [];
-
+    if (action == ACTION_FORMATION)
+    {
+        return Engine.GuiInterfaceCall("GetAvailableFormations");
+    } else if (action == ACTION_STANCE)
+    {
+        return ["violent", "aggressive", "passive", "defensive", "standground"];
+    }
     for each (var ent in selection)
     {
         var state = GetEntityState(ent);
@@ -1648 +1649 @@
             if (state.garrisonHolder && state.garrisonHolder.entities && state.garrisonHolder.entities.length)
                 ret.push(ent);
             break;
-        case ACTION_FORMATION:
-        case ACTION_STANCE:
-            if (!hasClass(state, "Unit") || hasClass(state, "Animal") || state.garrisonHolder)
-                break;
-
-            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");
-            ret.push(1);
-            break;
         case ACTION_BARTER:
             if (state.barterMarket)
                 ret.push(ent);
@@ -1667 +1657 @@
             if (state.trader)
                 ret.push([ent, state]);
             break;
-        default:
-            return ret; //shouldn't happen
         }
     }
     return ret;
 }
 
+// This returns a list of actions. Caller still has to check Technology availability
+function getDefaultActionForSelection(player, selection)
+{
+    var action;
+    var count = 0;
+    for each (var ent in selection)
+    {
+        var state = GetEntityState(ent);
+        if (!state || (state.player != player && !g_DevSettings.controlAll))
+            continue;
+
+        if (state.buildEntities && state.buildEntities.length)
+            return ACTION_BUILD; // by default
+
+        if (state.production && state.production.entities.length)
+            action |= ACTION_TRAIN;
+        else if (!hasClass(state, "Unit") || hasClass(state, "Animal") ||
+                !state.garrisonHolder) {
+            if (++count > 1) //only works with at least two units
+                action |= ACTION_FORMATION;
+        } else if (state.barterMarket)
+            action |= ACTION_BARTER;
+        else if (state.trader)
+            action |= ACTION_TRADER;
+    }
+    if (action & ACTION_TRAIN)
+        return ACTION_TRAIN;
+    else if (action & ACTION_FORMATION)
+        return ACTION_FORMATION;
+    else if (action & ACTION_BARTER) {
+        setupUnitBarterPanel(state);
+        return ACTION_BARTER;
+    } else if (action & ACTION_TRADER) {
+        setupUnitTradingPanel(state, selection);
+        return ACTION_TRADER;
+    }
+    return 0; //shouldn't happen
+}
+
 // Performs the specified group
 function performGroup(action, nr)
 {
@@ -1707 +1734 @@
         updateGroups();
         break;
     case "action":
-        if (!_optionsOfpreSelected.length) {
-            // action hotkey (first pass): With current selection, check possible
-            // ACTION_XXX's and set preSelectedAction when applicable
-            preSelectedAction = (1 << nr);
-
-            var selection = g_Selection.toList();
-            var player = Engine.GetPlayerID();
+        var selection = g_Selection.toList();
+        var player = Engine.GetPlayerID();
 
-            var actions = getActionForSelection(player, selection);
-            if (!actions || !actions.length) {
-                preSelectedAction = ACTION_NONE;
-                break;
-            }
+        preSelectedAction = getDefaultActionForSelection(player, selection);
+        if (preSelectedAction == ACTION_NONE)
+            break;
 
-            if (preSelectedAction == ACTION_BARTER)
-                setupUnitBarterPanel(state);
-            else if (preSelectedAction == ACTION_TRADER)
-                setupUnitTradingPanel(state, selection);
+        var lst = selectAction(player, selection, action);
+        if (!lst) // shouldn't happen
+            break;
 
-            _optionsOfpreSelected = actions;
-        }
-        else
+        if (preSelectedAction & ACTION_GARRISON)
         {
-            // 2nd action hotkey. Do preselectedAction[nr]
-            // The result depends on the action.
-
-            var lst = _optionsOfpreSelected;
-            if (!lst) // shouldn't happen
+            if (++nr > lst.length)
+                nr = lst.length;
+        } else if (preSelectedAction != ACTION_UNGARRISON) {
+            if (nr >= lst.length)
                 break;
+            lst = lst[nr];
+        }
 
-            if (preSelectedAction & ACTION_GARRISON)
-            {
-                if (++nr > lst.length)
-                    nr = lst.length;
-            } else if (preSelectedAction != ACTION_UNGARRISON) {
-                if (nr >= lst.length)
-                    break;
-                lst = lst[nr];
+        switch (preSelectedAction)
+        {
+        case ACTION_BUILD:
+            var tmpl = GetTemplateData(lst);
+            if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+                // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
+                startBuildingPlacement(lst);
+                placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
+                initBuildingPlacementView();
             }
-
-            switch (preSelectedAction)
-            {
-            case ACTION_BUILD:
-                var tmpl = GetTemplateData(lst);
-                if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
-                    // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
-                    startBuildingPlacement(lst);
-                    placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
-                    initBuildingPlacementView();
-                }
-                break;
-            case ACTION_TRAIN:
-                var tmpl = GetTemplateData(lst);
-                if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
-                    var ents = g_Selection.toList();
-                    addTrainingToQueue(ents, lst);
-                }
-                break;
-            case ACTION_GARRISON: // we garison nr+1 count
-                g_Selection.reset();
-                lst.splice(nr, lst.length - nr)
-                g_Selection.addList(lst);
-                inputState = INPUT_PRESELECTEDACTION;
-                break;
-            case ACTION_UNGARRISON:
-                if (lst.length > 1 || nr == 0) {
-                    if (nr >= lst.length)
-                        nr = lst.length - 1;
-                    if (lst.length != 1 && nr == 0) {
-                        // unload all from all buildings
-                        _optionsOfpreSelected = [];
-                        for each (var gh in lst) {
-                            var s = GetEntityState(gh);
-                            var gs = s.garrisonHolder.entities;
-                            _optionsOfpreSelected = _optionsOfpreSelected.concat(gs);
-                            unloadAll(gh);
-                        }
-                    } else {
-                        if (lst.length != 1)
-                            nr--;
-                        lst = lst[nr];
-
-                        var state = GetEntityState(lst);
-                        var gents = state.garrisonHolder.entities;
-                        _optionsOfpreSelected = gents;
-                        unloadAll(lst);
+            break;
+        case ACTION_TRAIN:
+            var tmpl = GetTemplateData(lst);
+            if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+                var ents = g_Selection.toList();
+                addTrainingToQueue(ents, lst);
+            }
+            break;
+        case ACTION_GARRISON: // we garison nr+1 count
+            g_Selection.reset();
+            lst.splice(nr, lst.length - nr)
+            g_Selection.addList(lst);
+            inputState = INPUT_PRESELECTEDACTION;
+            break;
+        case ACTION_UNGARRISON:
+            if (lst.length > 1 || nr == 0) {
+                if (nr >= lst.length)
+                    nr = lst.length - 1;
+                if (lst.length != 1 && nr == 0) {
+                    followQueue = [];
+                    // unload all from all buildings
+                    for each (var gh in lst) {
+                        var s = GetEntityState(gh);
+                        var gs = s.garrisonHolder.entities;
+                        followQueue = followQueue.concat(gs);
+                        unloadAll(gh);
                     }
-                    g_Selection.reset();
-                    inputState = INPUT_FOLLOW_UNGARRISON;
-                    break;
                 } else {
-                    lst = lst[0];
+                    if (lst.length != 1)
+                        nr--;
+                    lst = lst[nr];
+
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
-                    if (nr > gents.length)
-                        nr = gents.length;
-                    while (nr--)
-                        Engine.PostNetworkCommand({"type": "unload", "entities": [gents[nr]], "garrisonHolder": lst});
-                    // we could assign a key to follow them here
-                    break;
+                    followQueue = gents;
+                    unloadAll(lst);
                 }
+                g_Selection.reset();
                 break;
-            case ACTION_FORMATION:
-                ents = g_Selection.toList();
-                var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
-                    "ents": g_Selection.toList(),
-                    "formationName": lst
-                });
-                if (formationOk)
-                    performFormation(ents, lst);
-                break
-            case ACTION_STANCE:
-                ents = g_Selection.toList();
-                performStance(ents, lst);
-                break;
-            case ACTION_BARTER: //TODO
-                break;
-            case ACTION_TRADER: //TODO
+            } else {
+                lst = lst[0];
+                var state = GetEntityState(lst);
+                var gents = state.garrisonHolder.entities;
+                if (nr > gents.length)
+                    nr = gents.length;
+                while (nr--)
+                    Engine.PostNetworkCommand({"type": "unload", "entities": [gents[nr]], "garrisonHolder": lst});
+                // we could assign a key to follow them here
                 break;
             }
+            break;
+        case ACTION_FORMATION:
+            ents = g_Selection.toList();
+            var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
+                "ents": g_Selection.toList(),
+                "formationName": lst
+            });
+            if (formationOk)
+                performFormation(ents, lst);
+            break
+        case ACTION_STANCE:
+            ents = g_Selection.toList();
+            performStance(ents, lst);
+            break;
+        case ACTION_BARTER: //TODO
+            break;
+        case ACTION_TRADER: //TODO
+            break;
         }
         break;
     }
@@ -1895 +1901 @@
     }
 
     if (visibleEnts.length) {
-        if (!getActionForSelection(player, visibleEnts).length)
+        if (!getDefaultActionForSelection(player, visibleEnts).length)
             resetPreselectedAction();
         g_Selection.reset();
         g_Selection.addList(visibleEnts);
@@ -1918 +1924 @@
         var newEntity = Engine.GuiInterfaceCall("FindEntity", data);
         if (newEntity && newEntity != lastEntity)
         {
-            if (!getActionForSelection(player, [newEntity]).length)
+            if (!selectAction(player, [newEntity], preSelectedAction).length)
                 resetPreselectedAction();
             else if (preSelectedAction == ACTION_BUILD)
                 updateBuildingPlacementPreview();

binaries/data/config/default.cfg

@@ -189 +189 @@
 hotkey.selection.group.save.9 = "Ctrl+9"
 hotkey.selection.group.add.9 = "Shift+9"
 
-hotkey.selection.group.action.0 = H
-hotkey.selection.group.action.1 = J
-hotkey.selection.group.action.2 = K
-hotkey.selection.group.action.3 = L
-hotkey.selection.group.action.4 = Semicolon
-hotkey.selection.group.action.5 = SingleQuote
-hotkey.selection.group.action.6 = BackSlash
-hotkey.selection.group.action.7 = "Shift+H"
-hotkey.selection.group.action.8 = "Shift+J"
-hotkey.selection.group.action.9 = "Shift+K"
-hotkey.selection.group.action.10 = "Shift+L"
-hotkey.selection.group.action.11 = Colon
-hotkey.selection.group.action.12 = DoubleQuote
+hotkey.selection.group.action.0 = G
+hotkey.selection.group.action.1 = H
+hotkey.selection.group.action.2 = J
+hotkey.selection.group.action.3 = K
+hotkey.selection.group.action.4 = L
+hotkey.selection.group.action.5 = Semicolon
+hotkey.selection.group.action.6 = SingleQuote
+hotkey.selection.group.action.7 = "Ctrl+G"
+hotkey.selection.group.action.8 = "Ctrl+H"
+hotkey.selection.group.action.9 = "Ctrl+J"
+hotkey.selection.group.action.10 = "Ctrl+K"
+hotkey.selection.group.action.11 = "Ctrl+L"
+hotkey.selection.group.action.12 = "Ctrl+Semicolon"
+hotkey.selection.group.action.13 = "Ctrl+SingleQuote"
 hotkey.selection.group.action.reset = ForwardSlash
 
 ; > SESSION CONTROLS

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

@@ -671 +671 @@
     }
     if (inputState == INPUT_FOLLOW_UNGARRISON)
     {
-        gents = _optionsOfpreSelected;
+        var gents = _optionsOfpreSelected;
+        var state = GetEntityState(gents[0]);
+        // FIXME this stalls until the selection actually occurs
+        if (state.visibility == "hidden")
+            return true;
         Engine.CameraFollow(0);
         Engine.CameraFollow(gents[0]);
         g_Selection.addList(gents);
@@ -1771 +1775 @@
                 if (lst.length > 1 || nr == 0) {
                     if (nr >= lst.length)
                         nr = lst.length - 1;
-                    if (lst.length != 1)   // TODO: uload all from all
-                        lst = lst[nr]; // selected buildings
-                    else
-                        lst = lst[0];
-                    var state = GetEntityState(lst);
-                    var gents = state.garrisonHolder.entities;
-                    _optionsOfpreSelected = gents;
-                    unloadAll(lst);
+                    if (lst.length != 1 && nr == 0) {
+                        // unload all from all buildings
+                        _optionsOfpreSelected = [];
+                        for each (var gh in lst) {
+                            var s = GetEntityState(gh);
+                            var gs = s.garrisonHolder.entities;
+                            _optionsOfpreSelected = _optionsOfpreSelected.concat(gs);
+                            unloadAll(gh);
+                        }
+                    } else {
+                        if (lst.length != 1)
+                            nr--;
+                        lst = lst[nr];
+
+                        var state = GetEntityState(lst);
+                        var gents = state.garrisonHolder.entities;
+                        _optionsOfpreSelected = gents;
+                        unloadAll(lst);
+                    }
                     g_Selection.reset();
                     inputState = INPUT_FOLLOW_UNGARRISON;
                     break;
@@ -1786 +1801 @@
                     lst = lst[0];
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
-                    if (nr >= gents.length)
+                    if (nr > gents.length)
                         nr = gents.length;
                     while (nr--)
                         Engine.PostNetworkCommand({"type": "unload", "entities": [gents[nr]], "garrisonHolder": lst});

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

@@ -37 +37 @@
 const INPUT_BUILDING_WALL_CLICK = 8;
 const INPUT_BUILDING_WALL_PATHING = 9;
 const INPUT_FOLLOW_UNGARRISON = 10;
-const INPUT_REPEATED_UNGARRISON = 11;
 
 var inputState = INPUT_NORMAL;
 var placementSupport = new PlacementSupport();
@@ -677 +676 @@
         Engine.CameraFollow(gents[0]);
         g_Selection.addList(gents);
         resetPreselectedAction();
-    } else if (inputState == INPUT_REPEATED_UNGARRISON) {
-        var garrisonHolder =  _optionsOfpreSelected[0];
-        var state = GetEntityState(garrisonHolder);
-        var gents = state.garrisonHolder.entities;
-        var gent = gents[_optionsOfpreSelected[1]]
-        Engine.PostNetworkCommand({"type": "unload", "entities": [gent], "garrisonHolder": garrisonHolder});
-        if (_optionsOfpreSelected[1]-- > 0)
-            return true;
-        resetPreselectedAction();
     }
     // Remember whether the mouse is over a GUI object or not
     mouseIsOverObject = (hoveredObject != null);
@@ -1797 +1787 @@
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
                     if (nr >= gents.length)
-                        nr = gents.length - 1;
-                    // unload nr times, requires some update.
-                    _optionsOfpreSelected = [lst, nr];
-                    inputState = INPUT_REPEATED_UNGARRISON;
+                        nr = gents.length;
+                    while (nr--)
+                        Engine.PostNetworkCommand({"type": "unload", "entities": [gents[nr]], "garrisonHolder": lst});
+                    // we could assign a key to follow them here
+                    break;
                 }
                 break;
             case ACTION_FORMATION:

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

@@ -36 +36 @@
 const INPUT_PRESELECTEDACTION = 7;
 const INPUT_BUILDING_WALL_CLICK = 8;
 const INPUT_BUILDING_WALL_PATHING = 9;
+const INPUT_FOLLOW_UNGARRISON = 10;
+const INPUT_REPEATED_UNGARRISON = 11;
 
 var inputState = INPUT_NORMAL;
 var placementSupport = new PlacementSupport();
@@ -668 +670 @@
         mouseY = ev.y;
         break;
     }
-
+    if (inputState == INPUT_FOLLOW_UNGARRISON)
+    {
+        gents = _optionsOfpreSelected;
+        Engine.CameraFollow(0);
+        Engine.CameraFollow(gents[0]);
+        g_Selection.addList(gents);
+        resetPreselectedAction();
+    } else if (inputState == INPUT_REPEATED_UNGARRISON) {
+        var garrisonHolder =  _optionsOfpreSelected[0];
+        var state = GetEntityState(garrisonHolder);
+        var gents = state.garrisonHolder.entities;
+        var gent = gents[_optionsOfpreSelected[1]]
+        Engine.PostNetworkCommand({"type": "unload", "entities": [gent], "garrisonHolder": garrisonHolder});
+        if (_optionsOfpreSelected[1]-- > 0)
+            return true;
+        resetPreselectedAction();
+    }
     // Remember whether the mouse is over a GUI object or not
     mouseIsOverObject = (hoveredObject != null);
 
@@ -1725 +1743 @@
             if (!lst) // shouldn't happen
                 break;
 
-            if (preSelectedAction & (ACTION_UNGARRISON | ACTION_GARRISON))
+            if (preSelectedAction & ACTION_GARRISON)
             {
-                if (preSelectedAction & ACTION_GARRISON)
-                    ++nr;
-                if (nr > lst.length)
+                if (++nr > lst.length)
                     nr = lst.length;
-            } else if (preSelectedAction != (ACTION_BUILD|ACTION_TRAIN)) {
+            } else if (preSelectedAction != ACTION_UNGARRISON) {
                 if (nr >= lst.length)
                     break;
                 lst = lst[nr];
@@ -1763 +1779 @@
                 break;
             case ACTION_UNGARRISON:
                 if (lst.length > 1 || nr == 0) {
+                    if (nr >= lst.length)
+                        nr = lst.length - 1;
                     if (lst.length != 1)   // TODO: uload all from all
                         lst = lst[nr]; // selected buildings
                     else
                         lst = lst[0];
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
+                    _optionsOfpreSelected = gents;
                     unloadAll(lst);
-                    // FIXME: follow when ungarrisoning all
-                    // sadly these gents cannot be viewed after ungarissoning:
-                    if (gents)
-                    {
-                        //Engine.CameraFollow(0);
-                        g_Selection.reset();
-                        g_Selection.addList(gents);
-                        Engine.CameraFollow(gents);
-                    }
+                    g_Selection.reset();
+                    inputState = INPUT_FOLLOW_UNGARRISON;
+                    break;
                 } else {
                     lst = lst[0];
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
-                    // FIXME unload nr times, requires some update.
-                    unload(lst, gents);
+                    if (nr >= gents.length)
+                        nr = gents.length - 1;
+                    // unload nr times, requires some update.
+                    _optionsOfpreSelected = [lst, nr];
+                    inputState = INPUT_REPEATED_UNGARRISON;
                 }
                 break;
             case ACTION_FORMATION:

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

@@ -1767 +1767 @@
                         lst = lst[nr]; // selected buildings
                     else
                         lst = lst[0];
-                    // FIXME: follow when ungarrisoning all
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
                     unloadAll(lst);
-                    Engine.CameraFollow(0);
-                    g_Selection.reset();
-                    g_Selection.addList(gents);
-                    Engine.CameraFollow(gents[0]);
+                    // FIXME: follow when ungarrisoning all
+                    // sadly these gents cannot be viewed after ungarissoning:
+                    if (gents)
+                    {
+                        //Engine.CameraFollow(0);
+                        g_Selection.reset();
+                        g_Selection.addList(gents);
+                        Engine.CameraFollow(gents);
+                    }
                 } else {
                     lst = lst[0];
                     var state = GetEntityState(lst);
@@ -1847 +1851 @@
     currEntClass = 0;
 }
 
+function findAllVisibleEntities(classes, mode)
+{
+    var player = Engine.GetPlayerID();
+    var plEnts = Engine.PickFriendlyEntitiesOnScreen(player);
+    // Or we could do somthing alike the below, but this is resolution dependent
+    //var plEnts = Engine.PickFriendlyEntitiesInRect(250, 250, 1400, 750, player);
+    if (!plEnts.length)
+        return;
+    var visibleEnts = [];
+    for each (cls in classes)
+    {
+        var data = {
+            entClass: cls,
+            searchMode: mode,
+            playerEnts: plEnts,
+        };
+        var entities = Engine.GuiInterfaceCall("SubsetMatchedEnts", data);
+        if (entities.length)
+            visibleEnts = visibleEnts.concat(entities);
+    }
+
+    if (visibleEnts.length) {
+        if (!getActionForSelection(player, visibleEnts).length)
+            resetPreselectedAction();
+        g_Selection.reset();
+        g_Selection.addList(visibleEnts);
+        Engine.CameraFollow(visibleEnts[0]);
+    }
+}
+
 function findEntity(classes, mode)
 {
+    var queued = Engine.HotkeyIsPressed("session.queue");
+    if (queued) {
+        findAllVisibleEntities(classes, mode)
+        return;
+    }
     var player = Engine.GetPlayerID();
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -1426 +1426 @@
     PlaySound(data.name, data.entity);
 };
 
+GuiInterface.prototype.MatchEnt = function(ent, data)
+{
+    var ret;
+    var cmpId = Engine.QueryInterface(ent, IID_Identity);
+    if (cmpId && cmpId.HasClass(data.entClass)) {
+        if (data.searchMode == 0) {
+            ret = ent;
+        }  else if (data.searchMode == 1) { // Search idle villager/soldier
+            var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+            if (cmpUnitAI && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned())
+                ret = ent;
+        }
+    }
+    return ret;
+}
+
+GuiInterface.prototype.SubsetMatchedEnts = function(player, data)
+{
+    var ret = [];
+    for each (var ent in data.playerEnts)
+    {
+        var match = this.MatchEnt(ent, data);
+        if (match)
+            ret.push(match);
+    }
+    return ret;
+}
+
 GuiInterface.prototype.FindEntity = function(player, data)
 {
     var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
@@ -1435 +1463 @@
     // so that we cycle around in a predictable order
     for each (var ent in playerEntities)
     {
-        var cmpId = Engine.QueryInterface(ent, IID_Identity);
-        if (ent > data.prevEntity && cmpId && cmpId.HasClass(data.entClass)) {
-            if (data.searchMode == 0) {
-                return ent;
-            }  else if (data.searchMode == 1) { // Search idle villager/soldier
-                var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-                if (cmpUnitAI && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned())
-                    return ent;
-            }
+        if (ent > data.prevEntity)
+        {
+            var match = this.MatchEnt(ent, data);
+            if (match)
+                return match;
         }
     }
 
@@ -1570 +1594 @@
     "SetWallPlacementPreview": 1,
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
+    "SubsetMatchedEnts": 1,
     "FindEntity": 1,
     "GetTradingDetails": 1,
     "CanAttack": 1,

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;
     }
 }
 

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
 
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units

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

@@ -22 +22 @@
 const ACTION_BARTER = 64;
 const ACTION_TRADER =128;
 var preSelectedAction = ACTION_NONE;
+
+// N.B. reset this after selecting different units or buildings
 var _optionsOfpreSelected = [];
 
 const INPUT_NORMAL = 0;
@@ -144 +146 @@
     return false;
 }
 
+function initBuildingPlacementView(ev)
+{
+    if (placementSupport.mode === "wall")
+    {
+        // Including only the on-screen towers in the next snap candidate list is sufficient here, since the user is
+        // still selecting a starting point (which must necessarily be on-screen). (The update of the snap entities
+        // itself happens in the call to updateBuildingPlacementPreview below).
+        placementSupport.wallSnapEntitiesIncludeOffscreen = false;
+    }
+    else
+    {
+        var snapData = Engine.GuiInterfaceCall("GetFoundationSnapData", {
+            "template": placementSupport.template,
+            "x": placementSupport.position.x,
+            "z": placementSupport.position.z,
+        });
+        if (snapData)
+        {
+            placementSupport.angle = snapData.angle;
+            placementSupport.position.x = snapData.x;
+            placementSupport.position.z = snapData.z;
+        }
+    }
+    updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
+}
+
 function findGatherType(gatherer, supply)
 {
     if (!gatherer || !supply)
@@ -155 +183 @@
     return undefined;
 }
 
+function resetPreselectedAction()
+{
+    placementSupport.Reset();
+    inputState = INPUT_NORMAL;
+    _optionsOfpreSelected = [];
+
+}
+
 function getActionInfo(action, target)
 {
     var selection = g_Selection.toList();
@@ -449 +485 @@
             break;
         }
     }
-    else if (Engine.HotkeyIsPressed("session.garrison"))
+    else if (Engine.HotkeyIsPressed("session.garrison") || preSelectedAction == ACTION_GARRISON)
     {
         if (getActionInfo("garrison", target).possible)
             return {"type": "garrison", "cursor": "action-garrison", "target": target};
@@ -755 +791 @@
                 var queued = Engine.HotkeyIsPressed("session.queue");
                 if (tryPlaceBuilding(queued))
                 {
-                    if (queued) {
+                    if (queued)
                         inputState = INPUT_BUILDING_PLACEMENT;
-                    } else {
-                        inputState = INPUT_NORMAL;
-                        _optionsOfpreSelected = [];
-                    }
+                    else
+                        resetPreselectedAction();
                 }
                 else
                 {
@@ -774 +808 @@
             if (ev.button == SDL_BUTTON_RIGHT)
             {
                 // Cancel building
-                placementSupport.Reset();
-                inputState = INPUT_NORMAL;
-                _optionsOfpreSelected = [];
+                resetPreselectedAction();
                 return true;
             }
             break;
@@ -998 +1030 @@
             return false;
 
         case "mousebuttondown":
+            _optionsOfpreSelected = [];
             if (ev.button == SDL_BUTTON_LEFT)
             {
                 dragStart = [ ev.x, ev.y ];
@@ -1014 +1047 @@
             break;
 
         case "hotkeydown":
-            if (ev.hotkey.indexOf("selection.group.") == 0)
+            if (ev.hotkey && ev.hotkey.indexOf("selection.group.") == 0)
             {
+                var sptr = ev.hotkey.split(".");
                 var now = new Date();
-                if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey))
-                {
-                    if (ev.hotkey.indexOf("selection.group.select.") == 0)
-                    {
-                        var sptr = ev.hotkey.split(".");
-                        performGroup("snap", sptr[3]);
-                    }
+                if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey) && ev.hotkey.indexOf("selection.group.select.") == 0) {
+                    performGroup("snap", sptr[3], ev);
                 }
                 else
                 {
-                    var sptr = ev.hotkey.split(".");
-                    performGroup(sptr[2], sptr[3]);
+                    performGroup(sptr[2], sptr[3], ev);
 
                     doublePressTimer = now.getTime();
                     prevHotkey = ev.hotkey;
@@ -1045 +1073 @@
             if (ev.button == SDL_BUTTON_LEFT && preSelectedAction != ACTION_NONE)
             {
                 var action = determineAction(ev.x, ev.y);
+                resetPreselectedAction();
                 if (!action)
                     break;
-                preSelectedAction = ACTION_NONE;
-                inputState = INPUT_NORMAL;
-                _optionsOfpreSelected = [];
                 return doAction(action, ev);
             }
             else if (ev.button == SDL_BUTTON_RIGHT && preSelectedAction != ACTION_NONE)
             {
-                preSelectedAction = ACTION_NONE;
-                inputState = INPUT_NORMAL;
-                _optionsOfpreSelected = [];
+                resetPreselectedAction();
                 break;
             }
-            // else
         case "hotkeydown":
-            if (!ev.hotkey)
-                break;
-
-            if (ev.hotkey.indexOf("selection.group.action.") == 0)
+            if (ev.hotkey && ev.hotkey.indexOf("selection.group.action.") == 0)
             {
                 var sptr = ev.hotkey.split(".");
                 performGroup(sptr[2], sptr[3]);
@@ -1074 +1094 @@
             // Slight hack: If selection is empty, reset the input state
             if (g_Selection.toList().length == 0)
             {
-                preSelectedAction = ACTION_NONE;
-                inputState = INPUT_NORMAL;
-                _optionsOfpreSelected = [];
+                resetPreselectedAction();
                 break;
             }
         }
@@ -1108 +1126 @@
                 {
                     g_Selection.reset();
                     resetEntitySearch();
-                    inputState = INPUT_NORMAL;
-                    _optionsOfpreSelected = [];
+                    resetPreselectedAction();
                     return true;
                 }
 
@@ -1183 +1200 @@
                     g_Selection.reset();
                     g_Selection.addList(ents);
                 }
-
-                inputState = INPUT_NORMAL;
-                _optionsOfpreSelected = [];
+                resetPreselectedAction();
                 return true;
             }
             break;
@@ -1196 +1211 @@
         switch (ev.type)
         {
         case "mousemotion":
-            
             placementSupport.position = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
-            
-            if (placementSupport.mode === "wall")
-            {
-                // Including only the on-screen towers in the next snap candidate list is sufficient here, since the user is
-                // still selecting a starting point (which must necessarily be on-screen). (The update of the snap entities
-                // itself happens in the call to updateBuildingPlacementPreview below).
-                placementSupport.wallSnapEntitiesIncludeOffscreen = false;
-            }
-            else
-            {
-                var snapData = Engine.GuiInterfaceCall("GetFoundationSnapData", {
-                    "template": placementSupport.template,
-                    "x": placementSupport.position.x,
-                    "z": placementSupport.position.z,
-                });
-                if (snapData)
-                {
-                    placementSupport.angle = snapData.angle;
-                    placementSupport.position.x = snapData.x;
-                    placementSupport.position.z = snapData.z;
-                }
-            }
-
-            updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
+            initBuildingPlacementView(ev);
             return false; // continue processing mouse motion
 
         case "mousebuttondown":
@@ -1238 +1229 @@
                 else
                 {
                     placementSupport.position = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
-                    dragStart = [ ev.x, ev.y ];
-                    inputState = INPUT_BUILDING_CLICK;
+                    dragStart = [ ev.x, ev.y ];
+                    inputState = INPUT_BUILDING_CLICK;
+                    _optionsOfpreSelected = [];
                 }
                 return true;
             }
@@ -1247 +1239 @@
             {
                 // Cancel building
                 placementSupport.Reset();
-                inputState = INPUT_NORMAL;
-                preSelectedAction = ACTION_NONE;
-                 _optionsOfpreSelected = [];
+                resetPreselectedAction();
                 return true;
             }
             break;
@@ -1268 +1258 @@
                 placementSupport.angle -= rotation_step;
                 updateBuildingPlacementPreview();
                 break;
+            default:
+                if (ev.hotkey.indexOf("selection.group.action.") == 0)
+                {   // can switch buildings
+                    var sptr = ev.hotkey.split(".");
+                    performGroup(sptr[2], sptr[3], ev);
+                }
             }
             break;
 
@@ -1618 +1614 @@
         switch (preSelectedAction)
         {
         case ACTION_GARRISON:
-            if (state.buildEntities || (hasClass(state, "Unit") && !hasClass(state, "Animal") && !state.garrisonHolder))
+            if (state.buildEntities || (hasClass(state, "Unit") && !hasClass(state, "Animal") && !state.garrisonHolder)) {
+                inputState = INPUT_PRESELECTEDACTION;
                 ret.push(ent);
+            }
             break;
         case ACTION_BUILD:
-            if (state.buildEntities && state.buildEntities.length)
+            if (state.buildEntities && state.buildEntities.length) {
+                inputState = INPUT_PRESELECTEDACTION;
                 return state.buildEntities;
+            }
             break;
         case ACTION_TRAIN:
             if (state.production && state.production.entities.length)
@@ -1638 +1638 @@
             if (!hasClass(state, "Unit") || hasClass(state, "Animal") || state.garrisonHolder)
                 break;
 
-            if (preSelectedAction == ACTION_FORMATION) {
-                return Engine.GuiInterfaceCall("GetAvailableFormations");
-            } else { // FIXME:
+            if (preSelectedAction == STANCE)
                 return ["violent", "aggressive", "passive", "defensive", "standground"];
-            }
+            if (ret.length) // minimimum is 2 units for formation to be enabled
+                return Engine.GuiInterfaceCall("GetAvailableFormations");
+            ret.push(1);
             break;
         case ACTION_BARTER:
             if (state.barterMarket)
@@ -1660 +1660 @@
 }
 
 // Performs the specified group
-function performGroup(action, nr)
+function performGroup(action, nr, ev)
 {
     switch (action)
     {
@@ -1698 +1698 @@
             var actions = getActionForSelection(player, selection);
             if (!actions || !actions.length) {
                 preSelectedAction = ACTION_NONE;
-                _optionsOfpreSelected = [];
                 break;
             }
 
@@ -1707 +1706 @@
             else if (preSelectedAction == ACTION_TRADER)
                 setupUnitTradingPanel(state, selection);
 
-            inputState = INPUT_PRESELECTEDACTION;
             _optionsOfpreSelected = actions;
         }
         else
@@ -1735 +1733 @@
             {
             case ACTION_BUILD:
                 var tmpl = GetTemplateData(lst);
-                if (tmpl.requiredTechnology && !Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology))
-                    break;
-
-                startBuildingPlacement(lst);
-                inputState = INPUT_BUILDING_PLACEMENT;
-                preSelectedAction = ACTION_NONE;
-                return;
+                if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+                    // N.B. sets inputState = INPUT_BUILDING_PLACEMENT:
+                    startBuildingPlacement(lst);
+                    placementSupport.position = Engine.GetTerrainAtScreenPoint(mouseX, mouseY);
+                    initBuildingPlacementView(ev);
+                }
+                break;
             case ACTION_TRAIN:
                 var tmpl = GetTemplateData(lst);
                 if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
@@ -1753 +1751 @@
                 g_Selection.reset();
                 lst.splice(nr, lst.length - nr)
                 g_Selection.addList(lst);
+                inputState = INPUT_PRESELECTEDACTION;
                 break;
             case ACTION_UNGARRISON:
-                if (lst.length != 1 || nr == 0) {
+                if (lst.length > 1 || nr == 0) {
+                    if (lst.length != 1)   // TODO: uload all from all
+                        lst = lst[nr]; // selected buildings
+                    else
+                        lst = lst[0];
+                    // FIXME: follow when ungarrisoning all
                     var state = GetEntityState(lst);
-                    var gents = state.garrisonHolder.entities
-                    unloadAll(lst[nr]);
-                    // TODO: follow when ungarrisoning all
-                    //var gents = g_Selection.toList();
-        //          Engine.CameraFollow(gents[0]);
+                    var gents = state.garrisonHolder.entities;
+                    unloadAll(lst);
+                    Engine.CameraFollow(0);
+                    g_Selection.reset();
+                    g_Selection.addList(gents);
+                    Engine.CameraFollow(gents[0]);
                 } else {
                     lst = lst[0];
                     var state = GetEntityState(lst);
@@ -1788 +1793 @@
             case ACTION_TRADER: //TODO
                 break;
             }
-            inputState = INPUT_NORMAL;
-            _optionsOfpreSelected = [];
         }
+        break;
+    case "reset":
+        resetPreselectedAction();
+        break;
     }
 }
 
@@ -1837 +1844 @@
 
 function findEntity(classes, mode)
 {
+    var player = Engine.GetPlayerID();
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)
     {
@@ -1844 +1852 @@
         var newEntity = Engine.GuiInterfaceCall("FindEntity", data);
         if (newEntity && newEntity != lastEntity)
         {
+            if (!getActionForSelection(player, [newEntity]).length)
+                resetPreselectedAction();
+
             lastEntity = newEntity;
             g_Selection.reset();
             g_Selection.addList([lastEntity]);

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

@@ -1014 +1014 @@
             break;
 
         case "hotkeydown":
-                if (ev.hotkey.indexOf("selection.group.") == 0)
+            if (ev.hotkey.indexOf("selection.group.") == 0)
+            {
+                var now = new Date();
+                if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey))
                 {
-                    var now = new Date();
-                    if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey))
-                    {
-                        if (ev.hotkey.indexOf("selection.group.select.") == 0)
-                        {
-                            var sptr = ev.hotkey.split(".");
-                            performGroup("snap", sptr[3]);
-                        }
-                    }
-                    else
+                    if (ev.hotkey.indexOf("selection.group.select.") == 0)
                     {
                         var sptr = ev.hotkey.split(".");
-                        performGroup(sptr[2], sptr[3]);
-
-                        doublePressTimer = now.getTime();
-                        prevHotkey = ev.hotkey;
+                        performGroup("snap", sptr[3]);
                     }
                 }
-                break;
+                else
+                {
+                    var sptr = ev.hotkey.split(".");
+                    performGroup(sptr[2], sptr[3]);
+
+                    doublePressTimer = now.getTime();
+                    prevHotkey = ev.hotkey;
+                }
+            }
+            break;
         }
         break;
         

binaries/data/config/default.cfg

@@ -115 +115 @@
 hotkey.screenshot = F2                      ; Take PNG screenshot
 hotkey.bigscreenshot = "Shift+F2"           ; Take large BMP screenshot
 hotkey.togglefullscreen = "Alt+Return"      ; Toggle fullscreen/windowed mode
-hotkey.screenshot.watermark = "K"           ; Toggle product/company watermark for official screenshots
+hotkey.screenshot.watermark = "R"           ; Toggle product/company watermark for official screenshots
 hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode
 hotkey.silhouettes = "Alt+S"                ; Toggle unit silhouettes
 
 ; > CAMERA SETTINGS
-hotkey.camera.reset = "H"                                 ; Reset camera rotation to default.
+hotkey.camera.reset = "X"                                 ; Reset camera rotation to default.
 hotkey.camera.follow = "F"                                ; Follow the first unit in the selection
 hotkey.camera.zoom.in = Plus, Equals, NumPlus             ; Zoom camera in (continuous control)
 hotkey.camera.zoom.out = Minus, NumMinus                  ; Zoom camera out (continuous control)
@@ -189 +189 @@
 hotkey.selection.group.save.9 = "Ctrl+9"
 hotkey.selection.group.add.9 = "Shift+9"
 
+hotkey.selection.group.action.0 = H
+hotkey.selection.group.action.1 = J
+hotkey.selection.group.action.2 = K
+hotkey.selection.group.action.3 = L
+hotkey.selection.group.action.4 = Semicolon
+hotkey.selection.group.action.5 = SingleQuote
+hotkey.selection.group.action.6 = BackSlash
+hotkey.selection.group.action.7 = "Shift+H"
+hotkey.selection.group.action.8 = "Shift+J"
+hotkey.selection.group.action.9 = "Shift+K"
+hotkey.selection.group.action.10 = "Shift+L"
+hotkey.selection.group.action.11 = Colon
+hotkey.selection.group.action.12 = DoubleQuote
+
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building

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

@@ -15 +15 @@
 const ACTION_NONE = 0;
 const ACTION_GARRISON = 1;
 const ACTION_BUILD = 2;
+const ACTION_TRAIN = 4;
+const ACTION_UNGARRISON = 8;
+const ACTION_FORMATION = 16;
+const ACTION_STANCE = 32;
+const ACTION_BARTER = 64;
+const ACTION_TRADER =128;
 var preSelectedAction = ACTION_NONE;
+var _optionsOfpreSelected = [];
 
 const INPUT_NORMAL = 0;
 const INPUT_SELECTING = 1;
@@ -748 +755 @@
                 var queued = Engine.HotkeyIsPressed("session.queue");
                 if (tryPlaceBuilding(queued))
                 {
-                    if (queued)
+                    if (queued) {
                         inputState = INPUT_BUILDING_PLACEMENT;
-                    else
+                    } else {
                         inputState = INPUT_NORMAL;
+                        _optionsOfpreSelected = [];
+                    }
                 }
                 else
                 {
@@ -767 +776 @@
                 // Cancel building
                 placementSupport.Reset();
                 inputState = INPUT_NORMAL;
+                _optionsOfpreSelected = [];
                 return true;
             }
             break;
@@ -1039 +1049 @@
                     break;
                 preSelectedAction = ACTION_NONE;
                 inputState = INPUT_NORMAL;
+                _optionsOfpreSelected = [];
                 return doAction(action, ev);
             }
             else if (ev.button == SDL_BUTTON_RIGHT && preSelectedAction != ACTION_NONE)
             {
                 preSelectedAction = ACTION_NONE;
                 inputState = INPUT_NORMAL;
+                _optionsOfpreSelected = [];
                 break;
             }
             // else
+        case "hotkeydown":
+            if (!ev.hotkey)
+                break;
+
+            if (ev.hotkey.indexOf("selection.group.action.") == 0)
+            {
+                var sptr = ev.hotkey.split(".");
+                performGroup(sptr[2], sptr[3]);
+            }
+            break;
         default:
             // Slight hack: If selection is empty, reset the input state
             if (g_Selection.toList().length == 0)
             {
                 preSelectedAction = ACTION_NONE;
                 inputState = INPUT_NORMAL;
+                _optionsOfpreSelected = [];
                 break;
             }
         }
@@ -1086 +1109 @@
                     g_Selection.reset();
                     resetEntitySearch();
                     inputState = INPUT_NORMAL;
+                    _optionsOfpreSelected = [];
                     return true;
                 }
 
@@ -1161 +1185 @@
                 }
 
                 inputState = INPUT_NORMAL;
+                _optionsOfpreSelected = [];
                 return true;
             }
             break;
@@ -1223 +1248 @@
                 // Cancel building
                 placementSupport.Reset();
                 inputState = INPUT_NORMAL;
+                preSelectedAction = ACTION_NONE;
+                 _optionsOfpreSelected = [];
                 return true;
             }
             break;
@@ -1577 +1604 @@
     }
 }
 
+// This returns a list of actions. Caller still has to check Technology availability
+function getActionForSelection(player, selection)
+{
+    var ret = [];
+
+    for each (var ent in selection)
+    {
+        var state = GetEntityState(ent);
+        if (!state || (state.player != player && !g_DevSettings.controlAll))
+            continue;
+
+        switch (preSelectedAction)
+        {
+        case ACTION_GARRISON:
+            if (state.buildEntities || (hasClass(state, "Unit") && !hasClass(state, "Animal") && !state.garrisonHolder))
+                ret.push(ent);
+            break;
+        case ACTION_BUILD:
+            if (state.buildEntities && state.buildEntities.length)
+                return state.buildEntities;
+            break;
+        case ACTION_TRAIN:
+            if (state.production && state.production.entities.length)
+                return state.production.entities;
+            break;
+        case ACTION_UNGARRISON:
+            if (state.garrisonHolder && state.garrisonHolder.entities && state.garrisonHolder.entities.length)
+                ret.push(ent);
+            break;
+        case ACTION_FORMATION:
+        case ACTION_STANCE:
+            if (!hasClass(state, "Unit") || hasClass(state, "Animal") || state.garrisonHolder)
+                break;
+
+            if (preSelectedAction == ACTION_FORMATION) {
+                return Engine.GuiInterfaceCall("GetAvailableFormations");
+            } else { // FIXME:
+                return ["violent", "aggressive", "passive", "defensive", "standground"];
+            }
+            break;
+        case ACTION_BARTER:
+            if (state.barterMarket)
+                ret.push(ent);
+            break;
+        case ACTION_TRADER:
+            if (state.trader)
+                ret.push([ent, state]);
+            break;
+        default:
+            return ret; //shouldn't happen
+        }
+    }
+    return ret;
+}
+
 // Performs the specified group
 function performGroup(action, nr)
 {
@@ -1604 +1686 @@
         g_Groups.addEntities(nr, selection);
         updateGroups();
         break;
+    case "action":
+        if (!_optionsOfpreSelected.length) {
+            // action hotkey (first pass): With current selection, check possible
+            // ACTION_XXX's and set preSelectedAction when applicable
+            preSelectedAction = (1 << nr);
+
+            var selection = g_Selection.toList();
+            var player = Engine.GetPlayerID();
+
+            var actions = getActionForSelection(player, selection);
+            if (!actions || !actions.length) {
+                preSelectedAction = ACTION_NONE;
+                _optionsOfpreSelected = [];
+                break;
+            }
+
+            if (preSelectedAction == ACTION_BARTER)
+                setupUnitBarterPanel(state);
+            else if (preSelectedAction == ACTION_TRADER)
+                setupUnitTradingPanel(state, selection);
+
+            inputState = INPUT_PRESELECTEDACTION;
+            _optionsOfpreSelected = actions;
+        }
+        else
+        {
+            // 2nd action hotkey. Do preselectedAction[nr]
+            // The result depends on the action.
+
+            var lst = _optionsOfpreSelected;
+            if (!lst) // shouldn't happen
+                break;
+
+            if (preSelectedAction & (ACTION_UNGARRISON | ACTION_GARRISON))
+            {
+                if (preSelectedAction & ACTION_GARRISON)
+                    ++nr;
+                if (nr > lst.length)
+                    nr = lst.length;
+            } else if (preSelectedAction != (ACTION_BUILD|ACTION_TRAIN)) {
+                if (nr >= lst.length)
+                    break;
+                lst = lst[nr];
+            }
+
+            switch (preSelectedAction)
+            {
+            case ACTION_BUILD:
+                var tmpl = GetTemplateData(lst);
+                if (tmpl.requiredTechnology && !Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology))
+                    break;
+
+                startBuildingPlacement(lst);
+                inputState = INPUT_BUILDING_PLACEMENT;
+                preSelectedAction = ACTION_NONE;
+                return;
+            case ACTION_TRAIN:
+                var tmpl = GetTemplateData(lst);
+                if (!tmpl.requiredTechnology || Engine.GuiInterfaceCall("IsTechnologyResearched", tmpl.requiredTechnology)) {
+                    var ents = g_Selection.toList();
+                    addTrainingToQueue(ents, lst);
+                }
+                break;
+            case ACTION_GARRISON: // we garison nr+1 count
+                g_Selection.reset();
+                lst.splice(nr, lst.length - nr)
+                g_Selection.addList(lst);
+                break;
+            case ACTION_UNGARRISON:
+                if (lst.length != 1 || nr == 0) {
+                    var state = GetEntityState(lst);
+                    var gents = state.garrisonHolder.entities
+                    unloadAll(lst[nr]);
+                    // TODO: follow when ungarrisoning all
+                    //var gents = g_Selection.toList();
+        //          Engine.CameraFollow(gents[0]);
+                } else {
+                    lst = lst[0];
+                    var state = GetEntityState(lst);
+                    var gents = state.garrisonHolder.entities;
+                    // FIXME unload nr times, requires some update.
+                    unload(lst, gents);
+                }
+                break;
+            case ACTION_FORMATION:
+                ents = g_Selection.toList();
+                var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
+                    "ents": g_Selection.toList(),
+                    "formationName": lst
+                });
+                if (formationOk)
+                    performFormation(ents, lst);
+                break
+            case ACTION_STANCE:
+                ents = g_Selection.toList();
+                performStance(ents, lst);
+                break;
+            case ACTION_BARTER: //TODO
+                break;
+            case ACTION_TRADER: //TODO
+                break;
+            }
+            inputState = INPUT_NORMAL;
+            _optionsOfpreSelected = [];
+        }
     }
 }
 

binaries/data/config/default.cfg

@@ -151 +151 @@
 hotkey.selection.milonly = Alt              ; Add only military units to selection
 hotkey.selection.remove = Ctrl              ; Remove units from selection
 hotkey.selection.idleworker = Period        ; Select next idle worker
+hotkey.selection.structure = Y              ; Select structure
+hotkey.selection.civilcenter = U            ; Select towncenter
+hotkey.selection.dropsiteres = I            ; Select dropsite stone/wood/metal
+hotkey.selection.dropsitefood = O           ; Select dropsite food
+hotkey.selection.market = P                 ; Select market
 hotkey.selection.idlewarrior = Comma        ; Select next idle warrior
 hotkey.selection.offscreen = Alt            ; Include offscreen units in selection
 hotkey.selection.group.select.0 = 0

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

@@ -1084 +1084 @@
                 if (!ents.length)
                 {
                     g_Selection.reset();
-                    resetIdleUnit();
+                    resetEntitySearch();
                     inputState = INPUT_NORMAL;
                     return true;
                 }
@@ -1642 +1642 @@
 var lastEntity = 0;
 var currEntClass = 0;
 
-function resetIdleUnit()
+function resetEntitySearch()
 {
     lastEntity = 0;
     currEntClass = 0;
 }
 
-function findEntity(classes)
+function findEntity(classes, mode)
 {
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)
     {
-        var data = { prevUnit: lastEntity, idleClass: classes[currEntClass] };
-        var newIdleUnit = Engine.GuiInterfaceCall("FindIdleUnit", data);
-
-        // Check if we have new valid entity
-        if (newIdleUnit && newIdleUnit != lastEntity)
+        var data = { prevEntity: lastEntity, entClass: classes[currEntClass], searchMode: mode};
+        var newEntity = Engine.GuiInterfaceCall("FindEntity", data);
+        if (newEntity && newEntity != lastEntity)
         {
-            lastEntity = newIdleUnit;
-            g_Selection.reset()
+            lastEntity = newEntity;
+            g_Selection.reset();
             g_Selection.addList([lastEntity]);
             Engine.CameraFollow(lastEntity);
-
             return;
         }
-
         lastEntity = 0;
         currEntClass = (currEntClass + 1) % classes.length;
     }
-
     // TODO: display a message or play a sound to indicate no more idle units, or something
     // Reset for next cycle
-    resetIdleUnit();
+    resetEntitySearch();
 }
 
 function unload(garrisonHolder, entities)

binaries/data/mods/public/gui/session/session.xml

@@ -86 +86 @@
 
         <!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
         <object hotkey="selection.idlewarrior">
-            <action on="Press">findEntity(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
+            <action on="Press">findEntity(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"], 1);</action>
+        </object>
+
+        <!-- Select civilcenter -->
+        <object hotkey="selection.civilcenter">
+            <action on="Press">findEntity(["CivCentre"], 0);</action>
+        </object>
+        <!-- Select market -->
+        <object hotkey="selection.market">
+            <action on="Press">findEntity(["BarterMarket", "Market", "NavalMarket"], 0);</action>
+        </object>
+        <!-- Select dropsitefood -->
+        <object hotkey="selection.dropsitefood">
+            <action on="Press">findEntity(["CivCentre", "DropsiteFood"], 0);</action>
+        </object>
+        <!-- Select dropsitewood -->
+        <object hotkey="selection.dropsiteres">
+            <action on="Press">findEntity(["CivCentre", "DropsiteWood", "DropsiteStone", "DropsiteMetal"], 0);</action>
+        </object>
+        <!-- Select structure -->
+        <object hotkey="selection.structure">
+            <action on="Press">findEntity(["Structure"], 0);</action>
         </object>
 
         <!-- ================================  ================================ -->
@@ -525 +546 @@
                     >
                         <!-- TODO: should highlight the button if there's non-zero idle workers -->
                         <object size="0 0 100% 100%" type="image" sprite="idleWorker" ghost="true" />
-                        <action on="Press">findEntity(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
+                        <action on="Press">findEntity(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"], 1);</action>
                     </object>
                 </object>
             </object>

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -1426 +1426 @@
     PlaySound(data.name, data.entity);
 };
 
-function isIdleUnit(ent, idleClass)
-{
-    var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-    var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
-    
-    // TODO: Do something with garrisoned idle units
-    return (cmpUnitAI && cmpIdentity && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned() && idleClass && cmpIdentity.HasClass(idleClass));
-}
-
-GuiInterface.prototype.FindIdleUnit = function(player, data)
+GuiInterface.prototype.FindEntity = function(player, data)
 {
     var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     var playerEntities = rangeMan.GetEntitiesByPlayer(player);
@@ -1444 +1435 @@
     // so that we cycle around in a predictable order
     for each (var ent in playerEntities)
     {
-        if (ent > data.prevUnit && isIdleUnit(ent, data.idleClass))
-            return ent;
+        var cmpId = Engine.QueryInterface(ent, IID_Identity);
+        if (ent > data.prevEntity && cmpId && cmpId.HasClass(data.entClass)) {
+            if (data.searchMode == 0) {
+                return ent;
+            }  else if (data.searchMode == 1) { // Search idle villager/soldier
+                var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+                if (cmpUnitAI && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned())
+                    return ent;
+            }
+        }
     }
 
-    // No idle entities left in the class
+    // No entities left in the class
     return 0;
 };
 
@@ -1571 +1570 @@
     "SetWallPlacementPreview": 1,
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
-    "FindIdleUnit": 1,
+    "FindEntity": 1,
     "GetTradingDetails": 1,
     "CanAttack": 1,
 

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

@@ -14 +14 @@
 
 const ACTION_NONE = 0;
 const ACTION_GARRISON = 1;
-const ACTION_REPAIR = 2;
+const ACTION_BUILD = 2;
 var preSelectedAction = ACTION_NONE;
 
 const INPUT_NORMAL = 0;
@@ -434 +434 @@
             else
                 return  {"type": "none", "cursor": "action-garrison-disabled", "target": undefined};
             break;
-        case ACTION_REPAIR:
+        case ACTION_BUILD:
             if (getActionInfo("repair", target).possible)
                 return {"type": "repair", "cursor": "action-repair", "target": target};
             else
@@ -1533 +1533 @@
                 break;
             case "repair":
                 inputState = INPUT_PRESELECTEDACTION;
-                preSelectedAction = ACTION_REPAIR;
+                preSelectedAction = ACTION_BUILD;
                 break;
             case "unload-all":
                 unloadAll(entity);
@@ -1578 +1578 @@
 }
 
 // Performs the specified group
-function performGroup(action, groupId)
+function performGroup(action, nr)
 {
     switch (action)
     {
@@ -1587 +1587 @@
     case "add":
         var toSelect = [];
         g_Groups.update();
-        for (var ent in g_Groups.groups[groupId].ents)
+        for (var ent in g_Groups.groups[nr].ents)
             toSelect.push(+ent);
 
         if (action != "add")
@@ -1600 +1600 @@
         break;
     case "save":
         var selection = g_Selection.toList();
-        g_Groups.groups[groupId].reset();
-        g_Groups.addEntities(groupId, selection);
+        g_Groups.groups[nr].reset();
+        g_Groups.addEntities(nr, selection);
         updateGroups();
         break;
     }
@@ -1639 +1639 @@
     Engine.CameraFollow(0);
 }
 
-var lastIdleUnit = 0;
-var currIdleClass = 0;
+var lastEntity = 0;
+var currEntClass = 0;
 
 function resetIdleUnit()
 {
-    lastIdleUnit = 0;
-    currIdleClass = 0;
+    lastEntity = 0;
+    currEntClass = 0;
 }
 
-function findIdleUnit(classes)
+function findEntity(classes)
 {
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)
     {
-        var data = { prevUnit: lastIdleUnit, idleClass: classes[currIdleClass] };
+        var data = { prevUnit: lastEntity, idleClass: classes[currEntClass] };
         var newIdleUnit = Engine.GuiInterfaceCall("FindIdleUnit", data);
 
         // Check if we have new valid entity
-        if (newIdleUnit && newIdleUnit != lastIdleUnit)
+        if (newIdleUnit && newIdleUnit != lastEntity)
         {
-            lastIdleUnit = newIdleUnit;
+            lastEntity = newIdleUnit;
             g_Selection.reset()
-            g_Selection.addList([lastIdleUnit]);
-            Engine.CameraFollow(lastIdleUnit);
+            g_Selection.addList([lastEntity]);
+            Engine.CameraFollow(lastEntity);
 
             return;
         }
 
-        lastIdleUnit = 0;
-        currIdleClass = (currIdleClass + 1) % classes.length;
+        lastEntity = 0;
+        currEntClass = (currEntClass + 1) % classes.length;
     }
 
     // TODO: display a message or play a sound to indicate no more idle units, or something

binaries/data/mods/public/gui/session/session.xml

@@ -86 +86 @@
 
         <!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
         <object hotkey="selection.idlewarrior">
-            <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
+            <action on="Press">findEntity(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
         </object>
 
         <!-- ================================  ================================ -->
@@ -525 +525 @@
                     >
                         <!-- TODO: should highlight the button if there's non-zero idle workers -->
                         <object size="0 0 100% 100%" type="image" sprite="idleWorker" ghost="true" />
-                        <action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
+                        <action on="Press">findEntity(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
                     </object>
                 </object>
             </object>