dwmblocks.c

@@ -1,12 +1,10 @@
-#include <stdlib.h>
+#include<stdlib.h>
-#include <stdio.h>
+#include<stdio.h>
-#include <string.h>
+#include<string.h>
-#include <unistd.h>
+#include<unistd.h>
-#include <time.h>
+#include<signal.h>
-#include <signal.h>
+#include<X11/Xlib.h>
-#include <errno.h>
+#define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
-#include <X11/Xlib.h>
-#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
 #define CMDLENGTH		50
 
 typedef struct {
@@ -43,38 +41,25 @@ static void (*writestatus) () = setroot;
 
 void replace(char *str, char old, char new)
 {
-	for(char * c = str; *c; c++)
+	int N = strlen(str);
-		if(*c == old)
+	for(int i = 0; i < N; i++)
-			*c = new;
+		if(str[i] == old)
+			str[i] = new;
 }
 
-// the previous function looked nice but unfortunately it didnt work if to_remove was in any position other than the last character
-// theres probably still a better way of doing this
 void remove_all(char *str, char to_remove) {
 	char *read = str;
 	char *write = str;
 	while (*read) {
-		if (*read != to_remove) {
+		if (*read == to_remove) {
-			*write++ = *read;
+			read++;
+			*write = *read;
 		}
-		++read;
+		read++;
+		write++;
 	}
-	*write = '\0';
 }
 
-int gcd(int a, int b)
-{
-	int temp;
-	while (b > 0){
-		temp = a % b;
-
-		a = b;
-		b = temp;
-	}
-	return a;
-}
-
-
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
 {
@@ -83,37 +68,21 @@ void getcmd(const Block *block, char *output)
 		output[0] = block->signal;
 		output++;
 	}
+	strcpy(output, block->icon);
 	char *cmd = block->command;
 	FILE *cmdf = popen(cmd,"r");
-	if (!cmdf){
+	if (!cmdf)
-        //printf("failed to run: %s, %d\n", block->command, errno);
 		return;
-    }
+	char c;
-    char tmpstr[CMDLENGTH] = "";
-    // TODO decide whether its better to use the last value till next time or just keep trying while the error was the interrupt
-    // this keeps trying to read if it got nothing and the error was an interrupt
-    //  could also just read to a separate buffer and not move the data over if interrupted
-    //  this way will take longer trying to complete 1 thing but will get it done
-    //  the other way will move on to keep going with everything and the part that failed to read will be wrong till its updated again
-    // either way you have to save the data to a temp buffer because when it fails it writes nothing and then then it gets displayed before this finishes
-	char * s;
-    int e;
-    do {
-        errno = 0;
-        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);
+	fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf);
-    strcpy(output+i, tmpstr);
 	remove_all(output, '\n');
 	i = strlen(output);
-    if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])){
+    if ((i > 0 && block != &blocks[LENGTH(blocks) - 1]))
         strcat(output, delim);
-    }
     i+=strlen(delim);
 	output[i++] = '\0';
+	pclose(cmdf);
 }
 
 void getcmds(int time)
@@ -122,9 +91,8 @@ void getcmds(int time)
 	for(int i = 0; i < LENGTH(blocks); i++)
 	{
 		current = blocks + i;
-		if ((current->interval != 0 && time % current->interval == 0) || time == -1){
+		if ((current->interval != 0 && time % current->interval == 0) || time == -1)
 			getcmd(current,statusbar[i]);
-        }
 	}
 }
 
@@ -135,9 +103,8 @@ void getsigcmds(int signal)
 	for (int i = 0; i < LENGTH(blocks); i++)
 	{
 		current = blocks + i;
-		if (current->signal == signal){
+		if (current->signal == signal)
 			getcmd(current,statusbar[i]);
-        }
 	}
 }
 
@@ -209,34 +176,14 @@ void statusloop()
 #ifndef __OpenBSD__
 	setupsignals();
 #endif
-    // first figure out the default wait interval by finding the
+	int i = 0;
-    // greatest common denominator of the intervals
-    unsigned int interval = -1;
-    for(int i = 0; i < LENGTH(blocks); i++){
-        if(blocks[i].interval){
-            interval = gcd(blocks[i].interval, interval);
-        }
-    }
-	unsigned int i = 0;
-    int interrupted = 0;
-    const struct timespec sleeptime = {interval, 0};
-    struct timespec tosleep = sleeptime;
 	getcmds(-1);
 	while(statusContinue)
 	{
-        // sleep for tosleep (should be a sleeptime of interval seconds) and put what was left if interrupted back into tosleep
+		getcmds(i);
-        interrupted = nanosleep(&tosleep, &tosleep);
+		writestatus();
-        // if interrupted then just go sleep again for the remaining time
+		sleep(1.0);
-        if(interrupted == -1){
+		i++;
-            continue;
-        }
-        // if not interrupted then do the calling and writing
-        getcmds(i);
-        writestatus();
-        // then increment since its actually been a second (plus the time it took the commands to run)
-        i += interval;
-        // set the time to sleep back to the sleeptime of 1s
-        tosleep = sleeptime;
 	}
 }