#include<unistd.h>
#include<signal.h>
#include<X11/Xlib.h>
+#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 STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
typedef struct {
+ char* icon;
char* command;
unsigned int interval;
unsigned int signal;
} Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
void sighandler(int num);
-void replace(char *str, char old, char new);
void getcmds(int time);
void getsigcmds(int signal);
void setupsignals();
-void getstatus(char *str);
+void sighandler(int signum);
+int getstatus(char *str, char *last);
void setroot();
void statusloop();
-void statusinit();
-void sighandler(int signum);
void termhandler(int signum);
static Display *dpy;
static int screen;
static Window root;
-static char statusbar[LENGTH(blocks)][50] = {0};
-static char statusstr[256];
-static char *statuscat;
-static const char *volupcmd[] = { "volup", NULL };
-static const char *voldowncmd[] = { "voldown", NULL };
-static const char *volmutecmd[] = { "volmute", NULL };
-static int statusContinue = 1,volmuted = 0;
-
-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;
-}
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][STATUSLENGTH];
+static int statusContinue = 1;
+static void (*writestatus) () = setroot;
//opens process *cmd and stores output in *output
-void getcmd(char *cmd, char *output)
+void getcmd(const Block *block, char *output)
{
+ strcpy(output, block->icon);
+ char *cmd = block->command;
FILE *cmdf = popen(cmd,"r");
if (!cmdf)
return;
- int N = strlen(output);
char c;
- int i = 0;
- while((c = fgetc(cmdf)) != EOF)
- output[i++] = c;
+ int i = strlen(block->icon);
+ fgets(output+i, CMDLENGTH-i, cmdf);
+ i = strlen(output);
+ if (delim != '\0' && --i)
+ output[i++] = delim;
output[i++] = '\0';
pclose(cmdf);
}
{
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->command,statusbar[i]);
+ getcmd(current,statusbar[i]);
}
}
{
current = blocks + i;
if (current->signal == signal)
- getcmd(current->command,statusbar[i]);
+ getcmd(current,statusbar[i]);
}
}
void setupsignals()
{
+#ifndef __OpenBSD__
+ /* initialize all real time signals with dummy handler */
+ for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+ signal(i, dummysighandler);
+#endif
+
for(int i = 0; i < LENGTH(blocks); i++)
- {
+ {
if (blocks[i].signal > 0)
- signal(SIGRTMIN+blocks[i].signal, sighandler);
+ signal(SIGMINUS+blocks[i].signal, sighandler);
}
}
-void getstatus(char *str)
+int getstatus(char *str, char *last)
{
- int j = 0;
- for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
- {
- strcpy(str + j, statusbar[i]);
- }
- str[j] = '\0';
-
+ strcpy(last, str);
+ str[0] = '\0';
+ for(int i = 0; i < LENGTH(blocks); i++)
+ strcat(str, statusbar[i]);
+ str[strlen(str)-1] = '\0';
+ return strcmp(str, last);//0 if they are the same
}
void setroot()
{
+ if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
+ return;
Display *d = XOpenDisplay(NULL);
if (d) {
dpy = d;
}
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- getstatus(statusstr);
- replace(statusstr,'\n',' ');//gets rid of newlines from output
- replace(statusstr,EOF,' ');//gets rid of EOF from output
- XStoreName(dpy, root, statusstr);
+ XStoreName(dpy, root, statusstr[0]);
XCloseDisplay(dpy);
}
+void pstdout()
+{
+ if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+ return;
+ printf("%s\n",statusstr[0]);
+ fflush(stdout);
+}
+
void statusloop()
{
while(statusContinue)
{
getcmds(i);
- setroot();
+ writestatus();
sleep(1.0);
i++;
}
}
-void statusinit()
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
{
- statusloop();
+ return;
}
-
+#endif
void sighandler(int signum)
{
- getsigcmds(signum-SIGRTMIN);
- setroot();
+ getsigcmds(signum-SIGPLUS);
+ writestatus();
}
void termhandler(int signum)
{
statusContinue = 0;
- exit(0);
}
-int main()
+int main(int argc, char** argv)
{
+ for(int i = 0; i < argc; i++)
+ {
+ if (!strcmp("-d",argv[i]))
+ delim = argv[++i][0];
+ else if(!strcmp("-p",argv[i]))
+ writestatus = pstdout;
+ }
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
- statusinit();
+ statusloop();
}