Clear mods properly with |=

Fixes xkbcommon#583
Jules-Bertholet · Jan 8, 2025 · 4cd5209 · 4cd5209
1 parent d2eb860
commit 4cd5209
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/src/state.c b/src/state.c
@@ -478,7 +478,7 @@ xkb_filter_mod_set_func(struct xkb_state *state,
         return XKB_FILTER_CONSUME;
     }
 
-    state->clear_mods = filter->action.mods.mods.mask;
+    state->clear_mods |= filter->action.mods.mods.mask;
     if (filter->action.mods.flags & ACTION_LOCK_CLEAR)
         state->components.locked_mods &= ~filter->action.mods.mods.mask;
 
@@ -587,13 +587,13 @@ xkb_filter_mod_latch_func(struct xkb_state *state,
                 state->components.latched_mods &=
                     ~filter->action.mods.mods.mask;
             else
-                state->clear_mods = filter->action.mods.mods.mask;
+                state->clear_mods |= filter->action.mods.mods.mask;
             state->components.locked_mods &= ~filter->action.mods.mods.mask;
             filter->func = NULL;
         }
         else {
             latch = LATCH_PENDING;
-            state->clear_mods = filter->action.mods.mods.mask;
+            state->clear_mods |= filter->action.mods.mods.mask;
             state->components.latched_mods |= filter->action.mods.mods.mask;
             /* XXX beep beep! */
         }

diff --git a/test/data/keycodes/evdev b/test/data/keycodes/evdev
@@ -291,6 +291,7 @@ default xkb_keycodes "evdev" {
 
 	// Fake keycodes for virtual keys
 	<LVL3> =   92;
+	<LVL5> =   500;
 	<MDSW> =   203;
 	<ALT>  =   204;
 	<META> =   205;

diff --git a/test/data/symbols/issue583 b/test/data/symbols/issue583
@@ -0,0 +1,13 @@
+default partial alphanumeric_keys
+xkb_symbols "base" {
+	name[Group1] = "Test issue #583";
+
+	key <AB01> { [ z, Z, y, Y, ezh, EZH, ydiaeresis, Ydiaeresis ], type[Group1] = "EIGHT_LEVEL" };
+
+	key <LCTL> { [ Control_L ] };
+
+	key <RALT> { [ ISO_Level3_Latch, ISO_Level5_Latch ], type[Group1] = "PC_CONTROL_LEVEL2" };
+
+	key <LVL5> { [ ISO_Level5_Shift ] };
+	modifier_map Mod3 { <LVL5> };
+};
diff --git a/test/keyseq.c b/test/keyseq.c
@@ -365,6 +365,28 @@ test_explicit_actions(struct xkb_context *ctx)
     }
 }
 
+static void
+test_583(struct xkb_context *context)
+{
+    struct xkb_keymap *keymap;
+
+    keymap = test_compile_rules(context, "evdev", "evdev", "issue583", "", "");
+    assert(keymap);
+
+    assert(test_key_seq(keymap,
+              KEY_LEFTCTRL , DOWN, XKB_KEY_Control_L        , // Set Control
+        NEXT, KEY_RIGHTALT , BOTH, XKB_KEY_ISO_Level5_Latch , // Latch Level5
+        NEXT, KEY_LEFTCTRL , UP  , XKB_KEY_Control_L        , // Unset Control
+        NEXT, KEY_RIGHTALT , BOTH, XKB_KEY_ISO_Level3_Latch , // Latch Level3
+        NEXT, KEY_Z        , BOTH, XKB_KEY_ydiaeresis       , // Unlatch Level3, unlatch Level5
+        NEXT, KEY_Z        , BOTH, XKB_KEY_z                ,
+        NEXT, KEY_Z        , BOTH, XKB_KEY_z                ,
+
+        FINISH));
+
+    xkb_keymap_unref(keymap);
+}
+
 int
 main(void)
 {
@@ -375,6 +397,7 @@ main(void)
 
     assert(ctx);
 
+    test_583(ctx);
     test_group_latch(ctx);
     test_explicit_actions(ctx);