fixed flickering/disappearing blocks issue

dwmblocks.c

@@ -1,33 +1,36 @@
-#include<stdlib.h>
+#include <errno.h>
-#include<stdio.h>
+#include <signal.h>
-#include<string.h>
+#include <stdio.h>
-#include<unistd.h>
+#include <stdlib.h>
-#include<signal.h>
+#include <string.h>
-#include<sys/wait.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 #ifndef NO_X
-#include<X11/Xlib.h>
+#include <X11/Xlib.h>
 #endif
 #ifdef __OpenBSD__
-#define SIGPLUS			SIGUSR1+1
+#define SIGPLUS SIGUSR1 + 1
-#define SIGMINUS		SIGUSR1-1
+#define SIGMINUS SIGUSR1 - 1
 #else
 #define SIGPLUS SIGRTMIN
 #define SIGMINUS SIGRTMIN
 #endif
-#define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
+#define LENGTH(X) (sizeof(X) / sizeof(X[0]))
 #define CMDLENGTH 50
-#define MIN( a, b ) ( ( a < b) ? a : b )
+#define MIN(a, b) ((a < b) ? a : b)
 #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
-	char* icon;
+  char *icon;
-	char* command;
+  char *command;
   unsigned int interval;
   unsigned int signal;
 } Block;
 #ifndef __OpenBSD__
 void dummysighandler(int num);
 #endif
+void remove_all(char *str, char to_remove);
 void getcmds(int time);
 void getsigcmds(unsigned int signal);
 void setupsignals();
@@ -39,16 +42,15 @@ void chldhandler();
 void pstdout();
 #ifndef NO_X
 void setroot();
-static void (*writestatus) () = setroot;
+static void (*writestatus)() = setroot;
 static int setupX();
 static Display *dpy;
 static int screen;
 static Window root;
 #else
-static void (*writestatus) () = pstdout;
+static void (*writestatus)() = pstdout;
 #endif
 
-
 #include "blocks.h"
 
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
@@ -56,56 +58,67 @@ static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
 static int returnStatus = 0;
 
-//opens process *cmd and stores output in *output
+void remove_all(char *str, char to_remove) {
-void getcmd(const Block *block, char *output)
+  char *read = str;
-{
+  char *write = str;
-	if (block->signal)
+
-		*output++ = block->signal;
+  do {
-	strcpy(output, block->icon);
+    while (*read == to_remove)
-	FILE *cmdf = popen(block->command, "r");
+      read++;
-	if (!cmdf)
+    *write++ = *read;
-		return;
+    read++;
-	int i = strlen(block->icon);
+  } while (*(read - 1));
-	fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
-	i = strlen(output);
-	if (i == 0) {
-		//return if block and command output are both empty
-		pclose(cmdf);
-		return;
-	}
-	//only chop off newline if one is present at the end
-	i = output[i-1] == '\n' ? i-1 : i;
-	if (delim[0] != '\0') {
-		strncpy(output+i, delim, delimLen); 
-	}
-	else
-		output[i++] = '\0';
-	pclose(cmdf);
 }
 
-void getcmds(int time)
+// opens process *cmd and stores output in *output
-{
+void getcmd(const Block *block, char *output) {
-	const Block* current;
+  if (block->signal)
+    *output++ = block->signal;
+  FILE *cmdf = popen(block->command, "r");
+  if (!cmdf) {
+    printf("failed to run: %s, %d\n", block->command, errno);
+    return;
+  }
+  char tmpstr[CMDLENGTH] = "";
+  char *s;
+  int e;
+  do {
+    s = fgets(tmpstr, CMDLENGTH - (strlen(delim) + 1), cmdf);
+    e = errno;
+  } while (!s && e == EINTR);
+  pclose(cmdf);
+  int i = strlen(block->icon);
+  strcpy(output, block->icon);
+  strcpy(output + i, tmpstr);
+  remove_all(output, '\n');
+  i = strlen(output);
+  if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])) {
+    strcat(output, delim);
+  }
+  i += strlen(delim);
+  output[i++] = '\0';
+}
+
+void getcmds(int time) {
+  const Block *current;
   for (unsigned int i = 0; i < LENGTH(blocks); i++) {
     current = blocks + i;
     if ((current->interval != 0 && time % current->interval == 0) || time == -1)
-			getcmd(current,statusbar[i]);
+      getcmd(current, statusbar[i]);
   }
 }
 
-void getsigcmds(unsigned int signal)
+void getsigcmds(unsigned int signal) {
-{
   const Block *current;
   for (unsigned int i = 0; i < LENGTH(blocks); i++) {
     current = blocks + i;
     if (current->signal == signal)
-			getcmd(current,statusbar[i]);
+      getcmd(current, statusbar[i]);
   }
 }
 
-void setupsignals()
+void setupsignals() {
-{
+  struct sigaction sa = {.sa_sigaction = sighandler, .sa_flags = SA_SIGINFO};
-	struct sigaction sa = { .sa_sigaction = sighandler, .sa_flags = SA_SIGINFO };
 #ifndef __OpenBSD__
   /* initialize all real time signals with dummy handler */
   for (int i = SIGRTMIN; i <= SIGRTMAX; i++) {
@@ -116,32 +129,29 @@ void setupsignals()
 
   for (unsigned int i = 0; i < LENGTH(blocks); i++) {
     if (blocks[i].signal > 0)
-			sigaction(SIGMINUS+blocks[i].signal, &sa, NULL);
+      sigaction(SIGMINUS + blocks[i].signal, &sa, NULL);
   }
-
 }
 
-int getstatus(char *str, char *last)
+int getstatus(char *str, char *last) {
-{
   strcpy(last, str);
   str[0] = '\0';
   for (unsigned int i = 0; i < LENGTH(blocks); i++)
     strcat(str, statusbar[i]);
-	str[strlen(str)-strlen(delim)] = '\0';
+  str[strlen(str) - strlen(delim)] = '\0';
-	return strcmp(str, last);//0 if they are the same
+  return strcmp(str, last); // 0 if they are the same
 }
 
 #ifndef NO_X
-void setroot()
+void setroot() {
-{
+  if (!getstatus(statusstr[0],
-	if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
+                 statusstr[1])) // Only set root if text has changed.
     return;
   XStoreName(dpy, root, statusstr[0]);
   XFlush(dpy);
 }
 
-int setupX()
+int setupX() {
-{
   dpy = XOpenDisplay(NULL);
   if (!dpy) {
     fprintf(stderr, "dwmblocks: Failed to open display\n");
@@ -153,39 +163,43 @@ int setupX()
 }
 #endif
 
-void pstdout()
+void pstdout() {
-{
+  if (!getstatus(statusstr[0],
-	if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+                 statusstr[1])) // Only write out if text has changed.
     return;
-	printf("%s\n",statusstr[0]);
+  printf("%s\n", statusstr[0]);
   fflush(stdout);
 }
 
-
+void statusloop() {
-void statusloop()
-{
   setupsignals();
   int i = 0;
+  int gotscrewed = 0;
+  struct timespec sleeptime = {1, 0};
+  struct timespec tosleep = sleeptime;
   getcmds(-1);
   while (1) {
+    // sleep for tosleep (should be sleeptime of 1s) and put what was left if
+    // interrupted back into tosleep
+    gotscrewed = nanosleep(&tosleep, &tosleep);
+    // if interrupted then go back to sleep for remaining time
+    if (gotscrewed == -1) {
+      continue;
+    }
     getcmds(i++);
     writestatus();
     if (!statusContinue)
       break;
-		sleep(1.0);
+    tosleep = sleeptime;
   }
 }
 
 #ifndef __OpenBSD__
 /* this signal handler should do nothing */
-void dummysighandler(int signum)
+void dummysighandler(int signum) { return; }
-{
-    return;
-}
 #endif
 
-void sighandler(int signum, siginfo_t *si, void *ucontext)
+void sighandler(int signum, siginfo_t *si, void *ucontext) {
-{
   if (si->si_value.sival_int) {
     pid_t parent = getpid();
     if (fork() == 0) {
@@ -194,12 +208,15 @@ void sighandler(int signum, siginfo_t *si, void *ucontext)
         close(ConnectionNumber(dpy));
 #endif
       int i;
-			for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum-SIGRTMIN; i++);
+      for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum - SIGRTMIN;
+           i++)
+        ;
 
       char shcmd[1024];
-			sprintf(shcmd, "%s; kill -%d %d", blocks[i].command, SIGRTMIN+blocks[i].signal, parent);
+      sprintf(shcmd, "%s; kill -%d %d", blocks[i].command,
-			char *cmd[] = { "/bin/sh", "-c", shcmd, NULL };
+              SIGRTMIN + blocks[i].signal, parent);
-			char button[2] = { '0' + si->si_value.sival_int, '\0' };
+      char *cmd[] = {"/bin/sh", "-c", shcmd, NULL};
+      char button[2] = {'0' + si->si_value.sival_int, '\0'};
       setenv("BUTTON", button, 1);
       setsid();
       execvp(cmd[0], cmd);
@@ -207,27 +224,23 @@ void sighandler(int signum, siginfo_t *si, void *ucontext)
       exit(EXIT_SUCCESS);
     }
   } else {
-		getsigcmds(signum-SIGPLUS);
+    getsigcmds(signum - SIGPLUS);
     writestatus();
   }
 }
 
-void termhandler()
+void termhandler() { statusContinue = 0; }
-{
+
-	statusContinue = 0;
+void chldhandler() {
+  while (0 < waitpid(-1, NULL, WNOHANG))
+    ;
 }
 
-void chldhandler()
+int main(int argc, char **argv) {
-{
+  for (int i = 0; i < argc; i++) { // Handle command line arguments
-	while (0 < waitpid(-1, NULL, WNOHANG));
+    if (!strcmp("-d", argv[i]))
-}
-
-int main(int argc, char** argv)
-{
-	for (int i = 0; i < argc; i++) {//Handle command line arguments
-		if (!strcmp("-d",argv[i]))
       strncpy(delim, argv[++i], delimLen);
-		else if (!strcmp("-p",argv[i]))
+    else if (!strcmp("-p", argv[i]))
       writestatus = pstdout;
   }
 #ifndef NO_X