Adapt Cycle plugin to KeyEvent handlers

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>

plugins/Kaleidoscope-Cycle/src/kaleidoscope/plugin/Cycle.cpp

@@ -25,6 +25,7 @@ namespace kaleidoscope {
 namespace plugin {
 // --- state ---
 Key Cycle::last_non_cycle_key_;
+KeyAddr Cycle::cycle_key_addr_{KeyAddr::invalid_state};
 uint8_t Cycle::current_modifier_flags_;
 uint8_t Cycle::cycle_count_;
 
@@ -35,15 +36,12 @@ uint8_t Cycle::cycle_count_;
 // --- api ---
 
 void Cycle::replace(Key key) {
-  handleKeyswitchEvent(Key_Backspace, UnknownKeyswitchLocation, IS_PRESSED | INJECTED);
+  if (cycle_key_addr_ == KeyAddr{KeyAddr::invalid_state})
-  kaleidoscope::Runtime.hid().keyboard().sendReport();
+    return;
-  handleKeyswitchEvent(Key_Backspace, UnknownKeyswitchLocation, WAS_PRESSED | INJECTED);
+  Runtime.handleKeyEvent(KeyEvent{cycle_key_addr_, IS_PRESSED | INJECTED, Key_Backspace});
-  kaleidoscope::Runtime.hid().keyboard().sendReport();
+  Runtime.handleKeyEvent(KeyEvent{cycle_key_addr_, WAS_PRESSED | INJECTED, Key_Backspace});
-
+  Runtime.handleKeyEvent(KeyEvent{cycle_key_addr_, IS_PRESSED | INJECTED, key});
-  handleKeyswitchEvent(key, UnknownKeyswitchLocation, IS_PRESSED | INJECTED);
+  Runtime.handleKeyEvent(KeyEvent{cycle_key_addr_, WAS_PRESSED | INJECTED, key});
-  kaleidoscope::Runtime.hid().keyboard().sendReport();
-  handleKeyswitchEvent(key, UnknownKeyswitchLocation, WAS_PRESSED | INJECTED);
-  kaleidoscope::Runtime.hid().keyboard().sendReport();
 }
 
 void Cycle::replace(uint8_t cycle_size, const Key cycle_steps[]) {
@@ -57,35 +55,29 @@ EventHandlerResult Cycle::onNameQuery() {
   return ::Focus.sendName(F("Cycle"));
 }
 
-EventHandlerResult Cycle::onKeyswitchEvent(Key &mapped_key, KeyAddr key_addr, uint8_t key_state) {
+EventHandlerResult Cycle::onKeyEvent(KeyEvent &event) {
-  if (key_state & INJECTED)
+  if (event.state & INJECTED)
     return EventHandlerResult::OK;
 
-  if (!keyIsPressed(key_state) && !keyWasPressed(key_state)) {
+  if (!isCycle(event.key)) {
-    if (isCycle(mapped_key)) {
+    if (keyToggledOn(event.state)) {
-      return EventHandlerResult::EVENT_CONSUMED;
+      current_modifier_flags_ |= toModFlag(event.key.getKeyCode());
-    }
+      last_non_cycle_key_.setKeyCode(event.key.getKeyCode());
-    return EventHandlerResult::OK;
-  }
-
-  if (!isCycle(mapped_key)) {
-    if (keyToggledOn(key_state)) {
-      current_modifier_flags_ |= toModFlag(mapped_key.getKeyCode());
-      last_non_cycle_key_.setKeyCode(mapped_key.getKeyCode());
       last_non_cycle_key_.setFlags(current_modifier_flags_);
       cycle_count_ = 0;
     }
-    if (keyToggledOff(key_state)) {
+    if (keyToggledOff(event.state)) {
-      current_modifier_flags_ &= ~toModFlag(mapped_key.getKeyCode());
+      current_modifier_flags_ &= ~toModFlag(event.key.getKeyCode());
     }
     return EventHandlerResult::OK;
   }
 
-  if (!keyToggledOff(key_state)) {
+  if (!keyToggledOff(event.state)) {
     return EventHandlerResult::EVENT_CONSUMED;
   }
 
   ++cycle_count_;
+  cycle_key_addr_ = event.addr;
   cycleAction(last_non_cycle_key_, cycle_count_);
   return EventHandlerResult::EVENT_CONSUMED;
 }

plugins/Kaleidoscope-Cycle/src/kaleidoscope/plugin/Cycle.h

@@ -37,11 +37,12 @@ class Cycle : public kaleidoscope::Plugin {
   static void replace(uint8_t cycle_size, const Key cycle_steps[]);
 
   EventHandlerResult onNameQuery();
-  EventHandlerResult onKeyswitchEvent(Key &mapped_key, KeyAddr key_addr, uint8_t key_state);
+  EventHandlerResult onKeyEvent(KeyEvent &event);
 
  private:
   static uint8_t toModFlag(uint8_t keyCode);
   static Key last_non_cycle_key_;
+  static KeyAddr cycle_key_addr_;
   static uint8_t cycle_count_;
   static uint8_t current_modifier_flags_;
 };