1 files changed, 68 insertions, 23 deletions

diff --git a/core/input_map.cpp b/core/input_map.cpp
index a9ea1d9545..d33f40cbcf 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -35,27 +35,32 @@
 
 InputMap *InputMap::singleton = NULL;
 
+int InputMap::ALL_DEVICES = -1;
+
 void InputMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action);
 	ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions);
-	ClassDB::bind_method(D_METHOD("add_action", "action"), &InputMap::add_action);
+	ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(0.5f));
 	ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action);
 
+	ClassDB::bind_method(D_METHOD("action_set_deadzone", "deadzone"), &InputMap::action_set_deadzone);
 	ClassDB::bind_method(D_METHOD("action_add_event", "action", "event"), &InputMap::action_add_event);
 	ClassDB::bind_method(D_METHOD("action_has_event", "action", "event"), &InputMap::action_has_event);
 	ClassDB::bind_method(D_METHOD("action_erase_event", "action", "event"), &InputMap::action_erase_event);
+	ClassDB::bind_method(D_METHOD("action_erase_events", "action"), &InputMap::action_erase_events);
 	ClassDB::bind_method(D_METHOD("get_action_list", "action"), &InputMap::_get_action_list);
 	ClassDB::bind_method(D_METHOD("event_is_action", "event", "action"), &InputMap::event_is_action);
 	ClassDB::bind_method(D_METHOD("load_from_globals"), &InputMap::load_from_globals);
 }
 
-void InputMap::add_action(const StringName &p_action) {
+void InputMap::add_action(const StringName &p_action, float p_deadzone) {
 
 	ERR_FAIL_COND(input_map.has(p_action));
 	input_map[p_action] = Action();
 	static int last_id = 1;
 	input_map[p_action].id = last_id;
+	input_map[p_action].deadzone = p_deadzone;
 	last_id++;
 }
 
@@ -94,19 +99,21 @@ List<StringName> InputMap::get_actions() const {
 	return actions;
 }
 
-List<Ref<InputEvent> >::Element *InputMap::_find_event(List<Ref<InputEvent> > &p_list, const Ref<InputEvent> &p_event, bool p_action_test) const {
+List<Ref<InputEvent> >::Element *InputMap::_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength) const {
 
-	for (List<Ref<InputEvent> >::Element *E = p_list.front(); E; E = E->next()) {
+	for (List<Ref<InputEvent> >::Element *E = p_action.inputs.front(); E; E = E->next()) {
 
 		const Ref<InputEvent> e = E->get();
 
 		//if (e.type != Ref<InputEvent>::KEY && e.device != p_event.device) -- unsure about the KEY comparison, why is this here?
 		//	continue;
 
-		if (e->get_device() != p_event->get_device())
-			continue;
-		if (e->action_match(p_event))
-			return E;
+		int device = e->get_device();
+		if (device == ALL_DEVICES || device == p_event->get_device()) {
+			if (e->action_match(p_event, p_pressed, p_strength, p_action.deadzone)) {
+				return E;
+			}
+		}
 	}
 
 	return NULL;
@@ -117,11 +124,18 @@ bool InputMap::has_action(const StringName &p_action) const {
 	return input_map.has(p_action);
 }
 
+void InputMap::action_set_deadzone(const StringName &p_action, float p_deadzone) {
+
+	ERR_FAIL_COND(!input_map.has(p_action));
+
+	input_map[p_action].deadzone = p_deadzone;
+}
+
 void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
 
 	ERR_FAIL_COND(p_event.is_null());
 	ERR_FAIL_COND(!input_map.has(p_action));
-	if (_find_event(input_map[p_action].inputs, p_event))
+	if (_find_event(input_map[p_action], p_event))
 		return; //already gots
 
 	input_map[p_action].inputs.push_back(p_event);
@@ -130,18 +144,25 @@ void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent
 bool InputMap::action_has_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
 
 	ERR_FAIL_COND_V(!input_map.has(p_action), false);
-	return (_find_event(input_map[p_action].inputs, p_event) != NULL);
+	return (_find_event(input_map[p_action], p_event) != NULL);
 }
 
 void InputMap::action_erase_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
 
 	ERR_FAIL_COND(!input_map.has(p_action));
 
-	List<Ref<InputEvent> >::Element *E = _find_event(input_map[p_action].inputs, p_event);
+	List<Ref<InputEvent> >::Element *E = _find_event(input_map[p_action], p_event);
 	if (E)
 		input_map[p_action].inputs.erase(E);
 }
 
+void InputMap::action_erase_events(const StringName &p_action) {
+
+	ERR_FAIL_COND(!input_map.has(p_action));
+
+	input_map[p_action].inputs.clear();
+}
+
 Array InputMap::_get_action_list(const StringName &p_action) {
 
 	Array ret;
@@ -166,19 +187,33 @@ const List<Ref<InputEvent> > *InputMap::get_action_list(const StringName &p_acti
 }
 
 bool InputMap::event_is_action(const Ref<InputEvent> &p_event, const StringName &p_action) const {
+	return event_get_action_status(p_event, p_action);
+}
 
+bool InputMap::event_get_action_status(const Ref<InputEvent> &p_event, const StringName &p_action, bool *p_pressed, float *p_strength) const {
 	Map<StringName, Action>::Element *E = input_map.find(p_action);
 	if (!E) {
 		ERR_EXPLAIN("Request for nonexistent InputMap action: " + String(p_action));
 		ERR_FAIL_COND_V(!E, false);
 	}
 
-	Ref<InputEventAction> iea = p_event;
-	if (iea.is_valid()) {
-		return iea->get_action() == p_action;
+	Ref<InputEventAction> input_event_action = p_event;
+	if (input_event_action.is_valid()) {
+		return input_event_action->get_action() == p_action;
 	}
 
-	return _find_event(E->get().inputs, p_event, true) != NULL;
+	bool pressed;
+	float strength;
+	List<Ref<InputEvent> >::Element *event = _find_event(E->get(), p_event, &pressed, &strength);
+	if (event != NULL) {
+		if (p_pressed != NULL)
+			*p_pressed = pressed;
+		if (p_strength != NULL)
+			*p_strength = strength;
+		return true;
+	} else {
+		return false;
+	}
 }
 
 const Map<StringName, InputMap::Action> &InputMap::get_action_map() const {
@@ -200,16 +235,16 @@ void InputMap::load_from_globals() {
 
 		String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length());
 
-		add_action(name);
-
-		Array va = ProjectSettings::get_singleton()->get(pi.name);
+		Dictionary action = ProjectSettings::get_singleton()->get(pi.name);
+		float deadzone = action.has("deadzone") ? (float)action["deadzone"] : 0.5f;
+		Array events = action["events"];
 
-		for (int i = 0; i < va.size(); i++) {
-
-			Ref<InputEvent> ie = va[i];
-			if (ie.is_null())
+		add_action(name, deadzone);
+		for (int i = 0; i < events.size(); i++) {
+			Ref<InputEvent> event = events[i];
+			if (event.is_null())
 				continue;
-			action_add_event(name, ie);
+			action_add_event(name, event);
 		}
 	}
 }
@@ -282,6 +317,16 @@ void InputMap::load_default() {
 	key->set_scancode(KEY_PAGEDOWN);
 	action_add_event("ui_page_down", key);
 
+	add_action("ui_home");
+	key.instance();
+	key->set_scancode(KEY_HOME);
+	action_add_event("ui_home", key);
+
+	add_action("ui_end");
+	key.instance();
+	key->set_scancode(KEY_END);
+	action_add_event("ui_end", key);
+
 	//set("display/window/handheld/orientation", "landscape");
 }