#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;
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);
-#ifndef __OpenBSD__
void getsigcmds(int signal);
void setupsignals();
void sighandler(int signum);
-#endif
int getstatus(char *str, char *last);
void setroot();
void statusloop();
static int screen;
static Window root;
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
+static char statusstr[2][STATUSLENGTH];
static int statusContinue = 1;
static void (*writestatus) () = setroot;
-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;
-}
-
//opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output)
{
{
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]);
}
}
-#ifndef __OpenBSD__
void getsigcmds(int signal)
{
const Block *current;
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);
}
}
-#endif
int getstatus(char *str, char *last)
{
void statusloop()
{
-#ifndef __OpenBSD__
setupsignals();
-#endif
int i = 0;
getcmds(-1);
while(statusContinue)
}
#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
+{
+ return;
+}
+#endif
+
void sighandler(int signum)
{
- getsigcmds(signum-SIGRTMIN);
+ getsigcmds(signum-SIGPLUS);
writestatus();
}
-#endif
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];
else if(!strcmp("-p",argv[i]))