Ticket #3194: gui_hotkey_release_event_v1_debug.patch

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

@@ -48 +48 @@
 
     <object hotkey="session.stop">
         <action on="Press">stopUnits(g_Selection.toList());</action>
     </object>
 
+    <object hotkey="session.batchtrain">
+        <action on="Press">warn("Processing batchtrain PRESS");updateSelectionDetails();</action>
+        <action on="Release">warn("Processing batchtrain RELEASE");updateSelectionDetails();</action>
+    </object>
+
+    <object hotkey="session.massbarter">
+        <action on="Press">warn("Processing massbarter PRESS");updateSelectionDetails();</action>
+        <action on="Release">warn("Processing massbarter RELEASE");updateSelectionDetails();</action>
+    </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", "Dog"]);</action>
     </object>
 

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

@@ -112 +112 @@
         let selectionIcon = Engine.GetGUIObjectByName("unitBarterSellSelection[" + data.i + "]");
 
         let amountToSell = BARTER_RESOURCE_AMOUNT_TO_SELL;
         if (Engine.HotkeyIsPressed("session.massbarter"))
             amountToSell *= BARTER_BUNCH_MULTIPLIER;
-
+        warn("CHECKING massbarter pressed: " + String(Engine.HotkeyIsPressed("session.massbarter")));
         amount.Sell.caption = "-" + amountToSell;
         let prices = data.unitEntState.barterMarket.prices;
         amount.Buy.caption = "+" + Math.round(prices.sell[g_BarterSell] / prices.buy[data.item] * amountToSell);
 
         let resource = getLocalizedResourceName(data.item, "withinSentence");
@@ -974 +974 @@
             getTrainingBatchStatus(data.playerState, data.unitEntState.id, data.item, data.selection);
 
         let trainNum = buildingsCountToTrainFullBatch || 1;
         if (Engine.HotkeyIsPressed("session.batchtrain"))
             trainNum = buildingsCountToTrainFullBatch * fullBatchSize + remainderBatch;
-
+        warn("CHECKING batchtrain pressed: " + String(Engine.HotkeyIsPressed("session.batchtrain")));
         let neededResources;
         if (template.cost)
             neededResources = Engine.GuiInterfaceCall("GetNeededResources", {
                 "cost": multiplyEntityCosts(template, trainNum),
                 "player": data.unitEntState.player

source/gui/CGUI.cpp

@@ -63 +63 @@
 
 InReaction CGUI::HandleEvent(const SDL_Event_* ev)
 {
     InReaction ret = IN_PASS;
 
-    if (ev->ev.type == SDL_HOTKEYDOWN)
+    if (ev->ev.type == SDL_HOTKEYDOWN || ev->ev.type == SDL_HOTKEYUP)
     {
         const char* hotkey = static_cast<const char*>(ev->ev.user.data1);
+        if (CStr(hotkey) == "session.batchtrain" || CStr(hotkey) == "session.massbarter")
+            LOGERROR("HandleEvent %s", hotkey);
+
         std::map<CStr, std::vector<IGUIObject*> >::iterator it = m_HotkeyObjects.find(hotkey);
         if (it != m_HotkeyObjects.end())
             for (IGUIObject* const& obj : it->second)
-                obj->SendEvent(GUIM_PRESSED, "press");
+            {
+                // Update hotkey status before sending the event,
+                // else the status will be outdated when processing the GUI event.
+                HotkeyInputHandler(ev);
+                ret = IN_HANDLED;
+
+                if (ev->ev.type == SDL_HOTKEYDOWN)
+                    obj->SendEvent(GUIM_PRESSED, "press");
+                else
+                    obj->SendEvent(GUIM_RELEASED, "release");
+            }
     }
 
     else if (ev->ev.type == SDL_MOUSEMOTION)
     {
         // Yes the mouse position is stored as float to avoid

source/gui/GUIbase.h

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -70 +70 @@
     GUIM_MOUSE_RELEASE_RIGHT,
     GUIM_MOUSE_WHEEL_UP,
     GUIM_MOUSE_WHEEL_DOWN,
     GUIM_SETTINGS_UPDATED,  // SGUIMessage.m_Value = name of setting
     GUIM_PRESSED,
+    GUIM_RELEASED,
     GUIM_DOUBLE_PRESSED,
     GUIM_MOUSE_MOTION,
     GUIM_LOAD,              // Called when an object is added to the GUI.
     GUIM_GOT_FOCUS,
     GUIM_LOST_FOCUS,

source/ps/Hotkey.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -191 +191 @@
             break;
         }
         return IN_PASS;
 
     case SDL_HOTKEYDOWN:
+    {
+        const char* hotkey = static_cast<const char*>(ev->ev.user.data1);
+        if (CStr(hotkey) == "session.batchtrain" || CStr(hotkey) == "session.massbarter")
+            LOGERROR("HotkeyInputHandler DOWN %s", static_cast<const char*>(ev->ev.user.data1));
         g_HotkeyStatus[static_cast<const char*>(ev->ev.user.data1)] = true;
         return IN_PASS;
-
+    }
     case SDL_HOTKEYUP:
+    {
+        const char* hotkey = static_cast<const char*>(ev->ev.user.data1);
+        if (CStr(hotkey) == "session.batchtrain" || CStr(hotkey) == "session.massbarter")
+            LOGERROR("HotkeyInputHandler UP %s", static_cast<const char*>(ev->ev.user.data1));
         g_HotkeyStatus[static_cast<const char*>(ev->ev.user.data1)] = false;
         return IN_PASS;
-
+    }
     default:
         return IN_PASS;
     }
 
     // Somewhat hackish: