add make_device_ungrabbed_event

LiptonB · Jul 10, 2017 · 8b66c5d · 8b66c5d
1 parent 64bfe2c
commit 8b66c5d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/core/grabber/include/device_grabber.hpp b/src/core/grabber/include/device_grabber.hpp
@@ -371,7 +371,7 @@ class device_grabber final {
   }
 
   void post_device_ungrabbed_event(device_id device_id) {
-    event_queue::queued_event::event event(event_queue::queued_event::event::type::device_ungrabbed, 1);
+    auto event = event_queue::queued_event::event::type::make_device_ungrabbed_event();
     merged_input_event_queue_.emplace_back_event(device_id,
                                                  mach_absolute_time(),
                                                  event,

diff --git a/src/share/event_queue.hpp b/src/share/event_queue.hpp
@@ -54,6 +54,10 @@ class event_queue final {
         return make_virtual_event(type::device_pointing_buttons_are_released);
       }
 
+      static event make_device_ungrabbed_event(void) {
+        return make_virtual_event(type::device_ungrabbed);
+      }
+
       static event make_event_from_ignored_device(type original_type,
                                                   boost::optional<int64_t> original_integer_value) {
         event e;

diff --git a/tests/src/manipulator/test.cpp b/tests/src/manipulator/test.cpp
@@ -51,7 +51,7 @@ krbn::event_queue::queued_event::event spacebar_event(krbn::key_code::spacebar);
 krbn::event_queue::queued_event::event tab_event(krbn::key_code::tab);
 krbn::event_queue::queued_event::event up_arrow_event(krbn::key_code::up_arrow);
 
-krbn::event_queue::queued_event::event device_ungrabbed_event(krbn::event_queue::queued_event::event::type::device_ungrabbed, 1);
+auto device_ungrabbed_event = krbn::event_queue::queued_event::event::make_device_ungrabbed_event();
 } // namespace
 
 using krbn::manipulator::details::event_definition;

diff --git a/tests/src/post_event_to_virtual_devices/test.cpp b/tests/src/post_event_to_virtual_devices/test.cpp
@@ -72,7 +72,7 @@ krbn::event_queue::queued_event::event up_arrow_event(krbn::key_code::up_arrow);
 krbn::event_queue::queued_event::event button1_event(krbn::pointing_button::button1);
 krbn::event_queue::queued_event::event pointing_x_m10_event(krbn::event_queue::queued_event::event::type::pointing_x, -10);
 krbn::event_queue::queued_event::event pointing_y_10_event(krbn::event_queue::queued_event::event::type::pointing_y, 10);
-krbn::event_queue::queued_event::event device_ungrabbed_event(krbn::event_queue::queued_event::event::type::device_ungrabbed, 1);
+auto device_ungrabbed_event = krbn::event_queue::queued_event::event::make_device_ungrabbed_event();
 auto device_keys_are_released_event = krbn::event_queue::queued_event::event::make_device_keys_are_released_event();
 auto event_from_ignored_device_key_code_event = krbn::event_queue::queued_event::event::make_event_from_ignored_device(krbn::event_queue::queued_event::event::type::key_code, boost::none);
 auto event_from_ignored_device_pointing_x_100_event = krbn::event_queue::queued_event::event::make_event_from_ignored_device(krbn::event_queue::queued_event::event::type::pointing_x, 100);