wip

.config/suckless/slstatus/slstatus.c

@@ -16,9 +16,7 @@ static Display *dpy;
 const unsigned short interval = 1000;
 const char unknown_str[] = "n/a";
 
-void
+void die(const char *fmt, ...) {
-die(const char *fmt, ...)
-{
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
@@ -26,27 +24,20 @@ die(const char *fmt, ...)
 	if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
 		fputc(' ', stderr);
 		perror(NULL);
-	} else {
+	} else fputc('\n', stderr);
-		fputc('\n', stderr);
-	}
 	va_end(ap);
 	exit(1);
 }
 
-int
+int esnprintf(char *str, size_t size, const char *fmt, ...) {
-esnprintf(char *str, size_t size, const char *fmt, ...)
-{
 	va_list ap;
 	int ret;
 
 	va_start(ap, fmt);
 	ret = vsnprintf(str, size, fmt, ap);
 
-	if (ret < 0) {
+	if (ret < 0) return -1;
-		return -1;
+	else if ((size_t)ret >= size) return -1;
-	} else if ((size_t)ret >= size) {
-		return -1;
-	}
 	va_end(ap);
 
 	return ret;
@@ -58,54 +49,50 @@ struct arg {
 	const char *args;
 };
 
-static void
+static void terminate(const int signo) {
-terminate(const int signo)
-{
 	if (signo != SIGUSR1)
 		done = 1;
 }
 
-static void
+static void difftimespec(struct timespec *res, struct timespec *a, struct timespec *b) {
-difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
-{
 	res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
-	res->tv_nsec = a->tv_nsec - b->tv_nsec +
+	res->tv_nsec = a->tv_nsec - b->tv_nsec + (a->tv_nsec < b->tv_nsec) * 1E9;
-	               (a->tv_nsec < b->tv_nsec) * 1E9;
 }
 
-const char *
+const char* wallpaper_countdown(const char *unused) {
-run_command(const char *cmd)
+    (void)unused;
-{
+    time_t now = time(NULL), last = now;
+    FILE *f = fopen("/tmp/last_wallpaper_time", "r");
+    if (f) {
+        if (fscanf(f, "%ld", &last) != 1) last = now;
+        fclose(f);
+    }
+
+    int rem = 600 - (int)(now - last);
+    if (rem < 0) rem = 0;
+    if (snprintf(buf, sizeof(buf), "%02d:%02d", (rem / 60), (rem % 60)) < 0) return NULL;
+    return buf;
+}
+
+const char* run_command(const char *cmd) {
 	char *p;
 	FILE *fp;
 
-	if (!(fp = popen(cmd, "r"))) {
+	if (!(fp = popen(cmd, "r"))) return NULL;
-		return NULL;
-	}
-
 	p = fgets(buf, sizeof(buf) - 1, fp);
-	if (pclose(fp) < 0) {
+	if (pclose(fp) < 0) return NULL;
-		return NULL;
+	if (!p) return NULL;
-	}
+	if ((p = strrchr(buf, '\n'))) p[0] = '\0';
-	if (!p)
-		return NULL;
-
-	if ((p = strrchr(buf, '\n')))
-		p[0] = '\0';
-
 	return buf[0] ? buf : NULL;
 }
 
-static const
+static const struct arg args[] = {
-struct arg args[] = {
+	{ wallpaper_countdown, 	" %s till swap  •  ", NULL },	
-	{ run_command, 	" %s till swap  •  ", 	"sh /home/andrew/.config/suckless/slstatus/wallpaper-countdown.sh" },
 	{ run_command, 	"VOL at %s  •  ", 	"wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{printf \"%d%%\", $2 * 100}'" },
 	{ run_command,	"%s / 731 installed ", 	"sh -c 'echo $(( ( $(date +%s) - $(stat -c %W /) ) / 86400 ))'" },
 };
 
-int
+int main(int argc, char *argv[]) {
-main(int argc, char *argv[])
-{
 	struct sigaction act;
 	struct timespec start, current, diff, intspec, wait;
 	size_t i, len;
@@ -122,46 +109,32 @@ main(int argc, char *argv[])
 
 	if (!(dpy = XOpenDisplay(NULL)))
 		die("XOpenDisplay: Failed to open display");
-
 	do {
-		if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
+		if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) die("clock_gettime:");
-			die("clock_gettime:");
-
 		status[0] = '\0';
 		for (i = len = 0; i < LEN(args); i++) {
-			if (!(res = args[i].func(args[i].args)))
+			if (!(res = args[i].func(args[i].args))) res = unknown_str;
-				res = unknown_str;
+			if ((ret = esnprintf(status + len, sizeof(status) - len, args[i].fmt, res)) < 0)
-
-			if ((ret = esnprintf(status + len, sizeof(status) - len,
-			                     args[i].fmt, res)) < 0)
 				break;
-
 			len += ret;
 		}
 
-		if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0)
+		if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0) die("XStoreName: Allocation failed");
-			die("XStoreName: Allocation failed");
 		XFlush(dpy);
 
 		if (!done) {
-			if (clock_gettime(CLOCK_MONOTONIC, &current) < 0)
+			if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) die("clock_gettime:");
-				die("clock_gettime:");
 			difftimespec(&diff, &current, &start);
 
 			intspec.tv_sec = interval / 1000;
 			intspec.tv_nsec = (interval % 1000) * 1E6;
 			difftimespec(&wait, &intspec, &diff);
 
-			if (wait.tv_sec >= 0 &&
+			if (wait.tv_sec >= 0 && nanosleep(&wait, NULL) < 0 && errno != EINTR) die("nanosleep:");
-			    nanosleep(&wait, NULL) < 0 &&
-			    errno != EINTR)
-					die("nanosleep:");
 		}
 	} while (!done);
 
 	XStoreName(dpy, DefaultRootWindow(dpy), NULL);
-	if (XCloseDisplay(dpy) < 0)
+	if (XCloseDisplay(dpy) < 0) die("XCloseDisplay: Failed to close display");
-		die("XCloseDisplay: Failed to close display");
-
 	return 0;
 }

.config/suckless/slstatus/wallpaper-countdown.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-last=$(cat /tmp/last_wallpaper_time)
-
-now=$(date +%s)
-remaining=$((600 - (now - last)))
-
-[ "$remaining" -lt 0 ] && remaining=0
-    
-min=$((remaining / 60))
-sec=$((remaining % 60))
-
-# Format as mm:ss
-printf "%02d:%02d\n" "$min" "$sec"