Ticket #3194: gui_hotkey_release_event_v1.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">updateSelectionDetails();</action>
+        <action on="Release">updateSelectionDetails();</action>
+    </object>
+
+    <object hotkey="session.massbarter">
+        <action on="Press">updateSelectionDetails();</action>
+        <action on="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>
 

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);
+
         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,