From 7313667826eca809df924efa78acba8a9b626cf5 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Thu, 13 Oct 2022 22:55:58 +1100
Subject: [PATCH] Add double tap guard to Additional Features

---
 src/build/miryoku_kmonad.kbd | 24 ++++++++++++------------
 src/miryoku.h                |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/build/miryoku_kmonad.kbd b/src/build/miryoku_kmonad.kbd
index 5f7a25f..f9b4cb8 100644
--- a/src/build/miryoku_kmonad.kbd
+++ b/src/build/miryoku_kmonad.kbd
@@ -41,39 +41,39 @@ undo	S-del	C-ins	S-ins	again	again	S-ins	C-ins	S-del	undo
 		#(kp* kp5)	#(kp/ kp5)	#(kp- kp5)	#(kp- kp5)	#(kp/ kp5)	#(kp* kp5)
 )
 (deflayer U_NAV
-XX	(layer-switch U_TAP)	(layer-switch U_EXTRA)	(layer-switch U_BASE)	XX	again	S-ins	C-ins	S-del	undo
+XX	(multi-tap 200 XX (layer-switch U_TAP))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_BASE))	XX	again	S-ins	C-ins	S-del	undo
 met	alt	ctl	sft	XX	caps	left	down	up	right
-XX	ralt	(layer-switch U_NUM)	(layer-switch U_NAV)	XX	ins	home	pgdn	pgup	end
+XX	ralt	(multi-tap 200 XX (layer-switch U_NUM))	(multi-tap 200 XX (layer-switch U_NAV))	XX	ins	home	pgdn	pgup	end
 		XX	XX	XX	ent	bspc	del
 )
 (deflayer U_MOUSE
-XX	(layer-switch U_TAP)	(layer-switch U_EXTRA)	(layer-switch U_BASE)	XX	again	S-ins	C-ins	S-del	undo
+XX	(multi-tap 200 XX (layer-switch U_TAP))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_BASE))	XX	again	S-ins	C-ins	S-del	undo
 met	alt	ctl	sft	XX	XX	kp4	kp2	kp8	kp6
-XX	ralt	(layer-switch U_SYM)	(layer-switch U_MOUSE)	XX	XX	XX	XX	XX	XX
+XX	ralt	(multi-tap 200 XX (layer-switch U_SYM))	(multi-tap 200 XX (layer-switch U_MOUSE))	XX	XX	XX	XX	XX	XX
 		XX	XX	XX	#(kp- kp5)	#(kp/ kp5)	#(kp* kp5)
 )
 (deflayer U_MEDIA
-XX	(layer-switch U_TAP)	(layer-switch U_EXTRA)	(layer-switch U_BASE)	XX	XX	XX	XX	XX	XX
+XX	(multi-tap 200 XX (layer-switch U_TAP))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_BASE))	XX	XX	XX	XX	XX	XX
 met	alt	ctl	sft	XX	XX	previoussong	vold	volu	nextsong
-XX	ralt	(layer-switch U_FUN)	(layer-switch U_MEDIA)	XX	XX	XX	XX	XX	XX
+XX	ralt	(multi-tap 200 XX (layer-switch U_FUN))	(multi-tap 200 XX (layer-switch U_MEDIA))	XX	XX	XX	XX	XX	XX
 		XX	XX	XX	stopcd	playpause	mute
 )
 (deflayer U_NUM
-[	7	8	9	]	XX	(layer-switch U_BASE)	(layer-switch U_EXTRA)	(layer-switch U_TAP)	XX
+[	7	8	9	]	XX	(multi-tap 200 XX (layer-switch U_BASE))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_TAP))	XX
 ;	4	5	6	=	XX	sft	ctl	alt	met
-`	1	2	3	\\	XX	(layer-switch U_NUM)	(layer-switch U_NAV)	ralt	XX
+`	1	2	3	\\	XX	(multi-tap 200 XX (layer-switch U_NUM))	(multi-tap 200 XX (layer-switch U_NAV))	ralt	XX
 		.	0	-	XX	XX	XX
 )
 (deflayer U_SYM
-{	&	*	\(	}	XX	(layer-switch U_BASE)	(layer-switch U_EXTRA)	(layer-switch U_TAP)	XX
+{	&	*	\(	}	XX	(multi-tap 200 XX (layer-switch U_BASE))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_TAP))	XX
 :	$	%	^	+	XX	sft	ctl	alt	met
-~	!	@	#	|	XX	(layer-switch U_SYM)	(layer-switch U_MOUSE)	ralt	XX
+~	!	@	#	|	XX	(multi-tap 200 XX (layer-switch U_SYM))	(multi-tap 200 XX (layer-switch U_MOUSE))	ralt	XX
 		\(	\)	\_	XX	XX	XX
 )
 (deflayer U_FUN
-f12	f7	f8	f9	sysrq	XX	(layer-switch U_BASE)	(layer-switch U_EXTRA)	(layer-switch U_TAP)	XX
+f12	f7	f8	f9	sysrq	XX	(multi-tap 200 XX (layer-switch U_BASE))	(multi-tap 200 XX (layer-switch U_EXTRA))	(multi-tap 200 XX (layer-switch U_TAP))	XX
 f11	f4	f5	f6	slck	XX	sft	ctl	alt	met
-f10	f1	f2	f3	pause	XX	(layer-switch U_FUN)	(layer-switch U_MEDIA)	ralt	XX
+f10	f1	f2	f3	pause	XX	(multi-tap 200 XX (layer-switch U_FUN))	(multi-tap 200 XX (layer-switch U_MEDIA))	ralt	XX
 		comp	spc	tab	XX	XX	XX
 )
 
diff --git a/src/miryoku.h b/src/miryoku.h
index 6e4bd8d..c3962f7 100644
--- a/src/miryoku.h
+++ b/src/miryoku.h
@@ -44,7 +44,7 @@
 
 #define U_MT(TAP, HOLD) (tap-hold-next-release U_TAPPING_TERM TAP HOLD)
 #define U_LT(TAP, HOLD) (tap-hold-next-release U_TAPPING_TERM TAP (layer-toggle HOLD))
-#define U_DF(LAYER) (layer-switch LAYER)
+#define U_DF(LAYER) (multi-tap U_TAPPING_TERM XX (layer-switch LAYER))
 
 #define MIRYOKU_MAPPING_MAIN( \
   K00,      K01,      K02,      K03,      K04,      K05,      K06,      K07,      K08,      K09, \