[Android] Fix a bunch of input bugs.

Looking at the old code for the ButtonManager was a brainfsck. This fixes a ton of bugs I kept uncovering as I was moving along.

Fixes the gamepad configuration file being incorrect.
No longer treats touchscreen in a special way. Ends up as a regular device with a "Touchscreen" device name.
Was incorrectly converting a index from integer to ButtonType. Wouldn't work due to the addition of some unused(in JNI) enumerators in ButtonType.
Fixes an issue where a map had a key as an axis which was causing its binding to be overwritten for every axis that was used twice (eg main stick left and right);
Fixes Triggers not working at all.
Fixes DPad not working at all.
Fixes C-Stick only half working.
Removes touch screen specific nativelibrary types onTouchAxisEvent and onTouchEvent.

Adds a configuration version configuration option. Allows easy configuration overwriting if the options need to be changed during updating.

Supersedes github PR #291.

4 files changed, 102 insertions, 85 deletions

diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index e945f0638a..a1684ba5a6 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -9,11 +9,9 @@
 
 namespace ButtonManager
 {
-	// Pair key is padID, BUTTONTYPE
-	std::map<std::pair<int, int>, Button*> m_buttons;
-	std::map<std::pair<int, int>, Axis*> m_axises;
+	const std::string touchScreenKey = "Touchscreen";
 	std::unordered_map<std::string, InputDevice*> m_controllers;
-	const char* configStrings[] = {
+	std::vector<std::string> configStrings = {
 		"InputA",
 		"InputB",
 		"InputStart",
@@ -35,7 +33,28 @@ namespace ButtonManager
 		"InputL",
 		"InputR"
 	};
-	const int configStringNum = 20;
+	std::vector<ButtonType> configTypes = {
+		BUTTON_A,
+		BUTTON_B,
+		BUTTON_START,
+		BUTTON_X,
+		BUTTON_Y,
+		BUTTON_Z,
+		BUTTON_UP,
+		BUTTON_DOWN,
+		BUTTON_LEFT,
+		BUTTON_RIGHT,
+		STICK_MAIN_UP,
+		STICK_MAIN_DOWN,
+		STICK_MAIN_LEFT,
+		STICK_MAIN_RIGHT,
+		STICK_C_UP,
+		STICK_C_DOWN,
+		STICK_C_LEFT,
+		STICK_C_RIGHT,
+		TRIGGER_L,
+		TRIGGER_R
+	};
 
 	void AddBind(std::string dev, sBind *bind)
 	{
@@ -51,35 +70,35 @@ namespace ButtonManager
 
 	void Init()
 	{
-		// Initialize our touchscreen buttons
+		// Initialize our touchScreenKey buttons
 		for (int a = 0; a < 4; ++a)
 		{
-			m_buttons[std::make_pair(a, BUTTON_A)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_B)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_START)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_X)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_Y)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_Z)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_UP)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_DOWN)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_LEFT)] = new Button();
-			m_buttons[std::make_pair(a, BUTTON_RIGHT)] = new Button();
+			AddBind(touchScreenKey, new sBind(a, BUTTON_A, BIND_BUTTON, BUTTON_A, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_B, BIND_BUTTON, BUTTON_B, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_START, BIND_BUTTON, BUTTON_START, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_X, BIND_BUTTON, BUTTON_X, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_Y, BIND_BUTTON, BUTTON_Y, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_Z, BIND_BUTTON, BUTTON_Z, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_UP, BIND_BUTTON, BUTTON_UP, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_DOWN, BIND_BUTTON, BUTTON_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_LEFT, BIND_BUTTON, BUTTON_LEFT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_RIGHT, BIND_BUTTON, BUTTON_RIGHT, 1.0f));
 
-			m_axises[std::make_pair(a, STICK_MAIN_UP)] = new Axis();
-			m_axises[std::make_pair(a, STICK_MAIN_DOWN)] = new Axis();
-			m_axises[std::make_pair(a, STICK_MAIN_LEFT)] = new Axis();
-			m_axises[std::make_pair(a, STICK_MAIN_RIGHT)] = new Axis();
-			m_axises[std::make_pair(a, STICK_C_UP)] = new Axis();
-			m_axises[std::make_pair(a, STICK_C_DOWN)] = new Axis();
-			m_axises[std::make_pair(a, STICK_C_LEFT)] = new Axis();
-			m_axises[std::make_pair(a, STICK_C_RIGHT)] = new Axis();
-			m_buttons[std::make_pair(a, TRIGGER_L)] = new Button();
-			m_buttons[std::make_pair(a, TRIGGER_R)] = new Button();
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_UP, BIND_AXIS, STICK_MAIN_UP, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_DOWN, BIND_AXIS, STICK_MAIN_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_LEFT, BIND_AXIS, STICK_MAIN_LEFT, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_RIGHT, BIND_AXIS, STICK_MAIN_RIGHT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_UP, BIND_AXIS, STICK_C_UP, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_DOWN, BIND_AXIS, STICK_C_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_LEFT, BIND_AXIS, STICK_C_LEFT, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_RIGHT, BIND_AXIS, STICK_C_RIGHT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, TRIGGER_L, BIND_AXIS, TRIGGER_L, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, TRIGGER_R, BIND_AXIS, TRIGGER_R, 1.0f));
 		}
 		// Init our controller bindings
 		IniFile ini;
 		ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
-		for (int a = 0; a < configStringNum; ++a)
+		for (u32 a = 0; a < configStrings.size(); ++a)
 		{
 			for (int padID = 0; padID < 4; ++padID)
 			{
@@ -89,7 +108,7 @@ namespace ButtonManager
 				int bindnum;
 				char dev[128];
 				bool hasbind = false;
-				char modifier = 0;
+				char modifier = '+';
 				std::string value;
 				ini.Get("Android", config.str(), &value, "None");
 				if (value == "None")
@@ -107,14 +126,14 @@ namespace ButtonManager
 					sscanf(value.c_str(), "Device '%[^\']'-Button %d", dev, &bindnum);
 				}
 				if (hasbind)
-					AddBind(std::string(dev), new sBind(padID, (ButtonType)a, type, bindnum, modifier == '-' ? -1.0f : 1.0f));
+					AddBind(std::string(dev), new sBind(padID, configTypes[a], type, bindnum, modifier == '-' ? -1.0f : 1.0f));
 			}
 		}
 
 	}
 	bool GetButtonPressed(int padID, ButtonType button)
 	{
-		bool pressed = m_buttons[std::make_pair(padID, button)]->Pressed();
+		bool pressed = m_controllers[touchScreenKey]->ButtonValue(padID, button);
 
 		for (const auto& ctrl : m_controllers)
 			pressed |= ctrl.second->ButtonValue(padID, button);
@@ -123,19 +142,17 @@ namespace ButtonManager
 	}
 	float GetAxisValue(int padID, ButtonType axis)
 	{
-		float value = m_axises[std::make_pair(padID, axis)]->AxisValue();
-		auto it = m_controllers.begin();
-		if (it == m_controllers.end())
-			return value;
-		return value != 0.0f ? value : it->second->AxisValue(padID, axis);
-	}
-	void TouchEvent(int padID, ButtonType button, int action)
-	{
-		m_buttons[std::make_pair(padID, button)]->SetState(action ? BUTTON_PRESSED : BUTTON_RELEASED);
-	}
-	void TouchAxisEvent(int padID, ButtonType axis, float value)
-	{
-		m_axises[std::make_pair(padID, axis)]->SetValue(value);
+		float value = m_controllers[touchScreenKey]->AxisValue(padID, axis);
+		if (value == 0.0f)
+		{
+			for (const auto& ctrl : m_controllers)
+			{
+				value = ctrl.second->AxisValue(padID, axis);
+				if (value != 0.0f)
+					return value;
+			}
+		}
+		return value;
 	}
 	void GamepadEvent(std::string dev, int button, int action)
 	{
@@ -161,50 +178,58 @@ namespace ButtonManager
 	}
 	void Shutdown()
 	{
-		for (const auto& button : m_buttons)
-			delete button.second;
 		for (const auto& controller : m_controllers)
 			delete controller.second;
 		m_controllers.clear();
-		m_buttons.clear();
 	}
 
 	// InputDevice
 	void InputDevice::PressEvent(int button, int action)
 	{
-		if (_inputbinds.find(button) == _inputbinds.end())
-			return;
-		_buttons[_inputbinds[button]->_buttontype] = action == 0 ? true : false;
+		for (const auto& binding : _inputbinds)
+		{
+			if (binding.second->_bind == button)
+			{
+				if (binding.second->_bindtype == BIND_BUTTON)
+					_buttons[binding.second->_buttontype] = action == BUTTON_PRESSED ? true : false;
+				else
+					_axises[binding.second->_buttontype] = action == BUTTON_PRESSED ? 1.0f : 0.0f;
+			}
+		}
 	}
 	void InputDevice::AxisEvent(int axis, float value)
 	{
-		if (_inputbinds.find(axis) == _inputbinds.end())
-			return;
-		_axises[_inputbinds[axis]->_buttontype] = value;
+		for (const auto& binding : _inputbinds)
+		{
+			if (binding.second->_bind == axis)
+			{
+				if (binding.second->_bindtype == BIND_AXIS)
+					_axises[binding.second->_buttontype] = value;
+				else
+					_buttons[binding.second->_buttontype] = value > 0.5f ? true : false;
+			}
+		}
 	}
 	bool InputDevice::ButtonValue(int padID, ButtonType button)
 	{
-		auto it = _binds.find(button);
-		if (it == _binds.end())
-			return false;
-		if (it->second->_padID != padID)
+		const auto& binding = _inputbinds.find(std::make_pair(padID, button));
+		if (binding == _inputbinds.end())
 			return false;
-		if (it->second->_bindtype == BIND_BUTTON)
-			return _buttons[it->second->_buttontype];
+
+		if (binding->second->_bindtype == BIND_BUTTON)
+			return _buttons[binding->second->_buttontype];
 		else
-			return AxisValue(padID, button);
+			return (_axises[binding->second->_buttontype] * binding->second->_neg) > 0.5f;
 	}
 	float InputDevice::AxisValue(int padID, ButtonType axis)
 	{
-		auto it = _binds.find(axis);
-		if (it == _binds.end())
+		const auto& binding = _inputbinds.find(std::make_pair(padID, axis));
+		if (binding == _inputbinds.end())
 			return 0.0f;
-		if (it->second->_padID != padID)
-			return 0.0f;
-		if (it->second->_bindtype == BIND_BUTTON)
-			return ButtonValue(padID, axis);
+
+		if (binding->second->_bindtype == BIND_AXIS)
+			return _axises[binding->second->_buttontype] * binding->second->_neg;
 		else
-			return _axises[it->second->_buttontype] * it->second->_neg;
+			return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
 	}
-
 }
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h
index 8e5ff0a429..15dfbedbb1 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.h
+++ b/Source/Core/DolphinWX/Android/ButtonManager.h
@@ -86,17 +86,19 @@ namespace ButtonManager
 		const std::string _dev;
 		std::map<ButtonType, bool> _buttons;
 		std::map<ButtonType, float> _axises;
-		std::map<ButtonType, sBind*> _binds;
-		std::map<int, sBind*> _inputbinds;
+
+		// Key is padID and ButtonType
+		std::map<std::pair<int, ButtonType>, sBind*> _inputbinds;
 	public:
 		InputDevice(std::string dev)
 			: _dev(dev) {}
 		~InputDevice()
 		{
-			for (const auto& bind : _binds)
+			for (const auto& bind : _inputbinds)
 				delete bind.second;
+			_inputbinds.clear();
 		}
-		void AddBind(sBind *bind) { _binds[bind->_buttontype] = bind; _inputbinds[bind->_bind] = bind; }
+		void AddBind(sBind *bind) { _inputbinds[std::make_pair(bind->_padID, bind->_buttontype)] = bind; }
 		void PressEvent(int button, int action);
 		void AxisEvent(int axis, float value);
 		bool ButtonValue(int padID, ButtonType button);
@@ -106,8 +108,6 @@ namespace ButtonManager
 	void Init();
 	bool GetButtonPressed(int padID, ButtonType button);
 	float GetAxisValue(int padID, ButtonType axis);
-	void TouchEvent(int padID, ButtonType button, int action);
-	void TouchAxisEvent(int padID, ButtonType axis, float value);
 	void GamepadEvent(std::string dev, int button, int action);
 	void GamepadAxisEvent(std::string dev, int axis, float value);
 	void Shutdown();
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index ab82e7def1..157bb2802d 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -241,14 +241,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulatio
 	Core::Stop();
 	updateMainFrameEvent.Set(); // Kick the waiting event
 }
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchEvent(JNIEnv *env, jobject obj, jint padID, jint Button, jint Action)
-{
-	ButtonManager::TouchEvent(padID, (ButtonManager::ButtonType)Button, Action);
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchAxisEvent(JNIEnv *env, jobject obj, jint padID, jint Button, jfloat Action)
-{
-	ButtonManager::TouchAxisEvent(padID, (ButtonManager::ButtonType)Button, Action);
-}
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
 {
 	ButtonManager::GamepadEvent(GetJString(env, jDevice), Button, Action);
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index fa97e8f222..0f6a6ed0a5 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -46,10 +46,10 @@ Touchscreen::Touchscreen(int padID)
 	AddInput(new Button(_padID, ButtonManager::BUTTON_DOWN));
 	AddInput(new Button(_padID, ButtonManager::BUTTON_LEFT));
 	AddInput(new Button(_padID, ButtonManager::BUTTON_RIGHT));
-	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_LEFT, -1.0f), new Axis(_padID, ButtonManager::STICK_MAIN_RIGHT));
-	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_UP, -1.0f), new Axis(_padID, ButtonManager::STICK_MAIN_DOWN));
-	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_UP, -1.0f), new Axis(_padID, ButtonManager::STICK_C_DOWN));
-	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_LEFT, -1.0f), new Axis(_padID, ButtonManager::STICK_C_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_LEFT), new Axis(_padID, ButtonManager::STICK_MAIN_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_UP), new Axis(_padID, ButtonManager::STICK_MAIN_DOWN));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_LEFT), new Axis(_padID, ButtonManager::STICK_C_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_UP), new Axis(_padID, ButtonManager::STICK_C_DOWN));
 	AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_L), new Axis(_padID, ButtonManager::TRIGGER_L));
 	AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_R), new Axis(_padID, ButtonManager::TRIGGER_R));
 }