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

Remove if nesting for compose keys in console

Browse source
This commit is contained in:
ChillerDragon 2019-04-09 12:11:29 +02:00
parent e9f8bd42b7
commit 0b18d6eb44
1 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,48 +109,45 @@ void CGameConsole::CInstance::OnInput(IInput::CEvent Event)
{
bool Handled = false;
if(m_pGameConsole->Input()->KeyIsPressed(KEY_LCTRL))
if(m_pGameConsole->Input()->KeyIsPressed(KEY_LCTRL) && m_pGameConsole->Input()->KeyPress(KEY_V))
{
if(m_pGameConsole->Input()->KeyPress(KEY_V))
const char *Text = m_pGameConsole->Input()->GetClipboardText();
if(Text)
{
const char *Text = m_pGameConsole->Input()->GetClipboardText();
if(Text)
char Line[256];
int i, Begin = 0;
for(i = 0; i < str_length(Text); i++)
{
char Line[256];
int i, Begin = 0;
for(i = 0; i < str_length(Text); i++)
if(Text[i] == '\n')
{
if(Text[i] == '\n')
if(i == Begin)
{
if(i == Begin)
{
Begin++;
continue;
}
int max = min(i - Begin + 1, (int)sizeof(Line));
str_copy(Line, Text + Begin, max);
Begin = i+1;
ExecuteLine(Line);
Begin++;
continue;
}
int max = min(i - Begin + 1, (int)sizeof(Line));
str_copy(Line, Text + Begin, max);
Begin = i+1;
ExecuteLine(Line);
}
int max = min(i - Begin + 1, (int)sizeof(Line));
str_copy(Line, Text + Begin, max);
Begin = i+1;
m_Input.Add(Line);
}
int max = min(i - Begin + 1, (int)sizeof(Line));
str_copy(Line, Text + Begin, max);
Begin = i+1;
m_Input.Add(Line);
}
else if(m_pGameConsole->Input()->KeyPress(KEY_C))
{
m_pGameConsole->Input()->SetClipboardText(m_Input.GetString());
}
else if(m_pGameConsole->Input()->KeyPress(KEY_A))
{
m_Input.SetCursorOffset(0);
}
else if(m_pGameConsole->Input()->KeyPress(KEY_E))
{
m_Input.SetCursorOffset(m_Input.GetLength());
}
}
else if(m_pGameConsole->Input()->KeyIsPressed(KEY_LCTRL) && m_pGameConsole->Input()->KeyPress(KEY_C))
{
m_pGameConsole->Input()->SetClipboardText(m_Input.GetString());
}
else if(m_pGameConsole->Input()->KeyIsPressed(KEY_LCTRL) && m_pGameConsole->Input()->KeyPress(KEY_A))
{
m_Input.SetCursorOffset(0);
}
else if(m_pGameConsole->Input()->KeyIsPressed(KEY_LCTRL) && m_pGameConsole->Input()->KeyPress(KEY_E))
{
m_Input.SetCursorOffset(m_Input.GetLength());
}
if(Event.m_Flags&IInput::FLAG_PRESS)