Ticket #1028: 0adTicket_1028.patch

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

@@ -1659 +1659 @@
 }
 
 // Called by unit selection buttons
-function changePrimarySelectionGroup(templateName)
+function changePrimarySelectionGroup(templateName, deselectGroup)
 {
-    if (Engine.HotkeyIsPressed("session.deselectgroup"))
+    if (Engine.HotkeyIsPressed("session.deselectgroup") || deselectGroup)
         g_Selection.makePrimarySelection(templateName, true);
     else
         g_Selection.makePrimarySelection(templateName, false);

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

@@ -533 +533 @@
         // Button Function (need nested functions to get the closure right)
         // Items can have a callback element that overrides the normal caller-supplied callback function.
         button.onpress = (function(e){ return function() { e.callback ? e.callback(e) : callback(e) } })(item);
+
+        if(guiName == SELECTION)
+        {
+            button.onpressright = (function(e){return function() {callback(e, true) } })(item);
+            button.onpress = (function(e){ return function() {callback(e, false) } })(item);
+        }
 
         if (guiName == RESEARCH)
         {
@@ -973 +979 @@
 
         if (selection.length > 1)
             setupUnitPanel(SELECTION, usedPanels, entState, playerState, g_Selection.groups.getTemplateNames(),
-                function (entType) { changePrimarySelectionGroup(entType); } );
+                function (entType, rightPressed) { changePrimarySelectionGroup(entType, rightPressed); } );
 
         var commands = getEntityCommandsList(entState);
         if (commands.length)

source/gui/IGUIButtonBehavior.h

@@ -115 +115 @@
         // Notify the gui that we aren't hovered anymore
         UpdateMouseOver(NULL);
         m_Pressed = false;
+        m_PressedRight = false;
     }
 
     /**
@@ -125 +126 @@
      * this lets us know we are done with step one (clicking).
      */
     bool                            m_Pressed;
+    bool                            m_PressedRight;
 };
 
 #endif

source/gui/IGUIButtonBehavior.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -48 +48 @@
             break;
 
         m_Pressed = true;
-    }   break;
+    }
+    break;
 
+    case GUIM_MOUSE_DBLCLICK_RIGHT:
+    case GUIM_MOUSE_RELEASE_RIGHT:
+    {
+        bool enabled;
+        GUI<bool>::GetSetting(this, "enabled", enabled);
+        
+        if (!enabled)
+            break;
+        
+        if (m_PressedRight)
+        {
+            m_PressedRight = false;
+            if (Message.type == GUIM_MOUSE_RELEASE_RIGHT)
+            {
+                // Button was right-clicked
+                SendEvent(GUIM_PRESSED_MOUSE_RIGHT, "pressright");
+            }
+            else
+            {
+                // Button was clicked a second time. We can't tell if the button
+                // expects to receive doublepress events or just a second press
+                // event, so send both of them (and assume the extra unwanted press
+                // is harmless on buttons that expect doublepress)
+                SendEvent(GUIM_PRESSED_MOUSE_RIGHT, "pressright");
+                SendEvent(GUIM_DOUBLE_PRESSED_MOUSE_RIGHT, "doublepressright");
+            }
+        }
+    }
+    break;
+
+    case GUIM_MOUSE_PRESS_RIGHT:
+    {
+        bool enabled;
+        GUI<bool>::GetSetting(this, "enabled", enabled);
+        
+        if (!enabled)
+            break;
+        
+        m_PressedRight = true;
+    }
+    break;
+
     case GUIM_MOUSE_DBLCLICK_LEFT:
     case GUIM_MOUSE_RELEASE_LEFT:
     {
@@ -77 +120 @@
                 SendEvent(GUIM_DOUBLE_PRESSED, "doublepress");
             }
         }
-    }   break;
+    }
+    break;
 
     default:
         break;

source/gui/GUIbase.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -93 +93 @@
     GUIM_MOUSE_MOTION,
     GUIM_LOAD,              // Called when an object is added to the GUI.
     GUIM_GOT_FOCUS,
-    GUIM_LOST_FOCUS
+    GUIM_LOST_FOCUS,
+    GUIM_PRESSED_MOUSE_RIGHT,
+    GUIM_DOUBLE_PRESSED_MOUSE_RIGHT
 };
 
 /**