#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
typedef struct {
+ char* icon;
char* command;
unsigned int interval;
unsigned int signal;
void getcmds(int time);
void getsigcmds(int signal);
void setupsignals();
-void getstatus(char *str);
+int getstatus(char *str, char *last);
void setroot();
void statusloop();
void statusinit();
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;
+static char statusstr[2][256];
+static int statusContinue = 1;
void replace(char *str, char old, char new)
{
}
//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);
+ //int N = strlen(output);
char c;
- int i = 0;
+ int i = strlen(block->icon);
while((c = fgetc(cmdf)) != EOF)
output[i++] = c;
+ if (delim != '\0' && --i)
+ output[i++] = delim;
output[i++] = '\0';
pclose(cmdf);
}
{
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 getstatus(char *str)
+int getstatus(char *str, char *last)
{
+ strcpy(last, str);
int j = 0;
- for(int i = 0; i < 5; j+=strlen(statusbar[i++]))
+ for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
{
strcpy(str + j, statusbar[i]);
}
- str[j] = '\0';
-
+ str[--j] = '\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);
}
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];
+ }
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
statusinit();