griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Input GUI object cleanup.

Browse Source 
Remove redundant if-statement following 5593f573f4 as reported by
Vladislav.
Use switch-statement in ManuallyHandleEvent.

This was SVN commit r20078.
This commit is contained in:
elexis 2017-08-30 12:01:17 +00:00
parent ee38f0db37
commit a5c60619e2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/gui/CInput.cpp
View File

@ -96,7 +96,9 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
{
ENSURE(m_iBufferPos != -1);
if (ev->ev.type == SDL_HOTKEYDOWN)
switch (ev->ev.type)
{
case SDL_HOTKEYDOWN:
{
if (m_ComposingText)
return IN_HANDLED;
@ -105,7 +107,7 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
}
// SDL2 has a new method of text input that better supports Unicode and CJK
// see https://wiki.libsdl.org/Tutorials/TextInput
else if (ev->ev.type == SDL_TEXTINPUT)
case SDL_TEXTINPUT:
{
if (m_Readonly)
return IN_PASS;
@ -140,7 +142,7 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
return IN_HANDLED;
}
else if (ev->ev.type == SDL_TEXTEDITING)
case SDL_TEXTEDITING:
{
if (m_Readonly)
return IN_PASS;
@ -189,7 +191,7 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
return IN_HANDLED;
}
else if (ev->ev.type == SDL_KEYDOWN)
case SDL_KEYDOWN:
{
if (m_ComposingText)
return IN_HANDLED;
@ -198,10 +200,7 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
// in Unicode (CStrW), we'll simply retrieve the actual
// pointer and edit that.
CStrW* pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
SDL_Keycode keyCode = 0;
if (ev->ev.type == SDL_KEYDOWN)
keyCode = ev->ev.key.keysym.sym;
SDL_Keycode keyCode = ev->ev.key.keysym.sym;
ManuallyImmutableHandleKeyDownEvent(keyCode, pCaption);
ManuallyMutableHandleKeyDownEvent(keyCode, pCaption);
@ -209,8 +208,11 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
UpdateBufferPositionSetting();
return IN_HANDLED;
}
return IN_PASS;
default:
{
return IN_PASS;
}
}
}
void CInput::ManuallyMutableHandleKeyDownEvent(const SDL_Keycode keyCode, CStrW* pCaption)