From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Mon, 9 Mar 2020 09:01:19 +0000 (-0400)
Subject: Optionally set X root window name
X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=fabb877142fbe4686ef7fcaf7fa0f4f92c1fe254;p=khatus.git

Optionally set X root window name
---

diff --git a/x5/Makefile b/x5/Makefile
index 571c8ba..816deff 100644
--- a/x5/Makefile
+++ b/x5/Makefile
@@ -1,5 +1,7 @@
+CFLAGS := -Wall
+LDLIBS := -lX11
+
 EXECUTABLES := khatus
-CC          := $(CC) -Wall
 
 .PHONY: \
   build \
diff --git a/x5/khatus.c b/x5/khatus.c
index 5f283db..3897b87 100644
--- a/x5/khatus.c
+++ b/x5/khatus.c
@@ -1,8 +1,8 @@
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/stat.h>
+#include <X11/Xlib.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -38,12 +38,14 @@ struct Config {
 	File * files;
 	int    file_count;
 	int    total_width;
+	int    output_to_x_root_window;
 } defaults = {
 	.interval    = 1,
 	.separator   = "|",
 	.files       = NULL,
 	.file_count  = 0,
 	.total_width = 0,
+	.output_to_x_root_window = 0,
 };
 
 void
@@ -172,6 +174,11 @@ parse_opts_opt(Config *cfg, int argc, char *argv[], int i)
 	switch (argv[i][1]) {
 		case 'i': parse_opts_opt_i(cfg, argc, argv, ++i); break;  /* TODO: Generic set_int */
 		case 's': parse_opts_opt_s(cfg, argc, argv, ++i); break;  /* TODO: Generic set_str */
+		case 'x': {
+			cfg->output_to_x_root_window = 1;
+			opts_parse_any(cfg, argc, argv, ++i);
+			break;
+		}
 		default : usage("Option \"%s\" is invalid\n", argv[i]);
 	}
 }
@@ -266,7 +273,6 @@ read_all(Config *cfg, char *buf)
 	struct stat st;
 
 	FD_ZERO(&fds);
-
 	/* TODO: Check TTL */
 	for (File *f = cfg->files; f; f = f->next) {
 		/* TODO: Create the FIFO if it doesn't already exist. */
@@ -307,6 +313,7 @@ main(int argc, char *argv[])
 	int prefix = 0;
 	char *buf;
 	Config *cfg = &defaults;
+	Display *display;
 
 	argv0 = argv[0];
 
@@ -339,13 +346,23 @@ main(int argc, char *argv[])
 		}
 	}
 
-	printf("%s\n", buf);
+	if (cfg->output_to_x_root_window && !(display = XOpenDisplay(NULL)))
+		fatal("XOpenDisplay failed with: %p\n", display);
 	/* TODO: nanosleep and nano time diff */
 	for (;;) {
 		/* TODO: Check TTL and maybe blank-out */
 		/* TODO: How to trigger TTL check? On select? Alarm signal? */
-		/* TODO: Option to set X root window title or print */
+		/* TODO: Set timeout on read_all based on diff of last time of
+		 *       read_all and desired time of next TTL check.
+		 * */
 		read_all(cfg, buf);
-		printf("%s\n", buf);
+		if (cfg->output_to_x_root_window) {
+			if (XStoreName(display, DefaultRootWindow(display), buf) < 0)
+				fatal("XStoreName failed.\n");
+			XFlush(display);
+		} else {
+			puts(buf);
+			fflush(stdout);
+		}
 	}
 }