sam
/
dwmblocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual merge of pull request #19. This adds multi-character delimiter. 

Thanks to tph5595.
This commit is contained in:
aidan 2020-08-14 12:36:38 -06:00
parent 9c5aec5cd5
commit 941f415b38
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blocks.def.h
View File

@ -7,4 +7,5 @@ static const Block blocks[] = {
}; };
//sets delimeter between status commands. NULL character ('\0') means no delimeter. //sets delimeter between status commands. NULL character ('\0') means no delimeter.
static char delim = '|'; static char delim[] = " | ";
static unsigned int delimLen = 5;

31
dwmblocks.c
View File

@ -13,6 +13,7 @@
#endif #endif
#define LENGTH(X) (sizeof(X) / sizeof (X[0])) #define LENGTH(X) (sizeof(X) / sizeof (X[0]))
#define CMDLENGTH 50 #define CMDLENGTH 50
#define MIN( a, b ) ( ( a < b) ? a : b )
#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1) #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
typedef struct { typedef struct {
@ -26,13 +27,13 @@ void dummysighandler(int num);
#endif #endif
void sighandler(int num); void sighandler(int num);
void getcmds(int time); void getcmds(int time);
void getsigcmds(int signal); void getsigcmds(unsigned int signal);
void setupsignals(); void setupsignals();
void sighandler(int signum); void sighandler(int signum);
int getstatus(char *str, char *last); int getstatus(char *str, char *last);
void setroot(); void setroot();
void statusloop(); void statusloop();
void termhandler(int signum); void termhandler();
#include "blocks.h" #include "blocks.h"
@ -55,18 +56,19 @@ void getcmd(const Block *block, char *output)
return; return;
char c; char c;
int i = strlen(block->icon); int i = strlen(block->icon);
fgets(output+i, CMDLENGTH-i, cmdf); fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
i = strlen(output); i = strlen(output);
if (delim != '\0' && --i) if (delim[0] != '\0' && --i)
output[i++] = delim; strncpy(output+i, delim, delimLen);
output[i++] = '\0'; else
output[i++] = '\0';
pclose(cmdf); pclose(cmdf);
} }
void getcmds(int time) void getcmds(int time)
{ {
const Block* current; const Block* current;
for(int i = 0; i < LENGTH(blocks); i++) for(unsigned int i = 0; i < LENGTH(blocks); i++)
{ {
current = blocks + i; current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1) if ((current->interval != 0 && time % current->interval == 0) || time == -1)
@ -74,10 +76,10 @@ void getcmds(int time)
} }
} }
void getsigcmds(int signal) void getsigcmds(unsigned int signal)
{ {
const Block *current; const Block *current;
for (int i = 0; i < LENGTH(blocks); i++) for (unsigned int i = 0; i < LENGTH(blocks); i++)
{ {
current = blocks + i; current = blocks + i;
if (current->signal == signal) if (current->signal == signal)
@ -93,7 +95,7 @@ void setupsignals()
signal(i, dummysighandler); signal(i, dummysighandler);
#endif #endif
for(int i = 0; i < LENGTH(blocks); i++) for(unsigned int i = 0; i < LENGTH(blocks); i++)
{ {
if (blocks[i].signal > 0) if (blocks[i].signal > 0)
signal(SIGMINUS+blocks[i].signal, sighandler); signal(SIGMINUS+blocks[i].signal, sighandler);
@ -105,9 +107,9 @@ int getstatus(char *str, char *last)
{ {
strcpy(last, str); strcpy(last, str);
str[0] = '\0'; str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++) for(unsigned int i = 0; i < LENGTH(blocks); i++)
strcat(str, statusbar[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 return strcmp(str, last);//0 if they are the same
} }
@ -162,7 +164,7 @@ void sighandler(int signum)
writestatus(); writestatus();
} }
void termhandler(int signum) void termhandler()
{ {
statusContinue = 0; statusContinue = 0;
} }
@ -172,10 +174,11 @@ int main(int argc, char** argv)
for(int i = 0; i < argc; i++) for(int i = 0; i < argc; i++)
{ {
if (!strcmp("-d",argv[i])) if (!strcmp("-d",argv[i]))
delim = argv[++i][0]; strncpy(delim, argv[++i], delimLen);
else if(!strcmp("-p",argv[i])) else if(!strcmp("-p",argv[i]))
writestatus = pstdout; writestatus = pstdout;
} }
delim[MIN(delimLen, strlen(delim))] = '\0';
signal(SIGTERM, termhandler); signal(SIGTERM, termhandler);
signal(SIGINT, termhandler); signal(SIGINT, termhandler);
statusloop(); statusloop();