added draw.c again (except getcolor and setfont which are helpers in main.c)

4 files changed, 144 insertions, 133 deletions

diff --git a/Makefile b/Makefile
index 4af6a3d..6127456 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = client.c event.c layout.c main.c tag.c util.c
+SRC = client.c draw.c event.c layout.c main.c tag.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dwm
diff --git a/draw.c b/draw.c
new file mode 100644
index 0000000..25b08c6
--- /dev/null
+++ b/draw.c
@@ -0,0 +1,137 @@
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details.
+ */
+#include "dwm.h"
+#include <string.h>
+
+/* static */
+
+static unsigned int
+textnw(const char *text, unsigned int len) {
+	XRectangle r;
+
+	if(dc.font.set) {
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+		return r.width;
+	}
+	return XTextWidth(dc.font.xfont, text, len);
+}
+
+static void
+drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+	int x;
+	XGCValues gcv;
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+	gcv.foreground = col[ColFG];
+	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+	x = (dc.font.ascent + dc.font.descent + 2) / 4;
+	r.x = dc.x + 1;
+	r.y = dc.y + 1;
+	if(filled) {
+		r.width = r.height = x + 1;
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	}
+	else if(empty) {
+		r.width = r.height = x;
+		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	}
+}
+
+static Bool
+isoccupied(unsigned int t) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->tags[t])
+			return True;
+	return False;
+}
+
+/* extern */
+
+void
+drawstatus(void) {
+	int i, x;
+
+	dc.x = dc.y = 0;
+	for(i = 0; i < ntags; i++) {
+		dc.w = textw(tags[i]);
+		if(seltag[i]) {
+			drawtext(tags[i], dc.sel);
+			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+		}
+		else {
+			drawtext(tags[i], dc.norm);
+			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+		}
+		dc.x += dc.w;
+	}
+	dc.w = blw;
+	drawtext(lt->symbol, dc.norm);
+	x = dc.x + dc.w;
+	dc.w = textw(stext);
+	dc.x = sw - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = sw - x;
+	}
+	drawtext(stext, dc.norm);
+	if((dc.w = dc.x - x) > bh) {>How to play</h1>
    <p>Help little black square rescue the villagers, and battle the monsters.</p>
    <ul>
        <li>Rescue the other villagers from the monsters.</li>
        <li>You start in the village.</li>
        <li>Monsters will mostly stay away from the village.</li>
        <li>Use the arrow keys to move.</li>
        <li>Use the z key to attack.</li>
        <li>Use the x key to hide in your protective shell. Whil hiding you won't be able to move.</li>
        <li>Use the e key to cycle between your push attack and your sword.</li>
        <li>Earn the sword by rescuing some villagers!</li>
        <li>The push attack will knock enemies back, but won't harm them.</li>
        <li>The sword slices. This is dangerous, and will harm enemies.</li>
        <li>Be careful of the enemies, they will chase you around!</li>
        <li>If you defeate an enemy they may drop some yellow gems. Collect them to restore your health.</li>
        <li>Hold down the shift key to run faster, you only have so much stamina, though, so after a while you'll have to slow down again.</li>
        <li>Hold down the space bar to strafe.</li>
    </ul>
    <p><a href="index.html">Play the game!</a></p>
</body>
</html>