Fixed device context fallthrough (#277)

Author: houmain

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Not blocking when opening configuration from tray on Linux (#220).
 - Fixed focus update when xwayland app is minimized to tray (#220).
+- Fixed device context fallthrough (#277).
 - Optimized SVG icon.
 
 ## [Version 4.12.1] - 2025-05-20

src/runtime/Stage.cpp

@@ -199,7 +199,7 @@ KeySequence Stage::set_active_client_contexts(const std::vector<int> &indices) {
     assert(i >= 0 && i < static_cast<int>(m_contexts.size()));
 
   m_active_client_contexts = indices;
-  update_active_contexts();
+  update_active_contexts(any_device_index);
 
   // cancel output on release when the focus changed
   cancel_inactive_output_on_release();
@@ -218,15 +218,15 @@ bool Stage::match_context_modifier_filter(const KeySequence& modifiers) {
   return true;
 }
 
-void Stage::update_active_contexts() {
+void Stage::update_active_contexts(int device_index) {
   std::swap(m_prev_active_contexts, m_active_contexts);
 
   // evaluate modifier and device filter of contexts which were set active by client
   m_active_contexts.clear();
   for (auto index : m_active_client_contexts) {
     const auto& context = m_contexts[index];
     if ((match_context_modifier_filter(context.modifier_filter) ^ context.invert_modifier_filter) &&
-        ((!context.device_filter && !context.device_id_filter) || context.matching_device_bits)) {
+         device_matches_filter(context, device_index)) {
       index = fallthrough_context(index);
       if (m_active_contexts.empty() || m_active_contexts.back() != index)
         m_active_contexts.push_back(index);
@@ -385,9 +385,6 @@ auto Stage::match_input(bool first_iteration, bool matched_are_optional,
 
   for (auto context_index : m_active_contexts) {
     const auto& context = m_contexts[context_index];
-    if (!device_matches_filter(context, device_index))
-      continue;
-
     for (const auto& context_input : context.inputs) {
       const auto& input = context_input.input;
       const auto no_might_match_mapping = 
@@ -508,7 +505,7 @@ void Stage::apply_input(const KeyEvent event, int device_index) {
   }
 
   // update contexts with modifier filter
-  update_active_contexts();
+  update_active_contexts(device_index);
 
   if (event.state == KeyState::Up) {
 
@@ -668,7 +665,7 @@ void Stage::apply_input(const KeyEvent event, int device_index) {
     release_triggered(event.key);
 
   // update contexts with modifier filter
-  update_active_contexts();
+  update_active_contexts(device_index);
 
   // remove matched timeout events
   while (!m_sequence.empty() && 

src/runtime/Stage.h

@@ -73,7 +73,7 @@ class Stage {
   void update_output(const KeyEvent& event, const Trigger& trigger, int context_index = -1);
   void finish_sequence(ConstKeySequenceRange sequence);
   bool match_context_modifier_filter(const KeySequence& modifiers);
-  void update_active_contexts();
+  void update_active_contexts(int device_index);
   bool continue_output_on_release(const KeyEvent& event, int context_index = -1);
   void cancel_inactive_output_on_release();
   int fallthrough_context(int context_index) const;

src/test/test4_Server.cpp

@@ -139,7 +139,11 @@ namespace {
       indices.push_back(i);
     state.set_active_contexts(indices);
 
-    state.set_device_descs({ DeviceDesc{ "Device0" } });
+    state.set_device_descs({ 
+      DeviceDesc{ "Device0" },
+      DeviceDesc{ "Device1" },
+      DeviceDesc{ "Device2" },
+    });
     return state;
   }
 } // namespace
@@ -920,3 +924,23 @@ TEST_CASE("Keyrepeat triggers last matching mapping (#275)", "[Server]") {
   CHECK(state.apply_input("-C") == "");
   REQUIRE(state.stage_is_clear());
 }
+
+//--------------------------------------------------------------------
+
+TEST_CASE("Context with device filter fallthrough", "[Server]") {
+  auto state = create_state(R"(
+    [device = "Device0"]
+    [device = "Device1"]
+    A >> X
+
+    [default]
+    A >> Y
+  )");
+
+  CHECK(state.apply_input("+A", 0) == "+X");
+  CHECK(state.apply_input("-A", 0) == "-X");
+  CHECK(state.apply_input("+A", 1) == "+X");
+  CHECK(state.apply_input("-A", 1) == "-X");
+  CHECK(state.apply_input("+A", 2) == "+Y");
+  CHECK(state.apply_input("-A", 2) == "-Y");
+}