edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor console completion input handling according to upstream

Browse source
This commit is contained in:
Robert Müller 2022-08-09 17:40:16 +02:00
parent f3eb93b83a
commit 047c88d797
2 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/game/client/components/console.cpp
View file

@ -94,10 +94,8 @@ CGameConsole::CInstance::CInstance(int Type)
} }
m_aCompletionBuffer[0] = 0; m_aCompletionBuffer[0] = 0;
m_CompletionUsed = false;
m_CompletionChosen = -1; m_CompletionChosen = -1;
m_CompletionRenderOffset = 0.0f; Reset();
m_ReverseTAB = false;
m_aUser[0] = '\0'; m_aUser[0] = '\0';
m_UserGot = false; m_UserGot = false;
@ -137,6 +135,11 @@ void CGameConsole::CInstance::ClearHistory()
m_pHistoryEntry = 0; m_pHistoryEntry = 0;
} }
void CGameConsole::CInstance::Reset()
{
m_CompletionRenderOffset = 0.0f;
}
void CGameConsole::CInstance::ExecuteLine(const char *pLine) void CGameConsole::CInstance::ExecuteLine(const char *pLine)
{ {
if(m_Type == CGameConsole::CONSOLETYPE_LOCAL) if(m_Type == CGameConsole::CONSOLETYPE_LOCAL)
@ -330,18 +333,20 @@ void CGameConsole::CInstance::OnInput(IInput::CEvent Event)
{ {
if(m_Type == CGameConsole::CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed()) if(m_Type == CGameConsole::CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
{ {
if(m_ReverseTAB && m_CompletionUsed) const int Direction = m_pGameConsole->m_pClient->Input()->KeyIsPressed(KEY_LSHIFT) || m_pGameConsole->m_pClient->Input()->KeyIsPressed(KEY_RSHIFT) ? -1 : 1;
m_CompletionChosen--; const bool UseTempCommands = m_Type == CGameConsole::CONSOLETYPE_REMOTE && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands();
else if(!m_ReverseTAB) const int CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands);
m_CompletionChosen++; if(CompletionEnumerationCount)
int CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, m_Type != CGameConsole::CONSOLETYPE_LOCAL && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands(), PossibleCommandsCompleteCallback, this);
m_CompletionUsed = true;
// handle wrapping
if(CompletionEnumerationCount && (m_CompletionChosen >= CompletionEnumerationCount || m_CompletionChosen < 0))
{ {
m_CompletionChosen = (m_CompletionChosen + CompletionEnumerationCount) % CompletionEnumerationCount; if(m_CompletionChosen == -1 && Direction < 0)
m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, m_Type != CGameConsole::CONSOLETYPE_LOCAL && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands(), PossibleCommandsCompleteCallback, this); m_CompletionChosen = 0;
m_CompletionChosen = (m_CompletionChosen + Direction + CompletionEnumerationCount) % CompletionEnumerationCount;
m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands, PossibleCommandsCompleteCallback, this);
}
else if(m_CompletionChosen != -1)
{
m_CompletionChosen = -1;
Reset();
} }
} }
} }
@ -369,16 +374,6 @@ void CGameConsole::CInstance::OnInput(IInput::CEvent Event)
m_BacklogCurPage = 0; m_BacklogCurPage = 0;
m_pGameConsole->m_HasSelection = false; m_pGameConsole->m_HasSelection = false;
} }
else if(Event.m_Key == KEY_LSHIFT)
{
m_ReverseTAB = true;
Handled = true;
}
}
if(Event.m_Flags & IInput::FLAG_RELEASE && Event.m_Key == KEY_LSHIFT)
{
m_ReverseTAB = false;
Handled = true;
} }
if(!Handled) if(!Handled)
@ -386,17 +381,17 @@ void CGameConsole::CInstance::OnInput(IInput::CEvent Event)
if(Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_TEXT)) if(Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_TEXT))
{ {
if((Event.m_Key != KEY_TAB) && (Event.m_Key != KEY_LSHIFT)) if(Event.m_Key != KEY_TAB && Event.m_Key != KEY_LSHIFT && Event.m_Key != KEY_RSHIFT)
{ {
m_CompletionUsed = false;
m_CompletionChosen = -1; m_CompletionChosen = -1;
str_copy(m_aCompletionBuffer, m_Input.GetString()); str_copy(m_aCompletionBuffer, m_Input.GetString());
m_CompletionRenderOffset = 0.0f;
Reset();
} }
// find the current command // find the current command
{ {
char aBuf[64] = {0}; char aBuf[sizeof(m_aCommandName)] = {0};
const char *pSrc = GetString(); const char *pSrc = GetString();
int i = 0; int i = 0;
for(; i < (int)sizeof(aBuf) - 1 && *pSrc && *pSrc != ' '; i++, pSrc++) for(; i < (int)sizeof(aBuf) - 1 && *pSrc && *pSrc != ' '; i++, pSrc++)
@ -463,6 +458,7 @@ CGameConsole::CInstance *CGameConsole::CurrentConsole()
void CGameConsole::OnReset() void CGameConsole::OnReset()
{ {
m_RemoteConsole.Reset();
} }
// only defined for 0<=t<=1 // only defined for 0<=t<=1
@ -622,7 +618,7 @@ void CGameConsole::OnRender()
CRenderInfo Info; CRenderInfo Info;
Info.m_pSelf = this; Info.m_pSelf = this;
Info.m_WantedCompletion = pConsole->m_CompletionUsed ? pConsole->m_CompletionChosen : -1; Info.m_WantedCompletion = pConsole->m_CompletionChosen;
Info.m_EnumCount = 0; Info.m_EnumCount = 0;
Info.m_Offset = pConsole->m_CompletionRenderOffset; Info.m_Offset = pConsole->m_CompletionRenderOffset;
Info.m_Width = Screen.w; Info.m_Width = Screen.w;

3
src/game/client/components/console.h
View file

@ -45,11 +45,9 @@ class CGameConsole : public CComponent
CGameConsole *m_pGameConsole; CGameConsole *m_pGameConsole;
char m_aCompletionBuffer[128]; char m_aCompletionBuffer[128];
bool m_CompletionUsed;
int m_CompletionChosen; int m_CompletionChosen;
int m_CompletionFlagmask; int m_CompletionFlagmask;
float m_CompletionRenderOffset; float m_CompletionRenderOffset;
bool m_ReverseTAB;
char m_aUser[32]; char m_aUser[32];
bool m_UserGot; bool m_UserGot;
@ -66,6 +64,7 @@ class CGameConsole : public CComponent
void ClearBacklog(); void ClearBacklog();
void ClearBacklogYOffsets(); void ClearBacklogYOffsets();
void ClearHistory(); void ClearHistory();
void Reset();
void ExecuteLine(const char *pLine); void ExecuteLine(const char *pLine);