Add files via upload

6 files changed, 262 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3ec2656
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+ISC License (ISC)
+
+Copyright 2020 torrinfail
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..69b26ea
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+PREFIX ?= /usr/local
+CC ?= cc
+
+output: dwmblocks.c config.h
+	${CC} `pkg-config --cflags x11 --libs x11` dwmblocks.c -o dwmblocks
+blocks.h:
+	cp blocks.def.h $@
+
+
+clean:
+	rm -f *.o *.gch dwmblocks
+install: output
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	install -m 0755 dwmblocks $(DESTDIR)$(PREFIX)/bin/dwmblocks
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/dwmblocks
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..00896ed
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+# dwmblocks
+Modular status bar for dwm written in c.
+# usage
+To use dwmblocks first run 'make' and then install it with 'sudo make install'.
+After that you can put dwmblocks in your xinitrc or other startup script to have it start with dwm.
+# modifying blocks
+The statusbar is made from text output from commandline programs.
+Blocks are added and removed by editing the blocks.h header file.
+By default the blocks.h header file is created the first time you run make which copies the default config from blocks.def.h.
+This is so you can edit your status bar commands and they will not get overwritten in a future update.
+# patches
+Here are some patches to dwmblocks that add features that I either don't want to merge in, or that require a dwm patch to work.
+I do not maintain these but I will take pull requests to update them.
+<br>
+<a href=https://gist.github.com/toniz4/41d168719e22bf7bc4ecff09d424b7d2>dwmblocks-statuscmd-20200717-941f415.diff</a>
diff --git a/config.h b/config.h
new file mode 100644
index 0000000..a5a990d
--- /dev/null
+++ b/config.h
@@ -0,0 +1,14 @@
+//Modify this file to change what commands output to your statusbar, and recompile using the make command.
+static const Block blocks[] = {
+
+/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
+  {"",  "nettraf",  1,  16}, 
+  {"",  "volume", 1,  10},
+  {"",  "clock", 5, 1},
+  {"",  "battery",  5, 3},
+  {"",  "internet", 5,  4},
+};
+
+//sets delimeter between status commands. NULL character ('\0') means no delimeter.
+static char delim[] = " |";
+static unsigned int delimLen = 5;
diff --git a/dwmblocks b/dwmblocks
new file mode 100644
index 0000000..f002a5f
--- /dev/null
+++ b/dwmblocks
diff --git a/dwmblocks.c b/dwmblocks.c
new file mode 100644
index 0000000..d45e7c3
--- /dev/null
+++ b/dwmblocks.c
@@ -0,0 +1,210 @@
+#include<stdlib.h>
+#include<stdio.h>
+#include<string.h>
+#include<unistd.h>
+#include<signal.h>
+#ifndef NO_X
+#include<X11/Xlib.h>
+#endif
+#ifdef __OpenBSD__
+#define SIGPLUS			SIGUSR1+1
+#define SIGMINUS		SIGUSR1-1
+#else
+#define SIGPLUS			SIGRTMIN
+#define SIGMINUS		SIGRTMIN
+#endif
+#define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH		50
+#define MIN( a, b ) ( ( a < b) ? a : b )
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
+
+typedef struct {
+	char* icon;
+	char* command;
+	unsigned int interval;
+	unsigned int signal;
+} Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
+void sighandler(int num);
+void getcmds(int time);
+void getsigcmds(unsigned int signal);
+void setupsignals();
+void sighandler(int signum);
+int getstatus(char *str, char *last);
+void statusloop();
+void termhandler();
+void pstdout();
+#ifndef NO_X
+void setroot();
+static void (*writestatus) () = setroot;
+static int setupX();
+static Display *dpy;
+static int screen;
+static Window root;
+#else
+static void (*writestatus) () = pstdout;
+#endif
+
+
+#include "config.h"
+
+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)
+{
+	strcpy(output, block->icon);
+	FILE *cmdf = popen(block->command, "r");
+	if (!cmdf)
+		return;
+	int i = strlen(block->icon);
+	fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
+	i = strlen(output);
+	if (i == 0)//return if block and command output are both empty
+		return;
+	if (delim[0] != '\0') {
+		//only chop off newline if one is present at the end
+		i = output[i-1] == '\n' ? i-1 : i;
+		strncpy(output+i, delim, delimLen); 
+	}
+	else
+		output[i++] = '\0';
+	pclose(cmdf);
+}
+
+void getcmds(int time)
+{
+	const Block* current;
+	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+		current = blocks + i;
+		if ((current->interval != 0 && time % current->interval == 0) || time == -1)
+			getcmd(current,statusbar[i]);
+	}
+}
+
+void getsigcmds(unsigned int signal)
+{
+	const Block *current;
+	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+		current = blocks + i;
+		if (current->signal == signal)
+			getcmd(current,statusbar[i]);
+	}
+}
+
+void setupsignals()
+{
+#ifndef __OpenBSD__
+	    /* initialize all real time signals with dummy handler */
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
+        signal(i, dummysighandler);
+#endif
+
+	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+		if (blocks[i].signal > 0)
+			signal(SIGMINUS+blocks[i].signal, sighandler);
+	}
+
+}
+
+int getstatus(char *str, char *last)
+{
+	strcpy(last, str);
+	str[0] = '\0';
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
+		strcat(str, statusbar[i]);
+	str[strlen(str)-strlen(delim)] = '\0';
+	return strcmp(str, last);//0 if they are the same
+}
+
+#ifndef NO_X
+void setroot()
+{
+	if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
+		return;
+	XStoreName(dpy, root, statusstr[0]);
+	XFlush(dpy);
+}
+
+int setupX()
+{
+	dpy = XOpenDisplay(NULL);
+	if (!dpy) {
+		fprintf(stderr, "dwmblocks: Failed to open display\n");
+		return 0;
+	}
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
+	return 1;
+}
+#endif
+
+void pstdout()
+{
+	if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+		return;
+	printf("%s\n",statusstr[0]);
+	fflush(stdout);
+}
+
+
+void statusloop()
+{
+	setupsignals();
+	int i = 0;
+	getcmds(-1);
+	while (1) {
+		getcmds(i++);
+		writestatus();
+		if (!statusContinue)
+			break;
+		sleep(1.0);
+	}
+}
+
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
+{
+    return;
+}
+#endif
+
+void sighandler(int signum)
+{
+	getsigcmds(signum-SIGPLUS);
+	writestatus();
+}
+
+void termhandler()
+{
+	statusContinue = 0;
+}
+
+int main(int argc, char** argv)
+{
+	for (int i = 0; i < argc; i++) {//Handle command line arguments
+		if (!strcmp("-d",argv[i]))
+			strncpy(delim, argv[++i], delimLen);
+		else if (!strcmp("-p",argv[i]))
+			writestatus = pstdout;
+	}
+#ifndef NO_X
+	if (!setupX())
+		return 1;
+#endif
+	delimLen = MIN(delimLen, strlen(delim));
+	delim[delimLen++] = '\0';
+	signal(SIGTERM, termhandler);
+	signal(SIGINT, termhandler);
+	statusloop();
+#ifndef NO_X
+	XCloseDisplay(dpy);
+#endif
+	return 0;
+}