From 8ad66e8f677b3510335d99a313307c7d9593855f Mon Sep 17 00:00:00 2001
From: "Anselm R. Garbe" <garbeam@wmii.de>
Date: Thu, 22 Jun 2006 12:00:18 +0200
Subject: [PATCH] renamed blitz_draw_input into blitz_draw_label, now
 implementing blitz_draw_input

---
 cmd/wm/bar.c    |  2 +-
 cmd/wm/frame.c  |  6 +++---
 cmd/wmiimenu.c  | 10 +++++-----
 liblitz/blitz.h |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmd/wm/bar.c b/cmd/wm/bar.c
index 3634a2dc..18762f89 100644
--- a/cmd/wm/bar.c
+++ b/cmd/wm/bar.c
@@ -134,7 +134,7 @@ draw_bar()
 		for(; b; b=b->next) {
 			if(b == rbar)
 				b->brush.align = EAST;
-			blitz_draw_input(&b->brush, b->text);
+			blitz_draw_label(&b->brush, b->text);
 		}
 MapBar:
 	XCopyArea(blz.display, bbrush.drawable, barwin, bbrush.gc, 0, 0,
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
index 348355ff..24018fc8 100644
--- a/cmd/wm/frame.c
+++ b/cmd/wm/frame.c
@@ -173,9 +173,9 @@ draw_frame(Frame *f)
 	f->titlebar.rect.width = f->rect.width - (f->tagbar.rect.width + f->posbar.rect.width);
 
 	blitz_draw_tile(&f->tile);
-	blitz_draw_input(&f->tagbar, f->client->tags);
-	blitz_draw_input(&f->titlebar, f->client->name);
-	blitz_draw_input(&f->posbar, buf);
+	blitz_draw_label(&f->tagbar, f->client->tags);
+	blitz_draw_label(&f->titlebar, f->client->name);
+	blitz_draw_label(&f->posbar, buf);
 }
 
 void
diff --git a/cmd/wmiimenu.c b/cmd/wmiimenu.c
index 4370e0cd..a4c146b6 100644
--- a/cmd/wmiimenu.c
+++ b/cmd/wmiimenu.c
@@ -142,13 +142,13 @@ draw_menu()
 		cmdw = cwidth;
 		if(cmdw && item.size)
 			brush.rect.width = cmdw;
-		blitz_draw_input(&brush, text);
+		blitz_draw_label(&brush, text);
 	}
 	else {
 		cmdw = twidth;
 		brush.color = selcolor;
 		brush.rect.width = cmdw;
-		blitz_draw_input(&brush, title);
+		blitz_draw_label(&brush, title);
 	}
 	offx += brush.rect.width;
 
@@ -158,7 +158,7 @@ draw_menu()
 		brush.rect.x = offx;
 		brush.rect.width = seek;
 		offx += brush.rect.width;
-		blitz_draw_input(&brush, prevoff < curroff ? "<" : nil);
+		blitz_draw_label(&brush, prevoff < curroff ? "<" : nil);
 
 		/* determine maximum items */
 		for(i = curroff; i < nextoff; i++) {
@@ -171,14 +171,14 @@ draw_menu()
 				brush.color = selcolor;
 			else
 				brush.color = normcolor;
-			blitz_draw_input(&brush, item.data[i]);
+			blitz_draw_label(&brush, item.data[i]);
 			offx += brush.rect.width;
 		}
 
 		brush.color = normcolor;
 		brush.rect.x = irect.width - seek;
 		brush.rect.width = seek;
-		blitz_draw_input(&brush, item.size > nextoff ? ">" : nil);
+		blitz_draw_label(&brush, item.size > nextoff ? ">" : nil);
 	}
 	XCopyArea(blz.display, brush.drawable, win, brush.gc, 0, 0, irect.width,
 			irect.height, 0, 0);
diff --git a/liblitz/blitz.h b/liblitz/blitz.h
index b482cdef..5bfe4a13 100644
--- a/liblitz/blitz.h
+++ b/liblitz/blitz.h
@@ -72,7 +72,8 @@ struct BlitzInput {
 int blitz_loadcolor(Blitz *blitz, BlitzColor *c);
 
 /* brush.c */
-void blitz_draw_input(BlitzBrush *b, char *text);
+void blitz_draw_label(BlitzBrush *b, char *text);
+void blitz_draw_input(BlitzBrush *b, BlitzInput *input);
 void blitz_draw_tile(BlitzBrush *b);
 
 /* font.c */