From a5447c511b28a33208a26cc6092cdc4fcf89d1c3 Mon Sep 17 00:00:00 2001
From: Raheman Vaiya <r.vaiya@gmail.com>
Date: Mon, 11 Apr 2022 02:02:14 -0400
Subject: [PATCH] Make simple macros less noisy (#181)

This patch makes simple macros of the form `<mods>-<key>` less noisy by
avoiding the redundant release/depression of modifiers which are already
active. This used to be the default behaviour prior to 2.3.0-rc, but was
changed to accommodate #128 (among other things). In most cases the
additional noise is transparent to the application, but notably breaks
Gnome tab-switching via swap, since Gnome cares about intermediate
modifier state.
---
 data/keyd-application-mapper.1.gz | Bin 1487 -> 1488 bytes
 data/keyd.1.gz                    | Bin 5422 -> 5429 bytes
 docs/keyd.scdoc                   |   2 +-
 src/keyboard.c                    |  48 +++++++++++++++++++-----------
 t/oneshot10.t                     |   2 ++
 t/oneshot12.t                     |   2 ++
 t/swap4.t                         |   4 ---
 t/swap5.t                         |   2 --
 t/swap8.t                         |  32 ++++++++++++++++++++
 t/{swap7.t => swap9.t}            |  12 ++++----
 t/test.conf                       |   6 ++--
 11 files changed, 76 insertions(+), 34 deletions(-)
 create mode 100644 t/swap8.t
 rename t/{swap7.t => swap9.t} (71%)

diff --git a/data/keyd-application-mapper.1.gz b/data/keyd-application-mapper.1.gz
index e24e766648d90e237bd14d77a547e3562785aebf..9a5d913cc805fcc728e8a8c2c252528b65b8a34a 100644
GIT binary patch
delta 1213
zcmV;u1Va1I3(yOY8-I1s?L(0j$cijA(6vRAHXGu6pe0HsLWwF#Iq^{Jx9{Ciij#FI
zFe8C2ig)+!-Mb_6#SWe7R(ln7Ny`m|qI3n#^4Tmu%yPVa?V8T&s0r(RquZ#WaV=HO
zQ(T!qop-fY4dG|&BB`}9RxPb26-d$PyH8}=%2B6ko#jT;qF3F`Ys$+&$6si%tG;Bp
zwv;}@>a#3wS6Qw~vI5~(U7MEbJD7!QBY?cj^7A*ebFDY!M0K4tg+QA$c+h@_c4qiL
ze13R1dH!NDo9$%zhb%vPL!Zu$Pm%Bye=*qcri*m5GR2C#R=~Tc=6_G~#Z!Q)Og&|v
zQ@9yc7S%^mZAlVE2T-Od^zu+<OVgI7tpofaw>2Uwy1|;e!B<@2sZp_5VG9*jg@D8x
z_%LmB;J@etf-tT>T~CE-xgPB`xr(#`yr2uIl++>U$S>|COQF++sZ4<&;W`Wmf6L4<
z4u)A<w^WvVZxOT9m1#je>VSl&Iu<F@{cWE3MU3Vgwuua?40NzkDecNx>uxw1Xs3B8
z1h-X|e>|fX*^|p7Y>wK$y2`RANBXw&Is}F}d-d@75YLOJdHT!p%D{tE^J1mFW^|(`
z=AMJQR&(y(Vh9O@0JuC#6eH5B6DxY~`H_C-GH`bc)sd|aOuimPlNJKte>1|nMit)e
z&f8#00P0l11=!=w#mc+J^bH#@aPO=b{ils=)<5k1e`xVRzc9UCW9Bg>$CDW|h~hF^
z!dRl~+2ZLKJ>s{_s&D30YKXW}5!%484(SE<g9f(R)gZZsi^<_nKNrqAzb7)sh+6A$
za$I~zb~50gJGbPjrn3rhD>@!>Ly4`c$@Q`8Wk6fWA}f_{Ff|a%_pPX5fP$Ri$<m~v
zN9H&D-D|7klb{12f5&g%9-q(OzvDHK8PO$a21}<0!(G5i$JAm;k4U3T(xw^u_p#$@
z!dlJ(K-|a(MCWZ>@2NDQv%na%=b4UPhz3LDuM`^DVfJsy5E5>AlP_2a&S!V4Ax)Wq
z4VqURKr$Yo3I}N9@%eGM>^of^FpiB6pw%=wHM>dNfK|)}e;n}~G)uDyB;W=y9H8kG
zwx-g>rm%Wod)@+ciA?YACQ$Q@^VbK&Sg7d(%kvJiC=Bj;5R_i7)Eb2>3LRw3VZ=_?
z%1>b+x<H)ZifbKZ2pc?V_J?CyH_KEy_6IZG&6{fP`fhL3H_PFeZ%L4G%ja|NP27mM
zFy915N|v>be^VaUog$7cHr}(O$x7oP{9)8$Sn#EQbzkbW0s1VgTyIMO7Xl8DlBtmF
zs-F3k6vt){n-Fy~ka!`TBYe54(mqhIre1NZr51sj;0E<Vn;k?T&K*4YG)_9ULVMzF
z6Ekpv@J30Oj&U)-`kJRY%|E=x`(mY96B^pZ{ca`Ke-FGuwyjt(F(F%8)q?ta*r&*L
zDtS-$rI@nN%gWvXnTT=2sseLs%r71(nUe;^!4x+l6SahQG2T)Zak1lTrVwBDnlC@-
ztF{=0b~fCc_^>;;2k5(c8T`9em`vFTby@V#9)3!mcd8WWjD2*^0Sj2yI7&x^QbLSK
bEUy#H6HLjq6w^T4?J@TcUEG?p>k9w?A(vu3

delta 1212
zcmV;t1Vj7K3(pIX8-GpE?L(0j@QN%o(6vRAHXGu6pe0HsLWwF#Iq^{Jx9{Ciij#FI
zu)u*Wig)+!-Mb_6#SWe7R(ln7Ny`m|qI3lv=7)#*QI_NFYu9vEM@?Ao8{I|~jcciL
zp5n>`>b$GHY6w4D7fG#^v1(~GsX&TO-+dy}R*pJV>nt~#7FO+UUQ=EMnth?guKJSY
z+EV%(R-a{gyUKD^k`)NQ>e{qa-@z<g8v*2HmY=_&ool@*C#vhLDFoW2!GrcYv~!66
zqvuCQljkq+*~#(`S$_70KAp`@k?|FO4D5K*MY>s;Vntpn;9XSnzo+@)DL_@Gp0dv=
z+zcy=>LaPPB#EK}DAN>rc__1`X-m`A0sfHN8j%&<V9nj&E3WX=s93D9g$k=eK;jL2
zm^M1_U-SV%7}uY!r$V({kM^2eMOpz~(1lb=>JW6~7x$8-(CNZdra+Kz9R`GdW#$+M
z!>p}aDoeh%h*|2&w4fe!K*CcUi<Ig9Hc$K_Msp6^L<Us`I#{WccIB*fH=GQ#)4UXd
z+bYXHp3#f!$>lLNN9|u-W!aNsecO2*0>eCf_3-%!&x@yd`eb=!;6bW+vC>{My3rGJ
z&%s@*IrncdgakqWTplNi5$V+v6+QU-k$&egaCZ#Vk*yC*z8*)D7XsjahlF>HD!kjB
zx51PE)Tx3Cu*aK=m3NKl8#Z9z-dQpFPaD~+f7tu~(BgxBVS2sB%wtMslS5_@#bvgH
zu|(Ii#nUl*#BZ5Z-^{7h5OJj<w1HtA(hKYd4Q#cmL2?ZjlcS%0E}V6KPh^e}wbtY0
zxcH9jWWYgpZpl?mXBFZrbUfsS5?fc3>tol;fVPrFRw~_KY9N;HTT#OR1v$f$rAbAP
z%y0O+*H*KWp#va)v$t<&=kxdPcnxGmbV-`Q(&@o)7qHSXwOG<4(kPR(X@>rN?6{h+
zma_m5H!=dzc^lVzDoyAtFb3^;rlS|4!BF`tg+_Lm{aZ4Ggj?R^3s!>j+1+YLQ)Xa;
z<`oB!j7O-#0UCLHejG0QPL~IaW8(v8HH}WqZW1?O6|(_<M?443(rf|=xIqjDXgY<h
zsdTX^tRC2&w*Xxt)4RI~)O_Ro^#L&!YWl$Pyu&OCgS#FCrI#zUMj?wr2N`o1vD3Bk
zQy7RY5GT0eT1Oee29KKk;h5IVGL??~!HjqFrrNu{+Z*-Ga+vWg2{LZ^eD1x88xa@g
zo4`oPvet2b%Hz6I#IeQ3dzLg=X*`5Kj9Lr}z7(+TOT9KgpM{m{Z7JYFzyVS+6_Q=m
zGryAJ*z92wqHYEfFQjvXFIQFC2MX5ID~`3)B2W|Dpk8RRg9yaAgD0QHNyk=bPuy){
z22K#(DCyEME(Ta%^Hit#hu3&ttW;}4L%X=&t>pTDfmg`36)PqtWJ{}BP=62m6xmKC
z@9Dl2Qx<wz**hQ;F>Y8@U~Y~1#Umwi(x5n);znemmhdjdTgoCXc6`kg;>%w1<p+J$
z7NgM4hMN-~b_e$WeOE7of7c3=DLbJqiyqp;Ps#I6l_H(7kM22O0qYt^>4;EDh!Kh9
ab%L1_DY=$n8fd#c=KcW>cbKm03jhEvzghDD

diff --git a/data/keyd.1.gz b/data/keyd.1.gz
index f863f60297d3b373c680ad08527451fe8a60b711..bf8032cd146928d0d86878c1c5ddf5eb5abdfeaf 100644
GIT binary patch
delta 5355
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
JA>y((004_qd~5&!

delta 5327
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

diff --git a/docs/keyd.scdoc b/docs/keyd.scdoc
index 878c252..7f907d6 100644
--- a/docs/keyd.scdoc
+++ b/docs/keyd.scdoc
@@ -350,7 +350,7 @@ arguments.
 *swap(<layer>[, <macro>])*
 	Swap the currently active layer with the supplied one. The supplied layer is
 	active for the duration of the depression of the current layer's activation
-	key. A macro may optionally be supplied to be performed before the layer
+	key. A macro may optionally be supplied to be performed immediately after the layer
 	change.
 
 ```
diff --git a/src/keyboard.c b/src/keyboard.c
index 564796c..f4e016d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -51,7 +51,7 @@ static void kbd_send_key(struct keyboard *kbd, uint8_t code, uint8_t pressed)
 	}
 }
 
-/* 
+/*
  * refcounted to account for overlapping active mods without adding manual
  * accounting to the calling code, each send_mods(foo, 1) *must* be accompanied
  * by a corresponding send_mods(foo, 0) at some point. Failure to do so is
@@ -100,12 +100,30 @@ static void disarm_mods(struct keyboard *kbd, uint8_t mods)
 	send_mods(kbd, mods, 0);
 }
 
-
-static void execute_macro(struct keyboard *kbd, const struct macro *macro)
+static void execute_macro(struct keyboard *kbd, const struct macro *macro, uint8_t disable_mods)
 {
 	size_t i;
 	int hold_start = -1;
 
+	/*
+	 * Minimize unnecessary noise by avoiding redundant modifier key up/down
+	 * events in the case that the requisite modifiers are already present
+	 * in the layer modifier set and the macro is a simple key sequence.
+	 *
+	 * This makes common cases like:
+	 *
+	 * 	[meta]
+	 *
+	 * 	a = M-b
+	 *
+	 * less likely to produce undesirable side effects as a consequence of additional
+	 * meta up/down presses.
+	 */
+	if (macro->sz == 1 && macro->entries[0].type == MACRO_KEYSEQUENCE)
+		disable_mods &= ~(macro->entries[0].data >> 8);
+
+	disarm_mods(kbd, disable_mods);
+
 	for (i = 0; i < macro->sz; i++) {
 		const struct macro_entry *ent = &macro->entries[i];
 
@@ -167,6 +185,8 @@ static void execute_macro(struct keyboard *kbd, const struct macro *macro)
 		}
 
 	}
+
+	send_mods(kbd, disable_mods, 1);
 }
 
 int kbd_execute_expression(struct keyboard *kbd, const char *exp)
@@ -352,9 +372,7 @@ static long process_descriptor(struct keyboard *kbd, uint8_t code, struct descri
 		macro = &macros[d->args[0].idx];
 
 		if (pressed) {
-			disarm_mods(kbd, descriptor_layer_mods);
-
-			execute_macro(kbd, macro);
+			execute_macro(kbd, macro, descriptor_layer_mods);
 
 			active_macro = macro;
 			active_macro_mods = descriptor_layer_mods;
@@ -445,11 +463,6 @@ static long process_descriptor(struct keyboard *kbd, uint8_t code, struct descri
 
 		if (pressed) {
 			struct descriptor od;
-			if (macro) {
-				disarm_mods(kbd, descriptor_layer_mods);
-				execute_macro(kbd, macro);
-				send_mods(kbd, descriptor_layer_mods, 1);
-			}
 
 			if (!cache_get(kbd, kbd->last_layer_code, &od, NULL)) {
 				struct layer *oldlayer = &layers[od.args[0].idx];
@@ -459,6 +472,9 @@ static long process_descriptor(struct keyboard *kbd, uint8_t code, struct descri
 
 				activate_layer(kbd, layer);
 				deactivate_layer(kbd, oldlayer, 1);
+
+				if (macro)
+					execute_macro(kbd, macro, layer->mods);
 			}
 		} else
 			deactivate_layer(kbd, layer, 1);
@@ -475,9 +491,7 @@ static long process_descriptor(struct keyboard *kbd, uint8_t code, struct descri
 			deactivate_layer(kbd, layer, 1);
 
 			if (kbd->last_pressed_keycode == code) {
-				disarm_mods(kbd, descriptor_layer_mods);
-				execute_macro(kbd, macro);
-				send_mods(kbd, descriptor_layer_mods, 1);
+				execute_macro(kbd, macro, descriptor_layer_mods);
 
 				oneshot_latch = 0;
 				clear_oneshot = 1;
@@ -543,7 +557,7 @@ long kbd_process_key_event(struct keyboard *kbd,
 	/* timeout */
 	if (!code) {
 		if (active_macro) {
-			execute_macro(kbd, active_macro);
+			execute_macro(kbd, active_macro, active_macro_mods);
 			return kbd->config.macro_repeat_timeout;
 		} else if (kbd->pending_timeout.code) {
 			uint8_t mods = kbd->pending_timeout.mods;
@@ -568,10 +582,8 @@ long kbd_process_key_event(struct keyboard *kbd,
 		kbd->pending_timeout.code = 0;
 	}
 
-	if (active_macro) {
+	if (active_macro)
 		active_macro = NULL;
-		send_mods(kbd, active_macro_mods, 1);
-	}
 
 	if (pressed) {
 		lookup_descriptor(kbd, code, &descriptor_layer_mods, &d);
diff --git a/t/oneshot10.t b/t/oneshot10.t
index c42f3d3..a740479 100644
--- a/t/oneshot10.t
+++ b/t/oneshot10.t
@@ -11,5 +11,7 @@ o down
 o up
 n down
 n up
+shift down
+shift up
 x down
 x up
diff --git a/t/oneshot12.t b/t/oneshot12.t
index a529264..7424dac 100644
--- a/t/oneshot12.t
+++ b/t/oneshot12.t
@@ -16,6 +16,8 @@ o up
 n down
 n up
 shift down
+shift up
+shift down
 a down
 a up
 shift up
diff --git a/t/swap4.t b/t/swap4.t
index 7211c67..7e221e0 100644
--- a/t/swap4.t
+++ b/t/swap4.t
@@ -17,10 +17,6 @@ alt up
 control up
 tab down
 tab up
-alt down
-control down
-alt up
-control up
 shift down
 x down
 x up
diff --git a/t/swap5.t b/t/swap5.t
index e77d195..8524d49 100644
--- a/t/swap5.t
+++ b/t/swap5.t
@@ -14,9 +14,7 @@ alt up
 control up
 tab down
 tab up
-alt down
 control down
-alt up
 x down
 x up
 control up
diff --git a/t/swap8.t b/t/swap8.t
new file mode 100644
index 0000000..a28d479
--- /dev/null
+++ b/t/swap8.t
@@ -0,0 +1,32 @@
+c down
+alt down
+` down
+` up
+tab down
+tab up
+tab down
+tab up
+c up
+a down
+a up
+x down
+x up
+alt up
+c up
+
+control down
+alt down
+alt up
+shift down
+x down
+x up
+shift up
+shift down
+x down
+x up
+shift up
+control up
+b down
+b up
+x down
+x up
diff --git a/t/swap7.t b/t/swap9.t
similarity index 71%
rename from t/swap7.t
rename to t/swap9.t
index d3b26d9..ccd2971 100644
--- a/t/swap7.t
+++ b/t/swap9.t
@@ -3,17 +3,17 @@ s down
 s up
 a down
 a up
-s down
-s up
-a down
-a up
 alt up
 
 alt down
+meta down
 control down
 alt up
 control up
+a down
+a up
 b down
 b up
-c down
-c up
+control down
+meta up
+control up
diff --git a/t/test.conf b/t/test.conf
index 83d730a..1dc3d81 100644
--- a/t/test.conf
+++ b/t/test.conf
@@ -68,7 +68,7 @@ x = o
 [myalt:A]
 m = macro(C-x m)
 7 = x
-s = swap(swapped1)
+s = swap(swapped1, M-a)
 ` = swap(tablayer)
 1 = swap(tablayer, tab)
 2 = swap(tablayer2, tab)
@@ -81,9 +81,9 @@ h = left
 
 h = H
 
-[swapped1]
+[swapped1:M]
 
-a = b
+a = M-b
 s = swap(swapped2)
 
 [swapped2]