build stuff

Author: jb55

.gitignore

@@ -1 +1,3 @@
 /cmdtree
+*.d
+*.o

LICENSE

@@ -0,0 +1,31 @@
+MIT/X Consortium License
+
+© 2006-2014 Anselm R Garbe <[email protected]>
+© 2006-2008 Sander van Dijk <[email protected]>
+© 2006-2007 Michał Janeczek <[email protected]>
+© 2007 Kris Maglione <[email protected]>
+© 2009 Gottox <[email protected]>
+© 2009 Markus Schnalke <[email protected]>
+© 2009 Evan Gates <[email protected]>
+© 2010-2012 Connor Lane Smith <[email protected]>
+© 2014-2018 Hiltjo Posthuma <[email protected]>
+© 2015-2018 Quentin Rameau <[email protected]>
+© 2018-2019 William Casarin <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,7 +1,28 @@
 
-CFLAGS=-O -g -lX11 -Wall -Werror
+CFLAGS=-O2 -g -lX11 -Wall -Werror
+LDFLAGS=-lXft -lfontconfig
+
+BIN=cmdtree
+
+OBJS += drw.o
+OBJS += util.o
+OBJS += cmdtree.o
+
+SRCS=$(OBJS:.o=.c)
+
+all: $(SHLIB) $(STATICLIB) $(BIN)
+
+include $(OBJS:.o=.d)
+
+%.d: %.c
+	$(CC) -MM $(CFLAGS) $< > $@
 
 all: cmdtree
 
-cmdtree: cmdtree.c
-	$(CC) $(CFLAGS) $< -o $@
+$(BIN): $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean: fake
+	rm -f $(OBJS) $(BIN)
+
+.PHONY: fake

cmdtree.c

@@ -10,6 +10,8 @@
 
 #include <unistd.h>
 
+#include "util.h"
+
 static Window root, parentwin, win;
 static int screen;
 static Display *display;
@@ -20,26 +22,6 @@ static XIC xic;
 // config
 static int topbar = 1;
 
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-
-static void
-die(const char *fmt, ...) {
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
-		fputc(' ', stderr);
-		perror(NULL);
-	} else {
-		fputc('\n', stderr);
-	}
-
-	exit(1);
-}
-
 static void
 setup()
 {
@@ -97,23 +79,30 @@ setup()
 	/* drawmenu(); */
 }
 
+static void
+draw_tree() {
+	static const char *msg = "cmdtree is a tree of commands";
+
+	XFillRectangle(display, win, DefaultGC(display, screen),
+		       20, 20, 10, 10);
+
+	XDrawString(display, win, DefaultGC(display, screen), 10,
+		    50, msg, strlen(msg));
+}
+
+
 static void
 run() {
 	XEvent e;
 	int done = 0;
 	char buf[32];
 	KeySym ksym = NoSymbol;
 	Status status;
-	static const char *msg = "cmdtree is a tree of commands";
 
 	while (!done) {
 		XNextEvent(display, &e);
 		if (e.type == Expose) {
-			XFillRectangle(display, win, DefaultGC(display, screen),
-				       20, 20, 10, 10);
-
-			XDrawString(display, win, DefaultGC(display, screen), 10,
-				    50, msg, strlen(msg));
+			draw_tree();
 		}
 
 		if (e.type == KeyPress) {
@@ -127,6 +116,7 @@ run() {
 
 }
 
+
 int main(void) {
 
 	display = XOpenDisplay(NULL);