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

Merge pull request #28 from mackarelfish/master

Browse source 
Fixed weird blocks behaviour with moving text (music, nettraf), Added support for multiple char delimiter
This commit is contained in:
Luke Smith 2020-05-30 08:38:33 -04:00 committed by GitHub
commit 9a7ecafdcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -24,7 +24,7 @@ static const Block blocks[] = {
};
//sets delimeter between status commands. NULL character ('\0') means no delimeter.
static char delim = ' ';
static char *delim = " ";
// Have dwmblocks automatically recompile and run when you edit this file in
// vim with the following line in your vimrc/init.vim:

14
dwmblocks.c
View file

@ -75,11 +75,12 @@ void getcmd(const Block *block, char *output)
return;
char c;
int i = strlen(block->icon);
fgets(output+i, CMDLENGTH-i, cmdf);
fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf);
remove_all(output, '\n');
i = strlen(output);
if (delim != '\0' && i)
output[i++] = delim;
if ((i > 0 && block != &blocks[LENGTH(blocks) - 1]))
strcat(output, delim);
i+=strlen(delim);
output[i++] = '\0';
pclose(cmdf);
}
@ -130,8 +131,11 @@ int getstatus(char *str, char *last)
{
strcpy(last, str);
str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++)
for(int i = 0; i < LENGTH(blocks); i++) {
strcat(str, statusbar[i]);
if (i == LENGTH(blocks) - 1)
strcat(str, " ");
}
str[strlen(str)-1] = '\0';
return strcmp(str, last);//0 if they are the same
}
@ -218,7 +222,7 @@ int main(int argc, char** argv)
for(int i = 0; i < argc; i++)
{
if (!strcmp("-d",argv[i]))
delim = argv[++i][0];
delim = argv[++i];
else if(!strcmp("-p",argv[i]))
writestatus = pstdout;
}