From b0747006c6cefc525aa05f2c58fa6d54b60d2729 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Yadav <ashishkumar.yadav@students.iiserpune.ac.in>
Date: Tue, 7 Jul 2020 01:58:41 +0530
Subject: [PATCH] Did some cleanup

---
 Makefile       |  17 +++++++++--------
 README.md      |   2 +-
 dwmblocks.c    |  14 ++++++--------
 xgetrootname   | Bin 16848 -> 16872 bytes
 xgetrootname.c |   4 +---
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index de41651..3fa4e5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,25 @@
 #PREFIX = /usr/local
 PREFIX = ${HOME}/.local
+
 CC = gcc
-CFLAGS = -Wall -Wextra  -Os
+CFLAGS = -Wall -Wextra -Wextra -O3
 CFLAGSEXTRA = -Wno-unused-parameter -Wno-missing-field-initializers
 
-build: dwmblocks sigdwmblocks
+all: dwmblocks sigdwmblocks
 
-dwmblocks: dwmblocks.c blocks.h
-	${CC} ${CFLAGS} ${CFLAGSEXTRA} -lX11 dwmblocks.c -o dwmblocks
+dwmblocks: dwmblocks.c
+	${CC} -o $@ -lX11 ${CFLAGS} ${CFLAGSEXTRA} $<
 
 sigdwmblocks: sigdwmblocks.c
-	${CC} ${CFLAGS} sigdwmblocks.c -o sigdwmblocks
+	${CC} -o $@ ${CFLAGS} sigdwmblocks.c
 
 xgetrootname: xgetrootname.c
-	${CC} ${CFLAGS} xgetrootname.c -o xgetrootname
+	${CC} -o $@ -lX11 ${CFLAGS} xgetrootname.c
 
 clean:
 	rm -f dwmblocks sigdwmblocks
 
-install: build
+install: all
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	install -m 0755 dwmblocks ${DESTDIR}${PREFIX}/bin/dwmblocks
 	install -m 0755 sigdwmblocks ${DESTDIR}${PREFIX}/bin/sigdwmblocks
@@ -26,4 +27,4 @@ install: build
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/dwmblocks ${DESTDIR}${PREFIX}/bin/sigdwmblocks
 
-.PHONY: build clean install uninstall
+.PHONY: all clean install uninstall
diff --git a/README.md b/README.md
index aa9afab..b4db101 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ the block.
 
 # xgetrootname
 
-It is a small program to get the current root name. May prove helpful in
+It is a tiny program to get the current root name. May prove helpful in
 debugging.
 
 # Installation
diff --git a/dwmblocks.c b/dwmblocks.c
index be7a488..b185fe4 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -27,7 +27,7 @@ static void buttonhandler(int signal, siginfo_t *si, void *ucontext);
 static void getcmd(Block *block, int *sigval);
 static void setroot();
 static void setupsignals();
-static void sighandler(int signum, siginfo_t *si, void *ucontext);
+static void sighandler(int signal, siginfo_t *si, void *ucontext);
 static void statusloop();
 static void termhandler(int signum);
 static int updatestatus();
@@ -39,7 +39,6 @@ static int statusContinue = 1;
 static char statusstr[STTLENGTH];
 static size_t delimlength;
 static Display *dpy;
-static Window root;
 
 void
 buttonhandler(int signal, siginfo_t *si, void *ucontext)
@@ -115,7 +114,7 @@ setroot()
 {
 	if (updatestatus()) /* only set root if block outputs have changed */
 		return;
-	XStoreName(dpy, root, statusstr);
+	XStoreName(dpy, DefaultRootWindow(dpy), statusstr);
         XFlush(dpy);
 }
 
@@ -151,11 +150,11 @@ setupsignals()
 }
 
 void
-sighandler(int signum, siginfo_t *si, void *ucontext)
+sighandler(int signal, siginfo_t *si, void *ucontext)
 {
-	signum -= SIGRTMIN;
+	signal -= SIGRTMIN;
 	for (Block *current = blocks; current->pathu; current++) {
-		if (current->signal == signum)
+		if (current->signal == signal)
 			getcmd(current, &(si->si_value.sival_int));
 	}
 	setroot();
@@ -294,10 +293,9 @@ main(int argc, char *argv[])
                 fputs("Error: could not open display.\n", stderr);
                 return 1;
         }
-        root = RootWindow(dpy, DefaultScreen(dpy));
 	statusloop();
         unlink(LOCKFILE);
-        XStoreName(dpy, root, "");
+        XStoreName(dpy, DefaultRootWindow(dpy), "");
         XCloseDisplay(dpy);
         return 0;
 }
diff --git a/xgetrootname b/xgetrootname
index cc56a04fd45f0768df12c8ac4a2fa44097b38dd6..f5545376d656f68255af37bff56c27b423bc1376 100755
GIT binary patch
delta 905
zcmZWodq`7Z6#vfML$B%FvbZXglYC|9yvt2XTU%D%g@uZL^_t=om;Rw{rVwdi7Gi>M
zi0YqSRAwb4S4b2}OCrHY|EVB?-V7qtBEpbv=g!fC4xI0Ie&_KW?z!ii>4ab>^ku+}
zq4fgrb-+SWhi<rUsxU9J--rp^*sA_rgHhc_qi2%aMi-k;eLOcL7EEH0Yr{58JoI9f
zM!-I@#&AO8fomad*5<%%EYk{b0e#ww>l#}Ee&+G`169@ap6a@KPi>X2f%ya8n&xI!
z+uH04)L^P^N9=NYE(9FoutS$%dP2-d+LGww8ROV<9MJhehimi#M50aK4|;s1w*W84
zMBL)}VMS4-uJJ%EzBHOUju0clOFe}t$F{PT2&s3Ah1vwIY8p9%Zq?|X3mzvF$EBW<
zlt{0%Av!ffZJ8-`P8tt9lzL*U7RE-C$ahbj7~L{upj!&5Xhd~<dK8@hsVHA#*ZvSc
zySrx(O5Jaz&i8Vq>8e3PanzX0vU14KkxtJkikGltUQtdHE)kZfxS%M*gbiO5WeK~?
z`@|Gt`$<Qr;tnBm8H^{nodz@49%V4P43VxCs+VmiJwfV3KDkIYO;(*;mfR7IFR~uP
zJG`9z6ufei<t~61UE*qVh!3Db2J3g#vAD4nDzGUx9p><SZZTZJH@N~7pvxw}ZZz2}
z6jklU(0Mp?o>9+)OZ4eRCa_W`b^J>P)u?uqq6pSFj!hxhg@k9sO^k+bUQX49D?XrT
zx4?C*vJ1K2LN~^<N@qA22B4i-$zs?gbrVQJ!ywd?A7{n5M3zXFi4*>-Ov4Ggpmm1x
zIJO5D>;fE;`Mh#4se9>k7MHlU6?v@L)@&Q@&CkTM`F(NAOZiVsPTO=7u$0ruGn*@c
x#wr$Cc(3|HNxZVJFoJ_}TyP{|pTo%ic|!w^Vt6etI663J$0k=Ey@>%=`Y)&k0to;B

delta 843
zcmYjQT}V@L6#t*Aa~tT~b=loaagm`Wy0$jIo11-j2NJg^3bK9RM~Vi{P3%F)Faue^
z<WOV~CWR(J6t_t5!L5X%m-H!LeCQ<xJ*YkO@esFjuaO-%=XcKUod3D^{Lj6aaabLP
zWCbK&R0?1W1Jfjo0a)fG`%d%^(Z((9DOet}{`MYH+AaLPv#aig$9qRRFvDGi`xwa*
zFq~z@WR?}C)d*f`Tq;XMd-h?N!_(OU%wS*kOi3sdi$^;9L!G_-p`J+J0P7hXj>lLm
z-qk%cgjKo|h1|~5HOsNT5nj{T_;<vaNr#L2jEpjCxS)$c4wmH54Cu+32OVzYIKUw1
z>7N=8tSE{iPNas5#DwRbgE8^;QBOW&nOnp!suO>eFm1M<i&8w1iW|j5bJ<u68`e`H
zuNGR>21I5Ysx!HnxlHIxiHY_yLzh^Ud$59<#B~{_rpH&zm)`c&<d@zck}+B0Uz*Th
zmz-{jbfl}BiqcCcZ7E8UkZmi9q~bS4c}_4$_*0E>!hW%`n4AvMMLIR7vVN2KCU??g
z=N_2Mev{!iQKO_H^81e&R>&Kqe&}~v<gJ2eF0NO<hYg&q`3ONd>Ua$hq+B6-oo_&r
z!Sw^61AiSE0STk-a@fLYcN;vy&u#&_(eDwU33-nLS~Z`J64RyG5zXG!>@3a_|4j3j
zaLpswKG3!DoWL&l=!O21PYAUFd_h~S!!}Pf1uTzA{7wOFMw9OtsTG_YEnLk$R2NO6
z%}%H%UhN$AsqC&;FioASaf)mcZj(JP8|%&hUa7Av(7r97udO}MdMxCsan*S6PW_bJ
z*suU{rZEh3LxE<8F{rMGBq(2R)^l(Q15Ks)#A`P0{sC!k8?58D%OV%I3~<nolm0qL
IVA@~)2kV6JNB{r;

diff --git a/xgetrootname.c b/xgetrootname.c
index 532484f..e04154c 100644
--- a/xgetrootname.c
+++ b/xgetrootname.c
@@ -5,15 +5,13 @@ int
 main()
 {
         Display *dpy;
-        Window root;
         char *name;
 
         if (!(dpy = XOpenDisplay(NULL))) {
                 fputs("Error: could not open display.\n", stderr);
                 return 1;
         }
-        root = RootWindow(dpy, DefaultScreen(dpy));
-        if (XFetchName(dpy, root, &name) && name[0])
+        if (XFetchName(dpy, DefaultRootWindow(dpy), &name) && name[0])
                 printf("%s\n", name);
         else
                 puts("No name has been set for the root window.");