key repeat

Author: CMurtagh-LGTM

src/wayland/input_method/key_map_state.cpp

@@ -97,6 +97,10 @@ std::string_view KeyMapState::keyStateName(wl_keyboard_key_state state) {
 	}
 }
 
+bool KeyMapState::keyRepeats(xkb_keycode_t key) const {
+	 return xkb_keymap_key_repeats(this->xkbKeymap, key);
+}
+
 xkb_context* KeyMapState::xkbContext = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 
 } // namespace qs::wayland::input_method::impl

src/wayland/input_method/key_map_state.hpp

@@ -50,6 +50,8 @@ class KeyMapState {
 
 	static std::string_view keyStateName(wl_keyboard_key_state state);
 
+	[[nodiscard]] bool keyRepeats(xkb_keycode_t key) const;
+
 private:
 	static xkb_context* xkbContext;
 	xkb_keymap* xkbKeymap = nullptr;

src/wayland/input_method/keyboard_grab.cpp

@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <vector>
 
-#include <qlogging.h>
+#include <qdebug.h>
 #include <qobject.h>
 #include <qtmetamacros.h>
 #include <qwayland-input-method-unstable-v2.h>
@@ -25,7 +25,12 @@ InputMethodKeyboardGrab::InputMethodKeyboardGrab(
     ::zwp_input_method_keyboard_grab_v2* keyboard
 )
     : QObject(parent)
-    , zwp_input_method_keyboard_grab_v2(keyboard) {}
+    , zwp_input_method_keyboard_grab_v2(keyboard) {
+	this->mRepeatTimer.callOnTimeout(this, [&](){
+		this->mRepeatTimer.setInterval(1000 / this->mRepeatRate);
+		handleKey(mRepeatKey);
+	});
+}
 
 InputMethodKeyboardGrab::~InputMethodKeyboardGrab() {
 	this->release();
@@ -108,38 +113,58 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 		this->mKeyState[key - this->mKeyMapState.minKeycode()] = KeyState::RELEASED;
 	}
 
+	if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+		bool keyHandled = handleKey(key);
+		if (keyHandled){
+			if (this->mKeyMapState.keyRepeats(key) && this->mRepeatRate > 0) {
+				this->mRepeatKey = key;
+				this->mRepeatTimer.setInterval(this->mRepeatDelay);
+				this->mRepeatTimer.start();
+			}
+			return;
+		}
+	}
+
+	if (this->mRepeatKey == key) {
+		this->mRepeatTimer.stop();
+	}
+
+	this->mVirturalKeyboard->sendKey(key, static_cast<wl_keyboard_key_state>(state));
+}
+
+bool InputMethodKeyboardGrab::handleKey(xkb_keycode_t key){
+	const xkb_keysym_t sym = this->mKeyMapState.getOneSym(key);
 	if (sym == XKB_KEY_Up) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(DirectionKey::UP);
-		return;
+		emit directionPress(DirectionKey::UP);
+		return true;
 	}
 	if (sym == XKB_KEY_Down) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(DirectionKey::DOWN);
-		return;
+		emit directionPress(DirectionKey::DOWN);
+		return true;
 	}
 	if (sym == XKB_KEY_Left) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(DirectionKey::LEFT);
-		return;
+		emit directionPress(DirectionKey::LEFT);
+		return true;
 	}
 	if (sym == XKB_KEY_Right) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit directionPress(DirectionKey::RIGHT);
-		return;
+		emit directionPress(DirectionKey::RIGHT);
+		return true;
 	}
 	if (sym == XKB_KEY_BackSpace) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit backspacePress();
-		return;
+		emit backspacePress();
+		return true;
 	}
 	if (sym == XKB_KEY_Delete) {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit deletePress();
-		return;
+		emit deletePress();
+		return true;
 	}
 
 	const QChar character = this->mKeyMapState.getChar(key);
 	if (character != '\0') {
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit keyPress(character);
-		return;
-	} else {
-		this->mVirturalKeyboard->sendKey(key, static_cast<wl_keyboard_key_state>(state));
+		emit keyPress(character);
+		return true;
 	}
+	return false;
 }
 
 void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_modifiers(
@@ -158,8 +183,11 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_modifiers(
 }
 
 void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_repeat_info(
-    int32_t /*rate*/,
-    int32_t /*delay*/
-) {}
+    int32_t rate,
+    int32_t delay
+) {
+	mRepeatRate = rate;
+	mRepeatDelay = delay;
+}
 
 } // namespace qs::wayland::input_method::impl

src/wayland/input_method/keyboard_grab.hpp

@@ -3,6 +3,7 @@
 #include <qobject.h>
 #include <qtclasshelpermacros.h>
 #include <qwayland-input-method-unstable-v2.h>
+#include <qtimer.h>
 
 #include "key_map_state.hpp"
 #include "types.hpp"
@@ -55,6 +56,8 @@ class InputMethodKeyboardGrab
 	) override;
 	void zwp_input_method_keyboard_grab_v2_repeat_info(int32_t rate, int32_t delay) override;
 
+	bool handleKey(xkb_keycode_t key);
+
 	uint32_t mSerial = 0;
 
 	enum class KeyState : bool {
@@ -64,6 +67,13 @@ class InputMethodKeyboardGrab
 	std::vector<KeyState> mKeyState;
 	KeyMapState mKeyMapState;
 
+	QTimer mRepeatTimer;
+	// Keys per second
+	int32_t mRepeatRate = 25;
+	// milliseconds before first repeat
+	int32_t mRepeatDelay = 400;
+	xkb_keycode_t mRepeatKey = 0;
+
 	std::unique_ptr<VirtualKeyboardHandle> mVirturalKeyboard;
 };
 

src/wayland/input_method/qml_helpers.cpp

@@ -29,7 +29,7 @@ void KeyboardTextEdit::setTransform(const QJSValue& callback) {
 int KeyboardTextEdit::cursor() const { return this->mCursor; }
 void KeyboardTextEdit::setCursor(int value) {
 	value = std::max(value, 0);
-	value = std::min(value, static_cast<int>(this->mEditText.size() - 1));
+	value = std::min(value, static_cast<int>(this->mEditText.size()));
 	if (this->mCursor == value) return;
 	this->mCursor = value;
 	this->updatePreedit();