layout reorg

103 files changed, 0 insertions, 16755 deletions

diff --git a/src/chicken/chicken-core b/src/chicken/chicken-core
deleted file mode 160000
-Subproject 0f952c84f943658489a9c8d15277e3416de510c
diff --git a/src/chicken/setup.sh b/src/chicken/setup.sh
deleted file mode 100755
index 4c1ba54..0000000
--- a/src/chicken/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd chicken-core
-./scripts/bootstrap.sh
-
-CHICKEN_ALWAYS="--disable-shared --chicken ./chicken-boot --prefix ${HOME}/.local"
-
-./configure ${CHICKEN_FLAGS}
-make
-make install
diff --git a/src/dmenu/dmenu-5.4.tar.gz b/src/dmenu/dmenu-5.4.tar.gz
deleted file mode 100644
index 79d7ca4..0000000
--- a/src/dmenu/dmenu-5.4.tar.gz
+++ /dev/null
diff --git a/src/dmenu/dmenu-5.4/LICENSE b/src/dmenu/dmenu-5.4/LICENSE
deleted file mode 100644
index 2a64b28..0000000
--- a/src/dmenu/dmenu-5.4/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-MIT/X Consortium License
-
-© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
-© 2006-2008 Sander van Dijk <a.h.vandijk@gmail.com>
-© 2006-2007 Michał Janeczek <janeczek@gmail.com>
-© 2007 Kris Maglione <jg@suckless.org>
-© 2009 Gottox <gottox@s01.de>
-© 2009 Markus Schnalke <meillo@marmaro.de>
-© 2009 Evan Gates <evan.gates@gmail.com>
-© 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2014-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2015-2019 Quentin Rameau <quinq@fifth.space>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/src/dmenu/dmenu-5.4/Makefile b/src/dmenu/dmenu-5.4/Makefile
deleted file mode 100644
index 458c524..0000000
--- a/src/dmenu/dmenu-5.4/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# dmenu - dynamic menu
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = drw.c dmenu.c stest.c util.c
-OBJ = $(SRC:.c=.o)
-
-all: dmenu stest
-
-.c.o:
-	$(CC) -c $(CFLAGS) $<
-
-config.h:
-	cp config.def.h $@
-
-$(OBJ): arg.h config.h config.mk drw.h
-
-dmenu: dmenu.o drw.o util.o
-	$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
-
-stest: stest.o
-	$(CC) -o $@ stest.o $(LDFLAGS)
-
-clean:
-	rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
-
-dist: clean
-	mkdir -p dmenu-$(VERSION)
-	cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
-		drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
-		dmenu-$(VERSION)
-	tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
-	gzip dmenu-$(VERSION).tar
-	rm -rf dmenu-$(VERSION)
-
-install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-	sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
-		$(DESTDIR)$(PREFIX)/bin/dmenu_path\
-		$(DESTDIR)$(PREFIX)/bin/dmenu_run\
-		$(DESTDIR)$(PREFIX)/bin/stest\
-		$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
-		$(DESTDIR)$(MANPREFIX)/man1/stest.1
-
-.PHONY: all clean dist install uninstall
diff --git a/src/dmenu/dmenu-5.4/README b/src/dmenu/dmenu-5.4/README
deleted file mode 100644
index a8fcdfe..0000000
--- a/src/dmenu/dmenu-5.4/README
+++ /dev/null
@@ -1,24 +0,0 @@
-dmenu - dynamic menu
-====================
-dmenu is an efficient dynamic menu for X.
-
-
-Requirements
-------------
-In order to build dmenu you need the Xlib header files.
-
-
-Installation
-------------
-Edit config.mk to match your local setup (dmenu is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install dmenu
-(if necessary as root):
-
-    make clean install
-
-
-Running dmenu
--------------
-See the man page for details.
diff --git a/src/dmenu/dmenu-5.4/arg.h b/src/dmenu/dmenu-5.4/arg.h
deleted file mode 100644
index e94e02b..0000000
--- a/src/dmenu/dmenu-5.4/arg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef ARG_H__
-#define ARG_H__
-
-extern char *argv0;
-
-/* use main(int argc, char *argv[]) */
-#define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][0] == '-'\
-					&& argv[0][1];\
-					argc--, argv++) {\
-				char argc_;\
-				char **argv_;\
-				int brk_;\
-				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-					argv++;\
-					argc--;\
-					break;\
-				}\
-				for (brk_ = 0, argv[0]++, argv_ = argv;\
-						argv[0][0] && !brk_;\
-						argv[0]++) {\
-					if (argv_ != argv)\
-						break;\
-					argc_ = argv[0][0];\
-					switch (argc_)
-
-#define ARGEND			}\
-			}
-
-#define ARGC()		argc_
-
-#define EARGF(x)	((argv[0][1] == '\0' && argv[1] == NULL)?\
-				((x), abort(), (char *)0) :\
-				(brk_ = 1, (argv[0][1] != '\0')?\
-					(&argv[0][1]) :\
-					(argc--, argv++, argv[0])))
-
-#define ARGF()		((argv[0][1] == '\0' && argv[1] == NULL)?\
-				(char *)0 :\
-				(brk_ = 1, (argv[0][1] != '\0')?\
-					(&argv[0][1]) :\
-					(argc--, argv++, argv[0])))
-
-#endif
diff --git a/src/dmenu/dmenu-5.4/config.def.h b/src/dmenu/dmenu-5.4/config.def.h
deleted file mode 100644
index 1edb647..0000000
--- a/src/dmenu/dmenu-5.4/config.def.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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     */
-/* -fn option overrides fonts[0]; default X11 font or font set */
-static const char *fonts[] = {
-	"monospace:size=10"
-};
-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" },
-};
-/* -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[] = " ";
diff --git a/src/dmenu/dmenu-5.4/config.h b/src/dmenu/dmenu-5.4/config.h
deleted file mode 100644
index 1edb647..0000000
--- a/src/dmenu/dmenu-5.4/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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     */
-/* -fn option overrides fonts[0]; default X11 font or font set */
-static const char *fonts[] = {
-	"monospace:size=10"
-};
-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" },
-};
-/* -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[] = " ";
diff --git a/src/dmenu/dmenu-5.4/config.mk b/src/dmenu/dmenu-5.4/config.mk
deleted file mode 100644
index cf29342..0000000
--- a/src/dmenu/dmenu-5.4/config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# dmenu version
-VERSION = 5.4
-
-# paths
-PREFIX = ${HOME}/.local
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-# Xinerama, comment if you don't want it
-XINERAMALIBS  = -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = $(X11INC)/freetype2
-#MANPREFIX = ${PREFIX}/man
-
-# includes and libs
-INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
-
-# flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
-LDFLAGS  = $(LIBS)
-
-# compiler and linker
-CC = cc
diff --git a/src/dmenu/dmenu-5.4/dmenu.1 b/src/dmenu/dmenu-5.4/dmenu.1
deleted file mode 100644
index 323f93c..0000000
--- a/src/dmenu/dmenu-5.4/dmenu.1
+++ /dev/null
@@ -1,194 +0,0 @@
-.TH DMENU 1 dmenu\-VERSION
-.SH NAME
-dmenu \- dynamic menu
-.SH SYNOPSIS
-.B dmenu
-.RB [ \-bfiv ]
-.RB [ \-l
-.IR lines ]
-.RB [ \-m
-.IR monitor ]
-.RB [ \-p
-.IR prompt ]
-.RB [ \-fn
-.IR font ]
-.RB [ \-nb
-.IR color ]
-.RB [ \-nf
-.IR color ]
-.RB [ \-sb
-.IR color ]
-.RB [ \-sf
-.IR color ]
-.RB [ \-w
-.IR windowid ]
-.P
-.BR dmenu_run " ..."
-.SH DESCRIPTION
-.B dmenu
-is a dynamic menu for X, which reads a list of newline\-separated items from
-stdin.  When the user selects an item and presses Return, their choice is printed
-to stdout and dmenu terminates.  Entering text will narrow the items to those
-matching the tokens in the input.
-.P
-.B dmenu_run
-is a script used by
-.IR dwm (1)
-which lists programs in the user's $PATH and runs the result in their $SHELL.
-.SH OPTIONS
-.TP
-.B \-b
-dmenu appears at the bottom of the screen.
-.TP
-.B \-f
-dmenu grabs the keyboard before reading stdin if not reading from a tty. This
-is faster, but will lock up X until stdin reaches end\-of\-file.
-.TP
-.B \-i
-dmenu matches menu items case insensitively.
-.TP
-.BI \-l " lines"
-dmenu lists items vertically, with the given number of lines.
-.TP
-.BI \-m " monitor"
-dmenu is displayed on the monitor number supplied. Monitor numbers are starting
-from 0.
-.TP
-.BI \-p " prompt"
-defines the prompt to be displayed to the left of the input field.
-.TP
-.BI \-fn " font"
-defines the font or font set used.
-.TP
-.BI \-nb " color"
-defines the normal background color.
-.IR #RGB ,
-.IR #RRGGBB ,
-and X color names are supported.
-.TP
-.BI \-nf " color"
-defines the normal foreground color.
-.TP
-.BI \-sb " color"
-defines the selected background color.
-.TP
-.BI \-sf " color"
-defines the selected foreground color.
-.TP
-.B \-v
-prints version information to stdout, then exits.
-.TP
-.BI \-w " windowid"
-embed into windowid.
-.SH USAGE
-dmenu is completely controlled by the keyboard.  Items are selected using the
-arrow keys, page up, page down, home, and end.
-.TP
-.B Tab
-Copy the selected item to the input field.
-.TP
-.B Return
-Confirm selection.  Prints the selected item to stdout and exits, returning
-success.
-.TP
-.B Ctrl-Return
-Confirm selection.  Prints the selected item to stdout and continues.
-.TP
-.B Shift\-Return
-Confirm input.  Prints the input text to stdout and exits, returning success.
-.TP
-.B Escape
-Exit without selecting an item, returning failure.
-.TP
-.B Ctrl-Left
-Move cursor to the start of the current word
-.TP
-.B Ctrl-Right
-Move cursor to the end of the current word
-.TP
-.B C\-a
-Home
-.TP
-.B C\-b
-Left
-.TP
-.B C\-c
-Escape
-.TP
-.B C\-d
-Delete
-.TP
-.B C\-e
-End
-.TP
-.B C\-f
-Right
-.TP
-.B C\-g
-Escape
-.TP
-.B C\-h
-Backspace
-.TP
-.B C\-i
-Tab
-.TP
-.B C\-j
-Return
-.TP
-.B C\-J
-Shift-Return
-.TP
-.B C\-k
-Delete line right
-.TP
-.B C\-m
-Return
-.TP
-.B C\-M
-Shift-Return
-.TP
-.B C\-n
-Down
-.TP
-.B C\-p
-Up
-.TP
-.B C\-u
-Delete line left
-.TP
-.B C\-w
-Delete word left
-.TP
-.B C\-y
-Paste from primary X selection
-.TP
-.B C\-Y
-Paste from X clipboard
-.TP
-.B M\-b
-Move cursor to the start of the current word
-.TP
-.B M\-f
-Move cursor to the end of the current word
-.TP
-.B M\-g
-Home
-.TP
-.B M\-G
-End
-.TP
-.B M\-h
-Up
-.TP
-.B M\-j
-Page down
-.TP
-.B M\-k
-Page up
-.TP
-.B M\-l
-Down
-.SH SEE ALSO
-.IR dwm (1),
-.IR stest (1)
diff --git a/src/dmenu/dmenu-5.4/dmenu.c b/src/dmenu/dmenu-5.4/dmenu.c
deleted file mode 100644
index fd49549..0000000
--- a/src/dmenu/dmenu-5.4/dmenu.c
+++ /dev/null
@@ -1,795 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ctype.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#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 TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-/* enums */
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
-
-struct item {
-	char *text;
-	struct item *left, *right;
-	int out;
-};
-
-static char text[BUFSIZ] = "";
-static char *embed;
-static int bh, mw, mh;
-static int inputw = 0, promptw;
-static int lrpad; /* sum of left and right padding */
-static size_t cursor;
-static struct item *items = NULL;
-static struct item *matches, *matchend;
-static struct item *prev, *curr, *next, *sel;
-static int mon = -1, screen;
-
-static Atom clip, utf8;
-static Display *dpy;
-static Window root, parentwin, win;
-static XIC xic;
-
-static Drw *drw;
-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 unsigned int
-textw_clamp(const char *str, unsigned int n)
-{
-	unsigned int w = drw_fontset_getwidth_clamp(drw, str, n) + lrpad;
-	return MIN(w, n);
-}
-
-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 : textw_clamp(next->text, n)) > n)
-			break;
-	for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n)
-			break;
-}
-
-static void
-cleanup(void)
-{
-	size_t i;
-
-	XUngrabKeyboard(dpy, CurrentTime);
-	for (i = 0; i < SchemeLast; i++)
-		free(scheme[i]);
-	for (i = 0; items && items[i].text; ++i)
-		free(items[i].text);
-	free(items);
-	drw_free(drw);
-	XSync(dpy, False);
-	XCloseDisplay(dpy);
-}
-
-static char *
-cistrstr(const char *h, const char *n)
-{
-	size_t i;
-
-	if (!n[0])
-		return (char *)h;
-
-	for (; *h; ++h) {
-		for (i = 0; n[i] && tolower((unsigned char)n[i]) ==
-		            tolower((unsigned char)h[i]); ++i)
-			;
-		if (n[i] == '\0')
-			return (char *)h;
-	}
-	return NULL;
-}
-
-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;
-
-	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]);
-	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, textw_clamp(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
-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
-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 %zu 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 void
-insert(const char *str, ssize_t n)
-{
-	if (strlen(text) + n > sizeof text - 1)
-		return;
-	/* 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();
-}
-
-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
-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
-keypress(XKeyEvent *ev)
-{
-	char buf[64];
-	int len;
-	KeySym ksym = NoSymbol;
-	Status status;
-
-	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
-	switch (status) {
-	default: /* XLookupNone, XBufferOverflow */
-		return;
-	case XLookupChars: /* composed string from input method */
-		goto insert;
-	case XLookupKeySym:
-	case XLookupBoth: /* a KeySym and a string are returned: use keysym */
-		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:
-		case XK_KP_Left:
-			movewordedge(-1);
-			goto draw;
-		case XK_Right:
-		case XK_KP_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((unsigned char)*buf))
-			insert(buf, len);
-		break;
-	case XK_Delete:
-	case XK_KP_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:
-	case XK_KP_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:
-	case XK_KP_Home:
-		if (sel == matches) {
-			cursor = 0;
-			break;
-		}
-		sel = curr = matches;
-		calcoffsets();
-		break;
-	case XK_Left:
-	case XK_KP_Left:
-		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
-			cursor = nextrune(-1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Up:
-	case XK_KP_Up:
-		if (sel && sel->left && (sel = sel->left)->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
-		break;
-	case XK_Next:
-	case XK_KP_Next:
-		if (!next)
-			return;
-		sel = curr = next;
-		calcoffsets();
-		break;
-	case XK_Prior:
-	case XK_KP_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:
-	case XK_KP_Right:
-		if (text[cursor] != '\0') {
-			cursor = nextrune(+1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Down:
-	case XK_KP_Down:
-		if (sel && sel->right && (sel = sel->right) == next) {
-			curr = next;
-			calcoffsets();
-		}
-		break;
-	case XK_Tab:
-		if (!sel)
-			return;
-		cursor = strnlen(sel->text, sizeof text - 1);
-		memcpy(text, sel->text, cursor);
-		text[cursor] = '\0';
-		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
-readstdin(void)
-{
-	char *line = NULL;
-	size_t i, itemsiz = 0, linesiz = 0;
-	ssize_t len;
-
-	/* read each line from stdin and add it to the item list */
-	for (i = 0; (len = getline(&line, &linesiz, stdin)) != -1; i++) {
-		if (i + 1 >= itemsiz) {
-			itemsiz += 256;
-			if (!(items = realloc(items, itemsiz * sizeof(*items))))
-				die("cannot realloc %zu bytes:", itemsiz * sizeof(*items));
-		}
-		if (line[len - 1] == '\n')
-			line[len - 1] = '\0';
-		if (!(items[i].text = strdup(line)))
-			die("strdup:");
-
-		items[i].out = 0;
-	}
-	free(line);
-	if (items)
-		items[i].text = NULL;
-	lines = MIN(lines, i);
-}
-
-static void
-run(void)
-{
-	XEvent ev;
-
-	while (!XNextEvent(dpy, &ev)) {
-		if (XFilterEvent(&ev, win))
-			continue;
-		switch(ev.type) {
-		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"};
-#ifdef XINERAMA
-	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], 2);
-
-	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;
-#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]) != 0)
-					break;
-
-		x = info[i].x_org;
-		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-		mw = 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 = mw / 3; /* input width: ~33% of monitor width */
-	match();
-
-	/* create menu window */
-	swa.override_redirect = True;
-	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-	                    CopyFromParent, CopyFromParent, CopyFromParent,
-	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &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) {
-		XReparentWindow(dpy, win, parentwin, x, y);
-		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)
-{
-	die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-	    "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
-}
-
-int
-main(int argc, char *argv[])
-{
-	XWindowAttributes wa;
-	int i, fast = 0;
-
-	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 (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 (!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);
-	drw = drw_create(dpy, screen, root, wa.width, wa.height);
-	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");
-#endif
-
-	if (fast && !isatty(0)) {
-		grabkeyboard();
-		readstdin();
-	} else {
-		readstdin();
-		grabkeyboard();
-	}
-	setup();
-	run();
-
-	return 1; /* unreachable */
-}
diff --git a/src/dmenu/dmenu-5.4/dmenu_path b/src/dmenu/dmenu-5.4/dmenu_path
deleted file mode 100755
index 3a7cda7..0000000
--- a/src/dmenu/dmenu-5.4/dmenu_path
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
-cache="$cachedir/dmenu_run"
-
-[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
-
-IFS=:
-if stest -dqr -n "$cache" $PATH; then
-	stest -flx $PATH | sort -u | tee "$cache"
-else
-	cat "$cache"
-fi
diff --git a/src/dmenu/dmenu-5.4/dmenu_run b/src/dmenu/dmenu-5.4/dmenu_run
deleted file mode 100755
index 834ede5..0000000
--- a/src/dmenu/dmenu-5.4/dmenu_run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
diff --git a/src/dmenu/dmenu-5.4/drw.c b/src/dmenu/dmenu-5.4/drw.c
deleted file mode 100644
index c41e6af..0000000
--- a/src/dmenu/dmenu-5.4/drw.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-#define UTF_INVALID 0xFFFD
-
-static int
-utf8decode(const char *s_in, long *u, int *err)
-{
-	static const unsigned char lens[] = {
-		/* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-		/* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0,  /* invalid */
-		/* 110XX */ 2, 2, 2, 2,
-		/* 1110X */ 3, 3,
-		/* 11110 */ 4,
-		/* 11111 */ 0,  /* invalid */
-	};
-	static const unsigned char leading_mask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
-	static const unsigned int overlong[] = { 0x0, 0x80, 0x0800, 0x10000 };
-
-	const unsigned char *s = (const unsigned char *)s_in;
-	int len = lens[*s >> 3];
-	*u = UTF_INVALID;
-	*err = 1;
-	if (len == 0)
-		return 1;
-
-	long cp = s[0] & leading_mask[len - 1];
-	for (int i = 1; i < len; ++i) {
-		if (s[i] == '\0' || (s[i] & 0xC0) != 0x80)
-			return i;
-		cp = (cp << 6) | (s[i] & 0x3F);
-	}
-	/* out of range, surrogate, overlong encoding */
-	if (cp > 0x10FFFF || (cp >> 11) == 0x1B || cp < overlong[len - 1])
-		return len;
-
-	*err = 0;
-	*u = cp;
-	return len;
-}
-
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-{
-	Drw *drw = ecalloc(1, sizeof(Drw));
-
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
-}
-
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-}
-
-void
-drw_free(Drw *drw)
-{
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	drw_fontset_free(drw->fonts);
-	free(drw);
-}
-
-/* This function is an implementation detail. Library users should use
- * drw_fontset_create instead.
- */
-static Fnt *
-xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield the
-		 * same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in missing-character
-		 * rectangles being drawn, at least with some fonts. */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font from pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->h = xfont->ascent + xfont->descent;
-	font->dpy = drw->dpy;
-
-	return font;
-}
-
-static void
-xfont_free(Fnt *font)
-{
-	if (!font)
-		return;
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	free(font);
-}
-
-Fnt*
-drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
-{
-	Fnt *cur, *ret = NULL;
-	size_t i;
-
-	if (!drw || !fonts)
-		return NULL;
-
-	for (i = 1; i <= fontcount; i++) {
-		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
-			cur->next = ret;
-			ret = cur;
-		}
-	}
-	return (drw->fonts = ret);
-}
-
-void
-drw_fontset_free(Fnt *font)
-{
-	if (font) {
-		drw_fontset_free(font->next);
-		xfont_free(font);
-	}
-}
-
-void
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-{
-	if (!drw || !dest || !clrname)
-		return;
-
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, dest))
-		die("error, cannot allocate color '%s'", clrname);
-}
-
-/* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
-Clr *
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-{
-	size_t i;
-	Clr *ret;
-
-	/* need at least two colors for a scheme */
-	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
-		return NULL;
-
-	for (i = 0; i < clrcount; i++)
-		drw_clr_create(drw, &ret[i], clrnames[i]);
-	return ret;
-}
-
-void
-drw_setfontset(Drw *drw, Fnt *set)
-{
-	if (drw)
-		drw->fonts = set;
-}
-
-void
-drw_setscheme(Drw *drw, Clr *scm)
-{
-	if (drw)
-		drw->scheme = scm;
-}
-
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
-{
-	if (!drw || !drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	else
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
-}
-
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
-{
-	int ty, ellipsis_x = 0;
-	unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1;
-	XftDraw *d = NULL;
-	Fnt *usedfont, *curfont, *nextfont;
-	int utf8strlen, utf8charlen, utf8err, render = x || y || w || h;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0, overflow = 0;
-	/* keep track of a couple codepoints for which we have no match. */
-	static unsigned int nomatches[128], ellipsis_width, invalid_width;
-	static const char invalid[] = "�";
-
-	if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
-		return 0;
-
-	if (!render) {
-		w = invert ? invert : ~invert;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		if (w < lpad)
-			return x + w;
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-		x += lpad;
-		w -= lpad;
-	}
-
-	usedfont = drw->fonts;
-	if (!ellipsis_width && render)
-		ellipsis_width = drw_fontset_getwidth(drw, "...");
-	if (!invalid_width && render)
-		invalid_width = drw_fontset_getwidth(drw, invalid);
-	while (1) {
-		ew = ellipsis_len = utf8err = utf8charlen = utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, &utf8err);
-			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
-				if (charexists) {
-					drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
-					if (ew + ellipsis_width <= w) {
-						/* keep track where the ellipsis still fits */
-						ellipsis_x = x + ew;
-						ellipsis_w = w - ew;
-						ellipsis_len = utf8strlen;
-					}
-
-					if (ew + tmpw > w) {
-						overflow = 1;
-						/* called from drw_fontset_getwidth_clamp():
-						 * it wants the width AFTER the overflow
-						 */
-						if (!render)
-							x += tmpw;
-						else
-							utf8strlen = ellipsis_len;
-					} else if (curfont == usedfont) {
-						text += utf8charlen;
-						utf8strlen += utf8err ? 0 : utf8charlen;
-						ew += utf8err ? 0 : tmpw;
-					} else {
-						nextfont = curfont;
-					}
-					break;
-				}
-			}
-
-			if (overflow || !charexists || nextfont || utf8err)
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			if (render) {
-				ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
-				XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
-				                  usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
-			}
-			x += ew;
-			w -= ew;
-		}
-		if (utf8err && (!render || invalid_width < w)) {
-			if (render)
-				drw_text(drw, x, y, w, h, 0, invalid, invert);
-			x += invalid_width;
-			w -= invalid_width;
-		}
-		if (render && overflow)
-			drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
-
-		if (!*text || overflow) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			usedfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn. */
-			charexists = 1;
-
-			hash = (unsigned int)utf8codepoint;
-			hash = ((hash >> 16) ^ hash) * 0x21F0AAAD;
-			hash = ((hash >> 15) ^ hash) * 0xD35A2D97;
-			h0 = ((hash >> 15) ^ hash) % LENGTH(nomatches);
-			h1 = (hash >> 17) % LENGTH(nomatches);
-			/* avoid expensive XftFontMatch call when we know we won't find a match */
-			if (nomatches[h0] == utf8codepoint || nomatches[h1] == utf8codepoint)
-				goto no_match;
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts->pattern) {
-				/* Refer to the comment in xfont_create for more information. */
-				die("the first font in the cache must be loaded from a font string.");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
-					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
-						; /* NOP */
-					curfont->next = usedfont;
-				} else {
-					xfont_free(usedfont);
-					nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint;
-no_match:
-					usedfont = drw->fonts;
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x + (render ? w : 0);
-}
-
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
-}
-
-unsigned int
-drw_fontset_getwidth(Drw *drw, const char *text)
-{
-	if (!drw || !drw->fonts || !text)
-		return 0;
-	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
-}
-
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
-{
-	unsigned int tmp = 0;
-	if (drw && drw->fonts && text && n)
-		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
-	return MIN(n, tmp);
-}
-
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
-{
-	XGlyphInfo ext;
-
-	if (!font || !text)
-		return;
-
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	if (w)
-		*w = ext.xOff;
-	if (h)
-		*h = font->h;
-}
-
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
-
-	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
-		return NULL;
-
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
-	return cur;
-}
-
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
-
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
-}
diff --git a/src/dmenu/dmenu-5.4/drw.h b/src/dmenu/dmenu-5.4/drw.h
deleted file mode 100644
index fd7631b..0000000
--- a/src/dmenu/dmenu-5.4/drw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-typedef struct {
-	Cursor cursor;
-} Cur;
-
-typedef struct Fnt {
-	Display *dpy;
-	unsigned int h;
-	XftFont *xfont;
-	FcPattern *pattern;
-	struct Fnt *next;
-} Fnt;
-
-enum { ColFg, ColBg }; /* Clr scheme index */
-typedef XftColor Clr;
-
-typedef struct {
-	unsigned int w, h;
-	Display *dpy;
-	int screen;
-	Window root;
-	Drawable drawable;
-	GC gc;
-	Clr *scheme;
-	Fnt *fonts;
-} Drw;
-
-/* Drawable abstraction */
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-void drw_resize(Drw *drw, unsigned int w, unsigned int h);
-void drw_free(Drw *drw);
-
-/* Fnt abstraction */
-Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
-void drw_fontset_free(Fnt* set);
-unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-
-/* Colorscheme abstraction */
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *drw, int shape);
-void drw_cur_free(Drw *drw, Cur *cursor);
-
-/* Drawing context manipulation */
-void drw_setfontset(Drw *drw, Fnt *set);
-void drw_setscheme(Drw *drw, Clr *scm);
-
-/* Drawing functions */
-void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
-
-/* Map functions */
-void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
diff --git a/src/dmenu/dmenu-5.4/stest.1 b/src/dmenu/dmenu-5.4/stest.1
deleted file mode 100644
index 2667d8a..0000000
--- a/src/dmenu/dmenu-5.4/stest.1
+++ /dev/null
@@ -1,90 +0,0 @@
-.TH STEST 1 dmenu\-VERSION
-.SH NAME
-stest \- filter a list of files by properties
-.SH SYNOPSIS
-.B stest
-.RB [ -abcdefghlpqrsuwx ]
-.RB [ -n
-.IR file ]
-.RB [ -o
-.IR file ]
-.RI [ file ...]
-.SH DESCRIPTION
-.B stest
-takes a list of files and filters by the files' properties, analogous to
-.IR test (1).
-Files which pass all tests are printed to stdout. If no files are given, stest
-reads files from stdin.
-.SH OPTIONS
-.TP
-.B \-a
-Test hidden files.
-.TP
-.B \-b
-Test that files are block specials.
-.TP
-.B \-c
-Test that files are character specials.
-.TP
-.B \-d
-Test that files are directories.
-.TP
-.B \-e
-Test that files exist.
-.TP
-.B \-f
-Test that files are regular files.
-.TP
-.B \-g
-Test that files have their set-group-ID flag set.
-.TP
-.B \-h
-Test that files are symbolic links.
-.TP
-.B \-l
-Test the contents of a directory given as an argument.
-.TP
-.BI \-n " file"
-Test that files are newer than
-.IR file .
-.TP
-.BI \-o " file"
-Test that files are older than
-.IR file .
-.TP
-.B \-p
-Test that files are named pipes.
-.TP
-.B \-q
-No files are printed, only the exit status is returned.
-.TP
-.B \-r
-Test that files are readable.
-.TP
-.B \-s
-Test that files are not empty.
-.TP
-.B \-u
-Test that files have their set-user-ID flag set.
-.TP
-.B \-v
-Invert the sense of tests, only failing files pass.
-.TP
-.B \-w
-Test that files are writable.
-.TP
-.B \-x
-Test that files are executable.
-.SH EXIT STATUS
-.TP
-.B 0
-At least one file passed all tests.
-.TP
-.B 1
-No files passed all tests.
-.TP
-.B 2
-An error occurred.
-.SH SEE ALSO
-.IR dmenu (1),
-.IR test (1)
diff --git a/src/dmenu/dmenu-5.4/stest.c b/src/dmenu/dmenu-5.4/stest.c
deleted file mode 100644
index e27d3a5..0000000
--- a/src/dmenu/dmenu-5.4/stest.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "arg.h"
-char *argv0;
-
-#define FLAG(x)  (flag[(x)-'a'])
-
-static void test(const char *, const char *);
-static void usage(void);
-
-static int match = 0;
-static int flag[26];
-static struct stat old, new;
-
-static void
-test(const char *path, const char *name)
-{
-	struct stat st, ln;
-
-	if ((!stat(path, &st) && (FLAG('a') || name[0] != '.')        /* hidden files      */
-	&& (!FLAG('b') || S_ISBLK(st.st_mode))                        /* block special     */
-	&& (!FLAG('c') || S_ISCHR(st.st_mode))                        /* character special */
-	&& (!FLAG('d') || S_ISDIR(st.st_mode))                        /* directory         */
-	&& (!FLAG('e') || access(path, F_OK) == 0)                    /* exists            */
-	&& (!FLAG('f') || S_ISREG(st.st_mode))                        /* regular file      */
-	&& (!FLAG('g') || st.st_mode & S_ISGID)                       /* set-group-id flag */
-	&& (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link     */
-	&& (!FLAG('n') || st.st_mtime > new.st_mtime)                 /* newer than file   */
-	&& (!FLAG('o') || st.st_mtime < old.st_mtime)                 /* older than file   */
-	&& (!FLAG('p') || S_ISFIFO(st.st_mode))                       /* named pipe        */
-	&& (!FLAG('r') || access(path, R_OK) == 0)                    /* readable          */
-	&& (!FLAG('s') || st.st_size > 0)                             /* not empty         */
-	&& (!FLAG('u') || st.st_mode & S_ISUID)                       /* set-user-id flag  */
-	&& (!FLAG('w') || access(path, W_OK) == 0)                    /* writable          */
-	&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) {   /* executable        */
-		if (FLAG('q'))
-			exit(0);
-		match = 1;
-		puts(name);
-	}
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] "
-	        "[-n file] [-o file] [file...]\n", argv0);
-	exit(2); /* like test(1) return > 1 on error */
-}
-
-int
-main(int argc, char *argv[])
-{
-	struct dirent *d;
-	char path[PATH_MAX], *line = NULL, *file;
-	size_t linesiz = 0;
-	ssize_t n;
-	DIR *dir;
-	int r;
-
-	ARGBEGIN {
-	case 'n': /* newer than file */
-	case 'o': /* older than file */
-		file = EARGF(usage());
-		if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old))))
-			perror(file);
-		break;
-	default:
-		/* miscellaneous operators */
-		if (strchr("abcdefghlpqrsuvwx", ARGC()))
-			FLAG(ARGC()) = 1;
-		else
-			usage(); /* unknown flag */
-	} ARGEND;
-
-	if (!argc) {
-		/* read list from stdin */
-		while ((n = getline(&line, &linesiz, stdin)) > 0) {
-			if (line[n - 1] == '\n')
-				line[n - 1] = '\0';
-			test(line, line);
-		}
-		free(line);
-	} else {
-		for (; argc; argc--, argv++) {
-			if (FLAG('l') && (dir = opendir(*argv))) {
-				/* test directory contents */
-				while ((d = readdir(dir))) {
-					r = snprintf(path, sizeof path, "%s/%s",
-					             *argv, d->d_name);
-					if (r >= 0 && (size_t)r < sizeof path)
-						test(path, d->d_name);
-				}
-				closedir(dir);
-			} else {
-				test(*argv, *argv);
-			}
-		}
-	}
-	return match ? 0 : 1;
-}
diff --git a/src/dmenu/dmenu-5.4/util.c b/src/dmenu/dmenu-5.4/util.c
deleted file mode 100644
index 8e26a51..0000000
--- a/src/dmenu/dmenu-5.4/util.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-void
-die(const char *fmt, ...)
-{
-	va_list ap;
-	int saved_errno;
-
-	saved_errno = errno;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if (fmt[0] && fmt[strlen(fmt)-1] == ':')
-		fprintf(stderr, " %s", strerror(saved_errno));
-	fputc('\n', stderr);
-
-	exit(1);
-}
-
-void *
-ecalloc(size_t nmemb, size_t size)
-{
-	void *p;
-
-	if (!(p = calloc(nmemb, size)))
-		die("calloc:");
-	return p;
-}
diff --git a/src/dmenu/dmenu-5.4/util.h b/src/dmenu/dmenu-5.4/util.h
deleted file mode 100644
index c0a50d4..0000000
--- a/src/dmenu/dmenu-5.4/util.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))
-#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
-#define LENGTH(X)               (sizeof (X) / sizeof (X)[0])
-
-void die(const char *fmt, ...);
-void *ecalloc(size_t nmemb, size_t size);
diff --git a/src/dmenu/setup.sh b/src/dmenu/setup.sh
deleted file mode 100755
index 0f65d30..0000000
--- a/src/dmenu/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-cd dmenu-5.4
-rm -f config.h
-make config.h
-make install
diff --git a/src/dwm/dwm-6.6.tar.gz b/src/dwm/dwm-6.6.tar.gz
deleted file mode 100644
index 966b256..0000000
--- a/src/dwm/dwm-6.6.tar.gz
+++ /dev/null
diff --git a/src/dwm/dwm-6.6/LICENSE b/src/dwm/dwm-6.6/LICENSE
deleted file mode 100644
index 995172f..0000000
--- a/src/dwm/dwm-6.6/LICENSE
+++ /dev/null
@@ -1,38 +0,0 @@
-MIT/X Consortium License
-
-© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
-© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
-© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
-© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
-© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
-© 2007-2009 Christof Musik <christof at sendfax dot de>
-© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
-© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
-© 2008 Martin Hurton <martin dot hurton at gmail dot com>
-© 2008 Neale Pickett <neale dot woozle dot org>
-© 2009 Mate Nagy <mnagy at port70 dot net>
-© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2011 Christoph Lohmann <20h@r-36.net>
-© 2015-2016 Quentin Rameau <quinq@fifth.space>
-© 2015-2016 Eric Pruitt <eric.pruitt@gmail.com>
-© 2016-2017 Markus Teich <markus.teich@stusta.mhn.de>
-© 2020-2022 Chris Down <chris@chrisdown.name>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/src/dwm/dwm-6.6/Makefile b/src/dwm/dwm-6.6/Makefile
deleted file mode 100644
index ffa69b4..0000000
--- a/src/dwm/dwm-6.6/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# dwm - dynamic window manager
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = drw.c dwm.c util.c
-OBJ = ${SRC:.c=.o}
-
-all: dwm
-
-.c.o:
-	${CC} -c ${CFLAGS} $<
-
-${OBJ}: config.h config.mk
-
-config.h:
-	cp config.def.h $@
-
-dwm: ${OBJ}
-	${CC} -o $@ ${OBJ} ${LDFLAGS}
-
-clean:
-	rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
-
-dist: clean
-	mkdir -p dwm-${VERSION}
-	cp -R LICENSE Makefile README config.def.h config.mk\
-		dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}
-	tar -cf dwm-${VERSION}.tar dwm-${VERSION}
-	gzip dwm-${VERSION}.tar
-	rm -rf dwm-${VERSION}
-
-install: all
-	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f dwm ${DESTDIR}${PREFIX}/bin
-	chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
-	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
-	chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
-
-uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/dwm\
-		${DESTDIR}${MANPREFIX}/man1/dwm.1
-
-.PHONY: all clean dist install uninstall
diff --git a/src/dwm/dwm-6.6/README b/src/dwm/dwm-6.6/README
deleted file mode 100644
index 95d4fd0..0000000
--- a/src/dwm/dwm-6.6/README
+++ /dev/null
@@ -1,48 +0,0 @@
-dwm - dynamic window manager
-============================
-dwm is an extremely fast, small, and dynamic window manager for X.
-
-
-Requirements
-------------
-In order to build dwm you need the Xlib header files.
-
-
-Installation
-------------
-Edit config.mk to match your local setup (dwm is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install dwm (if
-necessary as root):
-
-    make clean install
-
-
-Running dwm
------------
-Add the following line to your .xinitrc to start dwm using startx:
-
-    exec dwm
-
-In order to connect dwm to a specific display, make sure that
-the DISPLAY environment variable is set correctly, e.g.:
-
-    DISPLAY=foo.bar:1 exec dwm
-
-(This will start dwm on display :1 of the host foo.bar.)
-
-In order to display status info in the bar, you can do something
-like this in your .xinitrc:
-
-    while xsetroot -name "`date` `uptime | sed 's/.*,//'`"
-    do
-    	sleep 1
-    done &
-    exec dwm
-
-
-Configuration
--------------
-The configuration of dwm is done by creating a custom config.h
-and (re)compiling the source code.
diff --git a/src/dwm/dwm-6.6/config.def.h b/src/dwm/dwm-6.6/config.def.h
deleted file mode 100644
index 0048756..0000000
--- a/src/dwm/dwm-6.6/config.def.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#include <X11/XF86keysym.h>
-
-/* appearance */
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int snap      = 1;       /* snap pixel */
-static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-static const unsigned int systrayonleft = 0;    /* 0: systray in the right corner, >0: systray on left of status text */
-static const unsigned int systrayspacing = 2;   /* systray spacing */
-static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-static const int showsystray        = 1;        /* 0 means no systray */
-static const int showbar            = 1;        /* 0 means no bar */
-static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "monospace:size=10" };
-static const char dmenufont[]       = "monospace:size=10";
-static const char col_gray1[]       = "#222222";
-static const char col_gray2[]       = "#444444";
-static const char col_gray3[]       = "#bbbbbb";
-static const char col_gray4[]       = "#eeeeee";
-static const char col_purple[]      = "#6904f7";
-static const char *colors[][3]      = {
-        /*               fg         bg         border   */
-        [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-        [SchemeSel]  = { col_gray4, col_purple,  col_purple  },
-};
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
-        /* xprop(1):
-         *      WM_CLASS(STRING) = instance, class
-         *      WM_NAME(STRING) = title
-         */
-        /* class      instance    title       tags mask     isfloating   monitor */
-        { "mpv",     NULL,       NULL,       0,            1,           -1 },
-};
-
-/* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster     = 1;    /* number of clients in master area */
-static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
-static const Layout layouts[] = {
-        /* symbol     arrange function */
-        { "[]=",      tile },    /* first entry is default */
-        { "><>",      NULL },    /* no layout function means floating behavior */
-        { "[M]",      monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY,TAG) \
-        { MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
-        { MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
-        { MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-        { MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "tmuterm", NULL };
-static const char *browsercmd[]  = { "tmubrowse", NULL };
-static const char *fixcmd[]  = { "fixrandr", NULL };
-static const char *bupcmd[]  = { "brightnessup", NULL };
-static const char *bdowncmd[]  = { "brightnessdown", NULL };
-static const char *bmaxcmd[]  = { "brightnessmax", NULL };
-static const char *upvol[]      = { "volumeup", NULL };
-static const char *downvol[]    = { "volumedown", NULL };
-static const char *mutevol[]    = { "volumemute", NULL };
-
-#include "movestack.c"
-static const Key keys[] = {
-        /* modifier                     key        function        argument */
-        { MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
-        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-        { MODKEY,                       XK_e,      spawn,          {.v = browsercmd } },
-        { MODKEY|ShiftMask,             XK_f,      spawn,          {.v = fixcmd } },
-        { 0,                            XF86XK_MonBrightnessUp, spawn,          {.v = bupcmd } },
-        { 0,                            XF86XK_MonBrightnessDown, spawn,          {.v = bdowncmd } },
-        { 0,                            XF86XK_Display, spawn,          {.v = bmaxcmd} },
-        { 0,                            XF86XK_AudioLowerVolume, spawn, {.v = downvol } },
-        { 0,                            XF86XK_AudioMute, spawn, {.v = mutevol } },
-        { 0,                            XF86XK_AudioRaiseVolume, spawn, {.v = upvol   } },
-        { MODKEY,                       XK_b,      togglebar,      {0} },
-        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-        { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-        { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-        { MODKEY,                       XK_o,      incnmaster,     {.i = -1 } },
-        { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-        { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-        { MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-        { MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
-        { MODKEY,                       XK_Return, zoom,           {0} },
-        { MODKEY,                       XK_Tab,    view,           {0} },
-        { MODKEY,                       XK_w,      selectclient,   {0} },
-        { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-        { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-        { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-        { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-        { MODKEY,                       XK_space,  setlayout,      {0} },
-        { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-        { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-        { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-        { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-        { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-        { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-        { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-        TAGKEYS(                        XK_1,                      0)
-        TAGKEYS(                        XK_2,                      1)
-        TAGKEYS(                        XK_3,                      2)
-        TAGKEYS(                        XK_4,                      3)
-        TAGKEYS(                        XK_5,                      4)
-        TAGKEYS(                        XK_6,                      5)
-        TAGKEYS(                        XK_7,                      6)
-        TAGKEYS(                        XK_8,                      7)
-        TAGKEYS(                        XK_9,                      8)
-        { MODKEY|ShiftMask,             XK_q,      quitprompt,           {0} },
-        { MODKEY,                       XK_minus, scratchpad_show, {0} },
-        { MODKEY|ShiftMask,             XK_minus, scratchpad_hide, {0} },
-        { MODKEY,                       XK_equal,scratchpad_remove,{0} },
-};
-
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static const Button buttons[] = {
-        /* click                event mask      button          function        argument */
-        { ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-        { ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-        { ClkWinTitle,          0,              Button2,        zoom,           {0} },
-        { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-        { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-        { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-        { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-        { ClkTagBar,            0,              Button1,        view,           {0} },
-        { ClkTagBar,            0,              Button3,        toggleview,     {0} },
-        { ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-        { ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
diff --git a/src/dwm/dwm-6.6/config.mk b/src/dwm/dwm-6.6/config.mk
deleted file mode 100644
index e3a2826..0000000
--- a/src/dwm/dwm-6.6/config.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# dwm version
-VERSION = 6.6
-
-# Customize below to fit your system
-
-# paths
-PREFIX = ${HOME}/.local
-MANPREFIX = ${PREFIX}/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-# Xinerama, comment if you don't want it
-XINERAMALIBS  = -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
-#MANPREFIX = ${PREFIX}/man
-
-# includes and libs
-INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-
-# flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-#CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
-LDFLAGS  = ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-
-# compiler and linker
-CC = cc
diff --git a/src/dwm/dwm-6.6/drw.c b/src/dwm/dwm-6.6/drw.c
deleted file mode 100644
index c41e6af..0000000
--- a/src/dwm/dwm-6.6/drw.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-#define UTF_INVALID 0xFFFD
-
-static int
-utf8decode(const char *s_in, long *u, int *err)
-{
-	static const unsigned char lens[] = {
-		/* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-		/* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0,  /* invalid */
-		/* 110XX */ 2, 2, 2, 2,
-		/* 1110X */ 3, 3,
-		/* 11110 */ 4,
-		/* 11111 */ 0,  /* invalid */
-	};
-	static const unsigned char leading_mask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
-	static const unsigned int overlong[] = { 0x0, 0x80, 0x0800, 0x10000 };
-
-	const unsigned char *s = (const unsigned char *)s_in;
-	int len = lens[*s >> 3];
-	*u = UTF_INVALID;
-	*err = 1;
-	if (len == 0)
-		return 1;
-
-	long cp = s[0] & leading_mask[len - 1];
-	for (int i = 1; i < len; ++i) {
-		if (s[i] == '\0' || (s[i] & 0xC0) != 0x80)
-			return i;
-		cp = (cp << 6) | (s[i] & 0x3F);
-	}
-	/* out of range, surrogate, overlong encoding */
-	if (cp > 0x10FFFF || (cp >> 11) == 0x1B || cp < overlong[len - 1])
-		return len;
-
-	*err = 0;
-	*u = cp;
-	return len;
-}
-
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-{
-	Drw *drw = ecalloc(1, sizeof(Drw));
-
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
-}
-
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-}
-
-void
-drw_free(Drw *drw)
-{
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	drw_fontset_free(drw->fonts);
-	free(drw);
-}
-
-/* This function is an implementation detail. Library users should use
- * drw_fontset_create instead.
- */
-static Fnt *
-xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield the
-		 * same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in missing-character
-		 * rectangles being drawn, at least with some fonts. */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font from pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->h = xfont->ascent + xfont->descent;
-	font->dpy = drw->dpy;
-
-	return font;
-}
-
-static void
-xfont_free(Fnt *font)
-{
-	if (!font)
-		return;
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	free(font);
-}
-
-Fnt*
-drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
-{
-	Fnt *cur, *ret = NULL;
-	size_t i;
-
-	if (!drw || !fonts)
-		return NULL;
-
-	for (i = 1; i <= fontcount; i++) {
-		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
-			cur->next = ret;
-			ret = cur;
-		}
-	}
-	return (drw->fonts = ret);
-}
-
-void
-drw_fontset_free(Fnt *font)
-{
-	if (font) {
-		drw_fontset_free(font->next);
-		xfont_free(font);
-	}
-}
-
-void
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-{
-	if (!drw || !dest || !clrname)
-		return;
-
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, dest))
-		die("error, cannot allocate color '%s'", clrname);
-}
-
-/* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
-Clr *
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-{
-	size_t i;
-	Clr *ret;
-
-	/* need at least two colors for a scheme */
-	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
-		return NULL;
-
-	for (i = 0; i < clrcount; i++)
-		drw_clr_create(drw, &ret[i], clrnames[i]);
-	return ret;
-}
-
-void
-drw_setfontset(Drw *drw, Fnt *set)
-{
-	if (drw)
-		drw->fonts = set;
-}
-
-void
-drw_setscheme(Drw *drw, Clr *scm)
-{
-	if (drw)
-		drw->scheme = scm;
-}
-
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
-{
-	if (!drw || !drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	else
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
-}
-
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
-{
-	int ty, ellipsis_x = 0;
-	unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1;
-	XftDraw *d = NULL;
-	Fnt *usedfont, *curfont, *nextfont;
-	int utf8strlen, utf8charlen, utf8err, render = x || y || w || h;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0, overflow = 0;
-	/* keep track of a couple codepoints for which we have no match. */
-	static unsigned int nomatches[128], ellipsis_width, invalid_width;
-	static const char invalid[] = "�";
-
-	if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
-		return 0;
-
-	if (!render) {
-		w = invert ? invert : ~invert;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		if (w < lpad)
-			return x + w;
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-		x += lpad;
-		w -= lpad;
-	}
-
-	usedfont = drw->fonts;
-	if (!ellipsis_width && render)
-		ellipsis_width = drw_fontset_getwidth(drw, "...");
-	if (!invalid_width && render)
-		invalid_width = drw_fontset_getwidth(drw, invalid);
-	while (1) {
-		ew = ellipsis_len = utf8err = utf8charlen = utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, &utf8err);
-			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
-				if (charexists) {
-					drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
-					if (ew + ellipsis_width <= w) {
-						/* keep track where the ellipsis still fits */
-						ellipsis_x = x + ew;
-						ellipsis_w = w - ew;
-						ellipsis_len = utf8strlen;
-					}
-
-					if (ew + tmpw > w) {
-						overflow = 1;
-						/* called from drw_fontset_getwidth_clamp():
-						 * it wants the width AFTER the overflow
-						 */
-						if (!render)
-							x += tmpw;
-						else
-							utf8strlen = ellipsis_len;
-					} else if (curfont == usedfont) {
-						text += utf8charlen;
-						utf8strlen += utf8err ? 0 : utf8charlen;
-						ew += utf8err ? 0 : tmpw;
-					} else {
-						nextfont = curfont;
-					}
-					break;
-				}
-			}
-
-			if (overflow || !charexists || nextfont || utf8err)
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			if (render) {
-				ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
-				XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
-				                  usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
-			}
-			x += ew;
-			w -= ew;
-		}
-		if (utf8err && (!render || invalid_width < w)) {
-			if (render)
-				drw_text(drw, x, y, w, h, 0, invalid, invert);
-			x += invalid_width;
-			w -= invalid_width;
-		}
-		if (render && overflow)
-			drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
-
-		if (!*text || overflow) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			usedfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn. */
-			charexists = 1;
-
-			hash = (unsigned int)utf8codepoint;
-			hash = ((hash >> 16) ^ hash) * 0x21F0AAAD;
-			hash = ((hash >> 15) ^ hash) * 0xD35A2D97;
-			h0 = ((hash >> 15) ^ hash) % LENGTH(nomatches);
-			h1 = (hash >> 17) % LENGTH(nomatches);
-			/* avoid expensive XftFontMatch call when we know we won't find a match */
-			if (nomatches[h0] == utf8codepoint || nomatches[h1] == utf8codepoint)
-				goto no_match;
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts->pattern) {
-				/* Refer to the comment in xfont_create for more information. */
-				die("the first font in the cache must be loaded from a font string.");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
-					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
-						; /* NOP */
-					curfont->next = usedfont;
-				} else {
-					xfont_free(usedfont);
-					nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint;
-no_match:
-					usedfont = drw->fonts;
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x + (render ? w : 0);
-}
-
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
-}
-
-unsigned int
-drw_fontset_getwidth(Drw *drw, const char *text)
-{
-	if (!drw || !drw->fonts || !text)
-		return 0;
-	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
-}
-
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
-{
-	unsigned int tmp = 0;
-	if (drw && drw->fonts && text && n)
-		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
-	return MIN(n, tmp);
-}
-
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
-{
-	XGlyphInfo ext;
-
-	if (!font || !text)
-		return;
-
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	if (w)
-		*w = ext.xOff;
-	if (h)
-		*h = font->h;
-}
-
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
-
-	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
-		return NULL;
-
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
-	return cur;
-}
-
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
-
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
-}
diff --git a/src/dwm/dwm-6.6/drw.h b/src/dwm/dwm-6.6/drw.h
deleted file mode 100644
index 6471431..0000000
--- a/src/dwm/dwm-6.6/drw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-typedef struct {
-	Cursor cursor;
-} Cur;
-
-typedef struct Fnt {
-	Display *dpy;
-	unsigned int h;
-	XftFont *xfont;
-	FcPattern *pattern;
-	struct Fnt *next;
-} Fnt;
-
-enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
-typedef XftColor Clr;
-
-typedef struct {
-	unsigned int w, h;
-	Display *dpy;
-	int screen;
-	Window root;
-	Drawable drawable;
-	GC gc;
-	Clr *scheme;
-	Fnt *fonts;
-} Drw;
-
-/* Drawable abstraction */
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-void drw_resize(Drw *drw, unsigned int w, unsigned int h);
-void drw_free(Drw *drw);
-
-/* Fnt abstraction */
-Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
-void drw_fontset_free(Fnt* set);
-unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-
-/* Colorscheme abstraction */
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *drw, int shape);
-void drw_cur_free(Drw *drw, Cur *cursor);
-
-/* Drawing context manipulation */
-void drw_setfontset(Drw *drw, Fnt *set);
-void drw_setscheme(Drw *drw, Clr *scm);
-
-/* Drawing functions */
-void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
-
-/* Map functions */
-void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
diff --git a/src/dwm/dwm-6.6/dwm.1 b/src/dwm/dwm-6.6/dwm.1
deleted file mode 100644
index ddc8321..0000000
--- a/src/dwm/dwm-6.6/dwm.1
+++ /dev/null
@@ -1,176 +0,0 @@
-.TH DWM 1 dwm\-VERSION
-.SH NAME
-dwm \- dynamic window manager
-.SH SYNOPSIS
-.B dwm
-.RB [ \-v ]
-.SH DESCRIPTION
-dwm is a dynamic window manager for X. It manages windows in tiled, monocle
-and floating layouts. Either layout can be applied dynamically, optimising the
-environment for the application in use and the task performed.
-.P
-In tiled layouts windows are managed in a master and stacking area. The master
-area on the left contains one window by default, and the stacking area on the
-right contains all other windows. The number of master area windows can be
-adjusted from zero to an arbitrary number. In monocle layout all windows are
-maximised to the screen size. In floating layout windows can be resized and
-moved freely. Dialog windows are always managed floating, regardless of the
-layout applied.
-.P
-Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting certain tags displays all windows with these tags.
-.P
-Each screen contains a small status bar which displays all available tags, the
-layout, the title of the focused window, and the text read from the root window
-name property, if the screen is focused. A floating window is indicated with an
-empty square and a maximised floating window is indicated with a filled square
-before the windows title.  The selected tags are indicated with a different
-color. The tags of the focused window are indicated with a filled square in the
-top left corner.  The tags which are applied to one or more windows are
-indicated with an empty square in the top left corner.
-.P
-dwm draws a small border around windows to indicate the focus state.
-.SH OPTIONS
-.TP
-.B \-v
-prints version information to stderr, then exits.
-.SH USAGE
-.SS Status bar
-.TP
-.B X root window name
-is read and displayed in the status text area. It can be set with the
-.BR xsetroot (1)
-command.
-.TP
-.B Button1
-click on a tag label to display all windows with that tag, click on the layout
-label toggles between tiled and floating layout.
-.TP
-.B Button3
-click on a tag label adds/removes all windows with that tag to/from the view.
-.TP
-.B Mod1\-Button1
-click on a tag label applies that tag to the focused window.
-.TP
-.B Mod1\-Button3
-click on a tag label adds/removes that tag to/from the focused window.
-.SS Keyboard commands
-.TP
-.B Mod1\-Shift\-Return
-Start
-.BR st(1).
-.TP
-.B Mod1\-p
-Spawn
-.BR dmenu(1)
-for launching other programs.
-.TP
-.B Mod1\-,
-Focus previous screen, if any.
-.TP
-.B Mod1\-.
-Focus next screen, if any.
-.TP
-.B Mod1\-Shift\-,
-Send focused window to previous screen, if any.
-.TP
-.B Mod1\-Shift\-.
-Send focused window to next screen, if any.
-.TP
-.B Mod1\-b
-Toggles bar on and off.
-.TP
-.B Mod1\-t
-Sets tiled layout.
-.TP
-.B Mod1\-f
-Sets floating layout.
-.TP
-.B Mod1\-m
-Sets monocle layout.
-.TP
-.B Mod1\-space
-Toggles between current and previous layout.
-.TP
-.B Mod1\-j
-Focus next window.
-.TP
-.B Mod1\-k
-Focus previous window.
-.TP
-.B Mod1\-i
-Increase number of windows in master area.
-.TP
-.B Mod1\-d
-Decrease number of windows in master area.
-.TP
-.B Mod1\-l
-Increase master area size.
-.TP
-.B Mod1\-h
-Decrease master area size.
-.TP
-.B Mod1\-Return
-Zooms/cycles focused window to/from master area (tiled layouts only).
-.TP
-.B Mod1\-Shift\-c
-Close focused window.
-.TP
-.B Mod1\-Shift\-space
-Toggle focused window between tiled and floating state.
-.TP
-.B Mod1\-Tab
-Toggles to the previously selected tags.
-.TP
-.B Mod1\-Shift\-[1..n]
-Apply nth tag to focused window.
-.TP
-.B Mod1\-Shift\-0
-Apply all tags to focused window.
-.TP
-.B Mod1\-Control\-Shift\-[1..n]
-Add/remove nth tag to/from focused window.
-.TP
-.B Mod1\-[1..n]
-View all windows with nth tag.
-.TP
-.B Mod1\-0
-View all windows with any tag.
-.TP
-.B Mod1\-Control\-[1..n]
-Add/remove all windows with nth tag to/from the view.
-.TP
-.B Mod1\-Shift\-q
-Quit dwm.
-.SS Mouse commands
-.TP
-.B Mod1\-Button1
-Move focused window while dragging. Tiled windows will be toggled to the floating state.
-.TP
-.B Mod1\-Button2
-Toggles focused window between floating and tiled state.
-.TP
-.B Mod1\-Button3
-Resize focused window while dragging. Tiled windows will be toggled to the floating state.
-.SH CUSTOMIZATION
-dwm is customized by creating a custom config.h and (re)compiling the source
-code. This keeps it fast, secure and simple.
-.SH SEE ALSO
-.BR dmenu (1),
-.BR st (1)
-.SH ISSUES
-Java applications which use the XToolkit/XAWT backend may draw grey windows
-only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
-JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
-are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the
-environment variable
-.BR AWT_TOOLKIT=MToolkit
-(to use the older Motif backend instead) or running
-.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D
-or
-.B wmname LG3D
-(to pretend that a non-reparenting window manager is running that the
-XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
-.BR _JAVA_AWT_WM_NONREPARENTING=1 .
-.SH BUGS
-Send all bug reports with a patch to hackers@suckless.org.
diff --git a/src/dwm/dwm-6.6/dwm.c b/src/dwm/dwm-6.6/dwm.c
deleted file mode 100644
index f2dcadd..0000000
--- a/src/dwm/dwm-6.6/dwm.c
+++ /dev/null
@@ -1,2878 +0,0 @@
-/* See LICENSE file for copyright and license details.
- *
- * dynamic window manager is designed like any other X client as well. It is
- * driven through handling X events. In contrast to other X clients, a window
- * manager selects for SubstructureRedirectMask on the root window, to receive
- * events about window (dis-)appearance. Only one X connection at a time is
- * allowed to select for this event mask.
- *
- * The event handlers of dwm are organized in an array which is accessed
- * whenever a new event has been fetched. This allows event dispatching
- * in O(1) time.
- *
- * Each child of the root window is called a client, except windows which have
- * set the override_redirect flag. Clients are organized in a linked client
- * list on each monitor, the focus history is remembered through a stack list
- * on each monitor. Each client contains a bit array to indicate the tags of a
- * client.
- *
- * Keys and tagging rules are organized as arrays and defined in config.h.
- *
- * To understand everything else, start reading main().
- */
-#include <errno.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif /* XINERAMA */
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-/* macros */
-#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
-#define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
-                               * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
-#define ISVISIBLE(C, M)         ((C->tags & M->tagset[M->seltags]))
-#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
-#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
-#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-#define TAGMASK                 ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-#define SYSTEM_TRAY_REQUEST_DOCK    0
-/* XEMBED messages */
-#define XEMBED_EMBEDDED_NOTIFY      0
-#define XEMBED_WINDOW_ACTIVATE      1
-#define XEMBED_FOCUS_IN             4
-#define XEMBED_MODALITY_ON         10
-#define XEMBED_MAPPED              (1 << 0)
-#define XEMBED_WINDOW_ACTIVATE      1
-#define XEMBED_WINDOW_DEACTIVATE    2
-#define VERSION_MAJOR               0
-#define VERSION_MINOR               0
-#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
-
-/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { SchemeNorm, SchemeSel }; /* color schemes */
-enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
-       NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
-       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
-enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-
-typedef union {
-        int i;
-        unsigned int ui;
-        float f;
-        const void *v;
-} Arg;
-
-typedef struct {
-        unsigned int click;
-        unsigned int mask;
-        unsigned int button;
-        void (*func)(const Arg *arg);
-        const Arg arg;
-} Button;
-
-typedef struct Clientlist Clientlist;
-typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
-        char name[256];
-        float mina, maxa;
-        int x, y, w, h;
-        int oldx, oldy, oldw, oldh;
-        int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
-        int bw, oldbw;
-        unsigned int tags;
-        int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-        Client *next;
-        Client *snext;
-        Monitor *mon;
-        Window win;
-};
-
-typedef struct {
-        unsigned int mod;
-        KeySym keysym;
-        void (*func)(const Arg *);
-        const Arg arg;
-} Key;
-
-typedef struct {
-        const char *symbol;
-        void (*arrange)(Monitor *);
-} Layout;
-
-struct Monitor {
-        char ltsymbol[16];
-        float mfact;
-        int nmaster;
-        int num;
-        int by;               /* bar geometry */
-        int mx, my, mw, mh;   /* screen size */
-        int wx, wy, ww, wh;   /* window area  */
-        unsigned int seltags;
-        unsigned int sellt;
-        unsigned int tagset[2];
-        int showbar;
-        int topbar;
-        Clientlist *cl;
-        Client *sel;
-        Monitor *next;
-        Window barwin;
-        const Layout *lt[2];
-};
-
-typedef struct {
-        const char *class;
-        const char *instance;
-        const char *title;
-        unsigned int tags;
-        int isfloating;
-        int monitor;
-} Rule;
-
-struct Clientlist {
-        Client *clients;
-        Client *stack;
-};
-
-typedef struct Systray   Systray;
-struct Systray {
-        Window win;
-        Client *icons;
-};
-
-/* function declarations */
-static void applyrules(Client *c);
-static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-static void arrange(Monitor *m);
-static void arrangemon(Monitor *m);
-static void attach(Client *c);
-static void attachclients(Monitor *m);
-static void attachstack(Client *c);
-static void buttonpress(XEvent *e);
-static void checkotherwm(void);
-static void cleanup(void);
-static void cleanupmon(Monitor *mon);
-static void clientmessage(XEvent *e);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static Monitor *createmon(void);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static Monitor *dirtomon(int dir);
-static void drawbar(Monitor *m);
-static void drawbars(void);
-/*
- * static void enternotify(XEvent *e);
- */
-static void expose(XEvent *e);
-static void focus(Client *c);
-static void focusin(XEvent *e);
-static void focusmon(const Arg *arg);
-static void focusstack(const Arg *arg);
-static Atom getatomprop(Client *c, Atom prop);
-static int getrootptr(int *x, int *y);
-static long getstate(Window w);
-static unsigned int getsystraywidth();
-static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, int focused);
-static void grabkeys(void);
-static void incnmaster(const Arg *arg);
-static void keypress(XEvent *e);
-static void killclient(const Arg *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void monocle(Monitor *m);
-static void motionnotify(XEvent *e);
-static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c, Monitor *m);
-static void pop(Client *c);
-static void propertynotify(XEvent *e);
-static void quit(const Arg *arg);
-static void quitprompt(const Arg *arg);
-static Monitor *recttomon(int x, int y, int w, int h);
-static void removesystrayicon(Client *i);
-static void resize(Client *c, int x, int y, int w, int h, int interact);
-static void resizebarwin(Monitor *m);
-static void resizeclient(Client *c, int x, int y, int w, int h);
-static void resizemouse(const Arg *arg);
-static void resizerequest(XEvent *e);
-static void restack(Monitor *m);
-static void run(void);
-static void scan(void);
-static void scratchpad_hide ();
-static _Bool scratchpad_last_showed_is_killed (void);
-static void scratchpad_remove ();
-static void scratchpad_show ();
-static void scratchpad_show_client (Client * c);
-static void scratchpad_show_first (void);
-static void selectclient(const Arg *arg);
-static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
-static void sendmon(Client *c, Monitor *m);
-static void setclientstate(Client *c, long state);
-static void setfocus(Client *c);
-static void setfullscreen(Client *c, int fullscreen);
-static void setlayout(const Arg *arg);
-static void setmfact(const Arg *arg);
-static void setup(void);
-static void seturgent(Client *c, int urg);
-static void showhide(Client *c);
-static void spawn(const Arg *arg);
-static Monitor *systraytomon(Monitor *m);
-static void tag(const Arg *arg);
-static void tagmon(const Arg *arg);
-static void tile(Monitor *m);
-static void togglebar(const Arg *arg);
-static void togglefloating(const Arg *arg);
-static void toggletag(const Arg *arg);
-static void toggleview(const Arg *arg);
-static void unfocus(Client *c, int setfocus);
-static void unmanage(Client *c, int destroyed);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(Monitor *m);
-static void updatebars(void);
-static void updateclientlist(void);
-static int updategeom(void);
-static void updatenumlockmask(void);
-static void updatesizehints(Client *c);
-static void updatestatus(void);
-static void updatesystray(void);
-static void updatesystrayicongeom(Client *i, int w, int h);
-static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
-static void updatetitle(Client *c);
-static void updatewindowtype(Client *c);
-static void updatewmhints(Client *c);
-static void view(const Arg *arg);
-static void warp(const Client *c);
-static Client *wintoclient(Window w);
-static Monitor *wintomon(Window w);
-static Client *wintosystrayicon(Window w);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dpy, XErrorEvent *ee);
-static int xerrorstart(Display *dpy, XErrorEvent *ee);
-static void zoom(const Arg *arg);
-
-/* variables */
-static Systray *systray = NULL;
-static const char broken[] = "broken";
-static char stext[256];
-static int screen;
-static int sw, sh;           /* X display screen geometry width, height */
-static int bh;               /* bar height */
-static int lrpad;            /* sum of left and right padding for text */
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
-        [ButtonPress] = buttonpress,
-        [ClientMessage] = clientmessage,
-        [ConfigureRequest] = configurerequest,
-        [ConfigureNotify] = configurenotify,
-        [DestroyNotify] = destroynotify,
-        /* [EnterNotify] = enternotify, */
-        [Expose] = expose,
-        [FocusIn] = focusin,
-        [KeyPress] = keypress,
-        [MappingNotify] = mappingnotify,
-        [MapRequest] = maprequest,
-        [MotionNotify] = motionnotify,
-        [PropertyNotify] = propertynotify,
-        [ResizeRequest] = resizerequest,
-        [UnmapNotify] = unmapnotify
-};
-static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
-static int running = 1;
-static int restart = 1;
-static Cur *cursor[CurLast];
-static Clr **scheme;
-static Display *dpy;
-static Drw *drw;
-static Monitor *mons, *selmon;
-static Window root, wmcheckwin;
-static Clientlist *cl;
-
-/* scratchpad */
-# define SCRATCHPAD_MASK (1u << sizeof tags / sizeof * tags)
-static Client * scratchpad_last_showed = NULL;
-
-/* configuration, allows nested code to access above variables */
-#include "config.h"
-
-/* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags { char limitexceeded[LENGTH(tags) > 30 ? -1 : 1]; };
-
-/* function implementations */
-void
-applyrules(Client *c)
-{
-        const char *class, *instance;
-        unsigned int i;
-        const Rule *r;
-        Monitor *m;
-        XClassHint ch = { NULL, NULL };
-
-        /* rule matching */
-        c->isfloating = 0;
-        c->tags = 0;
-        XGetClassHint(dpy, c->win, &ch);
-        class    = ch.res_class ? ch.res_class : broken;
-        instance = ch.res_name  ? ch.res_name  : broken;
-
-        for (i = 0; i < LENGTH(rules); i++) {
-                r = &rules[i];
-                if ((!r->title || strstr(c->name, r->title))
-                && (!r->class || strstr(class, r->class))
-                && (!r->instance || strstr(instance, r->instance)))
-                {
-                        c->isfloating = r->isfloating;
-                        c->tags |= r->tags;
-                        for (m = mons; m && (m->tagset[m->seltags] & c->tags) == 0; m = m->next);
-                        if (m)
-                                c->mon = m;
-                }
-        }
-        if (ch.res_class)
-                XFree(ch.res_class);
-        if (ch.res_name)
-                XFree(ch.res_name);
-        if (c->tags != SCRATCHPAD_MASK)
-                c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
-}
-
-int
-applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
-{
-        int baseismin;
-        Monitor *m = c->mon;
-
-        /* set minimum possible */
-        *w = MAX(1, *w);
-        *h = MAX(1, *h);
-        if (interact) {
-                if (*x > sw)
-                        *x = sw - WIDTH(c);
-                if (*y > sh)
-                        *y = sh - HEIGHT(c);
-                if (*x + *w + 2 * c->bw < 0)
-                        *x = 0;
-                if (*y + *h + 2 * c->bw < 0)
-                        *y = 0;
-        } else {
-                if (*x >= m->wx + m->ww)
-                        *x = m->wx + m->ww - WIDTH(c);
-                if (*y >= m->wy + m->wh)
-                        *y = m->wy + m->wh - HEIGHT(c);
-                if (*x + *w + 2 * c->bw <= m->wx)
-                        *x = m->wx;
-                if (*y + *h + 2 * c->bw <= m->wy)
-                        *y = m->wy;
-        }
-        if (*h < bh)
-                *h = bh;
-        if (*w < bh)
-                *w = bh;
-        if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
-                if (!c->hintsvalid)
-                        updatesizehints(c);
-                /* see last two sentences in ICCCM 4.1.2.3 */
-                baseismin = c->basew == c->minw && c->baseh == c->minh;
-                if (!baseismin) { /* temporarily remove base dimensions */
-                        *w -= c->basew;
-                        *h -= c->baseh;
-                }
-                /* adjust for aspect limits */
-                if (c->mina > 0 && c->maxa > 0) {
-                        if (c->maxa < (float)*w / *h)
-                                *w = *h * c->maxa + 0.5;
-                        else if (c->mina < (float)*h / *w)
-                                *h = *w * c->mina + 0.5;
-                }
-                if (baseismin) { /* increment calculation requires this */
-                        *w -= c->basew;
-                        *h -= c->baseh;
-                }
-                /* adjust for increment value */
-                if (c->incw)
-                        *w -= *w % c->incw;
-                if (c->inch)
-                        *h -= *h % c->inch;
-                /* restore base dimensions */
-                *w = MAX(*w + c->basew, c->minw);
-                *h = MAX(*h + c->baseh, c->minh);
-                if (c->maxw)
-                        *w = MIN(*w, c->maxw);
-                if (c->maxh)
-                        *h = MIN(*h, c->maxh);
-        }
-        return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
-}
-
-void
-arrange(Monitor *m)
-{
-        if (m)
-                showhide(m->cl->stack);
-        else for (m = mons; m; m = m->next)
-                showhide(m->cl->stack);
-        if (m) {
-                arrangemon(m);
-                restack(m);
-        } else for (m = mons; m; m = m->next)
-                arrangemon(m);
-}
-
-void
-arrangemon(Monitor *m)
-{
-        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
-        if (m->lt[m->sellt]->arrange)
-                m->lt[m->sellt]->arrange(m);
-}
-
-void
-attach(Client *c)
-{
-        c->next = c->mon->cl->clients;
-        c->mon->cl->clients = c;
-}
-
-void
-attachclients(Monitor *m) {
-        /* attach clients to the specified monitor */
-        Monitor *tm;
-        Client *c;
-        unsigned int utags = 0;
-        Bool rmons = False;
-        if(!m)
-                return;
-
-        /* collect information about the tags in use */
-        for (tm = mons; tm; tm = tm->next)
-                if(tm != m)
-                        utags |= tm->tagset[tm->seltags];
-
-        for (c = m->cl->clients; c; c = c->next)
-                if(ISVISIBLE(c, m)) {
-                        /* if client is also visible on other tags that are displayed on
-                         * other monitors, remove these tags */
-                        if(c->tags & utags) {
-                                c->tags = c->tags & m->tagset[m->seltags];
-                                rmons = True;
-                        }
-                        unfocus(c, True);
-                        c->mon = m;
-                }
-
-        if (rmons)
-                for (tm = mons; tm; tm = tm->next)
-                        if(tm != m)
-                                arrange(tm);
-
-}
-
-void
-attachstack(Client *c)
-{
-        c->snext = c->mon->cl->stack;
-        c->mon->cl->stack = c;
-}
-
-void
-buttonpress(XEvent *e)
-{
-        unsigned int i, x, click;
-        Arg arg = {0};
-        Client *c;
-        Monitor *m;
-        XButtonPressedEvent *ev = &e->xbutton;
-
-        click = ClkRootWin;
-        /* focus monitor if necessary */
-        if ((m = wintomon(ev->window)) && m != selmon) {
-                unfocus(selmon->sel, 1);
-                selmon = m;
-                focus(NULL);
-        }
-        if (ev->window == selmon->barwin) {
-                i = x = 0;
-                do
-                        x += TEXTW(tags[i]);
-                while (ev->x >= x && ++i < LENGTH(tags));
-                if (i < LENGTH(tags)) {
-                        click = ClkTagBar;
-                        arg.ui = 1 << i;
-                } else if (ev->x < x + TEXTW(selmon->ltsymbol))
-                        click = ClkLtSymbol;
-                else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
-                        click = ClkStatusText;
-                else
-                        click = ClkWinTitle;
-        } else if ((c = wintoclient(ev->window))) {
-                focus(c);
-                restack(selmon);
-                XAllowEvents(dpy, ReplayPointer, CurrentTime);
-                click = ClkClientWin;
-        }
-        for (i = 0; i < LENGTH(buttons); i++)
-                if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-                && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-                        buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-}
-
-void
-checkotherwm(void)
-{
-        xerrorxlib = XSetErrorHandler(xerrorstart);
-        /* this causes an error if some other window manager is running */
-        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
-        XSync(dpy, False);
-        XSetErrorHandler(xerror);
-        XSync(dpy, False);
-}
-
-void
-cleanup(void)
-{
-        Arg a = {.ui = ~0};
-        Layout foo = { "", NULL };
-        Monitor *m;
-        size_t i;
-
-        view(&a);
-        selmon->lt[selmon->sellt] = &foo;
-        for (m = mons; m; m = m->next)
-                while (m->cl->stack)
-                        unmanage(m->cl->stack, 0);
-        XUngrabKey(dpy, AnyKey, AnyModifier, root);
-        while (mons)
-                cleanupmon(mons);
-        if (showsystray) {
-                XUnmapWindow(dpy, systray->win);
-                XDestroyWindow(dpy, systray->win);
-                free(systray);
-        }
-        for (i = 0; i < CurLast; i++)
-                drw_cur_free(drw, cursor[i]);
-        for (i = 0; i < LENGTH(colors); i++)
-                free(scheme[i]);
-        free(scheme);
-        XDestroyWindow(dpy, wmcheckwin);
-        drw_free(drw);
-        XSync(dpy, False);
-        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-}
-
-void
-cleanupmon(Monitor *mon)
-{
-        Monitor *m;
-
-        if (mon == mons)
-                mons = mons->next;
-        else {
-                for (m = mons; m && m->next != mon; m = m->next);
-                m->next = mon->next;
-        }
-        XUnmapWindow(dpy, mon->barwin);
-        XDestroyWindow(dpy, mon->barwin);
-        free(mon);
-}
-
-void
-clientmessage(XEvent *e)
-{
-        XWindowAttributes wa;
-        XSetWindowAttributes swa;
-        XClientMessageEvent *cme = &e->xclient;
-        Client *c = wintoclient(cme->window);
-
-        if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
-                /* add systray icons */
-                if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
-                        if (!(c = (Client *)calloc(1, sizeof(Client))))
-                                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
-                        if (!(c->win = cme->data.l[2])) {
-                                free(c);
-                                return;
-                        }
-                        c->mon = selmon;
-                        c->next = systray->icons;
-                        systray->icons = c;
-                        if (!XGetWindowAttributes(dpy, c->win, &wa)) {
-                                /* use sane defaults */
-                                wa.width = bh;
-                                wa.height = bh;
-                                wa.border_width = 0;
-                        }
-                        c->x = c->oldx = c->y = c->oldy = 0;
-                        c->w = c->oldw = wa.width;
-                        c->h = c->oldh = wa.height;
-                        c->oldbw = wa.border_width;
-                        c->bw = 0;
-                        c->isfloating = True;
-                        /* reuse tags field as mapped status */
-                        c->tags = 1;
-                        updatesizehints(c);
-                        updatesystrayicongeom(c, wa.width, wa.height);
-                        XAddToSaveSet(dpy, c->win);
-                        XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
-                        XReparentWindow(dpy, c->win, systray->win, 0, 0);
-                        /* use parents background color */
-                        swa.background_pixel  = scheme[SchemeNorm][ColBg].pixel;
-                        XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
-                        sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-                        /* FIXME not sure if I have to send these events, too */
-                        sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-                        sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-                        sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-                        XSync(dpy, False);
-                        resizebarwin(selmon);
-                        updatesystray();
-                        setclientstate(c, NormalState);
-                }
-                return;
-        }
-        if (!c)
-                return;
-        if (cme->message_type == netatom[NetWMState]) {
-                if (cme->data.l[1] == netatom[NetWMFullscreen]
-                || cme->data.l[2] == netatom[NetWMFullscreen])
-                        setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
-                                || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-        } else if (cme->message_type == netatom[NetActiveWindow]) {
-                if (c != selmon->sel && !c->isurgent)
-                        seturgent(c, 1);
-        }
-}
-
-void
-configure(Client *c)
-{
-        XConfigureEvent ce;
-
-        ce.type = ConfigureNotify;
-        ce.display = dpy;
-        ce.event = c->win;
-        ce.window = c->win;
-        ce.x = c->x;
-        ce.y = c->y;
-        ce.width = c->w;
-        ce.height = c->h;
-        ce.border_width = c->bw;
-        ce.above = None;
-        ce.override_redirect = False;
-        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
-}
-
-void
-configurenotify(XEvent *e)
-{
-        Monitor *m;
-        Client *c;
-        XConfigureEvent *ev = &e->xconfigure;
-        int dirty;
-
-        /* TODO: updategeom handling sucks, needs to be simplified */
-        if (ev->window == root) {
-                dirty = (sw != ev->width || sh != ev->height);
-                sw = ev->width;
-                sh = ev->height;
-                if (updategeom() || dirty) {
-                        drw_resize(drw, sw, bh);
-                        updatebars();
-                        for (m = mons; m; m = m->next) {
-                                for (c = m->cl->clients; c; c = c->next)
-                                        if (c->isfullscreen)
-                                                resizeclient(c, m->mx, m->my, m->mw, m->mh);
-                                resizebarwin(m);
-                        }
-                        focus(NULL);
-                        arrange(NULL);
-                }
-        }
-}
-
-void
-configurerequest(XEvent *e)
-{
-        Client *c;
-        Monitor *m;
-        XConfigureRequestEvent *ev = &e->xconfigurerequest;
-        XWindowChanges wc;
-
-        if ((c = wintoclient(ev->window))) {
-                if (ev->value_mask & CWBorderWidth)
-                        c->bw = ev->border_width;
-                else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
-                        m = c->mon;
-                        if (ev->value_mask & CWX) {
-                                c->oldx = c->x;
-                                c->x = m->mx + ev->x;
-                        }
-                        if (ev->value_mask & CWY) {
-                                c->oldy = c->y;
-                                c->y = m->my + ev->y;
-                        }
-                        if (ev->value_mask & CWWidth) {
-                                c->oldw = c->w;
-                                c->w = ev->width;
-                        }
-                        if (ev->value_mask & CWHeight) {
-                                c->oldh = c->h;
-                                c->h = ev->height;
-                        }
-                        if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
-                                c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
-                        if ((c->y + c->h) > m->my + m->mh && c->isfloating)
-                                c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
-                        if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
-                                configure(c);
-                        if (ISVISIBLE(c, m))
-                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-                } else
-                        configure(c);
-        } else {
-                wc.x = ev->x;
-                wc.y = ev->y;
-                wc.width = ev->width;
-                wc.height = ev->height;
-                wc.border_width = ev->border_width;
-                wc.sibling = ev->above;
-                wc.stack_mode = ev->detail;
-                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-        }
-        XSync(dpy, False);
-}
-
-Monitor *
-createmon(void)
-{
-        Monitor *m, *tm;
-        int i;
-
-        /* bail out if the number of monitors exceeds the number of tags */
-        for (i=1, tm=mons; tm; i++, tm=tm->next);
-        if (i > LENGTH(tags)) {
-                fprintf(stderr, "dwm: failed to add monitor, number of tags exceeded\n");
-                return NULL;
-        }
-        /* find the first tag that isn't in use */
-        for (i=0; i < LENGTH(tags); i++) {
-                for (tm=mons; tm && !(tm->tagset[tm->seltags] & (1<<i)); tm=tm->next);
-                if (!tm)
-                        break;
-        }
-        /* reassign all tags to monitors since there's currently no free tag for the
-         * new monitor */
-        if (i >= LENGTH(tags))
-                for (i=0, tm=mons; tm; tm=tm->next, i++) {
-                        tm->seltags ^= 1;
-                        tm->tagset[tm->seltags] = (1<<i) & TAGMASK;
-                }
-
-        m = ecalloc(1, sizeof(Monitor));
-        m->cl = cl;
-        m->tagset[0] = m->tagset[1] = (1<<i) & TAGMASK;
-        m->mfact = mfact;
-        m->nmaster = nmaster;
-        m->showbar = showbar;
-        m->topbar = topbar;
-        m->lt[0] = &layouts[0];
-        m->lt[1] = &layouts[1 % LENGTH(layouts)];
-        strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-        return m;
-}
-
-void
-destroynotify(XEvent *e)
-{
-        Client *c;
-        XDestroyWindowEvent *ev = &e->xdestroywindow;
-
-        if ((c = wintoclient(ev->window)))
-                unmanage(c, 1);
-        else if ((c = wintosystrayicon(ev->window))) {
-                removesystrayicon(c);
-                resizebarwin(selmon);
-                updatesystray();
-        }
-}
-
-void
-detach(Client *c)
-{
-        Client **tc;
-
-        for (tc = &c->mon->cl->clients; *tc && *tc != c; tc = &(*tc)->next);
-        *tc = c->next;
-}
-
-void
-detachstack(Client *c)
-{
-        Client **tc, *t;
-
-        for (tc = &c->mon->cl->stack; *tc && *tc != c; tc = &(*tc)->snext);
-        *tc = c->snext;
-
-        if (c == c->mon->sel) {
-                for (t = c->mon->cl->stack; t && !ISVISIBLE(t, c->mon); t = t->snext);
-                c->mon->sel = t;
-        }
-}
-
-Monitor *
-dirtomon(int dir)
-{
-        Monitor *m = NULL;
-
-        if (dir > 0) {
-                if (!(m = selmon->next))
-                        m = mons;
-        } else if (selmon == mons)
-                for (m = mons; m->next; m = m->next);
-        else
-                for (m = mons; m->next != selmon; m = m->next);
-        return m;
-}
-void
-drawbar(Monitor *m)
-{
-        int x, w, tw = 0, stw = 0;
-        int boxs = drw->fonts->h / 9;
-        int boxw = drw->fonts->h / 6 + 2;
-        unsigned int i, occ = 0, urg = 0;
-        Client *c;
-        if (!m->showbar)
-                return;
-
-        if(showsystray && m == systraytomon(m) && !systrayonleft)
-                stw = getsystraywidth();
-
-        /* draw status first so it can be overdrawn by tags later */
-        if (m == selmon) { /* status is only drawn on selected monitor */
-                drw_setscheme(drw, scheme[SchemeNorm]);
-                tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */
-                drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0);
-        }
-        resizebarwin(m);
-        for (c = m->cl->clients; c; c = c->next) {
-                occ |= c->tags;
-                if (c->isurgent)
-                        urg |= c->tags;
-        }
-        x = 0;
-        for (i = 0; i < LENGTH(tags); i++) {
-                w = TEXTW(tags[i]);
-                drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-                drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-                if (occ & 1 << i)
-                        drw_rect(drw, x + boxs, boxs, boxw, boxw,
-                                m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-                                urg & 1 << i);
-                x += w;
-        }
-        w = TEXTW(m->ltsymbol);
-        drw_setscheme(drw, scheme[SchemeNorm]);
-        x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
-        if ((w = m->ww - tw - stw - x) > bh) {
-                if (m->sel) {
-                        drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-                        drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
-                        if (m->sel->isfloating)
-                                drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
-                } else {
-                        drw_setscheme(drw, scheme[SchemeNorm]);
-                        drw_rect(drw, x, 0, w, bh, 1, 1);
-                }
-        }
-        drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
-}
-
-void
-drawbars(void)
-{
-        Monitor *m;
-
-        for (m = mons; m; m = m->next)
-                drawbar(m);
-}
-
-/*
- * void
- * enternotify(XEvent *e)
- * {
- *         Client *c;
- *         Monitor *m;
- *         XCrossingEvent *ev = &e->xcrossing;
- *
- *         if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
- *                 return;
- *         c = wintoclient(ev->window);
- *         m = c ? c->mon : wintomon(ev->window);
- *         if (m != selmon) {
- *                 unfocus(selmon->sel, 1);
- *                 selmon = m;
- *         } else if (!c || c == selmon->sel)
- *                 return;
- *         focus(c);
- * }
- */
-
-void
-expose(XEvent *e)
-{
-        Monitor *m;
-        XExposeEvent *ev = &e->xexpose;
-
-        if (ev->count == 0 && (m = wintomon(ev->window))) {
-                drawbar(m);
-                if (m == selmon)
-                        updatesystray();
-        }
-}
-
-void
-focus(Client *c)
-{
-        if (!c || !ISVISIBLE(c, selmon))
-                for (c = selmon->cl->stack; c && !ISVISIBLE(c, selmon); c = c->snext);
-        if (selmon->sel && selmon->sel != c)
-                unfocus(selmon->sel, 0);
-        if (c) {
-                if (c->mon != selmon)
-                        selmon = c->mon;
-                if (c->isurgent)
-                        seturgent(c, 0);
-                detachstack(c);
-                attachstack(c);
-                grabbuttons(c, 1);
-                XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
-                setfocus(c);
-        } else {
-                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-        }
-        selmon->sel = c;
-        drawbars();
-}
-
-/* there are some broken focus acquiring clients needing extra handling */
-void
-focusin(XEvent *e)
-{
-        XFocusChangeEvent *ev = &e->xfocus;
-
-        if (selmon->sel && ev->window != selmon->sel->win)
-                setfocus(selmon->sel);
-}
-
-void
-focusmon(const Arg *arg)
-{
-        Monitor *m;
-
-        if (!mons->next)
-                return;
-        if ((m = dirtomon(arg->i)) == selmon)
-                return;
-        unfocus(selmon->sel, 0);
-        selmon = m;
-        focus(NULL);
-        warp(selmon->sel);
-}
-
-void
-focusstack(const Arg *arg)
-{
-        Client *c = NULL, *i;
-
-        if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
-                return;
-        if (arg->i > 0) {
-                for (c = selmon->sel->next; c && !ISVISIBLE(c, selmon); c = c->next);
-                if (!c)
-                        for (c = selmon->cl->clients; c && !ISVISIBLE(c, selmon); c = c->next);
-        } else {
-                for (i = selmon->cl->clients; i != selmon->sel; i = i->next)
-                        if (ISVISIBLE(i, selmon))
-                                c = i;
-                if (!c)
-                        for (; i; i = i->next)
-                                if (ISVISIBLE(i, selmon))
-                                        c = i;
-        }
-        if (c) {
-                focus(c);
-                restack(selmon);
-        }
-}
-
-Atom
-getatomprop(Client *c, Atom prop)
-{
-        int di;
-        unsigned long dl, nitems;
-        unsigned char *p = NULL;
-        Atom da, atom = None;
-
-        /* FIXME getatomprop should return the number of items and a pointer to
-         * the stored data instead of this workaround */
-        Atom req = XA_ATOM;
-        if (prop == xatom[XembedInfo])
-                req = xatom[XembedInfo];
-
-        if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
-                &da, &di, &nitems, &dl, &p) == Success && p) {
-                atom = *(Atom *)p;
-                if (da == xatom[XembedInfo] && nitems == 2)
-                        atom = ((Atom *)p)[1];
-                XFree(p);
-        }
-        return atom;
-}
-
-unsigned int
-getsystraywidth()
-{
-        unsigned int w = 0;
-        Client *i;
-        if(showsystray)
-                for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
-        return w ? w + systrayspacing : 1;
-}
-
-int
-getrootptr(int *x, int *y)
-{
-        int di;
-        unsigned int dui;
-        Window dummy;
-
-        return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
-}
-
-long
-getstate(Window w)
-{
-        int format;
-        long result = -1;
-        unsigned char *p = NULL;
-        unsigned long n, extra;
-        Atom real;
-
-        if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                &real, &format, &n, &extra, (unsigned char **)&p) != Success)
-                return -1;
-        if (n != 0)
-                result = *p;
-        XFree(p);
-        return result;
-}
-
-int
-gettextprop(Window w, Atom atom, char *text, unsigned int size)
-{
-        char **list = NULL;
-        int n;
-        XTextProperty name;
-
-        if (!text || size == 0)
-                return 0;
-        text[0] = '\0';
-        if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
-                return 0;
-        if (name.encoding == XA_STRING) {
-                strncpy(text, (char *)name.value, size - 1);
-        } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
-                strncpy(text, *list, size - 1);
-                XFreeStringList(list);
-        }
-        text[size - 1] = '\0';
-        XFree(name.value);
-        return 1;
-}
-
-void
-grabbuttons(Client *c, int focused)
-{
-        updatenumlockmask();
-        {
-                unsigned int i, j;
-                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-                if (!focused)
-                        XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-                                BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
-                for (i = 0; i < LENGTH(buttons); i++)
-                        if (buttons[i].click == ClkClientWin)
-                                for (j = 0; j < LENGTH(modifiers); j++)
-                                        XGrabButton(dpy, buttons[i].button,
-                                                buttons[i].mask | modifiers[j],
-                                                c->win, False, BUTTONMASK,
-                                                GrabModeAsync, GrabModeSync, None, None);
-        }
-}
-
-void
-grabkeys(void)
-{
-        updatenumlockmask();
-        {
-                unsigned int i, j, k;
-                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-                int start, end, skip;
-                KeySym *syms;
-
-                XUngrabKey(dpy, AnyKey, AnyModifier, root);
-                XDisplayKeycodes(dpy, &start, &end);
-                syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
-                if (!syms)
-                        return;
-                for (k = start; k <= end; k++)
-                        for (i = 0; i < LENGTH(keys); i++)
-                                /* skip modifier codes, we do that ourselves */
-                                if (keys[i].keysym == syms[(k - start) * skip])
-                                        for (j = 0; j < LENGTH(modifiers); j++)
-                                                XGrabKey(dpy, k,
-                                                         keys[i].mod | modifiers[j],
-                                                         root, True,
-                                                         GrabModeAsync, GrabModeAsync);
-                XFree(syms);
-        }
-}
-
-void
-incnmaster(const Arg *arg)
-{
-        selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-        arrange(selmon);
-}
-
-#ifdef XINERAMA
-static int
-isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
-{
-        while (n--)
-                if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
-                && unique[n].width == info->width && unique[n].height == info->height)
-                        return 0;
-        return 1;
-}
-#endif /* XINERAMA */
-
-void
-keypress(XEvent *e)
-{
-        unsigned int i;
-        KeySym keysym;
-        XKeyEvent *ev;
-
-        ev = &e->xkey;
-        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-        for (i = 0; i < LENGTH(keys); i++)
-                if (keysym == keys[i].keysym
-                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                && keys[i].func)
-                        keys[i].func(&(keys[i].arg));
-}
-
-void
-killclient(const Arg *arg)
-{
-        if (!selmon->sel)
-                return;
-
-        if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
-                XGrabServer(dpy);
-                XSetErrorHandler(xerrordummy);
-                XSetCloseDownMode(dpy, DestroyAll);
-                XKillClient(dpy, selmon->sel->win);
-                XSync(dpy, False);
-                XSetErrorHandler(xerror);
-                XUngrabServer(dpy);
-        }
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
-        Client *c, *t = NULL;
-        Window trans = None;
-        XWindowChanges wc;
-
-        c = ecalloc(1, sizeof(Client));
-        c->win = w;
-        /* geometry */
-        c->x = c->oldx = wa->x;
-        c->y = c->oldy = wa->y;
-        c->w = c->oldw = wa->width;
-        c->h = c->oldh = wa->height;
-        c->oldbw = wa->border_width;
-
-        updatetitle(c);
-        if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-                c->mon = t->mon;
-                c->tags = t->tags;
-        } else {
-                c->mon = selmon;
-                applyrules(c);
-        }
-
-        if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
-                c->x = c->mon->wx + c->mon->ww - WIDTH(c);
-        if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
-                c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
-        c->x = MAX(c->x, c->mon->wx);
-        c->y = MAX(c->y, c->mon->wy);
-        c->bw = borderpx;
-
-        wc.border_width = c->bw;
-        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-        XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
-        configure(c); /* propagates border_width, if size doesn't change */
-        updatewindowtype(c);
-        updatesizehints(c);
-        updatewmhints(c);
-        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
-        grabbuttons(c, 0);
-        if (!c->isfloating)
-                c->isfloating = c->oldstate = trans != None || c->isfixed;
-        if (c->isfloating)
-                XRaiseWindow(dpy, c->win);
-        attach(c);
-        attachstack(c);
-        XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
-                (unsigned char *) &(c->win), 1);
-        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
-        setclientstate(c, NormalState);
-        if (c->mon == selmon)
-                unfocus(selmon->sel, 0);
-        c->mon->sel = c;
-        arrange(c->mon);
-        XMapWindow(dpy, c->win);
-        focus(NULL);
-}
-
-void
-mappingnotify(XEvent *e)
-{
-        XMappingEvent *ev = &e->xmapping;
-
-        XRefreshKeyboardMapping(ev);
-        if (ev->request == MappingKeyboard)
-                grabkeys();
-}
-
-void
-maprequest(XEvent *e)
-{
-        static XWindowAttributes wa;
-        XMapRequestEvent *ev = &e->xmaprequest;
-
-        Client *i;
-        if ((i = wintosystrayicon(ev->window))) {
-                sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
-                resizebarwin(selmon);
-                updatesystray();
-        }
-
-        if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
-                return;
-        if (!wintoclient(ev->window))
-                manage(ev->window, &wa);
-}
-
-void
-monocle(Monitor *m)
-{
-        unsigned int n = 0;
-        Client *c;
-
-        for (c = m->cl->clients; c; c = c->next)
-                if (ISVISIBLE(c, m))
-                        n++;
-        if (n > 0) /* override layout symbol */
-                snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-        for (c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m))
-                resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
-}
-
-void
-motionnotify(XEvent *e)
-{
-        static Monitor *mon = NULL;
-        Monitor *m;
-        XMotionEvent *ev = &e->xmotion;
-
-        if (ev->window != root)
-                return;
-        if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-                unfocus(selmon->sel, 1);
-                selmon = m;
-                focus(NULL);
-        }
-        mon = m;
-}
-
-void
-movemouse(const Arg *arg)
-{
-        int x, y, ocx, ocy, nx, ny;
-        Client *c;
-        Monitor *m;
-        XEvent ev;
-        Time lasttime = 0;
-
-        if (!(c = selmon->sel))
-                return;
-        if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-                return;
-        restack(selmon);
-        ocx = c->x;
-        ocy = c->y;
-        if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
-                return;
-        if (!getrootptr(&x, &y))
-                return;
-        do {
-                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-                switch(ev.type) {
-                case ConfigureRequest:
-                case Expose:
-                case MapRequest:
-                        handler[ev.type](&ev);
-                        break;
-                case MotionNotify:
-                        if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-                                continue;
-                        lasttime = ev.xmotion.time;
-
-                        nx = ocx + (ev.xmotion.x - x);
-                        ny = ocy + (ev.xmotion.y - y);
-                        if (abs(selmon->wx - nx) < snap)
-                                nx = selmon->wx;
-                        else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
-                                nx = selmon->wx + selmon->ww - WIDTH(c);
-                        if (abs(selmon->wy - ny) < snap)
-                                ny = selmon->wy;
-                        else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
-                                ny = selmon->wy + selmon->wh - HEIGHT(c);
-                        if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                        && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-                                togglefloating(NULL);
-                        if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                                resize(c, nx, ny, c->w, c->h, 1);
-                        break;
-                }
-        } while (ev.type != ButtonRelease);
-        XUngrabPointer(dpy, CurrentTime);
-        if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-                sendmon(c, m);
-                selmon = m;
-                focus(NULL);
-        }
-}
-
-Client *
-nexttiled(Client *c, Monitor *m)
-{
-        for (; c && (c->isfloating || !ISVISIBLE(c, m)); c = c->next);
-        return c;
-}
-
-void
-pop(Client *c)
-{
-        detach(c);
-        attach(c);
-        focus(c);
-        arrange(c->mon);
-}
-
-void
-propertynotify(XEvent *e)
-{
-        Client *c;
-        Window trans;
-        XPropertyEvent *ev = &e->xproperty;
-
-        if ((c = wintosystrayicon(ev->window))) {
-                if (ev->atom == XA_WM_NORMAL_HINTS) {
-                        updatesizehints(c);
-                        updatesystrayicongeom(c, c->w, c->h);
-                }
-                else
-                        updatesystrayiconstate(c, ev);
-                resizebarwin(selmon);
-                updatesystray();
-        }
-
-        if ((ev->window == root) && (ev->atom == XA_WM_NAME))
-                updatestatus();
-        else if (ev->state == PropertyDelete)
-                return; /* ignore */
-        else if ((c = wintoclient(ev->window))) {
-                switch(ev->atom) {
-                default: break;
-                case XA_WM_TRANSIENT_FOR:
-                        if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
-                                (c->isfloating = (wintoclient(trans)) != NULL))
-                                arrange(c->mon);
-                        break;
-                case XA_WM_NORMAL_HINTS:
-                        c->hintsvalid = 0;
-                        break;
-                case XA_WM_HINTS:
-                        updatewmhints(c);
-                        drawbars();
-                        break;
-                }
-                if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-                        updatetitle(c);
-                        if (c == c->mon->sel)
-                                drawbar(c->mon);
-                }
-                if (ev->atom == netatom[NetWMWindowType])
-                        updatewindowtype(c);
-        }
-}
-
-void
-quit(const Arg *arg)
-{
-        running = 0;
-}
-
-void
-quitprompt(const Arg *arg)
-{
-        FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
-        if(pp != NULL) {
-                char buf[1024];
-                if (fgets(buf, sizeof(buf), pp) == NULL) {
-                        fprintf(stderr, "Quitprompt: Error reading pipe!\n");
-                        return;
-                }
-                if (strcmp(buf, "yes\n") == 0) {
-                        pclose(pp);
-                        restart = 0;
-                        quit(NULL);
-                } else if (strcmp(buf, "restart\n") == 0) {
-                        pclose(pp);
-                        restart = 1;
-                        quit(NULL);
-                } else if (strcmp(buf, "no\n") == 0) {
-                        pclose(pp);
-                        return;
-                }
-        }
-}
-
-Monitor *
-recttomon(int x, int y, int w, int h)
-{
-        Monitor *m, *r = selmon;
-        int a, area = 0;
-
-        for (m = mons; m; m = m->next)
-                if ((a = INTERSECT(x, y, w, h, m)) > area) {
-                        area = a;
-                        r = m;
-                }
-        return r;
-}
-
-void
-removesystrayicon(Client *i)
-{
-        Client **ii;
-
-        if (!showsystray || !i)
-                return;
-        for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
-        if (ii)
-                *ii = i->next;
-        free(i);
-}
-
-void
-resize(Client *c, int x, int y, int w, int h, int interact)
-{
-        if (applysizehints(c, &x, &y, &w, &h, interact))
-                resizeclient(c, x, y, w, h);
-}
-
-void
-resizebarwin(Monitor *m) {
-        unsigned int w = m->ww;
-        if (showsystray && m == systraytomon(m) && !systrayonleft)
-                w -= getsystraywidth();
-        XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-}
-
-void
-resizeclient(Client *c, int x, int y, int w, int h)
-{
-        XWindowChanges wc;
-        unsigned int n;
-        Client *nbc;
-
-        c->oldx = c->x; c->x = wc.x = x;
-        c->oldy = c->y; c->y = wc.y = y;
-        c->oldw = c->w; c->w = wc.width = w;
-        c->oldh = c->h; c->h = wc.height = h;
-        wc.border_width = c->bw;
-
-        for (n = 0, nbc = nexttiled(c, c->mon); nbc; nbc = nexttiled(nbc->next, nbc->mon), n++);
-
-        if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
-        } else {
-                if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
-                        wc.border_width = 0;
-                        c->w = wc.width += c->bw * 2;
-                        c->h = wc.height += c->bw * 2;
-                }
-        }
-
-        XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
-        configure(c);
-        XSync(dpy, False);
-}
-
-void
-resizerequest(XEvent *e)
-{
-        XResizeRequestEvent *ev = &e->xresizerequest;
-        Client *i;
-
-        if ((i = wintosystrayicon(ev->window))) {
-                updatesystrayicongeom(i, ev->width, ev->height);
-                resizebarwin(selmon);
-                updatesystray();
-        }
-}
-
-void
-resizemouse(const Arg *arg)
-{
-        int ocx, ocy, nw, nh;
-        Client *c;
-        Monitor *m;
-        XEvent ev;
-        Time lasttime = 0;
-
-        if (!(c = selmon->sel))
-                return;
-        if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-                return;
-        restack(selmon);
-        ocx = c->x;
-        ocy = c->y;
-        if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
-                return;
-        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-        do {
-                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-                switch(ev.type) {
-                case ConfigureRequest:
-                case Expose:
-                case MapRequest:
-                        handler[ev.type](&ev);
-                        break;
-                case MotionNotify:
-                        if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-                                continue;
-                        lasttime = ev.xmotion.time;
-
-                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-                        if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
-                        && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
-                        {
-                                if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                                && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
-                                        togglefloating(NULL);
-                        }
-                        if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                                resize(c, c->x, c->y, nw, nh, 1);
-                        break;
-                }
-        } while (ev.type != ButtonRelease);
-        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-        XUngrabPointer(dpy, CurrentTime);
-        while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-        if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-                sendmon(c, m);
-                selmon = m;
-                focus(NULL);
-        }
-}
-
-void
-restack(Monitor *m)
-{
-        Client *c;
-        XEvent ev;
-        XWindowChanges wc;
-
-        drawbar(m);
-        if (!m->sel)
-                return;
-        if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-                XRaiseWindow(dpy, m->sel->win);
-        if (m->lt[m->sellt]->arrange) {
-                wc.stack_mode = Below;
-                wc.sibling = m->barwin;
-                for (c = m->cl->stack; c; c = c->snext)
-                        if (!c->isfloating && ISVISIBLE(c, m)) {
-                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-                                wc.sibling = c->win;
-                        }
-        }
-        if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && m->lt[m->sellt]->arrange != &monocle)
-                warp(m->sel);
-        XSync(dpy, False);
-        while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-run(void)
-{
-        XEvent ev;
-        /* main event loop */
-        XSync(dpy, False);
-        while (running && !XNextEvent(dpy, &ev))
-                if (handler[ev.type])
-                        handler[ev.type](&ev); /* call handler */
-}
-
-void
-scan(void)
-{
-        unsigned int i, num;
-        Window d1, d2, *wins = NULL;
-        XWindowAttributes wa;
-
-        if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
-                for (i = 0; i < num; i++) {
-                        if (!XGetWindowAttributes(dpy, wins[i], &wa)
-                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
-                                continue;
-                        if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
-                                manage(wins[i], &wa);
-                }
-                for (i = 0; i < num; i++) { /* now the transients */
-                        if (!XGetWindowAttributes(dpy, wins[i], &wa))
-                                continue;
-                        if (XGetTransientForHint(dpy, wins[i], &d1)
-                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
-                                manage(wins[i], &wa);
-                }
-                if (wins)
-                        XFree(wins);
-        }
-}
-
-void
-selectclient(const Arg *_arg)
-{
-        static const char* dmenuwincmd[] = { "dmenu", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
-        Client *c;
-        int fds[4];             /* cin,sout,sin,cout */
-        const char ln = '\n';
-        char selected[257];
-        int ret;
-        struct sigaction sa;
-        Arg arg;
-
-        dmenumon[0] = '0' + selmon->num;
-
-        if (pipe(fds))
-                return;
-        if (pipe(fds+2)) {
-                close(fds[0]);
-                close(fds[1]);
-                return;
-        }
-        if (fork() == 0) {
-                close(fds[1]);
-                close(fds[2]);
-                dup2(fds[0], 0);
-                dup2(fds[3], 1);
-
-                if (dpy)
-                        close(ConnectionNumber(dpy));
-                setsid();
-
-                sigemptyset(&sa.sa_mask);
-                sa.sa_flags = 0;
-                sa.sa_handler = SIG_DFL;
-                sigaction(SIGCHLD, &sa, NULL);
-
-                execvp(((char **)dmenuwincmd)[0], (char **)dmenuwincmd);
-                die("dwm: execvp 'dmenu' for window select failed:");
-        }
-        close(fds[0]);
-        close(fds[3]);
-
-        for (c = selmon->cl->clients; c; c = c->next) {
-                write(fds[1], c->name, strlen(c->name));
-                write(fds[1], &ln, 1);
-        }
-        close(fds[1]);
-        ret = read(fds[2], selected, 256);
-        for (int i = 0; i < 256 && (selected[i] != '\n' || (selected[i] = 0)); ++i);
-        close(fds[2]);
-        if (ret <= 0)
-                return;
-        for (c = selmon->cl->clients; c; c = c->next) {
-                if (!strcmp(c->name, selected)) {
-                        arg.ui = c->tags;
-                        view(&arg);
-                        if (c->tags == SCRATCHPAD_MASK)
-                                scratchpad_show_client(c);
-                        else
-                                focus(c);
-                        return;
-                }
-
-        }
-}
-
-static void scratchpad_hide ()
-{
-        if (selmon -> sel)
-        {
-                selmon -> sel -> tags = SCRATCHPAD_MASK;
-                focus(NULL);
-                arrange(selmon);
-        }
-}
-
-static _Bool scratchpad_last_showed_is_killed (void)
-{
-        _Bool killed = 1;
-        for (Client * c = selmon->cl->clients; c != NULL; c = c -> next)
-        {
-                if (c == scratchpad_last_showed)
-                {
-                        killed = 0;
-                        break;
-                }
-        }
-        return killed;
-}
-
-static void scratchpad_remove ()
-{
-        if (selmon -> sel && scratchpad_last_showed != NULL && selmon -> sel == scratchpad_last_showed)
-                scratchpad_last_showed = NULL;
-}
-
-static void scratchpad_show ()
-{
-        if (scratchpad_last_showed == NULL || scratchpad_last_showed_is_killed ())
-                scratchpad_show_first ();
-        else
-        {
-                if (scratchpad_last_showed -> tags != SCRATCHPAD_MASK)
-                {
-                        scratchpad_last_showed -> tags = SCRATCHPAD_MASK;
-                        focus(NULL);
-                        arrange(selmon);
-                }
-                else
-                {
-                        _Bool found_current = 0;
-                        _Bool found_next = 0;
-                        for (Client * c = selmon->cl->clients; c != NULL; c = c -> next)
-                        {
-                                if (found_current == 0)
-                                {
-                                        if (c == scratchpad_last_showed)
-                                        {
-                                                found_current = 1;
-                                                continue;
-                                        }
-                                }
-                                else
-                                {
-                                        if (c -> tags == SCRATCHPAD_MASK)
-                                        {
-                                                found_next = 1;
-                                                scratchpad_show_client (c);
-                                                break;
-                                        }
-                                }
-                        }
-                        if (found_next == 0) scratchpad_show_first ();
-                }
-        }
-}
-
-static void scratchpad_show_client (Client * c)
-{
-        scratchpad_last_showed = c;
-        c -> tags = selmon->tagset[selmon->seltags];
-        focus(c);
-        arrange(selmon);
-}
-
-static void scratchpad_show_first (void)
-{
-        for (Client * c = selmon->cl->clients; c != NULL; c = c -> next)
-        {
-                if (c -> tags == SCRATCHPAD_MASK)
-                {
-                        scratchpad_show_client (c);
-                        break;
-                }
-        }
-}
-
-void
-sendmon(Client *c, Monitor *m)
-{
-        if (c->mon == m)
-                return;
-        unfocus(c, 1);
-        detachstack(c);
-        c->mon = m;
-        c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-        attachstack(c);
-        focus(NULL);
-        arrange(NULL);
-}
-
-void
-setclientstate(Client *c, long state)
-{
-        long data[] = { state, None };
-
-        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-                PropModeReplace, (unsigned char *)data, 2);
-}
-
-int
-sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
-{
-        int n;
-        Atom *protocols, mt;
-        int exists = 0;
-        XEvent ev;
-
-        if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
-                mt = wmatom[WMProtocols];
-                if (XGetWMProtocols(dpy, w, &protocols, &n)) {
-                        while (!exists && n--)
-                                exists = protocols[n] == proto;
-                        XFree(protocols);
-                }
-        }
-        else {
-                exists = True;
-                mt = proto;
-        }
-
-        if (exists) {
-                ev.type = ClientMessage;
-                ev.xclient.window = w;
-                ev.xclient.message_type = mt;
-                ev.xclient.format = 32;
-                ev.xclient.data.l[0] = d0;
-                ev.xclient.data.l[1] = d1;
-                ev.xclient.data.l[2] = d2;
-                ev.xclient.data.l[3] = d3;
-                ev.xclient.data.l[4] = d4;
-                XSendEvent(dpy, w, False, mask, &ev);
-        }
-        return exists;
-}
-void
-setfocus(Client *c)
-{
-        if (!c->neverfocus) {
-                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-                XChangeProperty(dpy, root, netatom[NetActiveWindow],
-                        XA_WINDOW, 32, PropModeReplace,
-                        (unsigned char *) &(c->win), 1);
-        }
-        sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
-}
-
-void
-setfullscreen(Client *c, int fullscreen)
-{
-        if (fullscreen && !c->isfullscreen) {
-                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                        PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-                c->isfullscreen = 1;
-                c->oldstate = c->isfloating;
-                c->oldbw = c->bw;
-                c->bw = 0;
-                c->isfloating = 1;
-                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-                XRaiseWindow(dpy, c->win);
-        } else if (!fullscreen && c->isfullscreen){
-                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                        PropModeReplace, (unsigned char*)0, 0);
-                c->isfullscreen = 0;
-                c->isfloating = c->oldstate;
-                c->bw = c->oldbw;
-                c->x = c->oldx;
-                c->y = c->oldy;
-                c->w = c->oldw;
-                c->h = c->oldh;
-                resizeclient(c, c->x, c->y, c->w, c->h);
-                arrange(c->mon);
-        }
-}
-
-void
-setlayout(const Arg *arg)
-{
-        if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-                selmon->sellt ^= 1;
-        if (arg && arg->v)
-                selmon->lt[selmon->sellt] = (Layout *)arg->v;
-        strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
-        if (selmon->sel)
-                arrange(selmon);
-        else
-                drawbar(selmon);
-}
-
-/* arg > 1.0 will set mfact absolutely */
-void
-setmfact(const Arg *arg)
-{
-        float f;
-
-        if (!arg || !selmon->lt[selmon->sellt]->arrange)
-                return;
-        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-        if (f < 0.05 || f > 0.95)
-                return;
-        selmon->mfact = f;
-        arrange(selmon);
-}
-
-void
-setup(void)
-{
-        int i;
-        XSetWindowAttributes wa;
-        Atom utf8string;
-        struct sigaction sa;
-
-        /* do not transform children into zombies when they terminate */
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
-        sa.sa_handler = SIG_IGN;
-        sigaction(SIGCHLD, &sa, NULL);
-
-        /* clean up any zombies (inherited from .xinitrc etc) immediately */
-        while (waitpid(-1, NULL, WNOHANG) > 0);
-
-        /* init screen */
-        screen = DefaultScreen(dpy);
-        sw = DisplayWidth(dpy, screen);
-        sh = DisplayHeight(dpy, screen);
-        if(!(cl = (Clientlist *)calloc(1, sizeof(Clientlist))))
-                die("fatal: could not malloc() %u bytes\n", sizeof(Clientlist));
-        root = RootWindow(dpy, screen);
-        drw = drw_create(dpy, screen, root, sw, sh);
-        if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-                die("no fonts could be loaded.");
-        lrpad = drw->fonts->h;
-        bh = drw->fonts->h + 2;
-        updategeom();
-        /* init atoms */
-        utf8string = XInternAtom(dpy, "UTF8_STRING", False);
-        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-        wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-        netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
-        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-        netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
-        netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
-        netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
-        netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
-        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
-        netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
-        netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-        netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
-        netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-        netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-        xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
-        xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
-        xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
-        /* init cursors */
-        cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
-        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
-        /* init appearance */
-        scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
-        for (i = 0; i < LENGTH(colors); i++)
-                scheme[i] = drw_scm_create(drw, colors[i], 3);
-        /* init system tray */
-        updatesystray();
-        /* init bars */
-        updatebars();
-        updatestatus();
-        /* supporting window for NetWMCheck */
-        wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
-        XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
-                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
-        XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
-                PropModeReplace, (unsigned char *) "dwm", 3);
-        XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
-                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
-        /* EWMH support per view */
-        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                PropModeReplace, (unsigned char *) netatom, NetLast);
-        XDeleteProperty(dpy, root, netatom[NetClientList]);
-        /* select events */
-        wa.cursor = cursor[CurNormal]->cursor;
-        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
-                |ButtonPressMask|PointerMotionMask|EnterWindowMask
-                |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
-        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-        XSelectInput(dpy, root, wa.event_mask);
-        grabkeys();
-        focus(NULL);
-}
-
-void
-seturgent(Client *c, int urg)
-{
-        XWMHints *wmh;
-
-        c->isurgent = urg;
-        if (!(wmh = XGetWMHints(dpy, c->win)))
-                return;
-        wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
-        XSetWMHints(dpy, c->win, wmh);
-        XFree(wmh);
-}
-
-void
-showhide(Client *c)
-{
-        if (!c)
-                return;
-        if (ISVISIBLE(c, c->mon)) {
-                /* show clients top down */
-                XMoveWindow(dpy, c->win, c->x, c->y);
-                if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-                        resize(c, c->x, c->y, c->w, c->h, 0);
-                showhide(c->snext);
-        } else {
-                /* hide clients bottom up */
-                showhide(c->snext);
-                XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
-        }
-}
-
-void
-spawn(const Arg *arg)
-{
-        struct sigaction sa;
-
-        if (arg->v == dmenucmd)
-                dmenumon[0] = '0' + selmon->num;
-        if (fork() == 0) {
-                if (dpy)
-                        close(ConnectionNumber(dpy));
-                setsid();
-
-                sigemptyset(&sa.sa_mask);
-                sa.sa_flags = 0;
-                sa.sa_handler = SIG_DFL;
-                sigaction(SIGCHLD, &sa, NULL);
-
-                execvp(((char **)arg->v)[0], (char **)arg->v);
-                die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
-        }
-}
-
-void
-tag(const Arg *arg)
-{
-        Monitor *m;
-        unsigned int newtags;
-        if (selmon->sel && arg->ui & TAGMASK) {
-                newtags = arg->ui & TAGMASK;
-                for (m = mons; m; m = m->next)
-                        /* if tag is visible on another monitor, move client to the new monitor */
-                        if (m != selmon && m->tagset[m->seltags] & newtags) {
-                                /* prevent moving client to all tags (MODKEY-Shift-0) when multiple monitors are connected */
-                                if(newtags & selmon->tagset[selmon->seltags])
-                                        return;
-                                selmon->sel->tags = newtags;
-                                selmon->sel->mon = m;
-                                arrange(m);
-                                break;
-                        }
-                /* workaround in case just one monitor is connected */
-
-                selmon->sel->tags = arg->ui & TAGMASK;
-                focus(NULL);
-                arrange(selmon);
-        }
-}
-
-void
-tagmon(const Arg *arg)
-{
-        if (!selmon->sel || !mons->next)
-                return;
-        sendmon(selmon->sel, dirtomon(arg->i));
-}
-
-void
-tile(Monitor *m)
-{
-        unsigned int i, n, h, mw, my, ty;
-        Client *c;
-
-        for (n = 0, c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m), n++);
-        if (n == 0)
-                return;
-
-        if (n > m->nmaster)
-                mw = m->nmaster ? m->ww * m->mfact : 0;
-        else
-                mw = m->ww;
-        for (i = my = ty = 0, c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m), i++)
-                if (i < m->nmaster) {
-                        h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-                        resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
-                        if (my + HEIGHT(c) < m->wh)
-                                my += HEIGHT(c);
-                } else {
-                        h = (m->wh - ty) / (n - i);
-                        resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
-                        if (ty + HEIGHT(c) < m->wh)
-                                ty += HEIGHT(c);
-                }
-}
-
-void
-togglebar(const Arg *arg)
-{
-        selmon->showbar = !selmon->showbar;
-        updatebarpos(selmon);
-        resizebarwin(selmon);
-        if (showsystray) {
-                XWindowChanges wc;
-                if (!selmon->showbar)
-                        wc.y = -bh;
-                else if (selmon->showbar) {
-                        wc.y = 0;
-                        if (!selmon->topbar)
-                                wc.y = selmon->mh - bh;
-                }
-                XConfigureWindow(dpy, systray->win, CWY, &wc);
-        }
-        arrange(selmon);
-}
-
-void
-togglefloating(const Arg *arg)
-{
-        if (!selmon->sel)
-                return;
-        if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-                return;
-        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
-        if (selmon->sel->isfloating)
-                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-                        selmon->sel->w, selmon->sel->h, 0);
-        arrange(selmon);
-}
-
-void
-toggletag(const Arg *arg)
-{
-        Monitor *m;
-        unsigned int newtags;
-
-        if (!selmon->sel)
-                return;
-        newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
-        if (newtags) {
-                /* prevent adding tags that are in use on other monitors */
-                for (m = mons; m; m = m->next)
-                        if (m != selmon && newtags & m->tagset[m->seltags])
-                                return;
-                selmon->sel->tags = newtags;
-                focus(NULL);
-                arrange(selmon);
-        }
-}
-
-void
-toggleview(const Arg *arg)
-{
-        Monitor *m;
-        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
-
-        if (newtagset) {
-                /* prevent displaying the same tags on multiple monitors */
-                for(m = mons; m; m = m->next)
-                        if(m != selmon && newtagset & m->tagset[m->seltags])
-                                return;
-                selmon->tagset[selmon->seltags] = newtagset;
-                attachclients(selmon);
-                arrange(selmon);
-                focus(NULL);
-
-                unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
-
-                if (newtagset) {
-                        selmon->tagset[selmon->seltags] = newtagset;
-                        attachclients(selmon);
-                        arrange(selmon);
-                        focus(NULL);
-                }
-        }
-}
-
-void
-unfocus(Client *c, int setfocus)
-{
-        if (!c)
-                return;
-        grabbuttons(c, 0);
-        XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
-        if (setfocus) {
-                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-        }
-}
-
-void
-unmanage(Client *c, int destroyed)
-{
-        Monitor *m = c->mon;
-        XWindowChanges wc;
-
-        detach(c);
-        detachstack(c);
-        if (!destroyed) {
-                wc.border_width = c->oldbw;
-                XGrabServer(dpy); /* avoid race conditions */
-                XSetErrorHandler(xerrordummy);
-                XSelectInput(dpy, c->win, NoEventMask);
-                XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-                setclientstate(c, WithdrawnState);
-                XSync(dpy, False);
-                XSetErrorHandler(xerror);
-                XUngrabServer(dpy);
-        }
-        if (scratchpad_last_showed == c)
-                scratchpad_last_showed = NULL;
-        free(c);
-        focus(NULL);
-        updateclientlist();
-        arrange(m);
-}
-
-void
-unmapnotify(XEvent *e)
-{
-        Client *c;
-        XUnmapEvent *ev = &e->xunmap;
-
-        if ((c = wintoclient(ev->window))) {
-                if (ev->send_event)
-                        setclientstate(c, WithdrawnState);
-                else
-                        unmanage(c, 0);
-        }
-        else if ((c = wintosystrayicon(ev->window))) {
-                /* KLUDGE! sometimes icons occasionally unmap their windows, but do
-                 * _not_ destroy them. We map those windows back */
-                XMapRaised(dpy, c->win);
-                updatesystray();
-        }
-}
-
-void
-updatebars(void)
-{
-        unsigned int w;
-        Monitor *m;
-        XSetWindowAttributes wa = {
-                .override_redirect = True,
-                .background_pixmap = ParentRelative,
-                .event_mask = ButtonPressMask|ExposureMask
-        };
-        XClassHint ch = {"dwm", "dwm"};
-        for (m = mons; m; m = m->next) {
-                if (m->barwin)
-                        continue;
-                w = m->ww;
-                if (showsystray && m == systraytomon(m))
-                        w -= getsystraywidth();
-                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
-                                CopyFromParent, DefaultVisual(dpy, screen),
-                                CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-                XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-                if (showsystray && m == systraytomon(m))
-                        XMapRaised(dpy, systray->win);
-                XMapRaised(dpy, m->barwin);
-                XSetClassHint(dpy, m->barwin, &ch);
-        }
-}
-
-void
-updatebarpos(Monitor *m)
-{
-        m->wy = m->my;
-        m->wh = m->mh;
-        if (m->showbar) {
-                m->wh -= bh;
-                m->by = m->topbar ? m->wy : m->wy + m->wh;
-                m->wy = m->topbar ? m->wy + bh : m->wy;
-        } else
-                m->by = -bh;
-}
-
-void
-updateclientlist(void)
-{
-        Client *c;
-        Monitor *m;
-
-        XDeleteProperty(dpy, root, netatom[NetClientList]);
-        for (m = mons; m; m = m->next)
-                for (c = m->cl->clients; c; c = c->next)
-                        XChangeProperty(dpy, root, netatom[NetClientList],
-                                XA_WINDOW, 32, PropModeAppend,
-                                (unsigned char *) &(c->win), 1);
-}
-
-int
-updategeom(void)
-{
-        int dirty = 0;
-
-#ifdef XINERAMA
-        if (XineramaIsActive(dpy)) {
-                int i, j, n, nn;
-                Client *c;
-                Monitor *m;
-                XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
-                XineramaScreenInfo *unique = NULL;
-
-                for (n = 0, m = mons; m; m = m->next, n++);
-                /* only consider unique geometries as separate screens */
-                unique = ecalloc(nn, sizeof(XineramaScreenInfo));
-                for (i = 0, j = 0; i < nn; i++)
-                        if (isuniquegeom(unique, j, &info[i]))
-                                memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
-                XFree(info);
-                nn = j;
-
-                /* new monitors if nn > n */
-                for (i = n; i < nn; i++) {
-                        for (m = mons; m && m->next; m = m->next);
-                        if (m) {
-                                m->next = createmon();
-                                attachclients(m->next);
-                        }
-                        else
-                                mons = createmon();
-                }
-                for (i = 0, m = mons; i < nn && m; m = m->next, i++)
-                        if (i >= n
-                        || unique[i].x_org != m->mx || unique[i].y_org != m->my
-                        || unique[i].width != m->mw || unique[i].height != m->mh)
-                        {
-                                dirty = 1;
-                                m->num = i;
-                                m->mx = m->wx = unique[i].x_org;
-                                m->my = m->wy = unique[i].y_org;
-                                m->mw = m->ww = unique[i].width;
-                                m->mh = m->wh = unique[i].height;
-                                updatebarpos(m);
-                        }
-                /* removed monitors if n > nn */
-                for (i = nn; i < n; i++) {
-                        for (m = mons; m && m->next; m = m->next);
-                        if (m == selmon)
-                                selmon = mons;
-                        for (c = m->cl->clients; c; c = c->next) {
-                                dirty = True;
-                                if (c->mon == m)
-                                        c->mon = selmon;
-                        }
-                        cleanupmon(m);
-                }
-                free(unique);
-        } else
-#endif /* XINERAMA */
-        { /* default monitor setup */
-                if (!mons)
-                        mons = createmon();
-                if (mons->mw != sw || mons->mh != sh) {
-                        dirty = 1;
-                        mons->mw = mons->ww = sw;
-                        mons->mh = mons->wh = sh;
-                        updatebarpos(mons);
-                }
-        }
-        if (dirty) {
-                selmon = mons;
-                selmon = wintomon(root);
-        }
-        return dirty;
-}
-
-void
-updatenumlockmask(void)
-{
-        unsigned int i, j;
-        XModifierKeymap *modmap;
-
-        numlockmask = 0;
-        modmap = XGetModifierMapping(dpy);
-        for (i = 0; i < 8; i++)
-                for (j = 0; j < modmap->max_keypermod; j++)
-                        if (modmap->modifiermap[i * modmap->max_keypermod + j]
-                                == XKeysymToKeycode(dpy, XK_Num_Lock))
-                                numlockmask = (1 << i);
-        XFreeModifiermap(modmap);
-}
-
-void
-updatesizehints(Client *c)
-{
-        long msize;
-        XSizeHints size;
-
-        if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
-                /* size is uninitialized, ensure that size.flags aren't used */
-                size.flags = PSize;
-        if (size.flags & PBaseSize) {
-                c->basew = size.base_width;
-                c->baseh = size.base_height;
-        } else if (size.flags & PMinSize) {
-                c->basew = size.min_width;
-                c->baseh = size.min_height;
-        } else
-                c->basew = c->baseh = 0;
-        if (size.flags & PResizeInc) {
-                c->incw = size.width_inc;
-                c->inch = size.height_inc;
-        } else
-                c->incw = c->inch = 0;
-        if (size.flags & PMaxSize) {
-                c->maxw = size.max_width;
-                c->maxh = size.max_height;
-        } else
-                c->maxw = c->maxh = 0;
-        if (size.flags & PMinSize) {
-                c->minw = size.min_width;
-                c->minh = size.min_height;
-        } else if (size.flags & PBaseSize) {
-                c->minw = size.base_width;
-                c->minh = size.base_height;
-        } else
-                c->minw = c->minh = 0;
-        if (size.flags & PAspect) {
-                c->mina = (float)size.min_aspect.y / size.min_aspect.x;
-                c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
-        } else
-                c->maxa = c->mina = 0.0;
-        c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
-        c->hintsvalid = 1;
-}
-
-void
-updatestatus(void)
-{
-        if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-                strcpy(stext, "dwm-"VERSION);
-        drawbar(selmon);
-        updatesystray();
-}
-
-
-void
-updatesystrayicongeom(Client *i, int w, int h)
-{
-        if (i) {
-                i->h = bh;
-                if (w == h)
-                        i->w = bh;
-                else if (h == bh)
-                        i->w = w;
-                else
-                        i->w = (int) ((float)bh * ((float)w / (float)h));
-                applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
-                /* force icons into the systray dimensions if they don't want to */
-                if (i->h > bh) {
-                        if (i->w == i->h)
-                                i->w = bh;
-                        else
-                                i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
-                        i->h = bh;
-                }
-        }
-}
-
-void
-updatesystrayiconstate(Client *i, XPropertyEvent *ev)
-{
-        long flags;
-        int code = 0;
-
-        if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
-                        !(flags = getatomprop(i, xatom[XembedInfo])))
-                return;
-
-        if (flags & XEMBED_MAPPED && !i->tags) {
-                i->tags = 1;
-                code = XEMBED_WINDOW_ACTIVATE;
-                XMapRaised(dpy, i->win);
-                setclientstate(i, NormalState);
-        }
-        else if (!(flags & XEMBED_MAPPED) && i->tags) {
-                i->tags = 0;
-                code = XEMBED_WINDOW_DEACTIVATE;
-                XUnmapWindow(dpy, i->win);
-                setclientstate(i, WithdrawnState);
-        }
-        else
-                return;
-        sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
-                        systray->win, XEMBED_EMBEDDED_VERSION);
-}
-
-void
-updatesystray(void)
-{
-        XSetWindowAttributes wa;
-        XWindowChanges wc;
-        Client *i;
-        Monitor *m = systraytomon(NULL);
-        unsigned int x = m->mx + m->mw;
-        unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
-        unsigned int w = 1;
-
-        if (!showsystray)
-                return;
-        if (systrayonleft)
-                x -= sw + lrpad / 2;
-        if (!systray) {
-                /* init systray */
-                if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
-                        die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
-                systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
-                wa.event_mask        = ButtonPressMask | ExposureMask;
-                wa.override_redirect = True;
-                wa.background_pixel  = scheme[SchemeNorm][ColBg].pixel;
-                XSelectInput(dpy, systray->win, SubstructureNotifyMask);
-                XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
-                                PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
-                XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
-                XMapRaised(dpy, systray->win);
-                XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
-                if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
-                        sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
-                        XSync(dpy, False);
-                }
-                else {
-                        fprintf(stderr, "dwm: unable to obtain system tray.\n");
-                        free(systray);
-                        systray = NULL;
-                        return;
-                }
-        }
-        for (w = 0, i = systray->icons; i; i = i->next) {
-                /* make sure the background color stays the same */
-                wa.background_pixel  = scheme[SchemeNorm][ColBg].pixel;
-                XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
-                XMapRaised(dpy, i->win);
-                w += systrayspacing;
-                i->x = w;
-                XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
-                w += i->w;
-                if (i->mon != m)
-                        i->mon = m;
-        }
-        w = w ? w + systrayspacing : 1;
-        x -= w;
-        XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
-        wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
-        wc.stack_mode = Above; wc.sibling = m->barwin;
-        XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
-        XMapWindow(dpy, systray->win);
-        XMapSubwindows(dpy, systray->win);
-        /* redraw background */
-        XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
-        XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
-        XSync(dpy, False);
-}
-
-void
-updatetitle(Client *c)
-{
-        if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-                gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
-        if (c->name[0] == '\0') /* hack to mark broken clients */
-                strcpy(c->name, broken);
-}
-
-void
-updatewindowtype(Client *c)
-{
-        Atom state = getatomprop(c, netatom[NetWMState]);
-        Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-
-        if (state == netatom[NetWMFullscreen])
-                setfullscreen(c, 1);
-        if (wtype == netatom[NetWMWindowTypeDialog])
-                c->isfloating = 1;
-}
-
-void
-updatewmhints(Client *c)
-{
-        XWMHints *wmh;
-
-        if ((wmh = XGetWMHints(dpy, c->win))) {
-                if (c == selmon->sel && wmh->flags & XUrgencyHint) {
-                        wmh->flags &= ~XUrgencyHint;
-                        XSetWMHints(dpy, c->win, wmh);
-                } else
-                        c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
-                if (wmh->flags & InputHint)
-                        c->neverfocus = !wmh->input;
-                else
-                        c->neverfocus = 0;
-                XFree(wmh);
-        }
-}
-
-void
-view(const Arg *arg)
-{
-        Monitor *m;
-        unsigned int newtagset = selmon->tagset[selmon->seltags ^ 1];
-        if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
-                return;
-        /* swap tags when trying to display a tag from another monitor */
-        if (arg->ui & TAGMASK)
-                newtagset = arg->ui & TAGMASK;
-        for (m = mons; m; m = m->next)
-                if (m != selmon && newtagset & m->tagset[m->seltags]) {
-                        /* prevent displaying all tags (MODKEY-0) when multiple monitors
-                         * are connected */
-                        if (newtagset & selmon->tagset[selmon->seltags])
-                                return;
-                        m->sel = selmon->sel;
-                        m->seltags ^= 1;
-                        m->tagset[m->seltags] = selmon->tagset[selmon->seltags];
-                        attachclients(m);
-                        arrange(m);
-                        break;
-                }
-        selmon->seltags ^= 1; /* toggle sel tagset */
-        if (arg->ui & TAGMASK)
-                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-        attachclients(selmon);
-        arrange(selmon);
-        focus(NULL);
-}
-
-void
-warp(const Client *c)
-{
-        int x, y;
-
-        if (!c) {
-                XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww / 2, selmon->wy + selmon->wh / 2);
-                return;
-        }
-
-        if (!getrootptr(&x, &y) ||
-                (x > c->x - c->bw &&
-                 y > c->y - c->bw &&
-                 x < c->x + c->w + c->bw*2 &&
-                 y < c->y + c->h + c->bw*2) ||
-                (y > c->mon->by && y < c->mon->by + bh) ||
-                (c->mon->topbar && !y))
-                return;
-
-        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
-}
-
-Client *
-wintoclient(Window w)
-{
-        Client *c;
-        Monitor *m;
-
-        for (m = mons; m; m = m->next)
-                for (c = m->cl->clients; c; c = c->next)
-                        if (c->win == w)
-                                return c;
-        return NULL;
-}
-
-Client *
-wintosystrayicon(Window w) {
-        Client *i = NULL;
-
-        if (!showsystray || !w)
-                return i;
-        for (i = systray->icons; i && i->win != w; i = i->next) ;
-        return i;
-}
-
-Monitor *
-wintomon(Window w)
-{
-        int x, y;
-        Client *c;
-        Monitor *m;
-
-        if (w == root && getrootptr(&x, &y))
-                return recttomon(x, y, 1, 1);
-        for (m = mons; m; m = m->next)
-                if (w == m->barwin)
-                        return m;
-        if ((c = wintoclient(w)))
-                return c->mon;
-        return selmon;
-}
-
-/* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which may call exit. */
-int
-xerror(Display *dpy, XErrorEvent *ee)
-{
-        if (ee->error_code == BadWindow
-        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
-        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
-        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
-        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
-        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
-        || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
-        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
-        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
-                return 0;
-        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-                ee->request_code, ee->error_code);
-        return xerrorxlib(dpy, ee); /* may call exit */
-}
-
-int
-xerrordummy(Display *dpy, XErrorEvent *ee)
-{
-        return 0;
-}
-
-/* Startup Error handler to check if another window manager
- * is already running. */
-int
-xerrorstart(Display *dpy, XErrorEvent *ee)
-{
-        die("dwm: another window manager is already running");
-        return -1;
-}
-
-Monitor *
-systraytomon(Monitor *m) {
-        Monitor *t;
-        int i, n;
-        if(!systraypinning) {
-                if(!m)
-                        return selmon;
-                return m == selmon ? m : NULL;
-        }
-        for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
-        for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
-        if(systraypinningfailfirst && n < systraypinning)
-                return mons;
-        return t;
-}
-
-void
-zoom(const Arg *arg)
-{
-        Client *c = selmon->sel;
-
-        if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
-                return;
-        if (c == nexttiled(selmon->cl->clients, selmon) && !(c = nexttiled(c->next, selmon)))
-                return;
-        pop(c);
-}
-
-int
-main(int argc, char *argv[])
-{
-        if (argc == 2 && !strcmp("-v", argv[1]))
-                die("dwm-"VERSION);
-        else if (argc != 1)
-                die("usage: dwm [-v]");
-        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-                fputs("warning: no locale support\n", stderr);
-        if (!(dpy = XOpenDisplay(NULL)))
-                die("dwm: cannot open display");
-        checkotherwm();
-        setup();
-#ifdef __OpenBSD__
-        if (pledge("stdio rpath proc exec", NULL) == -1)
-                die("pledge");
-#endif /* __OpenBSD__ */
-        scan();
-        run();
-        cleanup();
-        XCloseDisplay(dpy);
-        if (restart == 1) {
-                execlp("dwm", "dwm", NULL);
-        }
-        return EXIT_SUCCESS;
-}
diff --git a/src/dwm/dwm-6.6/dwm.png b/src/dwm/dwm-6.6/dwm.png
deleted file mode 100644
index b1f9ba7..0000000
--- a/src/dwm/dwm-6.6/dwm.png
+++ /dev/null
diff --git a/src/dwm/dwm-6.6/movestack.c b/src/dwm/dwm-6.6/movestack.c
deleted file mode 100644
index 0239b20..0000000
--- a/src/dwm/dwm-6.6/movestack.c
+++ /dev/null
@@ -1,48 +0,0 @@
-void
-movestack(const Arg *arg) {
-        Client *c = NULL, *p = NULL, *pc = NULL, *i;
-
-        if(arg->i > 0) {
-                /* find the client after selmon->sel */
-                for(c = selmon->sel->next; c && (!ISVISIBLE(c, selmon) || c->isfloating); c = c->next);
-                if(!c)
-                        for(c = selmon->cl->clients; c && (!ISVISIBLE(c, selmon) || c->isfloating); c = c->next);
-
-        }
-        else {
-                /* find the client before selmon->sel */
-                for(i = selmon->cl->clients; i != selmon->sel; i = i->next)
-                        if(ISVISIBLE(i,selmon) && !i->isfloating)
-                                c = i;
-                if(!c)
-                        for(; i; i = i->next)
-                                if(ISVISIBLE(i,selmon) && !i->isfloating)
-                                        c = i;
-        }
-        /* find the client before selmon->sel and c */
-        for(i = selmon->cl->clients; i && (!p || !pc); i = i->next) {
-                if(i->next == selmon->sel)
-                        p = i;
-                if(i->next == c)
-                        pc = i;
-        }
-
-        /* swap c and selmon->sel selmon->clients in the selmon->clients list */
-        if(c && c != selmon->sel) {
-                Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next;
-                selmon->sel->next = c->next==selmon->sel?c:c->next;
-                c->next = temp;
-
-                if(p && p != c)
-                        p->next = c;
-                if(pc && pc != selmon->sel)
-                        pc->next = selmon->sel;
-
-                if(selmon->sel == selmon->cl->clients)
-                        selmon->cl->clients = c;
-                else if(c == selmon->cl->clients)
-                        selmon->cl->clients = selmon->sel;
-
-                arrange(selmon);
-        }
-}
diff --git a/src/dwm/dwm-6.6/transient.c b/src/dwm/dwm-6.6/transient.c
deleted file mode 100644
index 040adb5..0000000
--- a/src/dwm/dwm-6.6/transient.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* cc transient.c -o transient -lX11 */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-int main(void) {
-	Display *d;
-	Window r, f, t = None;
-	XSizeHints h;
-	XEvent e;
-
-	d = XOpenDisplay(NULL);
-	if (!d)
-		exit(1);
-	r = DefaultRootWindow(d);
-
-	f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
-	h.min_width = h.max_width = h.min_height = h.max_height = 400;
-	h.flags = PMinSize | PMaxSize;
-	XSetWMNormalHints(d, f, &h);
-	XStoreName(d, f, "floating");
-	XMapWindow(d, f);
-
-	XSelectInput(d, f, ExposureMask);
-	while (1) {
-		XNextEvent(d, &e);
-
-		if (t == None) {
-			sleep(5);
-			t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
-			XSetTransientForHint(d, t, f);
-			XStoreName(d, t, "transient");
-			XMapWindow(d, t);
-			XSelectInput(d, t, ExposureMask);
-		}
-	}
-
-	XCloseDisplay(d);
-	exit(0);
-}
diff --git a/src/dwm/dwm-6.6/util.c b/src/dwm/dwm-6.6/util.c
deleted file mode 100644
index 8e26a51..0000000
--- a/src/dwm/dwm-6.6/util.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-void
-die(const char *fmt, ...)
-{
-	va_list ap;
-	int saved_errno;
-
-	saved_errno = errno;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if (fmt[0] && fmt[strlen(fmt)-1] == ':')
-		fprintf(stderr, " %s", strerror(saved_errno));
-	fputc('\n', stderr);
-
-	exit(1);
-}
-
-void *
-ecalloc(size_t nmemb, size_t size)
-{
-	void *p;
-
-	if (!(p = calloc(nmemb, size)))
-		die("calloc:");
-	return p;
-}
diff --git a/src/dwm/dwm-6.6/util.h b/src/dwm/dwm-6.6/util.h
deleted file mode 100644
index c0a50d4..0000000
--- a/src/dwm/dwm-6.6/util.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))
-#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
-#define LENGTH(X)               (sizeof (X) / sizeof (X)[0])
-
-void die(const char *fmt, ...);
-void *ecalloc(size_t nmemb, size_t size);
diff --git a/src/dwm/setup.sh b/src/dwm/setup.sh
deleted file mode 100755
index 946011c..0000000
--- a/src/dwm/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-cd dwm-6.6
-rm -f config.h
-make config.h
-make install
diff --git a/src/emacs/emacs-source b/src/emacs/emacs-source
deleted file mode 160000
-Subproject ee9b2db1cf036d6f511d7e6eea0189073076e7c
diff --git a/src/emacs/setup.sh b/src/emacs/setup.sh
deleted file mode 100755
index e7ca491..0000000
--- a/src/emacs/setup.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-EMACSFULL="--with-x-toolkit=gtk3 --disable-build-details --with-cairo \
-           --with-harfbuzz --with-libsystemd=no --with-modules \
-           --with-tree-sitter"
-
-EMACSMIN="--without-all \
-          --with-x-toolkit=no  --without-xwidgets --without-x --without-ns --disable-ns-self-contained \
-          --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no \
-          --without-internationalization --without-tree-sitter --without-mailutils"
-
-EMACSALWAYS="--with-gnutls --with-file-notification=yes --with-native-compilation=yes --with-zlib=yes"
-
-
-if [[ "$(read -e -p 'Build minimal emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
-    EMACSOPT="${EMACSMIN}  ${EMACSALWAYS}"
-else
-    EMACSOPT="${EMACSFULL} ${EMACSALWAYS}"
-fi
-cd emacs-source
-./autogen.sh
-./configure --prefix="${HOME}/.local" \
-            ${EMACSOPT} \
-            CFLAGS='-O2 -pipe'
-make
-make install
diff --git a/src/microhs/microhs b/src/microhs/microhs
deleted file mode 160000
-Subproject 547d3f5613bc1b0a1cdfaf065c3899af27e88eb
diff --git a/src/microhs/setup.sh b/src/microhs/setup.sh
deleted file mode 100755
index 297059f..0000000
--- a/src/microhs/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd microhs
-sed -i 's,^PREFIX=.*,PREFIX=${HOME}/.local,' Makefile
-make
-make install
-make -f Makefile.packages
diff --git a/src/musl/musl b/src/musl/musl
deleted file mode 160000
-Subproject 1b76ff0767d01df72f692806ee5adee13c67ef8
diff --git a/src/musl/setup.sh b/src/musl/setup.sh
deleted file mode 100755
index 2a0203c..0000000
--- a/src/musl/setup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cd musl
-./configure --prefix=${HOME}/.local/musl --disable-shared
-make
-make install
-cd ..
diff --git a/src/ncurses/ncurses b/src/ncurses/ncurses
deleted file mode 160000
-Subproject 87c2c84cbd2332d6d94b12a1dcaf12ad1a51a93
diff --git a/src/slstatus/setup.sh b/src/slstatus/setup.sh
deleted file mode 100755
index cf3367f..0000000
--- a/src/slstatus/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-cd slstatus-1.1
-rm -f config.h
-make config.h
-make install
diff --git a/src/slstatus/slstatus-1.1.tar.gz b/src/slstatus/slstatus-1.1.tar.gz
deleted file mode 100644
index 2ac5bfc..0000000
--- a/src/slstatus/slstatus-1.1.tar.gz
+++ /dev/null
diff --git a/src/slstatus/slstatus-1.1/LICENSE b/src/slstatus/slstatus-1.1/LICENSE
deleted file mode 100644
index 9fae663..0000000
--- a/src/slstatus/slstatus-1.1/LICENSE
+++ /dev/null
@@ -1,46 +0,0 @@
-ISC License
-
-Copyright 2016-2025 Aaron Marcher <me@drkhsh.at>
-
-Copyright 2016 Roy Freytag <rfreytag@hs-mittweida.de>
-Copyright 2016 Vincent Loupmon <vincentloupmon@gmail.com>
-Copyright 2016 Daniel Walter <d.walter@0x90.at>
-Copyright 2016-2018 Ali H. Fardan <raiz@firemail.cc>
-Copyright 2016 Jody Leonard <me@jodyleonard.com>
-Copyright 2016-2018 Quentin Rameau <quinq@fifth.space>
-Copyright 2016 Mike Coddington <mike@coddington.us>
-Copyright 2016-2018 Ivan J. <parazyd@dyne.org>
-Copyright 2017 Tobias Stoeckmann <tobias@stoeckmann.org>
-Copyright 2017-2018 Laslo Hunhold <dev@frign.de>
-Copyright 2018 Darron Anderson <darronanderson@protonmail.com>
-Copyright 2018 Josuah Demangeon <mail@josuah.net>
-Copyright 2018 Tobias Tschinkowitz <tobias@he4d.net>
-Copyright 2018 David Demelier <markand@malikania.fr>
-Copyright 2018-2012 Michael Buch <michaelbuch12@gmail.com>
-Copyright 2018 Ian Remmler <ian@remmler.org>
-Copyright 2016-2019 Joerg Jung <jung@openbsd.org>
-Copyright 2019 Ryan Kes <alrayyes@gmail.com>
-Copyright 2019 Cem Keylan <cem@ckyln.com>
-Copyright 2019 Dimitris Papastamos <dsp@2f30.org>
-Copyright 2019-2022 Ingo Feinerer <feinerer@logic.at>
-Copyright 2020 Alexandre Ratchov <alex@caoua.org>
-Copyright 2020 Mart Lubbers <mart@martlubbers.net>
-Copyright 2020 Daniel Moch <daniel@danielmoch.com>
-Copyright 2022 Nickolas Raymond Kaczynski <nrk@disroot.org>
-Copyright 2022 Patrick Iacob <iacobp@oregonstate.edu>
-Copyright 2021-2022 Steven Ward <planet36@gmail.com>
-Copyright 2025 Joakim Sindholt <opensource@zhasha.com>
-Copyright 2025 Al <eirann@disroot.org>
-Copyright 2025 sewn <sewn@disroot.org>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/src/slstatus/slstatus-1.1/Makefile b/src/slstatus/slstatus-1.1/Makefile
deleted file mode 100644
index 7a18274..0000000
--- a/src/slstatus/slstatus-1.1/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# See LICENSE file for copyright and license details
-# slstatus - suckless status monitor
-.POSIX:
-
-include config.mk
-
-REQ = util
-COM =\
-	components/battery\
-	components/cat\
-	components/cpu\
-	components/datetime\
-	components/disk\
-	components/entropy\
-	components/hostname\
-	components/ip\
-	components/kernel_release\
-	components/keyboard_indicators\
-	components/keymap\
-	components/load_avg\
-	components/netspeeds\
-	components/num_files\
-	components/ram\
-	components/run_command\
-	components/swap\
-	components/temperature\
-	components/uptime\
-	components/user\
-	components/volume\
-	components/wifi
-
-all: slstatus
-
-$(COM:=.o): config.mk $(REQ:=.h) slstatus.h
-slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)
-
-.c.o:
-	$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
-
-config.h:
-	cp config.def.h $@
-
-slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-	$(CC) -o $@ $(LDFLAGS) $(COM:=.o) $(REQ:=.o) slstatus.o $(LDLIBS)
-
-clean:
-	rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) slstatus-${VERSION}.tar.gz
-
-dist:
-	rm -rf "slstatus-$(VERSION)"
-	mkdir -p "slstatus-$(VERSION)/components"
-	cp -R LICENSE Makefile README config.mk config.def.h \
-	      arg.h slstatus.h slstatus.c $(REQ:=.c) $(REQ:=.h) \
-	      slstatus.1 "slstatus-$(VERSION)"
-	cp -R $(COM:=.c) "slstatus-$(VERSION)/components"
-	tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
-	rm -rf "slstatus-$(VERSION)"
-
-install: all
-	mkdir -p "$(DESTDIR)$(PREFIX)/bin"
-	cp -f slstatus "$(DESTDIR)$(PREFIX)/bin"
-	chmod 755 "$(DESTDIR)$(PREFIX)/bin/slstatus"
-	mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
-	cp -f slstatus.1 "$(DESTDIR)$(MANPREFIX)/man1"
-	chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/slstatus.1"
-
-uninstall:
-	rm -f "$(DESTDIR)$(PREFIX)/bin/slstatus"
-	rm -f "$(DESTDIR)$(MANPREFIX)/man1/slstatus.1"
diff --git a/src/slstatus/slstatus-1.1/README b/src/slstatus/slstatus-1.1/README
deleted file mode 100644
index 4d592bb..0000000
--- a/src/slstatus/slstatus-1.1/README
+++ /dev/null
@@ -1,65 +0,0 @@
-slstatus - suckless status
-==========================
-slstatus is a small tool for providing system status information to other
-programs over the EWMH property of the root window (used by dwm(1)) or
-standard input/output. It is designed to be as efficient as possible by
-only issuing the minimum of system calls required.
-
-
-Features
---------
-- Battery percentage/state/time left
-- Cat (read file)
-- CPU usage
-- CPU frequency
-- Custom shell commands
-- Date and time
-- Disk status (free storage, percentage, total storage and used storage)
-- Available entropy
-- Username/GID/UID
-- Hostname
-- IP address (IPv4 and IPv6), interface status
-- Kernel version
-- Keyboard indicators
-- Keymap
-- Load average
-- Network speeds (RX and TX)
-- Number of files in a directory (hint: Maildir)
-- Memory status (free memory, percentage, total memory and used memory)
-- Swap status (free swap, percentage, total swap and used swap)
-- Temperature
-- Uptime
-- Volume percentage
-- WiFi signal percentage and ESSID
-
-
-Requirements
-------------
-Currently slstatus works on FreeBSD, Linux and OpenBSD.
-In order to build slstatus you need the Xlib header files.
-
-- For volume percentage on Linux the kernel module `snd-mixer-oss` must be
-  loaded.
-- For volume percentage on FreeBSD, `sndio` must be installed.
-
-
-Installation
-------------
-Edit config.mk to match your local setup (slstatus is installed into the
-/usr/local namespace by default).
-
-Afterwards enter the following command to build and install slstatus (if
-necessary as root):
-
-    make clean install
-
-
-Running slstatus
-----------------
-See the man page for details.
-
-
-Configuration
--------------
-slstatus can be customized by creating a custom config.h and (re)compiling the
-source code. This keeps it fast, secure and simple.
diff --git a/src/slstatus/slstatus-1.1/arg.h b/src/slstatus/slstatus-1.1/arg.h
deleted file mode 100644
index 5f1f408..0000000
--- a/src/slstatus/slstatus-1.1/arg.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#ifndef ARG_H
-#define ARG_H
-
-extern char *argv0;
-
-/* int main(int argc, char *argv[]) */
-#define ARGBEGIN for (argv0 = *argv, *argv ? (argc--, argv++) : ((void *)0);      \
-                      *argv && (*argv)[0] == '-' && (*argv)[1]; argc--, argv++) { \
-                 	int i_, argused_;                                         \
-                 	if ((*argv)[1] == '-' && !(*argv)[2]) {                   \
-                 		argc--, argv++;                                   \
-                 		break;                                            \
-                 	}                                                         \
-                 	for (i_ = 1, argused_ = 0; (*argv)[i_]; i_++) {           \
-				switch ((*argv)[i_])
-#define ARGEND   		if (argused_) {                                   \
-                 			if ((*argv)[i_ + 1]) {                    \
-                 				break;                            \
-                 			} else {                                  \
-                 				argc--, argv++;                   \
-                 				break;                            \
-                 			}                                         \
-                 		}                                                 \
-                 	}                                                         \
-                 }
-#define ARGC()    ((*argv)[i_])
-#define ARGF_(x) (((*argv)[i_ + 1]) ? (argused_ = 1, &((*argv)[i_ + 1])) :        \
-                  (*(argv + 1))     ? (argused_ = 1, *(argv + 1))        : (x))
-#define EARGF(x) ARGF_(((x), exit(1), (char *)0))
-#define ARGF()   ARGF_((char *)0)
-
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/battery.c b/src/slstatus/slstatus-1.1/components/battery.c
deleted file mode 100644
index 1c753f9..0000000
--- a/src/slstatus/slstatus-1.1/components/battery.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__linux__)
-/*
- * https://www.kernel.org/doc/html/latest/power/power_supply_class.html
- */
-	#include <limits.h>
-	#include <stdint.h>
-	#include <unistd.h>
-
-	#define POWER_SUPPLY_CAPACITY "/sys/class/power_supply/%s/capacity"
-	#define POWER_SUPPLY_STATUS   "/sys/class/power_supply/%s/status"
-	#define POWER_SUPPLY_CHARGE   "/sys/class/power_supply/%s/charge_now"
-	#define POWER_SUPPLY_ENERGY   "/sys/class/power_supply/%s/energy_now"
-	#define POWER_SUPPLY_CURRENT  "/sys/class/power_supply/%s/current_now"
-	#define POWER_SUPPLY_POWER    "/sys/class/power_supply/%s/power_now"
-
-	static const char *
-	pick(const char *bat, const char *f1, const char *f2, char *path,
-	     size_t length)
-	{
-		if (esnprintf(path, length, f1, bat) > 0 &&
-		    access(path, R_OK) == 0)
-			return f1;
-
-		if (esnprintf(path, length, f2, bat) > 0 &&
-		    access(path, R_OK) == 0)
-			return f2;
-
-		return NULL;
-	}
-
-	const char *
-	battery_perc(const char *bat)
-	{
-		int cap_perc;
-		char path[PATH_MAX];
-
-		if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) < 0)
-			return NULL;
-		if (pscanf(path, "%d", &cap_perc) != 1)
-			return NULL;
-
-		return bprintf("%d", cap_perc);
-	}
-
-	const char *
-	battery_state(const char *bat)
-	{
-		static struct {
-			char *state;
-			char *symbol;
-		} map[] = {
-			{ "Charging",    "+" },
-			{ "Discharging", "-" },
-			{ "Full",        "o" },
-			{ "Not charging", "o" },
-		};
-		size_t i;
-		char path[PATH_MAX], state[12];
-
-		if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < 0)
-			return NULL;
-		if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
-			return NULL;
-
-		for (i = 0; i < LEN(map); i++)
-			if (!strcmp(map[i].state, state))
-				break;
-
-		return (i == LEN(map)) ? "?" : map[i].symbol;
-	}
-
-	const char *
-	battery_remaining(const char *bat)
-	{
-		uintmax_t charge_now, current_now, m, h;
-		double timeleft;
-		char path[PATH_MAX], state[12];
-
-		if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < 0)
-			return NULL;
-		if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
-			return NULL;
-
-		if (!pick(bat, POWER_SUPPLY_CHARGE, POWER_SUPPLY_ENERGY, path,
-		          sizeof(path)) ||
-		    pscanf(path, "%ju", &charge_now) < 0)
-			return NULL;
-
-		if (!strcmp(state, "Discharging")) {
-			if (!pick(bat, POWER_SUPPLY_CURRENT, POWER_SUPPLY_POWER, path,
-			          sizeof(path)) ||
-			    pscanf(path, "%ju", &current_now) < 0)
-				return NULL;
-
-			if (current_now == 0)
-				return NULL;
-
-			timeleft = (double)charge_now / (double)current_now;
-			h = timeleft;
-			m = (timeleft - (double)h) * 60;
-
-			return bprintf("%juh %jum", h, m);
-		}
-
-		return "";
-	}
-#elif defined(__OpenBSD__)
-	#include <fcntl.h>
-	#include <machine/apmvar.h>
-	#include <sys/ioctl.h>
-	#include <unistd.h>
-
-	static int
-	load_apm_power_info(struct apm_power_info *apm_info)
-	{
-		int fd;
-
-		fd = open("/dev/apm", O_RDONLY);
-		if (fd < 0) {
-			warn("open '/dev/apm':");
-			return 0;
-		}
-
-		memset(apm_info, 0, sizeof(struct apm_power_info));
-		if (ioctl(fd, APM_IOC_GETPOWER, apm_info) < 0) {
-			warn("ioctl 'APM_IOC_GETPOWER':");
-			close(fd);
-			return 0;
-		}
-		return close(fd), 1;
-	}
-
-	const char *
-	battery_perc(const char *unused)
-	{
-		struct apm_power_info apm_info;
-
-		if (load_apm_power_info(&apm_info))
-			return bprintf("%d", apm_info.battery_life);
-
-		return NULL;
-	}
-
-	const char *
-	battery_state(const char *unused)
-	{
-		struct {
-			unsigned int state;
-			char *symbol;
-		} map[] = {
-			{ APM_AC_ON,      "+" },
-			{ APM_AC_OFF,     "-" },
-		};
-		struct apm_power_info apm_info;
-		size_t i;
-
-		if (load_apm_power_info(&apm_info)) {
-			for (i = 0; i < LEN(map); i++)
-				if (map[i].state == apm_info.ac_state)
-					break;
-
-			return (i == LEN(map)) ? "?" : map[i].symbol;
-		}
-
-		return NULL;
-	}
-
-	const char *
-	battery_remaining(const char *unused)
-	{
-		struct apm_power_info apm_info;
-		unsigned int h, m;
-
-		if (load_apm_power_info(&apm_info)) {
-			if (apm_info.ac_state != APM_AC_ON) {
-				h = apm_info.minutes_left / 60;
-				m = apm_info.minutes_left % 60;
-				return bprintf("%uh %02um", h, m);
-			} else {
-				return "";
-			}
-		}
-
-		return NULL;
-	}
-#elif defined(__FreeBSD__)
-	#include <sys/sysctl.h>
-
-	#define BATTERY_LIFE  "hw.acpi.battery.life"
-	#define BATTERY_STATE "hw.acpi.battery.state"
-	#define BATTERY_TIME  "hw.acpi.battery.time"
-
-	const char *
-	battery_perc(const char *unused)
-	{
-		int cap_perc;
-		size_t len;
-
-		len = sizeof(cap_perc);
-		if (sysctlbyname(BATTERY_LIFE, &cap_perc, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		return bprintf("%d", cap_perc);
-	}
-
-	const char *
-	battery_state(const char *unused)
-	{
-		int state;
-		size_t len;
-
-		len = sizeof(state);
-		if (sysctlbyname(BATTERY_STATE, &state, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		switch (state) {
-		case 0: /* FALLTHROUGH */
-		case 2:
-			return "+";
-		case 1:
-			return "-";
-		default:
-			return "?";
-		}
-	}
-
-	const char *
-	battery_remaining(const char *unused)
-	{
-		int rem;
-		size_t len;
-
-		len = sizeof(rem);
-		if (sysctlbyname(BATTERY_TIME, &rem, &len, NULL, 0) < 0 || !len
-		    || rem < 0)
-			return NULL;
-
-		return bprintf("%uh %02um", rem / 60, rem % 60);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/cat.c b/src/slstatus/slstatus-1.1/components/cat.c
deleted file mode 100644
index 07944cc..0000000
--- a/src/slstatus/slstatus-1.1/components/cat.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-cat(const char *path)
-{
-        char *f;
-        FILE *fp;
-
-        if (!(fp = fopen(path, "r"))) {
-                warn("fopen '%s':", path);
-                return NULL;
-        }
-
-        f = fgets(buf, sizeof(buf) - 1, fp);
-        if (fclose(fp) < 0) {
-                warn("fclose '%s':", path);
-                return NULL;
-        }
-        if (!f)
-                return NULL;
-
-        if ((f = strrchr(buf, '\n')))
-                f[0] = '\0';
-
-        return buf[0] ? buf : NULL;
-}
-
diff --git a/src/slstatus/slstatus-1.1/components/cpu.c b/src/slstatus/slstatus-1.1/components/cpu.c
deleted file mode 100644
index d0d03c7..0000000
--- a/src/slstatus/slstatus-1.1/components/cpu.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__linux__)
-	#define CPU_FREQ "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
-
-	const char *
-	cpu_freq(const char *unused)
-	{
-		uintmax_t freq;
-
-		/* in kHz */
-		if (pscanf(CPU_FREQ, "%ju", &freq) != 1)
-			return NULL;
-
-		return fmt_human(freq * 1000, 1000);
-	}
-
-	const char *
-	cpu_perc(const char *unused)
-	{
-		static long double a[7];
-		long double b[7], sum;
-
-		memcpy(b, a, sizeof(b));
-		/* cpu user nice system idle iowait irq softirq */
-		if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
-		           &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6])
-		    != 7)
-			return NULL;
-
-		if (b[0] == 0)
-			return NULL;
-
-		sum = (b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) -
-		      (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]);
-
-		if (sum == 0)
-			return NULL;
-
-		return bprintf("%d", (int)(100 *
-		               ((b[0] + b[1] + b[2] + b[5] + b[6]) -
-		                (a[0] + a[1] + a[2] + a[5] + a[6])) / sum));
-	}
-#elif defined(__OpenBSD__)
-	#include <sys/param.h>
-	#include <sys/sched.h>
-	#include <sys/sysctl.h>
-
-	const char *
-	cpu_freq(const char *unused)
-	{
-		int freq, mib[2];
-		size_t size;
-
-		mib[0] = CTL_HW;
-		mib[1] = HW_CPUSPEED;
-
-		size = sizeof(freq);
-
-		/* in MHz */
-		if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
-			warn("sysctl 'HW_CPUSPEED':");
-			return NULL;
-		}
-
-		return fmt_human(freq * 1E6, 1000);
-	}
-
-	const char *
-	cpu_perc(const char *unused)
-	{
-		int mib[2];
-		static uintmax_t a[CPUSTATES];
-		uintmax_t b[CPUSTATES], sum;
-		size_t size;
-
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_CPTIME;
-
-		size = sizeof(a);
-
-		memcpy(b, a, sizeof(b));
-		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
-			warn("sysctl 'KERN_CPTIME':");
-			return NULL;
-		}
-		if (b[0] == 0)
-			return NULL;
-
-		sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
-		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
-
-		if (sum == 0)
-			return NULL;
-
-		return bprintf("%d", 100 *
-		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
-		                 a[CP_INTR]) -
-		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] +
-		                 b[CP_INTR])) / sum);
-	}
-#elif defined(__FreeBSD__)
-	#include <devstat.h>
-	#include <sys/param.h>
-	#include <sys/sysctl.h>
-
-	const char *
-	cpu_freq(const char *unused)
-	{
-		int freq;
-		size_t size;
-
-		size = sizeof(freq);
-		/* in MHz */
-		if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) < 0 || !size) {
-			warn("sysctlbyname 'hw.clockrate':");
-			return NULL;
-		}
-
-		return fmt_human(freq * 1E6, 1000);
-	}
-
-	const char *
-	cpu_perc(const char *unused)
-	{
-		size_t size;
-		static long a[CPUSTATES];
-		long b[CPUSTATES], sum;
-
-		size = sizeof(a);
-		memcpy(b, a, sizeof(b));
-		if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) < 0 || !size) {
-			warn("sysctlbyname 'kern.cp_time':");
-			return NULL;
-		}
-		if (b[0] == 0)
-			return NULL;
-
-		sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
-		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
-
-		if (sum == 0)
-			return NULL;
-
-		return bprintf("%d", 100 *
-		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
-		                 a[CP_INTR]) -
-		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] +
-		                 b[CP_INTR])) / sum);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/datetime.c b/src/slstatus/slstatus-1.1/components/datetime.c
deleted file mode 100644
index 5b10daf..0000000
--- a/src/slstatus/slstatus-1.1/components/datetime.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <time.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-datetime(const char *fmt)
-{
-	time_t t;
-
-	t = time(NULL);
-	if (!strftime(buf, sizeof(buf), fmt, localtime(&t))) {
-		warn("strftime: Result string exceeds buffer size");
-		return NULL;
-	}
-
-	return buf;
-}
diff --git a/src/slstatus/slstatus-1.1/components/disk.c b/src/slstatus/slstatus-1.1/components/disk.c
deleted file mode 100644
index e19a693..0000000
--- a/src/slstatus/slstatus-1.1/components/disk.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <sys/statvfs.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-disk_free(const char *path)
-{
-	struct statvfs fs;
-
-	if (statvfs(path, &fs) < 0) {
-		warn("statvfs '%s':", path);
-		return NULL;
-	}
-
-	return fmt_human(fs.f_frsize * fs.f_bavail, 1024);
-}
-
-const char *
-disk_perc(const char *path)
-{
-	struct statvfs fs;
-
-	if (statvfs(path, &fs) < 0) {
-		warn("statvfs '%s':", path);
-		return NULL;
-	}
-
-	return bprintf("%d", (int)(100 *
-	               (1 - ((double)fs.f_bavail / (double)fs.f_blocks))));
-}
-
-const char *
-disk_total(const char *path)
-{
-	struct statvfs fs;
-
-	if (statvfs(path, &fs) < 0) {
-		warn("statvfs '%s':", path);
-		return NULL;
-	}
-
-	return fmt_human(fs.f_frsize * fs.f_blocks, 1024);
-}
-
-const char *
-disk_used(const char *path)
-{
-	struct statvfs fs;
-
-	if (statvfs(path, &fs) < 0) {
-		warn("statvfs '%s':", path);
-		return NULL;
-	}
-
-	return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
-}
diff --git a/src/slstatus/slstatus-1.1/components/entropy.c b/src/slstatus/slstatus-1.1/components/entropy.c
deleted file mode 100644
index 65010b0..0000000
--- a/src/slstatus/slstatus-1.1/components/entropy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include "../slstatus.h"
-#if defined(__linux__)
-	#include <stdint.h>
-	#include <stdio.h>
-
-	#include "../util.h"
-
-	#define ENTROPY_AVAIL "/proc/sys/kernel/random/entropy_avail"
-
-	const char *
-	entropy(const char *unused)
-	{
-		uintmax_t num;
-
-		if (pscanf(ENTROPY_AVAIL, "%ju", &num) != 1)
-			return NULL;
-
-		return bprintf("%ju", num);
-	}
-#elif defined(__OpenBSD__) | defined(__FreeBSD__)
-	const char *
-	entropy(const char *unused)
-	{
-		// https://www.unicode.org/charts/PDF/U2200.pdf
-		/* Unicode Character 'INFINITY' (U+221E) */
-		return "\u221E";
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/hostname.c b/src/slstatus/slstatus-1.1/components/hostname.c
deleted file mode 100644
index dab8b63..0000000
--- a/src/slstatus/slstatus-1.1/components/hostname.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <unistd.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-hostname(const char *unused)
-{
-	if (gethostname(buf, sizeof(buf)) < 0) {
-		warn("gethostbyname:");
-		return NULL;
-	}
-
-	return buf;
-}
diff --git a/src/slstatus/slstatus-1.1/components/ip.c b/src/slstatus/slstatus-1.1/components/ip.c
deleted file mode 100644
index 2cdad46..0000000
--- a/src/slstatus/slstatus-1.1/components/ip.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__OpenBSD__)
-	#include <sys/socket.h>
-	#include <sys/types.h>
-#elif defined(__FreeBSD__)
-	#include <netinet/in.h>
-	#include <sys/socket.h>
-#endif
-
-#include "../slstatus.h"
-#include "../util.h"
-
-static const char *
-ip(const char *interface, unsigned short sa_family)
-{
-	struct ifaddrs *ifaddr, *ifa;
-	int s;
-	char host[NI_MAXHOST];
-
-	if (getifaddrs(&ifaddr) < 0) {
-		warn("getifaddrs:");
-		return NULL;
-	}
-
-	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (!ifa->ifa_addr)
-			continue;
-
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6),
-		                host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-		if (!strcmp(ifa->ifa_name, interface) &&
-		    (ifa->ifa_addr->sa_family == sa_family)) {
-			freeifaddrs(ifaddr);
-			if (s != 0) {
-				warn("getnameinfo: %s", gai_strerror(s));
-				return NULL;
-			}
-			return bprintf("%s", host);
-		}
-	}
-
-	freeifaddrs(ifaddr);
-
-	return NULL;
-}
-
-const char *
-ipv4(const char *interface)
-{
-	return ip(interface, AF_INET);
-}
-
-const char *
-ipv6(const char *interface)
-{
-	return ip(interface, AF_INET6);
-}
-
-const char *
-up(const char *interface)
-{
-	struct ifaddrs *ifaddr, *ifa;
-
-	if (getifaddrs(&ifaddr) < 0) {
-		warn("getifaddrs:");
-		return NULL;
-	}
-
-	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (!ifa->ifa_addr)
-			continue;
-
-		if (!strcmp(ifa->ifa_name, interface)) {
-			freeifaddrs(ifaddr);
-			return ifa->ifa_flags & IFF_UP ? "up" : "down";
-		}
-	}
-
-	freeifaddrs(ifaddr);
-
-	return NULL;
-}
diff --git a/src/slstatus/slstatus-1.1/components/kernel_release.c b/src/slstatus/slstatus-1.1/components/kernel_release.c
deleted file mode 100644
index 36a6a44..0000000
--- a/src/slstatus/slstatus-1.1/components/kernel_release.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <sys/utsname.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-kernel_release(const char *unused)
-{
-	struct utsname udata;
-
-	if (uname(&udata) < 0) {
-		warn("uname:");
-		return NULL;
-	}
-
-	return bprintf("%s", udata.release);
-}
diff --git a/src/slstatus/slstatus-1.1/components/keyboard_indicators.c b/src/slstatus/slstatus-1.1/components/keyboard_indicators.c
deleted file mode 100644
index 5f62bb7..0000000
--- a/src/slstatus/slstatus-1.1/components/keyboard_indicators.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <X11/Xlib.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-/*
- * fmt consists of uppercase or lowercase 'c' for caps lock and/or 'n' for num
- * lock, each optionally followed by '?', in the order of indicators desired.
- * If followed by '?', the letter with case preserved is included in the output
- * if the corresponding indicator is on.  Otherwise, the letter is always
- * included, lowercase when off and uppercase when on.
- */
-const char *
-keyboard_indicators(const char *fmt)
-{
-	Display *dpy;
-	XKeyboardState state;
-	size_t fmtlen, i, n;
-	int togglecase, isset;
-	char key;
-
-	if (!(dpy = XOpenDisplay(NULL))) {
-		warn("XOpenDisplay: Failed to open display");
-		return NULL;
-	}
-	XGetKeyboardControl(dpy, &state);
-	XCloseDisplay(dpy);
-
-	fmtlen = strnlen(fmt, 4);
-	for (i = n = 0; i < fmtlen; i++) {
-		key = tolower(fmt[i]);
-		if (key != 'c' && key != 'n')
-			continue;
-
-		togglecase = (i + 1 >= fmtlen || fmt[i + 1] != '?');
-		isset = (state.led_mask & (1 << (key == 'n')));
-
-		if (togglecase)
-			buf[n++] = isset ? toupper(key) : key;
-		else if (isset)
-			buf[n++] = fmt[i];
-	}
-
-	buf[n] = 0;
-	return buf;
-}
diff --git a/src/slstatus/slstatus-1.1/components/keymap.c b/src/slstatus/slstatus-1.1/components/keymap.c
deleted file mode 100644
index 22224f3..0000000
--- a/src/slstatus/slstatus-1.1/components/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/XKBlib.h>
-#include <X11/Xlib.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-static int
-valid_layout_or_variant(char *sym)
-{
-	size_t i;
-	/* invalid symbols from xkb rules config */
-	static const char *invalid[] = { "evdev", "inet", "pc", "base" };
-
-	for (i = 0; i < LEN(invalid); i++)
-		if (!strncmp(sym, invalid[i], strlen(invalid[i])))
-			return 0;
-
-	return 1;
-}
-
-static char *
-get_layout(char *syms, int grp_num)
-{
-	char *tok, *layout;
-	int grp;
-
-	layout = NULL;
-	tok = strtok(syms, "+:_");
-	for (grp = 0; tok && grp <= grp_num; tok = strtok(NULL, "+:_")) {
-		if (!valid_layout_or_variant(tok)) {
-			continue;
-		} else if (strlen(tok) == 1 && isdigit(tok[0])) {
-			/* ignore :2, :3, :4 (additional layout groups) */
-			continue;
-		}
-		layout = tok;
-		grp++;
-	}
-
-	return layout;
-}
-
-const char *
-keymap(const char *unused)
-{
-	Display *dpy;
-	XkbDescRec *desc;
-	XkbStateRec state;
-	char *symbols;
-	const char *layout;
-
-	layout = NULL;
-
-	if (!(dpy = XOpenDisplay(NULL))) {
-		warn("XOpenDisplay: Failed to open display");
-		return NULL;
-	}
-	if (!(desc = XkbAllocKeyboard())) {
-		warn("XkbAllocKeyboard: Failed to allocate keyboard");
-		goto end;
-	}
-	if (XkbGetNames(dpy, XkbSymbolsNameMask, desc)) {
-		warn("XkbGetNames: Failed to retrieve key symbols");
-		goto end;
-	}
-	if (XkbGetState(dpy, XkbUseCoreKbd, &state)) {
-		warn("XkbGetState: Failed to retrieve keyboard state");
-		goto end;
-	}
-	if (!(symbols = XGetAtomName(dpy, desc->names->symbols))) {
-		warn("XGetAtomName: Failed to get atom name");
-		goto end;
-	}
-	layout = bprintf("%s", get_layout(symbols, state.group));
-	XFree(symbols);
-end:
-	XkbFreeKeyboard(desc, XkbSymbolsNameMask, 1);
-	if (XCloseDisplay(dpy))
-		warn("XCloseDisplay: Failed to close display");
-
-	return layout;
-}
diff --git a/src/slstatus/slstatus-1.1/components/load_avg.c b/src/slstatus/slstatus-1.1/components/load_avg.c
deleted file mode 100644
index f278a40..0000000
--- a/src/slstatus/slstatus-1.1/components/load_avg.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-load_avg(const char *unused)
-{
-	double avgs[3];
-
-	if (getloadavg(avgs, 3) < 0) {
-		warn("getloadavg: Failed to obtain load average");
-		return NULL;
-	}
-
-	return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
-}
diff --git a/src/slstatus/slstatus-1.1/components/netspeeds.c b/src/slstatus/slstatus-1.1/components/netspeeds.c
deleted file mode 100644
index cde6fa9..0000000
--- a/src/slstatus/slstatus-1.1/components/netspeeds.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <limits.h>
-#include <stdio.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__linux__)
-	#include <stdint.h>
-
-	#define NET_RX_BYTES "/sys/class/net/%s/statistics/rx_bytes"
-	#define NET_TX_BYTES "/sys/class/net/%s/statistics/tx_bytes"
-
-	const char *
-	netspeed_rx(const char *interface)
-	{
-		uintmax_t oldrxbytes;
-		static uintmax_t rxbytes;
-		extern const unsigned int interval;
-		char path[PATH_MAX];
-
-		oldrxbytes = rxbytes;
-
-		if (esnprintf(path, sizeof(path), NET_RX_BYTES, interface) < 0)
-			return NULL;
-		if (pscanf(path, "%ju", &rxbytes) != 1)
-			return NULL;
-		if (oldrxbytes == 0)
-			return NULL;
-
-		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
-		                 1024);
-	}
-
-	const char *
-	netspeed_tx(const char *interface)
-	{
-		uintmax_t oldtxbytes;
-		static uintmax_t txbytes;
-		extern const unsigned int interval;
-		char path[PATH_MAX];
-
-		oldtxbytes = txbytes;
-
-		if (esnprintf(path, sizeof(path), NET_TX_BYTES, interface) < 0)
-			return NULL;
-		if (pscanf(path, "%ju", &txbytes) != 1)
-			return NULL;
-		if (oldtxbytes == 0)
-			return NULL;
-
-		return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
-		                 1024);
-	}
-#elif defined(__OpenBSD__) | defined(__FreeBSD__)
-	#include <ifaddrs.h>
-	#include <net/if.h>
-	#include <string.h>
-	#include <sys/types.h>
-	#include <sys/socket.h>
-
-	const char *
-	netspeed_rx(const char *interface)
-	{
-		struct ifaddrs *ifal, *ifa;
-		struct if_data *ifd;
-		uintmax_t oldrxbytes;
-		static uintmax_t rxbytes;
-		extern const unsigned int interval;
-		int if_ok = 0;
-
-		oldrxbytes = rxbytes;
-
-		if (getifaddrs(&ifal) < 0) {
-			warn("getifaddrs failed");
-			return NULL;
-		}
-		rxbytes = 0;
-		for (ifa = ifal; ifa; ifa = ifa->ifa_next)
-			if (!strcmp(ifa->ifa_name, interface) &&
-			   (ifd = (struct if_data *)ifa->ifa_data))
-				rxbytes += ifd->ifi_ibytes, if_ok = 1;
-
-		freeifaddrs(ifal);
-		if (!if_ok) {
-			warn("reading 'if_data' failed");
-			return NULL;
-		}
-		if (oldrxbytes == 0)
-			return NULL;
-
-		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
-		                 1024);
-	}
-
-	const char *
-	netspeed_tx(const char *interface)
-	{
-		struct ifaddrs *ifal, *ifa;
-		struct if_data *ifd;
-		uintmax_t oldtxbytes;
-		static uintmax_t txbytes;
-		extern const unsigned int interval;
-		int if_ok = 0;
-
-		oldtxbytes = txbytes;
-
-		if (getifaddrs(&ifal) < 0) {
-			warn("getifaddrs failed");
-			return NULL;
-		}
-		txbytes = 0;
-		for (ifa = ifal; ifa; ifa = ifa->ifa_next)
-			if (!strcmp(ifa->ifa_name, interface) &&
-			   (ifd = (struct if_data *)ifa->ifa_data))
-				txbytes += ifd->ifi_obytes, if_ok = 1;
-
-		freeifaddrs(ifal);
-		if (!if_ok) {
-			warn("reading 'if_data' failed");
-			return NULL;
-		}
-		if (oldtxbytes == 0)
-			return NULL;
-
-		return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
-		                 1024);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/num_files.c b/src/slstatus/slstatus-1.1/components/num_files.c
deleted file mode 100644
index df0acd1..0000000
--- a/src/slstatus/slstatus-1.1/components/num_files.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <dirent.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-num_files(const char *path)
-{
-	struct dirent *dp;
-	DIR *dir;
-	int num;
-
-	if (!(dir = opendir(path))) {
-		warn("opendir '%s':", path);
-		return NULL;
-	}
-
-	num = 0;
-	while ((dp = readdir(dir))) {
-		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
-			continue; /* skip self and parent */
-
-		num++;
-	}
-
-	closedir(dir);
-
-	return bprintf("%d", num);
-}
diff --git a/src/slstatus/slstatus-1.1/components/ram.c b/src/slstatus/slstatus-1.1/components/ram.c
deleted file mode 100644
index 15c4b74..0000000
--- a/src/slstatus/slstatus-1.1/components/ram.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__linux__)
-	#include <stdint.h>
-
-	const char *
-	ram_free(const char *unused)
-	{
-		uintmax_t free;
-
-		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ju kB\n"
-		           "MemFree: %ju kB\n"
-		           "MemAvailable: %ju kB\n",
-		           &free, &free, &free) != 3)
-			return NULL;
-
-		return fmt_human(free * 1024, 1024);
-	}
-
-	const char *
-	ram_perc(const char *unused)
-	{
-		uintmax_t total, free, buffers, cached;
-		int percent;
-
-		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ju kB\n"
-		           "MemFree: %ju kB\n"
-		           "MemAvailable: %ju kB\n"
-		           "Buffers: %ju kB\n"
-		           "Cached: %ju kB\n",
-		           &total, &free, &buffers, &buffers, &cached) != 5)
-			return NULL;
-
-		if (total == 0)
-			return NULL;
-
-		percent = 100 * ((total - free) - (buffers + cached)) / total;
-		return bprintf("%d", percent);
-	}
-
-	const char *
-	ram_total(const char *unused)
-	{
-		uintmax_t total;
-
-		if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
-		    != 1)
-			return NULL;
-
-		return fmt_human(total * 1024, 1024);
-	}
-
-	const char *
-	ram_used(const char *unused)
-	{
-		uintmax_t total, free, buffers, cached, used;
-
-		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ju kB\n"
-		           "MemFree: %ju kB\n"
-		           "MemAvailable: %ju kB\n"
-		           "Buffers: %ju kB\n"
-		           "Cached: %ju kB\n",
-		           &total, &free, &buffers, &buffers, &cached) != 5)
-			return NULL;
-
-		used = (total - free - buffers - cached);
-		return fmt_human(used * 1024, 1024);
-	}
-#elif defined(__OpenBSD__)
-	#include <stdlib.h>
-	#include <sys/sysctl.h>
-	#include <sys/types.h>
-	#include <unistd.h>
-
-	#define LOG1024 10
-	#define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))
-
-	inline int
-	load_uvmexp(struct uvmexp *uvmexp)
-	{
-		int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
-		size_t size;
-
-		size = sizeof(*uvmexp);
-
-		if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0)
-			return 1;
-
-		return 0;
-	}
-
-	const char *
-	ram_free(const char *unused)
-	{
-		struct uvmexp uvmexp;
-		int free_pages;
-
-		if (!load_uvmexp(&uvmexp))
-			return NULL;
-
-		free_pages = uvmexp.npages - uvmexp.active;
-		return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
-				 1024, 1024);
-	}
-
-	const char *
-	ram_perc(const char *unused)
-	{
-		struct uvmexp uvmexp;
-		int percent;
-
-		if (!load_uvmexp(&uvmexp))
-			return NULL;
-
-		percent = uvmexp.active * 100 / uvmexp.npages;
-		return bprintf("%d", percent);
-	}
-
-	const char *
-	ram_total(const char *unused)
-	{
-		struct uvmexp uvmexp;
-
-		if (!load_uvmexp(&uvmexp))
-			return NULL;
-
-		return fmt_human(pagetok(uvmexp.npages,
-					 uvmexp.pageshift) * 1024, 1024);
-	}
-
-	const char *
-	ram_used(const char *unused)
-	{
-		struct uvmexp uvmexp;
-
-		if (!load_uvmexp(&uvmexp))
-			return NULL;
-
-		return fmt_human(pagetok(uvmexp.active,
-					 uvmexp.pageshift) * 1024, 1024);
-	}
-#elif defined(__FreeBSD__)
-	#include <sys/sysctl.h>
-	#include <sys/vmmeter.h>
-	#include <unistd.h>
-	#include <vm/vm_param.h>
-
-	const char *
-	ram_free(const char *unused) {
-		struct vmtotal vm_stats;
-		int mib[] = {CTL_VM, VM_TOTAL};
-		size_t len;
-
-		len = sizeof(struct vmtotal);
-		if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) < 0
-		    || !len)
-			return NULL;
-
-		return fmt_human(vm_stats.t_free * getpagesize(), 1024);
-	}
-
-	const char *
-	ram_total(const char *unused) {
-		unsigned int npages;
-		size_t len;
-
-		len = sizeof(npages);
-		if (sysctlbyname("vm.stats.vm.v_page_count",
-		                 &npages, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		return fmt_human(npages * getpagesize(), 1024);
-	}
-
-	const char *
-	ram_perc(const char *unused) {
-		unsigned int npages;
-		unsigned int active;
-		size_t len;
-
-		len = sizeof(npages);
-		if (sysctlbyname("vm.stats.vm.v_page_count",
-		                 &npages, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		if (sysctlbyname("vm.stats.vm.v_active_count",
-		                 &active, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		return bprintf("%d", active * 100 / npages);
-	}
-
-	const char *
-	ram_used(const char *unused) {
-		unsigned int active;
-		size_t len;
-
-		len = sizeof(active);
-		if (sysctlbyname("vm.stats.vm.v_active_count",
-		                 &active, &len, NULL, 0) < 0 || !len)
-			return NULL;
-
-		return fmt_human(active * getpagesize(), 1024);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/run_command.c b/src/slstatus/slstatus-1.1/components/run_command.c
deleted file mode 100644
index 93bf6da..0000000
--- a/src/slstatus/slstatus-1.1/components/run_command.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-run_command(const char *cmd)
-{
-	char *p;
-	FILE *fp;
-
-	if (!(fp = popen(cmd, "r"))) {
-		warn("popen '%s':", cmd);
-		return NULL;
-	}
-
-	p = fgets(buf, sizeof(buf) - 1, fp);
-	if (pclose(fp) < 0) {
-		warn("pclose '%s':", cmd);
-		return NULL;
-	}
-	if (!p)
-		return NULL;
-
-	if ((p = strrchr(buf, '\n')))
-		p[0] = '\0';
-
-	return buf[0] ? buf : NULL;
-}
diff --git a/src/slstatus/slstatus-1.1/components/swap.c b/src/slstatus/slstatus-1.1/components/swap.c
deleted file mode 100644
index f270d93..0000000
--- a/src/slstatus/slstatus-1.1/components/swap.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__linux__)
-	static int
-	get_swap_info(long *s_total, long *s_free, long *s_cached)
-	{
-		FILE *fp;
-		struct {
-			const char *name;
-			const size_t len;
-			long *var;
-		} ent[] = {
-			{ "SwapTotal",  sizeof("SwapTotal") - 1,  s_total  },
-			{ "SwapFree",   sizeof("SwapFree") - 1,   s_free   },
-			{ "SwapCached", sizeof("SwapCached") - 1, s_cached },
-		};
-		size_t line_len = 0, i, left;
-		char *line = NULL;
-
-		/* get number of fields we want to extract */
-		for (i = 0, left = 0; i < LEN(ent); i++)
-			if (ent[i].var)
-				left++;
-
-		if (!(fp = fopen("/proc/meminfo", "r"))) {
-			warn("fopen '/proc/meminfo':");
-			return 1;
-		}
-
-		/* read file line by line and extract field information */
-		while (left > 0 && getline(&line, &line_len, fp) >= 0) {
-			for (i = 0; i < LEN(ent); i++) {
-				if (ent[i].var &&
-				    !strncmp(line, ent[i].name, ent[i].len)) {
-					sscanf(line + ent[i].len + 1,
-					       "%ld kB\n", ent[i].var);
-					left--;
-					break;
-				}
-			}
-		}
-		free(line);
-		if (ferror(fp)) {
-			warn("getline '/proc/meminfo':");
-			return 1;
-		}
-
-		fclose(fp);
-		return 0;
-	}
-
-	const char *
-	swap_free(const char *unused)
-	{
-		long free;
-
-		if (get_swap_info(NULL, &free, NULL))
-			return NULL;
-
-		return fmt_human(free * 1024, 1024);
-	}
-
-	const char *
-	swap_perc(const char *unused)
-	{
-		long total, free, cached;
-
-		if (get_swap_info(&total, &free, &cached) || total == 0)
-			return NULL;
-
-		return bprintf("%d", 100 * (total - free - cached) / total);
-	}
-
-	const char *
-	swap_total(const char *unused)
-	{
-		long total;
-
-		if (get_swap_info(&total, NULL, NULL))
-			return NULL;
-
-		return fmt_human(total * 1024, 1024);
-	}
-
-	const char *
-	swap_used(const char *unused)
-	{
-		long total, free, cached;
-
-		if (get_swap_info(&total, &free, &cached))
-			return NULL;
-
-		return fmt_human((total - free - cached) * 1024, 1024);
-	}
-#elif defined(__OpenBSD__)
-	#include <stdlib.h>
-	#include <sys/swap.h>
-	#include <sys/types.h>
-	#include <unistd.h>
-
-	static int
-	getstats(int *total, int *used)
-	{
-		struct swapent *sep, *fsep;
-		int rnswap, nswap, i;
-
-		if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) < 1) {
-			warn("swaptctl 'SWAP_NSWAP':");
-			return 1;
-		}
-		if (!(fsep = sep = calloc(nswap, sizeof(*sep)))) {
-			warn("calloc 'nswap':");
-			return 1;
-		}
-		if ((rnswap = swapctl(SWAP_STATS, (void *)sep, nswap)) < 0) {
-			warn("swapctl 'SWAP_STATA':");
-			return 1;
-		}
-		if (nswap != rnswap) {
-			warn("getstats: SWAP_STATS != SWAP_NSWAP");
-			return 1;
-		}
-
-		*total = 0;
-		*used = 0;
-
-		for (i = 0; i < rnswap; i++) {
-			*total += sep->se_nblks >> 1;
-			*used += sep->se_inuse >> 1;
-		}
-
-		free(fsep);
-
-		return 0;
-	}
-
-	const char *
-	swap_free(const char *unused)
-	{
-		int total, used;
-
-		if (getstats(&total, &used))
-			return NULL;
-
-		return fmt_human((total - used) * 1024, 1024);
-	}
-
-	const char *
-	swap_perc(const char *unused)
-	{
-		int total, used;
-
-		if (getstats(&total, &used))
-			return NULL;
-
-		if (total == 0)
-			return NULL;
-
-		return bprintf("%d", 100 * used / total);
-	}
-
-	const char *
-	swap_total(const char *unused)
-	{
-		int total, used;
-
-		if (getstats(&total, &used))
-			return NULL;
-
-		return fmt_human(total * 1024, 1024);
-	}
-
-	const char *
-	swap_used(const char *unused)
-	{
-		int total, used;
-
-		if (getstats(&total, &used))
-			return NULL;
-
-		return fmt_human(used * 1024, 1024);
-	}
-#elif defined(__FreeBSD__)
-	#include <fcntl.h>
-	#include <kvm.h>
-	#include <stdlib.h>
-	#include <sys/types.h>
-	#include <unistd.h>
-
-	static int getswapinfo(struct kvm_swap *swap_info, size_t size)
-	{
-		kvm_t *kd;
-
-		kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, NULL);
-		if (kd == NULL) {
-			warn("kvm_openfiles '/dev/null':");
-			return 0;
-		}
-
-		if (kvm_getswapinfo(kd, swap_info, size, 0 /* Unused flags */) < 0) {
-			warn("kvm_getswapinfo:");
-			kvm_close(kd);
-			return 0;
-		}
-
-		kvm_close(kd);
-		return 1;
-	}
-
-	const char *
-	swap_free(const char *unused)
-	{
-		struct kvm_swap swap_info[1];
-		long used, total;
-
-		if (!getswapinfo(swap_info, 1))
-			return NULL;
-
-		total = swap_info[0].ksw_total;
-		used = swap_info[0].ksw_used;
-
-		return fmt_human((total - used) * getpagesize(), 1024);
-	}
-
-	const char *
-	swap_perc(const char *unused)
-	{
-		struct kvm_swap swap_info[1];
-		long used, total;
-
-		if (!getswapinfo(swap_info, 1))
-			return NULL;
-
-		total = swap_info[0].ksw_total;
-		used = swap_info[0].ksw_used;
-
-		return bprintf("%d", used * 100 / total);
-	}
-
-	const char *
-	swap_total(const char *unused)
-	{
-		struct kvm_swap swap_info[1];
-		long total;
-
-		if (!getswapinfo(swap_info, 1))
-			return NULL;
-
-		total = swap_info[0].ksw_total;
-
-		return fmt_human(total * getpagesize(), 1024);
-	}
-
-	const char *
-	swap_used(const char *unused)
-	{
-		struct kvm_swap swap_info[1];
-		long used;
-
-		if (!getswapinfo(swap_info, 1))
-			return NULL;
-
-		used = swap_info[0].ksw_used;
-
-		return fmt_human(used * getpagesize(), 1024);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/temperature.c b/src/slstatus/slstatus-1.1/components/temperature.c
deleted file mode 100644
index 7cf1394..0000000
--- a/src/slstatus/slstatus-1.1/components/temperature.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stddef.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-
-#if defined(__linux__)
-	#include <stdint.h>
-
-	const char *
-	temp(const char *file)
-	{
-		uintmax_t temp;
-
-		if (pscanf(file, "%ju", &temp) != 1)
-			return NULL;
-
-		return bprintf("%ju", temp / 1000);
-	}
-#elif defined(__OpenBSD__)
-	#include <stdio.h>
-	#include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
-	#include <sys/sensors.h>
-	#include <sys/sysctl.h>
-
-	const char *
-	temp(const char *unused)
-	{
-		int mib[5];
-		size_t size;
-		struct sensor temp;
-
-		mib[0] = CTL_HW;
-		mib[1] = HW_SENSORS;
-		mib[2] = 0; /* cpu0 */
-		mib[3] = SENSOR_TEMP;
-		mib[4] = 0; /* temp0 */
-
-		size = sizeof(temp);
-
-		if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) {
-			warn("sysctl 'SENSOR_TEMP':");
-			return NULL;
-		}
-
-		/* kelvin to celsius */
-		return bprintf("%d", (int)((float)(temp.value-273150000) / 1E6));
-	}
-#elif defined(__FreeBSD__)
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <sys/sysctl.h>
-
-	#define ACPI_TEMP "hw.acpi.thermal.%s.temperature"
-
-	const char *
-	temp(const char *zone)
-	{
-		char buf[256];
-		int temp;
-		size_t len;
-
-		len = sizeof(temp);
-		snprintf(buf, sizeof(buf), ACPI_TEMP, zone);
-		if (sysctlbyname(buf, &temp, &len, NULL, 0) < 0
-				|| !len)
-			return NULL;
-
-		/* kelvin to decimal celcius */
-		return bprintf("%d.%d", (temp - 2731) / 10, abs((temp - 2731) % 10));
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/uptime.c b/src/slstatus/slstatus-1.1/components/uptime.c
deleted file mode 100644
index 6227f73..0000000
--- a/src/slstatus/slstatus-1.1/components/uptime.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdint.h>
-#include <stdio.h>
-#include <time.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(CLOCK_BOOTTIME)
-	#define UPTIME_FLAG CLOCK_BOOTTIME
-#elif defined(CLOCK_UPTIME)
-	#define UPTIME_FLAG CLOCK_UPTIME
-#else
-	#define UPTIME_FLAG CLOCK_MONOTONIC
-#endif
-
-const char *
-uptime(const char *unused)
-{
-	char warn_buf[256];
-	uintmax_t h, m;
-	struct timespec uptime;
-
-	if (clock_gettime(UPTIME_FLAG, &uptime) < 0) {
-		snprintf(warn_buf, sizeof(warn_buf), "clock_gettime %d", UPTIME_FLAG);
-		warn(warn_buf);
-		return NULL;
-	}
-
-	h = uptime.tv_sec / 3600;
-	m = uptime.tv_sec % 3600 / 60;
-
-	return bprintf("%juh %jum", h, m);
-}
diff --git a/src/slstatus/slstatus-1.1/components/user.c b/src/slstatus/slstatus-1.1/components/user.c
deleted file mode 100644
index 3517495..0000000
--- a/src/slstatus/slstatus-1.1/components/user.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <pwd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-const char *
-gid(const char *unused)
-{
-	return bprintf("%d", getgid());
-}
-
-const char *
-username(const char *unused)
-{
-	struct passwd *pw;
-
-	if (!(pw = getpwuid(geteuid()))) {
-		warn("getpwuid '%d':", geteuid());
-		return NULL;
-	}
-
-	return bprintf("%s", pw->pw_name);
-}
-
-const char *
-uid(const char *unused)
-{
-	return bprintf("%d", geteuid());
-}
diff --git a/src/slstatus/slstatus-1.1/components/volume.c b/src/slstatus/slstatus-1.1/components/volume.c
deleted file mode 100644
index 6cec556..0000000
--- a/src/slstatus/slstatus-1.1/components/volume.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#if defined(__OpenBSD__) | defined(__FreeBSD__)
-	#include <poll.h>
-	#include <sndio.h>
-	#include <stdlib.h>
-	#include <sys/queue.h>
-
-	struct control {
-		LIST_ENTRY(control)	next;
-		unsigned int		addr;
-	#define CTRL_NONE	0
-	#define CTRL_LEVEL	1
-	#define CTRL_MUTE	2
-		unsigned int		type;
-		unsigned int		maxval;
-		unsigned int		val;
-	};
-
-	static LIST_HEAD(, control) controls = LIST_HEAD_INITIALIZER(controls);
-	static struct pollfd *pfds;
-	static struct sioctl_hdl *hdl;
-	static int initialized;
-
-	/*
-	 * Call-back to obtain the description of all audio controls.
-	 */
-	static void
-	ondesc(void *unused, struct sioctl_desc *desc, int val)
-	{
-		struct control *c, *ctmp;
-		unsigned int type = CTRL_NONE;
-
-		if (desc == NULL)
-			return;
-
-		/* Delete existing audio control with the same address. */
-		LIST_FOREACH_SAFE(c, &controls, next, ctmp) {
-			if (desc->addr == c->addr) {
-				LIST_REMOVE(c, next);
-				free(c);
-				break;
-			}
-		}
-
-		/* Only match output.level and output.mute audio controls. */
-		if (desc->group[0] != 0 ||
-		    strcmp(desc->node0.name, "output") != 0)
-			return;
-		if (desc->type == SIOCTL_NUM &&
-		    strcmp(desc->func, "level") == 0)
-			type = CTRL_LEVEL;
-		else if (desc->type == SIOCTL_SW &&
-			 strcmp(desc->func, "mute") == 0)
-			type = CTRL_MUTE;
-		else
-			return;
-
-		c = malloc(sizeof(struct control));
-		if (c == NULL) {
-			warn("sndio: failed to allocate audio control\n");
-			return;
-		}
-
-		c->addr = desc->addr;
-		c->type = type;
-		c->maxval = desc->maxval;
-		c->val = val;
-		LIST_INSERT_HEAD(&controls, c, next);
-	}
-
-	/*
-	 * Call-back invoked whenever an audio control changes.
-	 */
-	static void
-	onval(void *unused, unsigned int addr, unsigned int val)
-	{
-		struct control *c;
-
-		LIST_FOREACH(c, &controls, next) {
-			if (c->addr == addr)
-				break;
-		}
-		c->val = val;
-	}
-
-	static void
-	cleanup(void)
-	{
-		struct control *c;
-
-		if (hdl) {
-			sioctl_close(hdl);
-			hdl = NULL;
-		}
-
-		free(pfds);
-		pfds = NULL;
-
-		while (!LIST_EMPTY(&controls)) {
-			c = LIST_FIRST(&controls);
-			LIST_REMOVE(c, next);
-			free(c);
-		}
-	}
-
-	static int
-	init(void)
-	{
-		hdl = sioctl_open(SIO_DEVANY, SIOCTL_READ, 0);
-		if (hdl == NULL) {
-			warn("sndio: cannot open device");
-			goto failed;
-		}
-
-		if (!sioctl_ondesc(hdl, ondesc, NULL)) {
-			warn("sndio: cannot set control description call-back");
-			goto failed;
-		}
-
-		if (!sioctl_onval(hdl, onval, NULL)) {
-			warn("sndio: cannot set control values call-back");
-			goto failed;
-		}
-
-		pfds = calloc(sioctl_nfds(hdl), sizeof(struct pollfd));
-		if (pfds == NULL) {
-			warn("sndio: cannot allocate pollfd structures");
-			goto failed;
-		}
-
-		return 1;
-	failed:
-		cleanup();
-		return 0;
-	}
-
-	const char *
-	vol_perc(const char *unused)
-	{
-		struct control *c;
-		int n, v, value;
-
-		if (!initialized)
-			initialized = init();
-
-		if (hdl == NULL)
-			return NULL;
-
-		n = sioctl_pollfd(hdl, pfds, POLLIN);
-		if (n > 0) {
-			n = poll(pfds, n, 0);
-			if (n > 0) {
-				if (sioctl_revents(hdl, pfds) & POLLHUP) {
-					warn("sndio: disconnected");
-					cleanup();
-					initialized = 0;
-					return NULL;
-				}
-			}
-		}
-
-		value = 100;
-		LIST_FOREACH(c, &controls, next) {
-			if (c->type == CTRL_MUTE && c->val == 1)
-				value = 0;
-			else if (c->type == CTRL_LEVEL) {
-				v = (c->val * 100 + c->maxval / 2) / c->maxval;
-				/* For multiple channels return the minimum. */
-				if (v < value)
-					value = v;
-			}
-		}
-
-		return bprintf("%d", value);
-	}
-#else
-	#include <sys/soundcard.h>
-
-	const char *
-	vol_perc(const char *card)
-	{
-		size_t i;
-		int v, afd, devmask;
-		char *vnames[] = SOUND_DEVICE_NAMES;
-
-		if ((afd = open(card, O_RDONLY | O_NONBLOCK)) < 0) {
-			warn("open '%s':", card);
-			return NULL;
-		}
-
-		if (ioctl(afd, (int)SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
-			warn("ioctl 'SOUND_MIXER_READ_DEVMASK':");
-			close(afd);
-			return NULL;
-		}
-		for (i = 0; i < LEN(vnames); i++) {
-			if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
-				if (ioctl(afd, MIXER_READ(i), &v) < 0) {
-					warn("ioctl 'MIXER_READ(%ld)':", i);
-					close(afd);
-					return NULL;
-				}
-			}
-		}
-
-		close(afd);
-
-		return bprintf("%d", v & 0xff);
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/components/wifi.c b/src/slstatus/slstatus-1.1/components/wifi.c
deleted file mode 100644
index 23af201..0000000
--- a/src/slstatus/slstatus-1.1/components/wifi.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ifaddrs.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include "../slstatus.h"
-#include "../util.h"
-
-#define RSSI_TO_PERC(rssi) \
-			rssi >= -50 ? 100 : \
-			(rssi <= -100 ? 0 : \
-			(2 * (rssi + 100)))
-
-#if defined(__linux__)
-	#include <stdint.h>
-	#include <net/if.h>
-	#include <linux/netlink.h>
-	#include <linux/genetlink.h>
-	#include <linux/nl80211.h>
-
-	static int nlsock = -1;
-	static uint32_t seq = 1;
-	static char resp[4096];
-
-	static char *
-	findattr(int attr, const char *p, const char *e, size_t *len)
-	{
-		while (p < e) {
-			struct nlattr nla;
-			memcpy(&nla, p, sizeof(nla));
-			if (nla.nla_type == attr) {
-				*len = nla.nla_len - NLA_HDRLEN;
-				return (char *)(p + NLA_HDRLEN);
-			}
-			p += NLA_ALIGN(nla.nla_len);
-		}
-		return NULL;
-	}
-
-	static uint16_t
-	nl80211fam(void)
-	{
-		static const char family[] = "nl80211";
-		static uint16_t id;
-		ssize_t r;
-		size_t len;
-		char ctrl[NLMSG_HDRLEN+GENL_HDRLEN+NLA_HDRLEN+NLA_ALIGN(sizeof(family))] = {0}, *p = ctrl;
-
-		if (id)
-			return id;
-
-		memcpy(p, &(struct nlmsghdr){
-			.nlmsg_len = sizeof(ctrl),
-			.nlmsg_type = GENL_ID_CTRL,
-			.nlmsg_flags = NLM_F_REQUEST,
-			.nlmsg_seq = seq++,
-			.nlmsg_pid = 0,
-		}, sizeof(struct nlmsghdr));
-		p += NLMSG_HDRLEN;
-		memcpy(p, &(struct genlmsghdr){
-			.cmd = CTRL_CMD_GETFAMILY,
-			.version = 1,
-		}, sizeof(struct genlmsghdr));
-		p += GENL_HDRLEN;
-		memcpy(p, &(struct nlattr){
-			.nla_len = NLA_HDRLEN+sizeof(family),
-			.nla_type = CTRL_ATTR_FAMILY_NAME,
-		}, sizeof(struct nlattr));
-		p += NLA_HDRLEN;
-		memcpy(p, family, sizeof(family));
-
-		if (nlsock < 0)
-			nlsock = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);
-		if (nlsock < 0) {
-			warn("socket 'AF_NETLINK':");
-			return 0;
-		}
-		if (send(nlsock, ctrl, sizeof(ctrl), 0) != sizeof(ctrl)) {
-			warn("send 'AF_NETLINK':");
-			return 0;
-		}
-		r = recv(nlsock, resp, sizeof(resp), 0);
-		if (r < 0) {
-			warn("recv 'AF_NETLINK':");
-			return 0;
-		}
-		if ((size_t)r <= sizeof(ctrl))
-			return 0;
-		p = findattr(CTRL_ATTR_FAMILY_ID, resp + sizeof(ctrl), resp + r, &len);
-		if (p && len == 2)
-			memcpy(&id, p, 2);
-
-		return id;
-	}
-
-	static int
-	ifindex(const char *interface)
-	{
-		static struct ifreq ifr;
-		static int ifsock = -1;
-
-		if (ifsock < 0)
-			ifsock = socket(AF_UNIX, SOCK_DGRAM, 0);
-		if (ifsock < 0) {
-			warn("socket 'AF_UNIX':");
-			return -1;
-		}
-		if (strcmp(ifr.ifr_name, interface) != 0) {
-			strcpy(ifr.ifr_name, interface);
-			if (ioctl(ifsock, SIOCGIFINDEX, &ifr) != 0) {
-				warn("ioctl 'SIOCGIFINDEX':");
-				return -1;
-			}
-		}
-		return ifr.ifr_ifindex;
-	}
-
-	const char *
-	wifi_essid(const char *interface)
-	{
-		uint16_t fam = nl80211fam();
-		ssize_t r;
-		size_t len;
-		char req[NLMSG_HDRLEN+GENL_HDRLEN+NLA_HDRLEN+NLA_ALIGN(4)] = {0}, *p = req;
-		int idx = ifindex(interface);
-		if (!fam) {
-			fprintf(stderr, "nl80211 family not found\n");
-			return NULL;
-		}
-		if (idx < 0) {
-			fprintf(stderr, "interface %s not found\n", interface);
-			return NULL;
-		}
-
-		memcpy(p, &(struct nlmsghdr){
-			.nlmsg_len = sizeof(req),
-			.nlmsg_type = fam,
-			.nlmsg_flags = NLM_F_REQUEST,
-			.nlmsg_seq = seq++,
-			.nlmsg_pid = 0,
-		}, sizeof(struct nlmsghdr));
-		p += NLMSG_HDRLEN;
-		memcpy(p, &(struct genlmsghdr){
-			.cmd = NL80211_CMD_GET_INTERFACE,
-			.version = 1,
-		}, sizeof(struct genlmsghdr));
-		p += GENL_HDRLEN;
-		memcpy(p, &(struct nlattr){
-			.nla_len = NLA_HDRLEN+4,
-			.nla_type = NL80211_ATTR_IFINDEX,
-		}, sizeof(struct nlattr));
-		p += NLA_HDRLEN;
-		memcpy(p, &(uint32_t){idx}, 4);
-
-		if (send(nlsock, req, sizeof(req), 0) != sizeof(req)) {
-			warn("send 'AF_NETLINK':");
-			return NULL;
-		}
-		r = recv(nlsock, resp, sizeof(resp), 0);
-		if (r < 0) {
-			warn("recv 'AF_NETLINK':");
-			return NULL;
-		}
-
-		if ((size_t)r <= NLMSG_HDRLEN + GENL_HDRLEN)
-			return NULL;
-		p = findattr(NL80211_ATTR_SSID, resp + NLMSG_HDRLEN + GENL_HDRLEN, resp + r, &len);
-		if (p)
-			p[len] = 0;
-
-		return p;
-	}
-
-	const char *
-	wifi_perc(const char *interface)
-	{
-		static char strength[4];
-		struct nlmsghdr hdr;
-		uint16_t fam = nl80211fam();
-		ssize_t r;
-		size_t len;
-		char req[NLMSG_HDRLEN + GENL_HDRLEN + NLA_HDRLEN + NLA_ALIGN(4)] = {0}, *p = req, *e;
-		int idx = ifindex(interface);
-
-		if (idx < 0) {
-			fprintf(stderr, "interface %s not found\n", interface);
-			return NULL;
-		}
-
-		memcpy(p, &(struct nlmsghdr){
-			.nlmsg_len = sizeof(req),
-			.nlmsg_type = fam,
-			.nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP,
-			.nlmsg_seq = seq++,
-			.nlmsg_pid = 0,
-		}, sizeof(struct nlmsghdr));
-		p += NLMSG_HDRLEN;
-		memcpy(p, &(struct genlmsghdr){
-			.cmd = NL80211_CMD_GET_STATION,
-			.version = 1,
-		}, sizeof(struct genlmsghdr));
-		p += GENL_HDRLEN;
-		memcpy(p, &(struct nlattr){
-			.nla_len = NLA_HDRLEN + 4,
-			.nla_type = NL80211_ATTR_IFINDEX,
-		}, sizeof(struct nlattr));
-		p += NLA_HDRLEN;
-		memcpy(p, &idx, 4);
-
-		if (send(nlsock, req, sizeof(req), 0) != sizeof(req)) {
-			warn("send 'AF_NETLINK':");
-			return NULL;
-		}
-
-		*strength = 0;
-		while (1) {
-			r = recv(nlsock, resp, sizeof(resp), 0);
-			if (r < 0) {
-				warn("recv 'AF_NETLINK':");
-				return NULL;
-			}
-			if ((size_t)r < sizeof(hdr))
-				return NULL;
-
-			for (p = resp; p != resp + r && (size_t)(resp + r-p) >= sizeof(hdr); p = e) {
-				memcpy(&hdr, p, sizeof(hdr));
-				e = resp + r - p < hdr.nlmsg_len ? resp + r : p + hdr.nlmsg_len;
-
-				if (!*strength && hdr.nlmsg_len > NLMSG_HDRLEN+GENL_HDRLEN) {
-					p += NLMSG_HDRLEN+GENL_HDRLEN;
-					p = findattr(NL80211_ATTR_STA_INFO, p, e, &len);
-					if (p)
-						p = findattr(NL80211_STA_INFO_SIGNAL_AVG, p, e, &len);
-					if (p && len == 1)
-						snprintf(strength, sizeof(strength), "%d", RSSI_TO_PERC(*p));
-				}
-				if (hdr.nlmsg_type == NLMSG_DONE)
-					return *strength ? strength : NULL;
-			}
-		}
-	}
-#elif defined(__OpenBSD__)
-	#include <net/if.h>
-	#include <net/if_media.h>
-	#include <net80211/ieee80211.h>
-	#include <sys/select.h> /* before <sys/ieee80211_ioctl.h> for NBBY */
-	#include <net80211/ieee80211_ioctl.h>
-	#include <stdlib.h>
-	#include <sys/types.h>
-
-	static int
-	load_ieee80211_nodereq(const char *interface, struct ieee80211_nodereq *nr)
-	{
-		struct ieee80211_bssid bssid;
-		int sockfd;
-		uint8_t zero_bssid[IEEE80211_ADDR_LEN];
-
-		memset(&bssid, 0, sizeof(bssid));
-		memset(nr, 0, sizeof(struct ieee80211_nodereq));
-		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-			warn("socket 'AF_INET':");
-			return 0;
-		}
-		strlcpy(bssid.i_name, interface, sizeof(bssid.i_name));
-		if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) {
-			warn("ioctl 'SIOCG80211BSSID':");
-			close(sockfd);
-			return 0;
-		}
-		memset(&zero_bssid, 0, sizeof(zero_bssid));
-		if (memcmp(bssid.i_bssid, zero_bssid,
-		    IEEE80211_ADDR_LEN) == 0) {
-			close(sockfd);
-			return 0;
-		}
-		strlcpy(nr->nr_ifname, interface, sizeof(nr->nr_ifname));
-		memcpy(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr));
-		if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) {
-			warn("ioctl 'SIOCG80211NODE':");
-			close(sockfd);
-			return 0;
-		}
-
-		return close(sockfd), 1;
-	}
-
-	const char *
-	wifi_perc(const char *interface)
-	{
-		struct ieee80211_nodereq nr;
-		int q;
-
-		if (load_ieee80211_nodereq(interface, &nr)) {
-			if (nr.nr_max_rssi)
-				q = IEEE80211_NODEREQ_RSSI(&nr);
-			else
-				q = RSSI_TO_PERC(nr.nr_rssi);
-
-			return bprintf("%d", q);
-		}
-
-		return NULL;
-	}
-
-	const char *
-	wifi_essid(const char *interface)
-	{
-		struct ieee80211_nodereq nr;
-
-		if (load_ieee80211_nodereq(interface, &nr))
-			return bprintf("%s", nr.nr_nwid);
-
-		return NULL;
-	}
-#elif defined(__FreeBSD__)
-	#include <net/if.h>
-	#include <net80211/ieee80211_ioctl.h>
-
-	int
-	load_ieee80211req(int sock, const char *interface, void *data, int type, size_t *len)
-	{
-		char warn_buf[256];
-		struct ieee80211req ireq;
-		memset(&ireq, 0, sizeof(ireq));
-		ireq.i_type = type;
-		ireq.i_data = (caddr_t) data;
-		ireq.i_len = *len;
-
-		strlcpy(ireq.i_name, interface, sizeof(ireq.i_name));
-		if (ioctl(sock, SIOCG80211, &ireq) < 0) {
-			snprintf(warn_buf,  sizeof(warn_buf),
-					"ioctl: 'SIOCG80211': %d", type);
-			warn(warn_buf);
-			return 0;
-		}
-
-		*len = ireq.i_len;
-		return 1;
-	}
-
-	const char *
-	wifi_perc(const char *interface)
-	{
-		union {
-			struct ieee80211req_sta_req sta;
-			uint8_t buf[24 * 1024];
-		} info;
-		uint8_t bssid[IEEE80211_ADDR_LEN];
-		int rssi_dbm;
-		int sockfd;
-		size_t len;
-		const char *fmt;
-
-		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-			warn("socket 'AF_INET':");
-			return NULL;
-		}
-
-		/* Retreive MAC address of interface */
-		len = IEEE80211_ADDR_LEN;
-		fmt = NULL;
-		if (load_ieee80211req(sockfd, interface, &bssid, IEEE80211_IOC_BSSID, &len))
-		{
-			/* Retrieve info on station with above BSSID */
-			memset(&info, 0, sizeof(info));
-			memcpy(info.sta.is_u.macaddr, bssid, sizeof(bssid));
-
-			len = sizeof(info);
-			if (load_ieee80211req(sockfd, interface, &info, IEEE80211_IOC_STA_INFO, &len)) {
-				rssi_dbm = info.sta.info[0].isi_noise +
- 					         info.sta.info[0].isi_rssi / 2;
-
-				fmt = bprintf("%d", RSSI_TO_PERC(rssi_dbm));
-			}
-		}
-
-		close(sockfd);
-		return fmt;
-	}
-
-	const char *
-	wifi_essid(const char *interface)
-	{
-		char ssid[IEEE80211_NWID_LEN + 1];
-		size_t len;
-		int sockfd;
-		const char *fmt;
-
-		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-			warn("socket 'AF_INET':");
-			return NULL;
-		}
-
-		fmt = NULL;
-		len = sizeof(ssid);
-		memset(&ssid, 0, len);
-		if (load_ieee80211req(sockfd, interface, &ssid, IEEE80211_IOC_SSID, &len)) {
-			if (len < sizeof(ssid))
-				len += 1;
-			else
-				len = sizeof(ssid);
-
-			ssid[len - 1] = '\0';
-			fmt = bprintf("%s", ssid);
-		}
-
-		close(sockfd);
-		return fmt;
-	}
-#endif
diff --git a/src/slstatus/slstatus-1.1/config.def.h b/src/slstatus/slstatus-1.1/config.def.h
deleted file mode 100644
index 2a285cb..0000000
--- a/src/slstatus/slstatus-1.1/config.def.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* interval between updates (in ms) */
-const unsigned int interval = 1000;
-
-/* text to show if no value can be retrieved */
-static const char unknown_str[] = "n/a";
-
-/* maximum output string length */
-#define MAXLEN 2048
-
-/*
- * function            description                     argument (example)
- *
- * battery_perc        battery percentage              battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_remaining   battery remaining HH:MM         battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_state       battery charging state          battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * cat                 read arbitrary file             path
- * cpu_freq            cpu frequency in MHz            NULL
- * cpu_perc            cpu usage in percent            NULL
- * datetime            date and time                   format string (%F %T)
- * disk_free           free disk space in GB           mountpoint path (/)
- * disk_perc           disk usage in percent           mountpoint path (/)
- * disk_total          total disk space in GB          mountpoint path (/)
- * disk_used           used disk space in GB           mountpoint path (/)
- * entropy             available entropy               NULL
- * gid                 GID of current user             NULL
- * hostname            hostname                        NULL
- * ipv4                IPv4 address                    interface name (eth0)
- * ipv6                IPv6 address                    interface name (eth0)
- * kernel_release      `uname -r`                      NULL
- * keyboard_indicators caps/num lock indicators        format string (c?n?)
- *                                                     see keyboard_indicators.c
- * keymap              layout (variant) of current     NULL
- *                     keymap
- * load_avg            load average                    NULL
- * netspeed_rx         receive network speed           interface name (wlan0)
- * netspeed_tx         transfer network speed          interface name (wlan0)
- * num_files           number of files in a directory  path
- *                                                     (/home/foo/Inbox/cur)
- * ram_free            free memory in GB               NULL
- * ram_perc            memory usage in percent         NULL
- * ram_total           total memory size in GB         NULL
- * ram_used            used memory in GB               NULL
- * run_command         custom shell command            command (echo foo)
- * swap_free           free swap in GB                 NULL
- * swap_perc           swap usage in percent           NULL
- * swap_total          total swap size in GB           NULL
- * swap_used           used swap in GB                 NULL
- * temp                temperature in degree celsius   sensor file
- *                                                     (/sys/class/thermal/...)
- *                                                     NULL on OpenBSD
- *                                                     thermal zone on FreeBSD
- *                                                     (tz0, tz1, etc.)
- * uid                 UID of current user             NULL
- * up                  interface is running            interface name (eth0)
- * uptime              system uptime                   NULL
- * username            username of current user        NULL
- * vol_perc            OSS/ALSA volume in percent      mixer file (/dev/mixer)
- *                                                     NULL on OpenBSD/FreeBSD
- * wifi_essid          WiFi ESSID                      interface name (wlan0)
- * wifi_perc           WiFi signal in percent          interface name (wlan0)
- */
-static const struct arg args[] = {
-	/* function format          argument */
-	{ battery_perc, "BAT: %s%% | ", "BAT0"  },
-	{ cpu_perc,     "CPU: %s%% | ", NULL  },
-	{ ram_perc,     "RAM: %s%% | ", NULL  },
-	{ keymap,       "KEY: %s | ",  NULL   },
-	{ datetime,     "%s", "%F %T" },
-};
diff --git a/src/slstatus/slstatus-1.1/config.h b/src/slstatus/slstatus-1.1/config.h
deleted file mode 100644
index 2a285cb..0000000
--- a/src/slstatus/slstatus-1.1/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* interval between updates (in ms) */
-const unsigned int interval = 1000;
-
-/* text to show if no value can be retrieved */
-static const char unknown_str[] = "n/a";
-
-/* maximum output string length */
-#define MAXLEN 2048
-
-/*
- * function            description                     argument (example)
- *
- * battery_perc        battery percentage              battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_remaining   battery remaining HH:MM         battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_state       battery charging state          battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * cat                 read arbitrary file             path
- * cpu_freq            cpu frequency in MHz            NULL
- * cpu_perc            cpu usage in percent            NULL
- * datetime            date and time                   format string (%F %T)
- * disk_free           free disk space in GB           mountpoint path (/)
- * disk_perc           disk usage in percent           mountpoint path (/)
- * disk_total          total disk space in GB          mountpoint path (/)
- * disk_used           used disk space in GB           mountpoint path (/)
- * entropy             available entropy               NULL
- * gid                 GID of current user             NULL
- * hostname            hostname                        NULL
- * ipv4                IPv4 address                    interface name (eth0)
- * ipv6                IPv6 address                    interface name (eth0)
- * kernel_release      `uname -r`                      NULL
- * keyboard_indicators caps/num lock indicators        format string (c?n?)
- *                                                     see keyboard_indicators.c
- * keymap              layout (variant) of current     NULL
- *                     keymap
- * load_avg            load average                    NULL
- * netspeed_rx         receive network speed           interface name (wlan0)
- * netspeed_tx         transfer network speed          interface name (wlan0)
- * num_files           number of files in a directory  path
- *                                                     (/home/foo/Inbox/cur)
- * ram_free            free memory in GB               NULL
- * ram_perc            memory usage in percent         NULL
- * ram_total           total memory size in GB         NULL
- * ram_used            used memory in GB               NULL
- * run_command         custom shell command            command (echo foo)
- * swap_free           free swap in GB                 NULL
- * swap_perc           swap usage in percent           NULL
- * swap_total          total swap size in GB           NULL
- * swap_used           used swap in GB                 NULL
- * temp                temperature in degree celsius   sensor file
- *                                                     (/sys/class/thermal/...)
- *                                                     NULL on OpenBSD
- *                                                     thermal zone on FreeBSD
- *                                                     (tz0, tz1, etc.)
- * uid                 UID of current user             NULL
- * up                  interface is running            interface name (eth0)
- * uptime              system uptime                   NULL
- * username            username of current user        NULL
- * vol_perc            OSS/ALSA volume in percent      mixer file (/dev/mixer)
- *                                                     NULL on OpenBSD/FreeBSD
- * wifi_essid          WiFi ESSID                      interface name (wlan0)
- * wifi_perc           WiFi signal in percent          interface name (wlan0)
- */
-static const struct arg args[] = {
-	/* function format          argument */
-	{ battery_perc, "BAT: %s%% | ", "BAT0"  },
-	{ cpu_perc,     "CPU: %s%% | ", NULL  },
-	{ ram_perc,     "RAM: %s%% | ", NULL  },
-	{ keymap,       "KEY: %s | ",  NULL   },
-	{ datetime,     "%s", "%F %T" },
-};
diff --git a/src/slstatus/slstatus-1.1/config.mk b/src/slstatus/slstatus-1.1/config.mk
deleted file mode 100644
index 0de16de..0000000
--- a/src/slstatus/slstatus-1.1/config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# slstatus version
-VERSION = 1.1
-
-# customize below to fit your system
-
-# paths
-PREFIX = ${HOME}/.local
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-# flags
-CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
-CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter -Os
-LDFLAGS  = -L$(X11LIB) -s
-# OpenBSD: add -lsndio
-# FreeBSD: add -lkvm -lsndio
-LDLIBS   = -lX11
-
-# compiler and linker
-CC = cc
diff --git a/src/slstatus/slstatus-1.1/slstatus.1 b/src/slstatus/slstatus-1.1/slstatus.1
deleted file mode 100644
index 73e7a60..0000000
--- a/src/slstatus/slstatus-1.1/slstatus.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.Dd 2023-04-23
-.Dt SLSTATUS 1
-.Os
-.Sh NAME
-.Nm slstatus
-.Nd suckless status
-.Sh SYNOPSIS
-.Nm
-.Op Fl s
-.Op Fl 1
-.Sh DESCRIPTION
-.Nm
-is a small tool for providing system status information to other programs
-over the EWMH
-.Em WM_NAME
-property of the root window (used by
-.Xr dwm 1 ) or standard input/output. It is designed to be as efficient as possible by
-only issuing the minimum of system calls required.
-.P
-By default,
-.Nm
-outputs to WM_NAME.
-.Sh OPTIONS
-.Bl -tag -width Ds
-.It Fl v
-Print version information to stderr, then exit.
-.It Fl s
-Write to stdout instead of WM_NAME.
-.It Fl 1
-Write once to stdout and quit.
-.El
-.Sh CUSTOMIZATION
-.Nm
-can be customized by creating a custom config.h and (re)compiling the source
-code. This keeps it fast, secure and simple.
-.Sh SIGNALS
-.Nm
-responds to the following signals:
-.Pp
-.Bl -tag -width TERM -compact
-.It USR1
-Triggers an instant redraw.
-.El
-.Sh AUTHORS
-See the LICENSE file for the authors.
-.Sh SEE ALSO
-.Xr dwm 1
diff --git a/src/slstatus/slstatus-1.1/slstatus.c b/src/slstatus/slstatus-1.1/slstatus.c
deleted file mode 100644
index 16d88fe..0000000
--- a/src/slstatus/slstatus-1.1/slstatus.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <X11/Xlib.h>
-
-#include "arg.h"
-#include "slstatus.h"
-#include "util.h"
-
-struct arg {
-	const char *(*func)(const char *);
-	const char *fmt;
-	const char *args;
-};
-
-char buf[1024];
-static volatile sig_atomic_t done;
-static Display *dpy;
-
-#include "config.h"
-
-static void
-terminate(const int signo)
-{
-	if (signo != SIGUSR1)
-		done = 1;
-}
-
-static void
-difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
-{
-	res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
-	res->tv_nsec = a->tv_nsec - b->tv_nsec +
-	               (a->tv_nsec < b->tv_nsec) * 1E9;
-}
-
-static void
-usage(void)
-{
-	die("usage: %s [-v] [-s] [-1]", argv0);
-}
-
-int
-main(int argc, char *argv[])
-{
-	struct sigaction act;
-	struct timespec start, current, diff, intspec, wait;
-	size_t i, len;
-	int sflag, ret;
-	char status[MAXLEN];
-	const char *res;
-
-	sflag = 0;
-	ARGBEGIN {
-	case 'v':
-		die("slstatus-"VERSION);
-		break;
-	case '1':
-		done = 1;
-		/* FALLTHROUGH */
-	case 's':
-		sflag = 1;
-		break;
-	default:
-		usage();
-	} ARGEND
-
-	if (argc)
-		usage();
-
-	memset(&act, 0, sizeof(act));
-	act.sa_handler = terminate;
-	sigaction(SIGINT,  &act, NULL);
-	sigaction(SIGTERM, &act, NULL);
-	act.sa_flags |= SA_RESTART;
-	sigaction(SIGUSR1, &act, NULL);
-
-	if (!sflag && !(dpy = XOpenDisplay(NULL)))
-		die("XOpenDisplay: Failed to open display");
-
-	do {
-		if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
-			die("clock_gettime:");
-
-		status[0] = '\0';
-		for (i = len = 0; i < LEN(args); i++) {
-			if (!(res = args[i].func(args[i].args)))
-				res = unknown_str;
-
-			if ((ret = esnprintf(status + len, sizeof(status) - len,
-			                     args[i].fmt, res)) < 0)
-				break;
-
-			len += ret;
-		}
-
-		if (sflag) {
-			puts(status);
-			fflush(stdout);
-			if (ferror(stdout))
-				die("puts:");
-		} else {
-			if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0)
-				die("XStoreName: Allocation failed");
-			XFlush(dpy);
-		}
-
-		if (!done) {
-			if (clock_gettime(CLOCK_MONOTONIC, &current) < 0)
-				die("clock_gettime:");
-			difftimespec(&diff, &current, &start);
-
-			intspec.tv_sec = interval / 1000;
-			intspec.tv_nsec = (interval % 1000) * 1E6;
-			difftimespec(&wait, &intspec, &diff);
-
-			if (wait.tv_sec >= 0 &&
-			    nanosleep(&wait, NULL) < 0 &&
-			    errno != EINTR)
-					die("nanosleep:");
-		}
-	} while (!done);
-
-	if (!sflag) {
-		XStoreName(dpy, DefaultRootWindow(dpy), NULL);
-		if (XCloseDisplay(dpy) < 0)
-			die("XCloseDisplay: Failed to close display");
-	}
-
-	return 0;
-}
diff --git a/src/slstatus/slstatus-1.1/slstatus.h b/src/slstatus/slstatus-1.1/slstatus.h
deleted file mode 100644
index 394281c..0000000
--- a/src/slstatus/slstatus-1.1/slstatus.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* battery */
-const char *battery_perc(const char *);
-const char *battery_remaining(const char *);
-const char *battery_state(const char *);
-
-/* cat */
-const char *cat(const char *path);
-
-/* cpu */
-const char *cpu_freq(const char *unused);
-const char *cpu_perc(const char *unused);
-
-/* datetime */
-const char *datetime(const char *fmt);
-
-/* disk */
-const char *disk_free(const char *path);
-const char *disk_perc(const char *path);
-const char *disk_total(const char *path);
-const char *disk_used(const char *path);
-
-/* entropy */
-const char *entropy(const char *unused);
-
-/* hostname */
-const char *hostname(const char *unused);
-
-/* ip */
-const char *ipv4(const char *interface);
-const char *ipv6(const char *interface);
-const char *up(const char *interface);
-
-/* kernel_release */
-const char *kernel_release(const char *unused);
-
-/* keyboard_indicators */
-const char *keyboard_indicators(const char *fmt);
-
-/* keymap */
-const char *keymap(const char *unused);
-
-/* load_avg */
-const char *load_avg(const char *unused);
-
-/* netspeeds */
-const char *netspeed_rx(const char *interface);
-const char *netspeed_tx(const char *interface);
-
-/* num_files */
-const char *num_files(const char *path);
-
-/* ram */
-const char *ram_free(const char *unused);
-const char *ram_perc(const char *unused);
-const char *ram_total(const char *unused);
-const char *ram_used(const char *unused);
-
-/* run_command */
-const char *run_command(const char *cmd);
-
-/* swap */
-const char *swap_free(const char *unused);
-const char *swap_perc(const char *unused);
-const char *swap_total(const char *unused);
-const char *swap_used(const char *unused);
-
-/* temperature */
-const char *temp(const char *);
-
-/* uptime */
-const char *uptime(const char *unused);
-
-/* user */
-const char *gid(const char *unused);
-const char *uid(const char *unused);
-const char *username(const char *unused);
-
-/* volume */
-const char *vol_perc(const char *card);
-
-/* wifi */
-const char *wifi_essid(const char *interface);
-const char *wifi_perc(const char *interface);
diff --git a/src/slstatus/slstatus-1.1/util.c b/src/slstatus/slstatus-1.1/util.c
deleted file mode 100644
index bca9b2e..0000000
--- a/src/slstatus/slstatus-1.1/util.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-char *argv0;
-
-static void
-verr(const char *fmt, va_list ap)
-{
-	vfprintf(stderr, fmt, ap);
-
-	if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
-		fputc(' ', stderr);
-		perror(NULL);
-	} else {
-		fputc('\n', stderr);
-	}
-}
-
-void
-warn(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	verr(fmt, ap);
-	va_end(ap);
-}
-
-void
-die(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	verr(fmt, ap);
-	va_end(ap);
-
-	exit(1);
-}
-
-static int
-evsnprintf(char *str, size_t size, const char *fmt, va_list ap)
-{
-	int ret;
-
-	ret = vsnprintf(str, size, fmt, ap);
-
-	if (ret < 0) {
-		warn("vsnprintf:");
-		return -1;
-	} else if ((size_t)ret >= size) {
-		warn("vsnprintf: Output truncated");
-		return -1;
-	}
-
-	return ret;
-}
-
-int
-esnprintf(char *str, size_t size, const char *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = evsnprintf(str, size, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-const char *
-bprintf(const char *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = evsnprintf(buf, sizeof(buf), fmt, ap);
-	va_end(ap);
-
-	return (ret < 0) ? NULL : buf;
-}
-
-const char *
-fmt_human(uintmax_t num, int base)
-{
-	double scaled;
-	size_t i, prefixlen;
-	const char **prefix;
-	const char *prefix_1000[] = { "", "k", "M", "G", "T", "P", "E", "Z",
-	                              "Y" };
-	const char *prefix_1024[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
-	                              "Zi", "Yi" };
-
-	switch (base) {
-	case 1000:
-		prefix = prefix_1000;
-		prefixlen = LEN(prefix_1000);
-		break;
-	case 1024:
-		prefix = prefix_1024;
-		prefixlen = LEN(prefix_1024);
-		break;
-	default:
-		warn("fmt_human: Invalid base");
-		return NULL;
-	}
-
-	scaled = num;
-	for (i = 0; i < prefixlen && scaled >= base; i++)
-		scaled /= base;
-
-	return bprintf("%.1f %s", scaled, prefix[i]);
-}
-
-int
-pscanf(const char *path, const char *fmt, ...)
-{
-	FILE *fp;
-	va_list ap;
-	int n;
-
-	if (!(fp = fopen(path, "r"))) {
-		warn("fopen '%s':", path);
-		return -1;
-	}
-	va_start(ap, fmt);
-	n = vfscanf(fp, fmt, ap);
-	va_end(ap);
-	fclose(fp);
-
-	return (n == EOF) ? -1 : n;
-}
diff --git a/src/slstatus/slstatus-1.1/util.h b/src/slstatus/slstatus-1.1/util.h
deleted file mode 100644
index cf4b027..0000000
--- a/src/slstatus/slstatus-1.1/util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdint.h>
-
-extern char buf[1024];
-
-#define LEN(x) (sizeof(x) / sizeof((x)[0]))
-
-extern char *argv0;
-
-void warn(const char *, ...);
-void die(const char *, ...);
-
-int esnprintf(char *str, size_t size, const char *fmt, ...);
-const char *bprintf(const char *fmt, ...);
-const char *fmt_human(uintmax_t num, int base);
-int pscanf(const char *path, const char *fmt, ...);
diff --git a/src/st/setup.sh b/src/st/setup.sh
deleted file mode 100755
index db5296d..0000000
--- a/src/st/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-cd st-0.9.3
-rm -f config.h
-make config.h
-make install
diff --git a/src/st/st-0.9.3.tar.gz b/src/st/st-0.9.3.tar.gz
deleted file mode 100644
index ca8cd05..0000000
--- a/src/st/st-0.9.3.tar.gz
+++ /dev/null
diff --git a/src/st/st-0.9.3/FAQ b/src/st/st-0.9.3/FAQ
deleted file mode 100644
index 6287a27..0000000
--- a/src/st/st-0.9.3/FAQ
+++ /dev/null
@@ -1,253 +0,0 @@
-## Why does st not handle utmp entries?
-
-Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task.
-
-
-## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
-
-It means that st doesn’t have any terminfo entry on your system. Chances are
-you did not `make install`. If you just want to test it without installing it,
-you can manually run `tic -sx st.info`.
-
-
-## Nothing works, and nothing is said about an unknown terminal!
-
-* Some programs just assume they’re running in xterm i.e. they don’t rely on
-  terminfo. What you see is the current state of the “xterm compliance”.
-* Some programs don’t complain about the lacking st description and default to
-  another terminal. In that case see the question about terminfo.
-
-
-## How do I scroll back up?
-
-* Using a terminal multiplexer.
-	* `st -e tmux` using C-b [
-	* `st -e screen` using C-a ESC
-* Using the excellent tool of [scroll](https://git.suckless.org/scroll/).
-* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/).
-
-
-## I would like to have utmp and/or scroll functionality by default
-
-You can add the absolute path of both programs in your config.h file. You only
-have to modify the value of utmp and scroll variables.
-
-
-## Why doesn't the Del key work in some programs?
-
-Taken from the terminfo manpage:
-
-	If the terminal has a keypad that transmits codes when the keys
-	are pressed, this information can be given. Note that it is not
-	possible to handle terminals where the keypad only works in
-	local (this applies, for example, to the unshifted HP 2621 keys).
-	If the keypad can be set to transmit or not transmit, give these
-	codes as smkx and rmkx. Otherwise the keypad is assumed to
-	always transmit.
-
-In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
-applications which want to test against keypad keys send these
-sequences.
-
-But buggy applications (like bash and irssi, for example) don't do this. A fast
-solution for them is to use the following command:
-
-	$ printf '\033[?1h\033=' >/dev/tty
-
-or
-	$ tput smkx
-
-In the case of bash, readline is used. Readline has a different note in its
-manpage about this issue:
-
-	enable-keypad (Off)
-		When set to On, readline will try to enable the
-		application keypad when it is called. Some systems
-		need this to enable arrow keys.
-
-Adding this option to your .inputrc will fix the keypad problem for all
-applications using readline.
-
-If you are using zsh, then read the zsh FAQ
-<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
-
-	It should be noted that the O / [ confusion can occur with other keys
-	such as Home and End. Some systems let you query the key sequences
-	sent by these keys from the system's terminal database, terminfo.
-	Unfortunately, the key sequences given there typically apply to the
-	mode that is not the one zsh uses by default (it's the "application"
-	mode rather than the "raw" mode). Explaining the use of terminfo is
-	outside of the scope of this FAQ, but if you wish to use the key
-	sequences given there you can tell the line editor to turn on
-	"application" mode when it starts and turn it off when it stops:
-
-		function zle-line-init () { echoti smkx }
-		function zle-line-finish () { echoti rmkx }
-		zle -N zle-line-init
-		zle -N zle-line-finish
-
-Putting these lines into your .zshrc will fix the problems.
-
-
-## How can I use meta in 8bit mode?
-
-St supports meta in 8bit mode, but the default terminfo entry doesn't
-use this capability. If you want it, you have to use the 'st-meta' value
-in TERM.
-
-
-## I cannot compile st in OpenBSD
-
-OpenBSD lacks librt, despite it being mandatory in POSIX
-<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html#tag_20_11_13>.
-If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and
-st will compile without any loss of functionality, because all the functions are
-included in libc on this platform.
-
-
-## The Backspace Case
-
-St is emulating the Linux way of handling backspace being delete and delete being
-backspace.
-
-This is an issue that was discussed in suckless mailing list
-<https://lists.suckless.org/dev/1404/20697.html>. Here is why some old grumpy
-terminal users wants its backspace to be how he feels it:
-
-	Well, I am going to comment why I want to change the behaviour
-	of this key. When ASCII was defined in 1968, communication
-	with computers was done using punched cards, or hardcopy
-	terminals (basically a typewriter machine connected with the
-	computer using a serial port).  ASCII defines DELETE as 7F,
-	because, in punched-card terms, it means all the holes of the
-	card punched; it is thus a kind of 'physical delete'. In the
-	same way, the BACKSPACE key was a non-destructive backspace,
-	as on a typewriter.  So, if you wanted to delete a character,
-	you had to BACKSPACE and then DELETE.  Another use of BACKSPACE
-	was to type accented characters, for example 'a BACKSPACE `'.
-	The VT100 had no BACKSPACE key; it was generated using the
-	CONTROL key as another control character (CONTROL key sets to
-	0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code
-	0x08)), but it had a DELETE key in a similar position where
-	the BACKSPACE key is located today on common PC keyboards.
-	All the terminal emulators emulated the difference between
-	these keys correctly: the backspace key generated a BACKSPACE
-	(^H) and delete key generated a DELETE (^?).
-
-	But a problem arose when Linus Torvalds wrote Linux. Unlike
-	earlier terminals, the Linux virtual terminal (the terminal
-	emulator integrated in the kernel) returned a DELETE when
-	backspace was pressed, due to the VT100 having a DELETE key in
-	the same position.  This created a lot of problems (see [1]
-	and [2]). Since Linux has become the king, a lot of terminal
-	emulators today generate a DELETE when the backspace key is
-	pressed in order to avoid problems with Linux. The result is
-	that the only way of generating a BACKSPACE on these systems
-	is by using CONTROL + H. (I also think that emacs had an
-	important point here because the CONTROL + H prefix is used
-	in emacs in some commands (help commands).)
-
-	From point of view of the kernel, you can change the key
-	for deleting a previous character with stty erase. When you
-	connect a real terminal into a machine you describe the type
-	of terminal, so getty configures the correct value of stty
-	erase for this terminal. In the case of terminal emulators,
-	however, you don't have any getty that can set the correct
-	value of stty erase, so you always get the default value.
-	For this reason, it is necessary to add 'stty erase ^H' to your
-	profile if you have changed the value of the backspace key.
-	Of course, another solution is for st itself to modify the
-	value of stty erase.  I usually have the inverse problem:
-	when I connect to non-Unix machines, I have to press CONTROL +
-	h to get a BACKSPACE. The inverse problem occurs when a user
-	connects to my Unix machines from a different system with a
-	correct backspace key.
-
-	[1] http://www.ibb.net/~anne/keyboard.html
-	[2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html
-
-
-## But I really want the old grumpy behaviour of my terminal
-
-Apply [1].
-
-[1] https://st.suckless.org/patches/delkey
-
-
-## Why do images not work in st using the w3m image hack?
-
-w3mimg uses a hack that draws an image on top of the terminal emulator Drawable
-window. The hack relies on the terminal to use a single buffer to draw its
-contents directly.
-
-st uses double-buffered drawing so the image is quickly replaced and may show a
-short flicker effect.
-
-Below is a patch example to change st double-buffering to a single Drawable
-buffer.
-
-diff --git a/x.c b/x.c
---- a/x.c
-+++ b/x.c
-@@ -732,10 +732,6 @@ xresize(int col, int row)
- 	win.tw = col * win.cw;
- 	win.th = row * win.ch;
- 
--	XFreePixmap(xw.dpy, xw.buf);
--	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
--	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
- 	/* resize to new width */
-@@ -1148,8 +1144,7 @@ xinit(int cols, int rows)
- 	gcvalues.graphics_exposures = False;
- 	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
- 			&gcvalues);
--	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+	xw.buf = xw.win;
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2)
- void
- xfinishdraw(void)
- {
--	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
--			win.h, 0, 0);
- 	XSetForeground(xw.dpy, dc.gc,
- 			dc.col[IS_SET(MODE_REVERSE)?
- 				defaultfg : defaultbg].pixel);
-
-
-## BadLength X error in Xft when trying to render emoji
-
-Xft makes st crash when rendering color emojis with the following error:
-
-"X Error of failed request:  BadLength (poly request too large or internal Xlib length error)"
-  Major opcode of failed request:  139 (RENDER)
-  Minor opcode of failed request:  20 (RenderAddGlyphs)
-  Serial number of failed request: 1595
-  Current serial number in output stream:  1818"
-
-This is a known bug in Xft (not st) which happens on some platforms and
-combination of particular fonts and fontconfig settings.
-
-See also:
-https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6
-https://bugs.freedesktop.org/show_bug.cgi?id=107534
-https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-
-The solution is to remove color emoji fonts or disable this in the fontconfig
-XML configuration.  As an ugly workaround (which may work only on newer
-fontconfig versions (FC_COLOR)), the following code can be used to mask color
-fonts:
-
-	FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
-
-Please don't bother reporting this bug to st, but notify the upstream Xft
-developers about fixing this bug.
-
-As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5:
-https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
diff --git a/src/st/st-0.9.3/LEGACY b/src/st/st-0.9.3/LEGACY
deleted file mode 100644
index bf28b1e..0000000
--- a/src/st/st-0.9.3/LEGACY
+++ /dev/null
@@ -1,17 +0,0 @@
-A STATEMENT ON LEGACY SUPPORT
-
-In the terminal world there is much cruft that comes from old and unsup‐
-ported terminals that inherit incompatible modes  and  escape  sequences
-which noone is able to know, except when he/she comes from that time and
-developed a graphical vt100 emulator at that time.
-
-One  goal  of  st is to only support what is really needed. When you en‐
-counter a sequence which you really need, implement it.  But  while  you
-are  at it,  do not add the other cruft you might encounter while sneek‐
-ing at other terminal emulators. History has bloated them and  there  is
-no real evidence that most of the sequences are used today.
-
-
-Christoph Lohmann <20h@r-36.net>
-2012-09-13T07:00:36.081271045+02:00
-
diff --git a/src/st/st-0.9.3/LICENSE b/src/st/st-0.9.3/LICENSE
deleted file mode 100644
index 3cbf420..0000000
--- a/src/st/st-0.9.3/LICENSE
+++ /dev/null
@@ -1,34 +0,0 @@
-MIT/X Consortium License
-
-© 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org>
-© 2018 Devin J. Pohly <djpohly at gmail dot com>
-© 2014-2017 Quentin Rameau <quinq at fifth dot space>
-© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
-© 2008-2017 Anselm R Garbe <garbeam at gmail dot com>
-© 2012-2017 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
-© 2012-2016 Christoph Lohmann <20h at r-36 dot net>
-© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
-© 2013 Alexander Sedov <alex0player at gmail dot com>
-© 2013 Mark Edgar <medgar123 at gmail dot com>
-© 2013-2014 Eric Pruitt <eric.pruitt at gmail dot com>
-© 2013 Michael Forney <mforney at mforney dot org>
-© 2013-2014 Markus Teich <markus dot teich at stusta dot mhn dot de>
-© 2014-2015 Laslo Hunhold <dev at frign dot de>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/src/st/st-0.9.3/Makefile b/src/st/st-0.9.3/Makefile
deleted file mode 100644
index 15db421..0000000
--- a/src/st/st-0.9.3/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# st - simple terminal
-# See LICENSE file for copyright and license details.
-.POSIX:
-
-include config.mk
-
-SRC = st.c x.c
-OBJ = $(SRC:.c=.o)
-
-all: st
-
-config.h:
-	cp config.def.h config.h
-
-.c.o:
-	$(CC) $(STCFLAGS) -c $<
-
-st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h
-
-$(OBJ): config.h config.mk
-
-st: $(OBJ)
-	$(CC) -o $@ $(OBJ) $(STLDFLAGS)
-
-clean:
-	rm -f st $(OBJ) st-$(VERSION).tar.gz
-
-dist: clean
-	mkdir -p st-$(VERSION)
-	cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
-		config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
-		st-$(VERSION)
-	tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
-	rm -rf st-$(VERSION)
-
-install: st
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f st $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/st
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
-	tic -sx st.info
-	@echo Please see the README file regarding the terminfo entry of st.
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/st
-	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
-
-.PHONY: all clean dist install uninstall
diff --git a/src/st/st-0.9.3/README b/src/st/st-0.9.3/README
deleted file mode 100644
index 6a846ed..0000000
--- a/src/st/st-0.9.3/README
+++ /dev/null
@@ -1,34 +0,0 @@
-st - simple terminal
---------------------
-st is a simple terminal emulator for X which sucks less.
-
-
-Requirements
-------------
-In order to build st you need the Xlib header files.
-
-
-Installation
-------------
-Edit config.mk to match your local setup (st is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install st (if
-necessary as root):
-
-    make clean install
-
-
-Running st
-----------
-If you did not install st with make clean install, you must compile
-the st terminfo entry with the following command:
-
-    tic -sx st.info
-
-See the man page for additional details.
-
-Credits
--------
-Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
-
diff --git a/src/st/st-0.9.3/TODO b/src/st/st-0.9.3/TODO
deleted file mode 100644
index 5f74cd5..0000000
--- a/src/st/st-0.9.3/TODO
+++ /dev/null
@@ -1,28 +0,0 @@
-vt emulation
-------------
-
-* double-height support
-
-code & interface
-----------------
-
-* add a simple way to do multiplexing
-
-drawing
--------
-* add diacritics support to xdraws()
-	* switch to a suckless font drawing library
-* make the font cache simpler
-* add better support for brightening of the upper colors
-
-bugs
-----
-
-* fix shift up/down (shift selection in emacs)
-* remove DEC test sequence when appropriate
-
-misc
-----
-
-    $ grep -nE 'XXX|TODO' st.c
-
diff --git a/src/st/st-0.9.3/arg.h b/src/st/st-0.9.3/arg.h
deleted file mode 100644
index a22e019..0000000
--- a/src/st/st-0.9.3/arg.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef ARG_H__
-#define ARG_H__
-
-extern char *argv0;
-
-/* use main(int argc, char *argv[]) */
-#define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][0] == '-'\
-					&& argv[0][1];\
-					argc--, argv++) {\
-				char argc_;\
-				char **argv_;\
-				int brk_;\
-				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-					argv++;\
-					argc--;\
-					break;\
-				}\
-				int i_;\
-				for (i_ = 1, brk_ = 0, argv_ = argv;\
-						argv[0][i_] && !brk_;\
-						i_++) {\
-					if (argv_ != argv)\
-						break;\
-					argc_ = argv[0][i_];\
-					switch (argc_)
-
-#define ARGEND			}\
-			}
-
-#define ARGC()		argc_
-
-#define EARGF(x)	((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
-				((x), abort(), (char *)0) :\
-				(brk_ = 1, (argv[0][i_+1] != '\0')?\
-					(&argv[0][i_+1]) :\
-					(argc--, argv++, argv[0])))
-
-#define ARGF()		((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
-				(char *)0 :\
-				(brk_ = 1, (argv[0][i_+1] != '\0')?\
-					(&argv[0][i_+1]) :\
-					(argc--, argv++, argv[0])))
-
-#endif
diff --git a/src/st/st-0.9.3/config.def.h b/src/st/st-0.9.3/config.def.h
deleted file mode 100644
index ed5dedf..0000000
--- a/src/st/st-0.9.3/config.def.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-static char *font = "Liberation Mono:pixelsize=11:antialias=true:autohint=true";
-static int borderpx = 2;
-
-/*
- * What program is execed by st depends of these precedence rules:
- * 1: program passed with -e
- * 2: scroll and/or utmp
- * 3: SHELL environment variable
- * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
- */
-static char *shell = "/bin/sh";
-char *utmp = NULL;
-/* scroll program: to enable use a string like "scroll" */
-char *scroll = NULL;
-char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
-
-/* identification sequence returned in DA and DECID */
-char *vtiden = "\033[?6c";
-
-/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
-static float chscale = 1.0;
-
-/*
- * word delimiter string
- *
- * More advanced example: L" `'\"()[]{}"
- */
-wchar_t *worddelimiters = L" ";
-
-/* selection timeouts (in milliseconds) */
-static unsigned int doubleclicktimeout = 300;
-static unsigned int tripleclicktimeout = 600;
-
-/* alt screens */
-int allowaltscreen = 1;
-
-/* allow certain non-interactive (insecure) window operations such as:
-   setting the clipboard text */
-int allowwindowops = 0;
-
-/*
- * draw latency range in ms - from new content/keypress/etc until drawing.
- * within this range, st draws when content stops arriving (idle). mostly it's
- * near minlatency, but it waits longer for slow updates to avoid partial draw.
- * low minlatency will tear/flicker more, as it can "detect" idle too early.
- */
-static double minlatency = 2;
-static double maxlatency = 33;
-
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
-static unsigned int blinktimeout = 800;
-
-/*
- * thickness of underline and bar cursors
- */
-static unsigned int cursorthickness = 2;
-
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
-static int bellvolume = 0;
-
-/* default TERM value */
-char *termname = "st-256color";
-
-/*
- * spaces per tab
- *
- * When you are changing this value, don't forget to adapt the »it« value in
- * the st.info and appropriately install the st.info in the environment where
- * you use this st version.
- *
- *      it#$tabspaces,
- *
- * Secondly make sure your kernel is not expanding tabs. When running `stty
- * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
- *  running following command:
- *
- *      stty tabs
- */
-unsigned int tabspaces = 8;
-
-/* Terminal colors (16 first used in escape sequence) */
-static const char *colorname[] = {
-        /* 8 normal colors */
-        "black",
-        "red3",
-        "green3",
-        "yellow3",
-        "Skyblue1",
-        "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
- */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
-
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-
-/*
- * Default columns and rows numbers
- */
-
-static unsigned int cols = 80;
-static unsigned int rows = 24;
-
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-static MouseShortcut mshortcuts[] = {
-        /* mask                 button   function        argument       release */
-        { XK_ANY_MOD,           Button4, kscrollup,      {.i = 1},            0, /* !alt */ -1 },
-        { XK_ANY_MOD,           Button5, kscrolldown,    {.i = 1},            0, /* !alt */ -1 },
-        { 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)
-
-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} },
-        { TERMMOD,              XK_space,       keyboard_select,{.i =  0} },
-};
-
-/*
- * Special keys (change & recompile st.info accordingly)
- *
- * Mask value:
- * * Use XK_ANY_MOD to match the key no matter modifiers state
- * * Use XK_NO_MOD to match the key alone (no modifiers)
- * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * *   = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
- * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
- *
- * Be careful with the order of the definitions because st searches in
- * this table sequentially, so any XK_ANY_MOD must be in the last
- * position for a key.
- */
-
-/*
- * 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 };
-
-/*
- * 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;
-
-/*
- * 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},
-};
-
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
- * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
- */
-static uint selmasks[] = {
-        [SEL_RECTANGULAR] = Mod1Mask,
-};
-
-/*
- * Printable characters in ASCII, used to estimate the advance width
- * of single wide characters.
- */
-static char ascii_printable[] =
-    " !\"#$%&'()*+,-./0123456789:;<=>?"
-    "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-    "`abcdefghijklmnopqrstuvwxyz{|}~";
-
-/**
-   + * Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
-   + *
-   + * Curly: Dunno how to draw it *shrug*
-   + *  _   _   _   _
-   + * ( ) ( ) ( ) ( )
-   + *   (_) (_) (_) (_)
-   + *
-   + * Spiky:
-   + * /\  /\   /\      /\
-   + *   \/  \/   \/
-   + *
-   + * Capped:
-   + *  _     _     _
-   + * / \   / \   / \
-   + *    \_/   \_/
-   + */
-// Available styles
-#define UNDERCURL_CURLY 0
-#define UNDERCURL_SPIKY 1
-#define UNDERCURL_CAPPED 2
-// Active style
-#define UNDERCURL_STYLE UNDERCURL_SPIKY
diff --git a/src/st/st-0.9.3/config.mk b/src/st/st-0.9.3/config.mk
deleted file mode 100644
index f5a97f5..0000000
--- a/src/st/st-0.9.3/config.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# st version
-VERSION = 0.9.3
-
-# Customize below to fit your system
-
-# paths
-PREFIX = ${HOME}/.local
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-PKG_CONFIG = pkg-config
-
-# includes and libs
-INCS = -I$(X11INC) \
-       `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-       `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2`
-
-# flags
-STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
-STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
-
-# OpenBSD:
-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
-#       `$(PKG_CONFIG) --libs fontconfig` \
-#       `$(PKG_CONFIG) --libs freetype2`
-#MANPREFIX = ${PREFIX}/man
-
-# compiler and linker
-# CC = c99
diff --git a/src/st/st-0.9.3/st.1 b/src/st/st-0.9.3/st.1
deleted file mode 100644
index 39120b4..0000000
--- a/src/st/st-0.9.3/st.1
+++ /dev/null
@@ -1,177 +0,0 @@
-.TH ST 1 st\-VERSION
-.SH NAME
-st \- simple terminal
-.SH SYNOPSIS
-.B st
-.RB [ \-aiv ]
-.RB [ \-c
-.IR class ]
-.RB [ \-f
-.IR font ]
-.RB [ \-g
-.IR geometry ]
-.RB [ \-n
-.IR name ]
-.RB [ \-o
-.IR iofile ]
-.RB [ \-T
-.IR title ]
-.RB [ \-t
-.IR title ]
-.RB [ \-l
-.IR line ]
-.RB [ \-w
-.IR windowid ]
-.RB [[ \-e ]
-.IR command
-.RI [ arguments ...]]
-.PP
-.B st
-.RB [ \-aiv ]
-.RB [ \-c
-.IR class ]
-.RB [ \-f
-.IR font ]
-.RB [ \-g
-.IR geometry ]
-.RB [ \-n
-.IR name ]
-.RB [ \-o
-.IR iofile ]
-.RB [ \-T
-.IR title ]
-.RB [ \-t
-.IR title ]
-.RB [ \-w
-.IR windowid ]
-.RB \-l
-.IR line
-.RI [ stty_args ...]
-.SH DESCRIPTION
-.B st
-is a simple terminal emulator.
-.SH OPTIONS
-.TP
-.B \-a
-disable alternate screens in terminal
-.TP
-.BI \-c " class"
-defines the window class (default $TERM).
-.TP
-.BI \-f " font"
-defines the
-.I font
-to use when st is run.
-.TP
-.BI \-g " geometry"
-defines the X11 geometry string.
-The form is [=][<cols>{xX}<rows>][{+-}<xoffset>{+-}<yoffset>]. See
-.BR XParseGeometry (3)
-for further details.
-.TP
-.B \-i
-will fixate the position given with the -g option.
-.TP
-.BI \-n " name"
-defines the window instance name (default $TERM).
-.TP
-.BI \-o " iofile"
-writes all the I/O to
-.I iofile.
-This feature is useful when recording st sessions. A value of "-" means
-standard output.
-.TP
-.BI \-T " title"
-defines the window title (default 'st').
-.TP
-.BI \-t " title"
-defines the window title (default 'st').
-.TP
-.BI \-w " windowid"
-embeds st within the window identified by
-.I windowid
-.TP
-.BI \-l " line"
-use a tty
-.I line
-instead of a pseudo terminal.
-.I line
-should be a (pseudo-)serial device (e.g. /dev/ttyS0 on Linux for serial port
-0).
-When this flag is given
-remaining arguments are used as flags for
-.BR stty(1).
-By default st initializes the serial line to 8 bits, no parity, 1 stop bit
-and a 38400 baud rate. The speed is set by appending it as last argument
-(e.g. 'st -l /dev/ttyS0 115200'). Arguments before the last one are
-.BR stty(1)
-flags. If you want to set odd parity on 115200 baud use for example 'st -l
-/dev/ttyS0 parenb parodd 115200'. Set the number of bits by using for
-example 'st -l /dev/ttyS0 cs7 115200'. See
-.BR stty(1)
-for more arguments and cases.
-.TP
-.B \-v
-prints version information to stderr, then exits.
-.TP
-.BI \-e " command " [ " arguments " "... ]"
-st executes
-.I command
-instead of the shell.  If this is used it
-.B must be the last option
-on the command line, as in xterm / rxvt.
-This option is only intended for compatibility,
-and all the remaining arguments are used as a command
-even without it.
-.SH SHORTCUTS
-.TP
-.B Break
-Send a break in the serial line.
-Break key is obtained in PC keyboards
-pressing at the same time control and pause.
-.TP
-.B Ctrl-Print Screen
-Toggle if st should print to the
-.I iofile.
-.TP
-.B Shift-Print Screen
-Print the full screen to the
-.I iofile.
-.TP
-.B Print Screen
-Print the selection to the
-.I iofile.
-.TP
-.B Ctrl-Shift-Page Up
-Increase font size.
-.TP
-.B Ctrl-Shift-Page Down
-Decrease font size.
-.TP
-.B Ctrl-Shift-Home
-Reset to default font size.
-.TP
-.B Ctrl-Shift-y
-Paste from primary selection (middle mouse button).
-.TP
-.B Ctrl-Shift-c
-Copy the selected text to the clipboard selection.
-.TP
-.B Ctrl-Shift-v
-Paste from the clipboard selection.
-.SH CUSTOMIZATION
-.B st
-can be customized by creating a custom config.h and (re)compiling the source
-code. This keeps it fast, secure and simple.
-.SH AUTHORS
-See the LICENSE file for the authors.
-.SH LICENSE
-See the LICENSE file for the terms of redistribution.
-.SH SEE ALSO
-.BR tabbed (1),
-.BR utmp (1),
-.BR stty (1),
-.BR scroll (1)
-.SH BUGS
-See the TODO file in the distribution.
-
diff --git a/src/st/st-0.9.3/st.c b/src/st/st-0.9.3/st.c
deleted file mode 100644
index 9f2df77..0000000
--- a/src/st/st-0.9.3/st.c
+++ /dev/null
@@ -1,3414 +0,0 @@
-/* See LICENSE for license details. */
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <X11/keysym.h>
-#include <X11/X.h>
-
-#include "st.h"
-#include "win.h"
-
-#if   defined(__linux)
-#include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-#include <util.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
-#include <libutil.h>
-#endif
-
-/* Arbitrary sizes */
-#define UTF_INVALID   0xFFFD
-#define UTF_SIZ       4
-#define ESC_BUF_SIZ   (128*UTF_SIZ)
-#define ESC_ARG_SIZ   16
-#define CAR_PER_ARG   4
-#define STR_BUF_SIZ   ESC_BUF_SIZ
-#define STR_ARG_SIZ   ESC_ARG_SIZ
-#define HISTSIZE      2000
-#define RESIZEBUFFER  1000
-
-/* macros */
-#define IS_SET(flag)            ((term.mode & (flag)) != 0)
-#define ISCONTROLC0(c)          (BETWEEN(c, 0, 0x1f) || (c) == 0x7f)
-#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[(term.histi + (y) - term.scr + 1 + HISTSIZE) % HISTSIZE] \
-                : term.line[(y) - term.scr]                             \
-        )
-
-#define TLINEABS(y) (                                                   \
-                (y) < 0 ? term.hist[(term.histi + (y) + 1 + HISTSIZE) % HISTSIZE] : term.line[(y)] \
-        )
-
-#define UPDATEWRAPNEXT(alt, col) do {                                   \
-                if ((term.c.state & CURSOR_WRAPNEXT) && term.c.x + term.wrapcwidth[alt] < col) { \
-                        term.c.x += term.wrapcwidth[alt];               \
-                        term.c.state &= ~CURSOR_WRAPNEXT;               \
-                }                                                       \
-        } while (0);
-
-enum term_mode {
-        MODE_WRAP        = 1 << 0,
-        MODE_INSERT      = 1 << 1,
-        MODE_ALTSCREEN   = 1 << 2,
-        MODE_CRLF        = 1 << 3,
-        MODE_ECHO        = 1 << 4,
-        MODE_PRINT       = 1 << 5,
-        MODE_UTF8        = 1 << 6,
-};
-
-enum scroll_mode {
-        SCROLL_RESIZE = -1,
-        SCROLL_NOSAVEHIST = 0,
-        SCROLL_SAVEHIST = 1
-};
-
-enum cursor_movement {
-        CURSOR_SAVE,
-        CURSOR_LOAD
-};
-
-enum cursor_state {
-        CURSOR_DEFAULT  = 0,
-        CURSOR_WRAPNEXT = 1,
-        CURSOR_ORIGIN   = 2
-};
-
-enum charset {
-        CS_GRAPHIC0,
-        CS_GRAPHIC1,
-        CS_UK,
-        CS_USA,
-        CS_MULTI,
-        CS_GER,
-        CS_FIN
-};
-
-enum escape_state {
-        ESC_START      = 1,
-        ESC_CSI        = 2,
-        ESC_STR        = 4,  /* DCS, OSC, PM, APC */
-        ESC_ALTCHARSET = 8,
-        ESC_STR_END    = 16, /* a final string was encountered */
-        ESC_TEST       = 32, /* Enter in test mode */
-        ESC_UTF8       = 64,
-};
-
-typedef struct {
-        Glyph attr; /* current char attributes */
-        int x;
-        int y;
-        char state;
-} TCursor;
-
-typedef struct {
-        int mode;
-        int type;
-        int snap;
-        /*
-         * Selection variables:
-         * nb – normalized coordinates of the beginning of the selection
-         * ne – normalized coordinates of the end of the selection
-         * ob – original coordinates of the beginning of the selection
-         * oe – original coordinates of the end of the selection
-         */
-        struct {
-                int x, y;
-        } nb, ne, ob, oe;
-
-        int alt;
-} Selection;
-
-/* Internal representation of the screen */
-typedef struct {
-        int row;      /* nb row */
-        int col;      /* nb col */
-        Line *line;   /* screen */
-        Line hist[HISTSIZE]; /* history buffer */
-        int histi;           /* history index */
-        int histf;           /* nb history available */
-        int scr;             /* scroll back */
-        int wrapcwidth[2];   /* used in updating WRAPNEXT when resizing */
-        int *dirty;   /* dirtyness of lines */
-        TCursor c;    /* cursor */
-        int ocx;      /* old cursor col */
-        int ocy;      /* old cursor row */
-        int top;      /* top    scroll limit */
-        int bot;      /* bottom scroll limit */
-        int mode;     /* terminal mode flags */
-        int esc;      /* escape state flags */
-        char trantbl[4]; /* charset table translation */
-        int charset;  /* current charset */
-        int icharset; /* selected charset for sequence */
-        int *tabs;
-        Rune lastc;   /* last printed char outside of sequence, 0 if control */
-} Term;
-
-/* CSI Escape sequence structs */
-/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
-typedef struct {
-        char buf[ESC_BUF_SIZ]; /* raw string */
-        size_t len;            /* raw string length */
-        char priv;
-        int arg[ESC_ARG_SIZ];
-        int narg;              /* nb of args */
-        char mode[2];
-        int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */
-} CSIEscape;
-
-/* STR Escape sequence structs */
-/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
-typedef struct {
-        char type;             /* ESC type ... */
-        char *buf;             /* allocated raw string */
-        size_t siz;            /* allocation size */
-        size_t len;            /* raw string length */
-        char *args[STR_ARG_SIZ];
-        int narg;              /* nb of args */
-} STREscape;
-
-static void execsh(char *, char **);
-static void stty(char **);
-static void sigchld(int);
-static void ttywriteraw(const char *, size_t);
-
-static void csidump(void);
-static void csihandle(void);
-static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
-static void csiparse(void);
-static void csireset(void);
-static void osc_color_response(int, int, int);
-static int eschandle(uchar);
-static void strdump(void);
-static void strhandle(void);
-static void strparse(void);
-static void strreset(void);
-
-static void tprinter(char *, size_t);
-static void tdumpsel(void);
-static void tdumpline(int);
-static void tdump(void);
-static void tclearregion(int, int, int, int, int);
-static void tcursor(int);
-static void tclearglyph(Glyph *, int);
-static void tresetcursor(void);
-static void tdeletechar(int);
-static void tdeleteline(int);
-static void tinsertblank(int);
-static void tinsertblankline(int);
-static int tlinelen(Line len);
-static int tiswrapped(Line line);
-static char *tgetglyphs(char *, const Glyph *, const Glyph *);
-static size_t tgetline(char *, const Glyph *);
-static void tmoveto(int, int);
-static void tmoveato(int, int);
-static void tnewline(int);
-static void tputtab(int);
-static void tputc(Rune);
-static void treset(void);
-static void tscrollup(int, int, int, int);
-static void tscrolldown(int, int);
-static void treflow(int, int);
-static void rscrolldown(int);
-static void tresizedef(int, int);
-static void tresizealt(int, int);
-static void tsetattr(const int *, int);
-static void tsetchar(Rune, const Glyph *, int, int);
-static void tsetdirt(int, int);
-static void tsetscroll(int, int);
-static void tswapscreen(void);
-static void tloaddefscreen(int, int);
-static void tloadaltscreen(int, int);
-static void tsetmode(int, int, const int *, int);
-static int twrite(const char *, int, int);
-static void tfulldirt(void);
-static void tcontrolcode(uchar );
-static void tdectest(char );
-static void tdefutf8(char);
-static int32_t tdefcolor(const int *, int *, int);
-static void tdeftran(char);
-static void tstrsequence(uchar);
-
-static void drawregion(int, int, int, int);
-
-static void selnormalize(void);
-static void selscroll(int, int, int);
-static void selmove(int);
-static void selremove(void);
-static int regionselected(int, int, int, int);
-static void selsnap(int *, int *, int);
-
-static size_t utf8decode(const char *, Rune *, size_t);
-static Rune utf8decodebyte(char, size_t *);
-static char utf8encodebyte(Rune, size_t);
-static size_t utf8validate(Rune *, size_t);
-
-static char *base64dec(const char *);
-static char base64dec_getc(const char **);
-
-static ssize_t xwrite(int, const char *, size_t);
-
-/* Globals */
-static Term term;
-static Selection sel;
-static CSIEscape csiescseq;
-static STREscape strescseq;
-static int iofd = 1;
-static int cmdfd;
-static pid_t pid;
-
-static const uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-ssize_t
-xwrite(int fd, const char *s, size_t len)
-{
-        size_t aux = len;
-        ssize_t r;
-
-        while (len > 0) {
-                r = write(fd, s, len);
-                if (r < 0)
-                        return r;
-                len -= r;
-                s += r;
-        }
-
-        return aux;
-}
-
-void *
-xmalloc(size_t len)
-{
-        void *p;
-
-        if (!(p = malloc(len)))
-                die("malloc: %s\n", strerror(errno));
-
-        return p;
-}
-
-void *
-xrealloc(void *p, size_t len)
-{
-        if ((p = realloc(p, len)) == NULL)
-                die("realloc: %s\n", strerror(errno));
-
-        return p;
-}
-
-char *
-xstrdup(const char *s)
-{
-        char *p;
-
-        if ((p = strdup(s)) == NULL)
-                die("strdup: %s\n", strerror(errno));
-
-        return p;
-}
-
-size_t
-utf8decode(const char *c, Rune *u, size_t clen)
-{
-        size_t i, j, len, type;
-        Rune udecoded;
-
-        *u = UTF_INVALID;
-        if (!clen)
-                return 0;
-        udecoded = utf8decodebyte(c[0], &len);
-        if (!BETWEEN(len, 1, UTF_SIZ))
-                return 1;
-        for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
-                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-                if (type != 0)
-                        return j;
-        }
-        if (j < len)
-                return 0;
-        *u = udecoded;
-        utf8validate(u, len);
-
-        return len;
-}
-
-Rune
-utf8decodebyte(char c, size_t *i)
-{
-        for (*i = 0; *i < LEN(utfmask); ++(*i))
-                if (((uchar)c & utfmask[*i]) == utfbyte[*i])
-                        return (uchar)c & ~utfmask[*i];
-
-        return 0;
-}
-
-size_t
-utf8encode(Rune u, char *c)
-{
-        size_t len, i;
-
-        len = utf8validate(&u, 0);
-        if (len > UTF_SIZ)
-                return 0;
-
-        for (i = len - 1; i != 0; --i) {
-                c[i] = utf8encodebyte(u, 0);
-                u >>= 6;
-        }
-        c[0] = utf8encodebyte(u, len);
-
-        return len;
-}
-
-char
-utf8encodebyte(Rune u, size_t i)
-{
-        return utfbyte[i] | (u & ~utfmask[i]);
-}
-
-size_t
-utf8validate(Rune *u, size_t i)
-{
-        if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
-                *u = UTF_INVALID;
-        for (i = 1; *u > utfmax[i]; ++i)
-                ;
-
-        return i;
-}
-
-char
-base64dec_getc(const char **src)
-{
-        while (**src && !isprint((unsigned char)**src))
-                (*src)++;
-        return **src ? *((*src)++) : '=';  /* emulate padding if string ends */
-}
-
-char *
-base64dec(const char *src)
-{
-        size_t in_len = strlen(src);
-        char *result, *dst;
-        static const char base64_digits[256] = {
-                [43] = 62, 0, 0, 0, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-                0, 0, 0, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-                13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0,
-                0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-                40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
-        };
-
-        if (in_len % 4)
-                in_len += 4 - (in_len % 4);
-        result = dst = xmalloc(in_len / 4 * 3 + 1);
-        while (*src) {
-                int a = base64_digits[(unsigned char) base64dec_getc(&src)];
-                int b = base64_digits[(unsigned char) base64dec_getc(&src)];
-                int c = base64_digits[(unsigned char) base64dec_getc(&src)];
-                int d = base64_digits[(unsigned char) base64dec_getc(&src)];
-
-                /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */
-                if (a == -1 || b == -1)
-                        break;
-
-                *dst++ = (a << 2) | ((b & 0x30) >> 4);
-                if (c == -1)
-                        break;
-                *dst++ = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2);
-                if (d == -1)
-                        break;
-                *dst++ = ((c & 0x03) << 6) | d;
-        }
-        *dst = '\0';
-        return result;
-}
-
-void
-selinit(void)
-{
-        sel.mode = SEL_IDLE;
-        sel.snap = 0;
-        sel.ob.x = -1;
-}
-
-int
-tlinelen(Line line)
-{
-        int i = term.col - 1;
-
-        for (; i >= 0 && !(line[i].mode & (ATTR_SET | ATTR_WRAP)); i--);
-        return i + 1;
-}
-
-int
-tiswrapped(Line line)
-{
-        int len = tlinelen(line);
-
-        return len > 0 && (line[len - 1].mode & ATTR_WRAP);
-}
-
-char *
-tgetglyphs(char *buf, const Glyph *gp, const Glyph *lgp)
-{
-        while (gp <= lgp)
-                if (gp->mode & ATTR_WDUMMY) {
-                        gp++;
-                } else {
-                        buf += utf8encode((gp++)->u, buf);
-                }
-        return buf;
-}
-
-size_t
-tgetline(char *buf, const Glyph *fgp)
-{
-        char *ptr;
-        const Glyph *lgp = &fgp[term.col - 1];
-
-        while (lgp > fgp && !(lgp->mode & (ATTR_SET | ATTR_WRAP)))
-                lgp--;
-        ptr = tgetglyphs(buf, fgp, lgp);
-        if (!(lgp->mode & ATTR_WRAP))
-                *(ptr++) = '\n';
-        return ptr - buf;
-}
-
-void
-selstart(int col, int row, int snap)
-{
-        selclear();
-        sel.mode = SEL_EMPTY;
-        sel.type = SEL_REGULAR;
-        sel.alt = IS_SET(MODE_ALTSCREEN);
-        sel.snap = snap;
-        sel.oe.x = sel.ob.x = col;
-        sel.oe.y = sel.ob.y = row;
-        selnormalize();
-
-        if (sel.snap != 0)
-                sel.mode = SEL_READY;
-        tsetdirt(sel.nb.y, sel.ne.y);
-}
-
-void
-selextend(int col, int row, int type, int done)
-{
-        int oldey, oldex, oldsby, oldsey, oldtype;
-
-        if (sel.mode == SEL_IDLE)
-                return;
-        if (done && sel.mode == SEL_EMPTY) {
-                selclear();
-                return;
-        }
-
-        oldey = sel.oe.y;
-        oldex = sel.oe.x;
-        oldsby = sel.nb.y;
-        oldsey = sel.ne.y;
-        oldtype = sel.type;
-
-        sel.oe.x = col;
-        sel.oe.y = row;
-        sel.type = type;
-        selnormalize();
-
-        if (oldey != sel.oe.y || oldex != sel.oe.x ||
-            oldtype != sel.type || sel.mode == SEL_EMPTY)
-                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
-
-        sel.mode = done ? SEL_IDLE : SEL_READY;
-}
-
-void
-selnormalize(void)
-{
-        int i;
-
-        if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
-                sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
-                sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
-        } else {
-                sel.nb.x = MIN(sel.ob.x, sel.oe.x);
-                sel.ne.x = MAX(sel.ob.x, sel.oe.x);
-        }
-        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
-        sel.ne.y = MAX(sel.ob.y, sel.oe.y);
-
-        selsnap(&sel.nb.x, &sel.nb.y, -1);
-        selsnap(&sel.ne.x, &sel.ne.y, +1);
-
-        /* expand selection over line breaks */
-        if (sel.type == SEL_RECTANGULAR)
-                return;
-
-        i = tlinelen(TLINE(sel.nb.y));
-        if (sel.nb.x > i)
-                sel.nb.x = i;
-        if (sel.ne.x >= tlinelen(TLINE(sel.ne.y)))
-                sel.ne.x = term.col - 1;
-}
-
-int
-regionselected(int x1, int y1, int x2, int y2)
-{
-        if (sel.ob.x == -1 || sel.mode == SEL_EMPTY ||
-            sel.alt != IS_SET(MODE_ALTSCREEN) || sel.nb.y > y2 || sel.ne.y < y1)
-                return 0;
-
-        return (sel.type == SEL_RECTANGULAR) ? sel.nb.x <= x2 && sel.ne.x >= x1
-            : (sel.nb.y != y2 || sel.nb.x <= x2) &&
-            (sel.ne.y != y1 || sel.ne.x >= x1);
-}
-
-int
-selected(int x, int y)
-{
-        return regionselected(x, y, x, y);
-}
-
-
-void
-selsnap(int *x, int *y, int direction)
-{
-        int newx, newy, xt, yt;
-        int rtop = 0, rbot = term.row - 1;
-        int delim, prevdelim;
-        const Glyph *gp, *prevgp;
-
-        if (!IS_SET(MODE_ALTSCREEN))
-                rtop += -term.histf + term.scr, rbot += term.scr;
-
-        switch (sel.snap) {
-        case SNAP_WORD:
-                /*
-                 * Snap around if the word wraps around at the end or
-                 * beginning of a line.
-                 */
-                prevgp = &TLINE(*y)[*x];
-                prevdelim = ISDELIM(prevgp->u);
-                for (;;) {
-                        newx = *x + direction;
-                        newy = *y;
-                        if (!BETWEEN(newx, 0, term.col - 1)) {
-                                newy += direction;
-                                newx = (newx + term.col) % term.col;
-                                if (!BETWEEN(newy, rtop, rbot))
-                                        break;
-
-                                if (direction > 0)
-                                        yt = *y, xt = *x;
-                                else
-                                        yt = newy, xt = newx;
-                                if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
-                                        break;
-                        }
-
-                        if (newx >= tlinelen(TLINE(newy)))
-                                break;
-
-                        gp = &TLINE(newy)[newx];
-                        delim = ISDELIM(gp->u);
-                        if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim ||
-                                                          (delim && !(gp->u == ' ' && prevgp->u == ' '))))
-                                break;
-
-                        *x = newx;
-                        *y = newy;
-                        prevgp = gp;
-                        prevdelim = delim;
-                }
-                break;
-        case SNAP_LINE:
-                /*
-                 * Snap around if the the previous line or the current one
-                 * has set ATTR_WRAP at its end. Then the whole next or
-                 * previous line will be selected.
-                 */
-                *x = (direction < 0) ? 0 : term.col - 1;
-                if (direction < 0) {
-                        for (; *y > rtop; *y -= 1) {
-                                if (!tiswrapped(TLINE(*y-1)))
-                                        break;
-                        }
-                } else if (direction > 0) {
-                        for (; *y < rbot; *y += 1) {
-                                if (!tiswrapped(TLINE(*y)))
-                                        break;
-                        }
-                }
-                break;
-        }
-}
-
-char *
-getsel(void)
-{
-        char *str, *ptr;
-        int y, lastx, linelen;
-        const Glyph *gp, *lgp;
-
-        if (sel.ob.x == -1 || sel.alt != IS_SET(MODE_ALTSCREEN))
-                return NULL;
-
-        str = xmalloc((term.col + 1) * (sel.ne.y - sel.nb.y + 1) * UTF_SIZ);
-        ptr = str;
-
-        /* append every set & selected glyph to the selection */
-        for (y = sel.nb.y; y <= sel.ne.y; y++) {
-                Line line = TLINE(y);
-
-                if ((linelen = tlinelen(line)) == 0) {
-                        *ptr++ = '\n';
-                        continue;
-                }
-
-                if (sel.type == SEL_RECTANGULAR) {
-                        gp = &line[sel.nb.x];
-                        lastx = sel.ne.x;
-                } else {
-                        gp = &line[sel.nb.y == y ? sel.nb.x : 0];
-                        lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
-                }
-                lgp = &line[MIN(lastx, linelen-1)];
-
-                ptr = tgetglyphs(ptr, gp, lgp);
-
-                /*
-                 * Copy and pasting of line endings is inconsistent
-                 * in the inconsistent terminal and GUI world.
-                 * The best solution seems like to produce '\n' when
-                 * something is copied from st and convert '\n' to
-                 * '\r', when something to be pasted is received by
-                 * st.
-                 * FIXME: Fix the computer world.
-                 */
-                if ((y < sel.ne.y || lastx >= linelen) &&
-                    (!(lgp->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
-                        *ptr++ = '\n';
-        }
-        *ptr = '\0';
-        return str;
-}
-
-void
-selclear(void)
-{
-        if (sel.ob.x == -1)
-                return;
-        selremove();
-        tsetdirt(sel.nb.y, sel.ne.y);
-}
-
-void
-selremove(void)
-{
-        sel.mode = SEL_IDLE;
-        sel.ob.x = -1;
-}
-
-void
-die(const char *errstr, ...)
-{
-        va_list ap;
-
-        va_start(ap, errstr);
-        vfprintf(stderr, errstr, ap);
-        va_end(ap);
-        exit(1);
-}
-
-void
-execsh(char *cmd, char **args)
-{
-        char *sh, *prog, *arg;
-        const struct passwd *pw;
-
-        errno = 0;
-        if ((pw = getpwuid(getuid())) == NULL) {
-                if (errno)
-                        die("getpwuid: %s\n", strerror(errno));
-                else
-                        die("who are you?\n");
-        }
-
-        if ((sh = getenv("SHELL")) == NULL)
-                sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd;
-
-        if (args) {
-                prog = args[0];
-                arg = NULL;
-        } else if (scroll) {
-                prog = scroll;
-                arg = utmp ? utmp : sh;
-        } else if (utmp) {
-                prog = utmp;
-                arg = NULL;
-        } else {
-                prog = sh;
-                arg = NULL;
-        }
-        DEFAULT(args, ((char *[]) {prog, arg, NULL}));
-
-        unsetenv("COLUMNS");
-        unsetenv("LINES");
-        unsetenv("TERMCAP");
-        setenv("LOGNAME", pw->pw_name, 1);
-        setenv("USER", pw->pw_name, 1);
-        setenv("SHELL", sh, 1);
-        setenv("HOME", pw->pw_dir, 1);
-        setenv("TERM", termname, 1);
-
-        signal(SIGCHLD, SIG_DFL);
-        signal(SIGHUP, SIG_DFL);
-        signal(SIGINT, SIG_DFL);
-        signal(SIGQUIT, SIG_DFL);
-        signal(SIGTERM, SIG_DFL);
-        signal(SIGALRM, SIG_DFL);
-
-        execvp(prog, args);
-        _exit(1);
-}
-
-void
-sigchld(int a)
-{
-        int stat;
-        pid_t p;
-
-        if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
-                die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
-
-        if (pid != p)
-                return;
-
-        if (WIFEXITED(stat) && WEXITSTATUS(stat))
-                die("child exited with status %d\n", WEXITSTATUS(stat));
-        else if (WIFSIGNALED(stat))
-                die("child terminated due to signal %d\n", WTERMSIG(stat));
-        _exit(0);
-}
-
-void
-stty(char **args)
-{
-        char cmd[_POSIX_ARG_MAX], **p, *q, *s;
-        size_t n, siz;
-
-        if ((n = strlen(stty_args)) > sizeof(cmd)-1)
-                die("incorrect stty parameters\n");
-        memcpy(cmd, stty_args, n);
-        q = cmd + n;
-        siz = sizeof(cmd) - n;
-        for (p = args; p && (s = *p); ++p) {
-                if ((n = strlen(s)) > siz-1)
-                        die("stty parameter length too long\n");
-                *q++ = ' ';
-                memcpy(q, s, n);
-                q += n;
-                siz -= n + 1;
-        }
-        *q = '\0';
-        if (system(cmd) != 0)
-                perror("Couldn't call stty");
-}
-
-int
-ttynew(const char *line, char *cmd, const char *out, char **args)
-{
-        int m, s;
-
-        if (out) {
-                term.mode |= MODE_PRINT;
-                iofd = (!strcmp(out, "-")) ?
-                    1 : open(out, O_WRONLY | O_CREAT, 0666);
-                if (iofd < 0) {
-                        fprintf(stderr, "Error opening %s:%s\n",
-                                out, strerror(errno));
-                }
-        }
-
-        if (line) {
-                if ((cmdfd = open(line, O_RDWR)) < 0)
-                        die("open line '%s' failed: %s\n",
-                            line, strerror(errno));
-                dup2(cmdfd, 0);
-                stty(args);
-                return cmdfd;
-        }
-
-        /* seems to work fine on linux, openbsd and freebsd */
-        if (openpty(&m, &s, NULL, NULL, NULL) < 0)
-                die("openpty failed: %s\n", strerror(errno));
-
-        switch (pid = fork()) {
-        case -1:
-                die("fork failed: %s\n", strerror(errno));
-                break;
-        case 0:
-                close(iofd);
-                close(m);
-                setsid(); /* create a new process group */
-                dup2(s, 0);
-                dup2(s, 1);
-                dup2(s, 2);
-                if (ioctl(s, TIOCSCTTY, NULL) < 0)
-                        die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
-                if (s > 2)
-                        close(s);
-#ifdef __OpenBSD__
-                if (pledge("stdio getpw proc exec", NULL) == -1)
-                        die("pledge\n");
-#endif
-                execsh(cmd, args);
-                break;
-        default:
-#ifdef __OpenBSD__
-                if (pledge("stdio rpath tty proc", NULL) == -1)
-                        die("pledge\n");
-#endif
-                close(s);
-                cmdfd = m;
-                signal(SIGCHLD, sigchld);
-                break;
-        }
-        return cmdfd;
-}
-
-size_t
-ttyread(void)
-{
-        static char buf[BUFSIZ];
-        static int buflen = 0;
-        int ret, written;
-
-        /* append read bytes to unprocessed bytes */
-        ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
-
-        switch (ret) {
-        case 0:
-                exit(0);
-        case -1:
-                die("couldn't read from shell: %s\n", strerror(errno));
-        default:
-                buflen += ret;
-                written = twrite(buf, buflen, 0);
-                buflen -= written;
-                /* keep any incomplete UTF-8 byte sequence for the next call */
-                if (buflen > 0)
-                        memmove(buf, buf + written, buflen);
-                return ret;
-        }
-}
-
-void
-ttywrite(const char *s, size_t n, int may_echo)
-{
-        const char *next;
-
-        kscrolldown(&((Arg){ .i = term.scr }));
-
-        if (may_echo && IS_SET(MODE_ECHO))
-                twrite(s, n, 1);
-
-        if (!IS_SET(MODE_CRLF)) {
-                ttywriteraw(s, n);
-                return;
-        }
-
-        /* This is similar to how the kernel handles ONLCR for ttys */
-        while (n > 0) {
-                if (*s == '\r') {
-                        next = s + 1;
-                        ttywriteraw("\r\n", 2);
-                } else {
-                        next = memchr(s, '\r', n);
-                        DEFAULT(next, s + n);
-                        ttywriteraw(s, next - s);
-                }
-                n -= next - s;
-                s = next;
-        }
-}
-
-void
-ttywriteraw(const char *s, size_t n)
-{
-        fd_set wfd, rfd;
-        ssize_t r;
-        size_t lim = 256;
-
-        /*
-         * Remember that we are using a pty, which might be a modem line.
-         * Writing too much will clog the line. That's why we are doing this
-         * dance.
-         * FIXME: Migrate the world to Plan 9.
-         */
-        while (n > 0) {
-                FD_ZERO(&wfd);
-                FD_ZERO(&rfd);
-                FD_SET(cmdfd, &wfd);
-                FD_SET(cmdfd, &rfd);
-
-                /* Check if we can write. */
-                if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) {
-                        if (errno == EINTR)
-                                continue;
-                        die("select failed: %s\n", strerror(errno));
-                }
-                if (FD_ISSET(cmdfd, &wfd)) {
-                        /*
-                         * Only write the bytes written by ttywrite() or the
-                         * default of 256. This seems to be a reasonable value
-                         * for a serial line. Bigger values might clog the I/O.
-                         */
-                        if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
-                                goto write_error;
-                        if (r < n) {
-                                /*
-                                 * We weren't able to write out everything.
-                                 * This means the buffer is getting full
-                                 * again. Empty it.
-                                 */
-                                if (n < lim)
-                                        lim = ttyread();
-                                n -= r;
-                                s += r;
-                        } else {
-                                /* All bytes have been written. */
-                                break;
-                        }
-                }
-                if (FD_ISSET(cmdfd, &rfd))
-                        lim = ttyread();
-        }
-        return;
-
-write_error:
-        die("write error on tty: %s\n", strerror(errno));
-}
-
-void
-ttyresize(int tw, int th)
-{
-        struct winsize w;
-
-        w.ws_row = term.row;
-        w.ws_col = term.col;
-        w.ws_xpixel = tw;
-        w.ws_ypixel = th;
-        if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
-                fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
-}
-
-void
-ttyhangup(void)
-{
-        /* Send SIGHUP to shell */
-        kill(pid, SIGHUP);
-}
-
-int
-tattrset(int attr)
-{
-        int i, j;
-
-        for (i = 0; i < term.row-1; i++) {
-                for (j = 0; j < term.col-1; j++) {
-                        if (term.line[i][j].mode & attr)
-                                return 1;
-                }
-        }
-
-        return 0;
-}
-
-void
-tsetdirt(int top, int bot)
-{
-        int i;
-
-        LIMIT(top, 0, term.row-1);
-        LIMIT(bot, 0, term.row-1);
-
-        for (i = top; i <= bot; i++)
-                term.dirty[i] = 1;
-}
-
-void
-tsetdirtattr(int attr)
-{
-        int i, j;
-
-        for (i = 0; i < term.row-1; i++) {
-                for (j = 0; j < term.col-1; j++) {
-                        if (term.line[i][j].mode & attr) {
-                                term.dirty[i] = 1;
-                                break;
-                        }
-                }
-        }
-}
-
-int tisaltscr(void)
-{
-        return IS_SET(MODE_ALTSCREEN);
-}
-
-void
-tfulldirt(void)
-{
-        for (int i = 0; i < term.row; i++)
-                term.dirty[i] = 1;
-}
-
-void
-tcursor(int mode)
-{
-        static TCursor c[2];
-        int alt = IS_SET(MODE_ALTSCREEN);
-
-        if (mode == CURSOR_SAVE) {
-                c[alt] = term.c;
-        } else if (mode == CURSOR_LOAD) {
-                term.c = c[alt];
-                tmoveto(c[alt].x, c[alt].y);
-        }
-}
-
-void
-tresetcursor(void)
-{
-        term.c = (TCursor){ { .mode = ATTR_NULL, .fg = defaultfg, .bg = defaultbg },
-                .x = 0, .y = 0, .state = CURSOR_DEFAULT };
-}
-
-void
-treset(void)
-{
-        uint i;
-        int x, y;
-
-        tresetcursor();
-
-        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
-        for (i = tabspaces; i < term.col; i += tabspaces)
-                term.tabs[i] = 1;
-        term.top = 0;
-        term.histf = 0;
-        term.scr = 0;
-        term.bot = term.row - 1;
-        term.mode = MODE_WRAP|MODE_UTF8;
-        memset(term.trantbl, CS_USA, sizeof(term.trantbl));
-        term.charset = 0;
-
-        selremove();
-        for (i = 0; i < 2; i++) {
-                tcursor(CURSOR_SAVE); /* reset saved cursor */
-                for (y = 0; y < term.row; y++)
-                        for (x = 0; x < term.col; x++)
-                                tclearglyph(&term.line[y][x], 0);
-                tswapscreen();
-        }
-        tfulldirt();
-}
-
-void
-tnew(int col, int row)
-{
-        int i, j;
-
-        for (i = 0; i < 2; i++) {
-                term.line = xmalloc(row * sizeof(Line));
-                for (j = 0; j < row; j++)
-                        term.line[j] = xmalloc(col * sizeof(Glyph));
-                term.col = col, term.row = row;
-                tswapscreen();
-        }
-        term.dirty = xmalloc(row * sizeof(*term.dirty));
-        term.tabs = xmalloc(col * sizeof(*term.tabs));
-        for (i = 0; i < HISTSIZE; i++)
-                term.hist[i] = xmalloc(col * sizeof(Glyph));
-        treset();
-}
-
-/* handle it with care */
-void
-tswapscreen(void)
-{
-        static Line *altline;
-        static int altcol, altrow;
-        Line *tmpline = term.line;
-        int tmpcol = term.col, tmprow = term.row;
-
-        term.line = altline;
-        term.col = altcol, term.row = altrow;
-        altline = tmpline;
-        altcol = tmpcol, altrow = tmprow;
-        term.mode ^= MODE_ALTSCREEN;
-}
-
-void
-tloaddefscreen(int clear, int loadcursor)
-{
-        int col, row, alt = IS_SET(MODE_ALTSCREEN);
-
-        if (alt) {
-                if (clear)
-                        tclearregion(0, 0, term.col-1, term.row-1, 1);
-                col = term.col, row = term.row;
-                tswapscreen();
-        }
-        if (loadcursor)
-                tcursor(CURSOR_LOAD);
-        if (alt)
-                tresizedef(col, row);
-}
-
-void
-tloadaltscreen(int clear, int savecursor)
-{
-        int col, row, def = !IS_SET(MODE_ALTSCREEN);
-
-        if (savecursor)
-                tcursor(CURSOR_SAVE);
-        if (def) {
-                col = term.col, row = term.row;
-                tswapscreen();
-                term.scr = 0;
-                tresizealt(col, row);
-        }
-        if (clear)
-                tclearregion(0, 0, term.col-1, term.row-1, 1);
-}
-
-int
-tisaltscreen(void)
-{
-        return IS_SET(MODE_ALTSCREEN);
-}
-
-
-void
-kscrolldown(const Arg* a)
-{
-        int n = a->i;
-
-        if (!term.scr || IS_SET(MODE_ALTSCREEN))
-                return;
-
-        if (n < 0)
-                n = MAX(term.row / -n, 1);
-
-        if (n <= term.scr) {
-                term.scr -= n;
-        } else {
-                n = term.scr;
-                term.scr = 0;
-        }
-        if (sel.ob.x != -1 && !sel.alt)
-                selmove(-n); /* negate change in term.scr */
-        tfulldirt();
-}
-
-
-
-void
-kscrollup(const Arg* a)
-{
-        int n = a->i;
-
-        if (!term.histf || IS_SET(MODE_ALTSCREEN))
-                return;
-
-        if (n < 0)
-                n = MAX(term.row / -n, 1);
-
-        if (term.scr + n <= term.histf) {
-                term.scr += n;
-        } else {
-                n = term.histf - term.scr;
-                term.scr = term.histf;
-        }
-
-        if (sel.ob.x != -1 && !sel.alt)
-                selmove(n); /* negate change in term.scr */
-        tfulldirt();
-
-}
-
-void
-tscrolldown(int top, int n)
-{
-        int i, bot = term.bot;
-        Line temp;
-
-        if (n <= 0)
-                return;
-        n = MIN(n, bot-top+1);
-
-        tsetdirt(top, bot-n);
-        tclearregion(0, bot-n+1, term.col-1, bot, 1);
-
-        for (i = bot; i >= top+n; i--) {
-                temp = term.line[i];
-                term.line[i] = term.line[i-n];
-                term.line[i-n] = temp;
-        }
-
-        if (sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN))
-                selscroll(top, bot, n);
-}
-
-void
-tscrollup(int top, int bot, int n, int mode)
-{
-        int i, j, s;
-        int alt = IS_SET(MODE_ALTSCREEN);
-        int savehist = !alt && top == 0 && mode != SCROLL_NOSAVEHIST;
-        Line temp;
-
-        if (n <= 0)
-                return;
-        n = MIN(n, bot-top+1);
-
-        if (savehist) {
-                for (i = 0; i < n; i++) {
-                        term.histi = (term.histi + 1) % HISTSIZE;
-                        temp = term.hist[term.histi];
-                        for (j = 0; j < term.col; j++)
-                                tclearglyph(&temp[j], 1);
-                        term.hist[term.histi] = term.line[i];
-                        term.line[i] = temp;
-                }
-                term.histf = MIN(term.histf + n, HISTSIZE);
-                s = n;
-                if (term.scr) {
-                        j = term.scr;
-                        term.scr = MIN(j + n, HISTSIZE);
-                        s = j + n - term.scr;
-                }
-                if (mode != SCROLL_RESIZE)
-                        tfulldirt();
-        } else {
-                tclearregion(0, top, term.col-1, top+n-1, 1);
-                tsetdirt(top+n, bot);
-        }
-
-        for (i = top; i <= bot-n; i++) {
-                temp = term.line[i];
-                term.line[i] = term.line[i+n];
-                term.line[i+n] = temp;
-        }
-
-        if (sel.ob.x != -1 && sel.alt == alt) {
-                if (!savehist) {
-                        selscroll(top, bot, -n);
-                } else if (s > 0) {
-                        selmove(-s);
-                        if (-term.scr + sel.nb.y < -term.histf)
-                                selremove();
-                }
-        }
-}
-
-void
-selmove(int n)
-{
-        sel.ob.y += n, sel.nb.y += n;
-        sel.oe.y += n, sel.ne.y += n;
-}
-
-void
-selscroll(int top, int bot, int n)
-{
-        /* turn absolute coordinates into relative */
-        top += term.scr, bot += term.scr;
-
-        if (BETWEEN(sel.nb.y, top, bot) != BETWEEN(sel.ne.y, top, bot)) {
-                selclear();
-        } else if (BETWEEN(sel.nb.y, top, bot)) {
-                selmove(n);
-                if (sel.nb.y < top || sel.ne.y > bot)
-                        selclear();
-        }
-}
-
-void
-tnewline(int first_col)
-{
-        int y = term.c.y;
-
-        if (y == term.bot) {
-                tscrollup(term.top, term.bot, 1, SCROLL_SAVEHIST);
-        } else {
-                y++;
-        }
-        tmoveto(first_col ? 0 : term.c.x, y);
-}
-
-void
-readcolonargs(char **p, int cursor, int params[][CAR_PER_ARG])
-{
-        int i = 0;
-        for (; i < CAR_PER_ARG; i++)
-                params[cursor][i] = -1;
-
-        if (**p != ':')
-                return;
-
-        char *np = NULL;
-        i = 0;
-
-        while (**p == ':' && i < CAR_PER_ARG) {
-                while (**p == ':')
-                        (*p)++;
-                params[cursor][i] = strtol(*p, &np, 10);
-                *p = np;
-                i++;
-        }
-}
-
-void
-csiparse(void)
-{
-        char *p = csiescseq.buf, *np;
-        long int v;
-        int sep = ';'; /* colon or semi-colon, but not both */
-
-        csiescseq.narg = 0;
-        if (*p == '?') {
-                csiescseq.priv = 1;
-                p++;
-        }
-
-        csiescseq.buf[csiescseq.len] = '\0';
-        while (p < csiescseq.buf+csiescseq.len) {
-                np = NULL;
-                v = strtol(p, &np, 10);
-                if (np == p)
-                        v = 0;
-                if (v == LONG_MAX || v == LONG_MIN)
-                        v = -1;
-                csiescseq.arg[csiescseq.narg++] = v;
-                p = np;
-                readcolonargs(&p, csiescseq.narg-1, csiescseq.carg);
-                if (sep == ';' && *p == ':')
-                        sep = ':'; /* allow override to colon once */
-                if (*p != sep || csiescseq.narg == ESC_ARG_SIZ)
-                        break;
-                p++;
-        }
-        csiescseq.mode[0] = *p++;
-        csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
-}
-
-/* for absolute user moves, when decom is set */
-void
-tmoveato(int x, int y)
-{
-        tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
-}
-
-void
-tmoveto(int x, int y)
-{
-        int miny, maxy;
-
-        if (term.c.state & CURSOR_ORIGIN) {
-                miny = term.top;
-                maxy = term.bot;
-        } else {
-                miny = 0;
-                maxy = term.row - 1;
-        }
-        term.c.state &= ~CURSOR_WRAPNEXT;
-        term.c.x = LIMIT(x, 0, term.col-1);
-        term.c.y = LIMIT(y, miny, maxy);
-}
-
-void
-tsetchar(Rune u, const Glyph *attr, int x, int y)
-{
-        static const char *vt100_0[62] = { /* 0x41 - 0x7e */
-                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
-                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
-                0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
-                0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
-                "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
-                "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
-                "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
-                "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
-        };
-
-        /*
-         * The table is proudly stolen from rxvt.
-         */
-        if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
-            BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
-                utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
-
-        if (term.line[y][x].mode & ATTR_WIDE) {
-                if (x+1 < term.col) {
-                        term.line[y][x+1].u = ' ';
-                        term.line[y][x+1].mode &= ~ATTR_WDUMMY;
-                }
-        } else if (term.line[y][x].mode & ATTR_WDUMMY) {
-                term.line[y][x-1].u = ' ';
-                term.line[y][x-1].mode &= ~ATTR_WIDE;
-        }
-
-        term.dirty[y] = 1;
-        term.line[y][x] = *attr;
-        term.line[y][x].u = u;
-        term.line[y][x].mode |= ATTR_SET;
-}
-
-
-
-void
-tclearglyph(Glyph *gp, int usecurattr)
-{
-        if (usecurattr) {
-                gp->fg = term.c.attr.fg;
-                gp->bg = term.c.attr.bg;
-        } else {
-                gp->fg = defaultfg;
-                gp->bg = defaultbg;
-        }
-        gp->mode = ATTR_NULL;
-        gp->u = ' ';
-}
-
-
-
-void
-tclearregion(int x1, int y1, int x2, int y2, int usecurattr)
-{
-        int x, y;
-        /* regionselected() takes relative coordinates */
-        if (regionselected(x1+term.scr, y1+term.scr, x2+term.scr, y2+term.scr))
-                selremove();
-
-        for (y = y1; y <= y2; y++) {
-                term.dirty[y] = 1;
-                for (x = x1; x <= x2; x++)
-                        tclearglyph(&term.line[y][x], usecurattr);
-        }
-}
-
-void
-tdeletechar(int n)
-{
-        int src, dst, size;
-        Line line;
-
-        if (n <= 0)
-                return;
-
-        dst = term.c.x;
-        src = MIN(term.c.x + n, term.col);
-        size = term.col - src;
-        if (size > 0) {
-                /*
-                 * otherwise src would point beyond the array
-                 * https://stackoverflow.com/questions/29844298
-                 */
-                line = term.line[term.c.y];
-                memmove(&line[dst], &line[src], size * sizeof(Glyph));
-        }
-        tclearregion(dst + size, term.c.y, term.col - 1, term.c.y, 1);
-}
-
-void
-tinsertblank(int n)
-{
-        int src, dst, size;
-        Line line;
-
-        if (n <= 0)
-                return;
-        dst = MIN(term.c.x + n, term.col);
-        src = term.c.x;
-        size = term.col - dst;
-        if (size > 0) { /* otherwise dst would point beyond the array */
-                line = term.line[term.c.y];
-                memmove(&line[dst], &line[src], size * sizeof(Glyph));
-        }
-        tclearregion(src, term.c.y, dst - 1, term.c.y, 1);
-}
-
-void
-tinsertblankline(int n)
-{
-        if (BETWEEN(term.c.y, term.top, term.bot))
-                tscrolldown(term.c.y, n);
-}
-
-void
-tdeleteline(int n)
-{
-        if (BETWEEN(term.c.y, term.top, term.bot))
-                tscrollup(term.c.y, term.bot, n, SCROLL_NOSAVEHIST);
-}
-
-int32_t
-tdefcolor(const int *attr, int *npar, int l)
-{
-        int32_t idx = -1;
-        uint r, g, b;
-
-        switch (attr[*npar + 1]) {
-        case 2: /* direct color in RGB space */
-                if (*npar + 4 >= l) {
-                        fprintf(stderr,
-                                "erresc(38): Incorrect number of parameters (%d)\n",
-                                *npar);
-                        break;
-                }
-                r = attr[*npar + 2];
-                g = attr[*npar + 3];
-                b = attr[*npar + 4];
-                *npar += 4;
-                if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
-                        fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
-                                r, g, b);
-                else
-                        idx = TRUECOLOR(r, g, b);
-                break;
-        case 5: /* indexed color */
-                if (*npar + 2 >= l) {
-                        fprintf(stderr,
-                                "erresc(38): Incorrect number of parameters (%d)\n",
-                                *npar);
-                        break;
-                }
-                *npar += 2;
-                if (!BETWEEN(attr[*npar], 0, 255))
-                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
-                else
-                        idx = attr[*npar];
-                break;
-        case 0: /* implemented defined (only foreground) */
-        case 1: /* transparent */
-        case 3: /* direct color in CMY space */
-        case 4: /* direct color in CMYK space */
-        default:
-                fprintf(stderr,
-                        "erresc(38): gfx attr %d unknown\n", attr[*npar]);
-                break;
-        }
-
-        return idx;
-}
-
-void
-tsetattr(const int *attr, int l)
-{
-        int i;
-        int32_t idx;
-
-        for (i = 0; i < l; i++) {
-                switch (attr[i]) {
-                case 0:
-                        term.c.attr.mode &= ~(
-                                ATTR_BOLD       |
-                                ATTR_FAINT      |
-                                ATTR_ITALIC     |
-                                ATTR_UNDERLINE  |
-                                ATTR_BLINK      |
-                                ATTR_REVERSE    |
-                                ATTR_INVISIBLE  |
-                                ATTR_STRUCK     );
-                        term.c.attr.fg = defaultfg;
-                        term.c.attr.bg = defaultbg;
-                        term.c.attr.ustyle = -1;
-                        term.c.attr.ucolor[0] = -1;
-                        term.c.attr.ucolor[1] = -1;
-                        term.c.attr.ucolor[2] = -1;
-                        break;
-                case 1:
-                        term.c.attr.mode |= ATTR_BOLD;
-                        break;
-                case 2:
-                        term.c.attr.mode |= ATTR_FAINT;
-                        break;
-                case 3:
-                        term.c.attr.mode |= ATTR_ITALIC;
-                        break;
-                case 4:
-                        term.c.attr.ustyle = csiescseq.carg[i][0];
-                        if (term.c.attr.ustyle != 0)
-                                term.c.attr.mode |= ATTR_UNDERLINE;
-                        else
-                                term.c.attr.mode &= ~ATTR_UNDERLINE;
-                        term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
-                        break;
-                case 5: /* slow blink */
-                        /* FALLTHROUGH */
-                case 6: /* rapid blink */
-                        term.c.attr.mode |= ATTR_BLINK;
-                        break;
-                case 7:
-                        term.c.attr.mode |= ATTR_REVERSE;
-                        break;
-                case 8:
-                        term.c.attr.mode |= ATTR_INVISIBLE;
-                        break;
-                case 9:
-                        term.c.attr.mode |= ATTR_STRUCK;
-                        break;
-                case 22:
-                        term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
-                        break;
-                case 23:
-                        term.c.attr.mode &= ~ATTR_ITALIC;
-                        break;
-                case 24:
-                        term.c.attr.mode &= ~ATTR_UNDERLINE;
-                        break;
-                case 25:
-                        term.c.attr.mode &= ~ATTR_BLINK;
-                        break;
-                case 27:
-                        term.c.attr.mode &= ~ATTR_REVERSE;
-                        break;
-                case 28:
-                        term.c.attr.mode &= ~ATTR_INVISIBLE;
-                        break;
-                case 29:
-                        term.c.attr.mode &= ~ATTR_STRUCK;
-                        break;
-                case 38:
-                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
-                                term.c.attr.fg = idx;
-                        break;
-                case 39: /* set foreground color to default */
-                        term.c.attr.fg = defaultfg;
-                        break;
-                case 48:
-                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
-                                term.c.attr.bg = idx;
-                        break;
-                case 49: /* set background color to default */
-                        term.c.attr.bg = defaultbg;
-                        break;
-                case 58:
-                        term.c.attr.ucolor[0] = csiescseq.carg[i][1];
-                        term.c.attr.ucolor[1] = csiescseq.carg[i][2];
-                        term.c.attr.ucolor[2] = csiescseq.carg[i][3];
-                        term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
-                        break;
-                case 59:
-                        term.c.attr.ucolor[0] = -1;
-                        term.c.attr.ucolor[1] = -1;
-                        term.c.attr.ucolor[2] = -1;
-                        term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
-                        break;
-                default:
-                        if (BETWEEN(attr[i], 30, 37)) {
-                                term.c.attr.fg = attr[i] - 30;
-                        } else if (BETWEEN(attr[i], 40, 47)) {
-                                term.c.attr.bg = attr[i] - 40;
-                        } else if (BETWEEN(attr[i], 90, 97)) {
-                                term.c.attr.fg = attr[i] - 90 + 8;
-                        } else if (BETWEEN(attr[i], 100, 107)) {
-                                term.c.attr.bg = attr[i] - 100 + 8;
-                        } else {
-                                fprintf(stderr,
-                                        "erresc(default): gfx attr %d unknown\n",
-                                        attr[i]);
-                                csidump();
-                        }
-                        break;
-                }
-        }
-}
-
-void
-tsetscroll(int t, int b)
-{
-        int temp;
-
-        LIMIT(t, 0, term.row-1);
-        LIMIT(b, 0, term.row-1);
-        if (t > b) {
-                temp = t;
-                t = b;
-                b = temp;
-        }
-        term.top = t;
-        term.bot = b;
-}
-
-void
-tsetmode(int priv, int set, const int *args, int narg)
-{
-        const int *lim;
-
-        for (lim = args + narg; args < lim; ++args) {
-                if (priv) {
-                        switch (*args) {
-                        case 1: /* DECCKM -- Cursor key */
-                                xsetmode(set, MODE_APPCURSOR);
-                                break;
-                        case 5: /* DECSCNM -- Reverse video */
-                                xsetmode(set, MODE_REVERSE);
-                                break;
-                        case 6: /* DECOM -- Origin */
-                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
-                                tmoveato(0, 0);
-                                break;
-                        case 7: /* DECAWM -- Auto wrap */
-                                MODBIT(term.mode, set, MODE_WRAP);
-                                break;
-                        case 0:  /* Error (IGNORED) */
-                        case 2:  /* DECANM -- ANSI/VT52 (IGNORED) */
-                        case 3:  /* DECCOLM -- Column  (IGNORED) */
-                        case 4:  /* DECSCLM -- Scroll (IGNORED) */
-                        case 8:  /* DECARM -- Auto repeat (IGNORED) */
-                        case 18: /* DECPFF -- Printer feed (IGNORED) */
-                        case 19: /* DECPEX -- Printer extent (IGNORED) */
-                        case 42: /* DECNRCM -- National characters (IGNORED) */
-                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
-                                break;
-                        case 25: /* DECTCEM -- Text Cursor Enable Mode */
-                                xsetmode(!set, MODE_HIDE);
-                                break;
-                        case 9:    /* X10 mouse compatibility mode */
-                                xsetpointermotion(0);
-                                xsetmode(0, MODE_MOUSE);
-                                xsetmode(set, MODE_MOUSEX10);
-                                break;
-                        case 1000: /* 1000: report button press */
-                                xsetpointermotion(0);
-                                xsetmode(0, MODE_MOUSE);
-                                xsetmode(set, MODE_MOUSEBTN);
-                                break;
-                        case 1002: /* 1002: report motion on button press */
-                                xsetpointermotion(0);
-                                xsetmode(0, MODE_MOUSE);
-                                xsetmode(set, MODE_MOUSEMOTION);
-                                break;
-                        case 1003: /* 1003: enable all mouse motions */
-                                xsetpointermotion(set);
-                                xsetmode(0, MODE_MOUSE);
-                                xsetmode(set, MODE_MOUSEMANY);
-                                break;
-                        case 1004: /* 1004: send focus events to tty */
-                                xsetmode(set, MODE_FOCUS);
-                                break;
-                        case 1006: /* 1006: extended reporting mode */
-                                xsetmode(set, MODE_MOUSESGR);
-                                break;
-                        case 1034: /* 1034: enable 8-bit mode for keyboard input */
-                                xsetmode(set, MODE_8BIT);
-                                break;
-                        case 1049: /* swap screen & set/restore cursor as xterm */
-                                if (!allowaltscreen)
-                                        break;
-                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
-                                /* FALLTHROUGH */
-                        case 47: /* swap screen buffer */
-                        case 1047: /* swap screen buffer */
-                                if (!allowaltscreen)
-                                        break;
-                                if (set)
-                                        tloadaltscreen(*args == 1049, *args == 1049);
-                                else
-                                        tloaddefscreen(*args == 1047, *args == 1049);
-                                break;
-                                /* FALLTHROUGH */
-                        case 1048: /* save/restore cursor (like DECSC/DECRC) */
-                                if (!allowaltscreen)
-                                        break;
-                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
-                                break;
-                        case 2004: /* 2004: bracketed paste mode */
-                                xsetmode(set, MODE_BRCKTPASTE);
-                                break;
-                                /* Not implemented mouse modes. See comments there. */
-                        case 1001: /* mouse highlight mode; can hang the
-                                      terminal by design when implemented. */
-                        case 1005: /* UTF-8 mouse mode; will confuse
-                                      applications not supporting UTF-8
-                                      and luit. */
-                        case 1015: /* urxvt mangled mouse mode; incompatible
-                                      and can be mistaken for other control
-                                      codes. */
-                                break;
-                        default:
-                                fprintf(stderr,
-                                        "erresc: unknown private set/reset mode %d\n",
-                                        *args);
-                                break;
-                        }
-                } else {
-                        switch (*args) {
-                        case 0:  /* Error (IGNORED) */
-                                break;
-                        case 2:
-                                xsetmode(set, MODE_KBDLOCK);
-                                break;
-                        case 4:  /* IRM -- Insertion-replacement */
-                                MODBIT(term.mode, set, MODE_INSERT);
-                                break;
-                        case 12: /* SRM -- Send/Receive */
-                                MODBIT(term.mode, !set, MODE_ECHO);
-                                break;
-                        case 20: /* LNM -- Linefeed/new line */
-                                MODBIT(term.mode, set, MODE_CRLF);
-                                break;
-                        default:
-                                fprintf(stderr,
-                                        "erresc: unknown set/reset mode %d\n",
-                                        *args);
-                                break;
-                        }
-                }
-        }
-}
-
-void
-csihandle(void)
-{
-        char buf[40];
-        int n, x;
-
-        switch (csiescseq.mode[0]) {
-        default:
-        unknown:
-                fprintf(stderr, "erresc: unknown csi ");
-                csidump();
-                /* die(""); */
-                break;
-        case '@': /* ICH -- Insert <n> blank char */
-                DEFAULT(csiescseq.arg[0], 1);
-                tinsertblank(csiescseq.arg[0]);
-                break;
-        case 'A': /* CUU -- Cursor <n> Up */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
-                break;
-        case 'B': /* CUD -- Cursor <n> Down */
-        case 'e': /* VPR --Cursor <n> Down */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
-                break;
-        case 'i': /* MC -- Media Copy */
-                switch (csiescseq.arg[0]) {
-                case 0:
-                        tdump();
-                        break;
-                case 1:
-                        tdumpline(term.c.y);
-                        break;
-                case 2:
-                        tdumpsel();
-                        break;
-                case 4:
-                        term.mode &= ~MODE_PRINT;
-                        break;
-                case 5:
-                        term.mode |= MODE_PRINT;
-                        break;
-                }
-                break;
-        case 'c': /* DA -- Device Attributes */
-                if (csiescseq.arg[0] == 0)
-                        ttywrite(vtiden, strlen(vtiden), 0);
-                break;
-        case 'b': /* REP -- if last char is printable print it <n> more times */
-                LIMIT(csiescseq.arg[0], 1, 65535);
-                if (term.lastc)
-                        while (csiescseq.arg[0]-- > 0)
-                                tputc(term.lastc);
-                break;
-        case 'C': /* CUF -- Cursor <n> Forward */
-        case 'a': /* HPR -- Cursor <n> Forward */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
-                break;
-        case 'D': /* CUB -- Cursor <n> Backward */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
-                break;
-        case 'E': /* CNL -- Cursor <n> Down and first col */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(0, term.c.y+csiescseq.arg[0]);
-                break;
-        case 'F': /* CPL -- Cursor <n> Up and first col */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(0, term.c.y-csiescseq.arg[0]);
-                break;
-        case 'g': /* TBC -- Tabulation clear */
-                switch (csiescseq.arg[0]) {
-                case 0: /* clear current tab stop */
-                        term.tabs[term.c.x] = 0;
-                        break;
-                case 3: /* clear all the tabs */
-                        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
-                        break;
-                default:
-                        goto unknown;
-                }
-                break;
-        case 'G': /* CHA -- Move to <col> */
-        case '`': /* HPA */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveto(csiescseq.arg[0]-1, term.c.y);
-                break;
-        case 'H': /* CUP -- Move to <row> <col> */
-        case 'f': /* HVP */
-                DEFAULT(csiescseq.arg[0], 1);
-                DEFAULT(csiescseq.arg[1], 1);
-                tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
-                break;
-        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
-                DEFAULT(csiescseq.arg[0], 1);
-                tputtab(csiescseq.arg[0]);
-                break;
-        case 'J': /* ED -- Clear screen */
-                switch (csiescseq.arg[0]) {
-                case 0: /* below */
-                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
-                        if (term.c.y < term.row-1) {
-                                tclearregion(0, term.c.y+1, term.col-1, term.row-1, 1);
-                        }
-                        break;
-                case 1: /* above */
-                        if (term.c.y >= 1)
-                                tclearregion(0, 0, term.col-1, term.c.y-1, 1);
-                        tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
-                        break;
-                case 2: /* all */
-                        if (IS_SET(MODE_ALTSCREEN)) {
-                                tclearregion(0, 0, term.col-1, term.row-1, 1);
-                                break;
-                        }
-                        /* vte does this:
-                           tscrollup(0, term.row-1, term.row, SCROLL_SAVEHIST); */
-
-                        /* alacritty does this: */
-                        for (n = term.row-1; n >= 0 && tlinelen(term.line[n]) == 0; n--);
-                        if (n >= 0)
-                                tscrollup(0, term.row-1, n+1, SCROLL_SAVEHIST);
-                        tscrollup(0, term.row-1, term.row-n-1, SCROLL_NOSAVEHIST);
-                        break;
-                default:
-                        goto unknown;
-                }
-                break;
-        case 'K': /* EL -- Clear line */
-                switch (csiescseq.arg[0]) {
-                case 0: /* right */
-                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
-                        break;
-                case 1: /* left */
-                        tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
-                        break;
-                case 2: /* all */
-                        tclearregion(0, term.c.y, term.col-1, term.c.y, 1);
-                        break;
-                }
-                break;
-        case 'S': /* SU -- Scroll <n> line up */
-                if (csiescseq.priv) break;
-                DEFAULT(csiescseq.arg[0], 1);
-                /* xterm, urxvt, alacritty save this in history */
-                tscrollup(term.top, term.bot, csiescseq.arg[0], SCROLL_SAVEHIST);
-                break;
-        case 'T': /* SD -- Scroll <n> line down */
-                DEFAULT(csiescseq.arg[0], 1);
-                tscrolldown(term.top, csiescseq.arg[0]);
-                break;
-        case 'L': /* IL -- Insert <n> blank lines */
-                DEFAULT(csiescseq.arg[0], 1);
-                tinsertblankline(csiescseq.arg[0]);
-                break;
-        case 'l': /* RM -- Reset Mode */
-                tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
-                break;
-        case 'M': /* DL -- Delete <n> lines */
-                DEFAULT(csiescseq.arg[0], 1);
-                tdeleteline(csiescseq.arg[0]);
-                break;
-        case 'X': /* ECH -- Erase <n> char */
-                if (csiescseq.arg[0] < 0)
-                        return;
-                DEFAULT(csiescseq.arg[0], 1);
-                x = MIN(term.c.x + csiescseq.arg[0], term.col) - 1;
-                tclearregion(term.c.x, term.c.y, x, term.c.y, 1);
-                break;
-        case 'P': /* DCH -- Delete <n> char */
-                DEFAULT(csiescseq.arg[0], 1);
-                tdeletechar(csiescseq.arg[0]);
-                break;
-        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
-                DEFAULT(csiescseq.arg[0], 1);
-                tputtab(-csiescseq.arg[0]);
-                break;
-        case 'd': /* VPA -- Move to <row> */
-                DEFAULT(csiescseq.arg[0], 1);
-                tmoveato(term.c.x, csiescseq.arg[0]-1);
-                break;
-        case 'h': /* SM -- Set terminal mode */
-                tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
-                break;
-        case 'm': /* SGR -- Terminal attribute (color) */
-                tsetattr(csiescseq.arg, csiescseq.narg);
-                break;
-        case 'n': /* DSR -- Device Status Report */
-                switch (csiescseq.arg[0]) {
-                case 5: /* Status Report "OK" `0n` */
-                        ttywrite("\033[0n", sizeof("\033[0n") - 1, 0);
-                        break;
-                case 6: /* Report Cursor Position (CPR) "<row>;<column>R" */
-                        n = snprintf(buf, sizeof(buf), "\033[%i;%iR",
-                                     term.c.y+1, term.c.x+1);
-                        ttywrite(buf, n, 0);
-                        break;
-                default:
-                        goto unknown;
-                }
-                break;
-        case 'r': /* DECSTBM -- Set Scrolling Region */
-                if (csiescseq.priv) {
-                        goto unknown;
-                } else {
-                        DEFAULT(csiescseq.arg[0], 1);
-                        DEFAULT(csiescseq.arg[1], term.row);
-                        tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
-                        tmoveato(0, 0);
-                }
-                break;
-        case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
-                tcursor(CURSOR_SAVE);
-                break;
-        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
-                if (csiescseq.priv) {
-                        goto unknown;
-                } else {
-                        tcursor(CURSOR_LOAD);
-                }
-                break;
-        case ' ':
-                switch (csiescseq.mode[1]) {
-                case 'q': /* DECSCUSR -- Set Cursor Style */
-                        if (xsetcursor(csiescseq.arg[0]))
-                                goto unknown;
-                        break;
-                default:
-                        goto unknown;
-                }
-                break;
-        }
-}
-
-void
-csidump(void)
-{
-        size_t i;
-        uint c;
-
-        fprintf(stderr, "ESC[");
-        for (i = 0; i < csiescseq.len; i++) {
-                c = csiescseq.buf[i] & 0xff;
-                if (isprint(c)) {
-                        putc(c, stderr);
-                } else if (c == '\n') {
-                        fprintf(stderr, "(\\n)");
-                } else if (c == '\r') {
-                        fprintf(stderr, "(\\r)");
-                } else if (c == 0x1b) {
-                        fprintf(stderr, "(\\e)");
-                } else {
-                        fprintf(stderr, "(%02x)", c);
-                }
-        }
-        putc('\n', stderr);
-}
-
-void
-csireset(void)
-{
-        memset(&csiescseq, 0, sizeof(csiescseq));
-}
-
-void
-osc_color_response(int num, int index, int is_osc4)
-{
-        int n;
-        char buf[32];
-        unsigned char r, g, b;
-
-        if (xgetcolor(is_osc4 ? num : index, &r, &g, &b)) {
-                fprintf(stderr, "erresc: failed to fetch %s color %d\n",
-                        is_osc4 ? "osc4" : "osc",
-                        is_osc4 ? num : index);
-                return;
-        }
-
-        n = snprintf(buf, sizeof buf, "\033]%s%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
-                     is_osc4 ? "4;" : "", num, r, r, g, g, b, b);
-        if (n < 0 || n >= sizeof(buf)) {
-                fprintf(stderr, "error: %s while printing %s response\n",
-                        n < 0 ? "snprintf failed" : "truncation occurred",
-                        is_osc4 ? "osc4" : "osc");
-        } else {
-                ttywrite(buf, n, 1);
-        }
-}
-
-void
-strhandle(void)
-{
-        char *p = NULL, *dec;
-        int j, narg, par;
-        const struct { int idx; char *str; } osc_table[] = {
-                { defaultfg, "foreground" },
-                { defaultbg, "background" },
-                { defaultcs, "cursor" }
-        };
-
-        term.esc &= ~(ESC_STR_END|ESC_STR);
-        strparse();
-        par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
-
-        switch (strescseq.type) {
-        case ']': /* OSC -- Operating System Command */
-                switch (par) {
-                case 0:
-                        if (narg > 1) {
-                                xsettitle(strescseq.args[1]);
-                                xseticontitle(strescseq.args[1]);
-                        }
-                        return;
-                case 1:
-                        if (narg > 1)
-                                xseticontitle(strescseq.args[1]);
-                        return;
-                case 2:
-                        if (narg > 1)
-                                xsettitle(strescseq.args[1]);
-                        return;
-                case 52: /* manipulate selection data */
-                        if (narg > 2 && allowwindowops) {
-                                dec = base64dec(strescseq.args[2]);
-                                if (dec) {
-                                        xsetsel(dec);
-                                        xclipcopy();
-                                } else {
-                                        fprintf(stderr, "erresc: invalid base64\n");
-                                }
-                        }
-                        return;
-                case 10: /* set dynamic VT100 text foreground color */
-                case 11: /* set dynamic VT100 text background color */
-                case 12: /* set dynamic text cursor color */
-                        if (narg < 2)
-                                break;
-                        p = strescseq.args[1];
-                        if ((j = par - 10) < 0 || j >= LEN(osc_table))
-                                break; /* shouldn't be possible */
-
-                        if (!strcmp(p, "?")) {
-                                osc_color_response(par, osc_table[j].idx, 0);
-                        } else if (xsetcolorname(osc_table[j].idx, p)) {
-                                fprintf(stderr, "erresc: invalid %s color: %s\n",
-                                        osc_table[j].str, p);
-                        } else {
-                                tfulldirt();
-                        }
-                        return;
-                case 4: /* color set */
-                        if (narg < 3)
-                                break;
-                        p = strescseq.args[2];
-                        /* FALLTHROUGH */
-                case 104: /* color reset */
-                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
-
-                        if (p && !strcmp(p, "?")) {
-                                osc_color_response(j, 0, 1);
-                        } else if (xsetcolorname(j, p)) {
-                                if (par == 104 && narg <= 1) {
-                                        xloadcols();
-                                        return; /* color reset without parameter */
-                                }
-                                fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
-                                        j, p ? p : "(null)");
-                        } else {
-                                /*
-                                 * TODO if defaultbg color is changed, borders
-                                 * are dirty
-                                 */
-                                tfulldirt();
-                        }
-                        return;
-                case 110: /* reset dynamic VT100 text foreground color */
-                case 111: /* reset dynamic VT100 text background color */
-                case 112: /* reset dynamic text cursor color */
-                        if (narg != 1)
-                                break;
-                        if ((j = par - 110) < 0 || j >= LEN(osc_table))
-                                break; /* shouldn't be possible */
-                        if (xsetcolorname(osc_table[j].idx, NULL)) {
-                                fprintf(stderr, "erresc: %s color not found\n", osc_table[j].str);
-                        } else {
-                                tfulldirt();
-                        }
-                        return;
-                }
-                break;
-        case 'k': /* old title set compatibility */
-                xsettitle(strescseq.args[0]);
-                return;
-        case 'P': /* DCS -- Device Control String */
-        case '_': /* APC -- Application Program Command */
-        case '^': /* PM -- Privacy Message */
-                return;
-        }
-
-        fprintf(stderr, "erresc: unknown str ");
-        strdump();
-}
-
-void
-strparse(void)
-{
-        int c;
-        char *p = strescseq.buf;
-
-        strescseq.narg = 0;
-        strescseq.buf[strescseq.len] = '\0';
-
-        if (*p == '\0')
-                return;
-
-        while (strescseq.narg < STR_ARG_SIZ) {
-                strescseq.args[strescseq.narg++] = p;
-                while ((c = *p) != ';' && c != '\0')
-                        ++p;
-                if (c == '\0')
-                        return;
-                *p++ = '\0';
-        }
-}
-
-void
-strdump(void)
-{
-        size_t i;
-        uint c;
-
-        fprintf(stderr, "ESC%c", strescseq.type);
-        for (i = 0; i < strescseq.len; i++) {
-                c = strescseq.buf[i] & 0xff;
-                if (c == '\0') {
-                        putc('\n', stderr);
-                        return;
-                } else if (isprint(c)) {
-                        putc(c, stderr);
-                } else if (c == '\n') {
-                        fprintf(stderr, "(\\n)");
-                } else if (c == '\r') {
-                        fprintf(stderr, "(\\r)");
-                } else if (c == 0x1b) {
-                        fprintf(stderr, "(\\e)");
-                } else {
-                        fprintf(stderr, "(%02x)", c);
-                }
-        }
-        fprintf(stderr, "ESC\\\n");
-}
-
-void
-strreset(void)
-{
-        strescseq = (STREscape){
-                .buf = xrealloc(strescseq.buf, STR_BUF_SIZ),
-                .siz = STR_BUF_SIZ,
-        };
-}
-
-void
-sendbreak(const Arg *arg)
-{
-        if (tcsendbreak(cmdfd, 0))
-                perror("Error sending break");
-}
-
-void
-tprinter(char *s, size_t len)
-{
-        if (iofd != -1 && xwrite(iofd, s, len) < 0) {
-                perror("Error writing to output file");
-                close(iofd);
-                iofd = -1;
-        }
-}
-
-void
-toggleprinter(const Arg *arg)
-{
-        term.mode ^= MODE_PRINT;
-}
-
-void
-printscreen(const Arg *arg)
-{
-        tdump();
-}
-
-void
-printsel(const Arg *arg)
-{
-        tdumpsel();
-}
-
-void
-tdumpsel(void)
-{
-        char *ptr;
-
-        if ((ptr = getsel())) {
-                tprinter(ptr, strlen(ptr));
-                free(ptr);
-        }
-}
-
-void
-tdumpline(int n)
-{
-        char str[(term.col + 1) * UTF_SIZ];
-        tprinter(str, tgetline(str, &term.line[n][0]));
-}
-
-void
-tdump(void)
-{
-        int i;
-
-        for (i = 0; i < term.row; ++i)
-                tdumpline(i);
-}
-
-void
-tputtab(int n)
-{
-        uint x = term.c.x;
-
-        if (n > 0) {
-                while (x < term.col && n--)
-                        for (++x; x < term.col && !term.tabs[x]; ++x)
-                                /* nothing */ ;
-        } else if (n < 0) {
-                while (x > 0 && n++)
-                        for (--x; x > 0 && !term.tabs[x]; --x)
-                                /* nothing */ ;
-        }
-        term.c.x = LIMIT(x, 0, term.col-1);
-}
-
-void
-tdefutf8(char ascii)
-{
-        if (ascii == 'G')
-                term.mode |= MODE_UTF8;
-        else if (ascii == '@')
-                term.mode &= ~MODE_UTF8;
-}
-
-void
-tdeftran(char ascii)
-{
-        static char cs[] = "0B";
-        static int vcs[] = {CS_GRAPHIC0, CS_USA};
-        char *p;
-
-        if ((p = strchr(cs, ascii)) == NULL) {
-                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
-        } else {
-                term.trantbl[term.icharset] = vcs[p - cs];
-        }
-}
-
-void
-tdectest(char c)
-{
-        int x, y;
-
-        if (c == '8') { /* DEC screen alignment test. */
-                for (x = 0; x < term.col; ++x) {
-                        for (y = 0; y < term.row; ++y)
-                                tsetchar('E', &term.c.attr, x, y);
-                }
-        }
-}
-
-void
-tstrsequence(uchar c)
-{
-        switch (c) {
-        case 0x90:   /* DCS -- Device Control String */
-                c = 'P';
-                break;
-        case 0x9f:   /* APC -- Application Program Command */
-                c = '_';
-                break;
-        case 0x9e:   /* PM -- Privacy Message */
-                c = '^';
-                break;
-        case 0x9d:   /* OSC -- Operating System Command */
-                c = ']';
-                break;
-        }
-        strreset();
-        strescseq.type = c;
-        term.esc |= ESC_STR;
-}
-
-void
-tcontrolcode(uchar ascii)
-{
-        switch (ascii) {
-        case '\t':   /* HT */
-                tputtab(1);
-                return;
-        case '\b':   /* BS */
-                tmoveto(term.c.x-1, term.c.y);
-                return;
-        case '\r':   /* CR */
-                tmoveto(0, term.c.y);
-                return;
-        case '\f':   /* LF */
-        case '\v':   /* VT */
-        case '\n':   /* LF */
-                /* go to first col if the mode is set */
-                tnewline(IS_SET(MODE_CRLF));
-                return;
-        case '\a':   /* BEL */
-                if (term.esc & ESC_STR_END) {
-                        /* backwards compatibility to xterm */
-                        strhandle();
-                } else {
-                        xbell();
-                }
-                break;
-        case '\033': /* ESC */
-                csireset();
-                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
-                term.esc |= ESC_START;
-                return;
-        case '\016': /* SO (LS1 -- Locking shift 1) */
-        case '\017': /* SI (LS0 -- Locking shift 0) */
-                term.charset = 1 - (ascii - '\016');
-                return;
-        case '\032': /* SUB */
-                tsetchar('?', &term.c.attr, term.c.x, term.c.y);
-                /* FALLTHROUGH */
-        case '\030': /* CAN */
-                csireset();
-                break;
-        case '\005': /* ENQ (IGNORED) */
-        case '\000': /* NUL (IGNORED) */
-        case '\021': /* XON (IGNORED) */
-        case '\023': /* XOFF (IGNORED) */
-        case 0177:   /* DEL (IGNORED) */
-                return;
-        case 0x80:   /* TODO: PAD */
-        case 0x81:   /* TODO: HOP */
-        case 0x82:   /* TODO: BPH */
-        case 0x83:   /* TODO: NBH */
-        case 0x84:   /* TODO: IND */
-                break;
-        case 0x85:   /* NEL -- Next line */
-                tnewline(1); /* always go to first col */
-                break;
-        case 0x86:   /* TODO: SSA */
-        case 0x87:   /* TODO: ESA */
-                break;
-        case 0x88:   /* HTS -- Horizontal tab stop */
-                term.tabs[term.c.x] = 1;
-                break;
-        case 0x89:   /* TODO: HTJ */
-        case 0x8a:   /* TODO: VTS */
-        case 0x8b:   /* TODO: PLD */
-        case 0x8c:   /* TODO: PLU */
-        case 0x8d:   /* TODO: RI */
-        case 0x8e:   /* TODO: SS2 */
-        case 0x8f:   /* TODO: SS3 */
-        case 0x91:   /* TODO: PU1 */
-        case 0x92:   /* TODO: PU2 */
-        case 0x93:   /* TODO: STS */
-        case 0x94:   /* TODO: CCH */
-        case 0x95:   /* TODO: MW */
-        case 0x96:   /* TODO: SPA */
-        case 0x97:   /* TODO: EPA */
-        case 0x98:   /* TODO: SOS */
-        case 0x99:   /* TODO: SGCI */
-                break;
-        case 0x9a:   /* DECID -- Identify Terminal */
-                ttywrite(vtiden, strlen(vtiden), 0);
-                break;
-        case 0x9b:   /* TODO: CSI */
-        case 0x9c:   /* TODO: ST */
-                break;
-        case 0x90:   /* DCS -- Device Control String */
-        case 0x9d:   /* OSC -- Operating System Command */
-        case 0x9e:   /* PM -- Privacy Message */
-        case 0x9f:   /* APC -- Application Program Command */
-                tstrsequence(ascii);
-                return;
-        }
-        /* only CAN, SUB, \a and C1 chars interrupt a sequence */
-        term.esc &= ~(ESC_STR_END|ESC_STR);
-}
-
-/*
- * returns 1 when the sequence is finished and it hasn't to read
- * more characters for this sequence, otherwise 0
- */
-int
-eschandle(uchar ascii)
-{
-        switch (ascii) {
-        case '[':
-                term.esc |= ESC_CSI;
-                return 0;
-        case '#':
-                term.esc |= ESC_TEST;
-                return 0;
-        case '%':
-                term.esc |= ESC_UTF8;
-                return 0;
-        case 'P': /* DCS -- Device Control String */
-        case '_': /* APC -- Application Program Command */
-        case '^': /* PM -- Privacy Message */
-        case ']': /* OSC -- Operating System Command */
-        case 'k': /* old title set compatibility */
-                tstrsequence(ascii);
-                return 0;
-        case 'n': /* LS2 -- Locking shift 2 */
-        case 'o': /* LS3 -- Locking shift 3 */
-                term.charset = 2 + (ascii - 'n');
-                break;
-        case '(': /* GZD4 -- set primary charset G0 */
-        case ')': /* G1D4 -- set secondary charset G1 */
-        case '*': /* G2D4 -- set tertiary charset G2 */
-        case '+': /* G3D4 -- set quaternary charset G3 */
-                term.icharset = ascii - '(';
-                term.esc |= ESC_ALTCHARSET;
-                return 0;
-        case 'D': /* IND -- Linefeed */
-                if (term.c.y == term.bot) {
-                        tscrollup(term.top, term.bot, 1, SCROLL_SAVEHIST);
-                } else {
-                        tmoveto(term.c.x, term.c.y+1);
-                }
-                break;
-        case 'E': /* NEL -- Next line */
-                tnewline(1); /* always go to first col */
-                break;
-        case 'H': /* HTS -- Horizontal tab stop */
-                term.tabs[term.c.x] = 1;
-                break;
-        case 'M': /* RI -- Reverse index */
-                if (term.c.y == term.top) {
-                        tscrolldown(term.top, 1);
-                } else {
-                        tmoveto(term.c.x, term.c.y-1);
-                }
-                break;
-        case 'Z': /* DECID -- Identify Terminal */
-                ttywrite(vtiden, strlen(vtiden), 0);
-                break;
-        case 'c': /* RIS -- Reset to initial state */
-                treset();
-                resettitle();
-                xloadcols();
-                xsetmode(0, MODE_HIDE);
-                break;
-        case '=': /* DECPAM -- Application keypad */
-                xsetmode(1, MODE_APPKEYPAD);
-                break;
-        case '>': /* DECPNM -- Normal keypad */
-                xsetmode(0, MODE_APPKEYPAD);
-                break;
-        case '7': /* DECSC -- Save Cursor */
-                tcursor(CURSOR_SAVE);
-                break;
-        case '8': /* DECRC -- Restore Cursor */
-                tcursor(CURSOR_LOAD);
-                break;
-        case '\\': /* ST -- String Terminator */
-                if (term.esc & ESC_STR_END)
-                        strhandle();
-                break;
-        default:
-                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
-                        (uchar) ascii, isprint(ascii)? ascii:'.');
-                break;
-        }
-        return 1;
-}
-
-void
-tputc(Rune u)
-{
-        char c[UTF_SIZ];
-        int control;
-        int width, len;
-        Glyph *gp;
-
-        control = ISCONTROL(u);
-        if (u < 127 || !IS_SET(MODE_UTF8)) {
-                c[0] = u;
-                width = len = 1;
-        } else {
-                len = utf8encode(u, c);
-                if (!control && (width = wcwidth(u)) == -1)
-                        width = 1;
-        }
-
-        if (IS_SET(MODE_PRINT))
-                tprinter(c, len);
-
-        /*
-         * STR sequence must be checked before anything else
-         * because it uses all following characters until it
-         * receives a ESC, a SUB, a ST or any other C1 control
-         * character.
-         */
-        if (term.esc & ESC_STR) {
-                if (u == '\a' || u == 030 || u == 032 || u == 033 ||
-                    ISCONTROLC1(u)) {
-                        term.esc &= ~(ESC_START|ESC_STR);
-                        term.esc |= ESC_STR_END;
-                        goto check_control_code;
-                }
-
-                if (strescseq.len+len >= strescseq.siz) {
-                        /*
-                         * Here is a bug in terminals. If the user never sends
-                         * some code to stop the str or esc command, then st
-                         * will stop responding. But this is better than
-                         * silently failing with unknown characters. At least
-                         * then users will report back.
-                         *
-                         * In the case users ever get fixed, here is the code:
-                         */
-                        /*
-                         * term.esc = 0;
-                         * strhandle();
-                         */
-                        if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2)
-                                return;
-                        strescseq.siz *= 2;
-                        strescseq.buf = xrealloc(strescseq.buf, strescseq.siz);
-                }
-
-                memmove(&strescseq.buf[strescseq.len], c, len);
-                strescseq.len += len;
-                return;
-        }
-
-check_control_code:
-        /*
-         * Actions of control codes must be performed as soon they arrive
-         * because they can be embedded inside a control sequence, and
-         * they must not cause conflicts with sequences.
-         */
-        if (control) {
-                /* in UTF-8 mode ignore handling C1 control characters */
-                if (IS_SET(MODE_UTF8) && ISCONTROLC1(u))
-                        return;
-                tcontrolcode(u);
-                /*
-                 * control codes are not shown ever
-                 */
-                if (!term.esc)
-                        term.lastc = 0;
-                return;
-        } else if (term.esc & ESC_START) {
-                if (term.esc & ESC_CSI) {
-                        csiescseq.buf[csiescseq.len++] = u;
-                        if (BETWEEN(u, 0x40, 0x7E)
-                            || csiescseq.len >= \
-                            sizeof(csiescseq.buf)-1) {
-                                term.esc = 0;
-                                csiparse();
-                                csihandle();
-                        }
-                        return;
-                } else if (term.esc & ESC_UTF8) {
-                        tdefutf8(u);
-                } else if (term.esc & ESC_ALTCHARSET) {
-                        tdeftran(u);
-                } else if (term.esc & ESC_TEST) {
-                        tdectest(u);
-                } else {
-                        if (!eschandle(u))
-                                return;
-                        /* sequence already finished */
-                }
-                term.esc = 0;
-                /*
-                 * All characters which form part of a sequence are not
-                 * printed
-                 */
-                return;
-        }
-
-        /* selected() takes relative coordinates */
-        if (selected(term.c.x + term.scr, term.c.y + term.scr))
-                selclear();
-
-        gp = &term.line[term.c.y][term.c.x];
-        if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
-                gp->mode |= ATTR_WRAP;
-                tnewline(1);
-                gp = &term.line[term.c.y][term.c.x];
-        }
-
-        if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) {
-                memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
-                gp->mode &= ~ATTR_WIDE;
-        }
-
-        if (term.c.x+width > term.col) {
-                if (IS_SET(MODE_WRAP))
-                        tnewline(1);
-                else
-                        tmoveto(term.col - width, term.c.y);
-                gp = &term.line[term.c.y][term.c.x];
-        }
-
-        tsetchar(u, &term.c.attr, term.c.x, term.c.y);
-        term.lastc = u;
-
-        if (width == 2) {
-                gp->mode |= ATTR_WIDE;
-                if (term.c.x+1 < term.col) {
-                        if (gp[1].mode == ATTR_WIDE && term.c.x+2 < term.col) {
-                                gp[2].u = ' ';
-                                gp[2].mode &= ~ATTR_WDUMMY;
-                        }
-                        gp[1].u = '\0';
-                        gp[1].mode = ATTR_WDUMMY;
-                }
-        }
-        if (term.c.x+width < term.col) {
-                tmoveto(term.c.x+width, term.c.y);
-        } else {
-                term.wrapcwidth[IS_SET(MODE_ALTSCREEN)] = width;
-                term.c.state |= CURSOR_WRAPNEXT;
-        }
-}
-
-int
-twrite(const char *buf, int buflen, int show_ctrl)
-{
-        int charsize;
-        Rune u;
-        int n;
-
-        for (n = 0; n < buflen; n += charsize) {
-                if (IS_SET(MODE_UTF8)) {
-                        /* process a complete utf8 char */
-                        charsize = utf8decode(buf + n, &u, buflen - n);
-                        if (charsize == 0)
-                                break;
-                } else {
-                        u = buf[n] & 0xFF;
-                        charsize = 1;
-                }
-                if (show_ctrl && ISCONTROL(u)) {
-                        if (u & 0x80) {
-                                u &= 0x7f;
-                                tputc('^');
-                                tputc('[');
-                        } else if (u != '\n' && u != '\r' && u != '\t') {
-                                u ^= 0x40;
-                                tputc('^');
-                        }
-                }
-                tputc(u);
-        }
-        return n;
-}
-
-void
-rscrolldown(int n)
-{
-        int i;
-        Line temp;
-
-        /* can never be true as of now
-           if (IS_SET(MODE_ALTSCREEN))
-           return; */
-
-        if ((n = MIN(n, term.histf)) <= 0)
-                return;
-
-        for (i = term.c.y + n; i >= n; i--) {
-                temp = term.line[i];
-                term.line[i] = term.line[i-n];
-                term.line[i-n] = temp;
-        }
-        for (/*i = n - 1 */; i >= 0; i--) {
-                temp = term.line[i];
-                term.line[i] = term.hist[term.histi];
-                term.hist[term.histi] = temp;
-                term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
-        }
-        term.c.y += n;
-        term.histf -= n;
-        if ((i = term.scr - n) >= 0) {
-                term.scr = i;
-        } else {
-                term.scr = 0;
-                if (sel.ob.x != -1 && !sel.alt)
-                        selmove(-i);
-        }
-}
-
-
-
-void
-tresize(int col, int row)
-{
-        int *bp;
-
-        if ( row < term.row  || col < term.col )
-                toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
-
-        /* col and row are always MAX(_, 1)
-           if (col < 1 || row < 1) {
-           fprintf(stderr, "tresize: error resizing to %dx%d\n", col, row);
-           return;
-           } */
-
-        term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
-        term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
-        if (col > term.col) {
-                bp = term.tabs + term.col;
-                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
-                while (--bp > term.tabs && !*bp)
-                        /* nothing */ ;
-                for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
-                        *bp = 1;
-        }
-
-        if (IS_SET(MODE_ALTSCREEN))
-                tresizealt(col, row);
-        else
-                tresizedef(col, row);
-}
-
-
-void
-tresizedef(int col, int row)
-{
-        int i, j;
-
-        /* return if dimensions haven't changed */
-        if (term.col == col && term.row == row) {
-                tfulldirt();
-                return;
-        }
-        if (col != term.col) {
-                if (!sel.alt)
-                        selremove();
-                treflow(col, row);
-        } else {
-                /* slide screen up if otherwise cursor would get out of the screen */
-                if (term.c.y >= row) {
-                        tscrollup(0, term.row - 1, term.c.y - row + 1, SCROLL_RESIZE);
-                        term.c.y = row - 1;
-                }
-                for (i = row; i < term.row; i++)
-                        free(term.line[i]);
-
-                /* resize to new height */
-                term.line = xrealloc(term.line, row * sizeof(Line));
-                /* allocate any new rows */
-                for (i = term.row; i < row; i++) {
-                        term.line[i] = xmalloc(col * sizeof(Glyph));
-                        for (j = 0; j < col; j++)
-                                tclearglyph(&term.line[i][j], 0);
-                }
-                /* scroll down as much as height has increased */
-                rscrolldown(row - term.row);
-        }
-        /* update terminal size */
-        term.col = col, term.row = row;
-        /* reset scrolling region */
-        term.top = 0, term.bot = row - 1;
-        /* dirty all lines */
-        tfulldirt();
-}
-
-
-
-void
-tresizealt(int col, int row)
-{
-        int i, j;
-
-        /* return if dimensions haven't changed */
-        if (term.col == col && term.row == row) {
-                tfulldirt();
-                return;
-        }
-        if (sel.alt)
-                selremove();
-        /* slide screen up if otherwise cursor would get out of the screen */
-        for (i = 0; i <= term.c.y - row; i++)
-                free(term.line[i]);
-        if (i > 0) {
-                /* ensure that both src and dst are not NULL */
-                memmove(term.line, term.line + i, row * sizeof(Line));
-                term.c.y = row - 1;
-        }
-        for (i += row; i < term.row; i++)
-                free(term.line[i]);
-        /* resize to new height */
-        term.line = xrealloc(term.line, row * sizeof(Line));
-        /* resize to new width */
-        for (i = 0; i < MIN(row, term.row); i++) {
-                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
-                for (j = term.col; j < col; j++)
-                        tclearglyph(&term.line[i][j], 0);
-        }
-        /* allocate any new rows */
-        for (/*i = MIN(row, term.row) */; i < row; i++) {
-                term.line[i] = xmalloc(col * sizeof(Glyph));
-                for (j = 0; j < col; j++)
-                        tclearglyph(&term.line[i][j], 0);
-        }
-        /* update cursor */
-        if (term.c.x >= col) {
-                term.c.state &= ~CURSOR_WRAPNEXT;
-                term.c.x = col - 1;
-        } else {
-                UPDATEWRAPNEXT(1, col);
-        }
-        /* update terminal size */
-        term.col = col, term.row = row;
-        /* reset scrolling region */
-        term.top = 0, term.bot = row - 1;
-        /* dirty all lines */
-        tfulldirt();
-}
-
-
-
-
-
-void
-treflow(int col, int row)
-{
-        int i, j;
-        int oce, nce, bot, scr;
-        int ox = 0, oy = -term.histf, nx = 0, ny = -1, len;
-        int cy = -1; /* proxy for new y coordinate of cursor */
-        int nlines;
-        Line *buf, line;
-
-        /* y coordinate of cursor line end */
-        for (oce = term.c.y; oce < term.row - 1 &&
-                 tiswrapped(term.line[oce]); oce++);
-
-        nlines = term.histf + oce + 1;
-        if (col < term.col) {
-                /* each line can take this many lines after reflow */
-                j = (term.col + col - 1) / col;
-                nlines = j * nlines;
-                if (nlines > HISTSIZE + RESIZEBUFFER + row) {
-                        nlines = HISTSIZE + RESIZEBUFFER + row;
-                        oy = -(nlines / j - oce - 1);
-                }
-        }
-        buf = xmalloc(nlines * sizeof(Line));
-        do {
-                if (!nx)
-                        buf[++ny] = xmalloc(col * sizeof(Glyph));
-                if (!ox) {
-                        line = TLINEABS(oy);
-                        len = tlinelen(line);
-                }
-                if (oy == term.c.y) {
-                        if (!ox)
-                                len = MAX(len, term.c.x + 1);
-                        /* update cursor */
-                        if (cy < 0 && term.c.x - ox < col - nx) {
-                                term.c.x = nx + term.c.x - ox, cy = ny;
-                                UPDATEWRAPNEXT(0, col);
-                        }
-                }
-                /* get reflowed lines in buf */
-                if (col - nx > len - ox) {
-                        memcpy(&buf[ny][nx], &line[ox], (len-ox) * sizeof(Glyph));
-                        nx += len - ox;
-                        if (len == 0 || !(line[len - 1].mode & ATTR_WRAP)) {
-                                for (j = nx; j < col; j++)
-                                        tclearglyph(&buf[ny][j], 0);
-                                nx = 0;
-                        } else if (nx > 0) {
-                                buf[ny][nx - 1].mode &= ~ATTR_WRAP;
-                        }
-                        ox = 0, oy++;
-                } else if (col - nx == len - ox) {
-                        memcpy(&buf[ny][nx], &line[ox], (col-nx) * sizeof(Glyph));
-                        ox = 0, oy++, nx = 0;
-                } else/* if (col - nx < len - ox) */ {
-                        memcpy(&buf[ny][nx], &line[ox], (col-nx) * sizeof(Glyph));
-                        ox += col - nx;
-                        buf[ny][col - 1].mode |= ATTR_WRAP;
-                        nx = 0;
-                }
-        } while (oy <= oce);
-        if (nx)
-                for (j = nx; j < col; j++)
-                        tclearglyph(&buf[ny][j], 0);
-
-        /* free extra lines */
-        for (i = row; i < term.row; i++)
-                free(term.line[i]);
-        /* resize to new height */
-        term.line = xrealloc(term.line, row * sizeof(Line));
-
-        bot = MIN(ny, row - 1);
-        scr = MAX(row - term.row, 0);
-        /* update y coordinate of cursor line end */
-        nce = MIN(oce + scr, bot);
-        /* update cursor y coordinate */
-        term.c.y = nce - (ny - cy);
-        if (term.c.y < 0) {
-                j = nce, nce = MIN(nce + -term.c.y, bot);
-                term.c.y += nce - j;
-                while (term.c.y < 0) {
-                        free(buf[ny--]);
-                        term.c.y++;
-                }
-        }
-        /* allocate new rows */
-        for (i = row - 1; i > nce; i--) {
-                term.line[i] = xmalloc(col * sizeof(Glyph));
-                for (j = 0; j < col; j++)
-                        tclearglyph(&term.line[i][j], 0);
-        }
-        /* fill visible area */
-        for (/*i = nce */; i >= term.row; i--, ny--)
-                term.line[i] = buf[ny];
-        for (/*i = term.row - 1 */; i >= 0; i--, ny--) {
-                free(term.line[i]);
-                term.line[i] = buf[ny];
-        }
-        /* fill lines in history buffer and update term.histf */
-        for (/*i = -1 */; ny >= 0 && i >= -HISTSIZE; i--, ny--) {
-                j = (term.histi + i + 1 + HISTSIZE) % HISTSIZE;
-                free(term.hist[j]);
-                term.hist[j] = buf[ny];
-        }
-        term.histf = -i - 1;
-        term.scr = MIN(term.scr, term.histf);
-        /* resize rest of the history lines */
-        for (/*i = -term.histf - 1 */; i >= -HISTSIZE; i--) {
-                j = (term.histi + i + 1 + HISTSIZE) % HISTSIZE;
-                term.hist[j] = xrealloc(term.hist[j], col * sizeof(Glyph));
-        }
-        free(buf);
-}
-
-void
-resettitle(void)
-{
-        xsettitle(NULL);
-}
-
-void
-drawregion(int x1, int y1, int x2, int y2)
-{
-        int y;
-
-        for (y = y1; y < y2; y++) {
-                if (!term.dirty[y])
-                        continue;
-
-                term.dirty[y] = 0;
-                xdrawline(TLINE(y), x1, y, x2);
-        }
-}
-
-void
-draw(void)
-{
-        int cx = term.c.x, ocx = term.ocx, ocy = term.ocy;
-
-        if (!xstartdraw())
-                return;
-
-        /* adjust cursor position */
-        LIMIT(term.ocx, 0, term.col-1);
-        LIMIT(term.ocy, 0, term.row-1);
-        if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
-                term.ocx--;
-        if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
-                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]);
-        term.ocx = cx;
-        term.ocy = term.c.y;
-        xfinishdraw();
-        if (ocx != term.ocx || ocy != term.ocy)
-                xximspot(term.ocx, term.ocy);
-}
-
-void
-redraw(void)
-{
-        tfulldirt();
-        draw();
-}
-
-void set_notifmode(int type, KeySym ksym) {
-        static char *lib[] = { " MOVE ", " SEL  "};
-        static Glyph *g, *deb, *fin;
-        static int col, bot;
-
-        if ( ksym == -1 ) {
-                free(g);
-                col = term.col, bot = term.bot;
-                g = xmalloc(col * sizeof(Glyph));
-                memcpy(g, term.line[bot], col * sizeof(Glyph));
-
-        }
-        else if ( ksym == -2 )
-                memcpy(term.line[bot], g, col * sizeof(Glyph));
-
-        if ( type < 2 ) {
-                char *z = lib[type];
-                for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
-                        deb->mode = ATTR_REVERSE,
-                            deb->u = *z,
-                            deb->fg = defaultfg, deb->bg = defaultbg;
-        }
-        else if ( type < 5 )
-                memcpy(term.line[bot], g, col * sizeof(Glyph));
-        else {
-                for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
-                        deb->mode = ATTR_REVERSE,
-                            deb->u = ' ',
-                            deb->fg = defaultfg, deb->bg = defaultbg;
-                term.line[bot][0].u = ksym;
-        }
-
-        term.dirty[bot] = 1;
-        drawregion(0, bot, col, bot + 1);
-}
-
-void select_or_drawcursor(int selectsearch_mode, int type) {
-        int done = 0;
-
-        if ( selectsearch_mode & 1 ) {
-                selextend(term.c.x, term.c.y, type, done);
-                xsetsel(getsel());
-        }
-        else
-                xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
-                            term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-}
-
-void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
-        Rune *r;
-        int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
-
-        for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
-                for (r = target; r - target < ptarget; r++) {
-                        if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
-                                if ( r - target == ptarget - 1 )     break;
-                        } else {
-                                r = NULL;
-                                break;
-                        }
-                }
-                if ( r != NULL )    break;
-        }
-
-        if ( i != bound ) {
-                term.c.y = i / term.col, term.c.x = i % term.col;
-                select_or_drawcursor(selectsearch_mode, type);
-        }
-}
-
-int trt_kbdselect(KeySym ksym, char *buf, int len) {
-        static TCursor cu;
-        static Rune target[64];
-        static int type = 1, ptarget, in_use;
-        static int sens, quant;
-        static char selectsearch_mode;
-        int i, bound, *xy;
-
-
-        if ( selectsearch_mode & 2 ) {
-                if ( ksym == XK_Return ) {
-                        selectsearch_mode ^= 2;
-                        set_notifmode(selectsearch_mode, -2);
-                        if ( ksym == XK_Escape )    ptarget = 0;
-                        return 0;
-                }
-                else if ( ksym == XK_BackSpace ) {
-                        if ( !ptarget )     return 0;
-                        term.line[term.bot][ptarget--].u = ' ';
-                }
-                else if ( len < 1 ) {
-                        return 0;
-                }
-                else if ( ptarget == term.col  || ksym == XK_Escape ) {
-                        return 0;
-                }
-                else {
-                        utf8decode(buf, &target[ptarget++], len);
-                        term.line[term.bot][ptarget].u = target[ptarget - 1];
-                }
-
-                if ( ksym != XK_BackSpace )
-                        search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
-
-                term.dirty[term.bot] = 1;
-                drawregion(0, term.bot, term.col, term.bot + 1);
-                return 0;
-        }
-
-        switch ( ksym ) {
-        case -1 :
-                in_use = 1;
-                cu.x = term.c.x, cu.y = term.c.y;
-                set_notifmode(0, ksym);
-                return MODE_KBDSELECT;
-        case XK_s :
-                if ( selectsearch_mode & 1 )
-                        selclear();
-                else
-                        selstart(term.c.x, term.c.y, 0);
-                set_notifmode(selectsearch_mode ^= 1, ksym);
-                break;
-        case XK_t :
-                selextend(term.c.x, term.c.y, type ^= 3, i = 0);  /* 2 fois */
-                selextend(term.c.x, term.c.y, type, i = 0);
-                break;
-        case XK_slash :
-        case XK_KP_Divide :
-        case XK_question :
-                ksym &= XK_question;                /* Divide to slash */
-                sens = (ksym == XK_slash) ? -1 : 1;
-                ptarget = 0;
-                set_notifmode(15, ksym);
-                selectsearch_mode ^= 2;
-                break;
-        case XK_Escape :
-                if ( !in_use )  break;
-                selclear();
-        case XK_Return :
-                set_notifmode(4, ksym);
-                term.c.x = cu.x, term.c.y = cu.y;
-                select_or_drawcursor(selectsearch_mode = 0, type);
-                in_use = quant = 0;
-                return MODE_KBDSELECT;
-        case XK_n :
-        case XK_N :
-                if ( ptarget )
-                        search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
-                break;
-        case XK_BackSpace :
-                term.c.x = 0;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_dollar :
-                term.c.x = term.col - 1;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_Home :
-                term.c.x = 0, term.c.y = 0;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_End :
-                term.c.x = cu.x, term.c.y = cu.y;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_Page_Up :
-        case XK_Page_Down :
-                term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_exclam :
-                term.c.x = term.col >> 1;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        case XK_asterisk :
-        case XK_KP_Multiply :
-                term.c.x = term.col >> 1;
-        case XK_underscore :
-                term.c.y = cu.y >> 1;
-                select_or_drawcursor(selectsearch_mode, type);
-                break;
-        default :
-                if ( ksym >= XK_0 && ksym <= XK_9 ) {               /* 0-9 keyboard */
-                        quant = (quant * 10) + (ksym ^ XK_0);
-                        return 0;
-                }
-                else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) {    /* 0-9 numpad */
-                        quant = (quant * 10) + (ksym ^ XK_KP_0);
-                        return 0;
-                }
-                else if ( ksym == XK_k || ksym == XK_h )
-                        i = ksym & 1;
-                else if ( ksym == XK_l || ksym == XK_j )
-                        i = ((ksym & 6) | 4) >> 1;
-                else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
-                        break;
-
-                xy = (i & 1) ? &term.c.y : &term.c.x;
-                sens = (i & 2) ? 1 : -1;
-                bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
-
-                if ( quant == 0 )
-                        quant++;
-
-                if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
-                        break;
-
-                *xy += quant * sens;
-                if ( *xy < 0 || ( bound > 0 && *xy > bound) )
-                        *xy = bound;
-
-                select_or_drawcursor(selectsearch_mode, type);
-        }
-        quant = 0;
-        return 0;
-}
diff --git a/src/st/st-0.9.3/st.h b/src/st/st-0.9.3/st.h
deleted file mode 100644
index 3b2b3e1..0000000
--- a/src/st/st-0.9.3/st.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* See LICENSE for license details. */
-
-#include <stdint.h>
-#include <sys/types.h>
-
-/* macros */
-#define MIN(a, b)		((a) < (b) ? (a) : (b))
-#define MAX(a, b)		((a) < (b) ? (b) : (a))
-#define LEN(a)			(sizeof(a) / sizeof(a)[0])
-#define BETWEEN(x, a, b)	((a) <= (x) && (x) <= (b))
-#define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
-#define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
-#define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
-				(a).bg != (b).bg)
-#define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
-				(t1.tv_nsec-t2.tv_nsec)/1E6)
-#define MODBIT(x, set, bit)	((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-
-#define TRUECOLOR(r,g,b)	(1 << 24 | (r) << 16 | (g) << 8 | (b))
-#define IS_TRUECOL(x)		(1 << 24 & (x))
-
-enum glyph_attribute {
-	ATTR_NULL       = 0,
-	ATTR_SET        = 1 << 0,
-	ATTR_BOLD       = 1 << 1,
-	ATTR_FAINT      = 1 << 2,
-	ATTR_ITALIC     = 1 << 3,
-	ATTR_UNDERLINE  = 1 << 4,
-	ATTR_BLINK      = 1 << 5,
-	ATTR_REVERSE    = 1 << 6,
-	ATTR_INVISIBLE  = 1 << 7,
-	ATTR_STRUCK     = 1 << 8,
-	ATTR_WRAP       = 1 << 9,
-	ATTR_WIDE       = 1 << 10,
-	ATTR_WDUMMY     = 1 << 11,
-	ATTR_SELECTED   = 1 << 12,
-	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-	ATTR_DIRTYUNDERLINE = 1 << 15,
-};
-
-enum selection_mode {
-	SEL_IDLE = 0,
-	SEL_EMPTY = 1,
-	SEL_READY = 2
-};
-
-enum selection_type {
-	SEL_REGULAR = 1,
-	SEL_RECTANGULAR = 2
-};
-
-enum selection_snap {
-	SNAP_WORD = 1,
-	SNAP_LINE = 2
-};
-
-typedef unsigned char uchar;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-typedef unsigned short ushort;
-
-typedef uint_least32_t Rune;
-
-#define Glyph Glyph_
-typedef struct {
-	Rune u;           /* character code */
-	ushort mode;      /* attribute flags */
-	uint32_t fg;      /* foreground  */
-	uint32_t bg;      /* background  */
-	int ustyle;	  /* underline style */
-	int ucolor[3];    /* underline color */
-} Glyph;
-
-typedef Glyph *Line;
-
-typedef union {
-	int i;
-	uint ui;
-	float f;
-	const void *v;
-	const char *s;
-} Arg;
-
-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 *);
-void toggleprinter(const Arg *);
-
-int tattrset(int);
-int tisaltscr(void);
-void tnew(int, int);
-int tisaltscreen(void);
-void tresize(int, int);
-void tsetdirtattr(int);
-void ttyhangup(void);
-int ttynew(const char *, char *, const char *, char **);
-size_t ttyread(void);
-void ttyresize(int, int);
-void ttywrite(const char *, size_t, int);
-
-void resettitle(void);
-
-void selclear(void);
-void selinit(void);
-void selstart(int, int, int);
-void selextend(int, int, int, int);
-int selected(int, int);
-char *getsel(void);
-
-size_t utf8encode(Rune, char *);
-
-void *xmalloc(size_t);
-void *xrealloc(void *, size_t);
-char *xstrdup(const char *);
-int  trt_kbdselect(KeySym, char *, int);
-
-/* config.h globals */
-extern char *utmp;
-extern char *scroll;
-extern char *stty_args;
-extern char *vtiden;
-extern wchar_t *worddelimiters;
-extern int allowaltscreen;
-extern int allowwindowops;
-extern char *termname;
-extern unsigned int tabspaces;
-extern unsigned int defaultfg;
-extern unsigned int defaultbg;
-extern unsigned int defaultcs;
diff --git a/src/st/st-0.9.3/st.info b/src/st/st-0.9.3/st.info
deleted file mode 100644
index 23b1875..0000000
--- a/src/st/st-0.9.3/st.info
+++ /dev/null
@@ -1,244 +0,0 @@
-st-mono| simpleterm monocolor,
-	Su,
-	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	am,
-	bce,
-	bel=^G,
-	blink=\E[5m,
-	bold=\E[1m,
-	cbt=\E[Z,
-	cvvis=\E[?25h,
-	civis=\E[?25l,
-	clear=\E[H\E[2J,
-	cnorm=\E[?12l\E[?25h,
-	colors#2,
-	cols#80,
-	cr=^M,
-	csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD,
-	cub1=^H,
-	cud1=^J,
-	cud=\E[%p1%dB,
-	cuf1=\E[C,
-	cuf=\E[%p1%dC,
-	cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A,
-	cuu=\E[%p1%dA,
-	dch=\E[%p1%dP,
-	dch1=\E[P,
-	dim=\E[2m,
-	dl=\E[%p1%dM,
-	dl1=\E[M,
-	ech=\E[%p1%dX,
-	ed=\E[J,
-	el=\E[K,
-	el1=\E[1K,
-	enacs=\E)0,
-	flash=\E[?5h$<80/>\E[?5l,
-	fsl=^G,
-	home=\E[H,
-	hpa=\E[%i%p1%dG,
-	hs,
-	ht=^I,
-	hts=\EH,
-	ich=\E[%p1%d@,
-	il1=\E[L,
-	il=\E[%p1%dL,
-	ind=^J,
-	indn=\E[%p1%dS,
-	invis=\E[8m,
-	is2=\E[4l\E>\E[?1034l,
-	it#8,
-	kel=\E[1;2F,
-	ked=\E[1;5F,
-	ka1=\E[1~,
-	ka3=\E[5~,
-	kc1=\E[4~,
-	kc3=\E[6~,
-	kbs=\177,
-	kcbt=\E[Z,
-	kb2=\EOu,
-	kcub1=\EOD,
-	kcud1=\EOB,
-	kcuf1=\EOC,
-	kcuu1=\EOA,
-	kDC=\E[3;2~,
-	kent=\EOM,
-	kEND=\E[1;2F,
-	kIC=\E[2;2~,
-	kNXT=\E[6;2~,
-	kPRV=\E[5;2~,
-	kHOM=\E[1;2H,
-	kLFT=\E[1;2D,
-	kRIT=\E[1;2C,
-	kind=\E[1;2B,
-	kri=\E[1;2A,
-	kclr=\E[3;5~,
-	kdl1=\E[3;2~,
-	kdch1=\E[3~,
-	kich1=\E[2~,
-	kend=\E[4~,
-	kf1=\EOP,
-	kf2=\EOQ,
-	kf3=\EOR,
-	kf4=\EOS,
-	kf5=\E[15~,
-	kf6=\E[17~,
-	kf7=\E[18~,
-	kf8=\E[19~,
-	kf9=\E[20~,
-	kf10=\E[21~,
-	kf11=\E[23~,
-	kf12=\E[24~,
-	kf13=\E[1;2P,
-	kf14=\E[1;2Q,
-	kf15=\E[1;2R,
-	kf16=\E[1;2S,
-	kf17=\E[15;2~,
-	kf18=\E[17;2~,
-	kf19=\E[18;2~,
-	kf20=\E[19;2~,
-	kf21=\E[20;2~,
-	kf22=\E[21;2~,
-	kf23=\E[23;2~,
-	kf24=\E[24;2~,
-	kf25=\E[1;5P,
-	kf26=\E[1;5Q,
-	kf27=\E[1;5R,
-	kf28=\E[1;5S,
-	kf29=\E[15;5~,
-	kf30=\E[17;5~,
-	kf31=\E[18;5~,
-	kf32=\E[19;5~,
-	kf33=\E[20;5~,
-	kf34=\E[21;5~,
-	kf35=\E[23;5~,
-	kf36=\E[24;5~,
-	kf37=\E[1;6P,
-	kf38=\E[1;6Q,
-	kf39=\E[1;6R,
-	kf40=\E[1;6S,
-	kf41=\E[15;6~,
-	kf42=\E[17;6~,
-	kf43=\E[18;6~,
-	kf44=\E[19;6~,
-	kf45=\E[20;6~,
-	kf46=\E[21;6~,
-	kf47=\E[23;6~,
-	kf48=\E[24;6~,
-	kf49=\E[1;3P,
-	kf50=\E[1;3Q,
-	kf51=\E[1;3R,
-	kf52=\E[1;3S,
-	kf53=\E[15;3~,
-	kf54=\E[17;3~,
-	kf55=\E[18;3~,
-	kf56=\E[19;3~,
-	kf57=\E[20;3~,
-	kf58=\E[21;3~,
-	kf59=\E[23;3~,
-	kf60=\E[24;3~,
-	kf61=\E[1;4P,
-	kf62=\E[1;4Q,
-	kf63=\E[1;4R,
-	khome=\E[1~,
-	kil1=\E[2;5~,
-	krmir=\E[2;2~,
-	knp=\E[6~,
-	kmous=\E[M,
-	kpp=\E[5~,
-	lines#24,
-	mir,
-	msgr,
-	npc,
-	op=\E[39;49m,
-	pairs#64,
-	mc0=\E[i,
-	mc4=\E[4i,
-	mc5=\E[5i,
-	rc=\E8,
-	rev=\E[7m,
-	ri=\EM,
-	rin=\E[%p1%dT,
-	ritm=\E[23m,
-	rmacs=\E(B,
-	rmcup=\E[?1049l,
-	rmir=\E[4l,
-	rmkx=\E[?1l\E>,
-	rmso=\E[27m,
-	rmul=\E[24m,
-	rs1=\Ec,
-	rs2=\E[4l\E>\E[?1034l,
-	sc=\E7,
-	sitm=\E[3m,
-	sgr0=\E[0m,
-	smacs=\E(0,
-	smcup=\E[?1049h,
-	smir=\E[4h,
-	smkx=\E[?1h\E=,
-	smso=\E[7m,
-	smul=\E[4m,
-	tbc=\E[3g,
-	tsl=\E]0;,
-	xenl,
-	vpa=\E[%i%p1%dd,
-# XTerm extensions
-	rmxx=\E[29m,
-	smxx=\E[9m,
-	BE=\E[?2004h,
-	BD=\E[?2004l,
-	PS=\E[200~,
-	PE=\E[201~,
-# disabled rep for now: causes some issues with older ncurses versions.
-#	rep=%p1%c\E[%p2%{1}%-%db,
-# tmux extensions, see TERMINFO EXTENSIONS in tmux(1)
-	Tc,
-	Ms=\E]52;%p1%s;%p2%s\007,
-	Se=\E[2 q,
-	Ss=\E[%p1%d q,
-
-st| simpleterm,
-	use=st-mono,
-	colors#8,
-	setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-
-st-256color| simpleterm with 256 colors,
-	use=st,
-	ccc,
-	colors#256,
-	oc=\E]104\007,
-	pairs#32767,
-#	Nicked from xterm-256color
-	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
-	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
-
-st-meta| simpleterm with meta key,
-	use=st,
-	km,
-	rmm=\E[?1034l,
-	smm=\E[?1034h,
-	rs2=\E[4l\E>\E[?1034h,
-	is2=\E[4l\E>\E[?1034h,
-
-st-meta-256color| simpleterm with meta key and 256 colors,
-	use=st-256color,
-	km,
-	rmm=\E[?1034l,
-	smm=\E[?1034h,
-	rs2=\E[4l\E>\E[?1034h,
-	is2=\E[4l\E>\E[?1034h,
-
-st-bs| simpleterm with backspace as backspace,
-	use=st,
-	kbs=\010,
-	kdch1=\177,
-
-st-bs-256color| simpleterm with backspace as backspace and 256colors,
-	use=st-256color,
-	kbs=\010,
-	kdch1=\177,
diff --git a/src/st/st-0.9.3/win.h b/src/st/st-0.9.3/win.h
deleted file mode 100644
index 4d25380..0000000
--- a/src/st/st-0.9.3/win.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* See LICENSE for license details. */
-
-enum win_mode {
-	MODE_VISIBLE     = 1 << 0,
-	MODE_FOCUSED     = 1 << 1,
-	MODE_APPKEYPAD   = 1 << 2,
-	MODE_MOUSEBTN    = 1 << 3,
-	MODE_MOUSEMOTION = 1 << 4,
-	MODE_REVERSE     = 1 << 5,
-	MODE_KBDLOCK     = 1 << 6,
-	MODE_HIDE        = 1 << 7,
-	MODE_APPCURSOR   = 1 << 8,
-	MODE_MOUSESGR    = 1 << 9,
-	MODE_8BIT        = 1 << 10,
-	MODE_BLINK       = 1 << 11,
-	MODE_FBLINK      = 1 << 12,
-	MODE_FOCUS       = 1 << 13,
-	MODE_MOUSEX10    = 1 << 14,
-	MODE_MOUSEMANY   = 1 << 15,
-	MODE_BRCKTPASTE  = 1 << 16,
-	MODE_NUMLOCK     = 1 << 17,
-	MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
-	                  |MODE_MOUSEMANY,
-	MODE_KBDSELECT   = 1 << 18,
-};
-
-void xbell(void);
-void xclipcopy(void);
-void xdrawcursor(int, int, Glyph, int, int, Glyph);
-void xdrawline(Line, int, int, int);
-void xfinishdraw(void);
-void xloadcols(void);
-int xsetcolorname(int, const char *);
-int xgetcolor(int, unsigned char *, unsigned char *, unsigned char *);
-void xseticontitle(char *);
-void xsettitle(char *);
-int xsetcursor(int);
-void xsetmode(int, unsigned int);
-void xsetpointermotion(int);
-void xsetsel(char *);
-int xstartdraw(void);
-void toggle_winmode(int);
-void keyboard_select(const Arg *);
-void xximspot(int, int);
diff --git a/src/st/st-0.9.3/x.c b/src/st/st-0.9.3/x.c
deleted file mode 100644
index ee85e4a..0000000
--- a/src/st/st-0.9.3/x.c
+++ /dev/null
@@ -1,2532 +0,0 @@
-/* See LICENSE for license details. */
-#include <errno.h>
-#include <math.h>
-#include <limits.h>
-#include <locale.h>
-#include <signal.h>
-#include <sys/select.h>
-#include <time.h>
-#include <unistd.h>
-#include <libgen.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xft/Xft.h>
-#include <X11/XKBlib.h>
-
-char *argv0;
-#include "arg.h"
-#include "st.h"
-#include "win.h"
-
-/* types used in config.h */
-typedef struct {
-	uint mod;
-	KeySym keysym;
-	void (*func)(const Arg *);
-	const Arg arg;
-} Shortcut;
-
-typedef struct {
-	uint mod;
-	uint button;
-	void (*func)(const Arg *);
-	const Arg arg;
-	uint  release;
-	int  altscrn;  /* 0: don't care, -1: not alt screen, 1: alt screen */
-} MouseShortcut;
-
-typedef struct {
-	KeySym k;
-	uint mask;
-	char *s;
-	/* three-valued logic variables: 0 indifferent, 1 on, -1 off */
-	signed char appkey;    /* application keypad */
-	signed char appcursor; /* application cursor */
-} Key;
-
-/* Undercurl slope types */
-enum undercurl_slope_type {
-	UNDERCURL_SLOPE_ASCENDING = 0,
-	UNDERCURL_SLOPE_TOP_CAP = 1,
-	UNDERCURL_SLOPE_DESCENDING = 2,
-	UNDERCURL_SLOPE_BOTTOM_CAP = 3
-};
-
-/* X modifiers */
-#define XK_ANY_MOD    UINT_MAX
-#define XK_NO_MOD     0
-#define XK_SWITCH_MOD (1<<13|1<<14)
-
-/* function definitions used in config.h */
-static void clipcopy(const Arg *);
-static void clippaste(const Arg *);
-static void numlock(const Arg *);
-static void selpaste(const Arg *);
-static void zoom(const Arg *);
-static void zoomabs(const Arg *);
-static void zoomreset(const Arg *);
-static void ttysend(const Arg *);
-
-/* config.h for applying patches and the configuration. */
-#include "config.h"
-
-/* XEMBED messages */
-#define XEMBED_FOCUS_IN  4
-#define XEMBED_FOCUS_OUT 5
-
-/* macros */
-#define IS_SET(flag)		((win.mode & (flag)) != 0)
-#define TRUERED(x)		(((x) & 0xff0000) >> 8)
-#define TRUEGREEN(x)		(((x) & 0xff00))
-#define TRUEBLUE(x)		(((x) & 0xff) << 8)
-
-typedef XftDraw *Draw;
-typedef XftColor Color;
-typedef XftGlyphFontSpec GlyphFontSpec;
-
-/* Purely graphic info */
-typedef struct {
-	int tw, th; /* tty width and height */
-	int w, h; /* window width and height */
-	int hborderpx, vborderpx;
-	int ch; /* char height */
-	int cw; /* char width  */
-	int mode; /* window state/mode flags */
-	int cursor; /* cursor style */
-} TermWindow;
-
-typedef struct {
-	Display *dpy;
-	Colormap cmap;
-	Window win;
-	Drawable buf;
-	GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-	Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmpid;
-	struct {
-		XIM xim;
-		XIC xic;
-		XPoint spot;
-		XVaNestedList spotlist;
-	} ime;
-	Draw draw;
-	Visual *vis;
-	XSetWindowAttributes attrs;
-	int scr;
-	int isfixed; /* is fixed geometry? */
-	int l, t; /* left and top offset */
-	int gm; /* geometry mask */
-} XWindow;
-
-typedef struct {
-	Atom xtarget;
-	char *primary, *clipboard;
-	struct timespec tclick1;
-	struct timespec tclick2;
-} XSelection;
-
-/* Font structure */
-#define Font Font_
-typedef struct {
-	int height;
-	int width;
-	int ascent;
-	int descent;
-	int badslant;
-	int badweight;
-	short lbearing;
-	short rbearing;
-	XftFont *match;
-	FcFontSet *set;
-	FcPattern *pattern;
-} Font;
-
-/* Drawing Context */
-typedef struct {
-	Color *col;
-	size_t collen;
-	Font font, bfont, ifont, ibfont;
-	GC gc;
-} DC;
-
-static inline ushort sixd_to_16bit(int);
-static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
-static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
-static void xdrawglyph(Glyph, int, int);
-static void xclear(int, int, int, int);
-static int xgeommasktogravity(int);
-static int ximopen(Display *);
-static void ximinstantiate(Display *, XPointer, XPointer);
-static void ximdestroy(XIM, XPointer, XPointer);
-static int xicdestroy(XIC, XPointer, XPointer);
-static void xinit(int, int);
-static void cresize(int, int);
-static void xresize(int, int);
-static void xhints(void);
-static int xloadcolor(int, const char *, Color *);
-static int xloadfont(Font *, FcPattern *);
-static void xloadfonts(const char *, double);
-static void xunloadfont(Font *);
-static void xunloadfonts(void);
-static void xsetenv(void);
-static void xseturgency(int);
-static int evcol(XEvent *);
-static int evrow(XEvent *);
-
-static void expose(XEvent *);
-static void visibility(XEvent *);
-static void unmap(XEvent *);
-static void kpress(XEvent *);
-static void cmessage(XEvent *);
-static void resize(XEvent *);
-static void focus(XEvent *);
-static uint buttonmask(uint);
-static int mouseaction(XEvent *, uint);
-static void brelease(XEvent *);
-static void bpress(XEvent *);
-static void bmotion(XEvent *);
-static void propnotify(XEvent *);
-static void selnotify(XEvent *);
-static void selclear_(XEvent *);
-static void selrequest(XEvent *);
-static void setsel(char *, Time);
-static void mousesel(XEvent *, int);
-static void mousereport(XEvent *);
-static char *kmap(KeySym, uint);
-static int match(uint, uint);
-
-static void run(void);
-static void usage(void);
-
-static void (*handler[LASTEvent])(XEvent *) = {
-	[KeyPress] = kpress,
-	[ClientMessage] = cmessage,
-	[ConfigureNotify] = resize,
-	[VisibilityNotify] = visibility,
-	[UnmapNotify] = unmap,
-	[Expose] = expose,
-	[FocusIn] = focus,
-	[FocusOut] = focus,
-	[MotionNotify] = bmotion,
-	[ButtonPress] = bpress,
-	[ButtonRelease] = brelease,
-/*
- * Uncomment if you want the selection to disappear when you select something
- * different in another window.
- */
-/*	[SelectionClear] = selclear_, */
-	[SelectionNotify] = selnotify,
-/*
- * PropertyNotify is only turned on when there is some INCR transfer happening
- * for the selection retrieval.
- */
-	[PropertyNotify] = propnotify,
-	[SelectionRequest] = selrequest,
-};
-
-/* Globals */
-static DC dc;
-static XWindow xw;
-static XSelection xsel;
-static TermWindow win;
-
-/* Font Ring Cache */
-enum {
-	FRC_NORMAL,
-	FRC_ITALIC,
-	FRC_BOLD,
-	FRC_ITALICBOLD
-};
-
-typedef struct {
-	XftFont *font;
-	int flags;
-	Rune unicodep;
-} Fontcache;
-
-/* Fontcache is an array now. A new font will be appended to the array. */
-static Fontcache *frc = NULL;
-static int frclen = 0;
-static int frccap = 0;
-static char *usedfont = NULL;
-static double usedfontsize = 0;
-static double defaultfontsize = 0;
-
-static char *opt_class = NULL;
-static char **opt_cmd  = NULL;
-static char *opt_embed = NULL;
-static char *opt_font  = NULL;
-static char *opt_io    = NULL;
-static char *opt_line  = NULL;
-static char *opt_name  = NULL;
-static char *opt_title = NULL;
-
-static uint buttons; /* bit field of pressed buttons */
-
-void
-clipcopy(const Arg *dummy)
-{
-	Atom clipboard;
-
-	free(xsel.clipboard);
-	xsel.clipboard = NULL;
-
-	if (xsel.primary != NULL) {
-		xsel.clipboard = xstrdup(xsel.primary);
-		clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-		XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-	}
-}
-
-void
-clippaste(const Arg *dummy)
-{
-	Atom clipboard;
-
-	clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-	XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
-			xw.win, CurrentTime);
-}
-
-void
-selpaste(const Arg *dummy)
-{
-	XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
-			xw.win, CurrentTime);
-}
-
-void
-numlock(const Arg *dummy)
-{
-	win.mode ^= MODE_NUMLOCK;
-}
-
-void
-zoom(const Arg *arg)
-{
-	Arg larg;
-
-	larg.f = usedfontsize + arg->f;
-	zoomabs(&larg);
-}
-
-void
-zoomabs(const Arg *arg)
-{
-	xunloadfonts();
-	xloadfonts(usedfont, arg->f);
-	cresize(0, 0);
-	redraw();
-	xhints();
-}
-
-void
-zoomreset(const Arg *arg)
-{
-	Arg larg;
-
-	if (defaultfontsize > 0) {
-		larg.f = defaultfontsize;
-		zoomabs(&larg);
-	}
-}
-
-void
-ttysend(const Arg *arg)
-{
-	ttywrite(arg->s, strlen(arg->s), 1);
-}
-
-int
-evcol(XEvent *e)
-{
-	int x = e->xbutton.x - win.hborderpx;
-	LIMIT(x, 0, win.tw - 1);
-	return x / win.cw;
-}
-
-int
-evrow(XEvent *e)
-{
-	int y = e->xbutton.y - win.vborderpx;
-	LIMIT(y, 0, win.th - 1);
-	return y / win.ch;
-}
-
-void
-mousesel(XEvent *e, int done)
-{
-	int type, seltype = SEL_REGULAR;
-	uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);
-
-	for (type = 1; type < LEN(selmasks); ++type) {
-		if (match(selmasks[type], state)) {
-			seltype = type;
-			break;
-		}
-	}
-	selextend(evcol(e), evrow(e), seltype, done);
-	if (done)
-		setsel(getsel(), e->xbutton.time);
-}
-
-void
-mousereport(XEvent *e)
-{
-	int len, btn, code;
-	int x = evcol(e), y = evrow(e);
-	int state = e->xbutton.state;
-	char buf[40];
-	static int ox, oy;
-
-	if (e->type == MotionNotify) {
-		if (x == ox && y == oy)
-			return;
-		if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
-			return;
-		/* MODE_MOUSEMOTION: no reporting if no button is pressed */
-		if (IS_SET(MODE_MOUSEMOTION) && buttons == 0)
-			return;
-		/* Set btn to lowest-numbered pressed button, or 12 if no
-		 * buttons are pressed. */
-		for (btn = 1; btn <= 11 && !(buttons & (1<<(btn-1))); btn++)
-			;
-		code = 32;
-	} else {
-		btn = e->xbutton.button;
-		/* Only buttons 1 through 11 can be encoded */
-		if (btn < 1 || btn > 11)
-			return;
-		if (e->type == ButtonRelease) {
-			/* MODE_MOUSEX10: no button release reporting */
-			if (IS_SET(MODE_MOUSEX10))
-				return;
-			/* Don't send release events for the scroll wheel */
-			if (btn == 4 || btn == 5)
-				return;
-		}
-		code = 0;
-	}
-
-	ox = x;
-	oy = y;
-
-	/* Encode btn into code. If no button is pressed for a motion event in
-	 * MODE_MOUSEMANY, then encode it as a release. */
-	if ((!IS_SET(MODE_MOUSESGR) && e->type == ButtonRelease) || btn == 12)
-		code += 3;
-	else if (btn >= 8)
-		code += 128 + btn - 8;
-	else if (btn >= 4)
-		code += 64 + btn - 4;
-	else
-		code += btn - 1;
-
-	if (!IS_SET(MODE_MOUSEX10)) {
-		code += ((state & ShiftMask  ) ?  4 : 0)
-		      + ((state & Mod1Mask   ) ?  8 : 0) /* meta key: alt */
-		      + ((state & ControlMask) ? 16 : 0);
-	}
-
-	if (IS_SET(MODE_MOUSESGR)) {
-		len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
-				code, x+1, y+1,
-				e->type == ButtonRelease ? 'm' : 'M');
-	} else if (x < 223 && y < 223) {
-		len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
-				32+code, 32+x+1, 32+y+1);
-	} else {
-		return;
-	}
-
-	ttywrite(buf, len, 0);
-}
-
-uint
-buttonmask(uint button)
-{
-	return button == Button1 ? Button1Mask
-	     : button == Button2 ? Button2Mask
-	     : button == Button3 ? Button3Mask
-	     : button == Button4 ? Button4Mask
-	     : button == Button5 ? Button5Mask
-	     : 0;
-}
-
-int
-mouseaction(XEvent *e, uint release)
-{
-	MouseShortcut *ms;
-
-	/* ignore Button<N>mask for Button<N> - it's set on release */
-	uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
-
-	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
-		if (ms->release == release &&
-		    ms->button == e->xbutton.button &&
-		    (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) &&
-		    (match(ms->mod, state) ||  /* exact or forced */
-		     match(ms->mod, state & ~forcemousemod))) {
-			ms->func(&(ms->arg));
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-void
-bpress(XEvent *e)
-{
-	int btn = e->xbutton.button;
-	struct timespec now;
-	int snap;
-
-	if (1 <= btn && btn <= 11)
-		buttons |= 1 << (btn-1);
-
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
-		mousereport(e);
-		return;
-	}
-
-	if (mouseaction(e, 0))
-		return;
-
-	if (btn == Button1) {
-		/*
-		 * If the user clicks below predefined timeouts specific
-		 * snapping behaviour is exposed.
-		 */
-		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
-			snap = SNAP_LINE;
-		} else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
-			snap = SNAP_WORD;
-		} else {
-			snap = 0;
-		}
-		xsel.tclick2 = xsel.tclick1;
-		xsel.tclick1 = now;
-
-		selstart(evcol(e), evrow(e), snap);
-	}
-}
-
-void
-propnotify(XEvent *e)
-{
-	XPropertyEvent *xpev;
-	Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-
-	xpev = &e->xproperty;
-	if (xpev->state == PropertyNewValue &&
-			(xpev->atom == XA_PRIMARY ||
-			 xpev->atom == clipboard)) {
-		selnotify(e);
-	}
-}
-
-void
-selnotify(XEvent *e)
-{
-	ulong nitems, ofs, rem;
-	int format;
-	uchar *data, *last, *repl;
-	Atom type, incratom, property = None;
-
-	incratom = XInternAtom(xw.dpy, "INCR", 0);
-
-	ofs = 0;
-	if (e->type == SelectionNotify)
-		property = e->xselection.property;
-	else if (e->type == PropertyNotify)
-		property = e->xproperty.atom;
-
-	if (property == None)
-		return;
-
-	do {
-		if (XGetWindowProperty(xw.dpy, xw.win, property, ofs,
-					BUFSIZ/4, False, AnyPropertyType,
-					&type, &format, &nitems, &rem,
-					&data)) {
-			fprintf(stderr, "Clipboard allocation failed\n");
-			return;
-		}
-
-		if (e->type == PropertyNotify && nitems == 0 && rem == 0) {
-			/*
-			 * If there is some PropertyNotify with no data, then
-			 * this is the signal of the selection owner that all
-			 * data has been transferred. We won't need to receive
-			 * PropertyNotify events anymore.
-			 */
-			MODBIT(xw.attrs.event_mask, 0, PropertyChangeMask);
-			XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
-					&xw.attrs);
-		}
-
-		if (type == incratom) {
-			/*
-			 * Activate the PropertyNotify events so we receive
-			 * when the selection owner does send us the next
-			 * chunk of data.
-			 */
-			MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask);
-			XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
-					&xw.attrs);
-
-			/*
-			 * Deleting the property is the transfer start signal.
-			 */
-			XDeleteProperty(xw.dpy, xw.win, (int)property);
-			continue;
-		}
-
-		/*
-		 * As seen in getsel:
-		 * Line endings are inconsistent in the terminal and GUI world
-		 * copy and pasting. When receiving some selection data,
-		 * replace all '\n' with '\r'.
-		 * FIXME: Fix the computer world.
-		 */
-		repl = data;
-		last = data + nitems * format / 8;
-		while ((repl = memchr(repl, '\n', last - repl))) {
-			*repl++ = '\r';
-		}
-
-		if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
-			ttywrite("\033[200~", 6, 0);
-		ttywrite((char *)data, nitems * format / 8, 1);
-		if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
-			ttywrite("\033[201~", 6, 0);
-		XFree(data);
-		/* number of 32-bit chunks returned */
-		ofs += nitems * format / 32;
-	} while (rem > 0);
-
-	/*
-	 * Deleting the property again tells the selection owner to send the
-	 * next data chunk in the property.
-	 */
-	XDeleteProperty(xw.dpy, xw.win, (int)property);
-}
-
-void
-xclipcopy(void)
-{
-	clipcopy(NULL);
-}
-
-void
-selclear_(XEvent *e)
-{
-	selclear();
-}
-
-void
-selrequest(XEvent *e)
-{
-	XSelectionRequestEvent *xsre;
-	XSelectionEvent xev;
-	Atom xa_targets, string, clipboard;
-	char *seltext;
-
-	xsre = (XSelectionRequestEvent *) e;
-	xev.type = SelectionNotify;
-	xev.requestor = xsre->requestor;
-	xev.selection = xsre->selection;
-	xev.target = xsre->target;
-	xev.time = xsre->time;
-	if (xsre->property == None)
-		xsre->property = xsre->target;
-
-	/* reject */
-	xev.property = None;
-
-	xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
-	if (xsre->target == xa_targets) {
-		/* respond with the supported type */
-		string = xsel.xtarget;
-		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
-				XA_ATOM, 32, PropModeReplace,
-				(uchar *) &string, 1);
-		xev.property = xsre->property;
-	} else if (xsre->target == xsel.xtarget || xsre->target == XA_STRING) {
-		/*
-		 * xith XA_STRING non ascii characters may be incorrect in the
-		 * requestor. It is not our problem, use utf8.
-		 */
-		clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-		if (xsre->selection == XA_PRIMARY) {
-			seltext = xsel.primary;
-		} else if (xsre->selection == clipboard) {
-			seltext = xsel.clipboard;
-		} else {
-			fprintf(stderr,
-				"Unhandled clipboard selection 0x%lx\n",
-				xsre->selection);
-			return;
-		}
-		if (seltext != NULL) {
-			XChangeProperty(xsre->display, xsre->requestor,
-					xsre->property, xsre->target,
-					8, PropModeReplace,
-					(uchar *)seltext, strlen(seltext));
-			xev.property = xsre->property;
-		}
-	}
-
-	/* all done, send a notification to the listener */
-	if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))
-		fprintf(stderr, "Error sending SelectionNotify event\n");
-}
-
-void
-setsel(char *str, Time t)
-{
-	if (!str)
-		return;
-
-	free(xsel.primary);
-	xsel.primary = str;
-
-	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
-	if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
-		selclear();
-}
-
-void
-xsetsel(char *str)
-{
-	setsel(str, CurrentTime);
-}
-
-void
-brelease(XEvent *e)
-{
-	int btn = e->xbutton.button;
-
-	if (1 <= btn && btn <= 11)
-		buttons &= ~(1 << (btn-1));
-
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
-		mousereport(e);
-		return;
-	}
-
-	if (mouseaction(e, 1))
-		return;
-	if (btn == Button1)
-		mousesel(e, 1);
-}
-
-void
-bmotion(XEvent *e)
-{
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
-		mousereport(e);
-		return;
-	}
-
-	mousesel(e, 0);
-}
-
-void
-cresize(int width, int height)
-{
-	int col, row;
-
-	if (width != 0)
-		win.w = width;
-	if (height != 0)
-		win.h = height;
-
-	col = (win.w - 2 * borderpx) / win.cw;
-	row = (win.h - 2 * borderpx) / win.ch;
-	col = MAX(1, col);
-	row = MAX(1, row);
-
-	win.hborderpx = (win.w - col * win.cw) / 2;
-	win.vborderpx = (win.h - row * win.ch) / 2;
-
-	tresize(col, row);
-	xresize(col, row);
-	ttyresize(win.tw, win.th);
-}
-
-void
-xresize(int col, int row)
-{
-	win.tw = col * win.cw;
-	win.th = row * win.ch;
-
-	XFreePixmap(xw.dpy, xw.buf);
-	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
-	XftDrawChange(xw.draw, xw.buf);
-	xclear(0, 0, win.w, win.h);
-
-	/* resize to new width */
-	xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
-}
-
-ushort
-sixd_to_16bit(int x)
-{
-	return x == 0 ? 0 : 0x3737 + 0x2828 * x;
-}
-
-int
-xloadcolor(int i, const char *name, Color *ncolor)
-{
-	XRenderColor color = { .alpha = 0xffff };
-
-	if (!name) {
-		if (BETWEEN(i, 16, 255)) { /* 256 color */
-			if (i < 6*6*6+16) { /* same colors as xterm */
-				color.red   = sixd_to_16bit( ((i-16)/36)%6 );
-				color.green = sixd_to_16bit( ((i-16)/6) %6 );
-				color.blue  = sixd_to_16bit( ((i-16)/1) %6 );
-			} else { /* greyscale */
-				color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16));
-				color.green = color.blue = color.red;
-			}
-			return XftColorAllocValue(xw.dpy, xw.vis,
-			                          xw.cmap, &color, ncolor);
-		} else
-			name = colorname[i];
-	}
-
-	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
-}
-
-void
-xloadcols(void)
-{
-	int i;
-	static int loaded;
-	Color *cp;
-
-	if (loaded) {
-		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
-			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
-	} else {
-		dc.collen = MAX(LEN(colorname), 256);
-		dc.col = xmalloc(dc.collen * sizeof(Color));
-	}
-
-	for (i = 0; i < dc.collen; i++)
-		if (!xloadcolor(i, NULL, &dc.col[i])) {
-			if (colorname[i])
-				die("could not allocate color '%s'\n", colorname[i]);
-			else
-				die("could not allocate color %d\n", i);
-		}
-	loaded = 1;
-}
-
-int
-xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
-{
-	if (!BETWEEN(x, 0, dc.collen - 1))
-		return 1;
-
-	*r = dc.col[x].color.red >> 8;
-	*g = dc.col[x].color.green >> 8;
-	*b = dc.col[x].color.blue >> 8;
-
-	return 0;
-}
-
-int
-xsetcolorname(int x, const char *name)
-{
-	Color ncolor;
-
-	if (!BETWEEN(x, 0, dc.collen - 1))
-		return 1;
-
-	if (!xloadcolor(x, name, &ncolor))
-		return 1;
-
-	XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
-	dc.col[x] = ncolor;
-
-	return 0;
-}
-
-/*
- * Absolute coordinates.
- */
-void
-xclear(int x1, int y1, int x2, int y2)
-{
-	XftDrawRect(xw.draw,
-			&dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
-			x1, y1, x2-x1, y2-y1);
-}
-
-void
-xhints(void)
-{
-	XClassHint class = {opt_name ? opt_name : termname,
-	                    opt_class ? opt_class : termname};
-	XWMHints wm = {.flags = InputHint, .input = 1};
-	XSizeHints *sizeh;
-
-	sizeh = XAllocSizeHints();
-
-	sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
-	sizeh->height = win.h;
-	sizeh->width = win.w;
-	sizeh->height_inc = 1;
-	sizeh->width_inc = 1;
-	sizeh->base_height = 2 * borderpx;
-	sizeh->base_width = 2 * borderpx;
-	sizeh->min_height = win.ch + 2 * borderpx;
-	sizeh->min_width = win.cw + 2 * borderpx;
-	if (xw.isfixed) {
-		sizeh->flags |= PMaxSize;
-		sizeh->min_width = sizeh->max_width = win.w;
-		sizeh->min_height = sizeh->max_height = win.h;
-	}
-	if (xw.gm & (XValue|YValue)) {
-		sizeh->flags |= USPosition | PWinGravity;
-		sizeh->x = xw.l;
-		sizeh->y = xw.t;
-		sizeh->win_gravity = xgeommasktogravity(xw.gm);
-	}
-
-	XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
-			&class);
-	XFree(sizeh);
-}
-
-int
-xgeommasktogravity(int mask)
-{
-	switch (mask & (XNegative|YNegative)) {
-	case 0:
-		return NorthWestGravity;
-	case XNegative:
-		return NorthEastGravity;
-	case YNegative:
-		return SouthWestGravity;
-	}
-
-	return SouthEastGravity;
-}
-
-int
-xloadfont(Font *f, FcPattern *pattern)
-{
-	FcPattern *configured;
-	FcPattern *match;
-	FcResult result;
-	XGlyphInfo extents;
-	int wantattr, haveattr;
-
-	/*
-	 * Manually configure instead of calling XftMatchFont
-	 * so that we can use the configured pattern for
-	 * "missing glyph" lookups.
-	 */
-	configured = FcPatternDuplicate(pattern);
-	if (!configured)
-		return 1;
-
-	FcConfigSubstitute(NULL, configured, FcMatchPattern);
-	XftDefaultSubstitute(xw.dpy, xw.scr, configured);
-
-	match = FcFontMatch(NULL, configured, &result);
-	if (!match) {
-		FcPatternDestroy(configured);
-		return 1;
-	}
-
-	if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
-		FcPatternDestroy(configured);
-		FcPatternDestroy(match);
-		return 1;
-	}
-
-	if ((XftPatternGetInteger(pattern, "slant", 0, &wantattr) ==
-	    XftResultMatch)) {
-		/*
-		 * Check if xft was unable to find a font with the appropriate
-		 * slant but gave us one anyway. Try to mitigate.
-		 */
-		if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
-		    &haveattr) != XftResultMatch) || haveattr < wantattr) {
-			f->badslant = 1;
-			fputs("font slant does not match\n", stderr);
-		}
-	}
-
-	if ((XftPatternGetInteger(pattern, "weight", 0, &wantattr) ==
-	    XftResultMatch)) {
-		if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
-		    &haveattr) != XftResultMatch) || haveattr != wantattr) {
-			f->badweight = 1;
-			fputs("font weight does not match\n", stderr);
-		}
-	}
-
-	XftTextExtentsUtf8(xw.dpy, f->match,
-		(const FcChar8 *) ascii_printable,
-		strlen(ascii_printable), &extents);
-
-	f->set = NULL;
-	f->pattern = configured;
-
-	f->ascent = f->match->ascent;
-	f->descent = f->match->descent;
-	f->lbearing = 0;
-	f->rbearing = f->match->max_advance_width;
-
-	f->height = f->ascent + f->descent;
-	f->width = DIVCEIL(extents.xOff, strlen(ascii_printable));
-
-	return 0;
-}
-
-void
-xloadfonts(const char *fontstr, double fontsize)
-{
-	FcPattern *pattern;
-	double fontval;
-
-	if (fontstr[0] == '-')
-		pattern = XftXlfdParse(fontstr, False, False);
-	else
-		pattern = FcNameParse((const FcChar8 *)fontstr);
-
-	if (!pattern)
-		die("can't open font %s\n", fontstr);
-
-	if (fontsize > 1) {
-		FcPatternDel(pattern, FC_PIXEL_SIZE);
-		FcPatternDel(pattern, FC_SIZE);
-		FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
-		usedfontsize = fontsize;
-	} else {
-		if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-				FcResultMatch) {
-			usedfontsize = fontval;
-		} else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
-				FcResultMatch) {
-			usedfontsize = -1;
-		} else {
-			/*
-			 * Default font size is 12, if none given. This is to
-			 * have a known usedfontsize value.
-			 */
-			FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
-			usedfontsize = 12;
-		}
-		defaultfontsize = usedfontsize;
-	}
-
-	if (xloadfont(&dc.font, pattern))
-		die("can't open font %s\n", fontstr);
-
-	if (usedfontsize < 0) {
-		FcPatternGetDouble(dc.font.match->pattern,
-		                   FC_PIXEL_SIZE, 0, &fontval);
-		usedfontsize = fontval;
-		if (fontsize == 0)
-			defaultfontsize = fontval;
-	}
-
-	/* Setting character width and height. */
-	win.cw = ceilf(dc.font.width * cwscale);
-	win.ch = ceilf(dc.font.height * chscale);
-
-	FcPatternDel(pattern, FC_SLANT);
-	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-	if (xloadfont(&dc.ifont, pattern))
-		die("can't open font %s\n", fontstr);
-
-	FcPatternDel(pattern, FC_WEIGHT);
-	FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-	if (xloadfont(&dc.ibfont, pattern))
-		die("can't open font %s\n", fontstr);
-
-	FcPatternDel(pattern, FC_SLANT);
-	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-	if (xloadfont(&dc.bfont, pattern))
-		die("can't open font %s\n", fontstr);
-
-	FcPatternDestroy(pattern);
-}
-
-void
-xunloadfont(Font *f)
-{
-	XftFontClose(xw.dpy, f->match);
-	FcPatternDestroy(f->pattern);
-	if (f->set)
-		FcFontSetDestroy(f->set);
-}
-
-void
-xunloadfonts(void)
-{
-	/* Free the loaded fonts in the font cache.  */
-	while (frclen > 0)
-		XftFontClose(xw.dpy, frc[--frclen].font);
-
-	xunloadfont(&dc.font);
-	xunloadfont(&dc.bfont);
-	xunloadfont(&dc.ifont);
-	xunloadfont(&dc.ibfont);
-}
-
-int
-ximopen(Display *dpy)
-{
-	XIMCallback imdestroy = { .client_data = NULL, .callback = ximdestroy };
-	XICCallback icdestroy = { .client_data = NULL, .callback = xicdestroy };
-
-	xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
-	if (xw.ime.xim == NULL)
-		return 0;
-
-	if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL))
-		fprintf(stderr, "XSetIMValues: "
-		                "Could not set XNDestroyCallback.\n");
-
-	xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
-	                                      NULL);
-
-	if (xw.ime.xic == NULL) {
-		xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle,
-		                       XIMPreeditNothing | XIMStatusNothing,
-		                       XNClientWindow, xw.win,
-		                       XNDestroyCallback, &icdestroy,
-		                       NULL);
-	}
-	if (xw.ime.xic == NULL)
-		fprintf(stderr, "XCreateIC: Could not create input context.\n");
-
-	return 1;
-}
-
-void
-ximinstantiate(Display *dpy, XPointer client, XPointer call)
-{
-	if (ximopen(dpy))
-		XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
-		                                 ximinstantiate, NULL);
-}
-
-void
-ximdestroy(XIM xim, XPointer client, XPointer call)
-{
-	xw.ime.xim = NULL;
-	XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
-	                               ximinstantiate, NULL);
-	XFree(xw.ime.spotlist);
-}
-
-int
-xicdestroy(XIC xim, XPointer client, XPointer call)
-{
-	xw.ime.xic = NULL;
-	return 1;
-}
-
-void
-xinit(int cols, int rows)
-{
-	XGCValues gcvalues;
-	Cursor cursor;
-	Window parent, root;
-	pid_t thispid = getpid();
-	XColor xmousefg, xmousebg;
-
-	if (!(xw.dpy = XOpenDisplay(NULL)))
-		die("can't open display\n");
-	xw.scr = XDefaultScreen(xw.dpy);
-	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-
-	/* font */
-	if (!FcInit())
-		die("could not init fontconfig.\n");
-
-	usedfont = (opt_font == NULL)? font : opt_font;
-	xloadfonts(usedfont, 0);
-
-	/* colors */
-	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-	xloadcols();
-
-	/* adjust fixed window geometry */
-	win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
-	win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
-	if (xw.gm & XNegative)
-		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
-	if (xw.gm & YNegative)
-		xw.t += DisplayHeight(xw.dpy, xw.scr) - win.h - 2;
-
-	/* Events */
-	xw.attrs.background_pixel = dc.col[defaultbg].pixel;
-	xw.attrs.border_pixel = dc.col[defaultbg].pixel;
-	xw.attrs.bit_gravity = NorthWestGravity;
-	xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask
-		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
-		| 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.vis, CWBackPixel | CWBorderPixel | CWBitGravity
-			| CWEventMask | CWColormap, &xw.attrs);
-	if (parent != root)
-		XReparentWindow(xw.dpy, xw.win, parent, xw.l, xw.t);
-
-	memset(&gcvalues, 0, sizeof(gcvalues));
-	gcvalues.graphics_exposures = False;
-	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));
-	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
-	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
-
-	/* font spec buffer */
-	xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
-
-	/* Xft rendering context */
-	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
-
-	/* input methods */
-	if (!ximopen(xw.dpy)) {
-		XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
-	                                       ximinstantiate, NULL);
-	}
-
-	/* white cursor, black outline */
-	cursor = XCreateFontCursor(xw.dpy, mouseshape);
-	XDefineCursor(xw.dpy, xw.win, cursor);
-
-	if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
-		xmousefg.red   = 0xffff;
-		xmousefg.green = 0xffff;
-		xmousefg.blue  = 0xffff;
-	}
-
-	if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
-		xmousebg.red   = 0x0000;
-		xmousebg.green = 0x0000;
-		xmousebg.blue  = 0x0000;
-	}
-
-	XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
-
-	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
-	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
-	xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
-	xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False);
-	XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
-
-	xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
-	XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
-			PropModeReplace, (uchar *)&thispid, 1);
-
-	win.mode = MODE_NUMLOCK;
-	resettitle();
-	xhints();
-	XMapWindow(xw.dpy, xw.win);
-	XSync(xw.dpy, False);
-
-	clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
-	clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2);
-	xsel.primary = NULL;
-	xsel.clipboard = NULL;
-	xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
-	if (xsel.xtarget == None)
-		xsel.xtarget = XA_STRING;
-}
-
-int
-xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
-{
-	float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
-	ushort mode, prevmode = USHRT_MAX;
-	Font *font = &dc.font;
-	int frcflags = FRC_NORMAL;
-	float runewidth = win.cw;
-	Rune rune;
-	FT_UInt glyphidx;
-	FcResult fcres;
-	FcPattern *fcpattern, *fontpattern;
-	FcFontSet *fcsets[] = { NULL };
-	FcCharSet *fccharset;
-	int i, f, numspecs = 0;
-
-	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
-		/* Fetch rune and mode for current glyph. */
-		rune = glyphs[i].u;
-		mode = glyphs[i].mode;
-
-		/* Skip dummy wide-character spacing. */
-		if (mode == ATTR_WDUMMY)
-			continue;
-
-		/* Determine font for glyph if different from previous glyph. */
-		if (prevmode != mode) {
-			prevmode = mode;
-			font = &dc.font;
-			frcflags = FRC_NORMAL;
-			runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
-			if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
-				font = &dc.ibfont;
-				frcflags = FRC_ITALICBOLD;
-			} else if (mode & ATTR_ITALIC) {
-				font = &dc.ifont;
-				frcflags = FRC_ITALIC;
-			} else if (mode & ATTR_BOLD) {
-				font = &dc.bfont;
-				frcflags = FRC_BOLD;
-			}
-			yp = winy + font->ascent;
-		}
-
-		/* Lookup character index with default font. */
-		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
-		if (glyphidx) {
-			specs[numspecs].font = font->match;
-			specs[numspecs].glyph = glyphidx;
-			specs[numspecs].x = (short)xp;
-			specs[numspecs].y = (short)yp;
-			xp += runewidth;
-			numspecs++;
-			continue;
-		}
-
-		/* Fallback on font cache, search the font cache for match. */
-		for (f = 0; f < frclen; f++) {
-			glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
-			/* Everything correct. */
-			if (glyphidx && frc[f].flags == frcflags)
-				break;
-			/* We got a default font for a not found glyph. */
-			if (!glyphidx && frc[f].flags == frcflags
-					&& frc[f].unicodep == rune) {
-				break;
-			}
-		}
-
-		/* Nothing was found. Use fontconfig to find matching font. */
-		if (f >= frclen) {
-			if (!font->set)
-				font->set = FcFontSort(0, font->pattern,
-				                       1, 0, &fcres);
-			fcsets[0] = font->set;
-
-			/*
-			 * Nothing was found in the cache. Now use
-			 * some dozen of Fontconfig calls to get the
-			 * font for one single character.
-			 *
-			 * Xft and fontconfig are design failures.
-			 */
-			fcpattern = FcPatternDuplicate(font->pattern);
-			fccharset = FcCharSetCreate();
-
-			FcCharSetAddChar(fccharset, rune);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET,
-					fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
-
-			FcConfigSubstitute(0, fcpattern,
-					FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-
-			fontpattern = FcFontSetMatch(0, fcsets, 1,
-					fcpattern, &fcres);
-
-			/* Allocate memory for the new cache entry. */
-			if (frclen >= frccap) {
-				frccap += 16;
-				frc = xrealloc(frc, frccap * sizeof(Fontcache));
-			}
-
-			frc[frclen].font = XftFontOpenPattern(xw.dpy,
-					fontpattern);
-			if (!frc[frclen].font)
-				die("XftFontOpenPattern failed seeking fallback font: %s\n",
-					strerror(errno));
-			frc[frclen].flags = frcflags;
-			frc[frclen].unicodep = rune;
-
-			glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
-
-			f = frclen;
-			frclen++;
-
-			FcPatternDestroy(fcpattern);
-			FcCharSetDestroy(fccharset);
-		}
-
-		specs[numspecs].font = frc[f].font;
-		specs[numspecs].glyph = glyphidx;
-		specs[numspecs].x = (short)xp;
-		specs[numspecs].y = (short)yp;
-		xp += runewidth;
-		numspecs++;
-	}
-
-	return numspecs;
-}
-
-static int isSlopeRising (int x, int iPoint, int waveWidth)
-{
-	//    .     .     .     .
-	//   / \   / \   / \   / \
-	//  /   \ /   \ /   \ /   \
-	// .     .     .     .     .
-
-	// Find absolute `x` of point
-	x += iPoint * (waveWidth/2);
-
-	// Find index of absolute wave
-	int absSlope = x / ((float)waveWidth/2);
-
-	return (absSlope % 2);
-}
-
-static int getSlope (int x, int iPoint, int waveWidth)
-{
-	// Sizes: Caps are half width of slopes
-	//    1_2       1_2       1_2      1_2
-	//   /   \     /   \     /   \    /   \
-	//  /     \   /     \   /     \  /     \
-	// 0       3_0       3_0      3_0       3_
-	// <2->    <1>         <---6---->
-
-	// Find type of first point
-	int firstType;
-	x -= (x / waveWidth) * waveWidth;
-	if (x < (waveWidth * (2.f/6.f)))
-		firstType = UNDERCURL_SLOPE_ASCENDING;
-	else if (x < (waveWidth * (3.f/6.f)))
-		firstType = UNDERCURL_SLOPE_TOP_CAP;
-	else if (x < (waveWidth * (5.f/6.f)))
-		firstType = UNDERCURL_SLOPE_DESCENDING;
-	else
-		firstType = UNDERCURL_SLOPE_BOTTOM_CAP;
-
-	// Find type of given point
-	int pointType = (iPoint % 4);
-	pointType += firstType;
-	pointType %= 4;
-
-	return pointType;
-}
-
-void
-xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
-{
-	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
-	int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
-	    width = charlen * win.cw;
-	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
-	XRenderColor colfg, colbg;
-	XRectangle r;
-
-	/* Fallback on color display for attributes not supported by the font */
-	if (base.mode & ATTR_ITALIC && base.mode & ATTR_BOLD) {
-		if (dc.ibfont.badslant || dc.ibfont.badweight)
-			base.fg = defaultattr;
-	} else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) ||
-	    (base.mode & ATTR_BOLD && dc.bfont.badweight)) {
-		base.fg = defaultattr;
-	}
-
-	if (IS_TRUECOL(base.fg)) {
-		colfg.alpha = 0xffff;
-		colfg.red = TRUERED(base.fg);
-		colfg.green = TRUEGREEN(base.fg);
-		colfg.blue = TRUEBLUE(base.fg);
-		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
-		fg = &truefg;
-	} else {
-		fg = &dc.col[base.fg];
-	}
-
-	if (IS_TRUECOL(base.bg)) {
-		colbg.alpha = 0xffff;
-		colbg.green = TRUEGREEN(base.bg);
-		colbg.red = TRUERED(base.bg);
-		colbg.blue = TRUEBLUE(base.bg);
-		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
-		bg = &truebg;
-	} else {
-		bg = &dc.col[base.bg];
-	}
-
-	/* Change basic system colors [0-7] to bright system colors [8-15] */
-	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
-		fg = &dc.col[base.fg + 8];
-
-	if (IS_SET(MODE_REVERSE)) {
-		if (fg == &dc.col[defaultfg]) {
-			fg = &dc.col[defaultbg];
-		} else {
-			colfg.red = ~fg->color.red;
-			colfg.green = ~fg->color.green;
-			colfg.blue = ~fg->color.blue;
-			colfg.alpha = fg->color.alpha;
-			XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
-					&revfg);
-			fg = &revfg;
-		}
-
-		if (bg == &dc.col[defaultbg]) {
-			bg = &dc.col[defaultfg];
-		} else {
-			colbg.red = ~bg->color.red;
-			colbg.green = ~bg->color.green;
-			colbg.blue = ~bg->color.blue;
-			colbg.alpha = bg->color.alpha;
-			XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
-					&revbg);
-			bg = &revbg;
-		}
-	}
-
-	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
-		colfg.red = fg->color.red / 2;
-		colfg.green = fg->color.green / 2;
-		colfg.blue = fg->color.blue / 2;
-		colfg.alpha = fg->color.alpha;
-		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
-		fg = &revfg;
-	}
-
-	if (base.mode & ATTR_REVERSE) {
-		temp = fg;
-		fg = bg;
-		bg = temp;
-	}
-
-	if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
-		fg = bg;
-
-	if (base.mode & ATTR_INVISIBLE)
-		fg = bg;
-
-	/* Intelligent cleaning up of the borders. */
-	if (x == 0) {
-		xclear(0, (y == 0)? 0 : winy, win.hborderpx,
-			winy + win.ch +
-			((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
-	}
-	if (winx + width >= win.hborderpx + win.tw) {
-		xclear(winx + width, (y == 0)? 0 : winy, win.w,
-			((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
-	}
-	if (y == 0)
-		xclear(winx, 0, winx + width, win.vborderpx);
-	if (winy + win.ch >= win.vborderpx + win.th)
-		xclear(winx, winy + win.ch, winx + width, win.h);
-
-	/* Clean up the region we want to draw to. */
-	XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
-
-	/* Set the clip region because Xft is sometimes dirty. */
-	r.x = 0;
-	r.y = 0;
-	r.height = win.ch;
-	r.width = width;
-	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
-
-	/* Render the glyphs. */
-	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-
-	/* Render underline and strikethrough. */
-	if (base.mode & ATTR_UNDERLINE) {
-		// Underline Color
-		const int widthThreshold  = 28; // +1 width every widthThreshold px of font
-		int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width
-		int linecolor;
-		if ((base.ucolor[0] >= 0) &&
-			!(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
-			!(base.mode & ATTR_INVISIBLE)
-		) {
-			// Special color for underline
-			// Index
-			if (base.ucolor[1] < 0) {
-				linecolor = dc.col[base.ucolor[0]].pixel;
-			}
-			// RGB
-			else {
-				XColor lcolor;
-				lcolor.red = base.ucolor[0] * 257;
-				lcolor.green = base.ucolor[1] * 257;
-				lcolor.blue = base.ucolor[2] * 257;
-				lcolor.flags = DoRed | DoGreen | DoBlue;
-				XAllocColor(xw.dpy, xw.cmap, &lcolor);
-				linecolor = lcolor.pixel;
-			}
-		} else {
-			// Foreground color for underline
-			linecolor = fg->pixel;
-		}
-
-		XGCValues ugcv = {
-			.foreground = linecolor,
-			.line_width = wlw,
-			.line_style = LineSolid,
-			.cap_style = CapNotLast
-		};
-
-		GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw),
-			GCForeground | GCLineWidth | GCLineStyle | GCCapStyle,
-			&ugcv);
-
-		// Underline Style
-		if (base.ustyle != 3) {
-			//XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
-			XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx,
-				winy + dc.font.ascent + 1, width, wlw);
-		} else if (base.ustyle == 3) {
-			int ww = win.cw;//width;
-			int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
-			int wx = winx;
-			int wy = winy + win.ch - dc.font.descent;
-
-#if UNDERCURL_STYLE == UNDERCURL_CURLY
-			// Draw waves
-			int narcs = charlen * 2 + 1;
-			XArc *arcs = xmalloc(sizeof(XArc) * narcs);
-
-			int i = 0;
-			for (i = 0; i < charlen-1; i++) {
-				arcs[i*2] = (XArc) {
-					.x = wx + win.cw * i + ww / 4,
-					.y = wy,
-					.width = win.cw / 2,
-					.height = wh,
-					.angle1 = 0,
-					.angle2 = 180 * 64
-				};
-				arcs[i*2+1] = (XArc) {
-					.x = wx + win.cw * i + ww * 0.75,
-					.y = wy,
-					.width = win.cw/2,
-					.height = wh,
-					.angle1 = 180 * 64,
-					.angle2 = 180 * 64
-				};
-			}
-			// Last wave
-			arcs[i*2] = (XArc) {wx + ww * i + ww / 4, wy, ww / 2, wh,
-			0, 180 * 64 };
-			// Last wave tail
-			arcs[i*2+1] = (XArc) {wx + ww * i + ww * 0.75, wy, ceil(ww / 2.),
-			wh, 180 * 64, 90 * 64};
-			// First wave tail
-			i++;
-			arcs[i*2] = (XArc) {wx - ww/4 - 1, wy, ceil(ww / 2.), wh, 270 * 64,
-			90 * 64 };
-
-			XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
-
-			free(arcs);
-#elif UNDERCURL_STYLE == UNDERCURL_SPIKY
-			// Make the underline corridor larger
-			/*
-			wy -= wh;
-			*/
-			wh *= 2;
-
-			// Set the angle of the slope to 45°
-			ww = wh;
-
-			// Position of wave is independent of word, it's absolute
-			wx = (wx / (ww/2)) * (ww/2);
-
-			int marginStart = winx - wx;
-
-			// Calculate number of points with floating precision
-			float n = width;					// Width of word in pixels
-			n = (n / ww) * 2;					// Number of slopes (/ or \)
-			n += 2;								// Add two last points
-			int npoints = n;					// Convert to int
-
-			// Total length of underline
-			float waveLength = 0;
-
-			if (npoints >= 3) {
-				// We add an aditional slot in case we use a bonus point
-				XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
-
-				// First point (Starts with the word bounds)
-				points[0] = (XPoint) {
-					.x = wx + marginStart,
-					.y = (isSlopeRising(wx, 0, ww))
-						? (wy - marginStart + ww/2.f)
-						: (wy + marginStart)
-				};
-
-				// Second point (Goes back to the absolute point coordinates)
-				points[1] = (XPoint) {
-					.x = (ww/2.f) - marginStart,
-					.y = (isSlopeRising(wx, 1, ww))
-						? (ww/2.f - marginStart)
-						: (-ww/2.f + marginStart)
-				};
-				waveLength += (ww/2.f) - marginStart;
-
-				// The rest of the points
-				for (int i = 2; i < npoints-1; i++) {
-					points[i] = (XPoint) {
-						.x = ww/2,
-						.y = (isSlopeRising(wx, i, ww))
-							? wh/2
-							: -wh/2
-					};
-					waveLength += ww/2;
-				}
-
-				// Last point
-				points[npoints-1] = (XPoint) {
-					.x = ww/2,
-					.y = (isSlopeRising(wx, npoints-1, ww))
-						? wh/2
-						: -wh/2
-				};
-				waveLength += ww/2;
-
-				// End
-				if (waveLength < width) { // Add a bonus point?
-					int marginEnd = width - waveLength;
-					points[npoints] = (XPoint) {
-						.x = marginEnd,
-						.y = (isSlopeRising(wx, npoints, ww))
-							? (marginEnd)
-							: (-marginEnd)
-					};
-
-					npoints++;
-				} else if (waveLength > width) { // Is last point too far?
-					int marginEnd = waveLength - width;
-					points[npoints-1].x -= marginEnd;
-					if (isSlopeRising(wx, npoints-1, ww))
-						points[npoints-1].y -= (marginEnd);
-					else
-						points[npoints-1].y += (marginEnd);
-				}
-
-				// Draw the lines
-				XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
-						CoordModePrevious);
-
-				// Draw a second underline with an offset of 1 pixel
-				if ( ((win.ch / (widthThreshold/2)) % 2)) {
-					points[0].x++;
-
-					XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
-							npoints, CoordModePrevious);
-				}
-
-				// Free resources
-				free(points);
-			}
-#else // UNDERCURL_CAPPED
-			// Cap is half of wave width
-			float capRatio = 0.5f;
-
-			// Make the underline corridor larger
-			wh *= 2;
-
-			// Set the angle of the slope to 45°
-			ww = wh;
-			ww *= 1 + capRatio; // Add a bit of width for the cap
-
-			// Position of wave is independent of word, it's absolute
-			wx = (wx / ww) * ww;
-
-			float marginStart;
-			switch(getSlope(winx, 0, ww)) {
-				case UNDERCURL_SLOPE_ASCENDING:
-					marginStart = winx - wx;
-					break;
-				case UNDERCURL_SLOPE_TOP_CAP:
-					marginStart = winx - (wx + (ww * (2.f/6.f)));
-					break;
-				case UNDERCURL_SLOPE_DESCENDING:
-					marginStart = winx - (wx + (ww * (3.f/6.f)));
-					break;
-				case UNDERCURL_SLOPE_BOTTOM_CAP:
-					marginStart = winx - (wx + (ww * (5.f/6.f)));
-					break;
-			}
-
-			// Calculate number of points with floating precision
-			float n = width;					// Width of word in pixels
-												//					   ._.
-			n = (n / ww) * 4;					// Number of points (./   \.)
-			n += 2;								// Add two last points
-			int npoints = n;					// Convert to int
-
-			// Position of the pen to draw the lines
-			float penX = 0;
-			float penY = 0;
-
-			if (npoints >= 3) {
-				XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
-
-				// First point (Starts with the word bounds)
-				penX = winx;
-				switch (getSlope(winx, 0, ww)) {
-					case UNDERCURL_SLOPE_ASCENDING:
-						penY = wy + wh/2.f - marginStart;
-						break;
-					case UNDERCURL_SLOPE_TOP_CAP:
-						penY = wy;
-						break;
-					case UNDERCURL_SLOPE_DESCENDING:
-						penY = wy + marginStart;
-						break;
-					case UNDERCURL_SLOPE_BOTTOM_CAP:
-						penY = wy + wh/2.f;
-						break;
-				}
-				points[0].x = penX;
-				points[0].y = penY;
-
-				// Second point (Goes back to the absolute point coordinates)
-				switch (getSlope(winx, 1, ww)) {
-					case UNDERCURL_SLOPE_ASCENDING:
-						penX += ww * (1.f/6.f) - marginStart;
-						penY += 0;
-						break;
-					case UNDERCURL_SLOPE_TOP_CAP:
-						penX += ww * (2.f/6.f) - marginStart;
-						penY += -wh/2.f + marginStart;
-						break;
-					case UNDERCURL_SLOPE_DESCENDING:
-						penX += ww * (1.f/6.f) - marginStart;
-						penY += 0;
-						break;
-					case UNDERCURL_SLOPE_BOTTOM_CAP:
-						penX += ww * (2.f/6.f) - marginStart;
-						penY += -marginStart + wh/2.f;
-						break;
-				}
-				points[1].x = penX;
-				points[1].y = penY;
-
-				// The rest of the points
-				for (int i = 2; i < npoints; i++) {
-					switch (getSlope(winx, i, ww)) {
-						case UNDERCURL_SLOPE_ASCENDING:
-						case UNDERCURL_SLOPE_DESCENDING:
-							penX += ww * (1.f/6.f);
-							penY += 0;
-							break;
-						case UNDERCURL_SLOPE_TOP_CAP:
-							penX += ww * (2.f/6.f);
-							penY += -wh / 2.f;
-							break;
-						case UNDERCURL_SLOPE_BOTTOM_CAP:
-							penX += ww * (2.f/6.f);
-							penY += wh / 2.f;
-							break;
-					}
-					points[i].x = penX;
-					points[i].y = penY;
-				}
-
-				// End
-				float waveLength = penX - winx;
-				if (waveLength < width) { // Add a bonus point?
-					int marginEnd = width - waveLength;
-					penX += marginEnd;
-					switch(getSlope(winx, npoints, ww)) {
-						case UNDERCURL_SLOPE_ASCENDING:
-						case UNDERCURL_SLOPE_DESCENDING:
-							//penY += 0;
-							break;
-						case UNDERCURL_SLOPE_TOP_CAP:
-							penY += -marginEnd;
-							break;
-						case UNDERCURL_SLOPE_BOTTOM_CAP:
-							penY += marginEnd;
-							break;
-					}
-
-					points[npoints].x = penX;
-					points[npoints].y = penY;
-
-					npoints++;
-				} else if (waveLength > width) { // Is last point too far?
-					int marginEnd = waveLength - width;
-					points[npoints-1].x -= marginEnd;
-					switch(getSlope(winx, npoints-1, ww)) {
-						case UNDERCURL_SLOPE_TOP_CAP:
-							points[npoints-1].y += marginEnd;
-							break;
-						case UNDERCURL_SLOPE_BOTTOM_CAP:
-							points[npoints-1].y -= marginEnd;
-							break;
-						default:
-							break;
-					}
-				}
-
-				// Draw the lines
-				XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
-						CoordModeOrigin);
-
-				// Draw a second underline with an offset of 1 pixel
-				if ( ((win.ch / (widthThreshold/2)) % 2)) {
-					for (int i = 0; i < npoints; i++)
-						points[i].x++;
-
-					XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
-							npoints, CoordModeOrigin);
-				}
-
-				// Free resources
-				free(points);
-			}
-#endif
-		}
-
-		XFreeGC(xw.dpy, ugc);
-	}
-
-	if (base.mode & ATTR_STRUCK) {
-		XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
-				width, 1);
-	}
-
-	/* Reset clip to none. */
-	XftDrawSetClip(xw.draw, 0);
-}
-
-void
-xdrawglyph(Glyph g, int x, int y)
-{
-	int numspecs;
-	XftGlyphFontSpec spec;
-
-	numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
-	xdrawglyphfontspecs(&spec, g, numspecs, x, y);
-}
-
-void
-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
-{
-	Color drawcol;
-
-	/* remove the old cursor */
-	if (selected(ox, oy))
-		og.mode ^= ATTR_REVERSE;
-	xdrawglyph(og, ox, oy);
-
-	if (IS_SET(MODE_HIDE))
-		return;
-
-	/*
-	 * Select the right color for the right mode.
-	 */
-	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
-
-	if (IS_SET(MODE_REVERSE)) {
-		g.mode |= ATTR_REVERSE;
-		g.bg = defaultfg;
-		if (selected(cx, cy)) {
-			drawcol = dc.col[defaultcs];
-			g.fg = defaultrcs;
-		} else {
-			drawcol = dc.col[defaultrcs];
-			g.fg = defaultcs;
-		}
-	} else {
-		if (selected(cx, cy)) {
-			g.fg = defaultfg;
-			g.bg = defaultrcs;
-		} else {
-			g.fg = defaultbg;
-			g.bg = defaultcs;
-		}
-		drawcol = dc.col[g.bg];
-	}
-
-	/* draw the new one */
-	if (IS_SET(MODE_FOCUSED)) {
-		switch (win.cursor) {
-		case 7: /* st extension */
-			g.u = 0x2603; /* snowman (U+2603) */
-			/* FALLTHROUGH */
-		case 0: /* Blinking Block */
-		case 1: /* Blinking Block (Default) */
-		case 2: /* Steady Block */
-			xdrawglyph(g, cx, cy);
-			break;
-		case 3: /* Blinking Underline */
-		case 4: /* Steady Underline */
-			XftDrawRect(xw.draw, &drawcol,
-					win.hborderpx + cx * win.cw,
-					win.vborderpx + (cy + 1) * win.ch - \
-						cursorthickness,
-					win.cw, cursorthickness);
-			break;
-		case 5: /* Blinking bar */
-		case 6: /* Steady bar */
-			XftDrawRect(xw.draw, &drawcol,
-					win.hborderpx + cx * win.cw,
-					win.vborderpx + cy * win.ch,
-					cursorthickness, win.ch);
-			break;
-		}
-	} else {
-		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + cy * win.ch,
-				win.cw - 1, 1);
-		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + cy * win.ch,
-				1, win.ch - 1);
-		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + (cx + 1) * win.cw - 1,
-				win.vborderpx + cy * win.ch,
-				1, win.ch - 1);
-		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + (cy + 1) * win.ch - 1,
-				win.cw, 1);
-	}
-}
-
-void
-xsetenv(void)
-{
-	char buf[sizeof(long) * 8 + 1];
-
-	snprintf(buf, sizeof(buf), "%lu", xw.win);
-	setenv("WINDOWID", buf, 1);
-}
-
-void
-xseticontitle(char *p)
-{
-	XTextProperty prop;
-	DEFAULT(p, opt_title);
-
-	if (p[0] == '\0')
-		p = opt_title;
-
-	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
-	                                &prop) != Success)
-		return;
-	XSetWMIconName(xw.dpy, xw.win, &prop);
-	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
-	XFree(prop.value);
-}
-
-void
-xsettitle(char *p)
-{
-	XTextProperty prop;
-	DEFAULT(p, opt_title);
-
-	if (p[0] == '\0')
-		p = opt_title;
-
-	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
-	                                &prop) != Success)
-		return;
-	XSetWMName(xw.dpy, xw.win, &prop);
-	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
-	XFree(prop.value);
-}
-
-int
-xstartdraw(void)
-{
-	return IS_SET(MODE_VISIBLE);
-}
-
-void
-xdrawline(Line line, int x1, int y1, int x2)
-{
-	int i, x, ox, numspecs;
-	Glyph base, new;
-	XftGlyphFontSpec *specs = xw.specbuf;
-
-	numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
-	i = ox = 0;
-	for (x = x1; x < x2 && i < numspecs; x++) {
-		new = line[x];
-		if (new.mode == ATTR_WDUMMY)
-			continue;
-		if (selected(x, y1))
-			new.mode ^= ATTR_REVERSE;
-		if (i > 0 && ATTRCMP(base, new)) {
-			xdrawglyphfontspecs(specs, base, i, ox, y1);
-			specs += i;
-			numspecs -= i;
-			i = 0;
-		}
-		if (i == 0) {
-			ox = x;
-			base = new;
-		}
-		i++;
-	}
-	if (i > 0)
-		xdrawglyphfontspecs(specs, base, i, ox, y1);
-}
-
-void
-xfinishdraw(void)
-{
-	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
-			win.h, 0, 0);
-	XSetForeground(xw.dpy, dc.gc,
-			dc.col[IS_SET(MODE_REVERSE)?
-				defaultfg : defaultbg].pixel);
-}
-
-void
-xximspot(int x, int y)
-{
-	if (xw.ime.xic == NULL)
-		return;
-
-	xw.ime.spot.x = borderpx + x * win.cw;
-	xw.ime.spot.y = borderpx + (y + 1) * win.ch;
-
-	XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);
-}
-
-void
-expose(XEvent *ev)
-{
-	redraw();
-}
-
-void
-visibility(XEvent *ev)
-{
-	XVisibilityEvent *e = &ev->xvisibility;
-
-	MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE);
-}
-
-void
-unmap(XEvent *ev)
-{
-	win.mode &= ~MODE_VISIBLE;
-}
-
-void
-xsetpointermotion(int set)
-{
-	MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
-	XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
-}
-
-void
-xsetmode(int set, unsigned int flags)
-{
-	int mode = win.mode;
-	MODBIT(win.mode, set, flags);
-	if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE))
-		redraw();
-}
-
-int
-xsetcursor(int cursor)
-{
-	if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
-		return 1;
-	win.cursor = cursor;
-	return 0;
-}
-
-void
-xseturgency(int add)
-{
-	XWMHints *h = XGetWMHints(xw.dpy, xw.win);
-
-	MODBIT(h->flags, add, XUrgencyHint);
-	XSetWMHints(xw.dpy, xw.win, h);
-	XFree(h);
-}
-
-void
-xbell(void)
-{
-	if (!(IS_SET(MODE_FOCUSED)))
-		xseturgency(1);
-	if (bellvolume)
-		XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
-}
-
-void
-focus(XEvent *ev)
-{
-	XFocusChangeEvent *e = &ev->xfocus;
-
-	if (e->mode == NotifyGrab)
-		return;
-
-	if (ev->type == FocusIn) {
-		if (xw.ime.xic)
-			XSetICFocus(xw.ime.xic);
-		win.mode |= MODE_FOCUSED;
-		xseturgency(0);
-		if (IS_SET(MODE_FOCUS))
-			ttywrite("\033[I", 3, 0);
-	} else {
-		if (xw.ime.xic)
-			XUnsetICFocus(xw.ime.xic);
-		win.mode &= ~MODE_FOCUSED;
-		if (IS_SET(MODE_FOCUS))
-			ttywrite("\033[O", 3, 0);
-	}
-}
-
-int
-match(uint mask, uint state)
-{
-	return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
-}
-
-char*
-kmap(KeySym k, uint state)
-{
-	Key *kp;
-	int i;
-
-	/* Check for mapped keys out of X11 function keys. */
-	for (i = 0; i < LEN(mappedkeys); i++) {
-		if (mappedkeys[i] == k)
-			break;
-	}
-	if (i == LEN(mappedkeys)) {
-		if ((k & 0xFFFF) < 0xFD00)
-			return NULL;
-	}
-
-	for (kp = key; kp < key + LEN(key); kp++) {
-		if (kp->k != k)
-			continue;
-
-		if (!match(kp->mask, state))
-			continue;
-
-		if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
-			continue;
-		if (IS_SET(MODE_NUMLOCK) && kp->appkey == 2)
-			continue;
-
-		if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
-			continue;
-
-		return kp->s;
-	}
-
-	return NULL;
-}
-
-void
-kpress(XEvent *ev)
-{
-	XKeyEvent *e = &ev->xkey;
-	KeySym ksym = NoSymbol;
-	char buf[64], *customkey;
-	int len;
-	Rune c;
-	Status status;
-	Shortcut *bp;
-
-	if (IS_SET(MODE_KBDLOCK))
-		return;
-
-	if (xw.ime.xic) {
-		len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
-		if (status == XBufferOverflow)
-			return;
-	} else {
-		len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
-	}
-
-	if ( IS_SET(MODE_KBDSELECT) ) {
-		if ( match(XK_NO_MOD, e->state) ||
-		     (XK_Shift_L | XK_Shift_R) & e->state )
-			win.mode ^= trt_kbdselect(ksym, buf, len);
-		return;
-	}
-	
-	/* 1. shortcuts */
-	for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
-		if (ksym == bp->keysym && match(bp->mod, e->state)) {
-			bp->func(&(bp->arg));
-			return;
-		}
-	}
-
-	/* 2. custom keys from config.h */
-	if ((customkey = kmap(ksym, e->state))) {
-		ttywrite(customkey, strlen(customkey), 1);
-		return;
-	}
-
-	/* 3. composed string from input method */
-	if (len == 0)
-		return;
-	if (len == 1 && e->state & Mod1Mask) {
-		if (IS_SET(MODE_8BIT)) {
-			if (*buf < 0177) {
-				c = *buf | 0x80;
-				len = utf8encode(c, buf);
-			}
-		} else {
-			buf[1] = buf[0];
-			buf[0] = '\033';
-			len = 2;
-		}
-	}
-	ttywrite(buf, len, 1);
-}
-
-void
-cmessage(XEvent *e)
-{
-	/*
-	 * See xembed specs
-	 *  http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
-	 */
-	if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
-		if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
-			win.mode |= MODE_FOCUSED;
-			xseturgency(0);
-		} else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
-			win.mode &= ~MODE_FOCUSED;
-		}
-	} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
-		ttyhangup();
-		exit(0);
-	}
-}
-
-void
-resize(XEvent *e)
-{
-	if (e->xconfigure.width == win.w && e->xconfigure.height == win.h)
-		return;
-
-	cresize(e->xconfigure.width, e->xconfigure.height);
-}
-
-void
-run(void)
-{
-	XEvent ev;
-	int w = win.w, h = win.h;
-	fd_set rfd;
-	int xfd = XConnectionNumber(xw.dpy), ttyfd, xev, drawing;
-	struct timespec seltv, *tv, now, lastblink, trigger;
-	double timeout;
-
-	/* Waiting for window mapping */
-	do {
-		XNextEvent(xw.dpy, &ev);
-		/*
-		 * This XFilterEvent call is required because of XOpenIM. It
-		 * does filter out the key event and some client message for
-		 * the input method too.
-		 */
-		if (XFilterEvent(&ev, None))
-			continue;
-		if (ev.type == ConfigureNotify) {
-			w = ev.xconfigure.width;
-			h = ev.xconfigure.height;
-		}
-	} while (ev.type != MapNotify);
-
-	ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
-	cresize(w, h);
-
-	for (timeout = -1, drawing = 0, lastblink = (struct timespec){0};;) {
-		FD_ZERO(&rfd);
-		FD_SET(ttyfd, &rfd);
-		FD_SET(xfd, &rfd);
-
-		if (XPending(xw.dpy))
-			timeout = 0;  /* existing events might not set xfd */
-
-		seltv.tv_sec = timeout / 1E3;
-		seltv.tv_nsec = 1E6 * (timeout - 1E3 * seltv.tv_sec);
-		tv = timeout >= 0 ? &seltv : NULL;
-
-		if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
-			if (errno == EINTR)
-				continue;
-			die("select failed: %s\n", strerror(errno));
-		}
-		clock_gettime(CLOCK_MONOTONIC, &now);
-
-		if (FD_ISSET(ttyfd, &rfd))
-			ttyread();
-
-		xev = 0;
-		while (XPending(xw.dpy)) {
-			xev = 1;
-			XNextEvent(xw.dpy, &ev);
-			if (XFilterEvent(&ev, None))
-				continue;
-			if (handler[ev.type])
-				(handler[ev.type])(&ev);
-		}
-
-		/*
-		 * To reduce flicker and tearing, when new content or event
-		 * triggers drawing, we first wait a bit to ensure we got
-		 * everything, and if nothing new arrives - we draw.
-		 * We start with trying to wait minlatency ms. If more content
-		 * arrives sooner, we retry with shorter and shorter periods,
-		 * and eventually draw even without idle after maxlatency ms.
-		 * Typically this results in low latency while interacting,
-		 * maximum latency intervals during `cat huge.txt`, and perfect
-		 * sync with periodic updates from animations/key-repeats/etc.
-		 */
-		if (FD_ISSET(ttyfd, &rfd) || xev) {
-			if (!drawing) {
-				trigger = now;
-				drawing = 1;
-			}
-			timeout = (maxlatency - TIMEDIFF(now, trigger)) \
-			          / maxlatency * minlatency;
-			if (timeout > 0)
-				continue;  /* we have time, try to find idle */
-		}
-
-		/* idle detected or maxlatency exhausted -> draw */
-		timeout = -1;
-		if (blinktimeout && tattrset(ATTR_BLINK)) {
-			timeout = blinktimeout - TIMEDIFF(now, lastblink);
-			if (timeout <= 0) {
-				if (-timeout > blinktimeout) /* start visible */
-					win.mode |= MODE_BLINK;
-				win.mode ^= MODE_BLINK;
-				tsetdirtattr(ATTR_BLINK);
-				lastblink = now;
-				timeout = blinktimeout;
-			}
-		}
-
-		draw();
-		XFlush(xw.dpy);
-		drawing = 0;
-	}
-}
-
-void
-usage(void)
-{
-	die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
-	    " [-n name] [-o file]\n"
-	    "          [-T title] [-t title] [-w windowid]"
-	    " [[-e] command [args ...]]\n"
-	    "       %s [-aiv] [-c class] [-f font] [-g geometry]"
-	    " [-n name] [-o file]\n"
-	    "          [-T title] [-t title] [-w windowid] -l line"
-	    " [stty_args ...]\n", argv0, argv0);
-}
-
-void toggle_winmode(int flag) {
-	win.mode ^= flag;
-}
-
-void keyboard_select(const Arg *dummy) {
-	win.mode ^= trt_kbdselect(-1, NULL, 0);
-}
-
-int
-main(int argc, char *argv[])
-{
-	xw.l = xw.t = 0;
-	xw.isfixed = False;
-	xsetcursor(cursorshape);
-
-	ARGBEGIN {
-	case 'a':
-		allowaltscreen = 0;
-		break;
-	case 'c':
-		opt_class = EARGF(usage());
-		break;
-	case 'e':
-		if (argc > 0)
-			--argc, ++argv;
-		goto run;
-	case 'f':
-		opt_font = EARGF(usage());
-		break;
-	case 'g':
-		xw.gm = XParseGeometry(EARGF(usage()),
-				&xw.l, &xw.t, &cols, &rows);
-		break;
-	case 'i':
-		xw.isfixed = 1;
-		break;
-	case 'o':
-		opt_io = EARGF(usage());
-		break;
-	case 'l':
-		opt_line = EARGF(usage());
-		break;
-	case 'n':
-		opt_name = EARGF(usage());
-		break;
-	case 't':
-	case 'T':
-		opt_title = EARGF(usage());
-		break;
-	case 'w':
-		opt_embed = EARGF(usage());
-		break;
-	case 'v':
-		die("%s " VERSION "\n", argv0);
-		break;
-	default:
-		usage();
-	} ARGEND;
-
-run:
-	if (argc > 0) /* eat all remaining arguments */
-		opt_cmd = argv;
-
-	if (!opt_title)
-		opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
-
-	setlocale(LC_CTYPE, "");
-	XSetLocaleModifiers("");
-	cols = MAX(cols, 1);
-	rows = MAX(rows, 1);
-	tnew(cols, rows);
-	xinit(cols, rows);
-	xsetenv();
-	selinit();
-	run();
-
-	return 0;
-}
diff --git a/src/tcc/setup.sh b/src/tcc/setup.sh
deleted file mode 100755
index ed6c6d6..0000000
--- a/src/tcc/setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd tcc
-
-./configure --prefix=${HOME}/.local
-make
-make test
-make install
-ln -sf ${HOME}/.local/bin/tcc ${HOME}/.local/bin/cc
diff --git a/src/tcc/tcc b/src/tcc/tcc
deleted file mode 160000
-Subproject 4fccaf61241a5eb72b0777b3a44bd7abbea4860
diff --git a/src/tcsh/setup.sh b/src/tcsh/setup.sh
deleted file mode 100755
index f96e30d..0000000
--- a/src/tcsh/setup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cd tcsh
-./configure --prefix=${HOME}/.local
-make
-make install
diff --git a/src/tcsh/tcsh b/src/tcsh/tcsh
deleted file mode 160000
-Subproject 626e47612a42d769d6082eef4f43fafd0da84d8
diff --git a/src/vi/setup.sh b/src/vi/setup.sh
deleted file mode 100755
index 2752651..0000000
--- a/src/vi/setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export PREFIX=${HOME}/.local
-
-cd vi
-make
-make install
-
diff --git a/src/vi/vi b/src/vi/vi
deleted file mode 160000
-Subproject 9855bed0869ace4665e2776ec4d489847a0781b