Compare commits

...

5 Commits

Author SHA1 Message Date
Victor Timofei 922ecaa737
Update scripts 2021-08-14 21:41:13 +03:00
Victor Timofei af5389ce30
Fix LDFLAGS for Ubuntu 2020-12-23 19:52:47 +02:00
aidan b6b0be4f4f Only open X server once rather than open and close after every writeout. 2020-09-09 13:10:49 -06:00
aidan b7d1970488 Consolidated X11 based code into the setroot function
This is to make it easier to build dwmblocks without xlib so you can
use it on wayland or other x wms.
2020-09-05 15:48:54 -06:00
aidan 13c7700f34 Fixed issue with empty command delimiter
This meant that the delimiters were added when when both the icon and
output where empty.
2020-08-29 11:58:28 -06:00
3 changed files with 50 additions and 24 deletions

View File

@ -1,8 +1,9 @@
PREFIX ?= /usr/local
CC ?= cc
LDFLAGS = -lX11
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:
cp blocks.def.h $@

View File

@ -1,9 +1,10 @@
//Modify this file to change what commands output to your statusbar, and recompile using the make command.
static const Block blocks[] = {
/*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
{"Mem:", "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/volinfo", 0, 12},
{"", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g", 30, 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.

View File

@ -3,7 +3,9 @@
#include<string.h>
#include<unistd.h>
#include<signal.h>
#ifndef NO_X
#include<X11/Xlib.h>
#endif
#ifdef __OpenBSD__
#define SIGPLUS SIGUSR1+1
#define SIGMINUS SIGUSR1-1
@ -31,20 +33,27 @@ void getsigcmds(unsigned int signal);
void setupsignals();
void sighandler(int signum);
int getstatus(char *str, char *last);
void setroot();
void statusloop();
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"
static Display *dpy;
static int screen;
static Window root;
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
static char statusstr[2][STATUSLENGTH];
static int statusContinue = 1;
static void (*writestatus) () = setroot;
static int returnStatus = 0;
//opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output)
@ -56,6 +65,8 @@ void getcmd(const Block *block, char *output)
int i = strlen(block->icon);
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
i = strlen(output);
if (i == 0)//return if block and command output are both empty
return;
if (delim[0] != '\0') {
//only chop off newline if one is present at the end
i = output[i-1] == '\n' ? i-1 : i;
@ -69,8 +80,7 @@ void getcmd(const Block *block, char *output)
void getcmds(int time)
{
const Block* current;
for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
getcmd(current,statusbar[i]);
@ -80,8 +90,7 @@ void getcmds(int time)
void getsigcmds(unsigned int signal)
{
const Block *current;
for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
current = blocks + i;
if (current->signal == signal)
getcmd(current,statusbar[i]);
@ -96,8 +105,7 @@ void setupsignals()
signal(i, dummysighandler);
#endif
for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
if (blocks[i].signal > 0)
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
}
#ifndef NO_X
void setroot()
{
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
return;
Display *d = XOpenDisplay(NULL);
if (d) {
dpy = d;
XStoreName(dpy, root, statusstr[0]);
XFlush(dpy);
}
int setupX()
{
dpy = XOpenDisplay(NULL);
if (!dpy) {
fprintf(stderr, "dwmblocks: Failed to open display\n");
return 0;
}
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
XStoreName(dpy, root, statusstr[0]);
XCloseDisplay(dpy);
return 1;
}
#endif
void pstdout()
{
@ -142,10 +158,11 @@ void statusloop()
setupsignals();
int i = 0;
getcmds(-1);
while (statusContinue)
{
while (1) {
getcmds(i++);
writestatus();
if (!statusContinue)
break;
sleep(1.0);
}
}
@ -171,16 +188,23 @@ void termhandler()
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]))
strncpy(delim, argv[++i], delimLen);
else if (!strcmp("-p",argv[i]))
writestatus = pstdout;
}
#ifndef NO_X
if (!setupX())
return 1;
#endif
delimLen = MIN(delimLen, strlen(delim));
delim[delimLen++] = '\0';
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
statusloop();
#ifndef NO_X
XCloseDisplay(dpy);
#endif
return 0;
}