qugalet/dwmblocks
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Further optimizations related to updatestatus and updateblock

Browse source
This commit is contained in:
Ashish Kumar Yadav 2021-02-10 13:29:43 +05:30
parent 07f444980d
commit a58b4d6a80
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dwmblocks.c
View file

@ -36,9 +36,10 @@ static void sighandler(int sig, siginfo_t *si, void *ucontext);
static void statusloop(); static void statusloop();
static void termhandler(int sig); static void termhandler(int sig);
static void updateblock(Block *block, int sigval); static void updateblock(Block *block, int sigval);
static int updatestatus(); static void updatestatus();
static void writepid(); static void writepid();
static int dirty;
static char statustext[STATUSLENGTH + DELIMITERLENGTH]; static char statustext[STATUSLENGTH + DELIMITERLENGTH];
static Display *dpy; static Display *dpy;
static sigset_t blocksigmask; static sigset_t blocksigmask;
@ -78,7 +79,9 @@ cleanup()
void void
setroot() setroot()
{ {
if (updatestatus()) { if (dirty) {
updatestatus();
dirty = 0;
XStoreName(dpy, DefaultRootWindow(dpy), statustext); XStoreName(dpy, DefaultRootWindow(dpy), statustext);
XSync(dpy, False); XSync(dpy, False);
} }
@ -234,36 +237,23 @@ updateblock(Block *block, int sigval)
exit(1); exit(1);
} }
close(fd[0]); close(fd[0]);
block->curcmdout[block->curcmdout[trd - 1] == '\n' ? trd - 1 : trd] = '\0'; block->curcmdout[block->curcmdout[trd - 1] == '\n' ? --trd : trd] = '\0';
if (memcmp(block->curcmdout, block->prvcmdout, trd) != 0) {
memcpy(block->prvcmdout, block->curcmdout, trd);
dirty = 1;
}
} }
} }
} }
/* returns whether block outputs have changed and updates statustext if they have */ void
int
updatestatus() updatestatus()
{ {
char *s = statustext; char *s = statustext;
size_t len; size_t len;
Block *block = blocks;
/* checking half of the function */ for (Block *block = blocks; block->pathu; block++) {
for (; block->pathu; block++) { if ((len = strlen(block->curcmdout)) == 0)
len = strlen(block->curcmdout);
if (memcmp(block->curcmdout, block->prvcmdout, len + 1) != 0)
goto update;
if (len == 0)
continue;
s += len + (block->pathc ? 1 : 0) + DELIMITERLENGTH;
}
return 0;
/* updating half of the function */
for (; block->pathu; block++) {
len = strlen(block->curcmdout);
update:
memcpy(block->prvcmdout, block->curcmdout, len + 1);
if (len == 0)
continue; continue;
memcpy(s, block->curcmdout, len); memcpy(s, block->curcmdout, len);
s += len; s += len;
@ -275,7 +265,6 @@ update:
if (s != statustext) if (s != statustext)
s -= DELIMITERLENGTH; s -= DELIMITERLENGTH;
*s = '\0'; *s = '\0';
return 1;
} }
void void