Ticket #1028: #1028.patch

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

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

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

@@ -295 +295 @@
         button.tooltip = tooltip;
 
         // Button Function (need nested functions to get the closure right)
-        button.onpress = (function(e){ return function() { 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);
 
         // Get icon image
         if (guiName == "Formation")
@@ -473 +475 @@
 
         if (selection.length > 1)
             setupUnitPanel("Selection", usedPanels, entState, g_Selection.groups.getTemplateNames(),
-                function (entType) { changePrimarySelectionGroup(entType); } );
+                function (entType, rightPressed) { changePrimarySelectionGroup(entType, rightPressed); } );
 
         var commands = getEntityCommandsList(entState);
         if (commands.length)

source/gui/IGUIButtonBehavior.cpp

@@ -39 +39 @@
     // TODO Gee: easier access functions
     switch (Message.type)
     {
+    case GUIM_MOUSE_PRESS_RIGHT:
+    {
+        bool enabled;
+        GUI<bool>::GetSetting(this, "enabled", enabled);
+    
+        if (!enabled)
+            break;
+
+        m_PressedRight = true;
+    }   break;
     case GUIM_MOUSE_PRESS_LEFT:
     {
         bool enabled;
@@ -49 +59 @@
 
         m_Pressed = true;
     }   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, "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, "pressright");
+                SendEvent(GUIM_DOUBLE_PRESSED, "doublepressright");
+            }
+        }
+    }   break;
     case GUIM_MOUSE_DBLCLICK_LEFT:
     case GUIM_MOUSE_RELEASE_LEFT:
     {

source/gui/IGUIButtonBehavior.h

@@ -114 +114 @@
     {
         m_MouseHovering = false;
         m_Pressed = false;
+        m_PressedRight = false;
     }
 
     /**
@@ -121 +122 @@
      * you have to first press the button, and then release it...
      * in between those two steps you can actually leave the button
      * area, as long as you release it within the button area... Anyway
-     * this lets us know we are done with step one (clicking).
+     * this lets us know we are done with step one (clicking). Or right clicking
      */
     bool                            m_Pressed;
+    bool                            m_PressedRight;
 };
 
 #endif