#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <X11/Xatom.h>
#include <X11/Xlib.h>
+#include <X11/Xatom.h>
#include <X11/Xutil.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#include <draw.h>
#define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
+#define LINEH (dc->font.height + 2)
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define UTF8_CODEPOINT(c) (((c) & 0xc0) != 0x80)
};
static void appenditem(Item *item, Item **list, Item **last);
-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
+static void calcoffsets(void);
static char *cistrstr(const char *s, const char *sub);
static void drawmenu(void);
-static void drawmenuh(void);
-static void drawmenuv(void);
static void grabkeyboard(void);
static void insert(const char *s, ssize_t n);
-static void keypress(XKeyEvent *e);
+static void keypress(XKeyEvent *ev);
static void match(void);
static void paste(void);
static void readstdin(void);
static void setup(void);
static void usage(void);
-static char text[4096];
+static char text[BUFSIZ];
static size_t cursor = 0;
static const char *prompt = NULL;
static const char *normbgcolor = "#cccccc";
static unsigned int inputw = 0;
static unsigned int lines = 0;
static unsigned int mw, mh;
+static unsigned int promptw;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Atom utf8;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
-static void (*calcoffsets)(void) = calcoffsetsh;
void
appenditem(Item *item, Item **list, Item **last) {
}
void
-calcoffsetsh(void) {
- unsigned int w, x;
+calcoffsets(void) {
+ unsigned int i, n;
- w = (prompt ? textw(dc, prompt) : 0) + inputw + textw(dc, "<") + textw(dc, ">");
- for(x = w, next = curr; next; next = next->right)
- if((x += MIN(textw(dc, next->text), mw / 3)) > mw)
- break;
- for(x = w, prev = curr; prev && prev->left; prev = prev->left)
- if((x += MIN(textw(dc, prev->left->text), mw / 3)) > mw)
- break;
-}
+ if(lines > 0)
+ n = lines * LINEH;
+ else
+ n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
-void
-calcoffsetsv(void) {
- unsigned int i;
-
- next = prev = curr;
- for(i = 0; i < lines && next; i++)
- next = next->right;
- for(i = 0; i < lines && prev && prev->left; i++)
- prev = prev->left;
+ for(i = 0, next = curr; i <= n && next; next = next->right)
+ i += (lines > 0) ? LINEH : MIN(textw(dc, next->text), mw/3);
+
+ for(i = 0, prev = curr; i <= n && prev && prev->left; prev = prev->left)
+ i += (lines > 0) ? LINEH : MIN(textw(dc, prev->left->text), mw/3);
}
char *
void
drawmenu(void) {
+ int curpos;
+ Item *item;
+
dc->x = 0;
dc->y = 0;
+ dc->h = LINEH;
drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));
- dc->h = dc->font.height + 2;
- dc->y = topbar ? 0 : mh - dc->h;
- /* print prompt? */
+
if(prompt) {
- dc->w = textw(dc, prompt);
+ dc->w = promptw;
drawtext(dc, prompt, selcol);
dc->x = dc->w;
}
- dc->w = mw - dc->x;
- /* print input area */
- if(matches && lines == 0 && textw(dc, text) <= inputw)
- dc->w = inputw;
+ dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
drawtext(dc, text, normcol);
- drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, normcol));
- if(lines > 0)
- drawmenuv();
- else if(curr && (dc->w == inputw || curr->next))
- drawmenuh();
- commitdraw(dc, win);
-}
-
-void
-drawmenuh(void) {
- Item *item;
-
- dc->x += inputw;
- dc->w = textw(dc, "<");
- if(curr->left)
- drawtext(dc, "<", normcol);
- for(item = curr; item != next; item = item->right) {
- dc->x += dc->w;
- dc->w = MIN(textw(dc, item->text), mw / 3);
- drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+ drawrect(dc, curpos, 2, 1, dc->h - 4, FG(dc, normcol));
+
+ if(lines > 0) {
+ dc->w = mw - dc->x;
+ for(item = curr; item != next; item = item->right) {
+ dc->y += dc->h;
+ drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
}
- dc->w = textw(dc, ">");
- dc->x = mw - dc->w;
- if(next)
- drawtext(dc, ">", normcol);
-}
-
-void
-drawmenuv(void) {
- Item *item;
-
- dc->y = topbar ? dc->h : 0;
- dc->w = mw - dc->x;
- for(item = curr; item != next; item = item->right) {
- drawtext(dc, item->text, (item == sel) ? selcol : normcol);
- dc->y += dc->h;
+ else if(matches) {
+ dc->x += inputw;
+ dc->w = textw(dc, "<");
+ if(curr->left)
+ drawtext(dc, "<", normcol);
+ for(item = curr; item != next; item = item->right) {
+ dc->x += dc->w;
+ dc->w = MIN(textw(dc, item->text), mw/3);
+ drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
+ dc->w = textw(dc, ">");
+ dc->x = mw - dc->w;
+ if(next)
+ drawtext(dc, ">", normcol);
}
+ commitdraw(dc, win);
}
void
}
void
-keypress(XKeyEvent *e) {
- char buf[sizeof text];
+keypress(XKeyEvent *ev) {
+ char buf[32];
int n;
size_t len;
KeySym ksym;
len = strlen(text);
- XLookupString(e, buf, sizeof buf, &ksym, NULL);
- if(e->state & ControlMask) {
+ XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+ if(ev->state & ControlMask) {
switch(tolower(ksym)) {
default:
return;
case XK_c:
ksym = XK_Escape;
break;
+ case XK_d:
+ ksym = XK_Delete;
+ break;
case XK_e:
ksym = XK_End;
break;
ksym = XK_Tab;
break;
case XK_j:
- case XK_m:
ksym = XK_Return;
break;
case XK_k: /* delete right */
break;
case XK_y: /* paste selection */
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
- /* causes SelectionNotify event */
return;
}
}
switch(ksym) {
default:
- if(!iscntrl((int)*buf))
+ if(isprint(*buf))
insert(buf, MIN(strlen(buf), sizeof text - cursor));
break;
case XK_BackSpace:
case XK_Up:
if(!sel || !sel->left)
return;
- sel = sel->left;
- if(sel->right == curr) {
+ if((sel = sel->left)->right == curr) {
curr = prev;
calcoffsets();
}
break;
case XK_Return:
case XK_KP_Enter:
- fputs((sel && !(e->state & ShiftMask)) ? sel->text : text, stdout);
+ fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
fflush(stdout);
exit(EXIT_SUCCESS);
case XK_Right:
case XK_Down:
if(!sel || !sel->right)
return;
- sel = sel->right;
- if(sel == next) {
+ if((sel = sel->right) == next) {
curr = next;
calcoffsets();
}
void
match(void) {
- unsigned int len;
+ size_t len;
Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
len = strlen(text);
if(!(new = malloc(sizeof *new)))
eprintf("cannot malloc %u bytes\n", sizeof *new);
if(!(new->text = strdup(buf)))
- eprintf("cannot strdup %u bytes\n", strlen(buf));
+ eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
inputw = MAX(inputw, textw(dc, new->text));
new->next = new->left = new->right = NULL;
if(item)
selcol[ColBG] = getcolor(dc, selbgcolor);
selcol[ColFG] = getcolor(dc, selfgcolor);
- /* input window geometry */
- mh = (dc->font.height + 2) * (lines + 1);
+ /* menu geometry */
+ mh = (lines + 1) * LINEH;
#ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) {
int i, di;
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
mw = DisplayWidth(dc->dpy, screen);
}
-
- /* input window */
+ /* menu window */
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
- DefaultDepth(dc->dpy, screen), CopyFromParent,
- DefaultVisual(dc->dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+ DefaultDepth(dc->dpy, screen), CopyFromParent,
+ DefaultVisual(dc->dpy, screen),
+ CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
grabkeyboard();
- setcanvas(dc, win, mw, mh);
+ setcanvas(dc, mw, mh);
inputw = MIN(inputw, mw/3);
+ promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
XMapRaised(dc->dpy, win);
+ text[0] = '\0';
match();
}
else if(i == argc-1)
usage();
/* double flags */
- else if(!strcmp(argv[i], "-l")) {
- if((lines = atoi(argv[++i])) > 0)
- calcoffsets = calcoffsetsv;
- }
+ else if(!strcmp(argv[i], "-l"))
+ lines = atoi(argv[++i]);
else if(!strcmp(argv[i], "-p"))
prompt = argv[++i];
else if(!strcmp(argv[i], "-fn"))
- initfont(dc, argv[i++]);
+ initfont(dc, argv[++i]);
else if(!strcmp(argv[i], "-nb"))
normbgcolor = argv[++i];
else if(!strcmp(argv[i], "-nf"))
