Ticket #850: Ticket_850_V2.patch

source/gui/IGUIScrollBar.cpp

@@ -76 +76 @@
         m_Pos = m_ScrollRange - m_ScrollSpace;
 }
 
+void IGUIScrollBar::ResetMouseStates()
+{
+    IGUIObject::ResetMouseStates();
+    SetBarPressed(false);
+}
+
 void IGUIScrollBar::HandleMessage(SGUIMessage &Message)
 {
     switch (Message.type)
@@ -120 +126 @@
                 m_BarPressed = true;
                 m_BarPressedAtPos = mouse;
                 m_PosWhenPressed = m_Pos;
+                m_IsCapturing = true;
             }
             else
             // if button-minus is pressed
@@ -159 +166 @@
     case GUIM_MOUSE_RELEASE_LEFT:
         m_ButtonMinusPressed = false;
         m_ButtonPlusPressed = false;
+        m_BarPressed = false;
+        m_IsCapturing = false;
         break;
 
     default:

source/gui/IGUIButtonBehavior.cpp

@@ -48 +48 @@
             break;
 
         m_Pressed = true;
+        m_IsCapturing = true;
     }   break;
 
     case GUIM_MOUSE_DBLCLICK_LEFT:
     case GUIM_MOUSE_RELEASE_LEFT:
     {
+        // Don't caputre anymore if the mouse button is released, regardless of the circumstances
+        m_IsCapturing = false;
+
         bool enabled;
         GUI<bool>::GetSetting(this, "enabled", enabled);
     
         if (!enabled)
             break;
 
-        if (m_Pressed)
+        if (m_Pressed && m_MouseHovering)
         {
-            m_Pressed = false;
             if (Message.type == GUIM_MOUSE_RELEASE_LEFT)
             {
                 // Button was clicked
@@ -77 +80 @@
                 SendEvent(GUIM_DOUBLE_PRESSED, "doublepress");
             }
         }
+        m_Pressed = false; 
     }   break;
 
     default:
@@ -116 +120 @@
     else return color;
 }
 
+void IGUIButtonBehavior::ResetMouseStates()
+{
+    IGUIObject::ResetMouseStates();
+    m_Pressed = false;
+}
+
 void IGUIButtonBehavior::DrawButton(const CRect &rect,
                                     const float &z,
                                     CGUISpriteInstance& sprite,

source/gui/IGUIScrollBarOwner.cpp

@@ -40 +40 @@
     }
 }
 
-void IGUIScrollBarOwner::ResetStates()
+void IGUIScrollBarOwner::ResetMouseStates()
 {
-    IGUIObject::ResetStates();
+    IGUIObject::ResetMouseStates();
     
     std::vector<IGUIScrollBar*>::iterator it;
     for (it=m_ScrollBars.begin(); it!=m_ScrollBars.end(); ++it)
     {
-        (*it)->SetBarPressed(false);
+        (*it)->ResetMouseStates();
     }
 }
 
@@ -78 +78 @@
 
 void IGUIScrollBarOwner::HandleMessage(SGUIMessage &Message)
 {
+    m_IsCapturing = false;
     std::vector<IGUIScrollBar*>::iterator it;
     for (it=m_ScrollBars.begin(); it!=m_ScrollBars.end(); ++it)
     {
         (*it)->HandleMessage(Message);
+        if((*it)->IsCapturing())
+        {
+            m_IsCapturing = true;
+        }
     }
 }
 

source/gui/CList.h

@@ -72 +72 @@
     virtual ~CList();
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates() { IGUIScrollBarOwner::ResetStates(); }
+    virtual void ResetMouseStates() { IGUIScrollBarOwner::ResetMouseStates(); }
 
     /**
      * Adds an item last to the list.

source/gui/GUIutil.h

@@ -80 +80 @@
     /// const version
     static const IGUIObject * GetObjectPointer(const CGUI &GUIinstance, const CStr& Object);
 
-    /// Wrapper for ResetStates
+    /// Wrapper for ResetMouseStates
     static void QueryResetting(IGUIObject *pObject);
 
     static void HandleMessage(IGUIObject *pObject, SGUIMessage &message);

source/gui/CGUI.cpp

@@ -115 +115 @@
         }
     }
 
-    // Update m_MousePos (for delayed mouse button events)
-    CPos oldMousePos = m_MousePos;
-    if (ev->ev.type == SDL_MOUSEBUTTONDOWN || ev->ev.type == SDL_MOUSEBUTTONUP)
-    {
-        m_MousePos = CPos((float)ev->ev.button.x, (float)ev->ev.button.y);
-    }
-
-    // Only one object can be hovered
+    // Only one object can be active either because it's capturing input or because it's hovered.
+    // Capturing takes precedence.
+    IGUIObject *pActive = NULL;
     IGUIObject *pNearest = NULL;
 
     // TODO Gee: (2004-09-08) Big TODO, don't do the below if the SDL_Event is something like a keypress!
@@ -130 +125 @@
     {
         PROFILE( "mouse events" );
         // TODO Gee: Optimizations needed!
-        //  these two recursive function are quite overhead heavy.
+        //  this recursive function is quite overhead heavy.
 
         // pNearest will after this point at the hovered object, possibly NULL
         pNearest = FindObjectUnderMouse();
-
-        // Is placed in the UpdateMouseOver function
-        //if (ev->ev.type == SDL_MOUSEMOTION && pNearest)
-        //  pNearest->ScriptEvent("mousemove");
-
-        // Now we'll call UpdateMouseOver on *all* objects,
-        //  we'll input the one hovered, and they will each
-        //  update their own data and send messages accordingly
         
-        GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject, 
-                                        &IGUIObject::UpdateMouseOver, 
-                                        pNearest);
+        // If no GUIObject is capturing mouse input, the nearest one under the mouse(if any) becomes active 
+        if(m_pCapturingGUIObject == NULL)
+        {
+            pActive = pNearest;
+            // Now we'll call UpdateMouseOver on *all* objects,
+            //  we'll input the one hovered, and they will each
+            //  update their own data and send messages accordingly
+            GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject, 
+                                            &IGUIObject::UpdateMouseOver, 
+                                            pNearest);
+        }
+        else
+        {
+            pActive = m_pCapturingGUIObject;
+            // Capturing mouse input also means that ONLY the capturing object must receive MouseOver events
+            pActive->UpdateMouseOver(pNearest);
+        }
 
         if (ev->ev.type == SDL_MOUSEBUTTONDOWN)
         {
@@ -153 +154 @@
             {
             case SDL_BUTTON_LEFT:
                 // Focus the clicked object (or focus none if nothing clicked on)
-                SetFocusedObject(pNearest);
+                SetFocusedObject(pActive);
 
-                if (pNearest)
+                if (pActive)
                 {
-                    ret = pNearest->SendEvent(GUIM_MOUSE_PRESS_LEFT, "mouseleftpress");
+                    ret = pActive->SendEvent(GUIM_MOUSE_PRESS_LEFT, "mouseleftpress");
                 }
                 break;
 
             case SDL_BUTTON_RIGHT:
-                if (pNearest)
+                if (pActive)
                 {
-                    ret = pNearest->SendEvent(GUIM_MOUSE_PRESS_RIGHT, "mouserightpress");
+                    ret = pActive->SendEvent(GUIM_MOUSE_PRESS_RIGHT, "mouserightpress");
                 }
                 break;
 
             case SDL_BUTTON_WHEELDOWN: // wheel down
-                if (pNearest)
+                if (pActive)
                 {
-                    ret = pNearest->SendEvent(GUIM_MOUSE_WHEEL_DOWN, "mousewheeldown");
+                    ret = pActive->SendEvent(GUIM_MOUSE_WHEEL_DOWN, "mousewheeldown");
                 }
                 break;
 
             case SDL_BUTTON_WHEELUP: // wheel up
-                if (pNearest)
+                if (pActive)
                 {
-                    ret = pNearest->SendEvent(GUIM_MOUSE_WHEEL_UP, "mousewheelup");
+                    ret = pActive->SendEvent(GUIM_MOUSE_WHEEL_UP, "mousewheelup");
                 }
                 break;
 
@@ -192 +193 @@
             switch (ev->ev.button.button)
             {
             case SDL_BUTTON_LEFT:
-                if (pNearest)
+                if (pActive)
                 {
-                    double timeElapsed = timer_Time() - pNearest->m_LastClickTime[SDL_BUTTON_LEFT];
-                    pNearest->m_LastClickTime[SDL_BUTTON_LEFT] = timer_Time();
-                    
+                    double timeElapsed = timer_Time() - pActive->m_LastClickTime[SDL_BUTTON_LEFT];
+                    pActive->m_LastClickTime[SDL_BUTTON_LEFT] = timer_Time();
+
                     //Double click?
                     if (timeElapsed < SELECT_DBLCLICK_RATE)
                     {
-                        ret = pNearest->SendEvent(GUIM_MOUSE_DBLCLICK_LEFT, "mouseleftdoubleclick");
+                        ret = pActive->SendEvent(GUIM_MOUSE_DBLCLICK_LEFT, "mouseleftdoubleclick");
                     }
                     else
                     {
-                        ret = pNearest->SendEvent(GUIM_MOUSE_RELEASE_LEFT, "mouseleftrelease");
+                        ret = pActive->SendEvent(GUIM_MOUSE_RELEASE_LEFT, "mouseleftrelease");
                     }
                 }
                 break;
             case SDL_BUTTON_RIGHT:
-                if (pNearest)
+                if (pActive)
                 {
-                    double timeElapsed = timer_Time() - pNearest->m_LastClickTime[SDL_BUTTON_RIGHT];
-                    pNearest->m_LastClickTime[SDL_BUTTON_RIGHT] = timer_Time();
-                    
+                    double timeElapsed = timer_Time() - pActive->m_LastClickTime[SDL_BUTTON_RIGHT];
+                    pActive->m_LastClickTime[SDL_BUTTON_RIGHT] = timer_Time();
+
                     //Double click?
                     if (timeElapsed < SELECT_DBLCLICK_RATE)
                     {
-                        ret = pNearest->SendEvent(GUIM_MOUSE_DBLCLICK_RIGHT, "mouserightdoubleclick");
+                        ret = pActive->SendEvent(GUIM_MOUSE_DBLCLICK_RIGHT, "mouserightdoubleclick");
                     }
                     else
                     {
-                        ret = pNearest->SendEvent(GUIM_MOUSE_RELEASE_RIGHT, "mouserightrelease");
+                        ret = pActive->SendEvent(GUIM_MOUSE_RELEASE_RIGHT, "mouserightrelease");
                     }
                 }
                 break;
             }
 
-            // Reset all states on all visible objects
-            GUI<>::RecurseObject(GUIRR_HIDDEN, m_BaseObject, 
-                                    &IGUIObject::ResetStates);
+        }
 
-            // It will have reset the mouse over of the current hovered, so we'll
-            //  have to restore that
-            if (pNearest)
-                pNearest->m_MouseHovering = true;
+        // Check if the active object is (still) capturing input
+        if(pActive && pActive->IsCapturing())
+        {
+            m_pCapturingGUIObject = pActive;
         }
+        else
+        {
+            m_pCapturingGUIObject = NULL;
+        }
     }
     catch (PSERROR_GUI& e)
     {
@@ -261 +264 @@
         }
     }
 
-    // Restore m_MousePos (for delayed mouse button events)
-    if (ev->ev.type == SDL_MOUSEBUTTONDOWN || ev->ev.type == SDL_MOUSEBUTTONUP)
-    {
-        m_MousePos = oldMousePos;
-    }
-
     // Handle keys for input boxes
     if (GetFocusedObject())
     {
@@ -382 +379 @@
     NULL, NULL, NULL, NULL
 };
 
-CGUI::CGUI() : m_MouseButtons(0), m_FocusedObject(NULL), m_InternalNameNumber(0)
+CGUI::CGUI() : m_MouseButtons(0), m_FocusedObject(NULL), m_pCapturingGUIObject(NULL), m_InternalNameNumber(0)
 {
     m_BaseObject = new CGUIDummyObject;
     m_BaseObject->SetGUI(this);
@@ -512 +509 @@
     m_Icons.clear();
 }
 
+void CGUI::SetInactive()
+{
+    // This GUIObject won't reveive events anymore until it's active again.
+    // This means that e.g. buttons would keep showing tooltips until then.
+    // We reset the mouse-position and the mouse-states of all GUIObjects 
+    // when leaving the GUIPage to avoid this.
+    m_MousePos = CPos();
+    GUI<>::RecurseObject(GUIRR_HIDDEN, m_BaseObject, &IGUIObject::ResetMouseStates);
+}
+
+void CGUI::SetActive(CPos MousePos)
+{
+    m_IsActive = true;
+    // The mouse position would be set correctly after the first mousemotion event.
+    // That's too late if e.g. the mouse is already on a button and the user clicks before moving it.
+    m_MousePos = MousePos;
+}
+
 void CGUI::UpdateResolution()
 {
     // Update ALL cached

source/gui/IGUIObject.h

@@ -390 +390 @@
     void SetParent(IGUIObject *pParent) { m_pParent = pParent; }
     
     /**
-     * Reset internal state of this object
-     */
-    virtual void ResetStates()
+     * Reset all internal states of this object which are related to the mouse.
+     * TODO: There are some edge-cases with keyboard-events also which are currently not handled.
+     */
+    virtual void ResetMouseStates()
     {
         m_MouseHovering = false;
+        m_IsCapturing = false;
     }
 
 public:
@@ -456 +458 @@
     InReaction SendEvent(EGUIMessageType type, const CStr& EventName);
 
     /**
+     * Check if the object reqires the mouse input to be caputred.
+     *
+     * @return true if capturing, false if not
+     */
+    virtual bool IsCapturing() { return m_IsCapturing; }
+
+    /**
      * Execute the script for a particular action.
      * Does nothing if no script has been registered for that action.
      * The mouse coordinates will be passed as the first argument.
@@ -551 +560 @@
     // Is mouse hovering the object? used with the function MouseOver()
     bool                                    m_MouseHovering;
 
+    // Is GUIObject is currently capturing mouse input? Used with the function IsCapturing()
+    bool m_IsCapturing;
+
     /**
      * Settings pool, all an object's settings are located here
      * If a derived object has got more settings that the base

source/gui/CCheckBox.h

@@ -64 +64 @@
     virtual ~CCheckBox();
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates() { IGUIButtonBehavior::ResetStates(); }
+    virtual void ResetMouseStates() { IGUIButtonBehavior::ResetMouseStates(); }
 
     /**
      * @see IGUIObject#HandleMessage()

source/gui/MiniMap.h

@@ -39 +39 @@
 
     // create the minimap textures
     void CreateTextures();
+    
+    virtual void ResetMouseStates();
 
     // rebuild the terrain texture map
     void RebuildTerrainTexture();
@@ -57 +59 @@
     
     //Whether or not the mouse is currently down
     bool m_Clicking;
-    bool m_Hovering;
 
     // minimap texture handles
     GLuint m_TerrainTexture;

source/gui/IGUIScrollBar.h

@@ -146 +146 @@
  * The class does not provide all functionality to the scroll-bar, many
  * things the parent of the scroll-bar, must provide. Like a combo-box.
  */
-class IGUIScrollBar
+class IGUIScrollBar : virtual public IGUIObject
 {
+    friend class IGUIScrollBarOwner;
+    
 public:
     IGUIScrollBar();
     virtual ~IGUIScrollBar();
@@ -330 +332 @@
      * Call every time m_Pos has been updated.
      */
     void UpdatePosBoundaries();
+    
+    /**
+     * Overload of the BaseClass IGUIObject
+     */
+    virtual void ResetMouseStates();
 
 protected:
     //@}

source/gui/CInput.h

@@ -72 +72 @@
     virtual ~CInput();
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates() { IGUIScrollBarOwner::ResetStates(); }
+    virtual void ResetMouseStates() { IGUIScrollBarOwner::ResetMouseStates(); }
 
     // Check where the mouse is hovering, and get the appropriate text position.
     //  return is the text-position index.

source/gui/IGUIButtonBehavior.h

@@ -108 +108 @@
 
 protected:
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates()
-    {
-        m_MouseHovering = false;
-        m_Pressed = false;
-    }
+    virtual void ResetMouseStates();
 
     /**
      * Everybody knows how a button works, you don't simply press it,

source/gui/GUIManager.cpp

@@ -72 +72 @@
 
 void CGUIManager::PushPage(const CStrW& pageName, CScriptVal initData)
 {
+    CPos MousePos;
+    if(m_PageStack.size() > 0)
+    {
+        // Get the mouse position from the last active page
+        MousePos = m_PageStack.back().gui->GetMousePos();
+        m_PageStack.back().gui->SetInactive(); 
+    }
+        
     m_PageStack.push_back(SGUIPage());
     m_PageStack.back().name = pageName;
     m_PageStack.back().initData = CScriptValRooted(m_ScriptInterface.GetContext(), initData);
     LoadPage(m_PageStack.back());
+    m_PageStack.back().gui->SetActive(MousePos);
 }
 
 void CGUIManager::PopPage()
@@ -86 +95 @@
         return;
     }
 
+    // Get the mouse position from the last active page before removing it
+    CPos MousePos = m_PageStack.back().gui->GetMousePos();
     m_PageStack.pop_back();
+    m_PageStack.back().gui->SetActive(MousePos);
 }
 
 void CGUIManager::DisplayMessageBox(int width, int height, const CStrW& title, const CStrW& message)

source/gui/IGUIScrollBarOwner.h

@@ -60 +60 @@
  */
 class IGUIScrollBarOwner : virtual public IGUIObject
 {
-    friend class IGUIScrollBar;
-
 public:
     IGUIScrollBarOwner();
     virtual ~IGUIScrollBarOwner();
@@ -74 +72 @@
     virtual void HandleMessage(SGUIMessage &Message);
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates();
+    virtual void ResetMouseStates();
 
     /**
      * Interface for the m_ScrollBar to use.

source/gui/GUIutil.cpp

@@ -277 +277 @@
 
 void CInternalCGUIAccessorBase::QueryResetting(IGUIObject *pObject)
 {
-    GUI<>::RecurseObject(0, pObject, &IGUIObject::ResetStates);
+    GUI<>::RecurseObject(0, pObject, &IGUIObject::ResetMouseStates);
 }
 
 void CInternalCGUIAccessorBase::HandleMessage(IGUIObject *pObject, SGUIMessage &message)

source/gui/CButton.h

@@ -63 +63 @@
     virtual ~CButton();
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates() { IGUIButtonBehavior::ResetStates(); }
+    virtual void ResetMouseStates() { IGUIButtonBehavior::ResetMouseStates(); }
 
     /**
      * @see IGUIObject#HandleMessage()

source/gui/IGUIObject.cpp

@@ -40 +40 @@
 //-------------------------------------------------------------------
 //  Constructor / Destructor
 //-------------------------------------------------------------------
-IGUIObject::IGUIObject() : 
-    m_pGUI(NULL), 
+IGUIObject::IGUIObject() :
+    m_pGUI(NULL),
     m_pParent(NULL),
     m_MouseHovering(false),
+    m_IsCapturing(false),
     m_JSObject(NULL)
 {
     AddSetting(GUIST_bool,          "enabled");

source/gui/MiniMap.cpp

@@ -28 +28 @@
 #include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TerritoryTexture.h"
+#include "maths/Vector2D.h"
 #include "lib/ogl.h"
 #include "lib/external_libraries/sdl.h"
 #include "lib/bits.h"
@@ -59 +60 @@
     AddSetting(GUIST_CStrW,     "tooltip");
     AddSetting(GUIST_CStr,      "tooltip_style");
     m_Clicking = false;
-    m_Hovering = false;
 }
 
 CMiniMap::~CMiniMap()
@@ -73 +73 @@
     {
     case GUIM_MOUSE_PRESS_LEFT:
         {
-            if (m_Hovering)
+            if (m_MouseHovering)
             {
                 SetCameraPos();
                 m_Clicking = true;
+                m_IsCapturing = true;
             }
             break;
         }
     case GUIM_MOUSE_RELEASE_LEFT:
         {
-            if(m_Hovering && m_Clicking)
+            if(m_MouseHovering && m_Clicking)
             {
                 SetCameraPos();
             }
             m_Clicking = false;
+            m_IsCapturing = false;
             break;
         }
     case GUIM_MOUSE_DBLCLICK_LEFT:
         {
-            if(m_Hovering && m_Clicking)
+            if(m_MouseHovering && m_Clicking)
             {
                 SetCameraPos();
             }
@@ -100 +102 @@
         }
     case GUIM_MOUSE_ENTER:
         {
-            m_Hovering = true;
+            m_MouseHovering = true;
             break;
         }
     case GUIM_MOUSE_LEAVE:
         {
-            m_Clicking = false;
-            m_Hovering = false;
+            m_MouseHovering = false;
             break;
         }
     case GUIM_MOUSE_RELEASE_RIGHT:
@@ -121 +122 @@
         }
     case GUIM_MOUSE_MOTION:
         {
-            if (m_Hovering && m_Clicking)
+            if (m_Clicking)
             {
                 SetCameraPos();
             }
@@ -139 +140 @@
 
 void CMiniMap::GetMouseWorldCoordinates(float& x, float& z)
 {
-    // Determine X and Z according to proportion of mouse position and minimap
-
     CPos mousePos = GetMousePos();
+    float MinimapRadius = m_CachedActualSize.GetWidth() / 2.0f;
+    CVector2D CornerToMouse; // Vector from the bottom left corner of the minimap to the mouse-position
+    CVector2D CenterToCorner; // Vector from the center to the bottom left corner or the minimap;
+    CVector2D CenterToMouse; // Vector from the center of the minimap to the mouse (will be clamped at the minimap bounds)
 
-    float px = (mousePos.x - m_CachedActualSize.left) / m_CachedActualSize.GetWidth();
-    float py = (m_CachedActualSize.bottom - mousePos.y) / m_CachedActualSize.GetHeight();
+    CornerToMouse.X = (mousePos.x - m_CachedActualSize.left);
+    CornerToMouse.Y = (m_CachedActualSize.bottom - mousePos.y);
+    CenterToCorner.X = CenterToCorner.Y = -MinimapRadius;
+    CenterToMouse = CornerToMouse + CenterToCorner;
 
+    // Clamp CenterToMouse at a length of the minimap radius
+    if(CenterToMouse.Length() > MinimapRadius)
+    {
+        float ShrinkFactor = MinimapRadius / CenterToMouse.Length();
+        CenterToMouse.X = CenterToMouse.X * ShrinkFactor;
+        CenterToMouse.Y = CenterToMouse.Y * ShrinkFactor;
+    }
+
+    // Recalculate CenterToMouse using the other two vectors.
+    // It is now still pointing in the same direction (towards the mouse pointer), but clamped
+    CornerToMouse = (-CenterToCorner) + CenterToMouse;
+
+    // Determine X and Z according to proportion of mouse position and minimap
+    float px = CornerToMouse.X / m_CachedActualSize.GetWidth();
+    float py = CornerToMouse.Y / m_CachedActualSize.GetHeight();
     float angle = GetAngle();
 
     // Scale world coordinates for shrunken square map
@@ -448 +468 @@
     RebuildTerrainTexture();
 }
 
+void CMiniMap::ResetMouseStates()
+{
+    IGUIObject::ResetMouseStates();
+    m_Clicking = false;
+}
 
 void CMiniMap::RebuildTerrainTexture()
 {

source/gui/CText.h

@@ -65 +65 @@
     virtual ~CText();
 
     /**
-     * @see IGUIObject#ResetStates()
+     * @see IGUIObject#ResetMouseStates()
      */
-    virtual void ResetStates() { IGUIScrollBarOwner::ResetStates(); }
+    virtual void ResetMouseStates() { IGUIScrollBarOwner::ResetMouseStates(); }
 
     /**
      * Test if mouse position is over an icon

source/gui/CGUI.h

@@ -167 +167 @@
      * within the GUI.
      */
     void Destroy();
+    
+    
+    /**
+     * Sets if the GUI is on the currently active GUIPage.
+     */
+     void SetInactive();
+     
+     /**
+      * Sets if the GUI is on the currently active GUIPage.
+      *
+      * @param MousePos Current position of the mouse
+      */
+     void SetActive(CPos MousePos);
+     
+     /**
+      * Some simply get-functions
+      */
+     CPos GetMousePos() const { return m_MousePos; };
+     bool IsActive() const {return m_IsActive; };
+     
 
     /**
      * The replacement of Process(), handles an SDL_Event_
@@ -645 +665 @@
      * as followed, the value will increment.
      */
     int m_InternalNameNumber;
+    
+    /**
+     * Value indicating if the GUI is on the currently active GUIPage. 
+     */
+    bool m_IsActive;
 
     /**
      * Function pointers to functions that constructs
@@ -677 +702 @@
 
     // Icons
     std::map<CStr, SGUIIcon> m_Icons;
+
+    // GUIObject capturing the mouse input
+    IGUIObject *m_pCapturingGUIObject;
 };
 
 #endif

source/graphics/Camera.cpp

@@ -308 +308 @@
 
     // Clamp the water intersection to within the map's bounds, so that
     // we'll always return a valid position on the map
-    ssize_t mapSize = g_Game->GetWorld()->GetTerrain()->GetVerticesPerSide();
-    if (gotWater)
-    {
-        waterPoint.X = clamp(waterPoint.X, 0.f, (float)((mapSize-1)*CELL_SIZE));
-        waterPoint.Z = clamp(waterPoint.Z, 0.f, (float)((mapSize-1)*CELL_SIZE));
-    }
 
     if (gotTerrain)
     {

binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -14 +14 @@
 
     // initialize currentSubmenuType with placeholder to avoid null when switching
     currentSubmenuType = "submenuSinglePlayer";
+
+    EnableUserReport(Engine.IsUserReportEnabled());
 }
 
 var t0 = new Date;
@@ -140 +142 @@
 
     if (Engine.IsUserReportEnabled())
     {
-        getGUIObjectByName("userReportDisabled").hidden = true;
-        getGUIObjectByName("userReportEnabled").hidden = false;
-
-        getGUIObjectByName("userReportEnabledText").caption =
-            userReportEnabledText.replace(/\$status/,
-                formatUserReportStatus(Engine.GetUserReportStatus()));
+        getGUIObjectByName("userReportEnabledText").caption = userReportEnabledText.replace(/\$status/,
+            formatUserReportStatus(Engine.GetUserReportStatus()));
     }
-    else
-    {
-        getGUIObjectByName("userReportDisabled").hidden = false;
-        getGUIObjectByName("userReportEnabled").hidden = true;
-    }
 }
 
+function EnableUserReport(Enabled)
+{
+    getGUIObjectByName("userReportDisabled").hidden = Enabled;
+    getGUIObjectByName("userReportEnabled").hidden = !Enabled;
+    Engine.SetUserReportEnabled(Enabled);
+}
 
+
 /*
  * MENU FUNCTIONS
  */

binaries/data/mods/public/gui/pregame/mainmenu.xml

@@ -97 +97 @@
             </object>
             <object type="button" style="StoneButton" size="8 100%-36 146 100%-8">
                 Enable feedback
-                <action on="Press">Engine.SetUserReportEnabled(true);</action>
+                <action on="Press">EnableUserReport(true);</action>
             </object>
             <object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
                 Technical details
@@ -149 +149 @@
 
             <object type="button" style="StoneButton" size="8 100%-36 146 100%-8">
                 Disable feedback
-                <action on="Press">Engine.SetUserReportEnabled(false);</action>
+                <action on="Press">EnableUserReport(false);</action>
             </object>
             <object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
                 Technical details