Ticket #3194: alternative.patch

source/gui/CGUI.cpp

@@ -73 +73 @@
 
         std::map<CStr, std::vector<IGUIObject*> >::iterator it = m_HotkeyObjects.find(hotkey);
         if (it != m_HotkeyObjects.end())
             for (IGUIObject* const& obj : it->second)
             {
-                // 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");
+                if ((ev->ev.type == SDL_HOTKEYDOWN && obj->SendEvent(GUIM_PRESSED, "press") == IN_HANDLED) ||
+                    (ev->ev.type == SDL_HOTKEYUP && obj->SendEvent(GUIM_RELEASED, "release") == IN_HANDLED))
+                {
+                    ret = IN_HANDLED;
+                }
             }
     }
 
     else if (ev->ev.type == SDL_MOUSEMOTION)
     {

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
@@ -304 +304 @@
     for (size_t i = 0; i < closestMapNames.size(); ++i)
     {
         SDL_Event_ hotkeyNotification;
         hotkeyNotification.ev.type = SDL_HOTKEYDOWN;
         hotkeyNotification.ev.user.data1 = const_cast<char*>(closestMapNames[i]);
+
+        // Update g_HotkeyMap since this event will be processed by the GUI handler before
+        // updating g_HotkeyMap, while the GUI handler requires that init prior
+        HotkeyInputHandler(&hotkeyNotification);
+
         in_push_priority_event(&hotkeyNotification);
     }
 
     // -- KEYUP SECTION --
 
@@ -332 +337 @@
         if (accept)
         {
             SDL_Event_ hotkeyNotification;
             hotkeyNotification.ev.type = SDL_HOTKEYUP;
             hotkeyNotification.ev.user.data1 = const_cast<char*>(hotkey.name.c_str());
+
+            // Update g_HotkeyMap since this event will be processed by the GUI handler before
+            // updating g_HotkeyMap, while the GUI handler requires that init prior
+            HotkeyInputHandler(&hotkeyNotification);
+
             in_push_priority_event(&hotkeyNotification);
         }
     }
 
     return IN_PASS;