NeoUI - Table headers + main table API + section X-axis scrolling

NeoUI table headers and main table API implemented, now have
Begin/EndTable and NextTableRow implementation replacing the
previous custom paint + button. Now can just layout the table
cells with widgets, although at the moment only NeoUI::Label
are properly utilized and dealt with. Other widgets are not
refactored up for tables yet.

The table headers now have dragable resizing and the server
browser now have tags column. There's also right-click on
the header to show/hide columns.

Sections now have X-axis scrolling, mainly used for table and
header scrolling support.

Re-done NeoUI::Tabs scrolling, now it's held externally and
its own thing.

OTHERS:
* Fix SDR/Steam networking server bot vs player number count
* Fix border in smaller resolutions
* Added IP Address (hidden by default) column

TODOs:
* Section X-scrollbar controls options/flags
  * Modes:
    * No X-scrollbar
    * Indicator/thin X-scrollbar
    * Dragable/thick X-scrollbar
  * Using BeginTable will automatically put
    the section into Dragable/thick X-scrollbar
    mode
* Some TODOs in source code
  * Change from only header to any sections to reference other
    section's scrolls

FUTURE TODOs:
* Refactor painting of widgets to utilize vgui viewports
* Possible split of painting (and colors) from NeoUI internals
* Vertical layouting that expands horizontally as oppose to the
  default horizontal layouting that expands vertically

* fixes #1566
* fixes #994
* fixes #1815

Author: nullsystem

src/game/client/neo/ui/neo_root.cpp

@@ -172,10 +172,10 @@ class CNeoRoot : public vgui::EditablePanel, public CGameEventListener
 	int m_iServerBrowserTab = 0;
 	CNeoServerList m_serverBrowser[GS__TOTAL];
 	CNeoServerPlayers m_serverPlayers;
-	ServerBrowserFilters m_sbFilters;
-	bool m_bSBFiltModified = false;
+	ServerBrowserFilters m_sbFilters = {};
+	NeoUI::TableHeaderModFlags m_headerModFlagsServerBrowser = 0;
 	bool m_bShowFilterPanel = false;
-	bool m_bSPlayersSortModified = false;
+	NeoUI::TableHeaderModFlags m_headerModFlagsPlayers = 0;
 	GameServerSortContext m_sortCtx = {};
 
 	wchar_t m_wszBindingText[128];
@@ -231,6 +231,17 @@ class CNeoRoot : public vgui::EditablePanel, public CGameEventListener
 	servernetadr_t m_favCacheNetAdr = {};
 	bool m_bFavCacheIsFav = false;
 	bool m_bAutoRefreshFav = false;
+
+	int m_iColsWideServerBrowser[GSIW__TOTAL] = {};
+	int m_iColsWideServerBlacklist[SBLIST_COL__TOTAL] = {};
+	int m_iColsWideDetailedPlayerList[GSPS__TOTAL] = {};
+
+	int m_iUpDownInitialServer = -1;
+	int m_iUpDownDirection = 0;
+
+	NeoUI::TabsState m_tabsStateSettings = {};
+	NeoUI::TabsState m_tabsStateServerBrowser = {};
+	NeoUI::TabsState m_tabsStateIFF = {};
 };
 
 extern CNeoRoot *g_pNeoRoot;

src/game/client/neo/ui/neo_root.h

@@ -205,13 +205,14 @@ void CNeoServerList::UpdateFilteredList()
 	}
 
 	gameserveritem_t curGsi;
-	if (IN_BETWEEN_AR(0, g_pNeoRoot->m_iSelectedServer, m_filteredServers.Count()))
+	if (IN_BETWEEN_AR(0, g_pNeoRoot->m_iSelectedServer, m_filteredServers.size()))
 	{
 		V_memcpy(&curGsi, &m_filteredServers[g_pNeoRoot->m_iSelectedServer], sizeof(gameserveritem_t));
 	}
 
 	m_filteredServers = m_servers;
-	if (m_filteredServers.IsEmpty())
+
+	if (m_filteredServers.empty())
 	{
 		g_pNeoRoot->m_iSelectedServer = -1;
 		return;
@@ -258,6 +259,10 @@ void CNeoServerList::UpdateFilteredList()
 			iLeft = gsiLeft.m_nPing;
 			iRight = gsiRight.m_nPing;
 			break;
+		case GSIW_IP_ADDRESS:
+			iLeft = gsiLeft.m_NetAdr.GetIP();
+			iRight = gsiRight.m_NetAdr.GetIP();
+			break;
 		case GSIW_NAME:
 		default:
 			// no-op, already assigned (default)
@@ -272,6 +277,7 @@ void CNeoServerList::UpdateFilteredList()
 			break;
 		case GSIW_PLAYERS:
 		case GSIW_PING:
+		case GSIW_IP_ADDRESS:
 			if (iLeft != iRight) return (m_pSortCtx->bDescending) ? iLeft < iRight : iLeft > iRight;
 			break;
 		default:
@@ -280,10 +286,10 @@ void CNeoServerList::UpdateFilteredList()
 		return (m_pSortCtx->bDescending) ? (V_strcmp(szRight, szLeft) > 0) : (V_strcmp(szLeft, szRight) > 0);
 	});
 
-	if (IN_BETWEEN_AR(0, g_pNeoRoot->m_iSelectedServer, m_filteredServers.Count()))
+	if (IN_BETWEEN_AR(0, g_pNeoRoot->m_iSelectedServer, m_filteredServers.size()))
 	{
 		g_pNeoRoot->m_iSelectedServer = -1;
-		for (int i = 0; i < m_filteredServers.Count(); ++i)
+		for (int i = 0; i < m_filteredServers.size(); ++i)
 		{
 			if (V_memcmp(&curGsi, &m_filteredServers[i], sizeof(gameserveritem_t)) == 0)
 			{
@@ -301,6 +307,8 @@ void CNeoServerList::RequestList()
 		return;
 	}
 
+	m_servers.clear();
+
 	static MatchMakingKeyValuePair_t mmFilters[] = {
 		{"gamedir", "neo"},
 	};
@@ -331,9 +339,26 @@ void CNeoServerList::ServerResponded(HServerListRequest hRequest, int iServer)
 
 	ISteamMatchmakingServers *steamMM = steamapicontext->SteamMatchmakingServers();
 	gameserveritem_t *pServerDetails = steamMM->GetServerDetails(hRequest, iServer);
-	if (pServerDetails)
+	if (pServerDetails && m_servers.size() < 1024)
 	{
-		m_servers.AddToTail(*pServerDetails);
+		wchar_t wszServerName[k_cbMaxGameServerName] = {};
+		g_pVGuiLocalize->ConvertANSIToUnicode(
+				pServerDetails->GetName(), wszServerName, sizeof(wszServerName));
+		const int iWszLen = V_wcslen(wszServerName);
+		// NEO TODO (nullsystem): Need to implement fallback fonts in NeoUI or otherwise
+		// without fallback unicode fonts can corrupt the memory on drawing the text somehow
+		for (int i = 0; i < iWszLen; ++i)
+		{
+			if (wszServerName[i] >= 256)
+			{
+				wszServerName[i] = L'?';
+			}
+		}
+		char szServerName[k_cbMaxGameServerName] = {};
+		g_pVGuiLocalize->ConvertUnicodeToANSI(wszServerName, szServerName, sizeof(szServerName));
+		Q_UnicodeRepair(szServerName);
+		pServerDetails->SetName(szServerName);
+		m_servers.push_back(*pServerDetails);
 		m_bModified = true;
 	}
 }
@@ -350,7 +375,7 @@ void CNeoServerList::RefreshComplete(HServerListRequest hRequest, EMatchMakingSe
 	if (m_iType == GS_BLACKLIST || hRequest != m_hdlRequest) return;
 
 	m_bSearching = false;
-	if (response == eNoServersListedOnMasterServer && m_servers.IsEmpty())
+	if (response == eNoServersListedOnMasterServer && m_servers.empty())
 	{
 		m_bModified = true;
 	}

src/game/client/neo/ui/neo_root_serverbrowser.cpp

@@ -3,6 +3,7 @@
 #include <tier1/netadr.h>
 #include <steam/isteammatchmaking.h>
 #include <utlvector.h>
+#include <vector>
 
 enum EServerBlacklistType
 {
@@ -64,9 +65,11 @@ enum GameServerInfoW
 	GSIW_LOCKED = 0,
 	GSIW_VAC,
 	GSIW_NAME,
+	GSIW_IP_ADDRESS,
 	GSIW_MAP,
 	GSIW_PLAYERS,
 	GSIW_PING,
+	GSIW_TAGS,
 
 	GSIW__TOTAL,
 };
@@ -80,6 +83,14 @@ enum AntiCheatMode
 	ANTICHEAT__TOTAL,
 };
 
+enum ETagsFilterMode
+{
+	TAGSFILTER_INCLUDE = 0,
+	TAGSFILTER_EXCLUDE,
+
+	TAGSFILTER__TOTAL,
+};
+
 enum GameServerPlayerSort
 {
 	GSPS_SCORE = 0,
@@ -101,16 +112,19 @@ struct GameServerSortContext
 
 struct GameServerPlayerSortContext
 {
-	GameServerPlayerSort col = GSPS_SCORE;
+	int col = GSPS_SCORE;
 	bool bDescending = true;
 };
 
 class CNeoServerList : public ISteamMatchmakingServerListResponse
 {
 public:
 	GameServerType m_iType;
-	CUtlVector<gameserveritem_t> m_servers;
-	CUtlVector<gameserveritem_t> m_filteredServers;
+
+	// NEO JANK (nullsystem): CUtlVector easily corrupts memory with
+	// gameserveritem_t results, so using std::vector instead
+	std::vector<gameserveritem_t> m_servers;
+	std::vector<gameserveritem_t> m_filteredServers;
 
 	void UpdateFilteredList();
 	void RequestList();
@@ -155,4 +169,9 @@ struct ServerBrowserFilters
 	bool bIsNotPasswordProtected = false;
 	int iAntiCheat = 0;
 	int iMaxPing = 0;
+	wchar_t wszMapFilter[k_cbMaxGameServerMapName] = {};
+	int iMaxPlayerCount = 0;
+	int iTagsFilterType = 0;
+	wchar_t wszTagsFilter[k_cbMaxGameServerTags] = {};
 };
+

src/game/client/neo/ui/neo_root_serverbrowser.h

@@ -1489,7 +1489,8 @@ void NeoSettings_HUD(NeoSettings *ns)
 
 	NeoUI::SetPerRowLayout(1);
 	NeoUI::Tabs(IFF_LABELS, iIFFLabelsSize, &optionChosen,
-			NeoUI::TABFLAG_NOSIDEKEYS | NeoUI::TABFLAG_NOSTATERESETS);
+			NeoUI::TABFLAG_NOSIDEKEYS | NeoUI::TABFLAG_NOSTATERESETS,
+			&g_pNeoRoot->m_tabsStateIFF);
 	NeoUI::SetPerRowLayout(2, NeoUI::ROWLAYOUT_TWOSPLIT);
 
 	// NEO TODO (Adam) Show what the marker looks like somewhere here

src/game/client/neo/ui/neo_root_settings.cpp

@@ -27,5 +27,8 @@ void SetupNTRETheme(NeoUI::Context *pNeoUICtx)
 	pColors->sliderHotBg = COLOR_GREY;
 	pColors->sliderActiveBg = COLOR_BLACK;
 	pColors->tabHintsFg = COLOR_WHITE;
+	pColors->tableHeaderSortIndicatorBg = COLOR_WHITE;
+	pColors->headerDragNormalBg = COLOR_FADED_WHITE;
+	pColors->headerDragActiveBg = COLOR_DARK_RED;
 }