From bdb7b92011c3597f6e7f13ff08a3e004bc62b4dd Mon Sep 17 00:00:00 2001 From: Luke Else Date: Tue, 20 Sep 2022 20:43:55 +0100 Subject: [PATCH] Add dwmblocks to repo --- .gitignore | 10 +++ Makefile | 35 +++++++++ config.h | 21 +++++ dwmblocks.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 config.h create mode 100644 dwmblocks.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..809baaa --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +dwmblocks +.cache + +# Vim +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] +*~ \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f039e6c --- /dev/null +++ b/Makefile @@ -0,0 +1,35 @@ +.SILENT: + +PREFIX ?= /usr/local +CC ?= cc +LDFLAGS = -lX11 + +output: dwmblocks.c + ${CC} dwmblocks.c $(LDFLAGS) -o dwmblocks + +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 + +indent: + indent --blank-lines-after-procedures --brace-indent0 --indent-level4 \ + --no-space-after-casts --no-space-after-function-call-names \ + --dont-break-procedure-type --format-all-comments \ + --line-length100 --comment-line-length100 --tab-size4 *.{c,h} + +check-indentation: + $(eval SOURCES := $(shell ls *.{c,h})) + for i in $(SOURCES); do \ + export DIFFS=$$(diff $$i <(indent -st -bap -bli0 -i4 -ncs -npcs -npsl -fca -l100 -lc100 -ts4 $$i)); \ + if [ -z "$$DIFFS" ]; then echo -e "\033[0;32mValid indentation format -> $$i\033[0m"; else echo -e "\033[0;31mInvalid indentation format -> $$i\033[0m"; fi \ + done + +check: + @echo Checking indentation standards + $(MAKE) check-indentation + +.PHONY: clean install uninstall output indent check-indentation check diff --git a/config.h b/config.h new file mode 100644 index 0000000..cc0c85b --- /dev/null +++ b/config.h @@ -0,0 +1,21 @@ +//Modify this file to change what commands output to your statusbar, and recompile using the make command. + +static const Block blocks[] = { + /* Command *//* Update Interval *//* Update Signal */ + {"dwm_memory", 3, 0}, + {"dwm_kernel", 0, 0}, + {"dwm_cpu_temp", 3, 0}, + // { "dwm_date", 3600, 0 }, + {"dwm_brightness", 0, 11}, + {"dwm_volume", 0, 10}, + {"dwm_network", 3, 0}, + // { "dwm_traffic", 1, 0 }, + {"dwm_battery", 3, 0}, + {"dwm_clock", 3, 0}, + {"dwm_keyboard_layout", 0, 12}, + {"dwm_uptime", 60, 0}, +}; + +//sets delimeter between status commands. NULL character ('\0') means no delimeter. +static char delim[] = " "; +static unsigned int delimLen = 1; diff --git a/dwmblocks.c b/dwmblocks.c new file mode 100644 index 0000000..94f794f --- /dev/null +++ b/dwmblocks.c @@ -0,0 +1,219 @@ +#include +#include +#include +#include +#include +#ifndef NO_X +#include +#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 100 +#define MIN( a, b ) ( ( a < b) ? a : b ) +#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1) + +typedef struct +{ + 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) +{ + FILE *cmdf = popen(block->command, "r"); + if (!cmdf) + return; + fgets(output, CMDLENGTH - delimLen, cmdf); + int i = strlen(output); + if (i == 0) + { + // return if block and command output are both empty + pclose(cmdf); + 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; +}