From: Connor Lane Smith <cls@lubutu.com>
Date: Fri, 30 Jul 2010 09:25:55 +0000 (+0100)
Subject: new libdraw
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=115c01b74ebd57382679bec5c6e1ff5604370cbf;p=dmenu.git

new libdraw
---

diff --git a/dinput.c b/dinput.c
index e861afc..4bbc7bc 100644
--- a/dinput.c
+++ b/dinput.c
@@ -34,12 +34,14 @@ drawbar(void)
 	/* print prompt? */
 	if(prompt) {
 		dc.w = promptw;
+		drawbox(&dc, selcol);
 		drawtext(&dc, prompt, selcol);
 		dc.x += dc.w;
 	}
 	dc.w = mw - dc.x;
 	drawtext(&dc, text, normcol);
-	drawcursor(&dc, text, cursor, normcol);
+	drawline(&dc, textnw(&dc, text, cursor) + dc.font.height/2, 2, 1,
+			dc.font.height-2, normcol);
 	commitdraw(&dc, win);
 }
 
diff --git a/dmenu.c b/dmenu.c
index 2c1867c..076cffe 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -24,7 +24,7 @@ static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
 static void dinput(void);
-static void drawitem(char *s, unsigned long col[ColLast]);
+static void drawitem(const char *s, unsigned long col[ColLast]);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static void match(void);
@@ -140,6 +140,7 @@ drawbar(void) {
 	/* print prompt? */
 	if(prompt) {
 		dc.w = promptw;
+		drawbox(&dc, selcol);
 		drawtext(&dc, prompt, selcol);
 		dc.x += dc.w;
 	}
@@ -156,7 +157,7 @@ drawbar(void) {
 }
 
 void
-drawitem(char *s, unsigned long col[ColLast]) {
+drawitem(const char *s, unsigned long col[ColLast]) {
 	drawbox(&dc, col);
 	drawtext(&dc, s, col);
 }