X-Git-Url: https://git.armaanb.net/?p=dwmblocks.git;a=blobdiff_plain;f=dwmblocks.c;h=e6c20dd37d44a682a80cda47c56afd2079abfaae;hp=5569531b6de43d67d8bc838d6184aa22819e2128;hb=HEAD;hpb=5ba902a6663dd298f2967fc7e9d691528c0d9ecd diff --git a/dwmblocks.c b/dwmblocks.c index 5569531..e6c20dd 100644 --- a/dwmblocks.c +++ b/dwmblocks.c @@ -3,119 +3,151 @@ #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 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 replace(char *str, char old, char new); void getcmds(int time); -void getsigcmds(int signal); +void getsigcmds(unsigned int signal); void setupsignals(); -void getstatus(char *str); -void setroot(); -void statusloop(); -void statusinit(); void sighandler(int signum); -void termhandler(int signum); - - -#include "blocks.h" - +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 statusstr[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 + + +#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(char *cmd, char *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, cmdf); + i = strlen(output); + if (i == 0) { + //return if block and command output are both empty + pclose(cmdf); + return; + } else if (output[i-1] == '\n') { + output[i-1] = '\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; - for(int i = 0; i < 5; j+=strlen(statusbar[i++])) - { - strcpy(str + j, statusbar[i]); - } - 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)] = '\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(statusstr); - replace(statusstr,'\n',' ');//gets rid of newlines from output - replace(statusstr,EOF,' ');//gets rid of EOF from output - XStoreName(dpy, root, statusstr); - 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); } @@ -124,36 +156,49 @@ 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("-p",argv[i])) + writestatus = pstdout; + } +#ifndef NO_X + if (!setupX()) + return 1; +#endif signal(SIGTERM, termhandler); signal(SIGINT, termhandler); - statusinit(); + statusloop(); +#ifndef NO_X + XCloseDisplay(dpy); +#endif + return 0; }