Version of alttab using deferred exec

plodah · Nov 8, 2024 · 37e2942 · 37e2942
1 parent fe50f01
commit 37e2942
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 14 deletions.
diff --git a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/config.h b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/config.h
@@ -37,6 +37,12 @@
 // #define PLODAH_TYPINGINDICATOR_HSV 240, 84, 255
 // #define PLODAH_TYPINGINDICATOR_DURATION 600
 
+#define PLODAH_MSJIGGLER_ENABLED
+// #define PLODAH_MSJIGGLER_PATTERN 1
+// #define PLODAH_MSJIGGLER_AUTOSTOP
+#define PLODAH_MSJIGGLER_INDICATOR_RGBINDEX 43
+#define PLODAH_MSJIGGLER_INDICATOR_HSV 0x0B, 0xFF, 0xFF
+
 #define BOOTMAGIC_ROW 0
 #define BOOTMAGIC_COLUMN 0
 

diff --git a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/rules.mk b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/rules.mk
@@ -7,7 +7,7 @@ BOOTMAGIC_ENABLE = yes
 CAPS_WORD_ENABLE = yes
 COMBO_ENABLE = yes
 CONSOLE_ENABLE = no
-DEFERRED_EXEC_ENABLE = no
+DEFERRED_EXEC_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = no
 DYNAMIC_TAPPING_TERM_ENABLE = no
 ENCODER_MAP_ENABLE = yes

diff --git a/keyboards/winry/winry315/keymaps/plodah/config.h b/keyboards/winry/winry315/keymaps/plodah/config.h
@@ -4,6 +4,7 @@
 // #define KC_PL_QLYR
 #define KC_PL_QRGB
 #define KC_PL_QVER
+#define PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE
 
 // #define PLODAH_CAPS_INDIC_HSV HSV_MAGENTA
 // #define PLODAH_LAYER_INDIC_INDEX1 6

diff --git a/users/plodah/configs/ploopy-common.h b/users/plodah/configs/ploopy-common.h
@@ -1,6 +1,6 @@
 
 #define IS_MOUSE
-#define PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
+#define PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE
 #define PLODAH_MSJIGGLER_ENABLED
 #define PLODAH_MSJIGGLER_AUTOSTOP
 

diff --git a/users/plodah/functions/alttab_enhancements.c b/users/plodah/functions/alttab_enhancements.c
@@ -5,7 +5,7 @@ uint16_t alt_tab_timer = 0;
   #define PLODAH_ALT_TAB_DELAY 1000
 #endif //PLODAH_ALT_TAB_DELAY
 
-void plodah_alt_tab(bool back) {
+void plodah_alttab_start(bool back) {
   if (!is_alt_tab_active) {
     #if ! defined(IS_MOUSE)
       if (!alt_pressed){

diff --git a/users/plodah/functions/alttab_enhancements_d.c b/users/plodah/functions/alttab_enhancements_d.c
@@ -0,0 +1,35 @@
+static deferred_token altTabToken = INVALID_DEFERRED_TOKEN;
+
+#ifndef PLODAH_ALT_TAB_DELAY
+  #define PLODAH_ALT_TAB_DELAY 1000
+#endif //PLODAH_ALT_TAB_DELAY
+
+uint32_t plodah_alttab_reset(uint32_t trigger_time, void *cb_arg) {
+    unregister_code(KC_LALT);
+    altTabToken = INVALID_DEFERRED_TOKEN;
+    // cancel_deferred_exec(altTabToken);
+    return 0;
+}
+
+void plodah_alttab_start(bool back) {
+  if (altTabToken != INVALID_DEFERRED_TOKEN) {
+    extend_deferred_exec(altTabToken, PLODAH_ALT_TAB_DELAY);
+    //altTabToken = defer_exec(PLODAH_ALT_TAB_DELAY, plodah_alttab_reset, NULL);
+  }
+  else{
+    #if ! defined(IS_MOUSE)
+      if (!alt_pressed){
+    #endif // ! defined(IS_MOUSE)
+      altTabToken = defer_exec(PLODAH_ALT_TAB_DELAY, plodah_alttab_reset, NULL);
+      register_code(KC_LALT);
+    #if ! defined(IS_MOUSE)
+      }
+    #endif // ! defined(IS_MOUSE)
+  }
+  if(back){
+    tap_code16(S(KC_TAB));
+  }
+  else{
+    tap_code16(KC_TAB);
+  }
+}
diff --git a/users/plodah/functions/combos.c b/users/plodah/functions/combos.c
@@ -31,7 +31,7 @@
     COMBO(pl_combo_xc, C(KC_C)),
     COMBO(pl_combo_cv, C(KC_V)),
     COMBO(pl_combo_xcv, C(S(KC_V))),
-    #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
+    #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) || defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
     COMBO(pl_combo_tabq, PL_ALTSTAB),
     COMBO(pl_combo_tabw, PL_ALTTAB),
     #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE

diff --git a/users/plodah/functions/encoder_actions.c b/users/plodah/functions/encoder_actions.c
@@ -148,10 +148,10 @@ void enc_act(int keycode, bool ctl_pressed, bool gui_pressed, bool alt_pressed,
       //A
       switch (keycode) {
         case PL_ENC_CCW & 0xff:
-          plodah_alt_tab(true);
+          plodah_alttab_start(true);
           break;
         case PL_ENC_CW & 0xff:
-          plodah_alt_tab(false);
+          plodah_alttab_start(false);
           break;
         case PL_ENC_PRS & 0xff:
         default:

diff --git a/users/plodah/functions/process_record_user.c b/users/plodah/functions/process_record_user.c
@@ -55,15 +55,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
     #endif // defined(KC_PL_QVER)
 
-    #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
+    #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) || defined(PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE)
       case PL_ALTTAB:
         if (record->event.pressed) {
-          plodah_alt_tab(false);
+          plodah_alttab_start(false);
         }
         return false;
       case PL_ALTSTAB:
         if (record->event.pressed) {
-          plodah_alt_tab(true);
+          plodah_alttab_start(true);
         }
         return false;
     #endif  // defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)

diff --git a/users/plodah/plodah.c b/users/plodah/plodah.c
@@ -11,7 +11,7 @@
 #if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PLODAH_MODS_INDIC_LGUI_INDEX) || defined(PLODAH_MODS_INDIC_RGUI_INDEX)
   bool gui_pressed = false;
 #endif // PLODAH_KNOB_ENHANCEMENTS_ENABLE // GUI
-#if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PLODAH_MODS_INDIC_LALT_INDEX) || defined(PLODAH_MODS_INDIC_RALT_INDEX)
+#if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) || defined(PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE) || defined(PLODAH_MODS_INDIC_LALT_INDEX) || defined(PLODAH_MODS_INDIC_RALT_INDEX)
   bool alt_pressed = false;
 #endif // PLODAH_KNOB_ENHANCEMENTS_ENABLE // ALT
 #if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PLODAH_MODS_INDIC_LSHIFT_INDEX) || defined(PLODAH_MODS_INDIC_RSHIFT_INDEX)
@@ -42,13 +42,20 @@
 //===================//
 //      ALT TAB      //
 //===================//
-#if (defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PL_ALTTAB) || defined(PL_ALTSTAB) ) && (! defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE))
-  #define PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
+#if (defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) || defined(PL_ALTTAB) || defined(PL_ALTSTAB) ) && (! defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)) && (! defined(PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE))
+  #if defined(DEFERRED_EXEC_ENABLE)
+    #define PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE
+  #else // defined(DEFERRED_EXEC_ENABLE)
+    #define PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
+  #endif // defined(DEFERRED_EXEC_ENABLE)
 #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
 #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
   #include "functions/alttab_enhancements.c"
 #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
-#if defined PLODAH_KNOB_ENHANCEMENTS_ENABLE
+#if defined(PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE)
+  #include "functions/alttab_enhancements_d.c"
+#endif // PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE
+#if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE)
   #include "functions/encoder_actions.c"
 #endif // PLODAH_KNOB_ENHANCEMENTS_ENABLE
 

diff --git a/users/plodah/plodah.h b/users/plodah/plodah.h
@@ -5,7 +5,7 @@
   #define PLODAH_LAYEROFFSET 0
 #endif // PLODAH_LAYEROFFSET
 
-#if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) && (! defined(PLODAH_ALT_TAB_DELAY))
+#if (defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) || defined(PLODAH_ALTTAB_ENHANCEMENTS_D_ENABLE)) && (! defined(PLODAH_ALT_TAB_DELAY))
   #define PLODAH_ALT_TAB_DELAY 750
 #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE