games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-02 22:05:43 +02:00
Code Issues Releases Activity

split massive handleCurrentEvent method into per-event parts

Browse Source
This commit is contained in:
Ivan Savenko 2023-05-17 17:16:09 +03:00
parent cb4cf224a9
commit 008a1ebec4
2 changed files with 178 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
client/gui/CGuiHandler.cpp
View File

@ -295,13 +295,42 @@ void CGuiHandler::fakeMouseButtonEventRelativeMode(bool down, bool right)
void CGuiHandler::handleCurrentEvent( SDL_Event & current ) void CGuiHandler::handleCurrentEvent( SDL_Event & current )
{ {
if(current.type == SDL_KEYDOWN || current.type == SDL_KEYUP) switch (current.type)
{ {
case SDL_KEYDOWN:
return handleEventKeyDown(current);
case SDL_KEYUP:
return handleEventKeyUp(current);
case SDL_MOUSEMOTION:
return handleEventMouseMotion(current);
case SDL_MOUSEBUTTONDOWN:
return handleEventMouseButtonDown(current);
case SDL_MOUSEWHEEL:
return handleEventMouseWheel(current);
case SDL_TEXTINPUT:
return handleEventTextInput(current);
case SDL_TEXTEDITING:
return handleEventTextEditing(current);
case SDL_MOUSEBUTTONUP:
return handleEventMouseButtonUp(current);
case SDL_FINGERMOTION:
return handleEventFingerMotion(current);
case SDL_FINGERDOWN:
return handleEventFingerDown(current);
case SDL_FINGERUP:
return handleEventFingerUp(current);
}
}
void CGuiHandler::handleEventKeyDown(SDL_Event & current)
{
SDL_KeyboardEvent key = current.key; SDL_KeyboardEvent key = current.key;
if (key.repeat != 0) if(key.repeat != 0)
return; // ignore periodic event resends return; // ignore periodic event resends
assert(key.state == SDL_PRESSED);
if(current.type == SDL_KEYDOWN && key.keysym.sym >= SDLK_F1 && key.keysym.sym <= SDLK_F15 && settings["session"]["spectate"].Bool()) if(current.type == SDL_KEYDOWN && key.keysym.sym >= SDLK_F1 && key.keysym.sym <= SDLK_F15 && settings["session"]["spectate"].Bool())
{ {
//TODO: we need some central place for all interface-independent hotkeys //TODO: we need some central place for all interface-independent hotkeys
@ -328,15 +357,6 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
s["spectate-skip-battle-result"].Bool() = !settings["session"]["spectate-skip-battle-result"].Bool(); s["spectate-skip-battle-result"].Bool() = !settings["session"]["spectate-skip-battle-result"].Bool();
break; break;
case SDLK_F9:
//not working yet since CClient::run remain locked after BattleInterface removal
// if(LOCPLINT->battleInt)
// {
// GH.windows().popInts(1);
// vstd::clear_pointer(LOCPLINT->battleInt);
// }
break;
default: default:
break; break;
} }
@ -347,38 +367,51 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
bool keysCaptured = false; bool keysCaptured = false;
for(auto i = keyinterested.begin(); i != keyinterested.end() && continueEventHandling; i++) for(auto i = keyinterested.begin(); i != keyinterested.end() && continueEventHandling; i++)
{ for(EShortcut shortcut : shortcutsVector)
for (EShortcut shortcut : shortcutsVector)
{
if((*i)->captureThisKey(shortcut)) if((*i)->captureThisKey(shortcut))
{
keysCaptured = true; keysCaptured = true;
break;
}
}
}
std::list<CIntObject*> miCopy = keyinterested; std::list<CIntObject *> miCopy = keyinterested;
for(auto i = miCopy.begin(); i != miCopy.end() && continueEventHandling; i++) for(auto i = miCopy.begin(); i != miCopy.end() && continueEventHandling; i++)
{ for(EShortcut shortcut : shortcutsVector)
for (EShortcut shortcut : shortcutsVector) if(vstd::contains(keyinterested, *i) && (!keysCaptured || (*i)->captureThisKey(shortcut)))
{
if(vstd::contains(keyinterested,*i) && (!keysCaptured || (*i)->captureThisKey(shortcut)))
{
if (key.state == SDL_PRESSED)
(**i).keyPressed(shortcut); (**i).keyPressed(shortcut);
if (key.state == SDL_RELEASED) }
void CGuiHandler::handleEventKeyUp(SDL_Event & current)
{
SDL_KeyboardEvent key = current.key;
if(key.repeat != 0)
return; // ignore periodic event resends
assert(key.state == SDL_RELEASED);
auto shortcutsVector = shortcutsHandler().translateKeycode(key.keysym.sym);
bool keysCaptured = false;
for(auto i = keyinterested.begin(); i != keyinterested.end() && continueEventHandling; i++)
for(EShortcut shortcut : shortcutsVector)
if((*i)->captureThisKey(shortcut))
keysCaptured = true;
std::list<CIntObject *> miCopy = keyinterested;
for(auto i = miCopy.begin(); i != miCopy.end() && continueEventHandling; i++)
for(EShortcut shortcut : shortcutsVector)
if(vstd::contains(keyinterested, *i) && (!keysCaptured || (*i)->captureThisKey(shortcut)))
(**i).keyReleased(shortcut); (**i).keyReleased(shortcut);
} }
}
} void CGuiHandler::handleEventMouseMotion(SDL_Event & current)
} {
else if(current.type == SDL_MOUSEMOTION)
{
handleMouseMotion(current); handleMouseMotion(current);
} }
else if(current.type == SDL_MOUSEBUTTONDOWN)
{ void CGuiHandler::handleEventMouseButtonDown(SDL_Event & current)
{
switch(current.button.button) switch(current.button.button)
{ {
case SDL_BUTTON_LEFT: case SDL_BUTTON_LEFT:
@ -415,9 +448,10 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
default: default:
break; break;
} }
} }
else if(current.type == SDL_MOUSEWHEEL)
{ void CGuiHandler::handleEventMouseWheel(SDL_Event & current)
{
std::list<CIntObject*> hlp = wheelInterested; std::list<CIntObject*> hlp = wheelInterested;
for(auto i = hlp.begin(); i != hlp.end() && continueEventHandling; i++) for(auto i = hlp.begin(); i != hlp.end() && continueEventHandling; i++)
{ {
@ -427,23 +461,26 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
SDL_GetMouseState(&x, &y); SDL_GetMouseState(&x, &y);
(*i)->wheelScrolled(current.wheel.y < 0, (*i)->pos.isInside(x, y)); (*i)->wheelScrolled(current.wheel.y < 0, (*i)->pos.isInside(x, y));
} }
} }
else if(current.type == SDL_TEXTINPUT)
{ void CGuiHandler::handleEventTextInput(SDL_Event & current)
{
for(auto it : textInterested) for(auto it : textInterested)
{ {
it->textInputed(current.text.text); it->textInputed(current.text.text);
} }
} }
else if(current.type == SDL_TEXTEDITING)
{ void CGuiHandler::handleEventTextEditing(SDL_Event & current)
{
for(auto it : textInterested) for(auto it : textInterested)
{ {
it->textEdited(current.edit.text); it->textEdited(current.edit.text);
} }
} }
else if(current.type == SDL_MOUSEBUTTONUP)
{ void CGuiHandler::handleEventMouseButtonUp(SDL_Event & current)
{
if(!multifinger) if(!multifinger)
{ {
switch(current.button.button) switch(current.button.button)
@ -459,16 +496,18 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
break; break;
} }
} }
} }
else if(current.type == SDL_FINGERMOTION)
{ void CGuiHandler::handleEventFingerMotion(SDL_Event & current)
{
if(isPointerRelativeMode) if(isPointerRelativeMode)
{ {
fakeMoveCursor(current.tfinger.dx, current.tfinger.dy); fakeMoveCursor(current.tfinger.dx, current.tfinger.dy);
} }
} }
else if(current.type == SDL_FINGERDOWN)
{ void CGuiHandler::handleEventFingerDown(SDL_Event & current)
{
auto fingerCount = SDL_GetNumTouchFingers(current.tfinger.touchId); auto fingerCount = SDL_GetNumTouchFingers(current.tfinger.touchId);
multifinger = fingerCount > 1; multifinger = fingerCount > 1;
@ -490,9 +529,10 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
handleMouseButtonClick(rclickable, MouseButton::RIGHT, true); handleMouseButtonClick(rclickable, MouseButton::RIGHT, true);
} }
#endif //VCMI_IOS #endif //VCMI_IOS
} }
else if(current.type == SDL_FINGERUP)
{ void CGuiHandler::handleEventFingerUp(SDL_Event & current)
{
#ifndef VCMI_IOS #ifndef VCMI_IOS
auto fingerCount = SDL_GetNumTouchFingers(current.tfinger.touchId); auto fingerCount = SDL_GetNumTouchFingers(current.tfinger.touchId);
#endif //VCMI_IOS #endif //VCMI_IOS
@ -515,8 +555,7 @@ void CGuiHandler::handleCurrentEvent( SDL_Event & current )
multifinger = fingerCount != 0; multifinger = fingerCount != 0;
} }
#endif //VCMI_IOS #endif //VCMI_IOS
} }
} //event end
void CGuiHandler::handleMouseButtonClick(CIntObjectList & interestedObjs, MouseButton btn, bool isPressed) void CGuiHandler::handleMouseButtonClick(CIntObjectList & interestedObjs, MouseButton btn, bool isPressed)
{ {

12
client/gui/CGuiHandler.h
View File

@ -91,6 +91,18 @@ private:
void fakeMoveCursor(float dx, float dy); void fakeMoveCursor(float dx, float dy);
void fakeMouseButtonEventRelativeMode(bool down, bool right); void fakeMouseButtonEventRelativeMode(bool down, bool right);
void handleEventKeyDown(SDL_Event & current);
void handleEventKeyUp(SDL_Event & current);
void handleEventMouseMotion(SDL_Event & current);
void handleEventMouseButtonDown(SDL_Event & current);
void handleEventMouseWheel(SDL_Event & current);
void handleEventTextInput(SDL_Event & current);
void handleEventTextEditing(SDL_Event & current);
void handleEventMouseButtonUp(SDL_Event & current);
void handleEventFingerMotion(SDL_Event & current);
void handleEventFingerDown(SDL_Event & current);
void handleEventFingerUp(SDL_Event & current);
public: public:
void handleElementActivate(CIntObject * elem, ui16 activityFlag); void handleElementActivate(CIntObject * elem, ui16 activityFlag);
void handleElementDeActivate(CIntObject * elem, ui16 activityFlag); void handleElementDeActivate(CIntObject * elem, ui16 activityFlag);