static void grabkeyboard(void);
static void insert(const char *str, ssize_t n);
static void keypress(XKeyEvent *ev);
-static void match(Bool sub);
+static void match(void);
static size_t nextrune(int inc);
static void paste(void);
static void readstdin(void);
static char text[BUFSIZ] = "";
static int bh, mw, mh;
static int inputw, promptw;
-static int lines = 0;
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 lines = 0;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Atom utf8;
static Item *matches, *matchend;
static Item *prev, *curr, *next, *sel;
static Window win;
+static XIC xic;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
void
appenditem(Item *item, Item **list, Item **last) {
- if(!*last)
- *list = item;
- else
+ if(*last)
(*last)->right = item;
+ else
+ *list = item;
item->left = *last;
item->right = NULL;
if(n > 0)
memcpy(&text[cursor], str, n);
cursor += n;
- match(n > 0 && text[cursor] == '\0');
+ match();
}
void
keypress(XKeyEvent *ev) {
char buf[32];
- KeySym ksym;
+ int len;
+ KeySym ksym = NoSymbol;
+ Status status;
- XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+ len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+ if(status == XBufferOverflow)
+ return;
if(ev->state & ControlMask) {
KeySym lower, upper;
case XK_k: /* delete right */
text[cursor] = '\0';
- match(False);
+ match();
break;
case XK_u: /* delete left */
insert(NULL, 0 - cursor);
switch(ksym) {
default:
if(!iscntrl(*buf))
- insert(buf, strlen(buf));
+ insert(buf, len);
break;
case XK_Delete:
if(text[cursor] == '\0')
return;
cursor = nextrune(+1);
+ /* fallthrough */
case XK_BackSpace:
if(cursor == 0)
return;
return;
strncpy(text, sel->text, sizeof text);
cursor = strlen(text);
- match(True);
+ match();
break;
}
drawmenu();
}
void
-match(Bool sub) {
- size_t len = strlen(text);
- Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- Item *item, *lnext;
-
- lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
- for(item = sub ? matches : items; item && item->text; item = lnext) {
- lnext = sub ? item->right : item + 1;
- if(!fstrncmp(text, item->text, len + 1))
- appenditem(item, &lexact, &exactend);
- else if(!fstrncmp(text, item->text, len))
+match(void) {
+ static char **tokv = NULL;
+ static int tokn = 0;
+
+ char buf[sizeof text], *s;
+ int i, tokc = 0;
+ size_t len;
+ Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+ strcpy(buf, text);
+ for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
+ if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+ eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+ len = tokc ? strlen(tokv[0]) : 0;
+
+ matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+ for(item = items; item && item->text; item++) {
+ for(i = 0; i < tokc; i++)
+ if(!fstrstr(item->text, tokv[i]))
+ break;
+ if(i != tokc)
+ continue;
+ if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
+ appenditem(item, &matches, &matchend);
+ else if(!fstrncmp(tokv[0], item->text, len))
appenditem(item, &lprefix, &prefixend);
- else if(fstrstr(item->text, text))
+ else
appenditem(item, &lsubstr, &substrend);
}
- matches = lexact;
- matchend = exactend;
-
if(lprefix) {
- if(matchend) {
+ if(matches) {
matchend->right = lprefix;
lprefix->left = matchend;
}
matchend = prefixend;
}
if(lsubstr) {
- if(matchend) {
+ if(matches) {
matchend->right = lsubstr;
lsubstr->left = matchend;
}
if(items)
items[i].text = NULL;
inputw = maxstr ? textw(dc, maxstr) : 0;
+ lines = MIN(lines, i);
}
void
run(void) {
XEvent ev;
- while(!XNextEvent(dc->dpy, &ev))
+ while(!XNextEvent(dc->dpy, &ev)) {
+ if(XFilterEvent(&ev, win))
+ continue;
switch(ev.type) {
case Expose:
if(ev.xexpose.count == 0)
XRaiseWindow(dc->dpy, win);
break;
}
+ }
}
void
setup(void) {
int x, y, screen = DefaultScreen(dc->dpy);
Window root = RootWindow(dc->dpy, screen);
- XSetWindowAttributes wa;
+ XSetWindowAttributes swa;
+ XIM xim;
#ifdef XINERAMA
int n;
XineramaScreenInfo *info;
if((info = XineramaQueryScreens(dc->dpy, &n))) {
int i, di;
unsigned int du;
- Window dw;
+ Window w, dw;
+ XWindowAttributes wa;
- XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
+ XGetInputFocus(dc->dpy, &w, &di);
+ if(w != root && w != PointerRoot && w != None && XGetWindowAttributes(dc->dpy, w, &wa))
+ XTranslateCoordinates(dc->dpy, w, root, wa.x, wa.y, &x, &y, &dw);
+ else
+ XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
for(i = 0; i < n-1; i++)
if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
break;
}
promptw = prompt ? textw(dc, prompt) : 0;
inputw = MIN(inputw, mw/3);
- match(False);
+ match();
/* menu window */
- wa.override_redirect = True;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+ swa.override_redirect = True;
+ swa.background_pixmap = ParentRelative;
+ swa.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);
+ CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
+
+ /* input methods */
+ xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
+ xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+ XNClientWindow, win, XNFocusWindow, win, NULL);
XMapRaised(dc->dpy, win);
resizedc(dc, mw, mh);