summaryrefslogtreecommitdiff
path: root/dwmblocks.c
diff options
context:
space:
mode:
Diffstat (limited to 'dwmblocks.c')
-rw-r--r--dwmblocks.c207
1 files changed, 94 insertions, 113 deletions
diff --git a/dwmblocks.c b/dwmblocks.c
index 391ee0d..ded717c 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -3,9 +3,20 @@
#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
+#else
+#define SIGPLUS SIGRTMIN
+#define SIGMINUS SIGRTMIN
+#endif
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
#define CMDLENGTH 50
+#define MIN( a, b ) ( ( a < b) ? a : b )
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
typedef struct {
char* icon;
@@ -13,95 +24,76 @@ typedef struct {
unsigned int interval;
unsigned int signal;
} Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
void sighandler(int num);
-void buttonhandler(int sig, siginfo_t *si, void *ucontext);
-void replace(char *str, char old, char new);
-void remove_all(char *str, char to_remove);
void getcmds(int time);
-#ifndef __OpenBSD__
-void getsigcmds(int signal);
+void getsigcmds(unsigned int signal);
void setupsignals();
void sighandler(int signum);
-#endif
int getstatus(char *str, char *last);
-void setroot();
void statusloop();
-void termhandler(int signum);
-
-
-#include "config.h"
-
+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;
-static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
-static int statusContinue = 1;
-static void (*writestatus) () = setroot;
+#else
+static void (*writestatus) () = pstdout;
+#endif
-void replace(char *str, char old, char new)
-{
- int N = strlen(str);
- for(int i = 0; i < N; i++)
- if(str[i] == old)
- str[i] = new;
-}
-void remove_all(char *str, char to_remove) {
- char *read = str;
- char *write = str;
- while (*read) {
- if (*read == to_remove) {
- read++;
- *write = *read;
- }
- read++;
- write++;
- }
-}
+#include "blocks.h"
+
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][STATUSLENGTH];
+static int statusContinue = 1;
+static int returnStatus = 0;
//opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output)
{
- if (block->signal)
- {
- output[0] = block->signal;
- output++;
- }
strcpy(output, block->icon);
- char *cmd = block->command;
- FILE *cmdf = popen(cmd,"r");
+ FILE *cmdf = popen(block->command, "r");
if (!cmdf)
return;
- char c;
int i = strlen(block->icon);
- fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf);
- remove_all(output, '\n');
+ fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
i = strlen(output);
- if ((i > 0 && block != &blocks[LENGTH(blocks) - 1]))
- strcat(output, delim);
- i+=strlen(delim);
- output[i++] = '\0';
+ if (i == 0) {
+ //return if block and command output are both empty
+ pclose(cmdf);
+ return;
+ }
+ if (delim[0] != '\0') {
+ //only chop off newline if one is present at the end
+ i = output[i-1] == '\n' ? i-1 : i;
+ strncpy(output+i, delim, delimLen);
+ }
+ else
+ output[i++] = '\0';
pclose(cmdf);
}
void getcmds(int time)
{
const Block* current;
- for(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]);
}
}
-#ifndef __OpenBSD__
-void getsigcmds(int signal)
+void getsigcmds(unsigned int signal)
{
const Block *current;
- for (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]);
@@ -110,49 +102,50 @@ void getsigcmds(int signal)
void setupsignals()
{
- struct sigaction sa;
- for(int i = 0; i < LENGTH(blocks); i++)
- {
+#ifndef __OpenBSD__
+ /* initialize all real time signals with dummy handler */
+ for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
+ signal(i, dummysighandler);
+#endif
+
+ for (unsigned int i = 0; i < LENGTH(blocks); i++) {
if (blocks[i].signal > 0)
- {
- signal(SIGRTMIN+blocks[i].signal, sighandler);
- sigaddset(&sa.sa_mask, SIGRTMIN+blocks[i].signal);
- }
+ signal(SIGMINUS+blocks[i].signal, sighandler);
}
- sa.sa_sigaction = buttonhandler;
- sa.sa_flags = SA_SIGINFO;
- sigaction(SIGUSR1, &sa, NULL);
- signal(SIGCHLD, SIG_IGN);
}
-#endif
int getstatus(char *str, char *last)
{
strcpy(last, str);
str[0] = '\0';
- for(int i = 0; i < LENGTH(blocks); i++) {
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
strcat(str, statusbar[i]);
- if (i == LENGTH(blocks) - 1)
- strcat(str, " ");
- }
- str[strlen(str)-1] = '\0';
+ str[strlen(str)-strlen(delim)] = '\0';
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()
{
@@ -165,68 +158,56 @@ void pstdout()
void statusloop()
{
-#ifndef __OpenBSD__
setupsignals();
-#endif
int i = 0;
getcmds(-1);
- while(statusContinue)
- {
- getcmds(i);
+ while (1) {
+ getcmds(i++);
writestatus();
+ if (!statusContinue)
+ break;
sleep(1.0);
- i++;
}
}
#ifndef __OpenBSD__
-void sighandler(int signum)
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
{
- getsigcmds(signum-SIGRTMIN);
- writestatus();
+ return;
}
+#endif
-void buttonhandler(int sig, siginfo_t *si, void *ucontext)
+void sighandler(int signum)
{
- char button[2] = {'0' + si->si_value.sival_int & 0xff, '\0'};
- sig = si->si_value.sival_int >> 8;
- if (fork() == 0)
- {
- const Block *current;
- for (int i = 0; i < LENGTH(blocks); i++)
- {
- current = blocks + i;
- if (current->signal == sig)
- break;
- }
- char *command[] = { "/bin/sh", "-c", current->command, NULL };
- setenv("BLOCK_BUTTON", button, 1);
- setsid();
- execvp(command[0], command);
- exit(EXIT_SUCCESS);
- }
- getsigcmds(sig);
+ getsigcmds(signum-SIGPLUS);
writestatus();
}
-#endif
-
-void termhandler(int signum)
+void termhandler()
{
statusContinue = 0;
- exit(0);
}
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]))
- delim = argv[++i];
- else if(!strcmp("-p",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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 07:28:06 +0000