Preparation to convert start menus from mouse move input (which does not work at all with touch screen devices) to touch input: New function select_menuitem_by_touch(), to be used in the next commits: - modified: project/jni/application/opentyrian/src/menus.cpp - modified: project/jni/application/opentyrian/src/menus.h Inside #ifdef ANDROID: Disable mouse move input handling in JE_textMenuWait() - modified: project/jni/application/opentyrian/src/setup.cpp
105 lines
2.3 KiB
C++
105 lines
2.3 KiB
C++
/*
|
|
* OpenTyrian Classic: A modern cross-platform port of Tyrian
|
|
* Copyright (C) 2007-2009 The OpenTyrian Development Team
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#include "joystick.h"
|
|
#include "keyboard.h"
|
|
#include "network.h"
|
|
#include "nortvars.h"
|
|
#include "opentyr.h"
|
|
#include "mainint.h"
|
|
#include "mouse.h"
|
|
#include "setup.h"
|
|
#include "video.h"
|
|
|
|
#include "SDL.h"
|
|
|
|
void JE_textMenuWait( JE_word *waitTime, JE_boolean doGamma )
|
|
{
|
|
#ifdef MENU_SELECT_BY_MOUSE_MOVE
|
|
set_mouse_position(160, 100);
|
|
#endif
|
|
|
|
do
|
|
{
|
|
JE_showVGA();
|
|
|
|
push_joysticks_as_keyboard();
|
|
service_SDL_events(true);
|
|
|
|
if (doGamma)
|
|
JE_gammaCheck();
|
|
|
|
inputDetected = newkey | mousedown;
|
|
|
|
if (lastkey_sym == SDLK_SPACE)
|
|
{
|
|
lastkey_sym = SDLK_RETURN;
|
|
}
|
|
|
|
if (mousedown)
|
|
{
|
|
newkey = true;
|
|
lastkey_sym = SDLK_RETURN;
|
|
}
|
|
|
|
if (has_mouse && input_grabbed)
|
|
{
|
|
#ifdef MENU_SELECT_BY_MOUSE_MOVE
|
|
/* Whacky hack which changes menu selecton based on
|
|
* relative mouse movement does not work with touch
|
|
* when a touch tiggers a mousedown which gets mapped
|
|
* to SDLK_RETURN above */
|
|
if (abs(mouse_y - 100) > 10)
|
|
{
|
|
inputDetected = true;
|
|
if (mouse_y - 100 < 0)
|
|
{
|
|
lastkey_sym = SDLK_UP;
|
|
} else {
|
|
lastkey_sym = SDLK_DOWN;
|
|
}
|
|
newkey = true;
|
|
}
|
|
if (abs(mouse_x - 160) > 10)
|
|
{
|
|
inputDetected = true;
|
|
if (mouse_x - 160 < 0)
|
|
{
|
|
lastkey_sym = SDLK_LEFT;
|
|
} else {
|
|
lastkey_sym = SDLK_RIGHT;
|
|
}
|
|
newkey = true;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
NETWORK_KEEP_ALIVE();
|
|
|
|
SDL_Delay(16);
|
|
|
|
if (*waitTime > 0)
|
|
{
|
|
(*waitTime)--;
|
|
}
|
|
} while (!(inputDetected || *waitTime == 1 || haltGame));
|
|
}
|
|
|
|
// kate: tab-width 4; vim: set noet:
|