From 2b4429778db5162857ae335ac0b7e36b765e3492 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 9 Jul 2018 16:08:12 -0700
Subject: prefix names

---
 cmdtree.c | 110 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 54 insertions(+), 56 deletions(-)

(limited to 'cmdtree.c')

diff --git a/cmdtree.c b/cmdtree.c
index f02e217..17d107b 100644
--- a/cmdtree.c
+++ b/cmdtree.c
@@ -137,29 +137,43 @@ setup(Drw *drw)
 }
 
 static int
-draw_command(Drw *drw, int x, int y, const char *name, const char *binding) {
+draw_command(Drw *drw, int x, int y, struct command *cmd) {
+	char buf[256];
 	int lpad = 0;
 	int pad = 0;
 	unsigned int w = 50;
 	int invert = 0;
+	int isprefix = 0;
+	char *name = cmd->name;
 
 	//drw_fontset_getwidth(drw, binding) + 1;
 
 	drw_setscheme(drw, &schemes[SchemeNorm].bind_clr,
 		      &schemes[SchemeNorm].bg_clr);
 
-	w = drw_fontset_getwidth(drw, binding);
-	x = drw_text(drw, x+pad, y, w, bh, lpad, binding, invert);
+	w = drw_fontset_getwidth(drw, cmd->bind);
+	x = drw_text(drw, x+pad, y, w, bh, lpad, cmd->bind, invert);
 
 	w = sep_width;
 	drw_setscheme(drw, &schemes[SchemeNorm].arrow_clr,
 		      &schemes[SchemeNorm].bg_clr);
 	x = drw_text(drw, x+pad, y, w, bh, lpad, separator, invert);
 
-	drw_setscheme(drw, &schemes[SchemeNorm].name_clr,
-		      &schemes[SchemeNorm].bg_clr);
+	isprefix = command_is_prefix(cmd);
+
+	if (isprefix)
+		drw_setscheme(drw, &schemes[SchemePrefix].name_clr,
+			      &schemes[SchemePrefix].bg_clr);
+	else
+		drw_setscheme(drw, &schemes[SchemeNorm].name_clr,
+			&schemes[SchemeNorm].bg_clr);
 
-	w = drw_fontset_getwidth(drw, name);
+	if (isprefix) {
+		snprintf(buf, 256, "+%s", cmd->name);
+		name = buf;
+	}
+
+	w = drw_fontset_getwidth(drw, buf);
 	x = drw_text(drw, x+pad, y, w, bh, lpad, name, invert);
 
 	return x;
@@ -170,11 +184,10 @@ draw_command(Drw *drw, int x, int y, const char *name, const char *binding) {
 /* calc_tree_exts(struct node *nodes, int num_nodes, int *rows, int *cols) { */
 /* } */
 static void
-draw_tree_vertical(Drw *drw, int x, int y, int w, int h) {
+draw_tree_vertical(Drw *drw, struct command *cmds, int x, int y, int w, int h) {
 	int i;
-	char buf[512];
-	char smallbuf[32];
 	int colw = 0;
+	int ncmds = tal_count(cmds);
 
 	x += xpad;
 	y += ypad;
@@ -184,65 +197,50 @@ draw_tree_vertical(Drw *drw, int x, int y, int w, int h) {
 	drw_rect(drw, 0, 0, w, h, 1, 1);
 
 	int c = '0';
-	for (i = 0; i < 40; ++i, ++c, y += bh) {
-		if (i % 2 == 0)
-			snprintf(buf, 512, "item-long-%d", i);
-		else if (i % 6 == 0)
-			snprintf(buf, 512, "herpderp-%d", i);
-		else if (i % 7 == 0)
-			snprintf(buf, 512, "ksdfsdjhfsdf-%d", i);
-		else
-			snprintf(buf, 512, "hi-%d", i);
-		if (c > '~') c = '0';
-		sprintf(smallbuf, "%c", c);
-
-		if (y >= mh) {
-			x = colw;
-			y = 0;
-			colw = 0;
-		}
 
-		colw = MAX(draw_command(drw, x, y, buf, smallbuf) + 20, colw);
-	}
-}
 
-static void
-draw_tree_horizontal(Drw *drw, int x, int y, int w, int h) {
-	int i, dx = x, dy = y;
-	char buf[512];
-	char smallbuf[32];
+	for (i = 0; i < ncmds; ++i, ++c, y += bh) {
+		struct command *cmd = &cmds[i];
 
-	drw_setscheme(drw, &schemes[SchemeNorm].bg_clr,
-		      &schemes[SchemeNorm].bg_clr);
-	drw_rect(drw, 0, 0, w, h, 1, 1);
-
-	int c = '0';
-	for (i = 0; i < 50; ++i, ++c) {
-		if (i % 2 == 0)
-			snprintf(buf, 512, "item-long-%d", i);
-		else if (i % 6 == 0)
-			snprintf(buf, 512, "herpderp-%d", i);
-		else if (i % 7 == 0)
-			snprintf(buf, 512, "ksdfsdjhfsdf-%d", i);
-		else
-			snprintf(buf, 512, "hi-%d", i);
-		if (c > '~') c = '0';
-		sprintf(smallbuf, "%c", c);
-		dx = draw_command(drw, dx, dy, buf, smallbuf) + 20;
-		if (dx >= mw) {
-			dx = 0;
-			dy += bh;
-		}
+		colw = MAX(draw_command(drw, x, y, cmd) + 20, colw);
 	}
 }
 
+/* static void */
+/* draw_tree_horizontal(Drw *drw, struct command *cmds, int x, int y, int w, int h) { */
+/* 	int i, dx = x, dy = y; */
+
+/* 	drw_setscheme(drw, &schemes[SchemeNorm].bg_clr, */
+/* 		      &schemes[SchemeNorm].bg_clr); */
+/* 	drw_rect(drw, 0, 0, w, h, 1, 1); */
+
+/* 	int c = '0'; */
+/* 	for (i = 0; i < 50; ++i, ++c) { */
+/* 		if (i % 2 == 0) */
+/* 			snprintf(buf, 512, "item-long-%d", i); */
+/* 		else if (i % 6 == 0) */
+/* 			snprintf(buf, 512, "herpderp-%d", i); */
+/* 		else if (i % 7 == 0) */
+/* 			snprintf(buf, 512, "ksdfsdjhfsdf-%d", i); */
+/* 		else */
+/* 			snprintf(buf, 512, "hi-%d", i); */
+/* 		if (c > '~') c = '0'; */
+/* 		sprintf(smallbuf, "%c", c); */
+/* 		dx = draw_command(drw, dx, dy, cmd) + 20; */
+/* 		if (dx >= mw) { */
+/* 			dx = 0; */
+/* 			dy += bh; */
+/* 		} */
+/* 	} */
+/* } */
+
 static void
 draw_tree(Drw *drw, int x, int y, int w, int h) {
 	if (!drw)
 		return;
 
 	/* draw_tree_horizontal(drw, x, y, w, h); */
-	draw_tree_vertical(drw, x, y, w, h);
+	draw_tree_vertical(drw, rootcmds, x, y, w, h);
 
 	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
 	XSync(drw->dpy, False);
-- 
cgit v1.2.3