From 2083a177d2e3b069b0343bcbc3027fd4c5cf7dba Mon Sep 17 00:00:00 2001 From: stkhan Date: Sat, 11 Mar 2023 16:39:07 -0600 Subject: update to dwm 6.4 --- .../dwm-statuscmd-nosignal-20210402-67d76bd.diff | 167 --------------------- 1 file changed, 167 deletions(-) delete mode 100644 wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff (limited to 'wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff') diff --git a/wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff b/wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff deleted file mode 100644 index 1dc5c53..0000000 --- a/wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff +++ /dev/null @@ -1,167 +0,0 @@ -From 02c4a28dd7f3a88eef3a4e533ace35f79cf09d57 Mon Sep 17 00:00:00 2001 -From: Daniel Bylinka -Date: Fri, 2 Apr 2021 19:34:38 +0200 -Subject: [PATCH] [statuscmd] Run shell commands based on mouse location and - button - ---- - config.def.h | 10 ++++++- - dwm.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 81 insertions(+), 5 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 1c0b587..8f88366 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -59,6 +59,12 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() - static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; - static const char *termcmd[] = { "st", NULL }; - -+/* commands spawned when clicking statusbar, the mouse button pressed is exported as BUTTON */ -+static const StatusCmd statuscmds[] = { -+ { "notify-send Mouse$BUTTON", 1 }, -+}; -+static const char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL }; -+ - static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -@@ -103,7 +109,9 @@ static Button buttons[] = { - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, -- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, -+ { ClkStatusText, 0, Button1, spawn, {.v = statuscmd } }, -+ { ClkStatusText, 0, Button2, spawn, {.v = statuscmd } }, -+ { ClkStatusText, 0, Button3, spawn, {.v = statuscmd } }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, -diff --git a/dwm.c b/dwm.c -index b0b3466..eb478a5 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -141,6 +141,11 @@ typedef struct { - int monitor; - } Rule; - -+typedef struct { -+ const char *cmd; -+ int id; -+} StatusCmd; -+ - /* function declarations */ - static void applyrules(Client *c); - static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact); -@@ -238,6 +243,9 @@ static void zoom(const Arg *arg); - /* variables */ - static const char broken[] = "broken"; - static char stext[256]; -+static int statusw; -+static int statuscmdn; -+static char lastbutton[] = "-"; - static int screen; - static int sw, sh; /* X display screen geometry width, height */ - static int bh, blw = 0; /* bar geometry */ -@@ -440,8 +448,27 @@ buttonpress(XEvent *e) - arg.ui = 1 << i; - } else if (ev->x < x + blw) - click = ClkLtSymbol; -- else if (ev->x > selmon->ww - (int)TEXTW(stext)) -+ else if (ev->x > selmon->ww - statusw) { -+ char *text, *s, ch; -+ *lastbutton = '0' + ev->button; -+ -+ x = selmon->ww - statusw; - click = ClkStatusText; -+ -+ statuscmdn = 0; -+ for (text = s = stext; *s && x <= ev->x; s++) { -+ if ((unsigned char)(*s) < ' ') { -+ ch = *s; -+ *s = '\0'; -+ x += TEXTW(text) - lrpad; -+ *s = ch; -+ text = s + 1; -+ if (x >= ev->x) -+ break; -+ statuscmdn = ch; -+ } -+ } -+ } - else - click = ClkWinTitle; - } else if ((c = wintoclient(ev->window))) { -@@ -704,9 +731,24 @@ drawbar(Monitor *m) - - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ -+ char *text, *s, ch; - drw_setscheme(drw, scheme[SchemeNorm]); -- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ -- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); -+ -+ x = 0; -+ for (text = s = stext; *s; s++) { -+ if ((unsigned char)(*s) < ' ') { -+ ch = *s; -+ *s = '\0'; -+ tw = TEXTW(text) - lrpad; -+ drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0); -+ x += tw; -+ *s = ch; -+ text = s + 1; -+ } -+ } -+ tw = TEXTW(text) - lrpad + 2; -+ drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0); -+ tw = statusw; - } - - for (c = m->clients; c; c = c->next) { -@@ -1645,6 +1687,17 @@ spawn(const Arg *arg) - if (fork() == 0) { - if (dpy) - close(ConnectionNumber(dpy)); -+ if (arg->v == statuscmd) { -+ for (int i = 0; i < LENGTH(statuscmds); i++) { -+ if (statuscmdn == statuscmds[i].id) { -+ statuscmd[2] = statuscmds[i].cmd; -+ setenv("BUTTON", lastbutton, 1); -+ break; -+ } -+ } -+ if (!statuscmd[2]) -+ exit(EXIT_SUCCESS); -+ } - setsid(); - execvp(((char **)arg->v)[0], (char **)arg->v); - fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]); -@@ -1990,8 +2043,23 @@ updatesizehints(Client *c) - void - updatestatus(void) - { -- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) -+ if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) { - strcpy(stext, "dwm-"VERSION); -+ statusw = TEXTW(stext) - lrpad + 2; -+ } else { -+ char *text, *s, ch; -+ statusw = 0; -+ for (text = s = stext; *s; s++) { -+ if ((unsigned char)(*s) < ' ') { -+ ch = *s; -+ *s = '\0'; -+ statusw += TEXTW(text) - lrpad; -+ *s = ch; -+ text = s + 1; -+ } -+ } -+ statusw += TEXTW(text) - lrpad + 2; -+ } - drawbar(selmon); - } - --- -2.31.0 - -- cgit v1.2.3