Make more reliable

Author: CMurtagh-LGTM

src/wayland/input_method/CMakeLists.txt

@@ -1,6 +1,8 @@
 qt_add_library(quickshell-wayland-input-method STATIC
 	input_method.cpp
+	keyboard_grab.cpp
 	virtual_keyboard.cpp
+	key_map_state.cpp
 	manager.cpp
 	qml.cpp
 )

src/wayland/input_method/input_method.cpp

@@ -1,12 +1,9 @@
 #include "input_method.hpp"
 
 #include <qtmetamacros.h>
-#include <sys/mman.h>
 #include <wayland-input-method-unstable-v2-client-protocol.h>
-#include <xkbcommon/xkbcommon.h>
 
-#include "manager.hpp"
-#include "virtual_keyboard.hpp"
+#include "keyboard_grab.hpp"
 
 namespace qs::wayland::input_method::impl {
 
@@ -20,7 +17,13 @@ InputMethodHandle::~InputMethodHandle() {
 }
 
 void InputMethodHandle::commitString(const QString& text) { commit_string(text); }
-void InputMethodHandle::sendPreeditString(const QString& text, int32_t cursorBegin, int32_t cursorEnd) { set_preedit_string(text, cursorBegin, cursorEnd); }
+void InputMethodHandle::sendPreeditString(
+    const QString& text,
+    int32_t cursorBegin,
+    int32_t cursorEnd
+) {
+	set_preedit_string(text, cursorBegin, cursorEnd);
+}
 void InputMethodHandle::deleteText(int before, int after) {
 	zwp_input_method_v2::delete_surrounding_text(before, after);
 }
@@ -33,7 +36,7 @@ QPointer<InputMethodKeyboardGrab> InputMethodHandle::grabKeyboard() {
 
 	return keyboard;
 }
-void InputMethodHandle::releaseKeyboard(){
+void InputMethodHandle::releaseKeyboard() {
 	if (!keyboard) return;
 	keyboard->deleteLater();
 	keyboard = nullptr;
@@ -61,117 +64,4 @@ void InputMethodHandle::zwp_input_method_v2_unavailable() {
 	) << "Compositor denied input method request, likely due to one already existing elsewhere";
 }
 
-InputMethodKeyboardGrab::InputMethodKeyboardGrab(
-    QObject* parent,
-    ::zwp_input_method_keyboard_grab_v2* keyboard
-)
-    : QObject(parent)
-    , zwp_input_method_keyboard_grab_v2(keyboard) {}
-
-InputMethodKeyboardGrab::~InputMethodKeyboardGrab() {
-	this->release();
-}
-
-void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_keymap(
-    uint32_t format,
-    int32_t fd,
-    uint32_t size
-) {
-	// https://wayland-book.com/seat/keyboard.html
-	assert(format == WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1);
-
-	char* mapShm = static_cast<char*>(mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, 0));
-	assert(mapShm != MAP_FAILED);
-
-	xkb_keymap_unref(xkbKeymap);
-	this->xkbKeymap = xkb_keymap_new_from_string(
-	    this->xkbContext,
-	    mapShm,
-	    XKB_KEYMAP_FORMAT_TEXT_V1,
-	    XKB_KEYMAP_COMPILE_NO_FLAGS
-	);
-
-	munmap(mapShm, size);
-	close(fd);
-
-	xkb_state_unref(xkbState);
-	this->xkbState = xkb_state_new(this->xkbKeymap);
-
-	// a hack to reset the keyboard on the client that has focus
-	auto vk = VirtualKeyboardManager::instance()->createVirtualKeyboard(xkbKeymap);
-	vk->sendKey(vk->toKey('\r'), WL_KEYBOARD_KEY_STATE_RELEASED);
-}
-
-void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
-    uint32_t serial,
-    uint32_t /*time*/, // TODO key repeat
-    uint32_t key,
-    uint32_t state
-) {
-
-	if (serial <= mSerial) return;
-	mSerial = serial;
-
-	xkb_keysym_t sym = xkb_state_key_get_one_sym(xkbState, key + 8);
-	if (sym == XKB_KEY_Escape) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit escapePress();
-		return;
-	}
-	if (sym == XKB_KEY_Return) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit returnPress();
-		return;
-	}
-	if (sym == XKB_KEY_Up) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(UP);
-		return;
-	}
-	if (sym == XKB_KEY_Down) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(DOWN);
-		return;
-	}
-	if (sym == XKB_KEY_Left) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(LEFT);
-		return;
-	}
-	if (sym == XKB_KEY_Right) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(RIGHT);
-		return;
-	}
-	if (sym == XKB_KEY_BackSpace) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit backspacePress();
-		return;
-	}
-	if (sym == XKB_KEY_Delete) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit deletePress();
-		return;
-	}
-	if (sym >= XKB_KEY_space && sym <= XKB_KEY_ydiaeresis)
-	{                // Should we limit the keyboard like this?
-		char buf[128]; // NOLINT
-		xkb_state_key_get_utf8(xkbState, key + 8, buf, sizeof(buf));
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit keyPress(buf);
-		return;
-	}
-}
-
-void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_modifiers(
-    uint32_t serial,
-    uint32_t modsDepressed,
-    uint32_t modsLatched,
-    uint32_t modsLocked,
-    uint32_t group
-) {
-	if (serial <= mSerial) return;
-	mSerial = serial;
-	xkb_state_update_mask(xkbState, modsDepressed, modsLatched, modsLocked, group, group, group);
-}
-
-void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_repeat_info(
-    int32_t rate,
-    int32_t delay
-) {
-	mRate = rate;
-	mDelay = delay;
-}
-
 } // namespace qs::wayland::input_method::impl

src/wayland/input_method/input_method.hpp

@@ -4,61 +4,10 @@
 #include <qpointer.h>
 #include <qtclasshelpermacros.h>
 #include <qwayland-input-method-unstable-v2.h>
-#include <xkbcommon/xkbcommon.h>
-#include "types.hpp"
 
 namespace qs::wayland::input_method::impl {
 
-class InputMethodHandle;
-
-class InputMethodPopupSurface: QObject {
-	Q_OBJECT;
-};
-
-class InputMethodKeyboardGrab
-    : public QObject
-    , private QtWayland::zwp_input_method_keyboard_grab_v2 {
-	Q_OBJECT;
-
-public:
-	explicit InputMethodKeyboardGrab(QObject* parent, ::zwp_input_method_keyboard_grab_v2* keyboard);
-	~InputMethodKeyboardGrab() override;
-	Q_DISABLE_COPY_MOVE(InputMethodKeyboardGrab);
-
-signals:
-	void keyPress(const QString& text);
-	void escapePress();
-	void returnPress();
-	void directionPress(DirectionKey);
-	void backspacePress();
-	void deletePress();
-
-private:
-	void
-	zwp_input_method_keyboard_grab_v2_keymap(uint32_t format, int32_t fd, uint32_t size) override;
-	void zwp_input_method_keyboard_grab_v2_key(
-	    uint32_t serial,
-	    uint32_t time,
-	    uint32_t key,
-	    uint32_t state
-	) override;
-	void zwp_input_method_keyboard_grab_v2_modifiers(
-	    uint32_t serial,
-	    uint32_t modsDepressed,
-	    uint32_t modsLatched,
-	    uint32_t modsLocked,
-	    uint32_t group
-	) override;
-	void zwp_input_method_keyboard_grab_v2_repeat_info(int32_t rate, int32_t delay) override;
-
-	uint32_t mSerial = 0;
-	int32_t mRate = 0;
-	int32_t mDelay = 0;
-
-	xkb_context* xkbContext = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-	xkb_keymap* xkbKeymap = nullptr;
-	xkb_state *xkbState = nullptr; 
-};
+class InputMethodKeyboardGrab;
 
 class InputMethodHandle
     : public QObject