Adapt Redial to active keys cache

Because the active key for redial was getting cached as the key being pressed,
Redial would only ever see a key toggled on event for `Key_Redial`. It would
then set `redial_held_` to `true`, but it would never get set to `false` on the
key's release.

This change both fixes it and simplifies the plugin as it is adapted to the
active keys cache by doing away with unnecessary state variables, including
`redial_held_`.

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

src/kaleidoscope/plugin/Redial.cpp

@@ -21,27 +21,16 @@
 namespace kaleidoscope {
 namespace plugin {
 
-Key Redial::key_to_redial_;
 Key Redial::last_key_;
-bool Redial::redial_held_ = false;
 
 EventHandlerResult Redial::onKeyswitchEvent(Key &mapped_key, KeyAddr key_addr, uint8_t key_state) {
-  if (mapped_key == Key_Redial) {
+  if (keyToggledOn(key_state)) {
-    if (keyToggledOff(key_state))
+    if (mapped_key == Key_Redial) {
-      key_to_redial_ = last_key_;
+      mapped_key = last_key_;
-
+    } else if (shouldRemember(mapped_key)) {
-    mapped_key = key_to_redial_;
+      last_key_ = mapped_key;
-    redial_held_ = keyIsPressed(key_state);
+    }
-
-    return EventHandlerResult::OK;
   }
-
-  if (keyToggledOn(key_state) && shouldRemember(mapped_key)) {
-    last_key_ = mapped_key;
-    if (!redial_held_)
-      key_to_redial_ = mapped_key;
-  }
-
   return EventHandlerResult::OK;
 }
 

src/kaleidoscope/plugin/Redial.h

@@ -34,9 +34,7 @@ class Redial : public kaleidoscope::Plugin {
   EventHandlerResult onKeyswitchEvent(Key &mapped_key, KeyAddr key_addr, uint8_t key_state);
 
  private:
-  static Key key_to_redial_;
   static Key last_key_;
-  static bool redial_held_;
 };
 
 }