ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2105 from Sonicadvance1/android_stop_eating_buttons 

[Android] Stop eating button events we don't handle.
This commit is contained in:
Ryan Houdek 2015-02-24 06:25:10 -06:00
parent 4e5d115bf0 29fc52cfa1
commit 7d5a558f31
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -69,8 +69,10 @@ public final class NativeLibrary
* @param Device The input descriptor of the gamepad. * @param Device The input descriptor of the gamepad.
* @param Button Key code identifying which button was pressed. * @param Button Key code identifying which button was pressed.
* @param Action Mask identifying which action is happing (button pressed down, or button released). * @param Action Mask identifying which action is happing (button pressed down, or button released).
*
* @return If we handled the button press.
*/ */
public static native void onGamePadEvent(String Device, int Button, int Action); public static native boolean onGamePadEvent(String Device, int Button, int Action);
/** /**
* Handles gamepad movement events. * Handles gamepad movement events.

4
Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
View File

@ -285,8 +285,8 @@ public final class EmulationActivity extends Activity
return false; return false;
} }
InputDevice input = event.getDevice(); InputDevice input = event.getDevice();
NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action); boolean handled = NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action);
return true; return handled;
} }
return false; return false;
} }

15
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -156,16 +156,14 @@ namespace ButtonManager
} }
return value; return value;
} }
void GamepadEvent(std::string dev, int button, int action) bool GamepadEvent(std::string dev, int button, int action)
{ {
auto it = m_controllers.find(dev); auto it = m_controllers.find(dev);
if (it != m_controllers.end()) if (it != m_controllers.end())
{ return it->second->PressEvent(button, action);
it->second->PressEvent(button, action);
return;
}
m_controllers[dev] = new InputDevice(dev); m_controllers[dev] = new InputDevice(dev);
m_controllers[dev]->PressEvent(button, action); return m_controllers[dev]->PressEvent(button, action);
} }
void GamepadAxisEvent(std::string dev, int axis, float value) void GamepadAxisEvent(std::string dev, int axis, float value)
{ {
@ -186,8 +184,9 @@ namespace ButtonManager
} }
// InputDevice // InputDevice
void InputDevice::PressEvent(int button, int action) bool InputDevice::PressEvent(int button, int action)
{ {
bool handled = false;
for (const auto& binding : _inputbinds) for (const auto& binding : _inputbinds)
{ {
if (binding.second->_bind == button) if (binding.second->_bind == button)
@ -196,8 +195,10 @@ namespace ButtonManager
_buttons[binding.second->_buttontype] = action == BUTTON_PRESSED ? true : false; _buttons[binding.second->_buttontype] = action == BUTTON_PRESSED ? true : false;
else else
_axises[binding.second->_buttontype] = action == BUTTON_PRESSED ? 1.0f : 0.0f; _axises[binding.second->_buttontype] = action == BUTTON_PRESSED ? 1.0f : 0.0f;
handled = true;
} }
} }
return handled;
} }
void InputDevice::AxisEvent(int axis, float value) void InputDevice::AxisEvent(int axis, float value)
{ {

4
Source/Core/DolphinWX/Android/ButtonManager.h
View File

@ -99,7 +99,7 @@ namespace ButtonManager
_inputbinds.clear(); _inputbinds.clear();
} }
void AddBind(sBind* bind) { _inputbinds[std::make_pair(bind->_padID, bind->_buttontype)] = bind; } void AddBind(sBind* bind) { _inputbinds[std::make_pair(bind->_padID, bind->_buttontype)] = bind; }
void PressEvent(int button, int action); bool PressEvent(int button, int action);
void AxisEvent(int axis, float value); void AxisEvent(int axis, float value);
bool ButtonValue(int padID, ButtonType button); bool ButtonValue(int padID, ButtonType button);
float AxisValue(int padID, ButtonType axis); float AxisValue(int padID, ButtonType axis);
@ -108,7 +108,7 @@ namespace ButtonManager
void Init(); void Init();
bool GetButtonPressed(int padID, ButtonType button); bool GetButtonPressed(int padID, ButtonType button);
float GetAxisValue(int padID, ButtonType axis); float GetAxisValue(int padID, ButtonType axis);
void GamepadEvent(std::string dev, int button, int action); bool GamepadEvent(std::string dev, int button, int action);
void GamepadAxisEvent(std::string dev, int axis, float value); void GamepadAxisEvent(std::string dev, int axis, float value);
void Shutdown(); void Shutdown();
} }

6
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -217,7 +217,7 @@ extern "C"
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value);
JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile); JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile);
JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile); JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile);
@ -247,9 +247,9 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulatio
Core::Stop(); Core::Stop();
updateMainFrameEvent.Set(); // Kick the waiting event updateMainFrameEvent.Set(); // Kick the waiting event
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action) JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
{ {
ButtonManager::GamepadEvent(GetJString(env, jDevice), Button, Action); return ButtonManager::GamepadEvent(GetJString(env, jDevice), Button, Action);
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value) JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value)
{ {