#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))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define UTF8_CODEPOINT(c) (((c) & 0xc0) != 0x80)
typedef struct Item Item;
struct Item {
static void insert(const char *s, ssize_t n);
static void keypress(XKeyEvent *ev);
static void match(void);
+static size_t nextrune(int incr);
static void paste(void);
static void readstdin(void);
static void run(void);
static void usage(void);
static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int lines = 0;
+static int promptw;
static size_t cursor = 0;
static const char *font = NULL;
static const char *prompt = NULL;
static const char *normfgcolor = "#000000";
static const char *selbgcolor = "#0066ff";
static const char *selfgcolor = "#ffffff";
-static unsigned int bh, mw, mh;
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int promptw;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Atom utf8;
if(lines > 0)
n = lines * bh;
else
- n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
+ n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
for(i = 0, next = curr; next; next = next->right)
- if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), mw/3)) > n)
+ if((i += (lines > 0) ? bh : dc_textw(dc, next->text)) > n)
break;
for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
- if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), mw/3)) > n)
+ if((i += (lines > 0) ? bh : dc_textw(dc, prev->left->text)) > n)
break;
}
dc->x = 0;
dc->y = 0;
dc->h = bh;
- drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+ dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
if(prompt) {
dc->w = promptw;
- drawtext(dc, prompt, selcol);
+ dc_drawtext(dc, prompt, selcol);
dc->x = dc->w;
}
dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
- drawtext(dc, text, normcol);
- if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
- drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+ dc_drawtext(dc, text, normcol);
+ if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+ dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, 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_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
}
}
else if(matches) {
dc->x += inputw;
- dc->w = textw(dc, "<");
+ dc->w = dc_textw(dc, "<");
if(curr->left)
- drawtext(dc, "<", normcol);
+ dc_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 = dc_textw(dc, item->text);
+ dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
}
- dc->w = textw(dc, ">");
+ dc->w = dc_textw(dc, ">");
dc->x = mw - dc->w;
if(next)
- drawtext(dc, ">", normcol);
+ dc_drawtext(dc, ">", normcol);
}
- commitdraw(dc, win, mw, mh);
+ dc_map(dc, win, mw, mh);
}
char *
void
insert(const char *s, ssize_t n) {
- memmove(text + cursor + n, text + cursor, sizeof text - cursor - n);
+ if(strlen(text) + n > sizeof text - 1)
+ return;
+ memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
if(n > 0)
memcpy(text + cursor, s, n);
cursor += n;
void
keypress(XKeyEvent *ev) {
char buf[32];
- int n;
size_t len;
KeySym ksym;
ksym = XK_Up;
break;
case XK_u: /* delete left */
- insert(NULL, -cursor);
+ insert(NULL, 0 - cursor);
break;
case XK_w: /* delete word */
- if(cursor == 0)
- return;
- n = 0;
- while(cursor - n++ > 0 && text[cursor - n] == ' ');
- while(cursor - n++ > 0 && text[cursor - n] != ' ');
- insert(NULL, 1-n);
+ while(cursor > 0 && text[nextrune(-1)] == ' ')
+ insert(NULL, nextrune(-1) - cursor);
+ while(cursor > 0 && text[nextrune(-1)] != ' ')
+ insert(NULL, nextrune(-1) - cursor);
break;
- case XK_y: /* paste selection */
- XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
- return;
}
}
switch(ksym) {
default:
if(isprint(*buf))
- insert(buf, MIN(strlen(buf), sizeof text - cursor));
- break;
- case XK_BackSpace:
- if(cursor == 0)
- return;
- for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
- insert(NULL, -n);
+ insert(buf, strlen(buf));
break;
case XK_Delete:
if(cursor == len)
return;
- for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++);
- cursor += n;
- insert(NULL, -n);
+ cursor = nextrune(+1);
+ case XK_BackSpace:
+ if(cursor > 0)
+ insert(NULL, nextrune(-1) - cursor);
break;
case XK_End:
if(cursor < len) {
sel = curr = matches;
calcoffsets();
break;
+ case XK_Insert: /* paste selection */
+ if(ev->state & ShiftMask)
+ XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+ return;
case XK_Left:
if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
- while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+ cursor = nextrune(-1);
break;
}
else if(lines > 0)
return;
case XK_Up:
- if(!sel || !sel->left)
- return;
- if((sel = sel->left)->right == curr) {
+ if(sel && sel->left && (sel = sel->left)->right == curr) {
curr = prev;
calcoffsets();
}
exit(EXIT_SUCCESS);
case XK_Right:
if(cursor < len) {
- while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+ cursor = nextrune(+1);
break;
}
else if(lines > 0)
return;
case XK_Down:
- if(!sel || !sel->right)
- return;
- if((sel = sel->right) == next) {
+ if(sel && sel->right && (sel = sel->right) == next) {
curr = next;
calcoffsets();
}
calcoffsets();
}
+size_t
+nextrune(int incr) {
+ size_t n, len;
+
+ len = strlen(text);
+ for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+ return n;
+}
+
void
paste(void) {
char *p, *q;
unsigned long dl;
Atom da;
- XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True,
+ XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
XFree(p);
eprintf("cannot malloc %u bytes\n", sizeof *item);
if(!(item->text = strdup(buf)))
eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
- inputw = MAX(inputw, textw(dc, item->text));
item->next = item->left = item->right = NULL;
+ inputw = MAX(inputw, dc_textw(dc, item->text));
}
}
root = RootWindow(dc->dpy, screen);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
- normcol[ColBG] = getcolor(dc, normbgcolor);
- normcol[ColFG] = getcolor(dc, normfgcolor);
- selcol[ColBG] = getcolor(dc, selbgcolor);
- selcol[ColFG] = getcolor(dc, selfgcolor);
+ normcol[ColBG] = dc_color(dc, normbgcolor);
+ normcol[ColFG] = dc_color(dc, normfgcolor);
+ selcol[ColBG] = dc_color(dc, selbgcolor);
+ selcol[ColFG] = dc_color(dc, selfgcolor);
/* menu geometry */
bh = dc->font.height + 2;
+ lines = MAX(lines, 0);
mh = (lines + 1) * bh;
#ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) {
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
grabkeyboard();
- setcanvas(dc, mw, mh);
+ dc_resize(dc, mw, mh);
inputw = MIN(inputw, mw/3);
- promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+ promptw = prompt ? dc_textw(dc, prompt) : 0;
XMapRaised(dc->dpy, win);
text[0] = '\0';
match();
else
usage();
- dc = initdraw();
- initfont(dc, font);
+ dc = dc_init();
+ dc_font(dc, font);
readstdin();
setup();
run();
