Break modifier latches when a group is latched

This ensures the behavior is as expected when using latched groups
to implement e.g. “additional symbols” layers.

Signed-off-by: Jules Bertholet <[email protected]>

Author: Jules-Bertholet

changes/api/+group-latches-break-mod-latches.breaking.md

@@ -0,0 +1 @@
+Changed latching behavior so that latching a group breaks active modifier latches.

src/state.c

@@ -328,6 +328,9 @@ xkb_action_breaks_latch(const union xkb_action *action, bool is_group_latch)
     case ACTION_TYPE_CTRL_SET:
     case ACTION_TYPE_CTRL_LOCK:
         return true;
+    case ACTION_TYPE_GROUP_LATCH:
+        // Group latches break mod latches, but not other group latches
+        return !is_group_latch;
     default:
         return false;
     }
@@ -410,7 +413,7 @@ xkb_filter_group_latch_func(struct xkb_state *state,
                 /* XXX beep beep! */
                 return XKB_FILTER_CONSUME;
             }
-            else if (xkb_action_breaks_latch(&(actions[k]))) {
+            else if (xkb_action_breaks_latch(&(actions[k]), true)) {
                 /* Breaks the latch */
                 state->components.latched_group = 0;
                 filter->func = NULL;
@@ -566,7 +569,7 @@ xkb_filter_mod_latch_func(struct xkb_state *state,
                 /* XXX beep beep! */
                 return XKB_FILTER_CONSUME;
             }
-            else if (xkb_action_breaks_latch(&(actions[k]))) {
+            else if (xkb_action_breaks_latch(&(actions[k]), false)) {
                 /* XXX: This may be totally broken, we might need to break the
                 *      latch in the next run after this press? */
                 state->components.latched_mods &= ~filter->action.mods.mods.mask;