miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better support for hardware Ctrl/Shift keys and hardware mouse

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-03-12 22:49:48 +02:00
committed by pelya
parent eb6626d247
commit cdde929500
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/video/sdl_v.cpp
View File

@@ -601,6 +601,11 @@ int VideoDriver_SDL::PollEvent()
_right_button_clicked = true;
_right_button_down_pos.x = ev.motion.x;
_right_button_down_pos.y = ev.motion.y;
#ifdef __ANDROID__
// Right button click on Android - cancel whatever action we were doing
ResetObjectToPlace();
ToolbarSelectLastTool();
#endif
break;
case SDL_BUTTON_WHEELUP: _cursor.wheel--; break;
@@ -622,7 +627,7 @@ int VideoDriver_SDL::PollEvent()
#ifdef __ANDROID__
if (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON_RMASK) {
// Two-finger click - hacky way to determine if the right mouse button is already pressed without processing the left button event
// Cancel whatewer action we were doing, to allow two finger scrolling
// Cancel whatever action we were doing, to allow two finger scrolling
ResetObjectToPlace();
ToolbarSelectLastTool();
}
@@ -656,8 +661,22 @@ int VideoDriver_SDL::PollEvent()
WChar character;
uint keycode = ConvertSdlKeyIntoMy(&ev.key.keysym, &character);
HandleKeypress(keycode, character);
#ifdef __ANDROID__
if (ev.key.keysym.sym == SDLK_LCTRL || ev.key.keysym.sym == SDLK_RCTRL)
_ctrl_pressed = true;
if (ev.key.keysym.sym == SDLK_LSHIFT || ev.key.keysym.sym == SDLK_RSHIFT)
_shift_pressed = true;
#endif
}
break;
case SDL_KEYUP:
#ifdef __ANDROID__
if (ev.key.keysym.sym == SDLK_LCTRL || ev.key.keysym.sym == SDLK_RCTRL)
_ctrl_pressed = false;
if (ev.key.keysym.sym == SDLK_LSHIFT || ev.key.keysym.sym == SDLK_RSHIFT)
_shift_pressed = false;
#endif
break;
#ifndef __ANDROID__
case SDL_VIDEORESIZE: {
int w = max(ev.resize.w, 64);