Skip to content

update input filter #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update input filter #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/window_callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void WindowCallbacks::onTouchEnd(int id, double x, double y) {
}
}
void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
if(hasInputMode(InputMode::Mouse)) {
if(sendEvents) {
// return onKeyboard((KeyCode) 4, KeyAction::PRESS);
// key = (KeyCode) 0x21;
#ifdef __APPLE__
Expand Down Expand Up @@ -188,20 +188,26 @@ void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
}
}
void WindowCallbacks::onKeyboardText(std::string const& c) {
if(c == "\n" && !jniSupport.getTextInputHandler().isMultiline())
jniSupport.onReturnKeyPressed();
else
jniSupport.getTextInputHandler().onTextInput(c);
if(sendEvents) {
if(c == "\n" && !jniSupport.getTextInputHandler().isMultiline()) {
jniSupport.onReturnKeyPressed();
} else {
jniSupport.getTextInputHandler().onTextInput(c);
}
}
}
void WindowCallbacks::onPaste(std::string const& str) {
jniSupport.getTextInputHandler().onTextInput(str);
if(sendEvents) {
jniSupport.getTextInputHandler().onTextInput(str);
}
}
void WindowCallbacks::onGamepadState(int gamepad, bool connected) {
Log::trace("WindowCallbacks", "Gamepad %s #%i", connected ? "connected" : "disconnected", gamepad);
if(connected)
if(connected) {
gamepads.insert({gamepad, GamepadData()});
else
} else {
gamepads.erase(gamepad);
}

if(sendEvents) {
// This crashs the game 1.16.210+ during init, but works after loading
Expand All @@ -212,8 +218,9 @@ void WindowCallbacks::onGamepadState(int gamepad, bool connected) {
}

void WindowCallbacks::queueGamepadAxisInputIfNeeded(int gamepad) {
if(!needsQueueGamepadInput)
if(!needsQueueGamepadInput) {
return;
}
inputQueue.addEvent(FakeMotionEvent(AINPUT_SOURCE_GAMEPAD, gamepad, AMOTION_EVENT_ACTION_MOVE, 0, 0.f, 0.f,
[this, gamepad](int axis) {
auto gpi = gamepads.find(gamepad);
Expand Down
3 changes: 2 additions & 1 deletion src/window_callbacks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ class WindowCallbacks {
bool needsQueueGamepadInput = true;
bool fullscreen = options.fullscreen;
bool sendEvents = false;
// Prefer Touch, Gamepad over Mouse due to Input Emulation
enum class InputMode {
Touch,
Mouse,
Gamepad,
Mouse,
Unknown,
};
InputMode inputMode = InputMode::Unknown;
Expand Down