Synchronize changes from 1.6 master branch [ci skip]

9705d5e Improve serverinfo (This still doesn't fix stale (i) button data)

Author: github-actions[bot]

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -580,6 +580,7 @@ void CServerBrowser::CreateTab(ServerBrowserType type, const char* szName)
     m_pServerList[type]->SetSize(CVector2D(fWidth, fHeight), false);
     m_pServerList[type]->SetIgnoreTextSpacer(true);
     m_pServerList[type]->SetClickHandler(GUI_CALLBACK(&CServerBrowser::OnClick, this));
+    m_pServerList[type]->SetSelectionHandler(GUI_CALLBACK(&CServerBrowser::OnClick, this));
     m_pServerListRevision[type] = 0;
 
     // Server List Columns
@@ -619,7 +620,7 @@ void CServerBrowser::CreateTab(ServerBrowserType type, const char* szName)
     // Filters
     float fLineHeight = SB_BACK_BUTTON_SIZE_Y / 2;
     fX = SB_SMALL_SPACER;
-    fY = m_WidgetSize.fY - SB_SMALL_SPACER / 2 - SB_BACK_BUTTON_SIZE_Y - TAB_SIZE_Y;
+    fY = m_WidgetSize.fY - (SB_SMALL_SPACER * 0.5f) - SB_BACK_BUTTON_SIZE_Y - TAB_SIZE_Y;
 
     // Include label
     m_pLabelInclude[type] = reinterpret_cast<CGUILabel*>(pManager->CreateLabel(m_pTab[type], _("Include:")));
@@ -919,6 +920,7 @@ void CServerBrowser::DeleteTab(ServerBrowserType type)
         m_pServerList[type]->SetEnterKeyHandler(GUI_CALLBACK());
         m_pServerList[type]->SetDoubleClickHandler(GUI_CALLBACK());
         m_pServerList[type]->SetKeyDownHandler(GUI_CALLBACK_KEY());
+        m_pServerList[type]->SetSelectionHandler(GUI_CALLBACK());
         delete m_pServerList[type];
         m_pServerList[type] = nullptr;
     }
@@ -1720,7 +1722,7 @@ bool CServerBrowser::OnInfoClick(CGUIElement* pElement)
 
     if (CServerInfo* pServerInfo = CServerInfo::GetSingletonPtr())
     {
-        pServerInfo->Show(eWindowTypes::SERVER_INFO_RAW, strHost.c_str(), usPort, strPassword.c_str());
+        pServerInfo->Show(eWindowTypes::SERVER_INFO_RAW, strHost.c_str(), usPort, strPassword.c_str(), nullptr);
     }
     return true;
 }

Client/core/ServerBrowser/CServerInfo.cpp

@@ -333,84 +333,168 @@ void CServerInfo::Show(eWindowType WindowType, const char* szHost, unsigned shor
 
 void CServerInfo::SetServerInformation(const char* szHost, unsigned short usPort, const char* szPassword, CServerListItem* pInitialServerListItem)
 {
-    // Store the parameters in our class instance for later use
     m_usPort = usPort;
+    m_strPassword = szPassword ? szPassword : "";
+    m_strHost = szHost ? szHost : "";
 
-    m_strPassword = szPassword;
-    m_strHost = szHost;
-
-    // Create a winsock address endpoint and parse the IP into it
     in_addr Address;
-    CServerListItem::Parse(szHost, Address);
-
-    // Set our server query's address, query port and game port
+    memset(&Address, 0, sizeof(Address));
+    if (!CServerListItem::Parse(szHost, Address))
+        Address.S_un.S_addr = 0;
+
+    m_Server.CancelPendingQuery();
+
+    // Clear stale address data before applying the new endpoint
+    m_Server.Address.S_un.S_addr = 0;
+    m_Server.AddressCopy.S_un.S_addr = 0;
+    m_Server.usGamePort = 0;
+    m_Server.usGamePortCopy = 0;
+    m_Server.strHost = "";
+    m_Server.strEndpoint = "";
+    m_Server.strEndpointSortKey = "";
+    m_Server.bScanned = false;
+    m_Server.bSkipped = false;
+
+    // Assign the new address details
     m_Server.ChangeAddress(Address, usPort);
 
-    if (pInitialServerListItem)            // If we have a pointer to an already scanned server, we initially set text to this
-        ResetServerGUI(pInitialServerListItem);
-    else            // Otherwise, reset it to blank text
+    if (m_Server.Address.S_un.S_addr != Address.S_un.S_addr || m_Server.usGamePort != usPort)
+    {
+        m_Server.Address = Address;
+        m_Server.usGamePort = usPort;
+    }
+
+    m_Server.AddressCopy = m_Server.Address;
+    m_Server.usGamePortCopy = m_Server.usGamePort;
+
+    const uchar* addressBytes = reinterpret_cast<const uchar*>(&m_Server.Address.S_un.S_addr);
+    SString      strAddressHost = inet_ntoa(m_Server.Address);
+    if (strAddressHost.empty())
+        strAddressHost = szHost;
+    m_Server.strHost = strAddressHost;
+    m_Server.strEndpoint = SString("%s:%u", *strAddressHost, m_Server.usGamePort);
+    m_Server.strEndpointSortKey =
+        SString("%02x%02x%02x%02x-%04x", addressBytes[0], addressBytes[1], addressBytes[2], addressBytes[3], m_Server.usGamePort);
+
+    if (pInitialServerListItem && CServerListItem::StaticIsValid(pInitialServerListItem))
+    {
+        m_Server.strName = pInitialServerListItem->strName;
+        m_Server.strSearchableName = pInitialServerListItem->strSearchableName;
+        m_Server.strHostName = pInitialServerListItem->strHostName;
+        m_Server.strGameName = pInitialServerListItem->strGameName;
+        m_Server.strGameMode = pInitialServerListItem->strGameMode;
+        m_Server.strMap = pInitialServerListItem->strMap;
+        m_Server.strVersion = pInitialServerListItem->strVersion;
+        m_Server.nPlayers = pInitialServerListItem->nPlayers;
+        m_Server.nMaxPlayers = pInitialServerListItem->nMaxPlayers;
+        m_Server.nPing = pInitialServerListItem->nPing;
+        m_Server.bPassworded = pInitialServerListItem->bPassworded;
+        m_Server.bSerials = pInitialServerListItem->bSerials;
+        m_Server.isStatusVerified = pInitialServerListItem->isStatusVerified;
+        m_Server.bMaybeOffline = pInitialServerListItem->bMaybeOffline;
+        m_Server.bMasterServerSaysNoResponse = pInitialServerListItem->bMasterServerSaysNoResponse;
+        m_Server.uiMasterServerSaysRestrictions = pInitialServerListItem->uiMasterServerSaysRestrictions;
+        m_Server.vecPlayers = pInitialServerListItem->vecPlayers;
+        m_Server.uiTieBreakPosition = pInitialServerListItem->uiTieBreakPosition;
+        m_Server.strTieBreakSortKey = pInitialServerListItem->strTieBreakSortKey;
+        m_Server.strNameSortKey = pInitialServerListItem->strNameSortKey;
+        m_Server.strVersionSortKey = pInitialServerListItem->strVersionSortKey;
+        m_Server.m_iBuildType = pInitialServerListItem->m_iBuildType;
+        m_Server.m_iBuildNumber = pInitialServerListItem->m_iBuildNumber;
+        m_Server.m_usHttpPort = pInitialServerListItem->m_usHttpPort;
+        m_Server.m_ucSpecialFlags = pInitialServerListItem->m_ucSpecialFlags;
+        m_Server.SetDataQuality(pInitialServerListItem->GetDataQuality());
+        m_Server.bScanned = true;
+        m_Server.bSkipped = false;
+
+        if (!pInitialServerListItem->strHost.empty())
+            m_Server.strHost = pInitialServerListItem->strHost;
+        if (!pInitialServerListItem->strEndpoint.empty())
+            m_Server.strEndpoint = pInitialServerListItem->strEndpoint;
+        if (!pInitialServerListItem->strEndpointSortKey.empty())
+            m_Server.strEndpointSortKey = pInitialServerListItem->strEndpointSortKey;
+
+        ResetServerGUI(&m_Server);
+    }
+    else
+    {
         Reset();
+    }
 
-    m_pServerAddressLabel->SetText(SString("%s:%u", szHost, usPort));
+    const SString strDisplayedEndpoint = !m_Server.strEndpoint.empty() ? m_Server.strEndpoint : SString("%s:%u", szHost, usPort);
+    m_pServerAddressLabel->SetText(strDisplayedEndpoint);
 
-    // Lets query the server now, as the previous data is out of date
+    // Start a fresh query so we get the latest data for this server
     Refresh();
 }
 
 void CServerInfo::DoPulse()
 {
-    // Are we visible?
-    if (IsVisible())
+    if (!IsVisible())
     {
-        // Pulse the server query
-        m_Server.Pulse(true);
-
-        // Do we need a refresh?
-        if ((m_Server.bScanned && (CClientTime::GetTime() - m_ulLastUpdateTime) >= SERVER_UPDATE_INTERVAL))
+        if (m_bWaitingToActivatePassword)
         {
-            // Are we queing, and is auto join enabled?
-            if (m_pCurrentWindowType == eWindowTypes::SERVER_INFO_QUEUE && m_pCheckboxAutojoin->GetSelected())
-            {
-                // Is a slot available?
-                if (m_Server.nPlayers < m_Server.nMaxPlayers)
-                {
-                    // Lets attempt to connect
-                    Connect();
-                    return;
-                }
-            }
+            m_bWaitingToActivatePassword = false;
+            m_pWindow->Activate();
+            m_pEnterPasswordEdit->Activate();
+        }
+        return;
+    }
 
-            ResetServerGUI(&m_Server);
+    const unsigned long ulNow = CClientTime::GetTime();
+    bool                bRefreshed = false;
 
-            m_ulLastUpdateTime = CClientTime::GetTime();
+    m_Server.Pulse(true);
 
-            // Query the server
-            Refresh();
-        }
-        else if (m_Server.bSkipped)            // Server query timed out
-        {
-            // Should we try to query again?
-            if (CClientTime::GetTime() - m_ulLastUpdateTime >= SERVER_UPDATE_INTERVAL)
-            {
-                // Query the server
-                Refresh();
-            }
+    in_addr expectedAddress;
+    memset(&expectedAddress, 0, sizeof(expectedAddress));
+    const bool bHasExpectedAddress = !m_strHost.empty() && CServerListItem::Parse(m_strHost.c_str(), expectedAddress);
+    const bool bAddressMatches = !bHasExpectedAddress || (expectedAddress.S_un.S_addr == m_Server.Address.S_un.S_addr && m_usPort == m_Server.usGamePort);
 
+    if (m_Server.bScanned)
+    {
+        if (bAddressMatches)
+        {
             ResetServerGUI(&m_Server);
 
-            // The server has timed out
-            m_pLatencyLabel->SetText(_("Timed Out"));
+            if (m_pCurrentWindowType == eWindowTypes::SERVER_INFO_QUEUE && m_pCheckboxAutojoin->GetSelected() &&
+                m_Server.nPlayers < m_Server.nMaxPlayers)
+            {
+                Connect();
+                return;
+            }
 
-            m_ulLastUpdateTime = CClientTime::GetTime();
+            m_ulLastUpdateTime = ulNow;
         }
-
-        if (m_bWaitingToActivatePassword)
+        else
         {
-            m_bWaitingToActivatePassword = false;
-            m_pWindow->Activate();
-            m_pEnterPasswordEdit->Activate();
+            Refresh();
+            bRefreshed = true;
+            m_ulLastUpdateTime = ulNow;
         }
     }
+    else if (m_Server.bSkipped)
+    {
+        ResetServerGUI(&m_Server);
+        m_pLatencyLabel->SetText(_("Timed Out"));
+        m_ulLastUpdateTime = ulNow;
+
+        Refresh();
+        bRefreshed = true;
+    }
+
+    if (!bRefreshed && (ulNow - m_ulLastUpdateTime) >= SERVER_UPDATE_INTERVAL)
+    {
+        Refresh();
+        m_ulLastUpdateTime = ulNow;
+    }
+
+    if (m_bWaitingToActivatePassword)
+    {
+        m_bWaitingToActivatePassword = false;
+        m_pWindow->Activate();
+        m_pEnterPasswordEdit->Activate();
+    }
 }
 
 void CServerInfo::Refresh()

Client/gui/CGUIGridList_Impl.cpp

@@ -25,6 +25,8 @@ CGUIGridList_Impl::CGUIGridList_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, bool
     m_hUniqueHandle = 0;
     m_iIndex = 0;
     m_bIgnoreTextSpacer = false;
+    m_OnSortColumn = NULL;
+    m_OnSelectionChanged = NULL;
 
     // Get an unique identifier for CEGUI (gah, there's gotta be an another way)
     char szUnique[CGUI_CHAR_SIZE];
@@ -49,6 +51,7 @@ CGUIGridList_Impl::CGUIGridList_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, bool
 
     // Register our events
     m_pWindow->subscribeEvent(CEGUI::MultiColumnList::EventSortColumnChanged, CEGUI::Event::Subscriber(&CGUIGridList_Impl::Event_OnSortColumn, this));
+    m_pWindow->subscribeEvent(CEGUI::MultiColumnList::EventSelectionChanged, CEGUI::Event::Subscriber(&CGUIGridList_Impl::Event_OnSelectionChanged, this));
     AddEvents();
 
     // If a parent is specified, add it to it's children list, if not, add it as a child to the pManager
@@ -787,13 +790,25 @@ void CGUIGridList_Impl::SetSortColumnHandler(GUI_CALLBACK Callback)
     m_OnSortColumn = Callback;
 }
 
+void CGUIGridList_Impl::SetSelectionHandler(GUI_CALLBACK Callback)
+{
+    m_OnSelectionChanged = Callback;
+}
+
 bool CGUIGridList_Impl::Event_OnSortColumn(const CEGUI::EventArgs& e)
 {
     if (m_OnSortColumn)
         m_OnSortColumn(reinterpret_cast<CGUIElement*>(this));
     return true;
 }
 
+bool CGUIGridList_Impl::Event_OnSelectionChanged(const CEGUI::EventArgs& e)
+{
+    if (m_OnSelectionChanged)
+        m_OnSelectionChanged(reinterpret_cast<CGUIElement*>(this));
+    return true;
+}
+
 unsigned int CGUIGridList_Impl::GetUniqueHandle()
 {
     return ++m_hUniqueHandle;

Client/gui/CGUIGridList_Impl.h

@@ -80,6 +80,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl
     void SetSelectedItem(int iRow, int hColumn, bool bReset);
 
     void SetSortColumnHandler(GUI_CALLBACK Callback);
+    void SetSelectionHandler(GUI_CALLBACK Callback);
 
     void      SetIgnoreTextSpacer(bool bIgnoreTextSpacer) { m_bIgnoreTextSpacer = bIgnoreTextSpacer; };
     eCGUIType GetType() { return CGUI_GRIDLIST; };
@@ -88,6 +89,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl
 
 private:
     bool Event_OnSortColumn(const CEGUI::EventArgs& e);
+    bool Event_OnSelectionChanged(const CEGUI::EventArgs& e);
 
     int m_iIndex;
 
@@ -98,6 +100,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl
     CFastHashMap<CEGUI::ListboxItem*, CGUIListItem_Impl*> m_Items;
 
     GUI_CALLBACK m_OnSortColumn;
+    GUI_CALLBACK m_OnSelectionChanged;
 
     bool m_bIgnoreTextSpacer;
 };

Client/sdk/gui/CGUIGridList.h

@@ -110,6 +110,7 @@ class CGUIGridList : public CGUIElement
     virtual void SetSelectedItem(int iRow, int hColumn, bool bReset) = 0;
 
     virtual void SetSortColumnHandler(GUI_CALLBACK Callback) = 0;
+    virtual void SetSelectionHandler(GUI_CALLBACK Callback) = 0;
 
     virtual void SetIgnoreTextSpacer(bool bIgnoreTextSpacer) = 0;
 };