blocks.h moved to config.h

This commit is contained in:
Luke Smith 2020-03-01 07:01:56 -05:00
parent 6bd2e845be
commit b9e29ebe90
No known key found for this signature in database
GPG key ID: 4C50B54A911F6252
3 changed files with 9 additions and 7 deletions

View file

@ -1,7 +1,7 @@
output: dwmblocks.o
gcc dwmblocks.o -lX11 -o dwmblocks
dwmblocks.o: dwmblocks.c blocks.h
gcc -c -lX11 dwmblocks.c
dwmblocks.o: dwmblocks.c config.h
gcc -c -lX11 dwmblocks.c
clean:
rm *.o *.gch dwmblocks
install: output

View file

@ -4,8 +4,10 @@ static const Block blocks[] = {
/* {"", "cat /tmp/recordingicon", 0, 9}, */
/* {"", "music", 0, 11}, */
{"", "pacpackages", 0, 8},
{"", "crypto", 0, 13},
{"", "torrent", 20, 7},
{"", "news", 0, 6},
/* {"", "moonphase", 18000, 5}, */
{"", "weather", 18000, 5},
{"", "mailbox", 180, 12},
{"", "volume", 0, 10},

View file

@ -25,7 +25,7 @@ void sighandler(int signum);
void termhandler(int signum);
#include "blocks.h"
#include "config.h"
static Display *dpy;
static int screen;
@ -69,7 +69,7 @@ void getcmds(int time)
{
const Block* current;
for(int i = 0; i < LENGTH(blocks); i++)
{
{
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
getcmd(current,statusbar[i]);
@ -90,7 +90,7 @@ void getsigcmds(int signal)
void setupsignals()
{
for(int i = 0; i < LENGTH(blocks); i++)
{
{
if (blocks[i].signal > 0)
signal(SIGRTMIN+blocks[i].signal, sighandler);
}
@ -101,7 +101,7 @@ void getstatus(char *str)
{
int j = 0;
for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
{
{
strcpy(str + j, statusbar[i]);
}
str[--j] = '\0';
@ -157,7 +157,7 @@ void termhandler(int signum)
int main(int argc, char** argv)
{
for(int i = 0; i < argc; i++)
{
{
if (!strcmp("-d",argv[i]))
delim = argv[++i][0];
}