change fontmy_st

8 files changed, 1231 insertions, 558 deletions

diff --git a/clickurl.diff b/clickurl.diff
new file mode 100644
index 0000000..9fdefac
--- /dev/null
+++ b/clickurl.diff
@@ -0,0 +1,205 @@
+From a5ac9200f9146b212c0cd87fcb3fae357f39cc53 Mon Sep 17 00:00:00 2001
+From: kroovy <me@kroovy.de>
+Date: Sat, 1 Mar 2025 23:44:55 +0100
+Subject: [PATCH] Underline URLs and follow with click
+
+---
+ config.def.h | 11 +++++++
+ st.c         | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ st.h         |  9 ++++++
+ x.c          | 12 ++++++-
+ 4 files changed, 119 insertions(+), 1 deletion(-)
+
+diff --git a/config.def.h b/config.def.h
+index 2cd740a..0eadbce 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -472,3 +472,14 @@ static char ascii_printable[] =
+ 	" !\"#$%&'()*+,-./0123456789:;<=>?"
+ 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ 	"`abcdefghijklmnopqrstuvwxyz{|}~";
++
++/*
++ * Open urls starting with urlprefixes, contatining urlchars
++ * by passing as ARG1 to urlhandler.
++ */
++char* urlhandler = "xdg-open";
++char urlchars[] =
++	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++	"abcdefghijklmnopqrstuvwxyz"
++	"0123456789-._~:/?#@!$&'*+,;=%";
++char* urlprefixes[] = {"http://", "https://", NULL};
+diff --git a/st.c b/st.c
+index 03b9bc8..75347c6 100644
+--- a/st.c
++++ b/st.c
+@@ -636,6 +636,92 @@ getsel(void)
+ 	return str;
+ }
+
++char *
++strstrany(char* s, char** strs) {
++	char *match;
++	for (int i = 0; strs[i]; i++) {
++		if ((match = strstr(s, strs[i]))) {
++			return match;
++		}
++	}
++	return NULL;
++}
++
++void
++highlighturlsline(int row)
++{
++	char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */
++	char *match;
++	for (int j = 0; j < term.col; j++) {
++		if (term.line[row][j].u < 127) {
++			linestr[j] = term.line[row][j].u;
++		}
++		linestr[term.col] = '\0';
++	}
++	int url_start = -1;
++	while ((match = strstrany(linestr + url_start + 1, urlprefixes))) {
++		url_start = match - linestr;
++		for (int c = url_start; c < term.col && strchr(urlchars, linestr[c]); c++) {
++			term.line[row][c].mode |= ATTR_URL;
++			tsetdirt(row, c);
++		}
++	}
++	free(linestr);
++}
++
++void
++unhighlighturlsline(int row)
++{
++	for (int j = 0; j < term.col; j++) {
++		Glyph* g = &term.line[row][j];
++		if (g->mode & ATTR_URL) {
++			g->mode &= ~ATTR_URL;
++			tsetdirt(row, j);
++		}
++	}
++	return;
++}
++
++int
++followurl(int col, int row) {
++	char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */
++	char *match;
++	for (int i = 0; i < term.col; i++) {
++		if (term.line[row][i].u < 127) {
++			linestr[i] = term.line[row][i].u;
++		}
++		linestr[term.col] = '\0';
++	}
++	int url_start = -1, found_url = 0;
++	while ((match = strstrany(linestr + url_start + 1, urlprefixes))) {
++		url_start = match - linestr;
++		int url_end = url_start;
++		for (int c = url_start; c < term.col && strchr(urlchars, linestr[c]); c++) {
++			url_end++;
++		}
++		if (url_start <= col && col < url_end) {
++			found_url = 1;
++			linestr[url_end] = '\0';
++			break;
++		}
++	}
++	if (!found_url) {
++		free(linestr);
++		return 0;
++	}
++
++	pid_t chpid;
++	if ((chpid = fork()) == 0) {
++		if (fork() == 0)
++			execlp(urlhandler, urlhandler, linestr + url_start, NULL);
++		exit(1);
++	}
++	if (chpid > 0)
++		waitpid(chpid, NULL, 0);
++	free(linestr);
++    return 1;
++}
++
+ void
+ selclear(void)
+ {
+diff --git a/st.h b/st.h
+index fd3b0d8..ee0db89 100644
+--- a/st.h
++++ b/st.h
+@@ -33,6 +33,7 @@ enum glyph_attribute {
+ 	ATTR_WRAP       = 1 << 8,
+ 	ATTR_WIDE       = 1 << 9,
+ 	ATTR_WDUMMY     = 1 << 10,
++	ATTR_URL        = 1 << 11,
+ 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+@@ -105,6 +106,10 @@ void selextend(int, int, int, int);
+ int selected(int, int);
+ char *getsel(void);
+
++void highlighturlsline(int);
++void unhighlighturlsline(int);
++int followurl(int, int);
++
+ size_t utf8encode(Rune, char *);
+
+ void *xmalloc(size_t);
+@@ -124,3 +129,7 @@ extern unsigned int tabspaces;
+ extern unsigned int defaultfg;
+ extern unsigned int defaultbg;
+ extern unsigned int defaultcs;
++extern char *urlhandler;
++extern char urlchars[];
++extern char *urlprefixes[];
++extern int nurlprefixes;
+diff --git a/x.c b/x.c
+index d73152b..e2d4d56 100644
+--- a/x.c
++++ b/x.c
+@@ -191,6 +191,7 @@ static void usage(void);
+
+ static void (*handler[LASTEvent])(XEvent *) = {
+ 	[KeyPress] = kpress,
++	[KeyRelease] = kpress,
+ 	[ClientMessage] = cmessage,
+ 	[ConfigureNotify] = resize,
+ 	[VisibilityNotify] = visibility,
+@@ -452,6 +453,10 @@ mouseaction(XEvent *e, uint release)
+ 	/* ignore Button<N>mask for Button<N> - it's set on release */
+ 	uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
+
++	if (release == 0 && e->xbutton.button == Button1) {
++		return followurl(evcol(e), evrow(e));
++	}
++
+ 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
+ 		if (ms->release == release &&
+ 		    ms->button == e->xbutton.button &&
+@@ -1495,7 +1500,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
+
+ 	/* Render underline and strikethrough. */
+-	if (base.mode & ATTR_UNDERLINE) {
++	if (base.mode & ATTR_UNDERLINE || base.mode & ATTR_URL) {
+ 		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
+ 				width, 1);
+ 	}
+@@ -1859,6 +1864,11 @@ kpress(XEvent *ev)
+ 	} else {
+ 		len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
+ 	}
++
++	/* KeyRelease not relevant to shortcuts */
++	if (ev->type == KeyRelease)
++		return;
++
+ 	/* 1. shortcuts */
+ 	for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+ 		if (ksym == bp->keysym && match(bp->mod, e->state)) {
+--
+2.48.1
diff --git a/config.def.h b/config.def.h
index cf1001c..7e6b2ff 100644
--- a/config.def.h
+++ b/config.def.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "Liberation Mono:pixelsize=14:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=32:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -98,36 +98,35 @@ float alpha = 0.8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
+    /* 8 normal colors */
+    "black",
+    "red3",
+    "green3",
+    "yellow3",
+    "blue2",
+    "magenta3",
+    "cyan3",
+    "gray90",
+
+    /* 8 bright colors */
+    "gray50",
+    "red",
+    "green",
+    "yellow",
+    "#5c5cff",
+    "magenta",
+    "cyan",
+    "white",
+
+    [255] = 0,
+
+    /* more colors can be added after 255 to use with DefaultXX */
+    "#cccccc",
+    "#555555",
+    "gray90", /* default foreground colour */
+    "black",  /* default background colour */
 };
 
-
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
@@ -178,34 +177,34 @@ static uint forcemousemod = ShiftMask;
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
+    /* mask                 button   function        argument       release */
+    {XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1},
+    {ShiftMask, Button4, ttysend, {.s = "\033[5;2~"}},
+    {XK_ANY_MOD, Button4, ttysend, {.s = "\031"}},
+    {ShiftMask, Button5, ttysend, {.s = "\033[6;2~"}},
+    {XK_ANY_MOD, Button5, ttysend, {.s = "\005"}},
 };
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
+#define TERMMOD (ControlMask | ShiftMask)
 
 static Shortcut shortcuts[] = {
-	/* mask                 keysym          function        argument */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
-	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
-	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-    { ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+    /* mask                 keysym          function        argument */
+    {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}},
+    {ControlMask, XK_Print, toggleprinter, {.i = 0}},
+    {ShiftMask, XK_Print, printscreen, {.i = 0}},
+    {XK_ANY_MOD, XK_Print, printsel, {.i = 0}},
+    {TERMMOD, XK_Prior, zoom, {.f = +1}},
+    {TERMMOD, XK_Next, zoom, {.f = -1}},
+    {TERMMOD, XK_Home, zoomreset, {.f = 0}},
+    {TERMMOD, XK_C, clipcopy, {.i = 0}},
+    {TERMMOD, XK_V, clippaste, {.i = 0}},
+    {TERMMOD, XK_Y, selpaste, {.i = 0}},
+    {ShiftMask, XK_Insert, selpaste, {.i = 0}},
+    {TERMMOD, XK_Num_Lock, numlock, {.i = 0}},
+    {ShiftMask, XK_Page_Up, kscrollup, {.i = -1}},
+    {ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}},
 };
 
 /*
@@ -233,229 +232,229 @@ static Shortcut shortcuts[] = {
  * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
  * to be mapped below, add them to this array.
  */
-static KeySym mappedkeys[] = { -1 };
+static KeySym mappedkeys[] = {-1};
 
 /*
  * State bits to ignore when matching key or button events.  By default,
  * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
  */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
 
 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.
  */
 static Key key[] = {
-	/* keysym           mask            string      appkey appcursor */
-	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
-	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
-	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
-	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
-	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
-	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
-	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
-	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
-	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
-	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
-	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
-	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
-	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
-	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
-	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
-	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
-	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
-	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
-	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
-	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
-	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
-	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
-	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
-	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
-	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
-	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
-	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
-	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
-	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
-	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
-	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
-	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
-	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
-	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
-	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
-	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
-	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
-	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
-	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
-	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
-	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
-	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
-	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
-	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
-	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
-	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
-	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
-	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
-	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
-	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
-	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
-	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
-	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
-	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
-	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
-	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
-	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
-	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
-	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
-	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
-	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
-	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
-	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
-	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
-	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
-	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
-	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
-	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
-	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
-	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
-	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
-	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
-	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
-	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
-	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
-	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
-	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
-	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
-	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
-	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
-	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
-	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
-	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
-	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
-	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
-	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
-	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
-	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
-	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
-	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
-	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
-	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
-	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
-	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
-	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
-	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
-	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
-	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
-	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
-	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
-	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
-	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
-	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
-	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
-	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
-	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
-	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
-	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
-	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
-	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
-	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
-	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
-	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
-	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
-	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
-	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
-	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
-	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
-	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
-	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
-	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
-	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
-	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
-	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
-	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
-	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
-	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
-	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
-	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
-	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
-	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
-	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
-	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
-	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
-	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
-	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
-	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
-	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
-	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
-	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
-	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
-	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
+    /* keysym           mask            string      appkey appcursor */
+    {XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
+    {XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
+    {XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
+    {XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+    {XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
+    {XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
+    {XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
+    {XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
+    {XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
+    {XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
+    {XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
+    {XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
+    {XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
+    {XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
+    {XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
+    {XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
+    {XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
+    {XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+    {XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
+    {XK_KP_End, ControlMask, "\033[J", -1, 0},
+    {XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
+    {XK_KP_End, ShiftMask, "\033[K", -1, 0},
+    {XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
+    {XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
+    {XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
+    {XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+    {XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
+    {XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
+    {XK_KP_Insert, ControlMask, "\033[L", -1, 0},
+    {XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
+    {XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+    {XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+    {XK_KP_Delete, ControlMask, "\033[M", -1, 0},
+    {XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
+    {XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
+    {XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
+    {XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+    {XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+    {XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
+    {XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
+    {XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
+    {XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
+    {XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
+    {XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
+    {XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
+    {XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
+    {XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
+    {XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
+    {XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
+    {XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
+    {XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
+    {XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
+    {XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
+    {XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
+    {XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
+    {XK_Up, ShiftMask, "\033[1;2A", 0, 0},
+    {XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
+    {XK_Up, ShiftMask | Mod1Mask, "\033[1;4A", 0, 0},
+    {XK_Up, ControlMask, "\033[1;5A", 0, 0},
+    {XK_Up, ShiftMask | ControlMask, "\033[1;6A", 0, 0},
+    {XK_Up, ControlMask | Mod1Mask, "\033[1;7A", 0, 0},
+    {XK_Up, ShiftMask | ControlMask | Mod1Mask, "\033[1;8A", 0, 0},
+    {XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
+    {XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
+    {XK_Down, ShiftMask, "\033[1;2B", 0, 0},
+    {XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
+    {XK_Down, ShiftMask | Mod1Mask, "\033[1;4B", 0, 0},
+    {XK_Down, ControlMask, "\033[1;5B", 0, 0},
+    {XK_Down, ShiftMask | ControlMask, "\033[1;6B", 0, 0},
+    {XK_Down, ControlMask | Mod1Mask, "\033[1;7B", 0, 0},
+    {XK_Down, ShiftMask | ControlMask | Mod1Mask, "\033[1;8B", 0, 0},
+    {XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
+    {XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
+    {XK_Left, ShiftMask, "\033[1;2D", 0, 0},
+    {XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
+    {XK_Left, ShiftMask | Mod1Mask, "\033[1;4D", 0, 0},
+    {XK_Left, ControlMask, "\033[1;5D", 0, 0},
+    {XK_Left, ShiftMask | ControlMask, "\033[1;6D", 0, 0},
+    {XK_Left, ControlMask | Mod1Mask, "\033[1;7D", 0, 0},
+    {XK_Left, ShiftMask | ControlMask | Mod1Mask, "\033[1;8D", 0, 0},
+    {XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
+    {XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
+    {XK_Right, ShiftMask, "\033[1;2C", 0, 0},
+    {XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
+    {XK_Right, ShiftMask | Mod1Mask, "\033[1;4C", 0, 0},
+    {XK_Right, ControlMask, "\033[1;5C", 0, 0},
+    {XK_Right, ShiftMask | ControlMask, "\033[1;6C", 0, 0},
+    {XK_Right, ControlMask | Mod1Mask, "\033[1;7C", 0, 0},
+    {XK_Right, ShiftMask | ControlMask | Mod1Mask, "\033[1;8C", 0, 0},
+    {XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
+    {XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
+    {XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
+    {XK_Return, Mod1Mask, "\033\r", 0, 0},
+    {XK_Return, XK_ANY_MOD, "\r", 0, 0},
+    {XK_Insert, ShiftMask, "\033[4l", -1, 0},
+    {XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
+    {XK_Insert, ControlMask, "\033[L", -1, 0},
+    {XK_Insert, ControlMask, "\033[2;5~", +1, 0},
+    {XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+    {XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+    {XK_Delete, ControlMask, "\033[M", -1, 0},
+    {XK_Delete, ControlMask, "\033[3;5~", +1, 0},
+    {XK_Delete, ShiftMask, "\033[2K", -1, 0},
+    {XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
+    {XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+    {XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+    {XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
+    {XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
+    {XK_Home, ShiftMask, "\033[2J", 0, -1},
+    {XK_Home, ShiftMask, "\033[1;2H", 0, +1},
+    {XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
+    {XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+    {XK_End, ControlMask, "\033[J", -1, 0},
+    {XK_End, ControlMask, "\033[1;5F", +1, 0},
+    {XK_End, ShiftMask, "\033[K", -1, 0},
+    {XK_End, ShiftMask, "\033[1;2F", +1, 0},
+    {XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
+    {XK_Prior, ControlMask, "\033[5;5~", 0, 0},
+    {XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
+    {XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+    {XK_Next, ControlMask, "\033[6;5~", 0, 0},
+    {XK_Next, ShiftMask, "\033[6;2~", 0, 0},
+    {XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+    {XK_F1, XK_NO_MOD, "\033OP", 0, 0},
+    {XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
+    {XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
+    {XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
+    {XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
+    {XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
+    {XK_F2, XK_NO_MOD, "\033OQ", 0, 0},
+    {XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
+    {XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
+    {XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
+    {XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
+    {XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
+    {XK_F3, XK_NO_MOD, "\033OR", 0, 0},
+    {XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
+    {XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
+    {XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
+    {XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
+    {XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
+    {XK_F4, XK_NO_MOD, "\033OS", 0, 0},
+    {XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
+    {XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
+    {XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
+    {XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
+    {XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
+    {XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
+    {XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
+    {XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
+    {XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
+    {XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
+    {XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
+    {XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
+    {XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
+    {XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
+    {XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
+    {XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
+    {XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
+    {XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
+    {XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
+    {XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
+    {XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
+    {XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
+    {XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
+    {XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
+    {XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
+    {XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
+    {XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
+    {XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
+    {XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
+    {XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
+    {XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
+    {XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
+    {XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
+    {XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
+    {XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
+    {XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
+    {XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
+    {XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
+    {XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
+    {XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
+    {XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
+    {XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
+    {XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
+    {XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
+    {XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
+    {XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
+    {XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
+    {XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
+    {XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
+    {XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
+    {XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
+    {XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
+    {XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
+    {XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
+    {XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
+    {XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
+    {XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
+    {XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
+    {XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
+    {XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
+    {XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
+    {XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
+    {XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
+    {XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
+    {XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
+    {XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
+    {XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
 };
 
 /*
@@ -466,25 +465,23 @@ static Key key[] = {
  * If no match is found, regular selection is used.
  */
 static uint selmasks[] = {
-	[SEL_RECTANGULAR] = Mod1Mask,
+    [SEL_RECTANGULAR] = Mod1Mask,
 };
 
 /*
  * Printable characters in ASCII, used to estimate the advance width
  * of single wide characters.
  */
-static char ascii_printable[] =
-	" !\"#$%&'()*+,-./0123456789:;<=>?"
-	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-	"`abcdefghijklmnopqrstuvwxyz{|}~";
+static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
+                                "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+                                "`abcdefghijklmnopqrstuvwxyz{|}~";
 
 /*
  * Open urls starting with urlprefixes, contatining urlchars
  * by passing as ARG1 to urlhandler.
  */
-char* urlhandler = "xdg-open";
-char urlchars[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz"
-	"0123456789-._~:/?#@!$&'*+,;=%";
-char* urlprefixes[] = {"http://", "https://", NULL};
+char *urlhandler = "xdg-open";
+char urlchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                  "abcdefghijklmnopqrstuvwxyz"
+                  "0123456789-._~:/?#@!$&'*+,;=%";
+char *urlprefixes[] = {"http://", "https://", NULL};
diff --git a/config.h b/config.h
index cf1001c..7e6b2ff 100644
--- a/config.h
+++ b/config.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "Liberation Mono:pixelsize=14:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=32:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -98,36 +98,35 @@ float alpha = 0.8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
+    /* 8 normal colors */
+    "black",
+    "red3",
+    "green3",
+    "yellow3",
+    "blue2",
+    "magenta3",
+    "cyan3",
+    "gray90",
+
+    /* 8 bright colors */
+    "gray50",
+    "red",
+    "green",
+    "yellow",
+    "#5c5cff",
+    "magenta",
+    "cyan",
+    "white",
+
+    [255] = 0,
+
+    /* more colors can be added after 255 to use with DefaultXX */
+    "#cccccc",
+    "#555555",
+    "gray90", /* default foreground colour */
+    "black",  /* default background colour */
 };
 
-
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
@@ -178,34 +177,34 @@ static uint forcemousemod = ShiftMask;
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
+    /* mask                 button   function        argument       release */
+    {XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1},
+    {ShiftMask, Button4, ttysend, {.s = "\033[5;2~"}},
+    {XK_ANY_MOD, Button4, ttysend, {.s = "\031"}},
+    {ShiftMask, Button5, ttysend, {.s = "\033[6;2~"}},
+    {XK_ANY_MOD, Button5, ttysend, {.s = "\005"}},
 };
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
+#define TERMMOD (ControlMask | ShiftMask)
 
 static Shortcut shortcuts[] = {
-	/* mask                 keysym          function        argument */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
-	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
-	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-    { ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+    /* mask                 keysym          function        argument */
+    {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}},
+    {ControlMask, XK_Print, toggleprinter, {.i = 0}},
+    {ShiftMask, XK_Print, printscreen, {.i = 0}},
+    {XK_ANY_MOD, XK_Print, printsel, {.i = 0}},
+    {TERMMOD, XK_Prior, zoom, {.f = +1}},
+    {TERMMOD, XK_Next, zoom, {.f = -1}},
+    {TERMMOD, XK_Home, zoomreset, {.f = 0}},
+    {TERMMOD, XK_C, clipcopy, {.i = 0}},
+    {TERMMOD, XK_V, clippaste, {.i = 0}},
+    {TERMMOD, XK_Y, selpaste, {.i = 0}},
+    {ShiftMask, XK_Insert, selpaste, {.i = 0}},
+    {TERMMOD, XK_Num_Lock, numlock, {.i = 0}},
+    {ShiftMask, XK_Page_Up, kscrollup, {.i = -1}},
+    {ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}},
 };
 
 /*
@@ -233,229 +232,229 @@ static Shortcut shortcuts[] = {
  * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
  * to be mapped below, add them to this array.
  */
-static KeySym mappedkeys[] = { -1 };
+static KeySym mappedkeys[] = {-1};
 
 /*
  * State bits to ignore when matching key or button events.  By default,
  * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
  */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
 
 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.
  */
 static Key key[] = {
-	/* keysym           mask            string      appkey appcursor */
-	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
-	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
-	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
-	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
-	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
-	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
-	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
-	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
-	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
-	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
-	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
-	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
-	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
-	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
-	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
-	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
-	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
-	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
-	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
-	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
-	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
-	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
-	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
-	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
-	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
-	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
-	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
-	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
-	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
-	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
-	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
-	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
-	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
-	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
-	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
-	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
-	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
-	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
-	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
-	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
-	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
-	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
-	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
-	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
-	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
-	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
-	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
-	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
-	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
-	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
-	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
-	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
-	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
-	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
-	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
-	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
-	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
-	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
-	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
-	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
-	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
-	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
-	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
-	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
-	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
-	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
-	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
-	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
-	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
-	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
-	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
-	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
-	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
-	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
-	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
-	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
-	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
-	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
-	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
-	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
-	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
-	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
-	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
-	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
-	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
-	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
-	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
-	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
-	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
-	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
-	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
-	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
-	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
-	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
-	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
-	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
-	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
-	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
-	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
-	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
-	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
-	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
-	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
-	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
-	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
-	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
-	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
-	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
-	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
-	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
-	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
-	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
-	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
-	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
-	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
-	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
-	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
-	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
-	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
-	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
-	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
-	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
-	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
-	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
-	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
-	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
-	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
-	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
-	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
-	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
-	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
-	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
-	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
-	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
-	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
-	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
-	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
-	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
-	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
-	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
-	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
-	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
+    /* keysym           mask            string      appkey appcursor */
+    {XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
+    {XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
+    {XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
+    {XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+    {XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
+    {XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
+    {XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
+    {XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
+    {XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
+    {XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
+    {XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
+    {XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
+    {XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
+    {XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
+    {XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
+    {XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
+    {XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
+    {XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+    {XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
+    {XK_KP_End, ControlMask, "\033[J", -1, 0},
+    {XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
+    {XK_KP_End, ShiftMask, "\033[K", -1, 0},
+    {XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
+    {XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
+    {XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
+    {XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+    {XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
+    {XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
+    {XK_KP_Insert, ControlMask, "\033[L", -1, 0},
+    {XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
+    {XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+    {XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+    {XK_KP_Delete, ControlMask, "\033[M", -1, 0},
+    {XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
+    {XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
+    {XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
+    {XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+    {XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+    {XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
+    {XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
+    {XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
+    {XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
+    {XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
+    {XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
+    {XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
+    {XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
+    {XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
+    {XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
+    {XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
+    {XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
+    {XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
+    {XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
+    {XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
+    {XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
+    {XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
+    {XK_Up, ShiftMask, "\033[1;2A", 0, 0},
+    {XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
+    {XK_Up, ShiftMask | Mod1Mask, "\033[1;4A", 0, 0},
+    {XK_Up, ControlMask, "\033[1;5A", 0, 0},
+    {XK_Up, ShiftMask | ControlMask, "\033[1;6A", 0, 0},
+    {XK_Up, ControlMask | Mod1Mask, "\033[1;7A", 0, 0},
+    {XK_Up, ShiftMask | ControlMask | Mod1Mask, "\033[1;8A", 0, 0},
+    {XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
+    {XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
+    {XK_Down, ShiftMask, "\033[1;2B", 0, 0},
+    {XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
+    {XK_Down, ShiftMask | Mod1Mask, "\033[1;4B", 0, 0},
+    {XK_Down, ControlMask, "\033[1;5B", 0, 0},
+    {XK_Down, ShiftMask | ControlMask, "\033[1;6B", 0, 0},
+    {XK_Down, ControlMask | Mod1Mask, "\033[1;7B", 0, 0},
+    {XK_Down, ShiftMask | ControlMask | Mod1Mask, "\033[1;8B", 0, 0},
+    {XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
+    {XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
+    {XK_Left, ShiftMask, "\033[1;2D", 0, 0},
+    {XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
+    {XK_Left, ShiftMask | Mod1Mask, "\033[1;4D", 0, 0},
+    {XK_Left, ControlMask, "\033[1;5D", 0, 0},
+    {XK_Left, ShiftMask | ControlMask, "\033[1;6D", 0, 0},
+    {XK_Left, ControlMask | Mod1Mask, "\033[1;7D", 0, 0},
+    {XK_Left, ShiftMask | ControlMask | Mod1Mask, "\033[1;8D", 0, 0},
+    {XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
+    {XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
+    {XK_Right, ShiftMask, "\033[1;2C", 0, 0},
+    {XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
+    {XK_Right, ShiftMask | Mod1Mask, "\033[1;4C", 0, 0},
+    {XK_Right, ControlMask, "\033[1;5C", 0, 0},
+    {XK_Right, ShiftMask | ControlMask, "\033[1;6C", 0, 0},
+    {XK_Right, ControlMask | Mod1Mask, "\033[1;7C", 0, 0},
+    {XK_Right, ShiftMask | ControlMask | Mod1Mask, "\033[1;8C", 0, 0},
+    {XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
+    {XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
+    {XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
+    {XK_Return, Mod1Mask, "\033\r", 0, 0},
+    {XK_Return, XK_ANY_MOD, "\r", 0, 0},
+    {XK_Insert, ShiftMask, "\033[4l", -1, 0},
+    {XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
+    {XK_Insert, ControlMask, "\033[L", -1, 0},
+    {XK_Insert, ControlMask, "\033[2;5~", +1, 0},
+    {XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+    {XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+    {XK_Delete, ControlMask, "\033[M", -1, 0},
+    {XK_Delete, ControlMask, "\033[3;5~", +1, 0},
+    {XK_Delete, ShiftMask, "\033[2K", -1, 0},
+    {XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
+    {XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+    {XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+    {XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
+    {XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
+    {XK_Home, ShiftMask, "\033[2J", 0, -1},
+    {XK_Home, ShiftMask, "\033[1;2H", 0, +1},
+    {XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
+    {XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+    {XK_End, ControlMask, "\033[J", -1, 0},
+    {XK_End, ControlMask, "\033[1;5F", +1, 0},
+    {XK_End, ShiftMask, "\033[K", -1, 0},
+    {XK_End, ShiftMask, "\033[1;2F", +1, 0},
+    {XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
+    {XK_Prior, ControlMask, "\033[5;5~", 0, 0},
+    {XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
+    {XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+    {XK_Next, ControlMask, "\033[6;5~", 0, 0},
+    {XK_Next, ShiftMask, "\033[6;2~", 0, 0},
+    {XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+    {XK_F1, XK_NO_MOD, "\033OP", 0, 0},
+    {XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
+    {XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
+    {XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
+    {XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
+    {XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
+    {XK_F2, XK_NO_MOD, "\033OQ", 0, 0},
+    {XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
+    {XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
+    {XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
+    {XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
+    {XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
+    {XK_F3, XK_NO_MOD, "\033OR", 0, 0},
+    {XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
+    {XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
+    {XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
+    {XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
+    {XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
+    {XK_F4, XK_NO_MOD, "\033OS", 0, 0},
+    {XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
+    {XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
+    {XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
+    {XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
+    {XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
+    {XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
+    {XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
+    {XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
+    {XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
+    {XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
+    {XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
+    {XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
+    {XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
+    {XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
+    {XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
+    {XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
+    {XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
+    {XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
+    {XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
+    {XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
+    {XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
+    {XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
+    {XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
+    {XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
+    {XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
+    {XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
+    {XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
+    {XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
+    {XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
+    {XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
+    {XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
+    {XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
+    {XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
+    {XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
+    {XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
+    {XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
+    {XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
+    {XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
+    {XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
+    {XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
+    {XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
+    {XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
+    {XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
+    {XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
+    {XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
+    {XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
+    {XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
+    {XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
+    {XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
+    {XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
+    {XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
+    {XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
+    {XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
+    {XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
+    {XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
+    {XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
+    {XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
+    {XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
+    {XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
+    {XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
+    {XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
+    {XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
+    {XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
+    {XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
+    {XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
+    {XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
+    {XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
 };
 
 /*
@@ -466,25 +465,23 @@ static Key key[] = {
  * If no match is found, regular selection is used.
  */
 static uint selmasks[] = {
-	[SEL_RECTANGULAR] = Mod1Mask,
+    [SEL_RECTANGULAR] = Mod1Mask,
 };
 
 /*
  * Printable characters in ASCII, used to estimate the advance width
  * of single wide characters.
  */
-static char ascii_printable[] =
-	" !\"#$%&'()*+,-./0123456789:;<=>?"
-	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-	"`abcdefghijklmnopqrstuvwxyz{|}~";
+static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
+                                "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+                                "`abcdefghijklmnopqrstuvwxyz{|}~";
 
 /*
  * Open urls starting with urlprefixes, contatining urlchars
  * by passing as ARG1 to urlhandler.
  */
-char* urlhandler = "xdg-open";
-char urlchars[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz"
-	"0123456789-._~:/?#@!$&'*+,;=%";
-char* urlprefixes[] = {"http://", "https://", NULL};
+char *urlhandler = "xdg-open";
+char urlchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                  "abcdefghijklmnopqrstuvwxyz"
+                  "0123456789-._~:/?#@!$&'*+,;=%";
+char *urlprefixes[] = {"http://", "https://", NULL};
diff --git a/open_selected.diff b/open_selected.diff
new file mode 100644
index 0000000..aa102a0
--- /dev/null
+++ b/open_selected.diff
@@ -0,0 +1,74 @@
+diff --git a/config.def.h b/config.def.h
+index 2cd740a..d362d6b 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -176,6 +176,7 @@ static uint forcemousemod = ShiftMask;
+  */
+ static MouseShortcut mshortcuts[] = {
+ 	/* mask                 button   function        argument       release */
++	{ ControlMask,          Button2, selopen,        {.i = 0},      1 },
+ 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+ 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
+ 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+diff --git a/st.c b/st.c
+index 2e3800e..f55facb 100644
+--- a/st.c
++++ b/st.c
+@@ -1903,6 +1903,16 @@ strhandle(void)
+ 			if (narg > 1)
+ 				xsettitle(strescseq.args[1]);
+ 			return;
++		case 7:
++			if (strstr(strescseq.args[1], "file://") != strescseq.args[1]) {
++				fprintf(stderr, "erresc: dir %s must have prefix 'file://'\n",
++				        strescseq.args[1]);
++				return;
++			}
++			if (chdir(strescseq.args[1] + 7) != 0) /* +7 to remove prefix */
++				fprintf(stderr, "erresc: invalid directory %s\n",
++				        strescseq.args[1]);
++			return;
+ 		case 52:
+ 			if (narg > 2 && allowwindowops) {
+ 				dec = base64dec(strescseq.args[2]);
+diff --git a/x.c b/x.c
+index d73152b..e44d61c 100644
+--- a/x.c
++++ b/x.c
+@@ -5,6 +5,7 @@
+ #include <locale.h>
+ #include <signal.h>
+ #include <sys/select.h>
++#include <sys/wait.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <libgen.h>
+@@ -55,6 +56,7 @@ static void clipcopy(const Arg *);
+ static void clippaste(const Arg *);
+ static void numlock(const Arg *);
+ static void selpaste(const Arg *);
++static void selopen(const Arg *);
+ static void zoom(const Arg *);
+ static void zoomabs(const Arg *);
+ static void zoomreset(const Arg *);
+@@ -286,6 +288,20 @@ selpaste(const Arg *dummy)
+ 			xw.win, CurrentTime);
+ }
+ 
++void
++selopen(const Arg *dummy)
++{
++	pid_t chpid;
++
++	if ((chpid = fork()) == 0) {
++		if (fork() == 0)
++			execlp("xdg-open", "xdg-open", getsel(), NULL);
++		exit(1);
++	}
++	if (chpid > 0)
++		waitpid(chpid, NULL, 0);
++}
++
+ void
+ numlock(const Arg *dummy)
+ {
diff --git a/scrollback.diff b/scrollback.diff
new file mode 100644
index 0000000..f9782e8
--- /dev/null
+++ b/scrollback.diff
@@ -0,0 +1,351 @@
+diff --git a/config.def.h b/config.def.h
+index 2cd740a..40b7d93 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -201,6 +201,8 @@ static Shortcut shortcuts[] = {
+ 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+ 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+ 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
++	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
++    { ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+ };
+ 
+ /*
+diff --git a/st.c b/st.c
+index b9f66e7..2478942 100644
+--- a/st.c
++++ b/st.c
+@@ -35,6 +35,7 @@
+ #define ESC_ARG_SIZ   16
+ #define STR_BUF_SIZ   ESC_BUF_SIZ
+ #define STR_ARG_SIZ   ESC_ARG_SIZ
++#define HISTSIZE      2000
+ 
+ /* macros */
+ #define IS_SET(flag)		((term.mode & (flag)) != 0)
+@@ -42,6 +43,9 @@
+ #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
+ #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
+ #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
++#define TLINE(y)		((y) < term.scr ? term.hist[((y) + term.histi - \
++            term.scr + HISTSIZE + 1) % HISTSIZE] : \
++            term.line[(y) - term.scr])
+ 
+ enum term_mode {
+ 	MODE_WRAP        = 1 << 0,
+@@ -115,6 +119,9 @@ typedef struct {
+ 	int col;      /* nb col */
+ 	Line *line;   /* screen */
+ 	Line *alt;    /* alternate screen */
++	Line hist[HISTSIZE]; /* history buffer */
++	int histi;    /* history index */
++	int scr;      /* scroll back */
+ 	int *dirty;   /* dirtyness of lines */
+ 	TCursor c;    /* cursor */
+ 	int ocx;      /* old cursor col */
+@@ -185,8 +192,8 @@ static void tnewline(int);
+ static void tputtab(int);
+ static void tputc(Rune);
+ static void treset(void);
+-static void tscrollup(int, int);
+-static void tscrolldown(int, int);
++static void tscrollup(int, int, int);
++static void tscrolldown(int, int, int);
+ static void tsetattr(const int *, int);
+ static void tsetchar(Rune, const Glyph *, int, int);
+ static void tsetdirt(int, int);
+@@ -409,10 +416,10 @@ tlinelen(int y)
+ {
+ 	int i = term.col;
+ 
+-	if (term.line[y][i - 1].mode & ATTR_WRAP)
++	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
+ 		return i;
+ 
+-	while (i > 0 && term.line[y][i - 1].u == ' ')
++	while (i > 0 && TLINE(y)[i - 1].u == ' ')
+ 		--i;
+ 
+ 	return i;
+@@ -521,7 +528,7 @@ selsnap(int *x, int *y, int direction)
+ 		 * Snap around if the word wraps around at the end or
+ 		 * beginning of a line.
+ 		 */
+-		prevgp = &term.line[*y][*x];
++		prevgp = &TLINE(*y)[*x];
+ 		prevdelim = ISDELIM(prevgp->u);
+ 		for (;;) {
+ 			newx = *x + direction;
+@@ -536,14 +543,14 @@ selsnap(int *x, int *y, int direction)
+ 					yt = *y, xt = *x;
+ 				else
+ 					yt = newy, xt = newx;
+-				if (!(term.line[yt][xt].mode & ATTR_WRAP))
++				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
+ 					break;
+ 			}
+ 
+ 			if (newx >= tlinelen(newy))
+ 				break;
+ 
+-			gp = &term.line[newy][newx];
++			gp = &TLINE(newy)[newx];
+ 			delim = ISDELIM(gp->u);
+ 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+ 					|| (delim && gp->u != prevgp->u)))
+@@ -564,14 +571,14 @@ selsnap(int *x, int *y, int direction)
+ 		*x = (direction < 0) ? 0 : term.col - 1;
+ 		if (direction < 0) {
+ 			for (; *y > 0; *y += direction) {
+-				if (!(term.line[*y-1][term.col-1].mode
++				if (!(TLINE(*y-1)[term.col-1].mode
+ 						& ATTR_WRAP)) {
+ 					break;
+ 				}
+ 			}
+ 		} else if (direction > 0) {
+ 			for (; *y < term.row-1; *y += direction) {
+-				if (!(term.line[*y][term.col-1].mode
++				if (!(TLINE(*y)[term.col-1].mode
+ 						& ATTR_WRAP)) {
+ 					break;
+ 				}
+@@ -602,13 +609,13 @@ getsel(void)
+ 		}
+ 
+ 		if (sel.type == SEL_RECTANGULAR) {
+-			gp = &term.line[y][sel.nb.x];
++			gp = &TLINE(y)[sel.nb.x];
+ 			lastx = sel.ne.x;
+ 		} else {
+-			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
++			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
+ 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
+ 		}
+-		last = &term.line[y][MIN(lastx, linelen-1)];
++		last = &TLINE(y)[MIN(lastx, linelen-1)];
+ 		while (last >= gp && last->u == ' ')
+ 			--last;
+ 
+@@ -844,6 +851,9 @@ void
+ ttywrite(const char *s, size_t n, int may_echo)
+ {
+ 	const char *next;
++	Arg arg = (Arg) { .i = term.scr };
++
++	kscrolldown(&arg);
+ 
+ 	if (may_echo && IS_SET(MODE_ECHO))
+ 		twrite(s, n, 1);
+@@ -1055,13 +1065,53 @@ tswapscreen(void)
+ }
+ 
+ void
+-tscrolldown(int orig, int n)
++kscrolldown(const Arg* a)
++{
++	int n = a->i;
++
++	if (n < 0)
++		n = term.row + n;
++
++	if (n > term.scr)
++		n = term.scr;
++
++	if (term.scr > 0) {
++		term.scr -= n;
++		selscroll(0, -n);
++		tfulldirt();
++	}
++}
++
++void
++kscrollup(const Arg* a)
++{
++	int n = a->i;
++
++	if (n < 0)
++		n = term.row + n;
++
++	if (term.scr <= HISTSIZE-n) {
++		term.scr += n;
++		selscroll(0, n);
++		tfulldirt();
++	}
++}
++
++void
++tscrolldown(int orig, int n, int copyhist)
+ {
+ 	int i;
+ 	Line temp;
+ 
+ 	LIMIT(n, 0, term.bot-orig+1);
+ 
++	if (copyhist) {
++		term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
++		temp = term.hist[term.histi];
++		term.hist[term.histi] = term.line[term.bot];
++		term.line[term.bot] = temp;
++	}
++
+ 	tsetdirt(orig, term.bot-n);
+ 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
+ 
+@@ -1071,17 +1121,28 @@ tscrolldown(int orig, int n)
+ 		term.line[i-n] = temp;
+ 	}
+ 
+-	selscroll(orig, n);
++	if (term.scr == 0)
++		selscroll(orig, n);
+ }
+ 
+ void
+-tscrollup(int orig, int n)
++tscrollup(int orig, int n, int copyhist)
+ {
+ 	int i;
+ 	Line temp;
+ 
+ 	LIMIT(n, 0, term.bot-orig+1);
+ 
++	if (copyhist) {
++		term.histi = (term.histi + 1) % HISTSIZE;
++		temp = term.hist[term.histi];
++		term.hist[term.histi] = term.line[orig];
++		term.line[orig] = temp;
++	}
++
++	if (term.scr > 0 && term.scr < HISTSIZE)
++		term.scr = MIN(term.scr + n, HISTSIZE-1);
++
+ 	tclearregion(0, orig, term.col-1, orig+n-1);
+ 	tsetdirt(orig+n, term.bot);
+ 
+@@ -1091,7 +1152,8 @@ tscrollup(int orig, int n)
+ 		term.line[i+n] = temp;
+ 	}
+ 
+-	selscroll(orig, -n);
++	if (term.scr == 0)
++		selscroll(orig, -n);
+ }
+ 
+ void
+@@ -1120,7 +1182,7 @@ tnewline(int first_col)
+ 	int y = term.c.y;
+ 
+ 	if (y == term.bot) {
+-		tscrollup(term.top, 1);
++		tscrollup(term.top, 1, 1);
+ 	} else {
+ 		y++;
+ 	}
+@@ -1285,14 +1347,14 @@ void
+ tinsertblankline(int n)
+ {
+ 	if (BETWEEN(term.c.y, term.top, term.bot))
+-		tscrolldown(term.c.y, n);
++		tscrolldown(term.c.y, n, 0);
+ }
+ 
+ void
+ tdeleteline(int n)
+ {
+ 	if (BETWEEN(term.c.y, term.top, term.bot))
+-		tscrollup(term.c.y, n);
++		tscrollup(term.c.y, n, 0);
+ }
+ 
+ int32_t
+@@ -1730,11 +1792,11 @@ csihandle(void)
+ 	case 'S': /* SU -- Scroll <n> line up */
+ 		if (csiescseq.priv) break;
+ 		DEFAULT(csiescseq.arg[0], 1);
+-		tscrollup(term.top, csiescseq.arg[0]);
++		tscrollup(term.top, csiescseq.arg[0], 0);
+ 		break;
+ 	case 'T': /* SD -- Scroll <n> line down */
+ 		DEFAULT(csiescseq.arg[0], 1);
+-		tscrolldown(term.top, csiescseq.arg[0]);
++		tscrolldown(term.top, csiescseq.arg[0], 0);
+ 		break;
+ 	case 'L': /* IL -- Insert <n> blank lines */
+ 		DEFAULT(csiescseq.arg[0], 1);
+@@ -2306,7 +2368,7 @@ eschandle(uchar ascii)
+ 		return 0;
+ 	case 'D': /* IND -- Linefeed */
+ 		if (term.c.y == term.bot) {
+-			tscrollup(term.top, 1);
++			tscrollup(term.top, 1, 1);
+ 		} else {
+ 			tmoveto(term.c.x, term.c.y+1);
+ 		}
+@@ -2319,7 +2381,7 @@ eschandle(uchar ascii)
+ 		break;
+ 	case 'M': /* RI -- Reverse index */
+ 		if (term.c.y == term.top) {
+-			tscrolldown(term.top, 1);
++			tscrolldown(term.top, 1, 1);
+ 		} else {
+ 			tmoveto(term.c.x, term.c.y-1);
+ 		}
+@@ -2542,7 +2604,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
+ void
+ tresize(int col, int row)
+ {
+-	int i;
++	int i, j;
+ 	int minrow = MIN(row, term.row);
+ 	int mincol = MIN(col, term.col);
+ 	int *bp;
+@@ -2579,6 +2641,14 @@ tresize(int col, int row)
+ 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
+ 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
+ 
++	for (i = 0; i < HISTSIZE; i++) {
++		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
++		for (j = mincol; j < col; j++) {
++			term.hist[i][j] = term.c.attr;
++			term.hist[i][j].u = ' ';
++		}
++	}
++
+ 	/* resize each row to new width, zero-pad if needed */
+ 	for (i = 0; i < minrow; i++) {
+ 		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
+@@ -2637,7 +2707,7 @@ drawregion(int x1, int y1, int x2, int y2)
+ 			continue;
+ 
+ 		term.dirty[y] = 0;
+-		xdrawline(term.line[y], x1, y, x2);
++		xdrawline(TLINE(y), x1, y, x2);
+ 	}
+ }
+ 
+@@ -2658,8 +2728,9 @@ draw(void)
+ 		cx--;
+ 
+ 	drawregion(0, 0, term.col, term.row);
+-	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+-			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
++	if (term.scr == 0)
++		xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
++				term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
+ 	term.ocx = cx;
+ 	term.ocy = term.c.y;
+ 	xfinishdraw();
+diff --git a/st.h b/st.h
+index fd3b0d8..818a6f8 100644
+--- a/st.h
++++ b/st.h
+@@ -81,6 +81,8 @@ void die(const char *, ...);
+ void redraw(void);
+ void draw(void);
+ 
++void kscrolldown(const Arg *);
++void kscrollup(const Arg *);
+ void printscreen(const Arg *);
+ void printsel(const Arg *);
+ void sendbreak(const Arg *);
diff --git a/st.c b/st.c
index 3307a7d..69f631c 100644
--- a/st.c
+++ b/st.c
@@ -2800,6 +2800,8 @@ drawregion(int x1, int y1, int x2, int y2)
 			continue;
 
 		term.dirty[y] = 0;
+ 		unhighlighturlsline(y);
+ 		highlighturlsline(y);
 		xdrawline(TLINE(y), x1, y, x2);
 	}
 }
diff --git a/st.h b/st.h
index fd3b0d8..31921f3 100644
--- a/st.h
+++ b/st.h
@@ -33,6 +33,7 @@ enum glyph_attribute {
 	ATTR_WRAP       = 1 << 8,
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
+	ATTR_URL        = 1 << 11,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
 };
 
@@ -81,6 +82,8 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);
 
+void kscrolldown(const Arg *);
+void kscrollup(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);
@@ -105,6 +108,10 @@ void selextend(int, int, int, int);
 int selected(int, int);
 char *getsel(void);
 
+void highlighturlsline(int);
+void unhighlighturlsline(int);
+int followurl(int, int);
+
 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
@@ -124,3 +131,7 @@ extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultcs;
+extern char *urlhandler;
+extern char urlchars[];
+extern char *urlprefixes[];
+extern int nurlprefixes;
diff --git a/x.c b/x.c
index d73152b..c17404f 100644
--- a/x.c
+++ b/x.c
@@ -105,6 +105,7 @@ typedef struct {
 	XSetWindowAttributes attrs;
 	int scr;
 	int isfixed; /* is fixed geometry? */
+	int depth; /* bit depth */
 	int l, t; /* left and top offset */
 	int gm; /* geometry mask */
 } XWindow;
@@ -191,6 +192,7 @@ static void usage(void);
 
 static void (*handler[LASTEvent])(XEvent *) = {
 	[KeyPress] = kpress,
+	[KeyRelease] = kpress,
 	[ClientMessage] = cmessage,
 	[ConfigureNotify] = resize,
 	[VisibilityNotify] = visibility,
@@ -452,6 +454,10 @@ mouseaction(XEvent *e, uint release)
 	/* ignore Button<N>mask for Button<N> - it's set on release */
 	uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
 
+	if (release == 0 && e->xbutton.button == Button1) {
+		return followurl(evcol(e), evrow(e));
+	}
+
 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
 		if (ms->release == release &&
 		    ms->button == e->xbutton.button &&
@@ -752,7 +758,7 @@ xresize(int col, int row)
 
 	XFreePixmap(xw.dpy, xw.buf);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
+			xw.depth);
 	XftDrawChange(xw.draw, xw.buf);
 	xclear(0, 0, win.w, win.h);
 
@@ -812,6 +818,10 @@ xloadcols(void)
 			else
 				die("could not allocate color %d\n", i);
 		}
+
+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
 	loaded = 1;
 }
 
@@ -842,6 +852,12 @@ xsetcolorname(int x, const char *name)
 	XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
 	dc.col[x] = ncolor;
 
+	if (x == defaultbg) {
+		dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
+		dc.col[defaultbg].pixel &= 0x00FFFFFF;
+		dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
+	}
+
 	return 0;
 }
 
@@ -1134,11 +1150,25 @@ xinit(int cols, int rows)
 	Window parent, root;
 	pid_t thispid = getpid();
 	XColor xmousefg, xmousebg;
+	XWindowAttributes attr;
+	XVisualInfo vis;
 
 	if (!(xw.dpy = XOpenDisplay(NULL)))
 		die("can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
-	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
+
+	root = XRootWindow(xw.dpy, xw.scr);
+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+		parent = root;
+
+	if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) {
+		xw.vis = vis.visual;
+		xw.depth = vis.depth;
+	} else {
+		XGetWindowAttributes(xw.dpy, parent, &attr);
+		xw.vis = attr.visual;
+		xw.depth = attr.depth;
+	}
 
 	/* font */
 	if (!FcInit())
@@ -1148,7 +1178,7 @@ xinit(int cols, int rows)
 	xloadfonts(usedfont, 0);
 
 	/* colors */
-	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
+	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
 	xloadcols();
 
 	/* adjust fixed window geometry */
@@ -1168,11 +1198,8 @@ xinit(int cols, int rows)
 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	xw.attrs.colormap = xw.cmap;
 
-	root = XRootWindow(xw.dpy, xw.scr);
-	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
-		parent = root;
-	xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t,
-			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
+			win.w, win.h, 0, xw.depth, InputOutput,
 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
 			| CWEventMask | CWColormap, &xw.attrs);
 	if (parent != root)
@@ -1183,7 +1210,7 @@ xinit(int cols, int rows)
 	dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures,
 			&gcvalues);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
+			xw.depth);
 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
@@ -1495,7 +1522,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
 
 	/* Render underline and strikethrough. */
-	if (base.mode & ATTR_UNDERLINE) {
+	if (base.mode & ATTR_UNDERLINE || base.mode & ATTR_URL) {
 		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
 				width, 1);
 	}
@@ -1859,6 +1886,11 @@ kpress(XEvent *ev)
 	} else {
 		len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
 	}
+
+	/* KeyRelease not relevant to shortcuts */
+	if (ev->type == KeyRelease)
+		return;
+
 	/* 1. shortcuts */
 	for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
 		if (ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -2047,6 +2079,10 @@ main(int argc, char *argv[])
 	case 'a':
 		allowaltscreen = 0;
 		break;
+	case 'A':
+		alpha = strtof(EARGF(usage()), NULL);
+		LIMIT(alpha, 0.0, 1.0);
+		break;
 	case 'c':
 		opt_class = EARGF(usage());
 		break;