Added keymapperctl --input and --output. 2nd

houmain · Sep 1, 2024 · 971e163 · 971e163
1 parent b2e8e51
commit 971e163
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/src/config/get_key_name.cpp b/src/config/get_key_name.cpp
@@ -287,7 +287,7 @@ Key get_key_by_name(std::string_view name) {
     return Key::Shift;
   if (name == "Control")
     return Key::Control;
-    if (name == "Meta")
+  if (name == "Meta")
     return Key::Meta;
 
   // allow some aliases

diff --git a/src/runtime/Stage.cpp b/src/runtime/Stage.cpp
@@ -74,10 +74,14 @@ namespace {
     return false;
   }
 
+  bool has_device_filter(const Stage::Context& context) {
+    return (context.device_filter ||
+            context.device_id_filter);
+  }
+
   bool has_device_filter(const std::vector<Stage::Context>& contexts) {
     for (const auto& context : contexts)
-      if (context.device_filter ||
-          context.device_id_filter)
+      if (has_device_filter(context))
         return true;
     return false;
   }
@@ -160,21 +164,31 @@ std::vector<Key> Stage::get_output_keys_down() const {
 }
 
 void Stage::evaluate_device_filters(const std::vector<DeviceDesc>& device_descs) {
-  for (auto& context : m_contexts) {
-    context.matching_device_bits = { };
-    auto bit = decltype(context.matching_device_bits){ 1 };
-    for (const auto& device_desc : device_descs) {  
-      if (context.device_filter.matches(device_desc.name, false) &&
-          context.device_id_filter.matches(device_desc.id, false))
-        context.matching_device_bits |= bit;
-      bit <<= 1;
+  for (auto& context : m_contexts)
+    if (has_device_filter(context)) {
+      context.matching_device_bits = { };
+      auto bit = decltype(context.matching_device_bits){ 1 };
+      for (const auto& device_desc : device_descs) {
+        if (context.device_filter.matches(device_desc.name, false) &&
+            context.device_id_filter.matches(device_desc.id, false))
+          context.matching_device_bits |= bit;
+        bit <<= 1;
+      }
+    }
+    else {
+      context.matching_device_bits = all_device_bits;
     }
-  }
 }
 
 bool Stage::device_matches_filter(const Context& context, int device_index) const {
-  return (device_index == any_device_index ||
-         ((context.matching_device_bits >> device_index) & 1));
+  if (device_index == any_device_index)
+    return true;
+
+  // no-device only matches contexts with default device
+  if (device_index == no_device_index)
+    return (context.matching_device_bits == all_device_bits);
+
+  return ((context.matching_device_bits >> device_index) & 1);
 }
 
 KeySequence Stage::set_active_client_contexts(const std::vector<int> &indices) {

diff --git a/src/runtime/Stage.h b/src/runtime/Stage.h
@@ -12,6 +12,7 @@ class Stage {
 public:
   static const int no_device_index = -1;
   static const int any_device_index = -2;
+  static const uint64_t all_device_bits = ~uint64_t{ };
 
   struct Input {
     KeySequence input;
@@ -31,7 +32,7 @@ class Stage {
     Filter device_filter;
     Filter device_id_filter;
     KeySequence modifier_filter;
-    uint64_t matching_device_bits = ~uint64_t{ };
+    uint64_t matching_device_bits = all_device_bits;
     bool invert_modifier_filter{ };
     bool fallthrough{ };
   };