usr

Modulate your userpace into POSIX-compliant shell scripts!
git clone git://clone.theohenson.com/usr.git
Log | Files | Refs | README

commit 1c423386658babb7bc005a559d09bb1d7b2f7600
parent 68f444115c9fd0296980ec4994ffc8031a2e114c
Author: Theo Henson <[email protected]>
Date:   Mon, 28 Dec 2020 15:57:46 -0500

Update dwmblocks

Diffstat:
Mhome/src/suk/dwmblocks/Makefile | 11++++++++---
Mhome/src/suk/dwmblocks/README.md | 10++++++++++
Mhome/src/suk/dwmblocks/blocks.h | 3++-
Mhome/src/suk/dwmblocks/dwmblocks.c | 143++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
4 files changed, 115 insertions(+), 52 deletions(-)

diff --git a/home/src/suk/dwmblocks/Makefile b/home/src/suk/dwmblocks/Makefile @@ -1,12 +1,17 @@ PREFIX ?= /usr/local +CC ?= cc +LDFLAGS = -lX11 output: dwmblocks.c blocks.h - cc `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks + ${CC} dwmblocks.c $(LDFLAGS) -o dwmblocks +blocks.h: + cp blocks.def.h [email protected] + + clean: rm -f *.o *.gch dwmblocks install: output mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f dwmblocks $(DESTDIR)$(PREFIX)/bin - chmod 755 $(DESTDIR)$(PREFIX)/bin/dwmblocks + install -m 0755 dwmblocks $(DESTDIR)$(PREFIX)/bin/dwmblocks uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/dwmblocks diff --git a/home/src/suk/dwmblocks/README.md b/home/src/suk/dwmblocks/README.md @@ -1,5 +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/IGeraGera/e4a5583b91b3eec2e81fdceb44dea717>dwmblocks-statuscmd-b6b0be4.diff</a> diff --git a/home/src/suk/dwmblocks/blocks.h b/home/src/suk/dwmblocks/blocks.h @@ -6,4 +6,5 @@ static const Block blocks[] = { }; //sets delimeter between status commands. NULL character ('\0') means no delimeter. -static char delim = ' '; +static char delim[] = " "; +static unsigned int delimLen = 1; diff --git a/home/src/suk/dwmblocks/dwmblocks.c b/home/src/suk/dwmblocks/dwmblocks.c @@ -3,9 +3,20 @@ #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; @@ -13,64 +24,76 @@ typedef struct { unsigned int interval; unsigned int signal; } Block; +#ifndef __OpenBSD__ +void dummysighandler(int num); +#endif void sighandler(int num); void getcmds(int time); -#ifndef __OpenBSD__ -void getsigcmds(int signal); +void getsigcmds(unsigned int signal); void setupsignals(); void sighandler(int signum); -#endif int getstatus(char *str, char *last); -void setroot(); void statusloop(); -void termhandler(int signum); +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 "blocks.h" -static Display *dpy; -static int screen; -static Window root; static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0}; -static char statusstr[2][256]; +static char statusstr[2][STATUSLENGTH]; static int statusContinue = 1; -static void (*writestatus) () = setroot; +static int returnStatus = 0; //opens process *cmd and stores output in *output void getcmd(const Block *block, char *output) { strcpy(output, block->icon); - char *cmd = block->command; - FILE *cmdf = popen(cmd,"r"); + FILE *cmdf = popen(block->command, "r"); if (!cmdf) return; - char c; int i = strlen(block->icon); - fgets(output+i, CMDLENGTH-i, cmdf); + fgets(output+i, CMDLENGTH-i-delimLen, cmdf); i = strlen(output); - if (delim != '\0' && --i) - output[i++] = delim; - output[i++] = '\0'; + 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(int i = 0; i < LENGTH(blocks); i++) - { + 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]); } } -#ifndef __OpenBSD__ -void getsigcmds(int signal) +void getsigcmds(unsigned int signal) { const Block *current; - for (int i = 0; i < LENGTH(blocks); i++) - { + for (unsigned int i = 0; i < LENGTH(blocks); i++) { current = blocks + i; if (current->signal == signal) getcmd(current,statusbar[i]); @@ -79,38 +102,50 @@ void getsigcmds(int signal) void setupsignals() { - for(int i = 0; i < LENGTH(blocks); i++) - { +#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(SIGRTMIN+blocks[i].signal, sighandler); + signal(SIGMINUS+blocks[i].signal, sighandler); } } -#endif int getstatus(char *str, char *last) { strcpy(last, str); str[0] = '\0'; - for(int i = 0; i < LENGTH(blocks); i++) + for (unsigned int i = 0; i < LENGTH(blocks); i++) strcat(str, statusbar[i]); - str[strlen(str)-1] = '\0'; + 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; - Display *d = XOpenDisplay(NULL); - if (d) { - dpy = d; + 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); - XStoreName(dpy, root, statusstr[0]); - XCloseDisplay(dpy); + return 1; } +#endif void pstdout() { @@ -123,44 +158,56 @@ void pstdout() void statusloop() { -#ifndef __OpenBSD__ setupsignals(); -#endif int i = 0; getcmds(-1); - while(statusContinue) - { - getcmds(i); + while (1) { + getcmds(i++); writestatus(); + if (!statusContinue) + break; sleep(1.0); - i++; } } #ifndef __OpenBSD__ +/* this signal handler should do nothing */ +void dummysighandler(int signum) +{ + return; +} +#endif + void sighandler(int signum) { - getsigcmds(signum-SIGRTMIN); + getsigcmds(signum-SIGPLUS); writestatus(); } -#endif -void termhandler(int signum) +void termhandler() { statusContinue = 0; - exit(0); } int main(int argc, char** argv) { - for(int i = 0; i < argc; i++) - { + for (int i = 0; i < argc; i++) {//Handle command line arguments if (!strcmp("-d",argv[i])) - delim = argv[++i][0]; - else if(!strcmp("-p",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; }