NapoleonDynamite/dwmblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added -p option for printing to stdout rather then setting the root window for compatibility with other wms.

Browse source
This commit is contained in:
Aidan 2019-11-26 22:43:16 -07:00
parent a22c6311cc
commit 1766af7d5e
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dwmblocks.c
View file

@ -33,6 +33,10 @@ static Window root;
static char statusbar[LENGTH(blocks)][50] = {0}; static char statusbar[LENGTH(blocks)][50] = {0};
static char statusstr[2][256]; static char statusstr[2][256];
static int statusContinue = 1; static int statusContinue = 1;
<<<<<<< HEAD
static void (*writestatus) () = setroot;
=======
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
void replace(char *str, char old, char new) void replace(char *str, char old, char new)
{ {
@ -50,7 +54,6 @@ void getcmd(const Block *block, char *output)
FILE *cmdf = popen(cmd,"r"); FILE *cmdf = popen(cmd,"r");
if (!cmdf) if (!cmdf)
return; return;
//int N = strlen(output);
char c; char c;
int i = strlen(block->icon); int i = strlen(block->icon);
while((c = fgetc(cmdf)) != EOF) while((c = fgetc(cmdf)) != EOF)
@ -96,12 +99,21 @@ void setupsignals()
int getstatus(char *str, char *last) int getstatus(char *str, char *last)
{ {
strcpy(last, str); strcpy(last, str);
<<<<<<< HEAD
str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++)
=======
int j = 0; int j = 0;
for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++])) for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
{ {
strcpy(str + j, statusbar[i]); strcat(str, statusbar[i]);
} }
<<<<<<< HEAD
str[strlen(str)-1] = '\0';
=======
str[--j] = '\0'; str[--j] = '\0';
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
return strcmp(str, last);//0 if they are the same return strcmp(str, last);//0 if they are the same
} }
@ -119,6 +131,14 @@ void setroot()
XCloseDisplay(dpy); XCloseDisplay(dpy);
} }
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()
{ {
@ -128,7 +148,7 @@ void statusloop()
while(statusContinue) while(statusContinue)
{ {
getcmds(i); getcmds(i);
setroot(); writestatus();
sleep(1.0); sleep(1.0);
i++; i++;
} }
@ -143,7 +163,7 @@ void statusinit()
void sighandler(int signum) void sighandler(int signum)
{ {
getsigcmds(signum-SIGRTMIN); getsigcmds(signum-SIGRTMIN);
setroot(); writestatus();
} }
void termhandler(int signum) void termhandler(int signum)
@ -158,6 +178,8 @@ int main(int argc, char** argv)
{ {
if (!strcmp("-d",argv[i])) if (!strcmp("-d",argv[i]))
delim = argv[++i][0]; delim = argv[++i][0];
else if(!strcmp("-p",argv[i]))
writestatus = pstdout;
} }
signal(SIGTERM, termhandler); signal(SIGTERM, termhandler);
signal(SIGINT, termhandler); signal(SIGINT, termhandler);