From 2b81d096264bfdfc6ff35bbe3c3eec2c93a01ada Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:48:52 +0200
Subject: [PATCH] src/keyboard.c: always try to remove keys from the pressed
 set on release

Fixes: #1200
Reported-by: @kyak
---
 src/keyboard.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index df8bce68..2d6cae7c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -241,9 +241,16 @@ handle_compositor_keybindings(struct keyboard *keyboard,
 		is_layout_switch |= translated.syms[i] == XKB_KEY_ISO_Next_Group;
 	}
 
-	if (!is_modifier && !is_layout_switch) {
-		key_state_set_pressed(event->keycode,
-			event->state == WL_KEYBOARD_KEY_STATE_PRESSED);
+	/*
+	 * An earlier press event from a key that causes a layout change event
+	 * might have been added already without us knowing that it actually was
+	 * a XKB_KEY_ISO_Next_Group sym. Thus we always try to remove the current
+	 * key from the set of pressed keys on release.
+	 */
+	if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+		key_state_set_pressed(event->keycode, false);
+	} else if (!is_modifier && !is_layout_switch) {
+		key_state_set_pressed(event->keycode, true);
 	}
 
 	/*