5 files changed, 26 insertions, 123 deletions

diff --git a/core/os/input.cpp b/core/os/input.cpp
index 3089ab2ce3..1d7cd7c791 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -111,7 +111,7 @@ void Input::_bind_methods() {
 	BIND_ENUM_CONSTANT(CURSOR_HSPLIT);
 	BIND_ENUM_CONSTANT(CURSOR_HELP);
 
-	ADD_SIGNAL(MethodInfo("joy_connection_changed", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::BOOL, "connected")));
+	ADD_SIGNAL(MethodInfo("joy_connection_changed", PropertyInfo(Variant::INT, "device"), PropertyInfo(Variant::BOOL, "connected")));
 }
 
 void Input::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp
index fa53cc85c8..9dfc91e308 100644
--- a/core/os/keyboard.cpp
+++ b/core/os/keyboard.cpp
@@ -461,99 +461,6 @@ const char *find_keycode_name(int p_keycode) {
 	return "";
 }
 
-struct _KeyCodeReplace {
-	int from;
-	int to;
-};
-
-static const _KeyCodeReplace _keycode_replace_qwertz[] = {
-	{ KEY_Y, KEY_Z },
-	{ KEY_Z, KEY_Y },
-	{ 0, 0 }
-};
-
-static const _KeyCodeReplace _keycode_replace_azerty[] = {
-	{ KEY_W, KEY_Z },
-	{ KEY_Z, KEY_W },
-	{ KEY_A, KEY_Q },
-	{ KEY_Q, KEY_A },
-	{ KEY_SEMICOLON, KEY_M },
-	{ KEY_M, KEY_SEMICOLON },
-	{ 0, 0 }
-};
-
-static const _KeyCodeReplace _keycode_replace_qzerty[] = {
-	{ KEY_W, KEY_Z },
-	{ KEY_Z, KEY_W },
-	{ KEY_SEMICOLON, KEY_M },
-	{ KEY_M, KEY_SEMICOLON },
-	{ 0, 0 }
-};
-
-static const _KeyCodeReplace _keycode_replace_dvorak[] = {
-	{ KEY_UNDERSCORE, KEY_BRACELEFT },
-	{ KEY_EQUAL, KEY_BRACERIGHT },
-	{ KEY_Q, KEY_APOSTROPHE },
-	{ KEY_W, KEY_COMMA },
-	{ KEY_E, KEY_PERIOD },
-	{ KEY_R, KEY_P },
-	{ KEY_T, KEY_Y },
-	{ KEY_Y, KEY_F },
-	{ KEY_U, KEY_G },
-	{ KEY_I, KEY_C },
-	{ KEY_O, KEY_R },
-	{ KEY_P, KEY_L },
-	{ KEY_BRACELEFT, KEY_SLASH },
-	{ KEY_BRACERIGHT, KEY_EQUAL },
-	{ KEY_A, KEY_A },
-	{ KEY_S, KEY_O },
-	{ KEY_D, KEY_E },
-	{ KEY_F, KEY_U },
-	{ KEY_G, KEY_I },
-	{ KEY_H, KEY_D },
-	{ KEY_J, KEY_H },
-	{ KEY_K, KEY_T },
-	{ KEY_L, KEY_N },
-	{ KEY_SEMICOLON, KEY_S },
-	{ KEY_APOSTROPHE, KEY_UNDERSCORE },
-	{ KEY_Z, KEY_SEMICOLON },
-	{ KEY_X, KEY_Q },
-	{ KEY_C, KEY_J },
-	{ KEY_V, KEY_K },
-	{ KEY_B, KEY_X },
-	{ KEY_N, KEY_B },
-	{ KEY_M, KEY_M },
-	{ KEY_COMMA, KEY_W },
-	{ KEY_PERIOD, KEY_V },
-	{ KEY_SLASH, KEY_Z },
-	{ 0, 0 }
-};
-
-static const _KeyCodeReplace _keycode_replace_neo[] = {
-	{ 0, 0 }
-};
-
-static const _KeyCodeReplace _keycode_replace_colemak[] = {
-	{ KEY_E, KEY_F },
-	{ KEY_R, KEY_P },
-	{ KEY_T, KEY_G },
-	{ KEY_Y, KEY_J },
-	{ KEY_U, KEY_L },
-	{ KEY_I, KEY_U },
-	{ KEY_O, KEY_Y },
-	{ KEY_P, KEY_SEMICOLON },
-	{ KEY_S, KEY_R },
-	{ KEY_D, KEY_S },
-	{ KEY_F, KEY_T },
-	{ KEY_G, KEY_D },
-	{ KEY_J, KEY_N },
-	{ KEY_K, KEY_E },
-	{ KEY_L, KEY_I },
-	{ KEY_SEMICOLON, KEY_O },
-	{ KEY_N, KEY_K },
-	{ 0, 0 }
-};
-
 int keycode_get_count() {
 
 	const _KeyCodeText *kct = &_keycodes[0];
@@ -574,31 +481,3 @@ int keycode_get_value_by_index(int p_index) {
 const char *keycode_get_name_by_index(int p_index) {
 	return _keycodes[p_index].text;
 }
-
-int latin_keyboard_keycode_convert(int p_keycode) {
-
-	const _KeyCodeReplace *kcr = NULL;
-	switch (OS::get_singleton()->get_latin_keyboard_variant()) {
-
-		case OS::LATIN_KEYBOARD_QWERTY: return p_keycode; break;
-		case OS::LATIN_KEYBOARD_QWERTZ: kcr = _keycode_replace_qwertz; break;
-		case OS::LATIN_KEYBOARD_AZERTY: kcr = _keycode_replace_azerty; break;
-		case OS::LATIN_KEYBOARD_QZERTY: kcr = _keycode_replace_qzerty; break;
-		case OS::LATIN_KEYBOARD_DVORAK: kcr = _keycode_replace_dvorak; break;
-		case OS::LATIN_KEYBOARD_NEO: kcr = _keycode_replace_neo; break;
-		case OS::LATIN_KEYBOARD_COLEMAK: kcr = _keycode_replace_colemak; break;
-		default: return p_keycode;
-	}
-
-	if (!kcr) {
-		return p_keycode;
-	}
-
-	while (kcr->from) {
-		if (kcr->from == p_keycode)
-			return kcr->to;
-		kcr++;
-	}
-
-	return p_keycode;
-}
diff --git a/core/os/keyboard.h b/core/os/keyboard.h
index 4c253fa4ce..a0e6f8b2ef 100644
--- a/core/os/keyboard.h
+++ b/core/os/keyboard.h
@@ -331,6 +331,5 @@ const char *find_keycode_name(int p_keycode);
 int keycode_get_count();
 int keycode_get_value_by_index(int p_index);
 const char *keycode_get_name_by_index(int p_index);
-int latin_keyboard_keycode_convert(int p_keycode);
 
 #endif
diff --git a/core/os/thread_dummy.cpp b/core/os/thread_dummy.cpp
index fa0bb3dafd..b6371235c4 100644
--- a/core/os/thread_dummy.cpp
+++ b/core/os/thread_dummy.cpp
@@ -55,3 +55,11 @@ Semaphore *SemaphoreDummy::create() {
 void SemaphoreDummy::make_default() {
 	Semaphore::create_func = &SemaphoreDummy::create;
 };
+
+RWLock *RWLockDummy::create() {
+	return memnew(RWLockDummy);
+};
+
+void RWLockDummy::make_default() {
+	RWLock::create_func = &RWLockDummy::create;
+};
diff --git a/core/os/thread_dummy.h b/core/os/thread_dummy.h
index b67b52a726..74957b95fe 100644
--- a/core/os/thread_dummy.h
+++ b/core/os/thread_dummy.h
@@ -32,6 +32,7 @@
 #define THREAD_DUMMY_H
 
 #include "mutex.h"
+#include "rw_lock.h"
 #include "semaphore.h"
 #include "thread.h"
 
@@ -69,4 +70,20 @@ public:
 	static void make_default();
 };
 
+class RWLockDummy : public RWLock {
+
+	static RWLock *create();
+
+public:
+	virtual void read_lock() {}
+	virtual void read_unlock() {}
+	virtual Error read_try_lock() { return OK; }
+
+	virtual void write_lock() {}
+	virtual void write_unlock() {}
+	virtual Error write_try_lock() { return OK; }
+
+	static void make_default();
+};
+
 #endif