Unified style for if, for, and while statements. As well as general
code cleanup.
This commit is contained in:
parent
b12722ab48
commit
416a36d636
17
dwmblocks.c
17
dwmblocks.c
@ -68,7 +68,7 @@ void getcmd(const Block *block, char *output)
|
|||||||
void getcmds(int time)
|
void getcmds(int time)
|
||||||
{
|
{
|
||||||
const Block* current;
|
const Block* current;
|
||||||
for(unsigned 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)
|
||||||
@ -91,11 +91,11 @@ void setupsignals()
|
|||||||
{
|
{
|
||||||
#ifndef __OpenBSD__
|
#ifndef __OpenBSD__
|
||||||
/* initialize all real time signals with dummy handler */
|
/* initialize all real time signals with dummy handler */
|
||||||
for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
||||||
signal(i, dummysighandler);
|
signal(i, dummysighandler);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(unsigned 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);
|
||||||
@ -107,7 +107,7 @@ int getstatus(char *str, char *last)
|
|||||||
{
|
{
|
||||||
strcpy(last, str);
|
strcpy(last, str);
|
||||||
str[0] = '\0';
|
str[0] = '\0';
|
||||||
for(unsigned 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)-strlen(delim)] = '\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
|
||||||
@ -141,12 +141,11 @@ void statusloop()
|
|||||||
setupsignals();
|
setupsignals();
|
||||||
int i = 0;
|
int i = 0;
|
||||||
getcmds(-1);
|
getcmds(-1);
|
||||||
while(statusContinue)
|
while (statusContinue)
|
||||||
{
|
{
|
||||||
getcmds(i);
|
getcmds(i++);
|
||||||
writestatus();
|
writestatus();
|
||||||
sleep(1.0);
|
sleep(1.0);
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,11 +170,11 @@ void termhandler()
|
|||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
for(int i = 0; i < argc; i++)
|
for (int i = 0; i < argc; i++) //Handle command line arguments
|
||||||
{
|
{
|
||||||
if (!strcmp("-d",argv[i]))
|
if (!strcmp("-d",argv[i]))
|
||||||
strncpy(delim, argv[++i], delimLen);
|
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';
|
delim[MIN(delimLen, strlen(delim))] = '\0';
|
||||||
|
Loading…
Reference in New Issue
Block a user