Skip to content

NeoUI - Add and remove server favorites #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nullsystem merged 1 commit into from
Sep 21, 2025
Merged

NeoUI - Add and remove server favorites #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 177 additions & 16 deletions src/game/client/neo/ui/neo_root.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "neo_version_info.h"
#include "cdll_client_int.h"
#include <steam/steam_api.h>
#include <steam/isteammatchmaking.h>
#include <vgui_avatarimage.h>
#include <IGameUIFuncs.h>
#include <voice_status.h>
Expand Down Expand Up @@ -106,6 +107,118 @@ void OverrideGameUI()
}
}

// Only use it rarely/cached
static bool NetAdrIsFavorite(const servernetadr_t &netAdr)
{
ISteamMatchmaking *smm = SteamMatchmaking();
if (!smm)
{
return false;
}

const int iMaxFavCount = smm->GetFavoriteGameCount();
for (int i = 0; i < iMaxFavCount; ++i)
{
uint32 nIP = 0;
uint16 nConnPort = 0;
uint16 nQueryPort = 0;
AppId_t nAppID = 0;
uint32 unFlags = 0;
[[maybe_unused]] uint32 rTime32LastPlayedOnServer = 0;

if (smm->GetFavoriteGame(i, &nAppID, &nIP, &nConnPort,
&nQueryPort, &unFlags, &rTime32LastPlayedOnServer))
{
if (nIP == netAdr.GetIP() &&
nConnPort == netAdr.GetConnectionPort() &&
nQueryPort == netAdr.GetQueryPort() &&
(unFlags & k_unFavoriteFlagFavorite) &&
nAppID == engine->GetAppID())
{
return true;
}
}
}
return false;
}

static void AddToBlacklist(const gameserveritem_t *gameServer)
{
const netadr_t netAdr(gameServer->m_NetAdr.GetIP(), gameServer->m_NetAdr.GetConnectionPort());

ServerBlacklistInfo sbInfo = {};

g_pVGuiLocalize->ConvertANSIToUnicode(gameServer->GetName(), sbInfo.wszName, sizeof(sbInfo.wszName));
sbInfo.timeVal = time(nullptr);
sbInfo.netAdr = netAdr;
sbInfo.eType = SBLIST_TYPE_NETADR;
ServerBlacklistCacheWsz(&sbInfo);

g_blacklistedServers.AddToTail(sbInfo);
}

static void RightClickRetServer(void *pData, const int iItem)
{
CNeoRoot *pNeoRoot = (CNeoRoot *)(pData);

Assert(pNeoRoot->m_iServerBrowserTab != GS_BLACKLIST && pNeoRoot->m_iSelectedServer >= 0);
if (pNeoRoot->m_iServerBrowserTab == GS_BLACKLIST || pNeoRoot->m_iSelectedServer < 0)
{
return;
}

const auto *gameServer = &pNeoRoot->m_serverBrowser[pNeoRoot->m_iServerBrowserTab].m_filteredServers[pNeoRoot->m_iSelectedServer];

switch (iItem)
{
case CNeoRoot::RIGHTCLICKSERVER_FAV:
{
if (ISteamMatchmaking *smm = SteamMatchmaking())
{
const servernetadr_t &netAdr = gameServer->m_NetAdr;
if (NetAdrIsFavorite(netAdr))
{
smm->RemoveFavoriteGame(
engine->GetAppID(),
netAdr.GetIP(),
netAdr.GetConnectionPort(),
netAdr.GetQueryPort(),
k_unFavoriteFlagFavorite);
}
else
{
smm->AddFavoriteGame(
engine->GetAppID(),
netAdr.GetIP(),
netAdr.GetConnectionPort(),
netAdr.GetQueryPort(),
k_unFavoriteFlagFavorite,
0);
}
}
} break;
case CNeoRoot::RIGHTCLICKSERVER_BLACKLIST:
AddToBlacklist(gameServer);
break;
default:
break;
}
}

static void RightClickRetRemoveBlacklist(void *pData, [[maybe_unused]] const int iItem)
{
CNeoRoot *pNeoRoot = (CNeoRoot *)(pData);

Assert(pNeoRoot->m_iServerBrowserTab == GS_BLACKLIST && pNeoRoot->m_iSelectedServer >= 0);
if (pNeoRoot->m_iServerBrowserTab != GS_BLACKLIST || pNeoRoot->m_iSelectedServer < 0)
{
return;
}

g_blacklistedServers.Remove(pNeoRoot->m_iSelectedServer);
pNeoRoot->m_iSelectedServer = -1;
}

CNeoRootInput::CNeoRootInput(CNeoRoot *rootPanel)
: Panel(rootPanel, "NeoRootPanelInput")
, m_pNeoRoot(rootPanel)
Expand Down Expand Up @@ -1262,10 +1375,15 @@ void CNeoRoot::MainLoopServerBrowser(const MainLoopParam param)
{
m_iSelectedServer = -1;
}
if (!m_serverBrowser[m_iServerBrowserTab].m_bReloadedAtLeastOnce)
if ((m_bAutoRefreshFav && m_iServerBrowserTab == GS_FAVORITES) ||
!m_serverBrowser[m_iServerBrowserTab].m_bReloadedAtLeastOnce)
{
bForceRefresh = true;
m_serverBrowser[m_iServerBrowserTab].m_bReloadedAtLeastOnce = true;
if (m_iServerBrowserTab == GS_FAVORITES)
{
m_bAutoRefreshFav = false;
}
}
g_uiCtx.eButtonTextStyle = NeoUI::TEXTSTYLE_LEFT;

Expand Down Expand Up @@ -1330,9 +1448,15 @@ void CNeoRoot::MainLoopServerBrowser(const MainLoopParam param)
const ServerBlacklistInfo &blacklist = g_blacklistedServers[i];

const auto btn = NeoUI::Button(L"");
if (btn.bPressed) // Dummy button, draw over it in paint
if (btn.bPressed || btn.bMouseRightPressed) // Dummy button, draw over it in paint
{
m_iSelectedServer = i;
if (btn.bMouseRightPressed)
{
static const wchar_t *PWSZ_BLACKLIST_RIGHTCLICK[] = { L"Remove from blacklist" };
NeoUI::PopupMenu(PWSZ_BLACKLIST_RIGHTCLICK, ARRAYSIZE(PWSZ_BLACKLIST_RIGHTCLICK),
RightClickRetRemoveBlacklist, (void *)(this));
}
}

if (param.eMode == NeoUI::MODE_PAINT)
Expand Down Expand Up @@ -1397,9 +1521,16 @@ void CNeoRoot::MainLoopServerBrowser(const MainLoopParam param)
}

const auto btn = NeoUI::Button(L"");
if (btn.bPressed) // Dummy button, draw over it in paint
if (btn.bPressed || btn.bMouseRightPressed) // Dummy button, draw over it in paint
{
m_iSelectedServer = i;
if (btn.bMouseRightPressed)
{
const bool bIsFav = NetAdrIsFavorite(server.m_NetAdr);
pwszRightclickServer[RIGHTCLICKSERVER_FAV] = bIsFav ? L"Unfavorite" : L"Favorite";
NeoUI::PopupMenu(pwszRightclickServer, RIGHTCLICKSERVER__TOTAL,
RightClickRetServer, (void *)(this));
}
if (btn.bKeyPressed || btn.bMouseDoublePressed)
{
bEnterServer = true;
Expand Down Expand Up @@ -1900,23 +2031,53 @@ void CNeoRoot::MainLoopServerDetails(const MainLoopParam param)
{
m_state = STATE_SERVERBROWSER;
}
NeoUI::Pad();
if (NeoUI::Button(L"Blacklist").bPressed)
{
const netadr_t netAdr(gameServer->m_NetAdr.GetIP(), gameServer->m_NetAdr.GetConnectionPort());

ServerBlacklistInfo sbInfo = {};

g_pVGuiLocalize->ConvertANSIToUnicode(gameServer->GetName(), sbInfo.wszName, sizeof(sbInfo.wszName));
sbInfo.timeVal = time(nullptr);
sbInfo.netAdr = netAdr;
sbInfo.eType = SBLIST_TYPE_NETADR;
ServerBlacklistCacheWsz(&sbInfo);

g_blacklistedServers.AddToTail(sbInfo);

AddToBlacklist(gameServer);
m_state = STATE_SERVERBROWSER;
}
if (ISteamMatchmaking *smm = SteamMatchmaking())
{
// Check if matches the favorite detail cache we have
// if not, search through with GetFavoriteGame + GetFavoriteGameCount
const servernetadr_t &netAdr = gameServer->m_NetAdr;
if (m_favCacheNetAdr.GetIP() != netAdr.GetIP() ||
m_favCacheNetAdr.GetConnectionPort() != netAdr.GetConnectionPort() ||
m_favCacheNetAdr.GetQueryPort() != netAdr.GetQueryPort())
{
m_bFavCacheIsFav = NetAdrIsFavorite(netAdr);
m_favCacheNetAdr = netAdr;
}
if (m_bFavCacheIsFav)
{
if (NeoUI::Button(L"Unfavorite").bPressed)
{
smm->RemoveFavoriteGame(
engine->GetAppID(),
netAdr.GetIP(),
netAdr.GetConnectionPort(),
netAdr.GetQueryPort(),
k_unFavoriteFlagFavorite);
m_favCacheNetAdr = servernetadr_t{};
m_bAutoRefreshFav = true;
}
}
else
{
if (NeoUI::Button(L"Favorite").bPressed)
{
smm->AddFavoriteGame(
engine->GetAppID(),
netAdr.GetIP(),
netAdr.GetConnectionPort(),
netAdr.GetQueryPort(),
k_unFavoriteFlagFavorite,
0);
m_favCacheNetAdr = servernetadr_t{};
m_bAutoRefreshFav = true;
}
}
}
}
NeoUI::SwapFont(NeoUI::FONT_NTNORMAL);
}
Expand Down
13 changes: 13 additions & 0 deletions src/game/client/neo/ui/neo_root.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,19 @@ class CNeoRoot : public vgui::EditablePanel, public CGameEventListener
bool m_bSprayGalleryRefresh = false;
float m_flWideAs43 = 0.0f;
SprayInfo m_sprayToDelete = {};

servernetadr_t m_favCacheNetAdr = {};
bool m_bFavCacheIsFav = false;
bool m_bAutoRefreshFav = false;

enum ERightClickServer
{
RIGHTCLICKSERVER_FAV = 0,
RIGHTCLICKSERVER_BLACKLIST,

RIGHTCLICKSERVER__TOTAL,
};
const wchar_t *pwszRightclickServer[RIGHTCLICKSERVER__TOTAL] = { L"", L"Add to blacklist" };
};

extern CNeoRoot *g_pNeoRoot;
Loading