skip releaying control keys that we consume and some more cleanup

Author: CMurtagh-LGTM

src/wayland/input_method/key_map_state.cpp

@@ -47,17 +47,6 @@ KeyMapState::operator bool() const {
 	return this->xkbKeymap != nullptr && this->xkbState != nullptr;
 }
 
-namespace {
-const char* getName(char key);
-}
-xkb_keycode_t KeyMapState::toKey(QChar character) const {
-	if (!*this) return XKB_KEYCODE_INVALID;
-	auto keycode = xkb_keymap_key_by_name(this->xkbKeymap, getName(character.toLatin1()));
-	if (keycode == XKB_KEYCODE_INVALID)
-		qDebug() << character << ":" << getName(character.toLatin1()) << "was not found in the keymap.";
-	return keycode;
-}
-
 const char* KeyMapState::keyName(xkb_keycode_t key) const {
 	return xkb_keymap_key_get_name(this->xkbKeymap, key);
 }
@@ -100,86 +89,10 @@ std::string_view KeyMapState::keyStateName(wl_keyboard_key_state state) {
 	switch (state) {
 	case WL_KEYBOARD_KEY_STATE_RELEASED: return "released";
 	case WL_KEYBOARD_KEY_STATE_PRESSED: return "pressed";
-#ifndef WL_KEYBOARD_KEY_STATE_REPEATED_SINCE_VERSION
-	case WL_KEYBOARD_KEY_STATE_REPEATED: return "repeated";
-#endif
 	default: return "unknown state";
 	}
 }
 
 xkb_context* KeyMapState::xkbContext = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 
-namespace {
-const char* getName(char key) {
-	switch (key) {
-	case 13: return "RTRN";
-	case 8: return "BKSP";
-	case '1': return "AE01";
-	case '2': return "AE02";
-	case '3': return "AE03";
-	case '4': return "AE04";
-	case '5': return "AE05";
-	case '6': return "AE06";
-	case '7': return "AE07";
-	case '8': return "AE08";
-	case '9': return "AE09";
-	case '0': return "AE10";
-	case 'a':
-	case 'A': return "LatA";
-	case 'b':
-	case 'B': return "LatB";
-	case 'c':
-	case 'C': return "LatC";
-	case 'd':
-	case 'D': return "LatD";
-	case 'e':
-	case 'E': return "LatE";
-	case 'f':
-	case 'F': return "LatF";
-	case 'g':
-	case 'G': return "LatG";
-	case 'h':
-	case 'H': return "LatH";
-	case 'i':
-	case 'I': return "LatI";
-	case 'j':
-	case 'J': return "LatJ";
-	case 'k':
-	case 'K': return "LatK";
-	case 'l':
-	case 'L': return "LatL";
-	case 'm':
-	case 'M': return "LatM";
-	case 'n':
-	case 'N': return "LatN";
-	case 'o':
-	case 'O': return "LatO";
-	case 'p':
-	case 'P': return "LatP";
-	case 'q':
-	case 'Q': return "LatQ";
-	case 'r':
-	case 'R': return "LatR";
-	case 's':
-	case 'S': return "LatS";
-	case 't':
-	case 'T': return "LatT";
-	case 'u':
-	case 'U': return "LatU";
-	case 'v':
-	case 'V': return "LatV";
-	case 'w':
-	case 'W': return "LatW";
-	case 'x':
-	case 'X': return "LatX";
-	case 'y':
-	case 'Y': return "LatY";
-	case 'z':
-	case 'Z': return "LatZ";
-	}
-	qDebug() << "Did not know the key name of character:" << key;
-	return "";
-}
-} // namespace
-
 } // namespace qs::wayland::input_method::impl

src/wayland/input_method/key_map_state.hpp

@@ -26,8 +26,6 @@ class KeyMapState {
 	[[nodiscard]] bool operator==(const KeyMapState& other) const;
 	[[nodiscard]] operator bool() const;
 
-	// RETURNS XKB_KEYCODE_INVALID if it wasn't found in the map
-	[[nodiscard]] xkb_keycode_t toKey(QChar character) const;
 	[[nodiscard]] const char* keyName(xkb_keycode_t key) const;
 	[[nodiscard]] xkb_keycode_t maxKeycode() const;
 	[[nodiscard]] xkb_keycode_t minKeycode() const;

src/wayland/input_method/keyboard_grab.cpp

@@ -78,18 +78,6 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 	        << this->mKeyMapState.keyName(key) << "[" << key << "]"
 	        << this->mKeyMapState.getChar(key);
 
-	if (
-	    state == WL_KEYBOARD_KEY_STATE_PRESSED
-#ifndef WL_KEYBOARD_KEY_STATE_REPEATED_SINCE_VERSION
-	    || state == WL_KEYBOARD_KEY_STATE_REPEATED
-#endif
-	)
-	{
-		this->mKeyState[key - this->mKeyMapState.minKeycode()] = KeyState::PRESSED;
-	} else if (state == WL_KEYBOARD_KEY_STATE_RELEASED) {
-		this->mKeyState[key - this->mKeyMapState.minKeycode()] = KeyState::RELEASED;
-	}
-
 	xkb_keysym_t sym = this->mKeyMapState.getOneSym(key);
 
 	if (sym == XKB_KEY_Escape) {
@@ -124,6 +112,14 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit deletePress();
 		return;
 	}
+
+	// Skip adding the control keys because we've consumed them
+	if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+		this->mKeyState[key - this->mKeyMapState.minKeycode()] = KeyState::PRESSED;
+	} else if (state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+		this->mKeyState[key - this->mKeyMapState.minKeycode()] = KeyState::RELEASED;
+	}
+
 	QChar character = this->mKeyMapState.getChar(key);
 	if (character != '\0') {
 		if (state == WL_KEYBOARD_KEY_STATE_PRESSED) emit keyPress(character);