X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=908f5481cc7fa7a3db73077f3e827e7d2dc2286d;hb=3c366bd73d1812845b0afc185ccaba9bbc871854;hp=5ae611f57658cff1f37790bc8d97109846b1c012;hpb=a5f31f570774ca1d4a504d8c13c96af0217635a7;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index 5ae611f..908f548 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,7 +10,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <draw.h>
+#include <dc.h>
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
@@ -124,7 +124,7 @@ drawmenu(void) {
 			dc_drawtext(dc, "<", normcol);
 		for(item = curr; item != next; item = item->right) {
 			dc->x += dc->w;
-			dc->w = MIN(dc_textw(dc, item->text), mw - dc->x);
+			dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">"));
 			dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
 		dc->w = dc_textw(dc, ">");
@@ -230,7 +230,7 @@ keypress(XKeyEvent *ev) {
 	}
 	switch(ksym) {
 	default:
-		if(isprint(*buf))
+		if(!iscntrl(*buf))
 			insert(buf, strlen(buf));
 		break;
 	case XK_Delete: