@@ -116,25 +116,26 @@ void action_tapping_process(keyrecord_t record) {
116116 * readable. The conditional definition of tapping_keycode and all the
117117 * conditional uses of it are hidden inside macros named TAP_...
118118 */
119- # if (defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )) || defined(PERMISSIVE_HOLD_PER_KEY ) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY )
120- # define TAP_DEFINE_KEYCODE const uint16_t tapping_keycode = get_record_keycode(&tapping_key, false)
121- # else
122- # define TAP_DEFINE_KEYCODE
123- # endif
119+ # define TAP_DEFINE_KEYCODE const uint16_t tapping_keycode = get_record_keycode(&tapping_key, false)
124120
125121# if defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )
126122# ifdef RETRO_TAPPING_PER_KEY
127- # define TAP_GET_RETRO_TAPPING get_retro_tapping(tapping_keycode, &tapping_key)
123+ # define TAP_GET_RETRO_TAPPING ( keyp ) get_auto_shifted_key(tapping_keycode, keyp) && get_retro_tapping(tapping_keycode, &tapping_key)
128124# else
129- # define TAP_GET_RETRO_TAPPING true
125+ # define TAP_GET_RETRO_TAPPING ( keyp ) get_auto_shifted_key(tapping_keycode, keyp)
130126# endif
131- # define MAYBE_RETRO_SHIFTING (ev ) (TAP_GET_RETRO_TAPPING && (RETRO_SHIFT + 0) != 0 && TIMER_DIFF_16((ev).time, tapping_key.event.time) < (RETRO_SHIFT + 0))
127+ /* Used to extend TAPPING_TERM:
128+ * indefinitely if RETRO_SHIFT does not have a value
129+ * to RETRO_SHIFT if RETRO_SHIFT is set
130+ * for possibly retro shifted keys.
131+ */
132+ # define MAYBE_RETRO_SHIFTING (ev , keyp ) (get_auto_shifted_key(tapping_keycode, keyp) && TAP_GET_RETRO_TAPPING(keyp) && ((RETRO_SHIFT + 0) == 0 || TIMER_DIFF_16((ev).time, tapping_key.event.time) < (RETRO_SHIFT + 0)))
132133# define TAP_IS_LT IS_QK_LAYER_TAP(tapping_keycode)
133134# define TAP_IS_MT IS_QK_MOD_TAP(tapping_keycode)
134135# define TAP_IS_RETRO IS_RETRO(tapping_keycode)
135136# else
136- # define TAP_GET_RETRO_TAPPING false
137- # define MAYBE_RETRO_SHIFTING (ev ) false
137+ # define TAP_GET_RETRO_TAPPING ( keyp ) false
138+ # define MAYBE_RETRO_SHIFTING (ev , kp ) false
138139# define TAP_IS_LT false
139140# define TAP_IS_MT false
140141# define TAP_IS_RETRO false
@@ -187,20 +188,19 @@ bool process_tapping(keyrecord_t *keyp) {
187188 return true;
188189 }
189190
191+ # if (defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )) || defined(PERMISSIVE_HOLD_PER_KEY ) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY )
190192 TAP_DEFINE_KEYCODE ;
193+ # endif
191194
192195 // process "pressed" tapping key state
193196 if (tapping_key .event .pressed ) {
194- if (WITHIN_TAPPING_TERM (event ) || MAYBE_RETRO_SHIFTING (event )) {
197+ if (WITHIN_TAPPING_TERM (event ) || MAYBE_RETRO_SHIFTING (event , keyp )) {
195198 if (IS_NOEVENT (event )) {
196199 // early return for tick events
197200 return true;
198201 }
199202 if (tapping_key .tap .count == 0 ) {
200203 if (IS_TAPPING_RECORD (keyp ) && !event .pressed ) {
201- # if defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )
202- retroshift_swap_times ();
203- # endif
204204 // first tap!
205205 ac_dprintf ("Tapping: First tap(0->1).\n" );
206206 tapping_key .tap .count = 1 ;
@@ -218,28 +218,12 @@ bool process_tapping(keyrecord_t *keyp) {
218218 */
219219 // clang-format off
220220 else if (
221+ !event .pressed && waiting_buffer_typed (event ) &&
221222 (
222- !event .pressed && waiting_buffer_typed (event ) &&
223- TAP_GET_PERMISSIVE_HOLD
224- )
225- // Causes nested taps to not wait past TAPPING_TERM/RETRO_SHIFT
226- // unnecessarily and fixes them for Layer Taps.
227- || (TAP_GET_RETRO_TAPPING &&
228- (
229- // Rolled over the two keys.
230- (tapping_key .tap .interrupted == true && (
231- (TAP_IS_LT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS ) ||
232- (TAP_IS_MT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS )
233- )
234- )
235- // Makes Retro Shift ignore the default behavior of
236- // MTs and LTs on nested taps below TAPPING_TERM or RETRO_SHIFT
237- || (
238- TAP_IS_RETRO
239- && (event .key .col != tapping_key .event .key .col || event .key .row != tapping_key .event .key .row )
240- && !event .pressed && waiting_buffer_typed (event )
241- )
242- )
223+ TAP_GET_PERMISSIVE_HOLD ||
224+ // Causes nested taps to not wait past TAPPING_TERM/RETRO_SHIFT
225+ // unnecessarily and fixes them for Layer Taps.
226+ TAP_GET_RETRO_TAPPING (keyp )
243227 )
244228 ) {
245229 // clang-format on
@@ -284,10 +268,16 @@ bool process_tapping(keyrecord_t *keyp) {
284268 process_record (keyp );
285269 return true;
286270 } else {
287- // set interrupted flag when other key preesed during tapping
271+ // set interrupted flag when other key pressed during tapping
288272 if (event .pressed ) {
289273 tapping_key .tap .interrupted = true;
290- if (TAP_GET_HOLD_ON_OTHER_KEY_PRESS ) {
274+ if (TAP_GET_HOLD_ON_OTHER_KEY_PRESS
275+ # if defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )
276+ // Auto Shift cannot evaluate this early
277+ // Retro Shift uses the hold action for all nested taps even without HOLD_ON_OTHER_KEY_PRESS, so this is fine to skip
278+ & & !(MAYBE_RETRO_SHIFTING (event , keyp ) && get_auto_shifted_key (get_record_keycode (keyp , false), keyp ))
279+ # endif
280+ ) {
291281 ac_dprintf ("Tapping: End. No tap. Interfered by pressed key\n" );
292282 process_record (& tapping_key );
293283 tapping_key = (keyrecord_t ){0 };
@@ -332,6 +322,9 @@ bool process_tapping(keyrecord_t *keyp) {
332322 return true;
333323 } else {
334324 ac_dprintf ("Tapping: key event while last tap(>0).\n" );
325+ # if defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT )
326+ retroshift_swap_times ();
327+ # endif
335328 process_record (keyp );
336329 return true;
337330 }
@@ -388,7 +381,7 @@ bool process_tapping(keyrecord_t *keyp) {
388381 }
389382 // process "released" tapping key state
390383 else {
391- if (WITHIN_TAPPING_TERM (event ) || MAYBE_RETRO_SHIFTING (event )) {
384+ if (WITHIN_TAPPING_TERM (event ) || MAYBE_RETRO_SHIFTING (event , keyp )) {
392385 if (IS_NOEVENT (event )) {
393386 // early return for tick events
394387 return true;
@@ -506,9 +499,16 @@ void waiting_buffer_scan_tap(void) {
506499 return ;
507500 }
508501
502+ # if (defined(AUTO_SHIFT_ENABLE ) && defined(RETRO_SHIFT ))
503+ TAP_DEFINE_KEYCODE ;
504+ # endif
509505 for (uint8_t i = waiting_buffer_tail ; i != waiting_buffer_head ; i = (i + 1 ) % WAITING_BUFFER_SIZE ) {
510506 keyrecord_t * candidate = & waiting_buffer [i ];
511- if (IS_EVENT (candidate -> event ) && KEYEQ (candidate -> event .key , tapping_key .event .key ) && !candidate -> event .pressed && WITHIN_TAPPING_TERM (candidate -> event )) {
507+ // clang-format off
508+ if (IS_EVENT (candidate -> event ) && KEYEQ (candidate -> event .key , tapping_key .event .key ) && !candidate -> event .pressed && (
509+ WITHIN_TAPPING_TERM (waiting_buffer [i ].event ) || MAYBE_RETRO_SHIFTING (waiting_buffer [i ].event , & tapping_key )
510+ )) {
511+ // clang-format on
512512 tapping_key .tap .count = 1 ;
513513 candidate -> tap .count = 1 ;
514514 process_record (& tapping_key );
0 commit comments