mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-11 17:51:04 +00:00
Add support for Android 2.3+
There have been plenty of ppl involved in creating this version. I don't wanna mention names as I'm sure I'd forget someone so I just tell where help has been done: - The partial android versions done by various ppl - Testing on different android devices - reviewing code (especially the in core changes) - testing controls - reviewing texts A big thank you to everyone helping this to be completed!
This commit is contained in:
sapier
parent
ff36071d93
commit
1cc40c0a7c
66 changed files with 4425 additions and 162 deletions
|
|
@ -88,6 +88,9 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
|
|||
m_ext_ptr(ext_ptr),
|
||||
m_font(dev->getGUIEnvironment()->getSkin()->getFont()),
|
||||
m_formspec_version(0)
|
||||
#ifdef __ANDROID__
|
||||
,m_JavaDialogFieldName(L"")
|
||||
#endif
|
||||
{
|
||||
current_keys_pending.key_down = false;
|
||||
current_keys_pending.key_up = false;
|
||||
|
|
@ -1878,6 +1881,52 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
|
|||
setInitialFocus();
|
||||
}
|
||||
|
||||
#ifdef __ANDROID__
|
||||
bool GUIFormSpecMenu::getAndroidUIInput()
|
||||
{
|
||||
/* no dialog shown */
|
||||
if (m_JavaDialogFieldName == L"") {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* still waiting */
|
||||
if (porting::getInputDialogState() == -1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
std::wstring fieldname = m_JavaDialogFieldName;
|
||||
m_JavaDialogFieldName = L"";
|
||||
|
||||
/* no value abort dialog processing */
|
||||
if (porting::getInputDialogState() != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
|
||||
iter != m_fields.end(); iter++) {
|
||||
|
||||
if (iter->fname != fieldname) {
|
||||
continue;
|
||||
}
|
||||
IGUIElement* tochange = getElementFromId(iter->fid);
|
||||
|
||||
if (tochange == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (tochange->getType() != irr::gui::EGUIET_EDIT_BOX) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string text = porting::getInputDialogValue();
|
||||
|
||||
((gui::IGUIEditBox*) tochange)->
|
||||
setText(narrow_to_wide(text).c_str());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
GUIFormSpecMenu::ItemSpec GUIFormSpecMenu::getItemAtPos(v2s32 p) const
|
||||
{
|
||||
core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
|
||||
|
|
@ -1886,8 +1935,7 @@ GUIFormSpecMenu::ItemSpec GUIFormSpecMenu::getItemAtPos(v2s32 p) const
|
|||
{
|
||||
const ListDrawSpec &s = m_inventorylists[i];
|
||||
|
||||
for(s32 i=0; i<s.geom.X*s.geom.Y; i++)
|
||||
{
|
||||
for(s32 i=0; i<s.geom.X*s.geom.Y; i++) {
|
||||
s32 item_i = i + s.start_item_i;
|
||||
s32 x = (i%s.geom.X) * spacing.X;
|
||||
s32 y = (i/s.geom.X) * spacing.Y;
|
||||
|
|
@ -2051,8 +2099,6 @@ void GUIFormSpecMenu::drawMenu()
|
|||
}
|
||||
}
|
||||
|
||||
m_pointer = m_device->getCursorControl()->getPosition();
|
||||
|
||||
updateSelectedItem();
|
||||
|
||||
gui::IGUISkin* skin = Environment->getSkin();
|
||||
|
|
@ -2195,6 +2241,11 @@ void GUIFormSpecMenu::drawMenu()
|
|||
*/
|
||||
gui::IGUIElement::draw();
|
||||
|
||||
/* TODO find way to show tooltips on touchscreen */
|
||||
#ifndef HAVE_TOUCHSCREENGUI
|
||||
m_pointer = m_device->getCursorControl()->getPosition();
|
||||
#endif
|
||||
|
||||
/*
|
||||
Draw fields/buttons tooltips
|
||||
*/
|
||||
|
|
@ -2491,7 +2542,8 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
|
|||
// Fix Esc/Return key being eaten by checkboxen and tables
|
||||
if(event.EventType==EET_KEY_INPUT_EVENT) {
|
||||
KeyPress kp(event.KeyInput);
|
||||
if (kp == EscapeKey || kp == getKeySetting("keymap_inventory")
|
||||
if (kp == EscapeKey || kp == CancelKey
|
||||
|| kp == getKeySetting("keymap_inventory")
|
||||
|| event.KeyInput.Key==KEY_RETURN) {
|
||||
gui::IGUIElement *focused = Environment->getFocus();
|
||||
if (focused && isMyChild(focused) &&
|
||||
|
|
@ -2533,6 +2585,156 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef __ANDROID__
|
||||
// display software keyboard when clicking edit boxes
|
||||
if (event.EventType == EET_MOUSE_INPUT_EVENT
|
||||
&& event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
|
||||
gui::IGUIElement *hovered =
|
||||
Environment->getRootGUIElement()->getElementFromPoint(
|
||||
core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
|
||||
if ((hovered) && (hovered->getType() == irr::gui::EGUIET_EDIT_BOX)) {
|
||||
bool retval = hovered->OnEvent(event);
|
||||
if (retval) {
|
||||
Environment->setFocus(hovered);
|
||||
}
|
||||
m_JavaDialogFieldName = getNameByID(hovered->getID());
|
||||
std::string message = gettext("Enter ");
|
||||
std::string label = wide_to_narrow(getLabelByID(hovered->getID()));
|
||||
if (label == "") {
|
||||
label = "text";
|
||||
}
|
||||
message += gettext(label) + ":";
|
||||
|
||||
/* single line text input */
|
||||
int type = 2;
|
||||
|
||||
/* multi line text input */
|
||||
if (((gui::IGUIEditBox*) hovered)->isMultiLineEnabled()) {
|
||||
type = 1;
|
||||
}
|
||||
|
||||
/* passwords are always single line */
|
||||
if (((gui::IGUIEditBox*) hovered)->isPasswordBox()) {
|
||||
type = 3;
|
||||
}
|
||||
|
||||
porting::showInputDialog(gettext("ok"), "",
|
||||
wide_to_narrow(((gui::IGUIEditBox*) hovered)->getText()),
|
||||
type);
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
||||
if (event.EventType == EET_TOUCH_INPUT_EVENT)
|
||||
{
|
||||
SEvent translated;
|
||||
memset(&translated, 0, sizeof(SEvent));
|
||||
translated.EventType = EET_MOUSE_INPUT_EVENT;
|
||||
gui::IGUIElement* root = Environment->getRootGUIElement();
|
||||
|
||||
if (!root) {
|
||||
errorstream
|
||||
<< "GUIFormSpecMenu::preprocessEvent unable to get root element"
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
gui::IGUIElement* hovered = root->getElementFromPoint(
|
||||
core::position2d<s32>(
|
||||
event.TouchInput.X,
|
||||
event.TouchInput.Y));
|
||||
|
||||
translated.MouseInput.X = event.TouchInput.X;
|
||||
translated.MouseInput.Y = event.TouchInput.Y;
|
||||
translated.MouseInput.Control = false;
|
||||
|
||||
bool dont_send_event = false;
|
||||
|
||||
if (event.TouchInput.touchedCount == 1) {
|
||||
switch (event.TouchInput.Event) {
|
||||
case ETIE_PRESSED_DOWN:
|
||||
m_pointer = v2s32(event.TouchInput.X,event.TouchInput.Y);
|
||||
translated.MouseInput.Event = EMIE_LMOUSE_PRESSED_DOWN;
|
||||
translated.MouseInput.ButtonStates = EMBSM_LEFT;
|
||||
m_down_pos = m_pointer;
|
||||
break;
|
||||
case ETIE_MOVED:
|
||||
m_pointer = v2s32(event.TouchInput.X,event.TouchInput.Y);
|
||||
translated.MouseInput.Event = EMIE_MOUSE_MOVED;
|
||||
translated.MouseInput.ButtonStates = EMBSM_LEFT;
|
||||
break;
|
||||
case ETIE_LEFT_UP:
|
||||
translated.MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
|
||||
translated.MouseInput.ButtonStates = 0;
|
||||
hovered = root->getElementFromPoint(m_down_pos);
|
||||
/* we don't have a valid pointer element use last
|
||||
* known pointer pos */
|
||||
translated.MouseInput.X = m_pointer.X;
|
||||
translated.MouseInput.Y = m_pointer.Y;
|
||||
|
||||
/* reset down pos */
|
||||
m_down_pos = v2s32(0,0);
|
||||
break;
|
||||
default:
|
||||
dont_send_event = true;
|
||||
//this is not supposed to happen
|
||||
errorstream
|
||||
<< "GUIFormSpecMenu::preprocessEvent unexpected usecase Event="
|
||||
<< event.TouchInput.Event << std::endl;
|
||||
}
|
||||
} else if ( (event.TouchInput.touchedCount == 2) &&
|
||||
(event.TouchInput.Event == ETIE_PRESSED_DOWN) ) {
|
||||
hovered = root->getElementFromPoint(m_down_pos);
|
||||
|
||||
translated.MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
|
||||
translated.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT;
|
||||
translated.MouseInput.X = m_pointer.X;
|
||||
translated.MouseInput.Y = m_pointer.Y;
|
||||
|
||||
if (hovered) {
|
||||
hovered->OnEvent(translated);
|
||||
}
|
||||
|
||||
translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
|
||||
translated.MouseInput.ButtonStates = EMBSM_LEFT;
|
||||
|
||||
|
||||
if (hovered) {
|
||||
hovered->OnEvent(translated);
|
||||
}
|
||||
dont_send_event = true;
|
||||
}
|
||||
/* ignore unhandled 2 touch events ... accidental moving for example */
|
||||
else if (event.TouchInput.touchedCount == 2) {
|
||||
dont_send_event = true;
|
||||
}
|
||||
else if (event.TouchInput.touchedCount > 2) {
|
||||
errorstream
|
||||
<< "GUIFormSpecMenu::preprocessEvent to many multitouch events "
|
||||
<< event.TouchInput.touchedCount << " ignoring them" << std::endl;
|
||||
}
|
||||
|
||||
if (dont_send_event) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* check if translated event needs to be preprocessed again */
|
||||
if (preprocessEvent(translated)) {
|
||||
return true;
|
||||
}
|
||||
if (hovered) {
|
||||
grab();
|
||||
bool retval = hovered->OnEvent(translated);
|
||||
|
||||
if (event.TouchInput.Event == ETIE_LEFT_UP) {
|
||||
/* reset pointer */
|
||||
m_pointer = v2s32(0,0);
|
||||
}
|
||||
drop();
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -2584,8 +2786,8 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
{
|
||||
if(event.EventType==EET_KEY_INPUT_EVENT) {
|
||||
KeyPress kp(event.KeyInput);
|
||||
if (event.KeyInput.PressedDown && (kp == EscapeKey ||
|
||||
kp == getKeySetting("keymap_inventory"))) {
|
||||
if (event.KeyInput.PressedDown && ( (kp == EscapeKey) ||
|
||||
(kp == getKeySetting("keymap_inventory")) || (kp == CancelKey))) {
|
||||
if (m_allowclose) {
|
||||
doPause = false;
|
||||
acceptInput(quit_mode_cancel);
|
||||
|
|
@ -3015,6 +3217,38 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
return Parent ? Parent->OnEvent(event) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* get name of element by element id
|
||||
* @param id of element
|
||||
* @return name string or empty string
|
||||
*/
|
||||
std::wstring GUIFormSpecMenu::getNameByID(s32 id)
|
||||
{
|
||||
for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
|
||||
iter != m_fields.end(); iter++) {
|
||||
if (iter->fid == id) {
|
||||
return iter->fname;
|
||||
}
|
||||
}
|
||||
return L"";
|
||||
}
|
||||
|
||||
/**
|
||||
* get label of element by id
|
||||
* @param id of element
|
||||
* @return label string or empty string
|
||||
*/
|
||||
std::wstring GUIFormSpecMenu::getLabelByID(s32 id)
|
||||
{
|
||||
for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
|
||||
iter != m_fields.end(); iter++) {
|
||||
if (iter->fid == id) {
|
||||
return iter->flabel;
|
||||
}
|
||||
}
|
||||
return L"";
|
||||
}
|
||||
|
||||
bool GUIFormSpecMenu::parseColor(const std::string &value, video::SColor &color,
|
||||
bool quiet)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue