summaryrefslogtreecommitdiffhomepage
path: root/dwm.c
diff options
context:
space:
mode:
authorbakkeby <[email protected]>2022-10-30 10:32:43 +0100
committerbakkeby <[email protected]>2022-10-30 10:32:43 +0100
commitad56835713b210ba71d2979ce345de39a5736f42 (patch)
treeb3a3c4b75ed1b2a37e65be91ecd35851fbaba67c /dwm.c
parente6a74ad3ea480ff7262af104db440d6bda0ab5ab (diff)
downloaddwm-flexipatch-ad56835713b210ba71d2979ce345de39a5736f42.tar.gz
dwm-flexipatch-ad56835713b210ba71d2979ce345de39a5736f42.zip
Bump to ba56fe9.
Revert "Remove dmenumon variable" This reverts commit c2b748e7931e5f28984efc236f9b1a212dbc65e8. Revert back this change. It seems to not be an edge-case anymore since multiple users have asked about this new behaviour now. Ref. https://git.suckless.org/dwm/commit/ba56fe9fea0a28d8184a727a987836a0903e2682.html
Diffstat (limited to 'dwm.c')
-rw-r--r--dwm.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/dwm.c b/dwm.c
index 25d57b6..df964a2 100644
--- a/dwm.c
+++ b/dwm.c
@@ -2060,7 +2060,11 @@ focus(Client *c)
#endif // BAR_FLEXWINTITLE_PATCH
setfocus(c);
} else {
+ #if NODMENU_PATCH
+ XSetInputFocus(dpy, selmon->bar && selmon->bar->win ? selmon->bar->win : root, RevertToPointerRoot, CurrentTime);
+ #else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ #endif // NODMENU_PATCH
XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
}
selmon->sel = c;
@@ -3947,6 +3951,10 @@ spawn(const Arg *arg)
#if RIODRAW_PATCH
pid_t pid;
#endif // RIODRAW_PATCH
+ #if !NODMENU_PATCH
+ if (arg->v == dmenucmd)
+ dmenumon[0] = '0' + selmon->num;
+ #endif // NODMENU_PATCH
#if RIODRAW_PATCH
if ((pid = fork()) == 0)
@@ -5066,6 +5074,7 @@ main(int argc, char *argv[])
else if (!strcmp("-sf", argv[i])) /* selected foreground color */
colors[SchemeSel][0] = argv[++i];
#endif // !BAR_VTCOLORS_PATCH
+ #if NODMENU_PATCH
else if (!strcmp("-df", argv[i])) /* dmenu font */
dmenucmd[2] = argv[++i];
else if (!strcmp("-dnb", argv[i])) /* dmenu normal background color */
@@ -5076,6 +5085,18 @@ main(int argc, char *argv[])
dmenucmd[8] = argv[++i];
else if (!strcmp("-dsf", argv[i])) /* dmenu selected foreground color */
dmenucmd[10] = argv[++i];
+ #else
+ else if (!strcmp("-df", argv[i])) /* dmenu font */
+ dmenucmd[4] = argv[++i];
+ else if (!strcmp("-dnb", argv[i])) /* dmenu normal background color */
+ dmenucmd[6] = argv[++i];
+ else if (!strcmp("-dnf", argv[i])) /* dmenu normal foreground color */
+ dmenucmd[8] = argv[++i];
+ else if (!strcmp("-dsb", argv[i])) /* dmenu selected background color */
+ dmenucmd[10] = argv[++i];
+ else if (!strcmp("-dsf", argv[i])) /* dmenu selected foreground color */
+ dmenucmd[12] = argv[++i];
+ #endif // NODMENU_PATCH
else die(help());
#else
if (argc == 2 && !strcmp("-v", argv[1]))