reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

Add tab completion support in launcher. (#393)

Browse Source 
Add tab completion support in launcher.
This commit is contained in:
Chuvi 2017-03-10 01:15:08 +03:00 committed by Lev
parent fb0c81aec9
commit 08825fdf0d
6 changed files with 97 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
rehlds/common/textconsole.cpp
View File

@ -130,13 +130,22 @@ void CTextConsole::ReceiveBackspace()
void CTextConsole::ReceiveTab()
{
#ifndef LAUNCHER_FIXES
if (!m_System)
return;
#else
if (!rehldsFuncs || !m_nConsoleTextLen)
{
return;
}
#endif
ObjectList matches;
m_szConsoleText[ m_nConsoleTextLen ] = '\0';
#ifndef LAUNCHER_FIXES
m_System->GetCommandMatches(m_szConsoleText, &matches);
#else
rehldsFuncs->GetCommandMatches(m_szConsoleText, &matches);
#endif
if (matches.IsEmpty())
return;
@ -159,15 +168,26 @@ void CTextConsole::ReceiveTab()
else
{
int nLongestCmd = 0;
int nSmallestCmd = 0;
int nCurrentColumn;
int nTotalColumns;
char szCommonCmd[256];//Should be enough.
char szFormatCmd[256];
char *pszSmallestCmd;
char *pszCurrentCmd = (char *)matches.GetFirst();
nSmallestCmd = strlen(pszCurrentCmd);
pszSmallestCmd = pszCurrentCmd;
while (pszCurrentCmd)
{
if ((int)strlen(pszCurrentCmd) > nLongestCmd)
{
nLongestCmd = strlen(pszCurrentCmd);
}
if ((int)strlen(pszCurrentCmd) < nSmallestCmd)
{
nSmallestCmd = strlen(pszCurrentCmd);
pszSmallestCmd = pszCurrentCmd;
}
pszCurrentCmd = (char *)matches.GetNext();
}
@ -175,13 +195,11 @@ void CTextConsole::ReceiveTab()
nCurrentColumn = 0;
Echo("\n");
Q_strcpy(szCommonCmd, pszSmallestCmd);
// Would be nice if these were sorted, but not that big a deal
pszCurrentCmd = (char *)matches.GetFirst();
while (pszCurrentCmd)
{
char szFormatCmd[256];
if (++nCurrentColumn > nTotalColumns)
{
Echo("\n");
@ -190,17 +208,25 @@ void CTextConsole::ReceiveTab()
_snprintf(szFormatCmd, sizeof(szFormatCmd), "%-*s ", nLongestCmd, pszCurrentCmd);
Echo(szFormatCmd);
for (char *pCur = pszCurrentCmd, *pCommon = szCommonCmd; (*pCur&&*pCommon); pCur++, pCommon++)
{
if (*pCur != *pCommon)
{
*pCommon = 0;
break;
}
}
pszCurrentCmd = (char *)matches.GetNext();
}
Echo("\n");
Echo(m_szConsoleText);
if (Q_strcmp(szCommonCmd, m_szConsoleText))
{
Q_strcpy(m_szConsoleText, szCommonCmd);
m_nConsoleTextLen = Q_strlen(szCommonCmd);
}
// TODO:
// Tack on 'common' chars in all the matches, i.e. if I typed 'con' and all the
// matches begin with 'connect_' then print the matches but also complete the
// command up to that point at least.
Echo(m_szConsoleText);
}
m_nCursorPosition = m_nConsoleTextLen;

5
rehlds/dedicated/src/dedicated.h
View File

@ -9,5 +9,8 @@ typedef void (*SleepType)(int msec);
extern bool g_bVGui;
extern IDedicatedServerAPI *engineAPI;
#ifdef LAUNCHER_FIXES
extern IRehldsApi *rehldsApi;
extern const RehldsFuncs_t* rehldsFuncs;
#endif
#endif // DEDICATED_H

6
rehlds/dedicated/src/precompiled.h
View File

@ -12,6 +12,12 @@
#include "idedicatedexports.h"
#include "icommandline.h"
#ifdef LAUNCHER_FIXES
struct DLL_FUNCTIONS;
#include "cvardef.h"
#include "rehlds_api.h"
#endif
#include "sys_ded.h"
#include "icommandline.h"
#include "textconsole.h"

21
rehlds/dedicated/src/sys_ded.cpp
View File

@ -8,6 +8,10 @@ bool gbAppHasBeenTerminated = false;
CSysModule *g_pEngineModule = nullptr;
IDedicatedServerAPI *engineAPI = nullptr;
#ifdef LAUNCHER_FIXES
IRehldsApi *rehldsApi = nullptr;
const RehldsFuncs_t* rehldsFuncs = nullptr;
#endif
IFileSystem *g_pFileSystemInterface = nullptr;
CSysModule *g_pFileSystemModule = nullptr;
@ -92,8 +96,23 @@ int RunServer()
RunVGUIFrame();
if (engineFactory)
{
engineAPI = (IDedicatedServerAPI *)engineFactory(VENGINE_HLDS_API_VERSION, NULL);
#ifdef LAUNCHER_FIXES
rehldsApi = (IRehldsApi *)engineFactory(VREHLDS_HLDS_API_VERSION, NULL);
if (rehldsApi)
{
if (rehldsApi->GetMajorVersion() != REHLDS_API_VERSION_MAJOR || rehldsApi->GetMinorVersion() < REHLDS_API_VERSION_MINOR)
{
rehldsApi = nullptr;
}
else
{
rehldsFuncs = rehldsApi->GetFuncs();
}
}
#endif
}
RunVGUIFrame();
if (!engineAPI)
return -1;

4
rehlds/public/rehlds/rehlds_api.h
View File

@ -33,9 +33,10 @@
#include "FlightRecorder.h"
#include "interface.h"
#include "model.h"
#include "ObjectList.h"
#define REHLDS_API_VERSION_MAJOR 3
#define REHLDS_API_VERSION_MINOR 1
#define REHLDS_API_VERSION_MINOR 2
//Steam_NotifyClientConnect hook
typedef IHookChain<qboolean, IGameClient*, const void*, unsigned int> IRehldsHook_Steam_NotifyClientConnect;
@ -283,6 +284,7 @@ struct RehldsFuncs_t {
void(*SV_UpdateUserInfo)(IGameClient *pGameClient);
bool(*StripUnprintableAndSpace)(char *pch);
void(*Cmd_RemoveCmd)(const char *cmd_name);
void(*GetCommandMatches)(const char *string, ObjectList *pMatchList);
};
class IRehldsApi {

26
rehlds/rehlds/rehlds_api_impl.cpp
View File

@ -158,6 +158,29 @@ void EXT_FUNC Rehlds_RegisterPluginApi(const char *name, void *impl) {
api->impl = impl;
}
void EXT_FUNC GetCommandMatches_api(const char *string, ObjectList *pMatchList)
{
if (!string || !string[0])
{
return;
}
auto TextLen = Q_strlen(string);
for (auto EngCmd = Cmd_GetFirstCmd(); EngCmd; EngCmd = EngCmd->next)
{
if (!Q_strnicmp(EngCmd->name, string, TextLen))
{
pMatchList->Add((void*)(EngCmd->name));
}
}
for (auto EngCvar = GetCvarVars_api(); EngCvar; EngCvar = EngCvar->next)
{
if (!Q_strnicmp(EngCvar->name, string, TextLen))
{
pMatchList->Add((void*)(EngCvar->name));
}
}
}
CRehldsServerStatic g_RehldsServerStatic;
CRehldsServerData g_RehldsServerData;
CRehldsHookchains g_RehldsHookchains;
@ -211,7 +234,8 @@ RehldsFuncs_t g_RehldsApiFuncs =
&SV_EmitSound2_api,
&SV_UpdateUserInfo_api,
&StripUnprintableAndSpace_api,
&Cmd_RemoveCmd
&Cmd_RemoveCmd,
&GetCommandMatches_api
};
bool EXT_FUNC SV_EmitSound2_internal(edict_t *entity, IGameClient *pReceiver, int channel, const char *sample, float volume, float attenuation, int flags, int pitch, int emitFlags, const float *pOrigin)