commit ab8389fe847bd784c3d3e28fdca437074b9f679a
parent a3605583ffff69dbc6b329883d92a243da5fceb8
Author: Daniel Bylinka <daniel.bylinka@gmail.com>
Date: Sun, 5 Apr 2020 01:29:21 +0200
[dwm][patch] statuscmd: run shell commands based on mouse button and position when clicking status bar
Diffstat:
2 files changed, 216 insertions(+), 0 deletions(-)
diff --git a/dwm.suckless.org/patches/statuscmd/dwm-statuscmd-6.2.diff b/dwm.suckless.org/patches/statuscmd/dwm-statuscmd-6.2.diff
@@ -0,0 +1,163 @@
+From b4e7de63bb4d6c711fa8d34fd83c86bfada7236e Mon Sep 17 00:00:00 2001
+From: Daniel Bylinka <daniel.bylinka@gmail.com>
+Date: Sat, 4 Apr 2020 22:54:03 +0200
+Subject: [PATCH] statuscmd: run shell commands based on mouse button and
+ position when clicking statusbar
+
+---
+ config.def.h | 8 +++++++-
+ dwm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 60 insertions(+), 4 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..b85d7a4 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -59,6 +59,10 @@ 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 char *statuscmds[] = { "notify-send Mouse$BUTTON" };
++static char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL };
++
+ static Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+@@ -103,7 +107,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 4465af1..29f9f8d 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -156,6 +156,7 @@ static void clientmessage(XEvent *e);
+ static void configure(Client *c);
+ static void configurenotify(XEvent *e);
+ static void configurerequest(XEvent *e);
++static void copyvalidchars(char *text, char *rawtext);
+ static Monitor *createmon(void);
+ static void destroynotify(XEvent *e);
+ static void detach(Client *c);
+@@ -237,6 +238,10 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static const char broken[] = "broken";
+ static char stext[256];
++static char rawstext[256];
++static const char statusexport[] = "export BUTTON=-;";
++static int statuscmdn;
++static int lastbutton;
+ static int screen;
+ static int sw, sh; /* X display screen geometry width, height */
+ static int bh, blw = 0; /* bar geometry */
+@@ -421,6 +426,7 @@ buttonpress(XEvent *e)
+ Client *c;
+ Monitor *m;
+ XButtonPressedEvent *ev = &e->xbutton;
++ lastbutton = ev->button;
+
+ click = ClkRootWin;
+ /* focus monitor if necessary */
+@@ -439,9 +445,26 @@ buttonpress(XEvent *e)
+ arg.ui = 1 << i;
+ } else if (ev->x < x + blw)
+ click = ClkLtSymbol;
+- else if (ev->x > selmon->ww - TEXTW(stext))
++ else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad)) {
+ click = ClkStatusText;
+- else
++
++ char *text = rawstext;
++ int i = -1;
++ char ch;
++ statuscmdn = 0;
++ while (text[++i]) {
++ if ((unsigned char)text[i] < ' ') {
++ ch = text[i];
++ text[i] = '\0';
++ x += TEXTW(text) - lrpad;
++ text[i] = ch;
++ text += i+1;
++ i = -1;
++ if (x >= ev->x) break;
++ if (ch <= LENGTH(statuscmds)) statuscmdn = ch - 1;
++ }
++ }
++ } else
+ click = ClkWinTitle;
+ } else if ((c = wintoclient(ev->window))) {
+ focus(c);
+@@ -627,6 +650,19 @@ configurerequest(XEvent *e)
+ XSync(dpy, False);
+ }
+
++void
++copyvalidchars(char *text, char *rawtext)
++{
++ int i = -1, j = 0;
++
++ while(rawtext[++i]) {
++ if ((unsigned char)rawtext[i] >= ' ') {
++ text[j++] = rawtext[i];
++ }
++ }
++ text[j] = '\0';
++}
++
+ Monitor *
+ createmon(void)
+ {
+@@ -1636,11 +1672,22 @@ sigchld(int unused)
+ while (0 < waitpid(-1, NULL, WNOHANG));
+ }
+
++
+ void
+ spawn(const Arg *arg)
+ {
++ char *cmd = NULL;
+ if (arg->v == dmenucmd)
+ dmenumon[0] = '0' + selmon->num;
++ else if (arg->v == statuscmd) {
++ int len = strlen(statuscmds[statuscmdn]) + 1;
++ if (!(cmd = malloc(sizeof(char)*len + sizeof(statusexport))))
++ die("malloc:");
++ strcpy(cmd, statusexport);
++ strcat(cmd, statuscmds[statuscmdn]);
++ cmd[LENGTH(statusexport)-3] = '0' + lastbutton;
++ statuscmd[2] = cmd;
++ }
+ if (fork() == 0) {
+ if (dpy)
+ close(ConnectionNumber(dpy));
+@@ -1650,6 +1697,7 @@ spawn(const Arg *arg)
+ perror(" failed");
+ exit(EXIT_SUCCESS);
+ }
++ free(cmd);
+ }
+
+ void
+@@ -1987,8 +2035,10 @@ updatesizehints(Client *c)
+ void
+ updatestatus(void)
+ {
+- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
++ if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
+ strcpy(stext, "dwm-"VERSION);
++ else
++ copyvalidchars(stext, rawstext);
+ drawbar(selmon);
+ }
+
+--
+2.26.0
+
diff --git a/dwm.suckless.org/patches/statuscmd/index.md b/dwm.suckless.org/patches/statuscmd/index.md
@@ -0,0 +1,53 @@
+statuscmd
+=========
+
+Description
+-----------
+This patch adds the ability to execute shell commands based on the mouse
+button and position when clicking the status bar.
+
+Usage
+-----
+Fill 'statuscmds' with commands. Choose which command to run by prefixing
+the status text with a raw byte of the command's index in 'statuscmds',
+offset by +1 since '\0' terminates strings. statuscmds[0] runs by default
+if there is no index to the left of the mouse position. The mouse button
+clicked is exported as $BUTTON.
+
+Example
+-------
+With these commands:
+
+ static const char *statuscmds[] = { "volume", "cpu", "battery" };
+
+And root name set like this:
+
+ xsetroot -name "$(echo -e 'volume |\x02 cpu |\x03 battery')"
+
+Clicking on 'volume |' would run `volume`, clicking on ' cpu |'
+would run `cpu` and clicking on ' battery' would run `battery`.
+
+The `cpu` script could look like this:
+
+ #!/bin/sh
+
+ case $BUTTON in
+ 1) notify-send "CPU usage" "$(ps axch -o cmd,%cpu --sort=-%cpu | head)";;
+ 3) st -e htop;;
+ esac
+
+Notes
+-----
+If you have 10 or more commands, make sure to be careful when adding or
+removing newline characters since '\n' is equal to '\x0a'. The problem
+where having certain unprintable characters such as '\n' in the status
+string can make dwm laggy is "fixed", since they are not copied to the
+string that is actually drawn.
+
+Download
+--------
+* [dwm-statuscmd-6.2.diff](dwm-statuscmd-6.2.diff)
+
+Author
+------
+* Daniel Bylinka - <daniel.bylinka@gmail.com>
