Updates dwm, st, dmenu, slock, and dwmblocks

6 files changed, 1296 insertions, 893 deletions

diff --git a/dmenu/config.h b/dmenu/config.h
index acc8457..1ac8c72 100644
--- a/dmenu/config.h
+++ b/dmenu/config.h
@@ -1,30 +1,32 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
 
-static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
+static int topbar = 1; /* -b  option; if 0, dmenu appears at bottom     */
+static int fuzzy = 1;  /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
-	"monospace:size=10",
-	"NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"
-};
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"};
 static const unsigned int bgalpha = 0xe0;
 static const unsigned int fgalpha = OPAQUE;
-static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
+static const char *prompt =
+    NULL; /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
-	/*     fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#222222" },
-	[SchemeSel] = { "#eeeeee", "#005577" },
-	[SchemeOut] = { "#000000", "#00ffff" },
+    /*     fg         bg       */
+    [SchemeNorm] = {"#bbbbbb", "#222222"},
+    [SchemeSel] = {"#eeeeee", "#005577"},
+    [SchemeOut] = {"#000000", "#00ffff"},
+    [SchemeCursor] = {"#222222", "#bbbbbb"},
 };
 static const unsigned int alphas[SchemeLast][2] = {
-	/*		fgalpha		bgalphga	*/
-	[SchemeNorm] = { fgalpha, bgalpha },
-	[SchemeSel] = { fgalpha, bgalpha },
-	[SchemeOut] = { fgalpha, bgalpha },
+    /*		fgalpha		bgalphga	*/
+    [SchemeNorm] = {fgalpha, bgalpha},
+    [SchemeSel] = {fgalpha, bgalpha},
+    [SchemeOut] = {fgalpha, bgalpha},
 };
 
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
-static unsigned int lines      = 0;
+static unsigned int lines = 0;
 
 /*
  * Characters not considered part of a word while deleting words
@@ -32,3 +34,13 @@ static unsigned int lines      = 0;
  */
 static const char worddelimiters[] = " ";
 
+/*
+ * -vi option; if nonzero, vi mode is always enabled and can be
+ * accessed with the global_esc keysym + mod mask
+ */
+static unsigned int vi_mode = 1;
+static unsigned int start_mode = 0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
+static Key global_esc = {XK_c, ControlMask}; /* escape key when vi mode is not enabled explicitly */
+static Key quit_keys[] = {
+    /* keysym	modifier */
+    {XK_q, 0}};
diff --git a/dmenu/config.h.bak b/dmenu/config.h.bak
new file mode 100644
index 0000000..10c2024
--- /dev/null
+++ b/dmenu/config.h.bak
@@ -0,0 +1,48 @@
+/* See LICENSE file for copyright and license details. */
+/* Default settings; can be overriden by command line. */
+
+static int topbar = 1; /* -b  option; if 0, dmenu appears at bottom     */
+static int fuzzy = 1;  /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
+/* -fn option overrides fonts[0]; default X11 font or font set */
+static const char *fonts[] = {
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"};
+static const unsigned int bgalpha = 0xe0;
+static const unsigned int fgalpha = OPAQUE;
+static const char *prompt =
+    NULL; /* -p  option; prompt to the left of input field */
+static const char *colors[SchemeLast][2] = {
+    /*     fg         bg       */
+    [SchemeNorm] = {"#bbbbbb", "#222222"},
+    [SchemeSel] = {"#eeeeee", "#005577"},
+    [SchemeOut] = {"#000000", "#00ffff"},
+    [SchemeCursor] = {"#222222", "#bbbbbb"},
+};
+static const unsigned int alphas[SchemeLast][2] = {
+    /*		fgalpha		bgalphga	*/
+    [SchemeNorm] = {fgalpha, bgalpha},
+    [SchemeSel] = {fgalpha, bgalpha},
+    [SchemeOut] = {fgalpha, bgalpha},
+};
+
+/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
+static unsigned int lines = 0;
+
+/*
+ * Characters not considered part of a word while deleting words
+ * for example: " /?\"&[]"
+ */
+static const char worddelimiters[] = " ";
+
+/*
+ * -vi option; if nonzero, vi mode is always enabled and can be
+ * accessed with the global_esc keysym + mod mask
+ */
+static unsigned int vi_mode = 1;
+static unsigned int start_mode =
+    0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
+static Key global_esc = {
+    XK_c, ControlMask}; /* escape key when vi mode is not enabled explicitly */
+static Key quit_keys[] = {
+    /* keysym	modifier */
+    {XK_q, 0}};
diff --git a/dmenu/config.mk b/dmenu/config.mk
index 8531fb9..1641c06 100644
--- a/dmenu/config.mk
+++ b/dmenu/config.mk
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lXrender
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lXrender -lm
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
diff --git a/dmenu/dmenu.1 b/dmenu/dmenu.1
index 4c87074..fc1eb5e 100644
--- a/dmenu/dmenu.1
+++ b/dmenu/dmenu.1
@@ -8,6 +8,12 @@ dmenu \- dynamic menu
 .IR lines ]
 .RB [ \-m
 .IR monitor ]
+.RB [ \-x
+.IR xoffset ]
+.RB [ \-y
+.IR yoffset ]
+.RB [ \-z
+.IR width ]
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
@@ -60,6 +66,24 @@ dmenu lists items vertically, with the given number of lines.
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 from 0.
 .TP
+.BI \-x " xoffset"
+dmenu is placed at this offset measured from the left side of the monitor.
+Can be negative.
+If option
+.B \-m
+is present, the measurement will use the given monitor.
+.TP
+.BI \-y " yoffset"
+dmenu is placed at this offset measured from the top of the monitor.  If the
+.B \-b
+option is used, the offset is measured from the bottom.  Can be negative.
+If option
+.B \-m
+is present, the measurement will use the given monitor.
+.TP
+.BI \-z " width"
+sets the width of the dmenu window.
+.TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP
diff --git a/dmenu/dmenu.c b/dmenu/dmenu.c
index 34d0943..9c67296 100644
--- a/dmenu/dmenu.c
+++ b/dmenu/dmenu.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,8 +9,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
@@ -21,26 +22,43 @@
 #include "util.h"
 
 /* macros */
-#define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
-                             && MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
-#define LENGTH(X)             (sizeof X / sizeof X[0])
-#define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
+#define INTERSECT(x, y, w, h, r)                                               \
+  (MAX(0, MIN((x) + (w), (r).x_org + (r).width) - MAX((x), (r).x_org)) &&      \
+   MAX(0, MIN((y) + (h), (r).y_org + (r).height) - MAX((y), (r).y_org)))
+#define LENGTH(X) (sizeof X / sizeof X[0])
+#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
 
 /* define opaqueness */
 #define OPAQUE 0xFFU
 
 /* enums */
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+enum {
+  SchemeNorm,
+  SchemeSel,
+  SchemeOut,
+  SchemeCursor,
+  SchemeLast
+}; /* color schemes */
 
 struct item {
-	char *text;
-	struct item *left, *right;
-	int out;
+  char *text;
+  struct item *left, *right;
+  int out;
+  double distance;
 };
 
+typedef struct {
+  KeySym ksym;
+  unsigned int state;
+} Key;
+
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
+static int dmx = 6; /* put dmenu at this x offset */
+static int dmy = 6; /* put dmenu at this y offset (measured from the bottom if
+                       topbar is 0) */
+static unsigned int dmw = 0; /* make dmenu this wide */
 static int inputw = 0, promptw, passwd = 0;
 static int lrpad; /* sum of left and right padding */
 static int reject_no_match = 0;
@@ -49,6 +67,7 @@ static struct item *items = NULL;
 static struct item *matches, *matchend;
 static struct item *prev, *curr, *next, *sel;
 static int mon = -1, screen;
+static unsigned int using_vi_mode = 0;
 
 static Atom clip, utf8;
 static Display *dpy;
@@ -64,934 +83,1234 @@ static Clr *scheme[SchemeLast];
 
 #include "config.h"
 
-static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
-static char *(*fstrstr)(const char *, const char *) = strstr;
-
-
-static void
-xinitvisual()
-{
-	XVisualInfo *infos;
-	XRenderPictFormat *fmt;
-	int nitems;
-	int i;
-
-	XVisualInfo tpl = {
-		.screen = screen,
-		.depth = 32,
-		.class = TrueColor
-	};
-
-	long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-
-	infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-	visual = NULL;
-
-	for (i = 0; i < nitems; i++){
-		fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-		if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-			visual = infos[i].visual;
-			depth = infos[i].depth;
-			cmap = XCreateColormap(dpy, root, visual, AllocNone);
-			usergb = 1;
-			break;
-		}
-	}
-
-	XFree(infos);
-
-	if (! visual) {
-		visual = DefaultVisual(dpy, screen);
-		depth = DefaultDepth(dpy, screen);
-		cmap = DefaultColormap(dpy, screen);
-	}
+static char *cistrstr(const char *s, const char *sub);
+static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp;
+static char *(*fstrstr)(const char *, const char *) = cistrstr;
+
+static void xinitvisual() {
+  XVisualInfo *infos;
+  XRenderPictFormat *fmt;
+  int nitems;
+  int i;
+
+  XVisualInfo tpl = {.screen = screen, .depth = 32, .class = TrueColor};
+
+  long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
+
+  infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
+  visual = NULL;
+
+  for (i = 0; i < nitems; i++) {
+    fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
+    if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
+      visual = infos[i].visual;
+      depth = infos[i].depth;
+      cmap = XCreateColormap(dpy, root, visual, AllocNone);
+      usergb = 1;
+      break;
+    }
+  }
+
+  XFree(infos);
+
+  if (!visual) {
+    visual = DefaultVisual(dpy, screen);
+    depth = DefaultDepth(dpy, screen);
+    cmap = DefaultColormap(dpy, screen);
+  }
+}
+
+static void appenditem(struct item *item, struct item **list,
+                       struct item **last) {
+  if (*last)
+    (*last)->right = item;
+  else
+    *list = item;
+
+  item->left = *last;
+  item->right = NULL;
+  *last = item;
 }
 
-static void
-appenditem(struct item *item, struct item **list, struct item **last)
-{
-	if (*last)
-		(*last)->right = item;
-	else
-		*list = item;
-
-	item->left = *last;
-	item->right = NULL;
-	*last = item;
+static void calcoffsets(void) {
+  int i, n;
+
+  if (lines > 0)
+    n = lines * bh;
+  else
+    n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
+  /* calculate which items will begin the next page and previous page */
+  for (i = 0, next = curr; next; next = next->right)
+    if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
+      break;
+  for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
+    if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
+      break;
 }
 
-static void
-calcoffsets(void)
-{
-	int i, n;
-
-	if (lines > 0)
-		n = lines * bh;
-	else
-		n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
-	/* calculate which items will begin the next page and previous page */
-	for (i = 0, next = curr; next; next = next->right)
-		if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
-			break;
-	for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
-			break;
+static void cleanup(void) {
+  size_t i;
+
+  XUngrabKey(dpy, AnyKey, AnyModifier, root);
+  for (i = 0; i < SchemeLast; i++)
+    free(scheme[i]);
+  drw_free(drw);
+  XSync(dpy, False);
+  XCloseDisplay(dpy);
 }
 
-static void
-cleanup(void)
-{
-	size_t i;
-
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	for (i = 0; i < SchemeLast; i++)
-		free(scheme[i]);
-	drw_free(drw);
-	XSync(dpy, False);
-	XCloseDisplay(dpy);
+static char *cistrstr(const char *s, const char *sub) {
+  size_t len;
+
+  for (len = strlen(sub); *s; s++)
+    if (!strncasecmp(s, sub, len))
+      return (char *)s;
+  return NULL;
 }
 
-static char *
-cistrstr(const char *s, const char *sub)
-{
-	size_t len;
+static int drawitem(struct item *item, int x, int y, int w) {
+  if (item == sel)
+    drw_setscheme(drw, scheme[SchemeSel]);
+  else if (item->out)
+    drw_setscheme(drw, scheme[SchemeOut]);
+  else
+    drw_setscheme(drw, scheme[SchemeNorm]);
 
-	for (len = strlen(sub); *s; s++)
-		if (!strncasecmp(s, sub, len))
-			return (char *)s;
-	return NULL;
+  return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
 }
 
-static int
-drawitem(struct item *item, int x, int y, int w)
-{
-	if (item == sel)
-		drw_setscheme(drw, scheme[SchemeSel]);
-	else if (item->out)
-		drw_setscheme(drw, scheme[SchemeOut]);
-	else
-		drw_setscheme(drw, scheme[SchemeNorm]);
-
-	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+static void drawmenu(void) {
+  unsigned int curpos;
+  struct item *item;
+  int x = 0, y = 0, w;
+  char *censort;
+
+  drw_setscheme(drw, scheme[SchemeNorm]);
+  drw_rect(drw, 0, 0, mw, mh, 1, 1);
+
+  if (prompt && *prompt) {
+    drw_setscheme(drw, scheme[SchemeSel]);
+    x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
+  }
+  /* draw input field */
+  w = (lines > 0 || !matches) ? mw - x : inputw;
+  drw_setscheme(drw, scheme[SchemeNorm]);
+  if (passwd) {
+    censort = ecalloc(1, sizeof(text));
+    memset(censort, '.', strlen(text));
+    drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
+    free(censort);
+  } else
+    drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
+
+  curpos = TEXTW(text) - TEXTW(&text[cursor]);
+  curpos += lrpad / 2 - 1;
+  if (using_vi_mode && text[0] != '\0') {
+    drw_setscheme(drw, scheme[SchemeCursor]);
+    char vi_char[] = {text[cursor], '\0'};
+    drw_text(drw, x + curpos, 0, TEXTW(vi_char) - lrpad, bh, 0, vi_char, 0);
+  } else if (using_vi_mode) {
+    drw_setscheme(drw, scheme[SchemeNorm]);
+    drw_rect(drw, x + curpos, 2, lrpad / 2, bh - 4, 1, 0);
+  } else if (curpos < w) {
+    drw_setscheme(drw, scheme[SchemeNorm]);
+    drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
+  }
+
+  if (lines > 0) {
+    /* draw vertical list */
+    for (item = curr; item != next; item = item->right)
+      drawitem(item, x, y += bh, mw - x);
+  } else if (matches) {
+    /* draw horizontal list */
+    x += inputw;
+    w = TEXTW("<");
+    if (curr->left) {
+      drw_setscheme(drw, scheme[SchemeNorm]);
+      drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
+    }
+    x += w;
+    for (item = curr; item != next; item = item->right)
+      x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
+    if (next) {
+      w = TEXTW(">");
+      drw_setscheme(drw, scheme[SchemeNorm]);
+      drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
+    }
+  }
+  drw_map(drw, win, 0, 0, mw, mh);
 }
 
-static void
-drawmenu(void)
-{
-	unsigned int curpos;
-	struct item *item;
-	int x = 0, y = 0, w;
- char *censort;
-
-	drw_setscheme(drw, scheme[SchemeNorm]);
-	drw_rect(drw, 0, 0, mw, mh, 1, 1);
-
-	if (prompt && *prompt) {
-		drw_setscheme(drw, scheme[SchemeSel]);
-		x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
-	}
-	/* draw input field */
-	w = (lines > 0 || !matches) ? mw - x : inputw;
-	drw_setscheme(drw, scheme[SchemeNorm]);
-	if (passwd) {
-	        censort = ecalloc(1, sizeof(text));
-		memset(censort, '.', strlen(text));
-		drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
-		free(censort);
-	} else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
-
-	curpos = TEXTW(text) - TEXTW(&text[cursor]);
-	if ((curpos += lrpad / 2 - 1) < w) {
-		drw_setscheme(drw, scheme[SchemeNorm]);
-		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
-	}
-
-	if (lines > 0) {
-		/* draw vertical list */
-		for (item = curr; item != next; item = item->right)
-			drawitem(item, x, y += bh, mw - x);
-	} else if (matches) {
-		/* draw horizontal list */
-		x += inputw;
-		w = TEXTW("<");
-		if (curr->left) {
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
-		}
-		x += w;
-		for (item = curr; item != next; item = item->right)
-			x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
-		if (next) {
-			w = TEXTW(">");
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
-		}
-	}
-	drw_map(drw, win, 0, 0, mw, mh);
+static void grabfocus(void) {
+  struct timespec ts = {.tv_sec = 0, .tv_nsec = 10000000};
+  Window focuswin;
+  int i, revertwin;
+
+  for (i = 0; i < 100; ++i) {
+    XGetInputFocus(dpy, &focuswin, &revertwin);
+    if (focuswin == win)
+      return;
+    XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+    nanosleep(&ts, NULL);
+  }
+  die("cannot grab focus");
 }
 
-static void
-grabfocus(void)
-{
-	struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
-	Window focuswin;
-	int i, revertwin;
-
-	for (i = 0; i < 100; ++i) {
-		XGetInputFocus(dpy, &focuswin, &revertwin);
-		if (focuswin == win)
-			return;
-		XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
-		nanosleep(&ts, NULL);
-	}
-	die("cannot grab focus");
+static void grabkeyboard(void) {
+  struct timespec ts = {.tv_sec = 0, .tv_nsec = 1000000};
+  int i;
+
+  if (embed)
+    return;
+  /* try to grab keyboard, we may have to wait for another process to ungrab */
+  for (i = 0; i < 1000; i++) {
+    if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
+                      GrabModeAsync, CurrentTime) == GrabSuccess)
+      return;
+    nanosleep(&ts, NULL);
+  }
+  die("cannot grab keyboard");
 }
 
-static void
-grabkeyboard(void)
-{
-	struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
-	int i;
-
-	if (embed)
-		return;
-	/* try to grab keyboard, we may have to wait for another process to ungrab */
-	for (i = 0; i < 1000; i++) {
-		if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
-		                  GrabModeAsync, CurrentTime) == GrabSuccess)
-			return;
-		nanosleep(&ts, NULL);
-	}
-	die("cannot grab keyboard");
+int compare_distance(const void *a, const void *b) {
+  struct item *da = *(struct item **)a;
+  struct item *db = *(struct item **)b;
+
+  if (!db)
+    return 1;
+  if (!da)
+    return -1;
+
+  return da->distance == db->distance  ? 0
+         : da->distance < db->distance ? -1
+                                       : 1;
 }
 
-static void
-match(void)
-{
-	static char **tokv = NULL;
-	static int tokn = 0;
-
-	char buf[sizeof text], *s;
-	int i, tokc = 0;
-	size_t len, textsize;
-	struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
-
-	strcpy(buf, text);
-	/* separate input text into tokens to be matched individually */
-	for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
-		if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-			die("cannot realloc %u bytes:", tokn * sizeof *tokv);
-	len = tokc ? strlen(tokv[0]) : 0;
-
-	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
-	textsize = strlen(text) + 1;
-	for (item = items; item && item->text; item++) {
-		for (i = 0; i < tokc; i++)
-			if (!fstrstr(item->text, tokv[i]))
-				break;
-		if (i != tokc) /* not all tokens match */
-			continue;
-		/* exact matches go first, then prefixes, then substrings */
-		if (!tokc || !fstrncmp(text, item->text, textsize))
-			appenditem(item, &matches, &matchend);
-		else if (!fstrncmp(tokv[0], item->text, len))
-			appenditem(item, &lprefix, &prefixend);
-		else
-			appenditem(item, &lsubstr, &substrend);
-	}
-	if (lprefix) {
-		if (matches) {
-			matchend->right = lprefix;
-			lprefix->left = matchend;
-		} else
-			matches = lprefix;
-		matchend = prefixend;
-	}
-	if (lsubstr) {
-		if (matches) {
-			matchend->right = lsubstr;
-			lsubstr->left = matchend;
-		} else
-			matches = lsubstr;
-		matchend = substrend;
-	}
-	curr = sel = matches;
-	calcoffsets();
+void fuzzymatch(void) {
+  /* bang - we have so much memory */
+  struct item *it;
+  struct item **fuzzymatches = NULL;
+  char c;
+  int number_of_matches = 0, i, pidx, sidx, eidx;
+  int text_len = strlen(text), itext_len;
+
+  matches = matchend = NULL;
+
+  /* walk through all items */
+  for (it = items; it && it->text; it++) {
+    if (text_len) {
+      itext_len = strlen(it->text);
+      pidx = 0;         /* pointer */
+      sidx = eidx = -1; /* start of match, end of match */
+      /* walk through item text */
+      for (i = 0; i < itext_len && (c = it->text[i]); i++) {
+        /* fuzzy match pattern */
+        if (!fstrncmp(&text[pidx], &c, 1)) {
+          if (sidx == -1)
+            sidx = i;
+          pidx++;
+          if (pidx == text_len) {
+            eidx = i;
+            break;
+          }
+        }
+      }
+      /* build list of matches */
+      if (eidx != -1) {
+        /* compute distance */
+        /* add penalty if match starts late (log(sidx+2))
+         * add penalty for long a match without many matching characters */
+        it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
+        /* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
+        appenditem(it, &matches, &matchend);
+        number_of_matches++;
+      }
+    } else {
+      appenditem(it, &matches, &matchend);
+    }
+  }
+
+  if (number_of_matches) {
+    /* initialize array with matches */
+    if (!(fuzzymatches =
+              realloc(fuzzymatches, number_of_matches * sizeof(struct item *))))
+      die("cannot realloc %u bytes:",
+          number_of_matches * sizeof(struct item *));
+    for (i = 0, it = matches; it && i < number_of_matches;
+         i++, it = it->right) {
+      fuzzymatches[i] = it;
+    }
+    /* sort matches according to distance */
+    qsort(fuzzymatches, number_of_matches, sizeof(struct item *),
+          compare_distance);
+    /* rebuild list of matches */
+    matches = matchend = NULL;
+    for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && it->text;
+         i++, it = fuzzymatches[i]) {
+      appenditem(it, &matches, &matchend);
+    }
+    free(fuzzymatches);
+  }
+  curr = sel = matches;
+  calcoffsets();
 }
 
-static void
-insert(const char *str, ssize_t n)
-{
-	if (strlen(text) + n > sizeof text - 1)
-		return;
-
-	static char last[BUFSIZ] = "";
-	if(reject_no_match) {
-		/* store last text value in case we need to revert it */
-		memcpy(last, text, BUFSIZ);
-	}
-
-	/* move existing text out of the way, insert new text, and update cursor */
-	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
-	if (n > 0)
-		memcpy(&text[cursor], str, n);
-	cursor += n;
-	match();
-
-	if(!matches && reject_no_match) {
-		/* revert to last text value if theres no match */
-		memcpy(text, last, BUFSIZ);
-		cursor -= n;
-		match();
-	}
+static void match(void) {
+  if (fuzzy) {
+    fuzzymatch();
+    return;
+  }
+  static char **tokv = NULL;
+  static int tokn = 0;
+
+  char buf[sizeof text], *s;
+  int i, tokc = 0;
+  size_t len, textsize;
+  struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+  strcpy(buf, text);
+  /* separate input text into tokens to be matched individually */
+  for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
+    if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+      die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+  len = tokc ? strlen(tokv[0]) : 0;
+
+  matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+  textsize = strlen(text) + 1;
+  for (item = items; item && item->text; item++) {
+    for (i = 0; i < tokc; i++)
+      if (!fstrstr(item->text, tokv[i]))
+        break;
+    if (i != tokc) /* not all tokens match */
+      continue;
+    /* exact matches go first, then prefixes, then substrings */
+    if (!tokc || !fstrncmp(text, item->text, textsize))
+      appenditem(item, &matches, &matchend);
+    else if (!fstrncmp(tokv[0], item->text, len))
+      appenditem(item, &lprefix, &prefixend);
+    else
+      appenditem(item, &lsubstr, &substrend);
+  }
+  if (lprefix) {
+    if (matches) {
+      matchend->right = lprefix;
+      lprefix->left = matchend;
+    } else
+      matches = lprefix;
+    matchend = prefixend;
+  }
+  if (lsubstr) {
+    if (matches) {
+      matchend->right = lsubstr;
+      lsubstr->left = matchend;
+    } else
+      matches = lsubstr;
+    matchend = substrend;
+  }
+  curr = sel = matches;
+  calcoffsets();
 }
 
-static size_t
-nextrune(int inc)
-{
-	ssize_t n;
+static void insert(const char *str, ssize_t n) {
+  if (strlen(text) + n > sizeof text - 1)
+    return;
 
-	/* return location of next utf8 rune in the given direction (+1 or -1) */
-	for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
-		;
-	return n;
+  static char last[BUFSIZ] = "";
+  if (reject_no_match) {
+    /* store last text value in case we need to revert it */
+    memcpy(last, text, BUFSIZ);
+  }
+
+  /* move existing text out of the way, insert new text, and update cursor */
+  memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+  if (n > 0)
+    memcpy(&text[cursor], str, n);
+  cursor += n;
+  match();
+
+  if (!matches && reject_no_match) {
+    /* revert to last text value if theres no match */
+    memcpy(text, last, BUFSIZ);
+    cursor -= n;
+    match();
+  }
 }
 
-static void
-movewordedge(int dir)
-{
-	if (dir < 0) { /* move cursor to the start of the word*/
-		while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
-			cursor = nextrune(-1);
-		while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
-			cursor = nextrune(-1);
-	} else { /* move cursor to the end of the word */
-		while (text[cursor] && strchr(worddelimiters, text[cursor]))
-			cursor = nextrune(+1);
-		while (text[cursor] && !strchr(worddelimiters, text[cursor]))
-			cursor = nextrune(+1);
-	}
+static size_t nextrune(int inc) {
+  ssize_t n;
+
+  /* return location of next utf8 rune in the given direction (+1 or -1) */
+  for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
+    ;
+  return n;
 }
 
-static void
-keypress(XKeyEvent *ev)
-{
-	char buf[32];
-	int len;
-	KeySym ksym;
-	Status status;
-
-	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
-	switch (status) {
-	default: /* XLookupNone, XBufferOverflow */
-		return;
-	case XLookupChars:
-		goto insert;
-	case XLookupKeySym:
-	case XLookupBoth:
-		break;
-	}
-
-	if (ev->state & ControlMask) {
-		switch(ksym) {
-		case XK_a: ksym = XK_Home;      break;
-		case XK_b: ksym = XK_Left;      break;
-		case XK_c: ksym = XK_Escape;    break;
-		case XK_d: ksym = XK_Delete;    break;
-		case XK_e: ksym = XK_End;       break;
-		case XK_f: ksym = XK_Right;     break;
-		case XK_g: ksym = XK_Escape;    break;
-		case XK_h: ksym = XK_BackSpace; break;
-		case XK_i: ksym = XK_Tab;       break;
-		case XK_j: /* fallthrough */
-		case XK_J: /* fallthrough */
-		case XK_m: /* fallthrough */
-		case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
-		case XK_n: ksym = XK_Down;      break;
-		case XK_p: ksym = XK_Up;        break;
-
-		case XK_k: /* delete right */
-			text[cursor] = '\0';
-			match();
-			break;
-		case XK_u: /* delete left */
-			insert(NULL, 0 - cursor);
-			break;
-		case XK_w: /* delete word */
-			while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
-				insert(NULL, nextrune(-1) - cursor);
-			while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
-				insert(NULL, nextrune(-1) - cursor);
-			break;
-		case XK_y: /* paste selection */
-		case XK_Y:
-			XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-			                  utf8, utf8, win, CurrentTime);
-			return;
-		case XK_Left:
-			movewordedge(-1);
-			goto draw;
-		case XK_Right:
-			movewordedge(+1);
-			goto draw;
-		case XK_Return:
-		case XK_KP_Enter:
-			break;
-		case XK_bracketleft:
-			cleanup();
-			exit(1);
-		default:
-			return;
-		}
-	} else if (ev->state & Mod1Mask) {
-		switch(ksym) {
-		case XK_b:
-			movewordedge(-1);
-			goto draw;
-		case XK_f:
-			movewordedge(+1);
-			goto draw;
-		case XK_g: ksym = XK_Home;  break;
-		case XK_G: ksym = XK_End;   break;
-		case XK_h: ksym = XK_Up;    break;
-		case XK_j: ksym = XK_Next;  break;
-		case XK_k: ksym = XK_Prior; break;
-		case XK_l: ksym = XK_Down;  break;
-		default:
-			return;
-		}
-	}
-
-	switch(ksym) {
-	default:
-insert:
-		if (!iscntrl(*buf))
-			insert(buf, len);
-		break;
-	case XK_Delete:
-		if (text[cursor] == '\0')
-			return;
-		cursor = nextrune(+1);
-		/* fallthrough */
-	case XK_BackSpace:
-		if (cursor == 0)
-			return;
-		insert(NULL, nextrune(-1) - cursor);
-		break;
-	case XK_End:
-		if (text[cursor] != '\0') {
-			cursor = strlen(text);
-			break;
-		}
-		if (next) {
-			/* jump to end of list and position items in reverse */
-			curr = matchend;
-			calcoffsets();
-			curr = prev;
-			calcoffsets();
-			while (next && (curr = curr->right))
-				calcoffsets();
-		}
-		sel = matchend;
-		break;
-	case XK_Escape:
-		cleanup();
-		exit(1);
-	case XK_Home:
-		if (sel == matches) {
-			cursor = 0;
-			break;
-		}
-		sel = curr = matches;
-		calcoffsets();
-		break;
-	case XK_Left:
-		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
-			cursor = nextrune(-1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Up:
-		if (sel && sel->left && (sel = sel->left)->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
-		break;
-	case XK_Next:
-		if (!next)
-			return;
-		sel = curr = next;
-		calcoffsets();
-		break;
-	case XK_Prior:
-		if (!prev)
-			return;
-		sel = curr = prev;
-		calcoffsets();
-		break;
-	case XK_Return:
-	case XK_KP_Enter:
-		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
-		if (!(ev->state & ControlMask)) {
-			cleanup();
-			exit(0);
-		}
-		if (sel)
-			sel->out = 1;
-		break;
-	case XK_Right:
-		if (text[cursor] != '\0') {
-			cursor = nextrune(+1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Down:
-		if (sel && sel->right && (sel = sel->right) == next) {
-			curr = next;
-			calcoffsets();
-		}
-		break;
-	case XK_Tab:
-		if (!sel)
-			return;
-		strncpy(text, sel->text, sizeof text - 1);
-		text[sizeof text - 1] = '\0';
-		cursor = strlen(text);
-		match();
-		break;
-	}
+static void movewordedge(int dir) {
+  if (dir < 0) { /* move cursor to the start of the word*/
+    while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+      cursor = nextrune(-1);
+    while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+      cursor = nextrune(-1);
+  } else { /* move cursor to the end of the word */
+    while (text[cursor] && strchr(worddelimiters, text[cursor]))
+      cursor = nextrune(+1);
+    while (text[cursor] && !strchr(worddelimiters, text[cursor]))
+      cursor = nextrune(+1);
+  }
+}
+
+static void vi_keypress(KeySym ksym, const XKeyEvent *ev) {
+  static const size_t quit_len = LENGTH(quit_keys);
+  if (ev->state & ControlMask) {
+    switch (ksym) {
+    /* movement */
+    case XK_d: /* fallthrough */
+      if (next) {
+        sel = curr = next;
+        calcoffsets();
+        goto draw;
+      } else
+        ksym = XK_G;
+      break;
+    case XK_u:
+      if (prev) {
+        sel = curr = prev;
+        calcoffsets();
+        goto draw;
+      } else
+        ksym = XK_g;
+      break;
+    case XK_p: /* fallthrough */
+    case XK_P:
+      break;
+    case XK_c:
+      cleanup();
+      exit(1);
+    case XK_Return: /* fallthrough */
+    case XK_KP_Enter:
+      break;
+    default:
+      return;
+    }
+  }
+
+  switch (ksym) {
+  /* movement */
+  case XK_0:
+    cursor = 0;
+    break;
+  case XK_dollar:
+    if (text[cursor + 1] != '\0') {
+      cursor = strlen(text) - 1;
+      break;
+    }
+    break;
+  case XK_b:
+    movewordedge(-1);
+    break;
+  case XK_e:
+    cursor = nextrune(+1);
+    movewordedge(+1);
+    if (text[cursor] == '\0')
+      --cursor;
+    else
+      cursor = nextrune(-1);
+    break;
+  case XK_g:
+    if (sel == matches) {
+      break;
+    }
+    sel = curr = matches;
+    calcoffsets();
+    break;
+  case XK_G:
+    if (next) {
+      /* jump to end of list and position items in reverse */
+      curr = matchend;
+      calcoffsets();
+      curr = prev;
+      calcoffsets();
+      while (next && (curr = curr->right))
+        calcoffsets();
+    }
+    sel = matchend;
+    break;
+  case XK_h:
+    if (cursor)
+      cursor = nextrune(-1);
+    break;
+  case XK_j:
+    if (sel && sel->right && (sel = sel->right) == next) {
+      curr = next;
+      calcoffsets();
+    }
+    break;
+  case XK_k:
+    if (sel && sel->left && (sel = sel->left)->right == curr) {
+      curr = prev;
+      calcoffsets();
+    }
+    break;
+  case XK_l:
+    if (text[cursor] != '\0' && text[cursor + 1] != '\0')
+      cursor = nextrune(+1);
+    else if (text[cursor] == '\0' && cursor)
+      --cursor;
+    break;
+  case XK_w:
+    movewordedge(+1);
+    if (text[cursor] != '\0' && text[cursor + 1] != '\0')
+      cursor = nextrune(+1);
+    else if (cursor)
+      --cursor;
+    break;
+  /* insertion */
+  case XK_a:
+    cursor = nextrune(+1);
+    /* fallthrough */
+  case XK_i:
+    using_vi_mode = 0;
+    break;
+  case XK_A:
+    if (text[cursor] != '\0')
+      cursor = strlen(text);
+    using_vi_mode = 0;
+    break;
+  case XK_I:
+    cursor = using_vi_mode = 0;
+    break;
+  case XK_p:
+    if (text[cursor] != '\0')
+      cursor = nextrune(+1);
+    XConvertSelection(dpy, (ev->state & ControlMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    return;
+  case XK_P:
+    XConvertSelection(dpy, (ev->state & ControlMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    return;
+  /* deletion */
+  case XK_D:
+    text[cursor] = '\0';
+    if (cursor)
+      cursor = nextrune(-1);
+    match();
+    break;
+  case XK_x:
+    cursor = nextrune(+1);
+    insert(NULL, nextrune(-1) - cursor);
+    if (text[cursor] == '\0' && text[0] != '\0')
+      --cursor;
+    match();
+    break;
+  /* misc. */
+  case XK_Return:
+  case XK_KP_Enter:
+    puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+    if (!(ev->state & ControlMask)) {
+      cleanup();
+      exit(0);
+    }
+    if (sel)
+      sel->out = 1;
+    break;
+  case XK_Tab:
+    if (!sel)
+      return;
+    strncpy(text, sel->text, sizeof text - 1);
+    text[sizeof text - 1] = '\0';
+    cursor = strlen(text) - 1;
+    match();
+    break;
+  default:
+    for (size_t i = 0; i < quit_len; ++i)
+      if (quit_keys[i].ksym == ksym &&
+          (quit_keys[i].state & ev->state) == quit_keys[i].state) {
+        cleanup();
+        exit(1);
+      }
+  }
 
 draw:
-	drawmenu();
+  drawmenu();
 }
 
-static void
-buttonpress(XEvent *e)
-{
-	struct item *item;
-	XButtonPressedEvent *ev = &e->xbutton;
-	int x = 0, y = 0, h = bh, w;
-
-	if (ev->window != win)
-		return;
-
-	/* right-click: exit */
-	if (ev->button == Button3)
-		exit(1);
-
-	if (prompt && *prompt)
-		x += promptw;
-
-	/* input field */
-	w = (lines > 0 || !matches) ? mw - x : inputw;
-
-	/* left-click on input: clear input,
-	 * NOTE: if there is no left-arrow the space for < is reserved so
-	 *       add that to the input width */
-	if (ev->button == Button1 &&
-	   ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
-	   ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
-	   (lines > 0 && ev->y >= y && ev->y <= y + h))) {
-		insert(NULL, -cursor);
-		drawmenu();
-		return;
-	}
-	/* middle-mouse click: paste selection */
-	if (ev->button == Button2) {
-		XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-		                  utf8, utf8, win, CurrentTime);
-		drawmenu();
-		return;
-	}
-	/* scroll up */
-	if (ev->button == Button4 && prev) {
-		sel = curr = prev;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	/* scroll down */
-	if (ev->button == Button5 && next) {
-		sel = curr = next;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	if (ev->button != Button1)
-		return;
-	if (ev->state & ~ControlMask)
-		return;
-	if (lines > 0) {
-		/* vertical list: (ctrl)left-click on item */
-		w = mw - x;
-		for (item = curr; item != next; item = item->right) {
-			y += h;
-			if (ev->y >= y && ev->y <= (y + h)) {
-				puts(item->text);
-				if (!(ev->state & ControlMask))
-					exit(0);
-				sel = item;
-				if (sel) {
-					sel->out = 1;
-					drawmenu();
-				}
-				return;
-			}
-		}
-	} else if (matches) {
-		/* left-click on left arrow */
-		x += inputw;
-		w = TEXTW("<");
-		if (prev && curr->left) {
-			if (ev->x >= x && ev->x <= x + w) {
-				sel = curr = prev;
-				calcoffsets();
-				drawmenu();
-				return;
-			}
-		}
-		/* horizontal list: (ctrl)left-click on item */
-		for (item = curr; item != next; item = item->right) {
-			x += w;
-			w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-			if (ev->x >= x && ev->x <= x + w) {
-				puts(item->text);
-				if (!(ev->state & ControlMask))
-					exit(0);
-				sel = item;
-				if (sel) {
-					sel->out = 1;
-					drawmenu();
-				}
-				return;
-			}
-		}
-		/* left-click on right arrow */
-		w = TEXTW(">");
-		x = mw - w;
-		if (next && ev->x >= x && ev->x <= x + w) {
-			sel = curr = next;
-			calcoffsets();
-			drawmenu();
-			return;
-		}
-	}
+static void keypress(XKeyEvent *ev) {
+  char buf[32];
+  int len;
+  KeySym ksym;
+  Status status;
+
+  len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+  switch (status) {
+  default: /* XLookupNone, XBufferOverflow */
+    return;
+  case XLookupChars:
+    goto insert;
+  case XLookupKeySym:
+  case XLookupBoth:
+    break;
+  }
+
+  if (using_vi_mode) {
+    vi_keypress(ksym, ev);
+    return;
+  } else if (vi_mode && (ksym == global_esc.ksym &&
+                         (ev->state & global_esc.state) == global_esc.state)) {
+    using_vi_mode = 1;
+    if (cursor)
+      cursor = nextrune(-1);
+    goto draw;
+  }
+
+  if (ev->state & ControlMask) {
+    switch (ksym) {
+    case XK_a:
+      ksym = XK_Home;
+    case XK_b:
+      break;
+      ksym = XK_Left;
+      break;
+    case XK_c:
+      ksym = XK_Escape;
+      break;
+    case XK_d:
+      ksym = XK_Delete;
+      break;
+    case XK_e:
+      ksym = XK_End;
+      break;
+    case XK_f:
+      ksym = XK_Right;
+      break;
+    case XK_g:
+      ksym = XK_Escape;
+      break;
+    case XK_h:
+      ksym = XK_BackSpace;
+      break;
+    case XK_i:
+      ksym = XK_Tab;
+      break;
+    case XK_j: /* fallthrough */
+    case XK_J: /* fallthrough */
+    case XK_m: /* fallthrough */
+    case XK_M:
+      ksym = XK_Return;
+      ev->state &= ~ControlMask;
+      break;
+    case XK_n:
+      ksym = XK_Down;
+      break;
+    case XK_p:
+      ksym = XK_Up;
+      break;
+
+    case XK_k: /* delete right */
+      text[cursor] = '\0';
+      match();
+      break;
+    case XK_u: /* delete left */
+      insert(NULL, 0 - cursor);
+      break;
+    case XK_w: /* delete word */
+      while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+        insert(NULL, nextrune(-1) - cursor);
+      while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+        insert(NULL, nextrune(-1) - cursor);
+      break;
+    case XK_y: /* paste selection */
+    case XK_Y:
+      XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, utf8,
+                        utf8, win, CurrentTime);
+      return;
+    case XK_Left:
+      movewordedge(-1);
+      goto draw;
+    case XK_Right:
+      movewordedge(+1);
+      goto draw;
+    case XK_Return:
+    case XK_KP_Enter:
+      break;
+    case XK_bracketleft:
+      cleanup();
+      exit(1);
+    default:
+      return;
+    }
+  } else if (ev->state & Mod1Mask) {
+    switch (ksym) {
+    case XK_b:
+      movewordedge(-1);
+      goto draw;
+    case XK_f:
+      movewordedge(+1);
+      goto draw;
+    case XK_g:
+      ksym = XK_Home;
+      break;
+    case XK_G:
+      ksym = XK_End;
+      break;
+    case XK_h:
+      ksym = XK_Up;
+      break;
+    case XK_j:
+      ksym = XK_Next;
+      break;
+    case XK_k:
+      ksym = XK_Prior;
+      break;
+    case XK_l:
+      ksym = XK_Down;
+      break;
+    default:
+      return;
+    }
+  }
+
+  switch (ksym) {
+  default:
+  insert:
+    if (!iscntrl(*buf))
+      insert(buf, len);
+    break;
+  case XK_Delete:
+    if (text[cursor] == '\0')
+      return;
+    cursor = nextrune(+1);
+    /* fallthrough */
+  case XK_BackSpace:
+    if (cursor == 0)
+      return;
+    insert(NULL, nextrune(-1) - cursor);
+    break;
+  case XK_End:
+    if (text[cursor] != '\0') {
+      cursor = strlen(text);
+      break;
+    }
+    if (next) {
+      /* jump to end of list and position items in reverse */
+      curr = matchend;
+      calcoffsets();
+      curr = prev;
+      calcoffsets();
+      while (next && (curr = curr->right))
+        calcoffsets();
+    }
+    sel = matchend;
+    break;
+  case XK_Escape:
+    cleanup();
+    exit(1);
+  case XK_Home:
+    if (sel == matches) {
+      cursor = 0;
+      break;
+    }
+    sel = curr = matches;
+    calcoffsets();
+    break;
+  case XK_Left:
+    if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
+      cursor = nextrune(-1);
+      break;
+    }
+    if (lines > 0)
+      return;
+    /* fallthrough */
+  case XK_Up:
+    if (sel && sel->left && (sel = sel->left)->right == curr) {
+      curr = prev;
+      calcoffsets();
+    }
+    break;
+  case XK_Next:
+    if (!next)
+      return;
+    sel = curr = next;
+    calcoffsets();
+    break;
+  case XK_Prior:
+    if (!prev)
+      return;
+    sel = curr = prev;
+    calcoffsets();
+    break;
+  case XK_Return:
+  case XK_KP_Enter:
+    puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+    if (!(ev->state & ControlMask)) {
+      cleanup();
+      exit(0);
+    }
+    if (sel)
+      sel->out = 1;
+    break;
+  case XK_Right:
+    if (text[cursor] != '\0') {
+      cursor = nextrune(+1);
+      break;
+    }
+    if (lines > 0)
+      return;
+    /* fallthrough */
+  case XK_Down:
+    if (sel && sel->right && (sel = sel->right) == next) {
+      curr = next;
+      calcoffsets();
+    }
+    break;
+  case XK_Tab:
+    if (!sel)
+      return;
+    strncpy(text, sel->text, sizeof text - 1);
+    text[sizeof text - 1] = '\0';
+    cursor = strlen(text);
+    match();
+    break;
+  }
+
+draw:
+  drawmenu();
 }
 
-static void
-paste(void)
-{
-	char *p, *q;
-	int di;
-	unsigned long dl;
-	Atom da;
-
-	/* we have been given the current selection, now insert it into input */
-	if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
-	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
-	    == Success && p) {
-		insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
-		XFree(p);
-	}
-	drawmenu();
+static void buttonpress(XEvent *e) {
+  struct item *item;
+  XButtonPressedEvent *ev = &e->xbutton;
+  int x = 0, y = 0, h = bh, w;
+
+  if (ev->window != win)
+    return;
+
+  /* right-click: exit */
+  if (ev->button == Button3)
+    exit(1);
+
+  if (prompt && *prompt)
+    x += promptw;
+
+  /* input field */
+  w = (lines > 0 || !matches) ? mw - x : inputw;
+
+  /* left-click on input: clear input,
+   * NOTE: if there is no left-arrow the space for < is reserved so
+   *       add that to the input width */
+  if (ev->button == Button1 &&
+      ((lines <= 0 && ev->x >= 0 &&
+        ev->x <= x + w + ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
+       (lines > 0 && ev->y >= y && ev->y <= y + h))) {
+    insert(NULL, -cursor);
+    drawmenu();
+    return;
+  }
+  /* middle-mouse click: paste selection */
+  if (ev->button == Button2) {
+    XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    drawmenu();
+    return;
+  }
+  /* scroll up */
+  if (ev->button == Button4 && prev) {
+    sel = curr = prev;
+    calcoffsets();
+    drawmenu();
+    return;
+  }
+  /* scroll down */
+  if (ev->button == Button5 && next) {
+    sel = curr = next;
+    calcoffsets();
+    drawmenu();
+    return;
+  }
+  if (ev->button != Button1)
+    return;
+  if (ev->state & ~ControlMask)
+    return;
+  if (lines > 0) {
+    /* vertical list: (ctrl)left-click on item */
+    w = mw - x;
+    for (item = curr; item != next; item = item->right) {
+      y += h;
+      if (ev->y >= y && ev->y <= (y + h)) {
+        puts(item->text);
+        if (!(ev->state & ControlMask))
+          exit(0);
+        sel = item;
+        if (sel) {
+          sel->out = 1;
+          drawmenu();
+        }
+        return;
+      }
+    }
+  } else if (matches) {
+    /* left-click on left arrow */
+    x += inputw;
+    w = TEXTW("<");
+    if (prev && curr->left) {
+      if (ev->x >= x && ev->x <= x + w) {
+        sel = curr = prev;
+        calcoffsets();
+        drawmenu();
+        return;
+      }
+    }
+    /* horizontal list: (ctrl)left-click on item */
+    for (item = curr; item != next; item = item->right) {
+      x += w;
+      w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
+      if (ev->x >= x && ev->x <= x + w) {
+        puts(item->text);
+        if (!(ev->state & ControlMask))
+          exit(0);
+        sel = item;
+        if (sel) {
+          sel->out = 1;
+          drawmenu();
+        }
+        return;
+      }
+    }
+    /* left-click on right arrow */
+    w = TEXTW(">");
+    x = mw - w;
+    if (next && ev->x >= x && ev->x <= x + w) {
+      sel = curr = next;
+      calcoffsets();
+      drawmenu();
+      return;
+    }
+  }
 }
 
-static void
-readstdin(void)
-{
-	char buf[sizeof text], *p;
-	size_t i, imax = 0, size = 0;
-	unsigned int tmpmax = 0;
+static void paste(void) {
+  char *p, *q;
+  int di;
+  unsigned long dl;
+  Atom da;
+
+  /* we have been given the current selection, now insert it into input */
+  if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, utf8,
+                         &da, &di, &dl, &dl, (unsigned char **)&p) == Success &&
+      p) {
+    insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
+    XFree(p);
+  }
+  if (using_vi_mode && text[cursor] == '\0')
+    --cursor;
+  drawmenu();
+}
+
+static void readstdin(void) {
+  char buf[sizeof text], *p;
+  size_t i, imax = 0, size = 0;
+  unsigned int tmpmax = 0;
 
-  if(passwd){
+  if (passwd) {
     inputw = lines = 0;
     return;
   }
 
-	/* read each line from stdin and add it to the item list */
-	for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
-		if (i + 1 >= size / sizeof *items)
-			if (!(items = realloc(items, (size += BUFSIZ))))
-				die("cannot realloc %u bytes:", size);
-		if ((p = strchr(buf, '\n')))
-			*p = '\0';
-		if (!(items[i].text = strdup(buf)))
-			die("cannot strdup %u bytes:", strlen(buf) + 1);
-		items[i].out = 0;
-		drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
-		if (tmpmax > inputw) {
-			inputw = tmpmax;
-			imax = i;
-		}
-	}
-	if (items)
-		items[i].text = NULL;
-	inputw = items ? TEXTW(items[imax].text) : 0;
-	lines = MIN(lines, i);
+  /* read each line from stdin and add it to the item list */
+  for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+    if (i + 1 >= size / sizeof *items)
+      if (!(items = realloc(items, (size += BUFSIZ))))
+        die("cannot realloc %u bytes:", size);
+    if ((p = strchr(buf, '\n')))
+      *p = '\0';
+    if (!(items[i].text = strdup(buf)))
+      die("cannot strdup %u bytes:", strlen(buf) + 1);
+    items[i].out = 0;
+    drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
+    if (tmpmax > inputw) {
+      inputw = tmpmax;
+      imax = i;
+    }
+  }
+  if (items)
+    items[i].text = NULL;
+  inputw = items ? TEXTW(items[imax].text) : 0;
+  lines = MIN(lines, i);
 }
 
-static void
-run(void)
-{
-	XEvent ev;
-
-	while (!XNextEvent(dpy, &ev)) {
-		if (XFilterEvent(&ev, win))
-			continue;
-		switch(ev.type) {
-		case ButtonPress:
-			buttonpress(&ev);
-			break;
-		case DestroyNotify:
-			if (ev.xdestroywindow.window != win)
-				break;
-			cleanup();
-			exit(1);
-		case Expose:
-			if (ev.xexpose.count == 0)
-				drw_map(drw, win, 0, 0, mw, mh);
-			break;
-		case FocusIn:
-			/* regrab focus from parent window */
-			if (ev.xfocus.window != win)
-				grabfocus();
-			break;
-		case KeyPress:
-			keypress(&ev.xkey);
-			break;
-		case SelectionNotify:
-			if (ev.xselection.property == utf8)
-				paste();
-			break;
-		case VisibilityNotify:
-			if (ev.xvisibility.state != VisibilityUnobscured)
-				XRaiseWindow(dpy, win);
-			break;
-		}
-	}
+static void run(void) {
+  XEvent ev;
+
+  while (!XNextEvent(dpy, &ev)) {
+    if (XFilterEvent(&ev, win))
+      continue;
+    switch (ev.type) {
+    case ButtonPress:
+      buttonpress(&ev);
+      break;
+    case DestroyNotify:
+      if (ev.xdestroywindow.window != win)
+        break;
+      cleanup();
+      exit(1);
+    case Expose:
+      if (ev.xexpose.count == 0)
+        drw_map(drw, win, 0, 0, mw, mh);
+      break;
+    case FocusIn:
+      /* regrab focus from parent window */
+      if (ev.xfocus.window != win)
+        grabfocus();
+      break;
+    case KeyPress:
+      keypress(&ev.xkey);
+      break;
+    case SelectionNotify:
+      if (ev.xselection.property == utf8)
+        paste();
+      break;
+    case VisibilityNotify:
+      if (ev.xvisibility.state != VisibilityUnobscured)
+        XRaiseWindow(dpy, win);
+      break;
+    }
+  }
 }
 
-static void
-setup(void)
-{
-	int x, y, i, j;
-	unsigned int du;
-	XSetWindowAttributes swa;
-	XIM xim;
-	Window w, dw, *dws;
-	XWindowAttributes wa;
-	XClassHint ch = {"dmenu", "dmenu"};
+static void setup(void) {
+  int x, y, i, j;
+  unsigned int du;
+  XSetWindowAttributes swa;
+  XIM xim;
+  Window w, dw, *dws;
+  XWindowAttributes wa;
+  XClassHint ch = {"dmenu", "dmenu"};
 #ifdef XINERAMA
-	XineramaScreenInfo *info;
-	Window pw;
-	int a, di, n, area = 0;
+  XineramaScreenInfo *info;
+  Window pw;
+  int a, di, n, area = 0;
 #endif
-	/* init appearance */
-	for (j = 0; j < SchemeLast; j++)
-		scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2);
+  /* init appearance */
+  for (j = 0; j < SchemeLast; j++)
+    scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2);
 
-	clip = XInternAtom(dpy, "CLIPBOARD",   False);
-	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
+  clip = XInternAtom(dpy, "CLIPBOARD", False);
+  utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
-	/* calculate menu geometry */
-	bh = drw->fonts->h + 2;
-	lines = MAX(lines, 0);
-	mh = (lines + 1) * bh;
+  /* calculate menu geometry */
+  bh = drw->fonts->h + 2;
+  lines = MAX(lines, 0);
+  mh = (lines + 1) * bh;
 #ifdef XINERAMA
-	i = 0;
-	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
-		XGetInputFocus(dpy, &w, &di);
-		if (mon >= 0 && mon < n)
-			i = mon;
-		else if (w != root && w != PointerRoot && w != None) {
-			/* find top-level window containing current input focus */
-			do {
-				if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
-					XFree(dws);
-			} while (w != root && w != pw);
-			/* find xinerama screen with which the window intersects most */
-			if (XGetWindowAttributes(dpy, pw, &wa))
-				for (j = 0; j < n; j++)
-					if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
-						area = a;
-						i = j;
-					}
-		}
-		/* no focused window is on screen, so use pointer location instead */
-		if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
-			for (i = 0; i < n; i++)
-				if (INTERSECT(x, y, 1, 1, info[i]))
-					break;
-
-		x = info[i].x_org;
-		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-		mw = info[i].width;
-		XFree(info);
-	} else
+  i = 0;
+  if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
+    XGetInputFocus(dpy, &w, &di);
+    if (mon >= 0 && mon < n)
+      i = mon;
+    else if (w != root && w != PointerRoot && w != None) {
+      /* find top-level window containing current input focus */
+      do {
+        if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
+          XFree(dws);
+      } while (w != root && w != pw);
+      /* find xinerama screen with which the window intersects most */
+      if (XGetWindowAttributes(dpy, pw, &wa))
+        for (j = 0; j < n; j++)
+          if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) >
+              area) {
+            area = a;
+            i = j;
+          }
+    }
+    /* no focused window is on screen, so use pointer location instead */
+    if (mon < 0 && !area &&
+        XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+      for (i = 0; i < n; i++)
+        if (INTERSECT(x, y, 1, 1, info[i]))
+          break;
+
+    x = info[i].x_org + dmx;
+    y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy);
+    mw = (dmw > 0 ? dmw : info[i].width);
+    XFree(info);
+  } else
 #endif
-	{
-		if (!XGetWindowAttributes(dpy, parentwin, &wa))
-			die("could not get embedding window attributes: 0x%lx",
-			    parentwin);
-		x = 0;
-		y = topbar ? 0 : wa.height - mh;
-		mw = wa.width;
-	}
-	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
-	inputw = MIN(inputw, mw/3);
-	match();
-
-	/* create menu window */
-	swa.override_redirect = True;
-	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-	swa.border_pixel = 0;
-	swa.colormap = cmap;
-	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask |
-		ButtonPressMask;
-	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
-	                    depth, InputOutput, visual,
-	                    CWOverrideRedirect | CWBackPixel | CWColormap |  CWEventMask | CWBorderPixel, &swa);
-	XSetClassHint(dpy, win, &ch);
-
-
-	/* input methods */
-	if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
-		die("XOpenIM failed: could not open input device");
-
-	xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-	                XNClientWindow, win, XNFocusWindow, win, NULL);
-
-	XMapRaised(dpy, win);
-	if (embed) {
-		XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
-		if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
-			for (i = 0; i < du && dws[i] != win; ++i)
-				XSelectInput(dpy, dws[i], FocusChangeMask);
-			XFree(dws);
-		}
-		grabfocus();
-	}
-	drw_resize(drw, mw, mh);
-	drawmenu();
+  {
+    if (!XGetWindowAttributes(dpy, parentwin, &wa))
+      die("could not get embedding window attributes: 0x%lx", parentwin);
+    x = dmx;
+    y = topbar ? dmy : wa.height - mh - dmy;
+    mw = (dmw > 0 ? dmw : wa.width);
+  }
+  promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
+  inputw = MIN(inputw, mw / 3);
+  match();
+
+  /* create menu window */
+  swa.override_redirect = True;
+  swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
+  swa.border_pixel = 0;
+  swa.colormap = cmap;
+  swa.event_mask =
+      ExposureMask | KeyPressMask | VisibilityChangeMask | ButtonPressMask;
+  win =
+      XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, depth, InputOutput, visual,
+                    CWOverrideRedirect | CWBackPixel | CWColormap |
+                        CWEventMask | CWBorderPixel,
+                    &swa);
+  XSetClassHint(dpy, win, &ch);
+
+  /* input methods */
+  if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
+    die("XOpenIM failed: could not open input device");
+
+  xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                  XNClientWindow, win, XNFocusWindow, win, NULL);
+
+  XMapRaised(dpy, win);
+  if (embed) {
+    XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
+    if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
+      for (i = 0; i < du && dws[i] != win; ++i)
+        XSelectInput(dpy, dws[i], FocusChangeMask);
+      XFree(dws);
+    }
+    grabfocus();
+  }
+  drw_resize(drw, mw, mh);
+  drawmenu();
 }
 
-static void
-usage(void)
-{
-	fputs("usage: dmenu [-bfiPrv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
-	exit(1);
+static void usage(void) {
+  fputs(
+      "usage: dmenu [-bfiPrv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+      "             [-x xoffset] [-y yoffset] [-z width]\n"
+      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w "
+      "windowid]\n",
+      stderr);
+  exit(1);
 }
 
-void
-read_Xresources(void) {
-	XrmInitialize();
-
-	char* xrm;
-	if ((xrm = XResourceManagerString(drw->dpy))) {
-		char *type;
-		XrmDatabase xdb = XrmGetStringDatabase(xrm);
-		XrmValue xval;
-
-		if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval) == True) /* font or font set */
-			fonts[0] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) == True)  /* normal background color */
-			colors[SchemeNorm][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) == True)  /* normal foreground color */
-			colors[SchemeNorm][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) == True)  /* selected background color */
-			colors[SchemeSel][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) == True)  /* selected foreground color */
-			colors[SchemeSel][ColFg] = strdup(xval.addr);
-
-		XrmDestroyDatabase(xdb);
-	}
+void read_Xresources(void) {
+  XrmInitialize();
+
+  char *xrm;
+  if ((xrm = XResourceManagerString(drw->dpy))) {
+    char *type;
+    XrmDatabase xdb = XrmGetStringDatabase(xrm);
+    XrmValue xval;
+
+    if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval) ==
+        True) /* font or font set */
+      fonts[0] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) ==
+        True) /* normal background color */
+      colors[SchemeNorm][ColBg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) ==
+        True) /* normal foreground color */
+      colors[SchemeNorm][ColFg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) ==
+        True) /* selected background color */
+      colors[SchemeSel][ColBg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) ==
+        True) /* selected foreground color */
+      colors[SchemeSel][ColFg] = strdup(xval.addr);
+
+    XrmDestroyDatabase(xdb);
+  }
 }
 
-int
-main(int argc, char *argv[])
-{
-	XWindowAttributes wa;
-	int i, fast = 0;
-
-	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fputs("warning: no locale support\n", stderr);
-	if (!(dpy = XOpenDisplay(NULL)))
-		die("cannot open display");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	if (!embed || !(parentwin = strtol(embed, NULL, 0)))
-		parentwin = root;
-	if (!XGetWindowAttributes(dpy, parentwin, &wa))
-		die("could not get embedding window attributes: 0x%lx",
-		    parentwin);
-	xinitvisual();
-	drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
-	read_Xresources();
-
-	for (i = 1; i < argc; i++)
-		/* these options take no arguments */
-		if (!strcmp(argv[i], "-v")) {      /* prints version information */
-			puts("dmenu-"VERSION);
-			exit(0);
-		} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
-			topbar = 0;
-		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
-			fast = 1;
-		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
-			fstrncmp = strncasecmp;
-			fstrstr = cistrstr;
-		} else if (!strcmp(argv[i], "-P"))   /* is the input a password */
-		        passwd = 1;
-		else if (!strcmp(argv[i], "-r")) /* reject input which results in no match */
-			reject_no_match = 1;
-		else if (i + 1 == argc)
-			usage();
-		/* these options take one argument */
-		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
-			lines = atoi(argv[++i]);
-		else if (!strcmp(argv[i], "-m"))
-			mon = atoi(argv[++i]);
-		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
-			prompt = argv[++i];
-		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
-			fonts[0] = argv[++i];
-		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
-			colors[SchemeNorm][ColBg] = argv[++i];
-		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
-			colors[SchemeNorm][ColFg] = argv[++i];
-		else if (!strcmp(argv[i], "-sb"))  /* selected background color */
-			colors[SchemeSel][ColBg] = argv[++i];
-		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
-			colors[SchemeSel][ColFg] = argv[++i];
-		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
-			embed = argv[++i];
-		else
-			usage();
-
-	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-		die("no fonts could be loaded.");
-	lrpad = drw->fonts->h;
+int main(int argc, char *argv[]) {
+  XWindowAttributes wa;
+  int i, fast = 0;
+
+  if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+    fputs("warning: no locale support\n", stderr);
+  if (!(dpy = XOpenDisplay(NULL)))
+    die("cannot open display");
+  screen = DefaultScreen(dpy);
+  root = RootWindow(dpy, screen);
+  if (!embed || !(parentwin = strtol(embed, NULL, 0)))
+    parentwin = root;
+  if (!XGetWindowAttributes(dpy, parentwin, &wa))
+    die("could not get embedding window attributes: 0x%lx", parentwin);
+  xinitvisual();
+  drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
+  read_Xresources();
+
+  for (i = 1; i < argc; i++)
+    /* these options take no arguments */
+    if (!strcmp(argv[i], "-v")) { /* prints version information */
+      puts("dmenu-" VERSION);
+      exit(0);
+    } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
+      topbar = 0;
+    else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
+      fast = 1;
+    else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
+      fuzzy = 0;
+    else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+      fstrncmp = strncasecmp;
+      fstrstr = cistrstr;
+    } else if (!strcmp(argv[i], "-vi")) {
+      vi_mode = 1;
+      using_vi_mode = start_mode;
+      global_esc.ksym = XK_Escape;
+      global_esc.state = 0;
+    } else if (!strcmp(argv[i], "-P")) /* is the input a password */
+      passwd = 1;
+    else if (!strcmp(argv[i],
+                     "-r")) /* reject input which results in no match */
+      reject_no_match = 1;
+    else if (i + 1 == argc)
+      usage();
+    /* these options take one argument */
+    else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
+      lines = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-x")) /* window x offset */
+      dmx = atoi(argv[++i]);
+    else if (!strcmp(argv[i],
+                     "-y")) /* window y offset (from bottom up if -b) */
+      dmy = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-z")) /* make dmenu this wide */
+      dmw = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-m"))
+      mon = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
+      prompt = argv[++i];
+    else if (!strcmp(argv[i], "-fn")) /* font or font set */
+      fonts[0] = argv[++i];
+    else if (!strcmp(argv[i], "-nb")) /* normal background color */
+      colors[SchemeNorm][ColBg] = argv[++i];
+    else if (!strcmp(argv[i], "-nf")) /* normal foreground color */
+      colors[SchemeNorm][ColFg] = argv[++i];
+    else if (!strcmp(argv[i], "-sb")) /* selected background color */
+      colors[SchemeSel][ColBg] = argv[++i];
+    else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
+      colors[SchemeSel][ColFg] = argv[++i];
+    else if (!strcmp(argv[i], "-w")) /* embedding window id */
+      embed = argv[++i];
+    else
+      usage();
+
+  if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+    die("no fonts could be loaded.");
+  lrpad = drw->fonts->h;
 
 #ifdef __OpenBSD__
-	if (pledge("stdio rpath", NULL) == -1)
-		die("pledge");
+  if (pledge("stdio rpath", NULL) == -1)
+    die("pledge");
 #endif
 
-	if (fast && !isatty(0)) {
-		grabkeyboard();
-		readstdin();
-	} else {
-		readstdin();
-		grabkeyboard();
-	}
-	setup();
-	run();
-
-	return 1; /* unreachable */
-}
+  if (fast && !isatty(0)) {
+    grabkeyboard();
+    readstdin();
+  } else {
+    readstdin();
+    grabkeyboard();
+  }
+  setup();
+  run();
 
+  return 1; /* unreachable */
+}
diff --git a/dmenu/stest b/dmenu/stest
index 455fd83..02ccef7 100755
--- a/dmenu/stest
+++ b/dmenu/stest