Add is_keyboard,is_pointing_device,is_game_pad into libkrbn_hid_value…

…_arrived
pqrs-org · Aug 16, 2024 · 0c0c70e · 0c0c70e
1 parent d2aeb4a
commit 0c0c70e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/appendix/GamePadViewer/src/EventObserver.swift b/appendix/GamePadViewer/src/EventObserver.swift
@@ -2,14 +2,19 @@ import SwiftUI
 
 private func callback(
   _ deviceId: UInt64,
+  _ isKeyboard: Bool,
+  _ isPointingDevice: Bool,
+  _ isGamePad: Bool,
   _ usagePage: Int32,
   _ usage: Int32,
   _ logicalMax: Int64,
   _ logicalMin: Int64,
   _ integerValue: Int64
 ) {
-  Task { @MainActor in
-    EventObserver.shared.update(usagePage, usage, logicalMax, logicalMin, integerValue)
+  if isGamePad {
+    Task { @MainActor in
+      EventObserver.shared.update(usagePage, usage, logicalMax, logicalMin, integerValue)
+    }
   }
 }
 

diff --git a/src/apps/EventViewer/src/EventHistory.swift b/src/apps/EventViewer/src/EventHistory.swift
@@ -2,6 +2,9 @@ import SwiftUI
 
 private func callback(
   _ deviceId: UInt64,
+  _ isKeyboard: Bool,
+  _ isPointingDevice: Bool,
+  _ isGamePad: Bool,
   _ usagePage: Int32,
   _ usage: Int32,
   _ logicalMax: Int64,

diff --git a/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp b/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp
@@ -55,8 +55,10 @@ class libkrbn_hid_value_monitor final : public pqrs::dispatcher::extra::dispatch
           observed_ = true;
         });
 
-        hid_queue_value_monitor->values_arrived.connect([this, device_id](auto&& values_ptr) {
-          values_arrived(device_id, values_ptr);
+        hid_queue_value_monitor->values_arrived.connect([this, device_id, device_properties](auto&& values_ptr) {
+          values_arrived(device_id,
+                         device_properties,
+                         values_ptr);
         });
 
         hid_queue_value_monitor->async_start(kIOHIDOptionsTypeNone,
@@ -104,6 +106,7 @@ class libkrbn_hid_value_monitor final : public pqrs::dispatcher::extra::dispatch
 
 private:
   void values_arrived(krbn::device_id device_id,
+                      gsl::not_null<std::shared_ptr<krbn::device_properties>> device_properties,
                       std::shared_ptr<std::vector<pqrs::cf::cf_ptr<IOHIDValueRef>>> values) {
     for (const auto& value : *values) {
       auto v = pqrs::osx::iokit_hid_value(*value);
@@ -114,6 +117,9 @@ class libkrbn_hid_value_monitor final : public pqrs::dispatcher::extra::dispatch
             if (auto logical_min = v.get_logical_min()) {
               for (const auto& c : callback_manager_.get_callbacks()) {
                 c(type_safe::get(device_id),
+                  device_properties->get_is_keyboard().value_or(false),
+                  device_properties->get_is_pointing_device().value_or(false),
+                  device_properties->get_is_game_pad().value_or(false),
                   type_safe::get(*usage_page),
                   type_safe::get(*usage),
                   *logical_max,

diff --git a/src/lib/libkrbn/include/libkrbn/libkrbn.h b/src/lib/libkrbn/include/libkrbn/libkrbn.h
@@ -486,6 +486,9 @@ void libkrbn_enable_hid_value_monitor(void);
 void libkrbn_disable_hid_value_monitor(void);
 
 typedef void (*libkrbn_hid_value_arrived)(uint64_t device_id,
+                                          bool is_keyboard,
+                                          bool is_pointing_device,
+                                          bool is_game_pad,
                                           int32_t usage_page,
                                           int32_t usage,
                                           int64_t logical_max,