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)
{
return;
//int N = strlen(output);
char c;
- int sl;
- int i = sl = strlen(block->icon);
+ 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);
- if (i == sl) { //return empty string if command has no output
- output[0] = '\0';
- return;
- }
- if (delim[0] != '\0' && --i)
- for (int j = 0; delim[j]; j++)
- output[i++] = delim[j];
- else
- output[--i] = '\0';
}
void getcmds(int time)
}
-void getstatus(char *str)
+int getstatus(char *str, char *last)
{
+ strcpy(last, str);
int j = 0;
for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
{
strcpy(str + j, statusbar[i]);
}
- for (int i = 0; delim[i]; 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);
- XStoreName(dpy, root, statusstr);
+ XStoreName(dpy, root, statusstr[0]);
XCloseDisplay(dpy);
}
for(int i = 0; i < argc; i++)
{
if (!strcmp("-d",argv[i]))
- delim = argv[++i];
+ delim = argv[++i][0];
}
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);