From 588bb80ca4c11471c31d7d516ba39da5b6b6dca8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 5 Jun 2020 12:46:57 +0400 Subject: Added support of dwmblocks --- README.md | 2 ++ config.def.h | 4 +++- config.h | 14 +++++++----- dwm.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 82 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index fc4c5c7..4138bfb 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,5 @@ Installed patches: * [focusonclick](https://dwm.suckless.org/patches/focusonclick/) to focus on click (yeah) * [systray](https://dwm.suckless.org/patches/systray/) for simple system tray implementation * [tilegap](https://dwm.suckless.org/patches/tilegap/) for nice gaps between windows +* [statuscmd-signal](https://dwm.suckless.org/patches/statuscmd/) for support of clicks on bar in dwmblocks + (needed manual merge because of conflict with systray) diff --git a/config.def.h b/config.def.h index b275b14..3f7da51 100644 --- a/config.def.h +++ b/config.def.h @@ -113,7 +113,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, sigdwmblocks, {.i = 1} }, + { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} }, + { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, diff --git a/config.h b/config.h index 5c67638..9cef80b 100644 --- a/config.h +++ b/config.h @@ -13,8 +13,8 @@ static const int showsystray = 1; /* 0 means no systray */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const int focusonwheel = 0; -static const char *fonts[] = { "monospace:size=13" }; -static const char dmenufont[] = "monospace:size=13"; +static const char *fonts[] = { "monospace:size=15" }; +static const char dmenufont[] = "monospace:size=15"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -113,9 +113,9 @@ static Key keys[] = { { MODKEY, XK_Tab, spawn, {.v = htopcmd } }, // Volume control - { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t") }, - { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 5") }, - { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 5") }, + { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; pkill -RTMIN+9 dwmblocks") }, + { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 5; pkill -RTMIN+9 dwmblocks") }, + { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 5; pkill -RTMIN+9 dwmblocks") }, // Screenshot of chosen area { 0, XK_Print, spawn, SHCMD("maim -u -s -m 1 | xclip -selection clipboard -t image/png") }, @@ -138,7 +138,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, sigdwmblocks, {.i = 1} }, + { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} }, + { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, diff --git a/dwm.c b/dwm.c index 51867d1..6e54eff 100644 --- a/dwm.c +++ b/dwm.c @@ -180,6 +180,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); @@ -192,6 +193,7 @@ static void focus(Client *c); static void focusin(XEvent *e); static void focusmon(const Arg *arg); static void focusstack(const Arg *arg); +static int getdwmblockspid(); static Atom getatomprop(Client *c, Atom prop); static int getrootptr(int *x, int *y); static long getstate(Window w); @@ -232,6 +234,7 @@ static void setup(void); static void seturgent(Client *c, int urg); static void showhide(Client *c); static void sigchld(int unused); +static void sigdwmblocks(const Arg *arg); static void spawn(const Arg *arg); static Monitor *systraytomon(Monitor *m); static void tag(const Arg *arg); @@ -271,6 +274,9 @@ static void zoom(const Arg *arg); static Systray *systray = NULL; static const char broken[] = "broken"; static char stext[256]; +static char rawstext[256]; +static int dwmblockssig; +pid_t dwmblockspid = 0; static int screen; static int sw, sh; /* X display screen geometry width, height */ static int bh, blw = 0; /* bar geometry */ @@ -473,9 +479,25 @@ buttonpress(XEvent *e) arg.ui = 1 << i; } else if (ev->x < x + blw) click = ClkLtSymbol; - else if (ev->x > selmon->ww - TEXTW(stext) - getsystraywidth()) + else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad - getsystraywidth())) { click = ClkStatusText; - else + char *text = rawstext; + int i = -1; + char ch; + dwmblockssig = 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; + dwmblockssig = ch; + } + } + } else click = ClkWinTitle; } else if ((c = wintoclient(ev->window))) { if (focusonwheel || (ev->button != Button4 && ev->button != Button5)) @@ -714,6 +736,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) { @@ -958,6 +993,18 @@ getatomprop(Client *c, Atom prop) return atom; } +int +getdwmblockspid() +{ + char buf[16]; + FILE *fp = popen("pidof -s dwmblocks", "r"); + fgets(buf, sizeof(buf), fp); + pid_t pid = strtoul(buf, NULL, 10); + pclose(fp); + dwmblockspid = pid; + return pid != 0 ? 0 : -1; +} + int getrootptr(int *x, int *y) { @@ -1786,6 +1833,23 @@ sigchld(int unused) while (0 < waitpid(-1, NULL, WNOHANG)); } +void +sigdwmblocks(const Arg *arg) +{ + union sigval sv; + sv.sival_int = (dwmblockssig << 8) | arg->i; + if (!dwmblockspid) + if (getdwmblockspid() == -1) + return; + + if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) { + if (errno == ESRCH) { + if (!getdwmblockspid()) + sigqueue(dwmblockspid, SIGUSR1, sv); + } + } +} + void spawn(const Arg *arg) { @@ -2170,8 +2234,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); updatesystray(); } -- cgit v1.2.3