1 files changed, 33 insertions, 4 deletions

diff --git a/main/input_default.cpp b/main/input_default.cpp
index 4fcb450bce..5e66a8b585 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -30,6 +30,7 @@
 #include "servers/visual_server.h"
 #include "os/os.h"
 #include "input_map.h"
+#include "scene/resources/texture.h"
 
 void InputDefault::SpeedTrack::update(const Vector2& p_delta_p) {
 
@@ -101,7 +102,7 @@ bool InputDefault::is_action_pressed(const StringName& p_action) {
 
 	const List<InputEvent> *alist = InputMap::get_singleton()->get_action_list(p_action);
 	if (!alist)
-		return NULL;
+		return false;
 
 
 	for (const List<InputEvent>::Element *E=alist->front();E;E=E->next()) {
@@ -220,18 +221,18 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
 			};
 		};
 		js.uid = uidname;
-		//printf("looking for mappings for guid %ls\n", uidname.c_str());
+		js.connected = true;
 		int mapping = fallback_mapping;
 		for (int i=0; i < map_db.size(); i++) {
 			if (js.uid == map_db[i].uid) {
 				mapping = i;
 				js.name = map_db[i].name;
-				//printf("found mapping\n");
 			};
 		};
 		js.mapping = mapping;
 	}
 	else {
+		js.connected = false;
 		for (int i = 0; i < JOY_BUTTON_MAX; i++) {
 
 			if (i < JOY_AXIS_MAX)
@@ -258,6 +259,12 @@ Vector3 InputDefault::get_magnetometer() {
 	return magnetometer;
 }
 
+Vector3 InputDefault::get_gyroscope() {
+
+	_THREAD_SAFE_METHOD_
+	return gyroscope;
+}
+
 void InputDefault::parse_input_event(const InputEvent& p_event) {
 
 	_THREAD_SAFE_METHOD_
@@ -385,6 +392,14 @@ void InputDefault::set_magnetometer(const Vector3& p_magnetometer) {
 
 }
 
+void InputDefault::set_gyroscope(const Vector3& p_gyroscope) {
+
+	_THREAD_SAFE_METHOD_
+
+	gyroscope=p_gyroscope;
+
+}
+
 void InputDefault::set_main_loop(MainLoop *p_main_loop) {
 	main_loop=p_main_loop;
 
@@ -463,9 +478,11 @@ void InputDefault::set_custom_mouse_cursor(const RES& p_cursor,const Vector2& p_
 		set_mouse_mode(MOUSE_MODE_VISIBLE);
 		VisualServer::get_singleton()->cursor_set_visible(false);
 	} else {
+		Ref<AtlasTexture> atex = custom_cursor;
+		Rect2 region = atex.is_valid() ? atex->get_region() : Rect2();
 		set_mouse_mode(MOUSE_MODE_HIDDEN);
 		VisualServer::get_singleton()->cursor_set_visible(true);
-		VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(),p_hotspot);
+		VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(),p_hotspot, 0, region);
 		VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos());
 	}
 }
@@ -1039,3 +1056,15 @@ bool InputDefault::is_joy_mapped(int p_device) {
 String InputDefault::get_joy_guid_remapped(int p_device) const {
 	return joy_names[p_device].uid;
 }
+
+Array InputDefault::get_connected_joysticks() {
+	Array ret;
+	Map<int, Joystick>::Element *elem = joy_names.front();
+	while (elem) {
+		if (elem->get().connected) {
+			ret.push_back(elem->key());
+		}
+		elem = elem->next();
+	}
+	return ret;
+}