#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))
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, ">");
}
switch(ksym) {
default:
- if(isprint(*buf))
+ if(!iscntrl(*buf))
insert(buf, strlen(buf));
break;
case XK_Delete: