games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00
Code Issues Releases Activity

try to fix hotkeys

Browse Source
This commit is contained in:
AlexVinS 2014-05-23 21:29:43 +04:00 committed by AlexVinS
parent ac2896da42
commit 6474e37b76
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
client/gui/CGuiHandler.cpp
View File

@ -198,6 +198,9 @@ void CGuiHandler::handleEvent(SDL_Event *sEvent)
if(key.keysym.sym == SDLK_KP_ENTER) if(key.keysym.sym == SDLK_KP_ENTER)
{ {
key.keysym.sym = (SDLKey)SDLK_RETURN; key.keysym.sym = (SDLKey)SDLK_RETURN;
#ifndef VCMI_SDL1
key.keysym.scancode = SDL_SCANCODE_RETURN;
#endif // VCMI_SDL1
} }
bool keysCaptured = false; bool keysCaptured = false;
@ -391,8 +394,11 @@ void CGuiHandler::handleMoveInterested( const SDL_MouseMotionEvent & motion )
void CGuiHandler::fakeMouseMove() void CGuiHandler::fakeMouseMove()
{ {
SDL_Event evnt; SDL_Event evnt;
#ifdef VCMI_SDL1
SDL_MouseMotionEvent sme = {SDL_MOUSEMOTION, 0, 0, 0, 0, 0, 0}; SDL_MouseMotionEvent sme = {SDL_MOUSEMOTION, 0, 0, 0, 0, 0, 0};
#else
SDL_MouseMotionEvent sme = {SDL_MOUSEMOTION, 0, 0, 0, 0, 0, 0, 0, 0};
#endif
int x, y; int x, y;
sme.state = SDL_GetMouseState(&x, &y); sme.state = SDL_GetMouseState(&x, &y);
sme.x = x; sme.x = x;
@ -506,18 +512,27 @@ SDLKey CGuiHandler::numToDigit( SDLKey key )
#ifdef VCMI_SDL1 #ifdef VCMI_SDL1
if(key >= SDLK_KP0 && key <= SDLK_KP9) if(key >= SDLK_KP0 && key <= SDLK_KP9)
return SDLKey(key - SDLK_KP0 + SDLK_0); return SDLKey(key - SDLK_KP0 + SDLK_0);
#else
if(key >= SDLK_KP_0 && key <= SDLK_KP_9)
return SDLKey(key - SDLK_KP_0 + SDLK_0);
#endif // 0 #endif // 0
#define REMOVE_KP(keyName) case SDLK_KP_ ## keyName : return SDLK_ ## keyName; #define REMOVE_KP(keyName) case SDLK_KP_ ## keyName : return SDLK_ ## keyName;
switch(key) switch(key)
{ {
#ifndef VCMI_SDL1
REMOVE_KP(0)
REMOVE_KP(1)
REMOVE_KP(2)
REMOVE_KP(3)
REMOVE_KP(4)
REMOVE_KP(5)
REMOVE_KP(6)
REMOVE_KP(7)
REMOVE_KP(8)
REMOVE_KP(9)
#endif // VCMI_SDL1
REMOVE_KP(PERIOD) REMOVE_KP(PERIOD)
REMOVE_KP(MINUS) REMOVE_KP(MINUS)
REMOVE_KP(PLUS) REMOVE_KP(PLUS)
REMOVE_KP(EQUALS) REMOVE_KP(EQUALS)
case SDLK_KP_MULTIPLY: case SDLK_KP_MULTIPLY:
return SDLK_ASTERISK; return SDLK_ASTERISK;
@ -540,15 +555,19 @@ bool CGuiHandler::isNumKey( SDLKey key, bool number )
return key >= SDLK_KP0 && key <= SDLK_KP_EQUALS; return key >= SDLK_KP0 && key <= SDLK_KP_EQUALS;
#else #else
if(number) if(number)
return key >= SDLK_KP_0 && key <= SDLK_KP_9; return key >= SDLK_KP_1 && key <= SDLK_KP_0;
else else
return key >= SDLK_KP_0 && key <= SDLK_KP_EQUALS; return (key >= SDLK_KP_1 && key <= SDLK_KP_0) || key == SDLK_KP_MINUS || key == SDLK_KP_PLUS || key == SDLK_KP_EQUALS;
#endif // 0 #endif // 0
} }
bool CGuiHandler::isArrowKey( SDLKey key ) bool CGuiHandler::isArrowKey( SDLKey key )
{ {
#ifdef VCMI_SDL1
return key >= SDLK_UP && key <= SDLK_LEFT; return key >= SDLK_UP && key <= SDLK_LEFT;
#else
return key == SDLK_UP || key == SDLK_DOWN || key == SDLK_LEFT || key == SDLK_RIGHT;
#endif
} }
bool CGuiHandler::amIGuiThread() bool CGuiHandler::amIGuiThread()