Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved the behavior and consistency for the virtual keyboard when using non-standard keyboard mappings.

Browse source
This commit is contained in:
Leon Styhre 2022-06-10 19:28:01 +02:00
parent de747a932d
commit cfc9d54068
4 changed files with 83 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
es-core/src/components/TextEditComponent.cpp
View file

@ -22,6 +22,7 @@ TextEditComponent::TextEditComponent()
: mRenderer {Renderer::getInstance()} : mRenderer {Renderer::getInstance()}
, mFocused {false} , mFocused {false}
, mEditing {false} , mEditing {false}
, mMaskInput {true}
, mCursor {0} , mCursor {0}
, mBlinkTime {0} , mBlinkTime {0}
, mCursorRepeatDir {0} , mCursorRepeatDir {0}
@ -66,6 +67,9 @@ void TextEditComponent::setValue(const std::string& val)
void TextEditComponent::textInput(const std::string& text) void TextEditComponent::textInput(const std::string& text)
{ {
if (mMaskInput)
return;
if (mEditing) { if (mEditing) {
mBlinkTime = 0; mBlinkTime = 0;
mCursorRepeatDir = 0; mCursorRepeatDir = 0;
@ -114,38 +118,33 @@ void TextEditComponent::stopEditing()
{ {
SDL_StopTextInput(); SDL_StopTextInput();
mEditing = false; mEditing = false;
mMaskInput = false;
mCursorRepeatDir = 0; mCursorRepeatDir = 0;
updateHelpPrompts(); updateHelpPrompts();
} }
bool TextEditComponent::input(InputConfig* config, Input input) bool TextEditComponent::input(InputConfig* config, Input input)
{ {
bool const cursor_left = bool const cursorLeft {config->isMappedLike("left", input)};
(config->getDeviceId() != DEVICE_KEYBOARD && config->isMappedLike("left", input)) || bool const cursorRight {config->isMappedLike("right", input)};
(config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_LEFT); bool const cursorUp {config->isMappedLike("up", input)};
bool const cursor_right = bool const cursorDown {config->isMappedLike("down", input)};
(config->getDeviceId() != DEVICE_KEYBOARD && config->isMappedLike("right", input)) || bool const shoulderLeft {config->isMappedLike("leftshoulder", input)};
(config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_RIGHT); bool const shoulderRight {config->isMappedLike("rightshoulder", input)};
bool const cursor_up = bool const triggerLeft {config->isMappedLike("lefttrigger", input)};
(config->getDeviceId() != DEVICE_KEYBOARD && config->isMappedLike("up", input)) || bool const triggerRight {config->isMappedLike("righttrigger", input)};
(config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_UP);
bool const cursor_down =
(config->getDeviceId() != DEVICE_KEYBOARD && config->isMappedLike("down", input)) ||
(config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_DOWN);
bool const shoulder_left = (config->isMappedLike("leftshoulder", input));
bool const shoulder_right = (config->isMappedLike("rightshoulder", input));
bool const trigger_left = (config->isMappedLike("lefttrigger", input));
bool const trigger_right = (config->isMappedLike("righttrigger", input));
if (input.value == 0) { mMaskInput = true;
if (cursor_left || cursor_right || cursor_up || cursor_down || shoulder_left ||
shoulder_right | trigger_left || trigger_right) { if (cursorLeft || cursorRight || cursorUp || cursorDown || shoulderLeft ||
shoulderRight | triggerLeft || triggerRight) {
if (input.value == 0)
mCursorRepeatDir = 0; mCursorRepeatDir = 0;
}
return false;
} }
if (input.value == 0)
return false;
if ((config->isMappedTo("a", input) || if ((config->isMappedTo("a", input) ||
(config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_RETURN)) && (config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_RETURN)) &&
mFocused && !mEditing) { mFocused && !mEditing) {
@ -154,63 +153,64 @@ bool TextEditComponent::input(InputConfig* config, Input input)
} }
if (mEditing) { if (mEditing) {
if (config->getDeviceId() == DEVICE_KEYBOARD && input.id == SDLK_RETURN) { if (config->getDeviceId() == DEVICE_KEYBOARD) {
if (isMultiline()) // Special handling for keyboard input as the "A" and "B" buttons are overridden.
textInput("\n"); if (input.id == SDLK_RETURN) {
else if (isMultiline())
stopEditing(); textInput("\n");
else
stopEditing();
return true; return true;
}
else if (input.id == SDLK_DELETE) {
if (mCursor < static_cast<int>(mText.length())) {
// Fake as Backspace one char to the right.
mMaskInput = false;
moveCursor(1);
textInput("\b");
}
return true;
}
else if (input.id == SDLK_BACKSPACE) {
mMaskInput = false;
textInput("\b");
return true;
}
} }
if (cursor_left || cursor_right) { if (cursorLeft || cursorRight) {
mBlinkTime = 0; mBlinkTime = 0;
mCursorRepeatDir = cursor_left ? -1 : 1; mCursorRepeatDir = cursorLeft ? -1 : 1;
mCursorRepeatTimer = -(CURSOR_REPEAT_START_DELAY - CURSOR_REPEAT_SPEED); mCursorRepeatTimer = -(CURSOR_REPEAT_START_DELAY - CURSOR_REPEAT_SPEED);
moveCursor(mCursorRepeatDir); moveCursor(mCursorRepeatDir);
return false;
} }
// Stop editing and let the button down event be captured by the parent component. else if (cursorDown) {
else if (cursor_down) { // Stop editing and let the button down event be captured by the parent component.
stopEditing(); stopEditing();
return false; return false;
} }
else if (shoulder_left || shoulder_right) { else if (shoulderLeft) {
mBlinkTime = 0; mMaskInput = false;
mCursorRepeatDir = shoulder_left ? -10 : 10; textInput("\b");
mCursorRepeatTimer = -(CURSOR_REPEAT_START_DELAY - CURSOR_REPEAT_SPEED); return true;
moveCursor(mCursorRepeatDir);
} }
// Jump to beginning of text. else if (triggerLeft) {
else if (trigger_left) { // Jump to beginning of text.
mBlinkTime = 0; mBlinkTime = 0;
setCursor(0); setCursor(0);
return true;
} }
// Jump to end of text. else if (triggerRight) {
else if (trigger_right) { // Jump to end of text.
mBlinkTime = 0; mBlinkTime = 0;
setCursor(mText.length()); setCursor(mText.length());
return true;
} }
else if (config->getDeviceId() == DEVICE_KEYBOARD) {
switch (input.id) {
case SDLK_HOME: {
setCursor(0);
break;
}
case SDLK_END: {
setCursor(std::string::npos);
break;
}
case SDLK_DELETE: {
if (mCursor < static_cast<int>(mText.length())) {
// Fake as Backspace one char to the right.
moveCursor(1);
textInput("\b");
}
break;
}
}
}
// Consume all input when editing text. // Consume all input when editing text.
mMaskInput = false;
return true; return true;
} }

2
es-core/src/components/TextEditComponent.h
View file

@ -42,6 +42,7 @@ public:
std::shared_ptr<Font> getFont() const override { return mFont; } std::shared_ptr<Font> getFont() const override { return mFont; }
void setCursor(size_t pos); void setCursor(size_t pos);
void setMaskInput(bool state) { mMaskInput = state; }
std::vector<HelpPrompt> getHelpPrompts() override; std::vector<HelpPrompt> getHelpPrompts() override;
@ -61,6 +62,7 @@ private:
std::string mTextOrig; std::string mTextOrig;
bool mFocused; bool mFocused;
bool mEditing; bool mEditing;
bool mMaskInput;
int mCursor; // Cursor position in characters. int mCursor; // Cursor position in characters.
int mBlinkTime; int mBlinkTime;

16
es-core/src/guis/GuiTextEditKeyboardPopup.cpp
View file

@ -340,15 +340,13 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input)
mNavigationRepeatDirY = 0; mNavigationRepeatDirY = 0;
} }
// If the keyboard has been configured with backspace as the back button (which is the default // Ignore whatever key is mapped to the back button so it can be used for text input.
// configuration) then ignore this key if we're currently editing or otherwise it would be bool keyboardBack {config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() &&
// impossible to erase characters using this key. config->isMappedLike("b", input)};
bool keyboardBackspace = (config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() &&
input.id == SDLK_BACKSPACE);
// Pressing back (or the escape key if using keyboard input) closes us. // Pressing back (or the escape key if using keyboard input) closes us.
if ((config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_ESCAPE) || if ((config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_ESCAPE) ||
(!keyboardBackspace && input.value && config->isMappedTo("b", input))) { (!keyboardBack && input.value && config->isMappedTo("b", input))) {
if (mText->getValue() != mInitValue) { if (mText->getValue() != mInitValue) {
// Changes were made, ask if the user wants to save them. // Changes were made, ask if the user wants to save them.
mWindow->pushGui(new GuiMsgBox( mWindow->pushGui(new GuiMsgBox(
@ -393,7 +391,9 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput("\b"); mText->textInput("\b");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();
@ -410,7 +410,9 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput(" "); mText->textInput(" ");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();
@ -523,7 +525,9 @@ void GuiTextEditKeyboardPopup::updateDeleteRepeat(int deltaTime)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput("\b"); mText->textInput("\b");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();

16
es-core/src/guis/GuiTextEditPopup.cpp
View file

@ -165,15 +165,13 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input)
return true; return true;
} }
// If the keyboard has been configured with backspace as the back button (which is the default // Ignore whatever key is mapped to the back button so it can be used for text input.
// configuration) then ignore this key if we're currently editing or otherwise it would be bool keyboardBack {config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() &&
// impossible to erase characters using this key. config->isMappedLike("b", input)};
bool keyboardBackspace = (config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() &&
input.id == SDLK_BACKSPACE);
// Pressing back (or the escape key if using keyboard input) closes us. // Pressing back (or the escape key if using keyboard input) closes us.
if ((config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_ESCAPE) || if ((config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_ESCAPE) ||
(!keyboardBackspace && input.value && config->isMappedTo("b", input))) { (!keyboardBack && input.value && config->isMappedTo("b", input))) {
if (mText->getValue() != mInitValue) { if (mText->getValue() != mInitValue) {
// Changes were made, ask if the user wants to save them. // Changes were made, ask if the user wants to save them.
mWindow->pushGui(new GuiMsgBox( mWindow->pushGui(new GuiMsgBox(
@ -210,7 +208,9 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput("\b"); mText->textInput("\b");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();
@ -227,7 +227,9 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput(" "); mText->textInput(" ");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();
@ -272,7 +274,9 @@ void GuiTextEditPopup::updateDeleteRepeat(int deltaTime)
if (!editing) if (!editing)
mText->startEditing(); mText->startEditing();
mText->setMaskInput(false);
mText->textInput("\b"); mText->textInput("\b");
mText->setMaskInput(true);
if (!editing) if (!editing)
mText->stopEditing(); mText->stopEditing();