update: dwmblocks icons; add: correct versions

dwmblocks/Makefile

@@ -1,4 +1,4 @@
-PREFIX  := /usr/local
+PREFIX  := /usr
 CC      := cc
 CFLAGS  := -pedantic -Wall -Wno-deprecated-declarations -Os
 LDFLAGS := -lX11

dwmblocks/blocks.def.h

@@ -2,11 +2,11 @@
 #define MODULE_ROOT "$HOME/.config/suckless/dwmblocks/modules/"
 static const Block blocks[] = {
     /*Icon*/    /*Command*/    /*Update Interval*/ /*Update Signal*/
-    {" ",    MODULE_ROOT "status-music",     0, 1},
-    {"net:", MODULE_ROOT "status-network",  10, 0},
-    {"bat:", MODULE_ROOT "status-battery",  60, 0},
-    {"vol:", MODULE_ROOT "status-volume",    0, 2},
-    {"",     MODULE_ROOT "status-datetime", 60, 0},
+    {" 󰎇 ", MODULE_ROOT "status-music",     0, 1},
+    {"󰖩 ", MODULE_ROOT "status-network",  10, 0},
+    {" ", MODULE_ROOT "status-battery",  60, 0},
+    {"󰕾 ", MODULE_ROOT "status-volume",    0, 2},
+    {" ", MODULE_ROOT "status-datetime", 60, 0},
 };
 
 //sets delimiter between status commands. NULL character ('\0') means no delimiter.

dwmblocks/dwmblocks.c

@@ -17,6 +17,7 @@
 #define CMDLENGTH		50
 #define MIN( a, b ) ( ( a < b) ? a : b )
 #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
+#define DWMBLOCKS_VERSION "1.0-odweta"
 
 typedef struct {
 	char* icon;
@@ -53,7 +54,6 @@ static void (*writestatus) () = pstdout;
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
 static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
-static int returnStatus = 0;
 
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
@@ -190,10 +190,17 @@ void termhandler()
 	statusContinue = 0;
 }
 
+void version() {
+    printf("dwmblocks " DWMBLOCKS_VERSION "\n");
+}
+
 int main(int argc, char** argv)
 {
 	for (int i = 0; i < argc; i++) {//Handle command line arguments
-		if (!strcmp("-d",argv[i]))
+        if (!strcmp("-v",argv[i])) {
+            version();
+            return 0;
+        } else if (!strcmp("-d",argv[i]))
 			strncpy(delim, argv[++i], delimLen);
 		else if (!strcmp("-p",argv[i]))
 			writestatus = pstdout;

dwmblocks/modules/status-music

@@ -1,3 +1,22 @@
 #!/usr/bin/env bash
 
-mpc status | head -1
+STATUS=$(mpc status | head -1)
+STATUS_TAIL=$(mpc status | tail -1)
+NAME=$STATUS
+ICON=""
+
+if [[ "$(echo $STATUS | awk -F ": " '{print $1}')" == "volume" ]]; then
+    NAME="silence"
+fi
+
+# random
+if [[ "$(echo $STATUS_TAIL | awk -F " " '{print $6}')" == "on" ]]; then
+    ICON="$ICON "
+fi
+
+# repeat
+if [[ "$(echo $STATUS_TAIL | awk -F " " '{print $4}')" == "on" ]]; then
+    ICON="$ICON "
+fi
+
+echo -n "$ICON$NAME"