From 762e2b5c8696d41c99a90262826679bf08323ba3 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 1 Sep 2021 07:13:24 -0300 Subject: [PATCH] Changed all the blocks and added mail block --- GNUmakefile | 6 +- blocks.def/battery.sh | 4 - blocks.def/battery_button.sh | 41 ---- blocks.def/calendar.sh | 3 - blocks.def/cpu_temp.sh | 38 +++- blocks.def/cpu_temp_button.sh | 8 +- blocks.def/mail.sh | 16 ++ blocks.def/mail_button.sh | 9 + blocks.def/time.sh | 38 ++++ blocks.def/time_button.sh | 22 ++ blocks.def/volume.pipewire.sh | 44 ---- blocks.def/volume.sh | 95 ++++---- blocks.def/volume_button.sh | 43 +++- config.def.h | 10 +- daemons/pulse_daemon.sh | 9 - patches/dwm-dwmblocks-6.2.diff | 401 --------------------------------- 16 files changed, 225 insertions(+), 562 deletions(-) delete mode 100755 blocks.def/battery.sh delete mode 100755 blocks.def/battery_button.sh delete mode 100755 blocks.def/calendar.sh create mode 100755 blocks.def/mail.sh create mode 100755 blocks.def/mail_button.sh create mode 100755 blocks.def/time.sh create mode 100755 blocks.def/time_button.sh delete mode 100755 blocks.def/volume.pipewire.sh delete mode 100755 daemons/pulse_daemon.sh delete mode 100644 patches/dwm-dwmblocks-6.2.diff diff --git a/GNUmakefile b/GNUmakefile index 470e5e5..5673ce8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,7 +34,9 @@ xgetrootname/xgetrootname: xgetrootname/xgetrootname.c ${CC} -o $@ ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS} clean: - rm -f dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname + rm -f dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname + rm config.h + rm -r blocks BINDIR = ${DESTDIR}${PREFIX}/bin PIDDIR = /var/local/dwmblocks @@ -45,6 +47,8 @@ install: all chmod 755 ${BINDIR}/dwmblocks ${BINDIR}/sigdwmblocks ${BINDIR}/xgetrootname mkdir -p ${PIDDIR} chmod 777 ${PIDDIR} + cp blocks.def/* blocks + cp config.def.h config.h uninstall: rm -f ${BINDIR}/dwmblocks ${BINDIR}/sigdwmblocks ${BINDIR}/xgetrootname diff --git a/blocks.def/battery.sh b/blocks.def/battery.sh deleted file mode 100755 index df98fc8..0000000 --- a/blocks.def/battery.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -ICON="  " -read -r capacity /dev/null & + #setsid -f mw -Y > /dev/null + #setsid -f $TERMINAL -e "mw" "-Y" + #mailsync > /dev/null + /.$HOME/mailCheck > /dev/null +} + +#getMails +unreadMails="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/*/[Ii][Nn][Bb][Oo][Xx]/new/* -type f 2>/dev/null | wc -l 2>/dev/null)" + +printf "$ICON %s" "$unreadMails" diff --git a/blocks.def/mail_button.sh b/blocks.def/mail_button.sh new file mode 100755 index 0000000..1e2fd4e --- /dev/null +++ b/blocks.def/mail_button.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + 1) "$TERMINAL" -e "neomutt" ;; + #3) mw -Y ;; + # 3) "$TERMINAL" -e "neomutt" ;; +esac + +sigdwmblocks 3 diff --git a/blocks.def/time.sh b/blocks.def/time.sh new file mode 100755 index 0000000..b2824da --- /dev/null +++ b/blocks.def/time.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +ICON="🕓" + +chooseEmoji() { + clock=$(date '+%I') + + case "$clock" in + "00") ICON="🕛" ;; + "01") ICON="🕐" ;; + "02") ICON="🕑" ;; + "03") ICON="🕒" ;; + "04") ICON="🕓" ;; + "05") ICON="🕔" ;; + "06") ICON="🕕" ;; + "07") ICON="🕖" ;; + "08") ICON="🕗" ;; + "09") ICON="🕘" ;; + "10") ICON="🕙" ;; + "11") ICON="🕚" ;; + "12") ICON="🕛" ;; + esac +} + +waitForMinute() { + while true + do + if [ `date "+%S"` -eq 0 ]; then + break + fi + + sleep 1 + done +} + +chooseEmoji + +printf "$ICON %s" "$(date '+%R %b %d (%a)')" diff --git a/blocks.def/time_button.sh b/blocks.def/time_button.sh new file mode 100755 index 0000000..b25535f --- /dev/null +++ b/blocks.def/time_button.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +manageCalcurse() { + if pgrep "calcurse" > /dev/null; then + pkill "calcurse" + else + "$TERMINAL" -e "calcurse" + fi +} + +manageNotifications() { + #"$TERMINAL" -e "dunstctl" "history-pop" + dunstctl history-pop +} + +case "$1" in + 1) manageCalcurse ;; + 3) manageNotifications ;; + + # Agregar appointments o algo de ese estilo + # Time tracker tmb puede ser +esac diff --git a/blocks.def/volume.pipewire.sh b/blocks.def/volume.pipewire.sh deleted file mode 100755 index b4e6c8f..0000000 --- a/blocks.def/volume.pipewire.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# (for pipewire users) -# This script parses the output of `pactl list sinks' to find volume and mute -# status of the default audio sink and whether headphones are plugged in or not -# Also see ../daemons/pulse_daemon.sh -sink="$(pactl info | awk '$1 == "Default" && $2 == "Sink:" {print $3}')" -[ -n "$sink" ] || exit -pactl list sinks | awk -v sink="$sink" ' - BEGIN { - ICONsn = "\x0c\x0b" # headphone unplugged, not muted - ICONsm = "\x0d\x0b" # headphone unplugged, muted - ICONhn = "\x0c\x0b" # headphone plugged in, not muted - ICONhm = "\x0d\x0b" # headphone plugged in, muted - } - f { - if ($1 == "Mute:" && $2 == "yes") { - m = 1 - } else if ($1 == "Volume:") { - if ($3 == $10) { - vb = $5 - } else { - vl = $5 - vr = $12 - } - } else if ($1 == "Active" && $2 == "Port:") { - if (tolower($3) ~ /headphone/) - h = 1 - exit - } - next - } - $1 == "Name:" && $2 == sink { - f = 1 - } - END { - if (f) { - printf "%s", h ? (m ? ICONhm : ICONhn) : (m ? ICONsm : ICONsn) - if (vb) - print vb - else - printf "L%s R%s\n", vl, vr - } - } -' diff --git a/blocks.def/volume.sh b/blocks.def/volume.sh index b74139d..c47307b 100755 --- a/blocks.def/volume.sh +++ b/blocks.def/volume.sh @@ -1,42 +1,55 @@ #!/bin/sh -# (for pulseaudio users) -# This script parses the output of `pacmd list-sinks' to find volume and mute -# status of the default audio sink and whether headphones are plugged in or not -# Also see ../daemons/pulse_daemon.sh -pacmd list-sinks | awk ' - BEGIN { - ICONsn = "\x0c\x0b" # headphone unplugged, not muted - ICONsm = "\x0d\x0b" # headphone unplugged, muted - ICONhn = "\x0c\x0b" # headphone plugged in, not muted - ICONhm = "\x0d\x0b" # headphone plugged in, muted - } - f { - if ($1 == "muted:" && $2 == "yes") { - m = 1 - } else if ($1 == "volume:") { - if ($3 == $10) { - vb = $5 - } else { - vl = $5 - vr = $12 - } - } else if ($1 == "active" && $2 == "port:") { - if (tolower($3) ~ /headphone/) - h = 1 - exit - } - next - } - $1 == "*" && $2 == "index:" { - f = 1 - } - END { - if (f) { - printf "%s", h ? (m ? ICONhm : ICONhn) : (m ? ICONsm : ICONsn) - if (vb) - print vb - else - printf "L%s R%s\n", vl, vr - } - } -' + +ICONlow="🔈" +ICONmid="🔉" +ICONhigh="🔊" +ICONmute="🔇" +ICONspeakermute="🔕" +ICONspeaker="🔔" + +SINKHDMI=alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1 +SINKANALOG=alsa_output.pci-0000_00_1b.0.analog-stereo + +checkDefaultSink() { + PACTLOUTPUT=`pactl info` + + if echo $PACTLOUTPUT | grep -q "$SINKANALOG"; then + SINK=$SINKANALOG + elif echo $PACTLOUTPUT | grep -q "$SINKHDMI"; then + SINK=$SINKHDMI + fi +} + +#VOLUME=`pulsemixer --get-volume | awk '{printf $1}'` +VOLUME=$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{printf $5}' | sed s/%//) +MUTE=$(pactl get-sink-mute @DEFAULT_SINK@ | awk '{printf $2}') + +checkDefaultSink + +getIcon() { + #if [ `pulsemixer --get-mute` -eq 1 ]; then + if [ "$MUTE" = "yes" ]; then + #ICON=$ICONmute + if [ "$SINK" = "$SINKHDMI" ]; then + ICON=$ICONspeakermute + elif [ "$SINK" = "$SINKANALOG" ]; then + ICON=$ICONmute + fi + else + if [ "$SINK" = "$SINKHDMI" ]; then + ICON=$ICONspeaker + elif [ "$SINK" = "$SINKANALOG" ]; then + if [ "$VOLUME" -gt "50" ]; then + ICON=$ICONhigh + elif [ "$VOLUME" -gt "20" ]; then + ICON=$ICONmid + else + ICON=$ICONlow + fi + fi + fi + + printf "$ICON %s" "$VOLUME%" +} + +getIcon diff --git a/blocks.def/volume_button.sh b/blocks.def/volume_button.sh index b0f58d4..94978c1 100755 --- a/blocks.def/volume_button.sh +++ b/blocks.def/volume_button.sh @@ -1,5 +1,44 @@ #!/bin/sh + +SINKHDMI=alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1 +SINKANALOG=alsa_output.pci-0000_00_1b.0.analog-stereo + +checkDefaultSink() { + PACTLOUTPUT=`pactl info` + + if echo $PACTLOUTPUT | grep -q "$SINKANALOG"; then + SINK=$SINKANALOG + elif echo $PACTLOUTPUT | grep -q "$SINKHDMI"; then + SINK=$SINKHDMI + fi +} + +changeDefaultSink() { + if [ "$SINK" = "$SINKANALOG" ]; then + pactl set-default-sink $SINKHDMI + elif [ "$SINK" = "$SINKHDMI" ]; then + pactl set-default-sink $SINKANALOG + fi +} + +managePulsemixer() { + if pgrep "pulsemixer" > /dev/null; then + pkill "pulsemixer" + else + "$TERMINAL" -e "pulsemixer" + fi +} + +refreshVolumeBlock() { + sigdwmblocks 2 +} + +checkDefaultSink + case "$1" in - 1) pactl set-sink-mute @DEFAULT_SINK@ toggle ;; - 3) pactl set-sink-volume @DEFAULT_SINK@ 50% ;; + 1) managePulsemixer ;; + 2) changeDefaultSink;; + 3) pactl set-sink-mute @DEFAULT_SINK@ toggle;; esac + +refreshVolumeBlock diff --git a/config.def.h b/config.def.h index 0eb2264..eb67bed 100644 --- a/config.def.h +++ b/config.def.h @@ -17,7 +17,7 @@ /* delimiter specified as an array of characters * don't remove DELIMITERENDCHAR at the end */ -static const char delimiter[] = { ' ', ' ', ' ', DELIMITERENDCHAR }; +static const char delimiter[] = { ' ', ' ', DELIMITERENDCHAR }; #include "block.h" @@ -43,9 +43,9 @@ static const char delimiter[] = { ' ', ' ', ' ', DELIMITERENDCHAR }; static Block blocks[] = { /* pathu pathc interval signal */ - { PATH("calendar.sh"), NULL, 30, 1}, - { PATH("volume.sh"), PATH("volume_button.sh"), 0, 2}, - { PATH("cpu_temp.sh"), PATH("cpu_temp_button.sh"), 1, 4}, - { PATH("battery.sh"), PATH("battery_button.sh"), 30, 3}, + { PATH("time.sh"), PATH("time_button.sh"), 1, 1}, + { PATH("volume.sh"), PATH("volume_button.sh"), 0, 2}, + { PATH("mail.sh"), PATH("mail_button.sh"), 0, 3}, + { PATH("cpu_temp.sh"), PATH("cpu_temp_button.sh"), 15, 4}, { NULL } /* just to mark the end of the array */ }; diff --git a/daemons/pulse_daemon.sh b/daemons/pulse_daemon.sh deleted file mode 100755 index 222099b..0000000 --- a/daemons/pulse_daemon.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# This script should be autostarted with X session -# It signals volume block to update on audio related events -pactl subscribe | - while IFS='' read -r output ; do - case "$output" in - *" sink "*) sigdwmblocks 1 ;; - esac - done diff --git a/patches/dwm-dwmblocks-6.2.diff b/patches/dwm-dwmblocks-6.2.diff deleted file mode 100644 index 7ccf3be..0000000 --- a/patches/dwm-dwmblocks-6.2.diff +++ /dev/null @@ -1,401 +0,0 @@ -diff -ruN dwm-6.2-ori/config.def.h dwm-6.2/config.def.h ---- dwm-6.2-ori/config.def.h 2019-02-02 18:25:28.000000000 +0530 -+++ dwm-6.2/config.def.h 2020-12-27 19:45:35.127385861 +0530 -@@ -12,10 +12,26 @@ - static const char col_gray3[] = "#bbbbbb"; - static const char col_gray4[] = "#eeeeee"; - static const char col_cyan[] = "#005577"; -+static const char col1[] = "#ffffff"; -+static const char col2[] = "#ffffff"; -+static const char col3[] = "#ffffff"; -+static const char col4[] = "#ffffff"; -+static const char col5[] = "#ffffff"; -+static const char col6[] = "#ffffff"; -+ -+enum { SchemeNorm, SchemeCol1, SchemeCol2, SchemeCol3, SchemeCol4, -+ SchemeCol5, SchemeCol6, SchemeSel }; /* color schemes */ -+ - static const char *colors[][3] = { - /* fg bg border */ -- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, -- [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, -+ [SchemeCol1] = { col1, col_gray1, col_gray2 }, -+ [SchemeCol2] = { col2, col_gray1, col_gray2 }, -+ [SchemeCol3] = { col3, col_gray1, col_gray2 }, -+ [SchemeCol4] = { col4, col_gray1, col_gray2 }, -+ [SchemeCol5] = { col5, col_gray1, col_gray2 }, -+ [SchemeCol6] = { col6, col_gray1, col_gray2 }, -+ [SchemeSel] = { col_gray4, col_cyan, col_cyan }, - }; - - /* tagging */ -@@ -103,7 +119,9 @@ - { 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 -ruN dwm-6.2-ori/dwm.c dwm-6.2/dwm.c ---- dwm-6.2-ori/dwm.c 2019-02-02 18:25:28.000000000 +0530 -+++ dwm-6.2/dwm.c 2021-08-03 19:15:58.734660076 +0530 -@@ -40,6 +40,7 @@ - #include - #endif /* XINERAMA */ - #include -+#include - - #include "drw.h" - #include "util.h" -@@ -56,10 +57,16 @@ - #define HEIGHT(X) ((X)->h + 2 * (X)->bw) - #define TAGMASK ((1 << LENGTH(tags)) - 1) - #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) -+#define TTEXTW(X) (drw_fontset_getwidth(drw, (X))) -+ -+#define STATUSLENGTH 256 -+#define DWMBLOCKSLOCKFILE "/var/local/dwmblocks/dwmblocks.pid" -+#define DELIMITERENDCHAR 10 -+#define LSPAD (lrpad / 2) /* padding on left side of status text */ -+#define RSPAD (lrpad / 2) /* padding on right side of status text */ - - /* enums */ --enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ --enum { SchemeNorm, SchemeSel }; /* color schemes */ -+enum { CurNormal, CurHand, CurResize, CurMove, CurLast }; /* cursor */ - enum { NetSupported, NetWMName, NetWMState, NetWMCheck, - NetWMFullscreen, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ -@@ -124,6 +131,7 @@ - unsigned int tagset[2]; - int showbar; - int topbar; -+ int statushandcursor; - Client *clients; - Client *sel; - Client *stack; -@@ -205,6 +213,7 @@ - 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 void tag(const Arg *arg); - static void tagmon(const Arg *arg); -@@ -219,6 +228,7 @@ - static void updatebarpos(Monitor *m); - static void updatebars(void); - static void updateclientlist(void); -+static void updatedwmblockssig(int x); - static int updategeom(void); - static void updatenumlockmask(void); - static void updatesizehints(Client *c); -@@ -236,12 +246,15 @@ - - /* variables */ - static const char broken[] = "broken"; --static char stext[256]; -+static char stextc[STATUSLENGTH]; -+static char stexts[STATUSLENGTH]; - static int screen; - static int sw, sh; /* X display screen geometry width, height */ --static int bh, blw = 0; /* bar geometry */ -+static int bh, blw, ble; /* bar geometry */ -+static int wstext; /* width of status text */ - static int lrpad; /* sum of left and right padding for text */ - static int (*xerrorxlib)(Display *, XErrorEvent *); -+static unsigned int dwmblockssig; - static unsigned int numlockmask = 0; - static void (*handler[LASTEvent]) (XEvent *) = { - [ButtonPress] = buttonpress, -@@ -416,13 +429,13 @@ - void - buttonpress(XEvent *e) - { -- unsigned int i, x, click; -+ int i, x; -+ unsigned int click; - Arg arg = {0}; - Client *c; - Monitor *m; - XButtonPressedEvent *ev = &e->xbutton; - -- click = ClkRootWin; - /* focus monitor if necessary */ - if ((m = wintomon(ev->window)) && m != selmon) { - unfocus(selmon->sel, 1); -@@ -430,25 +443,29 @@ - focus(NULL); - } - if (ev->window == selmon->barwin) { -- i = x = 0; -- do -- x += TEXTW(tags[i]); -- while (ev->x >= x && ++i < LENGTH(tags)); -- if (i < LENGTH(tags)) { -- click = ClkTagBar; -- arg.ui = 1 << i; -- } else if (ev->x < x + blw) -- click = ClkLtSymbol; -- else if (ev->x > selmon->ww - TEXTW(stext)) -- click = ClkStatusText; -- else -- click = ClkWinTitle; -+ if (ev->x < ble - blw) { -+ i = -1, x = -ev->x; -+ do -+ x += TEXTW(tags[++i]); -+ while (x <= 0); -+ click = ClkTagBar; -+ arg.ui = 1 << i; -+ } else if (ev->x < ble) -+ click = ClkLtSymbol; -+ else if (ev->x < selmon->ww - wstext) -+ click = ClkWinTitle; -+ else if ((x = selmon->ww - RSPAD - ev->x) > 0 && (x -= wstext - LSPAD - RSPAD) <= 0) { -+ updatedwmblockssig(x); -+ click = ClkStatusText; -+ } else -+ return; - } else if ((c = wintoclient(ev->window))) { - focus(c); - restack(selmon); - XAllowEvents(dpy, ReplayPointer, CurrentTime); - click = ClkClientWin; -- } -+ } else -+ click = ClkRootWin; - for (i = 0; i < LENGTH(buttons); i++) - if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button - && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) -@@ -695,7 +712,7 @@ - void - drawbar(Monitor *m) - { -- int x, w, sw = 0; -+ int x, w; - int boxs = drw->fonts->h / 9; - int boxw = drw->fonts->h / 6 + 2; - unsigned int i, occ = 0, urg = 0; -@@ -703,9 +720,32 @@ - - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ -- drw_setscheme(drw, scheme[SchemeNorm]); -- sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ -- drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0); -+ char *stc = stextc; -+ char *stp = stextc; -+ char tmp; -+ -+ drw_setscheme(drw, scheme[SchemeNorm]); -+ x = m->ww - wstext; -+ drw_rect(drw, x, 0, LSPAD, bh, 1, 1); x += LSPAD; /* to keep left padding clean */ -+ for (;;) { -+ if ((unsigned char)*stc >= ' ') { -+ stc++; -+ continue; -+ } -+ tmp = *stc; -+ if (stp != stc) { -+ *stc = '\0'; -+ x = drw_text(drw, x, 0, TTEXTW(stp), bh, 0, stp, 0); -+ } -+ if (tmp == '\0') -+ break; -+ if (tmp - DELIMITERENDCHAR - 1 < LENGTH(colors)) -+ drw_setscheme(drw, scheme[tmp - DELIMITERENDCHAR - 1]); -+ *stc = tmp; -+ stp = ++stc; -+ } -+ drw_setscheme(drw, scheme[SchemeNorm]); -+ drw_rect(drw, x, 0, m->ww - x, bh, 1, 1); /* to keep right padding clean */ - } - - for (c = m->clients; c; c = c->next) { -@@ -724,11 +764,17 @@ - urg & 1 << i); - x += w; - } -- w = blw = TEXTW(m->ltsymbol); -+ w = TEXTW(m->ltsymbol); - drw_setscheme(drw, scheme[SchemeNorm]); - x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - -- if ((w = m->ww - sw - x) > bh) { -+ if (m == selmon) { -+ blw = w, ble = x; -+ w = m->ww - wstext - x; -+ } else -+ w = m->ww - x; -+ -+ if (w > bh) { - if (m->sel) { - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); -@@ -1119,17 +1165,24 @@ - motionnotify(XEvent *e) - { - static Monitor *mon = NULL; -+ int x; - Monitor *m; - XMotionEvent *ev = &e->xmotion; - -- if (ev->window != root) -- return; -- if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) { -- unfocus(selmon->sel, 1); -- selmon = m; -- focus(NULL); -- } -- mon = m; -+ if (ev->window == root) { -+ if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) { -+ unfocus(selmon->sel, 1); -+ selmon = m; -+ focus(NULL); -+ } -+ mon = m; -+ } else if (ev->window == selmon->barwin && (x = selmon->ww - RSPAD - ev->x) > 0 -+ && (x -= wstext - LSPAD - RSPAD) <= 0) -+ updatedwmblockssig(x); -+ else if (selmon->statushandcursor) { -+ selmon->statushandcursor = 0; -+ XDefineCursor(dpy, selmon->barwin, cursor[CurNormal]->cursor); -+ } - } - - void -@@ -1564,6 +1617,7 @@ - netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); - /* init cursors */ - cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); -+ cursor[CurHand] = drw_cur_create(drw, XC_hand2); - cursor[CurResize] = drw_cur_create(drw, XC_sizing); - cursor[CurMove] = drw_cur_create(drw, XC_fleur); - /* init appearance */ -@@ -1637,6 +1691,37 @@ - } - - void -+sigdwmblocks(const Arg *arg) -+{ -+ static int fd = -1; -+ struct flock fl; -+ union sigval sv; -+ -+ if (!dwmblockssig) -+ return; -+ fl.l_type = F_WRLCK; -+ fl.l_whence = SEEK_SET; -+ fl.l_start = 0; -+ fl.l_len = 0; -+ if (fd != -1) { -+ if (fcntl(fd, F_GETLK, &fl) != -1 && fl.l_type == F_WRLCK) -+ goto signal; -+ close(fd); -+ fl.l_type = F_WRLCK; -+ } -+ if ((fd = open(DWMBLOCKSLOCKFILE, O_RDONLY | O_CLOEXEC)) == -1) -+ return; -+ if (fcntl(fd, F_GETLK, &fl) == -1 || fl.l_type != F_WRLCK) { -+ close(fd); -+ fd = -1; -+ return; -+ } -+signal: -+ sv.sival_int = (dwmblockssig << 8) | arg->i; -+ sigqueue(fl.l_pid, SIGRTMIN, sv); -+} -+ -+void - spawn(const Arg *arg) - { - if (arg->v == dmenucmd) -@@ -1805,7 +1890,7 @@ - XSetWindowAttributes wa = { - .override_redirect = True, - .background_pixmap = ParentRelative, -- .event_mask = ButtonPressMask|ExposureMask -+ .event_mask = ButtonPressMask|ExposureMask|PointerMotionMask - }; - XClassHint ch = {"dwm", "dwm"}; - for (m = mons; m; m = m->next) { -@@ -1847,6 +1932,41 @@ - (unsigned char *) &(c->win), 1); - } - -+void -+updatedwmblockssig(int x) -+{ -+ char *sts = stexts; -+ char *stp = stexts; -+ char tmp; -+ -+ while (*sts != '\0') { -+ if ((unsigned char)*sts >= ' ') { -+ sts++; -+ continue; -+ } -+ tmp = *sts; -+ *sts = '\0'; -+ x += TTEXTW(stp); -+ *sts = tmp; -+ if (x > 0) { -+ if (tmp == DELIMITERENDCHAR) -+ break; -+ if (!selmon->statushandcursor) { -+ selmon->statushandcursor = 1; -+ XDefineCursor(dpy, selmon->barwin, cursor[CurHand]->cursor); -+ } -+ dwmblockssig = tmp; -+ return; -+ } -+ stp = ++sts; -+ } -+ if (selmon->statushandcursor) { -+ selmon->statushandcursor = 0; -+ XDefineCursor(dpy, selmon->barwin, cursor[CurNormal]->cursor); -+ } -+ dwmblockssig = 0; -+} -+ - int - updategeom(void) - { -@@ -1987,9 +2107,27 @@ - void - updatestatus(void) - { -- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) -- strcpy(stext, "dwm-"VERSION); -- drawbar(selmon); -+ char rawstext[STATUSLENGTH]; -+ -+ if (gettextprop(root, XA_WM_NAME, rawstext, sizeof rawstext)) { -+ char stextp[STATUSLENGTH]; -+ char *stp = stextp, *stc = stextc, *sts = stexts; -+ -+ for (char *rst = rawstext; *rst != '\0'; rst++) -+ if ((unsigned char)*rst >= ' ') -+ *(stp++) = *(stc++) = *(sts++) = *rst; -+ else if ((unsigned char)*rst > DELIMITERENDCHAR) -+ *(stc++) = *rst; -+ else -+ *(sts++) = *rst; -+ *stp = *stc = *sts = '\0'; -+ wstext = TTEXTW(stextp) + LSPAD + RSPAD; -+ } else { -+ strcpy(stextc, "dwm-"VERSION); -+ strcpy(stexts, stextc); -+ wstext = TTEXTW(stextc) + LSPAD + RSPAD; -+ } -+ drawbar(selmon); - } - - void