Merge pull request #608 from dmitry-ant/x11-key-press

[Linux] Send mapped wchar characters to internal key press
Kode · Mar 19, 2021 · 3a7564d · 3a7564d
2 parents 15ad056 + 9a8b5fd
commit 3a7564d
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/Backends/System/Linux/Sources/kinc/backend/system.cpp b/Backends/System/Linux/Sources/kinc/backend/system.cpp
@@ -41,6 +41,7 @@ typedef GLXContext (*glXCreateContextAttribsARBProc)(Display*, GLXFBConfig, GLXC
 #endif
 
 _XDisplay* Kore::Linux::display = nullptr;
+XIC xInputContext;
 
 namespace {
 	struct MwmHints {
@@ -123,6 +124,11 @@ int createWindow(const char* title, int x, int y, int width, int height, kinc_wi
 		fatalError("could not open display");
 	}
 
+	XSetLocaleModifiers("@im=none");
+	XIM xInputMethod = XOpenIM(Kore::Linux::display, nullptr, nullptr, nullptr);
+	xInputContext = XCreateIC(xInputMethod, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, win, nullptr);
+	XSetICFocus(xInputContext);
+
 	XkbSetDetectableAutoRepeat(Kore::Linux::display, True, NULL);
 
 	XSetWindowAttributes swa;
@@ -426,15 +432,23 @@ bool kinc_internal_handle_messages() {
 		}
 
 		switch (event.type) {
+		case MappingNotify: {
+			XRefreshKeyboardMapping(&event.xmapping);
+		}
+		break;
 		case KeyPress: {
 			XKeyEvent* key = (XKeyEvent*)&event;
-			KeySym keysym;
-			char buffer[1];
-			XLookupString(key, buffer, 1, &keysym, NULL);
+			KeySym keysym = XkbKeycodeToKeysym(Kore::Linux::display, event.xkey.keycode, 0, 0);
 
-			if (buffer[0] >= 32 && buffer[0] <= 126) {
-                kinc_internal_keyboard_trigger_key_press((wchar_t)buffer[0]);
-			}
+			bool isIgnoredKeySym = keysym == XK_Escape || keysym == XK_BackSpace || keysym == XK_Delete;
+			if (!controlDown && !XFilterEvent(&event, win) && !isIgnoredKeySym) {
+
+				wchar_t wchar;
+
+				if (XwcLookupString(xInputContext, key, &wchar, 1, &keysym, nullptr)) {
+					kinc_internal_keyboard_trigger_key_press(wchar);
+				}
+			} 
 
 #define KEY(xkey, korekey)                                          \
 	case xkey:                                                      \