Compare commits
5 Commits
3d308cafb0
...
922ecaa737
Author | SHA1 | Date |
---|---|---|
Victor Timofei | 922ecaa737 | |
Victor Timofei | af5389ce30 | |
aidan | b6b0be4f4f | |
aidan | b7d1970488 | |
aidan | 13c7700f34 |
3
Makefile
3
Makefile
|
@ -1,8 +1,9 @@
|
||||||
PREFIX ?= /usr/local
|
PREFIX ?= /usr/local
|
||||||
CC ?= cc
|
CC ?= cc
|
||||||
|
LDFLAGS = -lX11
|
||||||
|
|
||||||
output: dwmblocks.c blocks.def.h blocks.h
|
output: dwmblocks.c blocks.def.h blocks.h
|
||||||
${CC} `pkg-config --cflags x11 --libs x11` dwmblocks.c -o dwmblocks
|
${CC} dwmblocks.c $(LDFLAGS) -o dwmblocks
|
||||||
blocks.h:
|
blocks.h:
|
||||||
cp blocks.def.h $@
|
cp blocks.def.h $@
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
//Modify this file to change what commands output to your statusbar, and recompile using the make command.
|
//Modify this file to change what commands output to your statusbar, and recompile using the make command.
|
||||||
static const Block blocks[] = {
|
static const Block blocks[] = {
|
||||||
/*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
|
/*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
|
||||||
{"Mem:", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g", 30, 0},
|
{"", "/home/vtimofei/scripts/volinfo", 0, 12},
|
||||||
|
{" ", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g", 30, 0},
|
||||||
{"", "date '+%b %d (%a) %I:%M%p'", 5, 0},
|
{" ", "/home/vtimofei/scripts/get-layout", 0, 11},
|
||||||
|
{" ", "date '+%b %d (%a) %I:%M%p' ", 5, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
//sets delimeter between status commands. NULL character ('\0') means no delimeter.
|
//sets delimeter between status commands. NULL character ('\0') means no delimeter.
|
||||||
|
|
64
dwmblocks.c
64
dwmblocks.c
|
@ -3,7 +3,9 @@
|
||||||
#include<string.h>
|
#include<string.h>
|
||||||
#include<unistd.h>
|
#include<unistd.h>
|
||||||
#include<signal.h>
|
#include<signal.h>
|
||||||
|
#ifndef NO_X
|
||||||
#include<X11/Xlib.h>
|
#include<X11/Xlib.h>
|
||||||
|
#endif
|
||||||
#ifdef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
#define SIGPLUS SIGUSR1+1
|
#define SIGPLUS SIGUSR1+1
|
||||||
#define SIGMINUS SIGUSR1-1
|
#define SIGMINUS SIGUSR1-1
|
||||||
|
@ -31,20 +33,27 @@ 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 statusloop();
|
void statusloop();
|
||||||
void termhandler();
|
void termhandler();
|
||||||
|
void pstdout();
|
||||||
|
#ifndef NO_X
|
||||||
|
void setroot();
|
||||||
|
static void (*writestatus) () = setroot;
|
||||||
|
static int setupX();
|
||||||
|
static Display *dpy;
|
||||||
|
static int screen;
|
||||||
|
static Window root;
|
||||||
|
#else
|
||||||
|
static void (*writestatus) () = pstdout;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "blocks.h"
|
#include "blocks.h"
|
||||||
|
|
||||||
static Display *dpy;
|
|
||||||
static int screen;
|
|
||||||
static Window root;
|
|
||||||
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
||||||
static char statusstr[2][STATUSLENGTH];
|
static char statusstr[2][STATUSLENGTH];
|
||||||
static int statusContinue = 1;
|
static int statusContinue = 1;
|
||||||
static void (*writestatus) () = setroot;
|
static int returnStatus = 0;
|
||||||
|
|
||||||
//opens process *cmd and stores output in *output
|
//opens process *cmd and stores output in *output
|
||||||
void getcmd(const Block *block, char *output)
|
void getcmd(const Block *block, char *output)
|
||||||
|
@ -56,6 +65,8 @@ void getcmd(const Block *block, char *output)
|
||||||
int i = strlen(block->icon);
|
int i = strlen(block->icon);
|
||||||
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
|
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
|
||||||
i = strlen(output);
|
i = strlen(output);
|
||||||
|
if (i == 0)//return if block and command output are both empty
|
||||||
|
return;
|
||||||
if (delim[0] != '\0') {
|
if (delim[0] != '\0') {
|
||||||
//only chop off newline if one is present at the end
|
//only chop off newline if one is present at the end
|
||||||
i = output[i-1] == '\n' ? i-1 : i;
|
i = output[i-1] == '\n' ? i-1 : i;
|
||||||
|
@ -69,8 +80,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)
|
||||||
getcmd(current,statusbar[i]);
|
getcmd(current,statusbar[i]);
|
||||||
|
@ -80,8 +90,7 @@ void getcmds(int time)
|
||||||
void getsigcmds(unsigned int signal)
|
void getsigcmds(unsigned int signal)
|
||||||
{
|
{
|
||||||
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->signal == signal)
|
if (current->signal == signal)
|
||||||
getcmd(current,statusbar[i]);
|
getcmd(current,statusbar[i]);
|
||||||
|
@ -96,8 +105,7 @@ void setupsignals()
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
@ -114,19 +122,27 @@ int getstatus(char *str, char *last)
|
||||||
return strcmp(str, last);//0 if they are the same
|
return strcmp(str, last);//0 if they are the same
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef NO_X
|
||||||
void setroot()
|
void setroot()
|
||||||
{
|
{
|
||||||
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
|
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
|
||||||
return;
|
return;
|
||||||
Display *d = XOpenDisplay(NULL);
|
XStoreName(dpy, root, statusstr[0]);
|
||||||
if (d) {
|
XFlush(dpy);
|
||||||
dpy = d;
|
}
|
||||||
|
|
||||||
|
int setupX()
|
||||||
|
{
|
||||||
|
dpy = XOpenDisplay(NULL);
|
||||||
|
if (!dpy) {
|
||||||
|
fprintf(stderr, "dwmblocks: Failed to open display\n");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
screen = DefaultScreen(dpy);
|
screen = DefaultScreen(dpy);
|
||||||
root = RootWindow(dpy, screen);
|
root = RootWindow(dpy, screen);
|
||||||
XStoreName(dpy, root, statusstr[0]);
|
return 1;
|
||||||
XCloseDisplay(dpy);
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void pstdout()
|
void pstdout()
|
||||||
{
|
{
|
||||||
|
@ -142,10 +158,11 @@ void statusloop()
|
||||||
setupsignals();
|
setupsignals();
|
||||||
int i = 0;
|
int i = 0;
|
||||||
getcmds(-1);
|
getcmds(-1);
|
||||||
while (statusContinue)
|
while (1) {
|
||||||
{
|
|
||||||
getcmds(i++);
|
getcmds(i++);
|
||||||
writestatus();
|
writestatus();
|
||||||
|
if (!statusContinue)
|
||||||
|
break;
|
||||||
sleep(1.0);
|
sleep(1.0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -171,16 +188,23 @@ void termhandler()
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < argc; i++) //Handle command line arguments
|
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;
|
||||||
}
|
}
|
||||||
|
#ifndef NO_X
|
||||||
|
if (!setupX())
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
delimLen = MIN(delimLen, strlen(delim));
|
delimLen = MIN(delimLen, strlen(delim));
|
||||||
delim[delimLen++] = '\0';
|
delim[delimLen++] = '\0';
|
||||||
signal(SIGTERM, termhandler);
|
signal(SIGTERM, termhandler);
|
||||||
signal(SIGINT, termhandler);
|
signal(SIGINT, termhandler);
|
||||||
statusloop();
|
statusloop();
|
||||||
|
#ifndef NO_X
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
#endif
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue