X-Git-Url: https://git.danieliu.xyz/?p=dwmblocks.git;a=blobdiff_plain;f=dwmblocks.c;h=64ad7a33e2d6b6acf39f28b899e1a74a23be9cee;hp=62908daad025a7448b17b9a604b2d5cfe28b20e6;hb=b6b0be4f4fe77fea6f1aef07232a44abd0139098;hpb=c97d6d119e83e1fc776fadb185f9d5b2e2fd5b14 diff --git a/dwmblocks.c b/dwmblocks.c index 62908da..64ad7a3 100644 --- a/dwmblocks.c +++ b/dwmblocks.c @@ -3,149 +3,208 @@ #include #include #include -//#include +#ifndef NO_X #include -//#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 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); - -#include "blocks.h" - +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; -static char statusbar[LENGTH(blocks)][50] = {0}; -static char setrootcmd[256]; -static char *statuscat; -static const char *volupcmd[] = { "volup", NULL }; -static const char *voldowncmd[] = { "voldown", NULL }; -static const char *volmutecmd[] = { "volmute", NULL }; -static int statusContinue = 1,volmuted = 0; - -void replace(char *str, char old, char new) -{ - int N = strlen(str); - for(int i = 0; i < N; i++) - if(str[i] == old) - str[i] = new; -} +#else +static void (*writestatus) () = pstdout; +#endif -void getcmd(char *cmd, char *output) +#include "blocks.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(cmd,"r"); + strcpy(output, block->icon); + FILE *cmdf = popen(block->command, "r"); if (!cmdf) return; - int N = strlen(output); - char c; - int i = 0; - while((c = fgetc(cmdf)) != EOF) - output[i++] = c; - output[i++] = '\0'; + 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(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->command,statusbar[i]); + getcmd(current,statusbar[i]); } } -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->command,statusbar[i]); + getcmd(current,statusbar[i]); } } 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); } } -void getstatus(char *str) +int getstatus(char *str, char *last) { - int j = 0;//15; - for(int i = 0; i < 5; j+=strlen(statusbar[i++])) - { - strcpy(str + j, statusbar[i]); - } - //for (;j < LENGTH(str);j++) - str[j] = '\0'; - + 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() { - Display *d = XOpenDisplay(NULL); - if (d) { - dpy = d; + 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); - getstatus(setrootcmd); - replace(setrootcmd,'\n',' '); - replace(setrootcmd,EOF,' '); - //printf("%s\n",setrootcmd); - XStoreName(dpy, root, setrootcmd); - XCloseDisplay(dpy); + 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() +void statusloop() { setupsignals(); int i = 0; getcmds(-1); - while(statusContinue) - { - getcmds(i); - setroot(); + while (1) { + getcmds(i++); + writestatus(); + if (!statusContinue) + break; sleep(1.0); - i++; } } -void statusinit() +#ifndef __OpenBSD__ +/* this signal handler should do nothing */ +void dummysighandler(int signum) { - statusloop(); + return; } - +#endif void sighandler(int signum) { - getsigcmds(signum-SIGRTMIN); - setroot(); + getsigcmds(signum-SIGPLUS); + writestatus(); } -void termhandler(int signum) +void termhandler() { statusContinue = 0; - exit(0); } -int main() +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); - statusinit(); + statusloop(); +#ifndef NO_X + XCloseDisplay(dpy); +#endif + return 0; }