1 files changed, 32 insertions, 16 deletions

diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 36e9681f5f..ddb5237d1b 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -1888,6 +1888,8 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 		if (status == XLookupChars) {
 			bool keypress = xkeyevent->type == KeyPress;
 			unsigned int keycode = KeyMappingX11::get_keycode(keysym_keycode);
+			unsigned int physical_keycode = KeyMappingX11::get_scancode(xkeyevent->keycode);
+
 			if (keycode >= 'a' && keycode <= 'z')
 				keycode -= 'a' - 'A';
 
@@ -1896,23 +1898,29 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 			for (int i = 0; i < tmp.length(); i++) {
 				Ref<InputEventKey> k;
 				k.instance();
-				if (keycode == 0 && tmp[i] == 0) {
+				if (physical_keycode == 0 && keycode == 0 && tmp[i] == 0) {
 					continue;
 				}
 
+				if (keycode == 0)
+					keycode = physical_keycode;
+
 				get_key_modifier_state(xkeyevent->state, k);
 
 				k->set_unicode(tmp[i]);
 
 				k->set_pressed(keypress);
 
-				k->set_scancode(keycode);
+				k->set_keycode(keycode);
+
+				k->set_physical_keycode(physical_keycode);
 
 				k->set_echo(false);
 
-				if (k->get_scancode() == KEY_BACKTAB) {
+				if (k->get_keycode() == KEY_BACKTAB) {
 					//make it consistent across platforms.
-					k->set_scancode(KEY_TAB);
+					k->set_keycode(KEY_TAB);
+					k->set_physical_keycode(KEY_TAB);
 					k->set_shift(true);
 				}
 
@@ -1942,6 +1950,7 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 	// keysym, so it works in all platforms the same.
 
 	unsigned int keycode = KeyMappingX11::get_keycode(keysym_keycode);
+	unsigned int physical_keycode = KeyMappingX11::get_scancode(xkeyevent->keycode);
 
 	/* Phase 3, obtain a unicode character from the keysym */
 
@@ -1961,9 +1970,12 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 
 	bool keypress = xkeyevent->type == KeyPress;
 
-	if (keycode == 0 && unicode == 0)
+	if (physical_keycode == 0 && keycode == 0 && unicode == 0)
 		return;
 
+	if (keycode == 0)
+		keycode = physical_keycode;
+
 	/* Phase 5, determine modifier mask */
 
 	// No problems here, except I had no way to
@@ -2000,8 +2012,10 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 			// is correct, but the xorg developers are
 			// not very helpful today.
 
-			::Time tresh = ABSDIFF(peek_event.xkey.time, xkeyevent->time);
-			if (peek_event.type == KeyPress && tresh < 5) {
+#define ABSDIFF(x, y) (((x) < (y)) ? ((y) - (x)) : ((x) - (y)))
+			::Time threshold = ABSDIFF(peek_event.xkey.time, xkeyevent->time);
+#undef ABSDIFF
+			if (peek_event.type == KeyPress && threshold < 5) {
 				KeySym rk;
 				XLookupString((XKeyEvent *)&peek_event, str, 256, &rk, NULL);
 				if (rk == keysym_keycode) {
@@ -2025,37 +2039,39 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
 	if (keycode >= 'a' && keycode <= 'z')
 		keycode -= 'a' - 'A';
 
-	k->set_scancode(keycode);
+	k->set_keycode(keycode);
+	k->set_physical_keycode(physical_keycode);
 	k->set_unicode(unicode);
 	k->set_echo(p_echo);
 
-	if (k->get_scancode() == KEY_BACKTAB) {
+	if (k->get_keycode() == KEY_BACKTAB) {
 		//make it consistent across platforms.
-		k->set_scancode(KEY_TAB);
+		k->set_keycode(KEY_TAB);
+		k->set_physical_keycode(KEY_TAB);
 		k->set_shift(true);
 	}
 
 	//don't set mod state if modifier keys are released by themselves
 	//else event.is_action() will not work correctly here
 	if (!k->is_pressed()) {
-		if (k->get_scancode() == KEY_SHIFT)
+		if (k->get_keycode() == KEY_SHIFT)
 			k->set_shift(false);
-		else if (k->get_scancode() == KEY_CONTROL)
+		else if (k->get_keycode() == KEY_CONTROL)
 			k->set_control(false);
-		else if (k->get_scancode() == KEY_ALT)
+		else if (k->get_keycode() == KEY_ALT)
 			k->set_alt(false);
-		else if (k->get_scancode() == KEY_META)
+		else if (k->get_keycode() == KEY_META)
 			k->set_metakey(false);
 	}
 
-	bool last_is_pressed = Input::get_singleton()->is_key_pressed(k->get_scancode());
+	bool last_is_pressed = Input::get_singleton()->is_key_pressed(k->get_keycode());
 	if (k->is_pressed()) {
 		if (last_is_pressed) {
 			k->set_echo(true);
 		}
 	}
 
-	//printf("key: %x\n",k->get_scancode());
+	//printf("key: %x\n",k->get_keycode());
 	input->accumulate_input_event(k);
 }