Fixed keyrepeat might match

houmain · Jan 20, 2021 · 725d563 · 725d563
1 parent c8adf82
commit 725d563
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/runtime/Stage.cpp b/src/runtime/Stage.cpp
@@ -93,9 +93,12 @@ KeySequence Stage::apply_input(const KeyEvent event) {
   if (event.state == KeyState::Down) {
     // merge key repeats
     auto it = find_key(m_sequence, event.key);
-    if (it != end(m_sequence))
-      if (it->state == KeyState::DownMatched)
+    if (it != end(m_sequence)) {
+      const auto is_repeat = !std::count(m_sequence.begin(), m_sequence.end(),
+        KeyEvent{ event.key, KeyState::Up });
+      if (is_repeat)
         m_sequence.erase(it);
+    }
   }
   m_sequence.push_back(event);
 

diff --git a/src/test/test1_ParseConfig.cpp b/src/test/test1_ParseConfig.cpp
@@ -105,6 +105,15 @@ TEST_CASE("Problems", "[ParseConfig]") {
     C >> CommandA
   )";
   REQUIRE_THROWS(parse_config(string));
+
+  // no default mapping (which is ok)
+  string = R"(
+    C >> CommandA
+
+    [window class='']
+    CommandA >> D
+  )";
+  REQUIRE_NOTHROW(parse_config(string));
 }
 
 //--------------------------------------------------------------------

diff --git a/src/test/test3_Stage.cpp b/src/test/test3_Stage.cpp
@@ -580,5 +580,19 @@ TEST_CASE("Might match, then no match or match", "[Stage]") {
   REQUIRE(apply_input(stage, "+B") == "+2");
   REQUIRE(apply_input(stage, "-B") == "-2");
 }
+//--------------------------------------------------------------------
+
+TEST_CASE("Keyrepeat might match", "[Stage]") {
+  auto config = R"(
+    Meta{C} >> Control{C}
+  )";
+  Stage stage = create_stage(config);
+
+  REQUIRE(apply_input(stage, "+MetaLeft") == "");
+  REQUIRE(apply_input(stage, "+MetaLeft") == "");
+  REQUIRE(apply_input(stage, "+C") == "+ControlLeft +C");
+  REQUIRE(apply_input(stage, "-C") == "-ControlLeft -C");
+  REQUIRE(apply_input(stage, "-MetaLeft") == "");
+}
 
 //--------------------------------------------------------------------