Merge branch 'master' into patch-1
This commit is contained in:
commit
7a570d5760
4
Makefile
4
Makefile
@ -1,7 +1,7 @@
|
|||||||
PREFIX ?= /usr/local
|
PREFIX ?= /usr/local
|
||||||
|
CC ?= cc
|
||||||
output: dwmblocks.c blocks.h
|
output: dwmblocks.c blocks.h
|
||||||
cc dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
|
${CC} dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.gch dwmblocks
|
rm -f *.o *.gch dwmblocks
|
||||||
install: output
|
install: output
|
||||||
|
19
dwmblocks.c
19
dwmblocks.c
@ -13,6 +13,7 @@ typedef struct {
|
|||||||
unsigned int interval;
|
unsigned int interval;
|
||||||
unsigned int signal;
|
unsigned int signal;
|
||||||
} Block;
|
} Block;
|
||||||
|
void dummysighandler(int num);
|
||||||
void sighandler(int num);
|
void sighandler(int num);
|
||||||
void getcmds(int time);
|
void getcmds(int time);
|
||||||
#ifndef __OpenBSD__
|
#ifndef __OpenBSD__
|
||||||
@ -58,7 +59,7 @@ void getcmds(int time)
|
|||||||
{
|
{
|
||||||
const Block* current;
|
const Block* current;
|
||||||
for(int i = 0; i < LENGTH(blocks); i++)
|
for(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)
|
||||||
getcmd(current,statusbar[i]);
|
getcmd(current,statusbar[i]);
|
||||||
@ -79,8 +80,12 @@ void getsigcmds(int signal)
|
|||||||
|
|
||||||
void setupsignals()
|
void setupsignals()
|
||||||
{
|
{
|
||||||
|
/* initialize all real time signals with dummy handler */
|
||||||
|
for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
||||||
|
signal(i, dummysighandler);
|
||||||
|
|
||||||
for(int i = 0; i < LENGTH(blocks); i++)
|
for(int i = 0; i < LENGTH(blocks); i++)
|
||||||
{
|
{
|
||||||
if (blocks[i].signal > 0)
|
if (blocks[i].signal > 0)
|
||||||
signal(SIGRTMIN+blocks[i].signal, sighandler);
|
signal(SIGRTMIN+blocks[i].signal, sighandler);
|
||||||
}
|
}
|
||||||
@ -137,6 +142,14 @@ void statusloop()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __OpenBSD__
|
||||||
|
/* this signal handler should do nothing */
|
||||||
|
void dummysighandler(int signum)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __OpenBSD__
|
#ifndef __OpenBSD__
|
||||||
void sighandler(int signum)
|
void sighandler(int signum)
|
||||||
{
|
{
|
||||||
@ -154,7 +167,7 @@ void termhandler(int signum)
|
|||||||
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++)
|
||||||
{
|
{
|
||||||
if (!strcmp("-d",argv[i]))
|
if (!strcmp("-d",argv[i]))
|
||||||
delim = argv[++i][0];
|
delim = argv[++i][0];
|
||||||
else if(!strcmp("-p",argv[i]))
|
else if(!strcmp("-p",argv[i]))
|
||||||
|
Loading…
Reference in New Issue
Block a user