0007-Unnecessary-gcrypt-requirement.diff: Only link against and #include gcrypt for gnutls < 2.12

11 files changed, 8821 insertions, 1 deletions

diff --git a/.pc/0007-Unnecessary-gcrypt-requirement.diff/.timestamp b/.pc/0007-Unnecessary-gcrypt-requirement.diff/.timestamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.pc/0007-Unnecessary-gcrypt-requirement.diff/.timestamp
diff --git a/.pc/0007-Unnecessary-gcrypt-requirement.diff/linux/Makefile b/.pc/0007-Unnecessary-gcrypt-requirement.diff/linux/Makefile
new file mode 100644
index 0000000..68ad52a
--- /dev/null
+++ b/.pc/0007-Unnecessary-gcrypt-requirement.diff/linux/Makefile
@@ -0,0 +1,70 @@
+LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4 gnutls gthread-2.0
+
+CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS))
+LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl -lgcrypt
+
+PREFIX?= /usr/local
+BINDIR?= $(PREFIX)/bin
+MANDIR?= $(PREFIX)/share/man
+RESDIR?= $(PREFIX)/share/xxxterm
+
+SRCS= $(shell ls ../*.c)
+SRCS+= linux.c
+OBJS= $(SRCS:.c=.o)
+DEPS= $(addsuffix .depend, $(OBJS))
+
+CC?= gcc
+
+BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh)
+ifneq ("${BUILDVERSION}", "")
+CFLAGS+= -DXXXTERM_BUILDSTR=\"$(BUILDVERSION)\"
+endif
+
+all: javascript.h xxxterm
+
+javascript.h: ../js-merge-helper.pl ../hinting.js ../autoscroll.js
+	perl ../js-merge-helper.pl ../hinting.js ../input-focus.js \
+	../autoscroll.js > javascript.h
+
+xxxterm: $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LDADD)
+
+%.o: %.c
+	@echo "Generating $@.depend"
+	@$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< | \
+	sed 's,^.*\.o[ :]*,$@ $@.depend : ,g' > $@.depend
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+
+install: all
+	install -m 755 -d $(DESTDIR)$(BINDIR)
+	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
+	install -m 755 -d $(DESTDIR)$(RESDIR)
+	install -m 755 xxxterm $(DESTDIR)$(BINDIR)
+	install -m 644 ../xxxterm.1 $(DESTDIR)$(MANDIR)/man1/xxxterm.1
+	install -m 644 ../xxxtermicon16.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xxxtermicon32.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xxxtermicon48.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xxxtermicon64.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xxxtermicon128.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
+	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
+
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/xxxterm
+	rm -f $(DESTDIR)$(MANDIR)/man1/xxxterm.1
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon.png
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon16.png
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon32.png
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon48.png
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon64.png
+	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon128.png
+	rm -f $(DESTDIR)$(RESDIR)/style.css
+	if [ -d $(DESTDIR)$(RESDIR) ]; then rmdir $(DESTDIR)$(RESDIR); fi
+clean:
+	rm -f xxxterm $(OBJS) $(DEPS)
+	rm -f javascript.h
+
+
+-include $(DEPS)
+
+.PHONY: all install clean
diff --git a/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.c b/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.c
new file mode 100644
index 0000000..26c6987
--- /dev/null
+++ b/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.c
@@ -0,0 +1,7995 @@
+/*
+ * Copyright (c) 2010, 2011 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2011 Stevan Andjelkovic <stevan@student.chalmers.se>
+ * Copyright (c) 2010, 2011, 2012 Edd Barrett <vext01@gmail.com>
+ * Copyright (c) 2011 Todd T. Fries <todd@fries.net>
+ * Copyright (c) 2011 Raphael Graf <r@undefined.ch>
+ * Copyright (c) 2011 Michal Mazurek <akfaew@jasminek.net>
+ *
+ * Permission to use, copy, modify, and 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.
+ */
+
+#include <xxxterm.h>
+#include <netdb.h>
+#include "version.h"
+
+char		*version = XXXTERM_VERSION;
+
+#ifdef XT_DEBUG
+uint32_t		swm_debug = 0
+			    | XT_D_MOVE
+			    | XT_D_KEY
+			    | XT_D_TAB
+			    | XT_D_URL
+			    | XT_D_CMD
+			    | XT_D_NAV
+			    | XT_D_DOWNLOAD
+			    | XT_D_CONFIG
+			    | XT_D_JS
+			    | XT_D_FAVORITE
+			    | XT_D_PRINTING
+			    | XT_D_COOKIE
+			    | XT_D_KEYBINDING
+			    | XT_D_CLIP
+			    | XT_D_BUFFERCMD
+			    | XT_D_INSPECTOR
+			    | XT_D_VISITED
+			    | XT_D_HISTORY
+			    ;
+#endif
+
+#ifdef USE_THREADS
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
+
+char		*icons[] = {
+	"xxxtermicon16.png",
+	"xxxtermicon32.png",
+	"xxxtermicon48.png",
+	"xxxtermicon64.png",
+	"xxxtermicon128.png"
+};
+
+struct session {
+	TAILQ_ENTRY(session)	entry;
+	const gchar		*name;
+};
+TAILQ_HEAD(session_list, session);
+
+struct undo {
+	TAILQ_ENTRY(undo)	entry;
+	gchar			*uri;
+	GList			*history;
+	int			back; /* Keeps track of how many back
+				       * history items there are. */
+};
+TAILQ_HEAD(undo_tailq, undo);
+
+struct command_entry {
+	char				*line;
+	TAILQ_ENTRY(command_entry)	entry;
+};
+TAILQ_HEAD(command_list, command_entry);
+
+/* defines */
+#define XT_DIR			(".xxxterm")
+#define XT_CACHE_DIR		("cache")
+#define XT_CERT_DIR		("certs")
+#define XT_JS_DIR		("js")
+#define XT_SESSIONS_DIR		("sessions")
+#define XT_TEMP_DIR		("tmp")
+#define XT_CONF_FILE		("xxxterm.conf")
+#define XT_QMARKS_FILE		("quickmarks")
+#define XT_SAVED_TABS_FILE	("main_session")
+#define XT_RESTART_TABS_FILE	("restart_tabs")
+#define XT_SOCKET_FILE		("socket")
+#define XT_SAVE_SESSION_ID	("SESSION_NAME=")
+#define XT_SEARCH_FILE		("search_history")
+#define XT_COMMAND_FILE		("command_history")
+#define XT_DLMAN_REFRESH	"10"
+#define XT_MAX_URL_LENGTH	(4096) /* 1 page is atomic, don't make bigger */
+#define XT_MAX_UNDO_CLOSE_TAB	(32)
+#define XT_RESERVED_CHARS	"$&+,/:;=?@ \"<>#%%{}|^~[]`"
+#define XT_PRINT_EXTRA_MARGIN	10
+#define XT_URL_REGEX		("^[[:blank:]]*[^[:blank:]]*([[:alnum:]-]+\\.)+[[:alnum:]-][^[:blank:]]*[[:blank:]]*$")
+#define XT_INVALID_MARK		(-1) /* XXX this is a double, maybe use something else, like a nan */
+
+/* colors */
+#define XT_COLOR_RED		"#cc0000"
+#define XT_COLOR_YELLOW		"#ffff66"
+#define XT_COLOR_BLUE		"lightblue"
+#define XT_COLOR_GREEN		"#99ff66"
+#define XT_COLOR_WHITE		"white"
+#define XT_COLOR_BLACK		"black"
+
+#define XT_COLOR_CT_BACKGROUND	"#000000"
+#define XT_COLOR_CT_INACTIVE	"#dddddd"
+#define XT_COLOR_CT_ACTIVE	"#bbbb00"
+#define XT_COLOR_CT_SEPARATOR	"#555555"
+
+#define XT_COLOR_SB_SEPARATOR	"#555555"
+
+#define XT_PROTO_DELIM		"://"
+
+/* actions */
+#define XT_MOVE_INVALID		(0)
+#define XT_MOVE_DOWN		(1)
+#define XT_MOVE_UP		(2)
+#define XT_MOVE_BOTTOM		(3)
+#define XT_MOVE_TOP		(4)
+#define XT_MOVE_PAGEDOWN	(5)
+#define XT_MOVE_PAGEUP		(6)
+#define XT_MOVE_HALFDOWN	(7)
+#define XT_MOVE_HALFUP		(8)
+#define XT_MOVE_LEFT		(9)
+#define XT_MOVE_FARLEFT		(10)
+#define XT_MOVE_RIGHT		(11)
+#define XT_MOVE_FARRIGHT	(12)
+#define XT_MOVE_PERCENT		(13)
+#define XT_MOVE_CENTER		(14)
+
+#define XT_QMARK_SET		(0)
+#define XT_QMARK_OPEN		(1)
+#define XT_QMARK_TAB		(2)
+
+#define XT_MARK_SET		(0)
+#define XT_MARK_GOTO		(1)
+
+#define XT_GO_UP_ROOT		(999)
+
+#define XT_TAB_LAST		(-4)
+#define XT_TAB_FIRST		(-3)
+#define XT_TAB_PREV		(-2)
+#define XT_TAB_NEXT		(-1)
+#define XT_TAB_INVALID		(0)
+#define XT_TAB_NEW		(1)
+#define XT_TAB_DELETE		(2)
+#define XT_TAB_DELQUIT		(3)
+#define XT_TAB_OPEN		(4)
+#define XT_TAB_UNDO_CLOSE	(5)
+#define XT_TAB_SHOW		(6)
+#define XT_TAB_HIDE		(7)
+#define XT_TAB_NEXTSTYLE	(8)
+#define XT_TAB_LOAD_IMAGES	(9)
+
+#define XT_NAV_INVALID		(0)
+#define XT_NAV_BACK		(1)
+#define XT_NAV_FORWARD		(2)
+#define XT_NAV_RELOAD		(3)
+#define XT_NAV_STOP		(4)
+
+#define XT_FOCUS_INVALID	(0)
+#define XT_FOCUS_URI		(1)
+#define XT_FOCUS_SEARCH		(2)
+
+#define XT_SEARCH_INVALID	(0)
+#define XT_SEARCH_NEXT		(1)
+#define XT_SEARCH_PREV		(2)
+
+#define XT_STYLE_CURRENT_TAB	(0)
+#define XT_STYLE_GLOBAL		(1)
+
+#define XT_PASTE_CURRENT_TAB	(0)
+#define XT_PASTE_NEW_TAB	(1)
+
+#define XT_ZOOM_IN		(-1)
+#define XT_ZOOM_OUT		(-2)
+#define XT_ZOOM_NORMAL		(100)
+
+#define XT_URL_SHOW		(1)
+#define XT_URL_HIDE		(2)
+
+#define XT_CMD_OPEN		(0)
+#define XT_CMD_OPEN_CURRENT	(1)
+#define XT_CMD_TABNEW		(2)
+#define XT_CMD_TABNEW_CURRENT	(3)
+
+#define XT_STATUS_NOTHING	(0)
+#define XT_STATUS_LINK		(1)
+#define XT_STATUS_URI		(2)
+#define XT_STATUS_LOADING	(3)
+
+#define XT_SES_DONOTHING	(0)
+#define XT_SES_CLOSETABS	(1)
+
+#define XT_PREFIX		(1<<0)
+#define XT_USERARG		(1<<1)
+#define XT_URLARG		(1<<2)
+#define XT_INTARG		(1<<3)
+#define XT_SESSARG		(1<<4)
+#define XT_SETARG		(1<<5)
+
+#define XT_HINT_NEWTAB		(1<<0)
+
+#define XT_BUFCMD_SZ		(8)
+
+#define XT_EJS_SHOW		(1<<0)
+
+GtkWidget *	create_button(char *, char *, int);
+
+void		recalc_tabs(void);
+void		recolor_compact_tabs(void);
+void		set_current_tab(int page_num);
+gboolean	update_statusbar_position(GtkAdjustment*, gpointer);
+void		marks_clear(struct tab *t);
+
+/* globals */
+extern char		*__progname;
+char * const		*start_argv;
+struct passwd		*pwd;
+GtkWidget		*main_window;
+GtkNotebook		*notebook;
+GtkWidget		*tab_bar;
+GtkWidget		*arrow, *abtn;
+struct tab_list		tabs;
+struct history_list	hl;
+int			hl_purge_count = 0;
+struct session_list	sessions;
+struct domain_list	c_wl;
+struct domain_list	js_wl;
+struct domain_list	pl_wl;
+struct strict_transport_tree	st_tree;
+struct undo_tailq	undos;
+struct keybinding_list	kbl;
+struct sp_list		spl;
+struct user_agent_list	ua_list;
+int			user_agent_count = 0;
+struct command_list	chl;
+struct command_list	shl;
+struct command_entry	*history_at;
+struct command_entry	*search_at;
+int			undo_count;
+int			cmd_history_count = 0;
+int			search_history_count = 0;
+char			*global_search;
+uint64_t		blocked_cookies = 0;
+char			named_session[PATH_MAX];
+GtkListStore		*completion_model;
+GtkListStore		*buffers_store;
+
+char			*qmarks[XT_NOMARKS];
+int			btn_down;	/* M1 down in any wv */
+regex_t			url_re;		/* guess_search regex */
+
+/* starts from 1 to catch atoi() failures when calling xtp_handle_dl() */
+int			next_download_id = 1;
+
+void			xxx_dir(char *);
+int			icon_size_map(int);
+
+void
+history_delete(struct command_list *l, int *counter)
+{
+	struct command_entry	*c;
+
+	if (l == NULL || counter == NULL)
+		return;
+
+	c = TAILQ_LAST(l, command_list);
+	if (c == NULL)
+		return;
+
+	TAILQ_REMOVE(l, c, entry);
+	*counter -= 1;
+	g_free(c->line);
+	g_free(c);
+}
+
+void
+history_add(struct command_list *list, char *file, char *l, int *counter)
+{
+	struct command_entry	*c;
+	FILE			*f;
+
+	if (list == NULL || l == NULL || counter == NULL)
+		return;
+
+	/* don't add the same line */
+	c = TAILQ_FIRST(list);
+	if (c)
+		if (!strcmp(c->line + 1 /* skip space */, l))
+			return;
+
+	c = g_malloc0(sizeof *c);
+	c->line = g_strdup_printf(" %s", l);
+
+	*counter += 1;
+	TAILQ_INSERT_HEAD(list, c, entry);
+
+	if (*counter > 1000)
+		history_delete(list, counter);
+
+	if (history_autosave && file) {
+		f = fopen(file, "w");
+		if (f == NULL) {
+			show_oops(NULL, "couldn't write history %s", file);
+			return;
+		}
+
+		TAILQ_FOREACH_REVERSE(c, list, command_list, entry) {
+			c->line[0] = ' ';
+			fprintf(f, "%s\n", c->line);
+		}
+
+		fclose(f);
+	}
+}
+
+int
+history_read(struct command_list *list, char *file, int *counter)
+{
+	FILE			*f;
+	char			*s, line[65536];
+
+	if (list == NULL || file == NULL)
+		return (1);
+
+	f = fopen(file, "r");
+	if (f == NULL) {
+		startpage_add("couldn't open history file %s", file);
+		return (1);
+	}
+
+	for (;;) {
+		s = fgets(line, sizeof line, f);
+		if (s == NULL || feof(f) || ferror(f))
+			break;
+		if ((s = strchr(line, '\n')) == NULL) {
+			startpage_add("invalid history file %s", file);
+			fclose(f);
+			return (1);
+		}
+		*s = '\0';
+
+		history_add(list, NULL, line + 1, counter);
+	}
+
+	fclose(f);
+
+	return (0);
+}
+
+/* marks and quickmarks array storage.
+ * first a-z, then A-Z, then 0-9 */
+char
+indextomark(int i)
+{
+	if (i < 0)
+		return (0);
+
+	if (i >= 0 && i <= 'z' - 'a')
+		return 'a' + i;
+
+	i -= 'z' - 'a' + 1;
+	if (i >= 0 && i <= 'Z' - 'A')
+		return 'A' + i;
+
+	i -= 'Z' - 'A' + 1;
+	if (i >= 10)
+		return (0);
+
+	return i + '0';
+}
+
+int
+marktoindex(char m)
+{
+	int ret = 0;
+
+	if (m >= 'a' && m <= 'z')
+		return ret + m - 'a';
+
+	ret += 'z' - 'a' + 1;
+	if (m >= 'A' && m <= 'Z')
+		return ret + m - 'A';
+
+	ret += 'Z' - 'A' + 1;
+	if (m >= '0' && m <= '9')
+		return ret + m - '0';
+
+	return (-1);
+}
+
+#ifndef XT_SIGNALS_DISABLE
+void
+sigchild(int sig)
+{
+	int			saved_errno, status;
+	pid_t			pid;
+
+	saved_errno = errno;
+
+	while ((pid = waitpid(WAIT_ANY, &status, WNOHANG)) != 0) {
+		if (pid == -1) {
+			if (errno == EINTR)
+				continue;
+			if (errno != ECHILD) {
+				/*
+				clog_warn("sigchild: waitpid:");
+				*/
+			}
+			break;
+		}
+
+		if (WIFEXITED(status)) {
+			if (WEXITSTATUS(status) != 0) {
+				/*
+				clog_warnx("sigchild: child exit status: %d",
+				    WEXITSTATUS(status));
+				*/
+			}
+		} else {
+			/*
+			clog_warnx("sigchild: child is terminated abnormally");
+			*/
+		}
+	}
+
+	errno = saved_errno;
+}
+#endif
+
+int
+is_g_object_setting(GObject *o, char *str)
+{
+	guint			n_props = 0, i;
+	GParamSpec		**proplist;
+	int			rv = 0;
+
+	if (!G_IS_OBJECT(o))
+		return (0);
+
+	proplist = g_object_class_list_properties(G_OBJECT_GET_CLASS(o),
+	    &n_props);
+
+	for (i = 0; i < n_props; i++) {
+		if (! strcmp(proplist[i]->name, str)) {
+			rv = 1;
+			break;
+		}
+	}
+
+	g_free(proplist);
+	return (rv);
+}
+
+struct tab *
+get_current_tab(void)
+{
+	struct tab		*t;
+
+	TAILQ_FOREACH(t, &tabs, entry) {
+		if (t->tab_id == gtk_notebook_get_current_page(notebook))
+			return (t);
+	}
+
+	warnx("%s: no current tab", __func__);
+
+	return (NULL);
+}
+
+void
+set_status(struct tab *t, gchar *s, int status)
+{
+	gchar *type = NULL;
+
+	if (s == NULL)
+		return;
+
+	switch (status) {
+	case XT_STATUS_LOADING:
+		type = g_strdup_printf("Loading: %s", s);
+		s = type;
+		break;
+	case XT_STATUS_LINK:
+		type = g_strdup_printf("Link: %s", s);
+		if (!t->status)
+			t->status = g_strdup(gtk_entry_get_text(
+			    GTK_ENTRY(t->sbe.statusbar)));
+		s = type;
+		break;
+	case XT_STATUS_URI:
+		type = g_strdup_printf("%s", s);
+		if (!t->status) {
+			t->status = g_strdup(type);
+		}
+		s = type;
+		if (!t->status)
+			t->status = g_strdup(s);
+		break;
+	case XT_STATUS_NOTHING:
+		/* FALL THROUGH */
+	default:
+		break;
+	}
+	gtk_entry_set_text(GTK_ENTRY(t->sbe.statusbar), s);
+	if (type)
+		g_free(type);
+}
+
+void
+hide_cmd(struct tab *t)
+{
+	DNPRINTF(XT_D_CMD, "%s: tab %d\n", __func__, t->tab_id);
+
+	history_at = NULL; /* just in case */
+	search_at = NULL; /* just in case */
+	gtk_widget_hide(t->cmd);
+}
+
+void
+show_cmd(struct tab *t)
+{
+	DNPRINTF(XT_D_CMD, "%s: tab %d\n", __func__, t->tab_id);
+
+	history_at = NULL;
+	search_at = NULL;
+	gtk_widget_hide(t->oops);
+	gtk_widget_show(t->cmd);
+}
+
+void
+hide_buffers(struct tab *t)
+{
+	gtk_widget_hide(t->buffers);
+	gtk_list_store_clear(buffers_store);
+}
+
+enum {
+	COL_ID		= 0,
+	COL_FAVICON,
+	COL_TITLE,
+	NUM_COLS
+};
+
+int
+sort_tabs_by_page_num(struct tab ***stabs)
+{
+	int			num_tabs = 0;
+	struct tab		*t;
+
+	num_tabs = gtk_notebook_get_n_pages(notebook);
+
+	*stabs = g_malloc0(num_tabs * sizeof(struct tab *));
+
+	TAILQ_FOREACH(t, &tabs, entry)
+		(*stabs)[gtk_notebook_page_num(notebook, t->vbox)] = t;
+
+	return (num_tabs);
+}
+
+void
+buffers_make_list(void)
+{
+	int			i, num_tabs;
+	const gchar		*title = NULL;
+	GtkTreeIter		iter;
+	struct tab		**stabs = NULL;
+
+	num_tabs = sort_tabs_by_page_num(&stabs);
+
+	for (i = 0; i < num_tabs; i++)
+		if (stabs[i]) {
+			gtk_list_store_append(buffers_store, &iter);
+			title = get_title(stabs[i], FALSE);
+			gtk_list_store_set(buffers_store, &iter,
+			    COL_ID, i + 1, /* Enumerate the tabs starting from 1
+					    * rather than 0. */
+			    COL_FAVICON, gtk_image_get_pixbuf
+			        (GTK_IMAGE(stabs[i]->tab_elems.favicon)),
+			    COL_TITLE, title,
+			    -1);
+		}
+
+	g_free(stabs);
+}
+
+void
+show_buffers(struct tab *t)
+{
+	if (gtk_widget_get_visible(GTK_WIDGET(t->buffers)))
+		return;
+
+	buffers_make_list();
+	gtk_widget_show(t->buffers);
+	gtk_widget_grab_focus(GTK_WIDGET(t->buffers));
+}
+
+void
+toggle_buffers(struct tab *t)
+{
+	if (gtk_widget_get_visible(t->buffers))
+		hide_buffers(t);
+	else
+		show_buffers(t);
+}
+
+int
+buffers(struct tab *t, struct karg *args)
+{
+	show_buffers(t);
+
+	return (0);
+}
+
+void
+hide_oops(struct tab *t)
+{
+	gtk_widget_hide(t->oops);
+}
+
+void
+show_oops(struct tab *at, const char *fmt, ...)
+{
+	va_list			ap;
+	char			*msg = NULL;
+	struct tab		*t = NULL;
+
+	if (fmt == NULL)
+		return;
+
+	if (at == NULL) {
+		if ((t = get_current_tab()) == NULL)
+			return;
+	} else
+		t = at;
+
+	va_start(ap, fmt);
+	if (vasprintf(&msg, fmt, ap) == -1)
+		errx(1, "show_oops failed");
+	va_end(ap);
+
+	gtk_entry_set_text(GTK_ENTRY(t->oops), msg);
+	gtk_widget_hide(t->cmd);
+	gtk_widget_show(t->oops);
+
+	if (msg)
+		free(msg);
+}
+
+char			work_dir[PATH_MAX];
+char			certs_dir[PATH_MAX];
+char			js_dir[PATH_MAX];
+char			cache_dir[PATH_MAX];
+char			sessions_dir[PATH_MAX];
+char			temp_dir[PATH_MAX];
+char			cookie_file[PATH_MAX];
+char			*strict_transport_file = NULL;
+SoupSession		*session;
+SoupCookieJar		*s_cookiejar;
+SoupCookieJar		*p_cookiejar;
+char			rc_fname[PATH_MAX];
+
+struct mime_type_list	mtl;
+struct alias_list	aliases;
+
+/* protos */
+struct tab		*create_new_tab(char *, struct undo *, int, int);
+void			delete_tab(struct tab *);
+void			setzoom_webkit(struct tab *, int);
+int			download_rb_cmp(struct download *, struct download *);
+gboolean		cmd_execute(struct tab *t, char *str);
+
+int
+history_rb_cmp(struct history *h1, struct history *h2)
+{
+	return (strcmp(h1->uri, h2->uri));
+}
+RB_GENERATE(history_list, history, entry, history_rb_cmp);
+
+int
+domain_rb_cmp(struct domain *d1, struct domain *d2)
+{
+	return (strcmp(d1->d, d2->d));
+}
+RB_GENERATE(domain_list, domain, entry, domain_rb_cmp);
+
+int
+download_rb_cmp(struct download *e1, struct download *e2)
+{
+	return (e1->id < e2->id ? -1 : e1->id > e2->id);
+}
+RB_GENERATE(download_list, download, entry, download_rb_cmp);
+
+struct valid_url_types {
+	char		*type;
+} vut[] = {
+	{ "http://" },
+	{ "https://" },
+	{ "ftp://" },
+	{ "file://" },
+	{ XT_XTP_STR },
+};
+
+int
+valid_url_type(char *url)
+{
+	int			i;
+
+	for (i = 0; i < LENGTH(vut); i++)
+		if (!strncasecmp(vut[i].type, url, strlen(vut[i].type)))
+			return (0);
+
+	return (1);
+}
+
+char *
+match_alias(char *url_in)
+{
+	struct alias		*a;
+	char			*arg;
+	char			*url_out = NULL, *search, *enc_arg;
+
+	search = g_strdup(url_in);
+	arg = search;
+	if (strsep(&arg, " \t") == NULL) {
+		show_oops(NULL, "match_alias: NULL URL");
+		goto done;
+	}
+
+	TAILQ_FOREACH(a, &aliases, entry) {
+		if (!strcmp(search, a->a_name))
+			break;
+	}
+
+	if (a != NULL) {
+		DNPRINTF(XT_D_URL, "match_alias: matched alias %s\n",
+		    a->a_name);
+		if (arg != NULL) {
+			enc_arg = soup_uri_encode(arg, XT_RESERVED_CHARS);
+			url_out = g_strdup_printf(a->a_uri, enc_arg);
+			g_free(enc_arg);
+		} else
+			url_out = g_strdup_printf(a->a_uri, "");
+	}
+done:
+	g_free(search);
+	return (url_out);
+}
+
+char *
+guess_url_type(char *url_in)
+{
+	struct stat		sb;
+	char			*url_out = NULL, *enc_search = NULL;
+	int			i;
+	char			*cwd;
+
+
+	/* substitute aliases */
+	url_out = match_alias(url_in);
+	if (url_out != NULL)
+		return (url_out);
+
+	/* see if we are an about page */
+	if (!strncmp(url_in, XT_URI_ABOUT, XT_URI_ABOUT_LEN))
+		for (i = 0; i < about_list_size(); i++)
+			if (!strcmp(&url_in[XT_URI_ABOUT_LEN],
+			    about_list[i].name)) {
+				url_out = g_strdup(url_in);
+				goto done;
+			}
+
+	if (guess_search && url_regex &&
+	    !(g_str_has_prefix(url_in, "http://") ||
+	    g_str_has_prefix(url_in, "https://"))) {
+		if (regexec(&url_re, url_in, 0, NULL, 0)) {
+			/* invalid URI so search instead */
+			enc_search = soup_uri_encode(url_in, XT_RESERVED_CHARS);
+			url_out = g_strdup_printf(search_string, enc_search);
+			g_free(enc_search);
+			goto done;
+		}
+	}
+
+	/* XXX not sure about this heuristic */
+	if (stat(url_in, &sb) == 0) {
+		if (url_in[0] == '/')
+			url_out = g_strdup_printf("file://%s", url_in);
+		else {
+			cwd = malloc(PATH_MAX);
+			if (getcwd(cwd, PATH_MAX) != NULL) {
+				url_out = g_strdup_printf("file://%s/%s",cwd, url_in);
+			}
+			free(cwd);
+		}
+	} else
+		url_out = g_strdup_printf("http://%s", url_in); /* guess http */
+done:
+	DNPRINTF(XT_D_URL, "guess_url_type: guessed %s\n", url_out);
+
+	return (url_out);
+}
+
+void
+load_uri(struct tab *t, gchar *uri)
+{
+	struct karg	args;
+	gchar		*newuri = NULL;
+	int		i;
+
+	if (uri == NULL)
+		return;
+
+	/* Strip leading spaces. */
+	while (*uri && isspace(*uri))
+		uri++;
+
+	if (strlen(uri) == 0) {
+		blank(t, NULL);
+		return;
+	}
+
+	t->xtp_meaning = XT_XTP_TAB_MEANING_NORMAL;
+
+	if (valid_url_type(uri)) {
+		newuri = guess_url_type(uri);
+		uri = newuri;
+	}
+
+	if (!strncmp(uri, XT_URI_ABOUT, XT_URI_ABOUT_LEN)) {
+		for (i = 0; i < about_list_size(); i++)
+			if (!strcmp(&uri[XT_URI_ABOUT_LEN], about_list[i].name)) {
+				bzero(&args, sizeof args);
+				about_list[i].func(t, &args);
+				gtk_widget_set_sensitive(GTK_WIDGET(t->stop),
+				    FALSE);
+				goto done;
+			}
+		show_oops(t, "invalid about page");
+		goto done;
+	}
+
+	set_status(t, (char *)uri, XT_STATUS_LOADING);
+	marks_clear(t);
+	webkit_web_view_load_uri(t->wv, uri);
+done:
+	if (newuri)
+		g_free(newuri);
+}
+
+const gchar *
+get_uri(struct tab *t)
+{
+	const gchar		*uri = NULL;
+
+	if (webkit_web_view_get_load_status(t->wv) == WEBKIT_LOAD_FAILED)
+		return (NULL);
+	if (t->xtp_meaning == XT_XTP_TAB_MEANING_NORMAL) {
+		uri = webkit_web_view_get_uri(t->wv);
+	} else {
+		/* use tmp_uri to make sure it is g_freed */
+		if (t->tmp_uri)
+			g_free(t->tmp_uri);
+		t->tmp_uri =g_strdup_printf("%s%s", XT_URI_ABOUT,
+		    about_list[t->xtp_meaning].name);
+		uri = t->tmp_uri;
+	}
+	return uri;
+}
+
+const gchar *
+get_title(struct tab *t, bool window)
+{
+	const gchar		*set = NULL, *title = NULL;
+	WebKitLoadStatus	status = webkit_web_view_get_load_status(t->wv);
+
+	if (status == WEBKIT_LOAD_PROVISIONAL || status == WEBKIT_LOAD_FAILED ||
+	    t->xtp_meaning == XT_XTP_TAB_MEANING_BL)
+		goto notitle;
+
+	title = webkit_web_view_get_title(t->wv);
+	if ((set = title ? title : get_uri(t)))
+		return set;
+
+notitle:
+	set = window ? XT_NAME : "(untitled)";
+
+	return set;
+}
+
+struct mime_type *
+find_mime_type(char *mime_type)
+{
+	struct mime_type	*m, *def = NULL, *rv = NULL;
+
+	TAILQ_FOREACH(m, &mtl, entry) {
+		if (m->mt_default &&
+		    !strncmp(mime_type, m->mt_type, strlen(m->mt_type)))
+			def = m;
+
+		if (m->mt_default == 0 && !strcmp(mime_type, m->mt_type)) {
+			rv = m;
+			break;
+		}
+	}
+
+	if (rv == NULL)
+		rv = def;
+
+	return (rv);
+}
+
+struct domain *
+wl_find_uri(const gchar *s, struct domain_list *wl)
+{
+	int			i;
+	char			*ss;
+	struct domain		*r;
+
+	if (s == NULL || wl == NULL)
+		return (NULL);
+
+	if (!strncmp(s, "http://", strlen("http://")))
+		s = &s[strlen("http://")];
+	else if (!strncmp(s, "https://", strlen("https://")))
+		s = &s[strlen("https://")];
+
+	if (strlen(s) < 2)
+		return (NULL);
+
+	for (i = 0; i < strlen(s) + 1 /* yes er need this */; i++)
+		/* chop string at first slash */
+		if (s[i] == '/' || s[i] == ':' || s[i] == '\0') {
+			ss = g_strdup(s);
+			ss[i] = '\0';
+			r = wl_find(ss, wl);
+			g_free(ss);
+			return (r);
+		}
+
+	return (NULL);
+}
+
+char *
+js_ref_to_string(JSContextRef context, JSValueRef ref)
+{
+	char			*s = NULL;
+	size_t			l;
+	JSStringRef		jsref;
+
+	jsref = JSValueToStringCopy(context, ref, NULL);
+	if (jsref == NULL)
+		return (NULL);
+
+	l = JSStringGetMaximumUTF8CStringSize(jsref);
+	s = g_malloc(l);
+	if (s)
+		JSStringGetUTF8CString(jsref, s, l);
+	JSStringRelease(jsref);
+
+	return (s);
+}
+
+#define XT_JS_DONE		("done;")
+#define XT_JS_DONE_LEN		(strlen(XT_JS_DONE))
+#define XT_JS_INSERT		("insert;")
+#define XT_JS_INSERT_LEN	(strlen(XT_JS_INSERT))
+
+int
+run_script(struct tab *t, char *s)
+{
+	JSGlobalContextRef	ctx;
+	WebKitWebFrame		*frame;
+	JSStringRef		str;
+	JSValueRef		val, exception;
+	char			*es;
+
+	DNPRINTF(XT_D_JS, "%s: tab %d %s\n", __func__,
+	    t->tab_id, s == (char *)JS_HINTING ? "JS_HINTING" : s);
+
+	frame = webkit_web_view_get_main_frame(t->wv);
+	ctx = webkit_web_frame_get_global_context(frame);
+
+	str = JSStringCreateWithUTF8CString(s);
+	val = JSEvaluateScript(ctx, str, JSContextGetGlobalObject(ctx),
+	    NULL, 0, &exception);
+	JSStringRelease(str);
+
+	DNPRINTF(XT_D_JS, "%s: val %p\n", __func__, val);
+	if (val == NULL) {
+		es = js_ref_to_string(ctx, exception);
+		if (es) {
+			DNPRINTF(XT_D_JS, "%s: exception %s\n", __func__, es);
+			g_free(es);
+		}
+		return (1);
+	} else {
+		es = js_ref_to_string(ctx, val);
+#if 0
+		/* return values */
+		if (!strncmp(es, XT_JS_DONE, XT_JS_DONE_LEN))
+			; /* do nothing */
+		if (!strncmp(es, XT_JS_INSERT, XT_JS_INSERT_LEN))
+			; /* do nothing */
+#endif
+		if (es) {
+			DNPRINTF(XT_D_JS, "%s: val %s\n", __func__, es);
+			g_free(es);
+		}
+	}
+
+	return (0);
+}
+
+void
+enable_hints(struct tab *t)
+{
+	DNPRINTF(XT_D_JS, "%s: tab %d\n", __func__, t->tab_id);
+
+	if (t->new_tab)
+		run_script(t, "hints.createHints('', 'F');");
+	else
+		run_script(t, "hints.createHints('', 'f');");
+	t->mode = XT_MODE_HINT;
+}
+
+void
+disable_hints(struct tab *t)
+{
+	DNPRINTF(XT_D_JS, "%s: tab %d\n", __func__, t->tab_id);
+
+	run_script(t, "hints.clearHints();");
+	t->mode = XT_MODE_COMMAND;
+	t->new_tab = 0;
+}
+
+int
+passthrough(struct tab *t, struct karg *args)
+{
+	t->mode = XT_MODE_PASSTHROUGH;
+	return (0);
+}
+
+int
+hint(struct tab *t, struct karg *args)
+{
+
+	DNPRINTF(XT_D_JS, "hint: tab %d args %d\n", t->tab_id, args->i);
+
+	if (t->mode == XT_MODE_HINT) {
+		if (args->i == XT_HINT_NEWTAB)
+			t->new_tab = 1;
+		enable_hints(t);
+	} else
+		disable_hints(t);
+
+	return (0);
+}
+
+void
+apply_style(struct tab *t)
+{
+	t->styled = 1;
+	g_object_set(G_OBJECT(t->settings),
+	    "user-stylesheet-uri", t->stylesheet, (char *)NULL);
+}
+
+void
+remove_style(struct tab *t)
+{
+	t->styled = 0;
+	g_object_set(G_OBJECT(t->settings),
+	    "user-stylesheet-uri", NULL, (char *)NULL);
+}
+
+int
+userstyle(struct tab *t, struct karg *args)
+{
+	struct tab		*tt;
+
+	DNPRINTF(XT_D_JS, "userstyle: tab %d\n", t->tab_id);
+
+	switch (args->i) {
+	case XT_STYLE_CURRENT_TAB:
+		if (t->styled)
+			remove_style(t);
+		else
+			apply_style(t);
+		break;
+	case XT_STYLE_GLOBAL:
+		if (userstyle_global) {
+			userstyle_global = 0;
+			TAILQ_FOREACH(tt, &tabs, entry)
+				remove_style(tt);
+		} else {
+			userstyle_global = 1;
+			TAILQ_FOREACH(tt, &tabs, entry)
+				apply_style(tt);
+		}
+		break;
+	}
+
+	return (0);
+}
+
+int
+quit(struct tab *t, struct karg *args)
+{
+	if (save_global_history)
+		save_global_history_to_disk(t);
+
+	gtk_main_quit();
+
+	return (1);
+}
+
+void
+restore_sessions_list(void)
+{
+	DIR		*sdir = NULL;
+	struct dirent	*dp = NULL;
+	struct session	*s;
+	int		reg;
+
+	sdir = opendir(sessions_dir);
+	if (sdir) {
+		while ((dp = readdir(sdir)) != NULL) {
+#if defined __MINGW32__
+			reg = 1; /* windows only has regular files */
+#else
+			reg = dp->d_type == DT_REG;
+#endif
+			if (dp && reg) {
+				s = g_malloc(sizeof(struct session));
+				s->name = g_strdup(dp->d_name);
+				TAILQ_INSERT_TAIL(&sessions, s, entry);
+			}
+		}
+		closedir(sdir);
+	}
+}
+
+int
+open_tabs(struct tab *t, struct karg *a)
+{
+	char		file[PATH_MAX];
+	FILE		*f = NULL;
+	char		*uri = NULL;
+	int		rv = 1;
+	struct tab	*ti, *tt;
+
+	if (a == NULL)
+		goto done;
+
+	ti = TAILQ_LAST(&tabs, tab_list);
+
+	snprintf(file, sizeof file, "%s" PS "%s", sessions_dir, a->s);
+	if ((f = fopen(file, "r")) == NULL)
+		goto done;
+
+	for (;;) {
+		if ((uri = fparseln(f, NULL, NULL, "\0\0\0", 0)) == NULL)
+			if (feof(f) || ferror(f))
+				break;
+
+		/* retrieve session name */
+		if (uri && g_str_has_prefix(uri, XT_SAVE_SESSION_ID)) {
+			strlcpy(named_session,
+			    &uri[strlen(XT_SAVE_SESSION_ID)],
+			    sizeof named_session);
+			continue;
+		}
+
+		if (uri && strlen(uri))
+			create_new_tab(uri, NULL, 1, -1);
+
+		free(uri);
+		uri = NULL;
+	}
+
+	/* close open tabs */
+	if (a->i == XT_SES_CLOSETABS && ti != NULL) {
+		for (;;) {
+			tt = TAILQ_FIRST(&tabs);
+			if (tt == NULL)
+				break;
+			if (tt != ti) {
+				delete_tab(tt);
+				continue;
+			}
+			delete_tab(tt);
+			break;
+		}
+	}
+
+	rv = 0;
+done:
+	if (f)
+		fclose(f);
+
+	return (rv);
+}
+
+int
+restore_saved_tabs(void)
+{
+	char		file[PATH_MAX];
+	int		unlink_file = 0;
+	struct stat	sb;
+	struct karg	a;
+	int		rv = 0;
+
+	snprintf(file, sizeof file, "%s" PS "%s",
+	    sessions_dir, XT_RESTART_TABS_FILE);
+	if (stat(file, &sb) == -1)
+		a.s = XT_SAVED_TABS_FILE;
+	else {
+		unlink_file = 1;
+		a.s = XT_RESTART_TABS_FILE;
+	}
+
+	a.i = XT_SES_DONOTHING;
+	rv = open_tabs(NULL, &a);
+
+	if (unlink_file)
+		unlink(file);
+
+	return (rv);
+}
+
+int
+save_tabs(struct tab *t, struct karg *a)
+{
+	char			file[PATH_MAX];
+	FILE			*f;
+	int			num_tabs = 0, i;
+	struct tab		**stabs = NULL;
+
+	/* tab may be null here */
+
+	if (a == NULL)
+		return (1);
+	if (a->s == NULL)
+		snprintf(file, sizeof file, "%s" PS "%s",
+		    sessions_dir, named_session);
+	else
+		snprintf(file, sizeof file, "%s" PS "%s", sessions_dir, a->s);
+
+	if ((f = fopen(file, "w")) == NULL) {
+		show_oops(t, "Can't open save_tabs file: %s", strerror(errno));
+		return (1);
+	}
+
+	/* save session name */
+	fprintf(f, "%s%s\n", XT_SAVE_SESSION_ID, named_session);
+
+	/* Save tabs, in the order they are arranged in the notebook. */
+	num_tabs = sort_tabs_by_page_num(&stabs);
+
+	for (i = 0; i < num_tabs; i++)
+		if (stabs[i]) {
+			if (get_uri(stabs[i]) != NULL)
+				fprintf(f, "%s\n", get_uri(stabs[i]));
+			else if (gtk_entry_get_text(GTK_ENTRY(
+			    stabs[i]->uri_entry)))
+				fprintf(f, "%s\n", gtk_entry_get_text(GTK_ENTRY(
+				    stabs[i]->uri_entry)));
+		}
+
+	g_free(stabs);
+
+	/* try and make sure this gets to disk NOW. XXX Backup first? */
+	if (fflush(f) != 0 || fsync(fileno(f)) != 0) {
+		show_oops(t, "May not have managed to save session: %s",
+		    strerror(errno));
+	}
+
+	fclose(f);
+
+	return (0);
+}
+
+int
+save_tabs_and_quit(struct tab *t, struct karg *args)
+{
+	struct karg		a;
+
+	a.s = NULL;
+	save_tabs(t, &a);
+	quit(t, NULL);
+
+	return (1);
+}
+
+int
+run_page_script(struct tab *t, struct karg *args)
+{
+	const gchar		*uri;
+	char			*tmp, script[PATH_MAX];
+
+	tmp = args->s != NULL && strlen(args->s) > 0 ? args->s : default_script;
+	if (tmp[0] == '\0') {
+		show_oops(t, "no script specified");
+		return (1);
+	}
+
+	if ((uri = get_uri(t)) == NULL) {
+		show_oops(t, "tab is empty, not running script");
+		return (1);
+	}
+
+	if (tmp[0] == '~')
+		snprintf(script, sizeof script, "%s" PS "%s",
+		    pwd->pw_dir, &tmp[1]);
+	else
+		strlcpy(script, tmp, sizeof script);
+
+	return (fork_exec(t, script, uri, "can't launch external script", 1));
+}
+
+int
+yank_uri(struct tab *t, struct karg *args)
+{
+	const gchar		*uri;
+	GtkClipboard		*clipboard;
+
+	if ((uri = get_uri(t)) == NULL)
+		return (1);
+
+	clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+	gtk_clipboard_set_text(clipboard, uri, -1);
+
+	return (0);
+}
+
+int
+paste_uri(struct tab *t, struct karg *args)
+{
+	GtkClipboard		*clipboard;
+	GdkAtom			atom = gdk_atom_intern("CUT_BUFFER0", FALSE);
+	gint			len;
+	gchar			*p = NULL, *uri;
+
+	/* try primary clipboard first */
+	clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+	p = gtk_clipboard_wait_for_text(clipboard);
+
+	/* if it failed get whatever text is in cut_buffer0 */
+	if (p == NULL && xterm_workaround)
+		if (gdk_property_get(gdk_get_default_root_window(),
+		    atom,
+		    gdk_atom_intern("STRING", FALSE),
+		    0,
+		    1024 * 1024 /* picked out of my butt */,
+		    FALSE,
+		    NULL,
+		    NULL,
+		    &len,
+		    (guchar **)&p)) {
+			if (p == NULL)
+				goto done;
+			/* yes sir, we need to NUL the string */
+			p[len] = '\0';
+		}
+
+	if (p) {
+		uri = p;
+		while (*uri && isspace(*uri))
+			uri++;
+		if (strlen(uri) == 0) {
+			show_oops(t, "empty paste buffer");
+			goto done;
+		}
+		if (guess_search == 0 && valid_url_type(uri)) {
+			/* we can be clever and paste this in search box */
+			show_oops(t, "not a valid URL");
+			goto done;
+		}
+
+		if (args->i == XT_PASTE_CURRENT_TAB)
+			load_uri(t, uri);
+		else if (args->i == XT_PASTE_NEW_TAB)
+			create_new_tab(uri, NULL, 1, -1);
+	}
+
+done:
+	if (p)
+		g_free(p);
+
+	return (0);
+}
+
+void
+js_toggle_cb(GtkWidget *w, struct tab *t)
+{
+	struct karg		a;
+	int			es, set;
+
+	g_object_get(G_OBJECT(t->settings),
+	    "enable-scripts", &es, (char *)NULL);
+	es = !es;
+	if (es)
+		set = XT_WL_ENABLE;
+	else
+		set = XT_WL_DISABLE;
+
+	a.i = set | XT_WL_TOPLEVEL;
+	toggle_pl(t, &a);
+
+	a.i = set | XT_WL_TOPLEVEL;
+	toggle_cwl(t, &a);
+
+	a.i = XT_WL_TOGGLE | XT_WL_TOPLEVEL | XT_WL_RELOAD;
+	toggle_js(t, &a);
+}
+
+int
+toggle_src(struct tab *t, struct karg *args)
+{
+	gboolean		mode;
+
+	if (t == NULL)
+		return (0);
+
+	mode = webkit_web_view_get_view_source_mode(t->wv);
+	webkit_web_view_set_view_source_mode(t->wv, !mode);
+	webkit_web_view_reload(t->wv);
+
+	return (0);
+}
+
+void
+focus_webview(struct tab *t)
+{
+	if (t == NULL)
+		return;
+
+	/* only grab focus if we are visible */
+	if (gtk_notebook_get_current_page(notebook) == t->tab_id)
+		gtk_widget_grab_focus(GTK_WIDGET(t->wv));
+}
+
+int
+focus(struct tab *t, struct karg *args)
+{
+	if (t == NULL || args == NULL)
+		return (1);
+
+	if (show_url == 0)
+		return (0);
+
+	if (args->i == XT_FOCUS_URI)
+		gtk_widget_grab_focus(GTK_WIDGET(t->uri_entry));
+	else if (args->i == XT_FOCUS_SEARCH)
+		gtk_widget_grab_focus(GTK_WIDGET(t->search_entry));
+
+	return (0);
+}
+
+int
+connect_socket_from_uri(const gchar *uri, const gchar **error_str, char *domain,
+    size_t domain_sz)
+{
+	SoupURI			*su = NULL;
+	struct addrinfo		hints, *res = NULL, *ai;
+	int			rv = -1, s = -1, on, error;
+	char			port[8];
+	static gchar		myerror[256]; /* this is not thread safe */
+
+	myerror[0] = '\0';
+	*error_str = myerror;
+	if (uri && !g_str_has_prefix(uri, "https://")) {
+		*error_str = "invalid URI";
+		goto done;
+	}
+
+	su = soup_uri_new(uri);
+	if (su == NULL) {
+		*error_str = "invalid soup URI";
+		goto done;
+	}
+	if (!SOUP_URI_VALID_FOR_HTTP(su)) {
+		*error_str = "invalid HTTPS URI";
+		goto done;
+	}
+
+	snprintf(port, sizeof port, "%d", su->port);
+	bzero(&hints, sizeof(struct addrinfo));
+	hints.ai_flags = AI_CANONNAME;
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+
+	if ((error = getaddrinfo(su->host, port, &hints, &res))) {
+		snprintf(myerror, sizeof myerror, "getaddrinfo failed: %s",
+		    gai_strerror(errno));
+		goto done;
+	}
+
+	for (ai = res; ai; ai = ai->ai_next) {
+		if (s != -1) {
+			close(s);
+			s = -1;
+		}
+
+		if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
+			continue;
+		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+		if (s == -1)
+			continue;
+		if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on,
+		    sizeof(on)) == -1)
+			continue;
+		if (connect(s, ai->ai_addr, ai->ai_addrlen) == 0)
+			break;
+	}
+	if (s == -1) {
+		snprintf(myerror, sizeof myerror,
+		    "could not obtain certificates from: %s",
+		    su->host);
+		goto done;
+	}
+
+	if (domain)
+		strlcpy(domain, su->host, domain_sz);
+	rv = s;
+done:
+	if (su)
+		soup_uri_free(su);
+	if (res)
+		freeaddrinfo(res);
+	if (rv == -1 && s != -1)
+		close(s);
+
+	return (rv);
+}
+
+#ifdef __MINGW32__
+static ssize_t
+custom_gnutls_push(void *s, const void *buf, size_t len)
+{
+	return send((size_t)s, buf, len, 0);
+}
+
+static ssize_t
+custom_gnutls_pull(void *s, void *buf, size_t len)
+{
+	return recv((size_t)s, buf, len, 0);
+}
+#endif
+
+int
+stop_tls(gnutls_session_t gsession, gnutls_certificate_credentials_t xcred)
+{
+	if (gsession)
+		gnutls_deinit(gsession);
+	if (xcred)
+		gnutls_certificate_free_credentials(xcred);
+
+	return (0);
+}
+
+int
+start_tls(const gchar **error_str, int s, gnutls_session_t *gs,
+    gnutls_certificate_credentials_t *xc)
+{
+	gnutls_certificate_credentials_t xcred;
+	gnutls_session_t	gsession;
+	int			rv = 1;
+	static gchar		myerror[1024]; /* this is not thread safe */
+
+	if (gs == NULL || xc == NULL)
+		goto done;
+
+	myerror[0] = '\0';
+	*gs = NULL;
+	*xc = NULL;
+
+	gnutls_certificate_allocate_credentials(&xcred);
+	gnutls_certificate_set_x509_trust_file(xcred, ssl_ca_file,
+	    GNUTLS_X509_FMT_PEM);
+
+	gnutls_init(&gsession, GNUTLS_CLIENT);
+	gnutls_priority_set_direct(gsession, "PERFORMANCE", NULL);
+	gnutls_credentials_set(gsession, GNUTLS_CRD_CERTIFICATE, xcred);
+	gnutls_transport_set_ptr(gsession, (gnutls_transport_ptr_t)(long)s);
+#ifdef __MINGW32__
+	/* sockets on windows don't use file descriptors */
+	gnutls_transport_set_push_function(gsession, custom_gnutls_push);
+	gnutls_transport_set_pull_function(gsession, custom_gnutls_pull);
+#endif
+	if ((rv = gnutls_handshake(gsession)) < 0) {
+		snprintf(myerror, sizeof myerror,
+		    "gnutls_handshake failed %d fatal %d %s",
+		    rv,
+		    gnutls_error_is_fatal(rv),
+#if LIBGNUTLS_VERSION_MAJOR >= 2 && LIBGNUTLS_VERSION_MINOR >= 6
+		    gnutls_strerror_name(rv));
+#else
+		    "GNUTLS version is too old to provide human readable error");
+#endif
+		stop_tls(gsession, xcred);
+		goto done;
+	}
+
+	gnutls_credentials_type_t cred;
+	cred = gnutls_auth_get_type(gsession);
+	if (cred != GNUTLS_CRD_CERTIFICATE) {
+		snprintf(myerror, sizeof myerror,
+		    "gnutls_auth_get_type failed %d",
+		    (int)cred);
+		stop_tls(gsession, xcred);
+		goto done;
+	}
+
+	*gs = gsession;
+	*xc = xcred;
+	rv = 0;
+done:
+	*error_str = myerror;
+	return (rv);
+}
+
+int
+get_connection_certs(gnutls_session_t gsession, gnutls_x509_crt_t **certs,
+    size_t *cert_count)
+{
+	unsigned int		len;
+	const gnutls_datum_t	*cl;
+	gnutls_x509_crt_t	*all_certs;
+	int			i, rv = 1;
+
+	if (certs == NULL || cert_count == NULL)
+		goto done;
+	if (gnutls_certificate_type_get(gsession) != GNUTLS_CRT_X509)
+		goto done;
+	cl = gnutls_certificate_get_peers(gsession, &len);
+	if (len == 0)
+		goto done;
+
+	all_certs = g_malloc(sizeof(gnutls_x509_crt_t) * len);
+	for (i = 0; i < len; i++) {
+		gnutls_x509_crt_init(&all_certs[i]);
+		if (gnutls_x509_crt_import(all_certs[i], &cl[i],
+		    GNUTLS_X509_FMT_PEM < 0)) {
+			g_free(all_certs);
+			goto done;
+		    }
+	}
+
+	*certs = all_certs;
+	*cert_count = len;
+	rv = 0;
+done:
+	return (rv);
+}
+
+void
+free_connection_certs(gnutls_x509_crt_t *certs, size_t cert_count)
+{
+	int			i;
+
+	for (i = 0; i < cert_count; i++)
+		gnutls_x509_crt_deinit(certs[i]);
+	g_free(certs);
+}
+
+void
+statusbar_modify_attr(struct tab *t, const char *text, const char *base)
+{
+	GdkColor                c_text, c_base;
+
+	gdk_color_parse(text, &c_text);
+	gdk_color_parse(base, &c_base);
+
+	gtk_widget_modify_text(t->sbe.statusbar, GTK_STATE_NORMAL, &c_text);
+	gtk_widget_modify_text(t->sbe.buffercmd, GTK_STATE_NORMAL, &c_text);
+	gtk_widget_modify_text(t->sbe.zoom, GTK_STATE_NORMAL, &c_text);
+	gtk_widget_modify_text(t->sbe.position, GTK_STATE_NORMAL, &c_text);
+
+	gtk_widget_modify_base(t->sbe.statusbar, GTK_STATE_NORMAL, &c_base);
+	gtk_widget_modify_base(t->sbe.buffercmd, GTK_STATE_NORMAL, &c_base);
+	gtk_widget_modify_base(t->sbe.zoom, GTK_STATE_NORMAL, &c_base);
+	gtk_widget_modify_base(t->sbe.position, GTK_STATE_NORMAL, &c_base);
+}
+
+void
+save_certs(struct tab *t, gnutls_x509_crt_t *certs,
+    size_t cert_count, char *domain)
+{
+	size_t			cert_buf_sz;
+	char			cert_buf[64 * 1024], file[PATH_MAX];
+	int			i;
+	FILE			*f;
+	GdkColor		color;
+
+	if (t == NULL || certs == NULL || cert_count <= 0 || domain == NULL)
+		return;
+
+	snprintf(file, sizeof file, "%s" PS "%s", certs_dir, domain);
+	if ((f = fopen(file, "w")) == NULL) {
+		show_oops(t, "Can't create cert file %s %s",
+		    file, strerror(errno));
+		return;
+	}
+
+	for (i = 0; i < cert_count; i++) {
+		cert_buf_sz = sizeof cert_buf;
+		if (gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM,
+		    cert_buf, &cert_buf_sz)) {
+			show_oops(t, "gnutls_x509_crt_export failed");
+			goto done;
+		}
+		if (fwrite(cert_buf, cert_buf_sz, 1, f) != 1) {
+			show_oops(t, "Can't write certs: %s", strerror(errno));
+			goto done;
+		}
+	}
+
+	/* not the best spot but oh well */
+	gdk_color_parse("lightblue", &color);
+	gtk_widget_modify_base(t->uri_entry, GTK_STATE_NORMAL, &color);
+	statusbar_modify_attr(t, XT_COLOR_BLACK, "lightblue");
+done:
+	fclose(f);
+}
+
+enum cert_trust {
+	CERT_LOCAL,
+	CERT_TRUSTED,
+	CERT_UNTRUSTED,
+	CERT_BAD
+};
+
+enum cert_trust
+load_compare_cert(const gchar *uri, const gchar **error_str)
+{
+	char			domain[8182], file[PATH_MAX];
+	char			cert_buf[64 * 1024], r_cert_buf[64 * 1024];
+	int			s = -1, i;
+	unsigned int		error = 0;
+	FILE			*f = NULL;
+	size_t			cert_buf_sz, cert_count;
+	enum cert_trust		rv = CERT_UNTRUSTED;
+	static gchar		serr[80]; /* this isn't thread safe */
+	gnutls_session_t	gsession;
+	gnutls_x509_crt_t	*certs;
+	gnutls_certificate_credentials_t xcred;
+
+	DNPRINTF(XT_D_URL, "%s: %s\n", __func__, uri);
+
+	serr[0] = '\0';
+	*error_str = serr;
+	if ((s = connect_socket_from_uri(uri, error_str, domain,
+	    sizeof domain)) == -1)
+		return (rv);
+
+	DNPRINTF(XT_D_URL, "%s: fd %d\n", __func__, s);
+
+	/* go ssl/tls */
+	if (start_tls(error_str, s, &gsession, &xcred))
+		goto done;
+	DNPRINTF(XT_D_URL, "%s: got tls\n", __func__);
+
+	/* verify certs in case cert file doesn't exist */
+	if (gnutls_certificate_verify_peers2(gsession, &error) !=
+	    GNUTLS_E_SUCCESS) {
+		*error_str = "Invalid certificates";
+		goto done;
+	}
+
+	/* get certs */
+	if (get_connection_certs(gsession, &certs, &cert_count)) {
+		*error_str = "Can't get connection certificates";
+		goto done;
+	}
+
+	snprintf(file, sizeof file, "%s" PS "%s", certs_dir, domain);
+	if ((f = fopen(file, "r")) == NULL) {
+		if (!error)
+			rv = CERT_TRUSTED;
+		goto freeit;
+	}
+
+	for (i = 0; i < cert_count; i++) {
+		cert_buf_sz = sizeof cert_buf;
+		if (gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM,
+		    cert_buf, &cert_buf_sz)) {
+			goto freeit;
+		}
+		if (fread(r_cert_buf, cert_buf_sz, 1, f) != 1) {
+			rv = CERT_BAD; /* critical */
+			goto freeit;
+		}
+		if (bcmp(r_cert_buf, cert_buf, sizeof cert_buf_sz)) {
+			rv = CERT_BAD; /* critical */
+			goto freeit;
+		}
+		rv = CERT_LOCAL;
+	}
+
+freeit:
+	if (f)
+		fclose(f);
+	free_connection_certs(certs, cert_count);
+done:
+	/* we close the socket first for speed */
+	if (s != -1)
+		close(s);
+
+	/* only complain if we didn't save it locally */
+	if (error && rv != CERT_LOCAL) {
+		strlcpy(serr, "Certificate exception(s): ", sizeof serr);
+		if (error & GNUTLS_CERT_INVALID)
+			strlcat(serr, "invalid, ", sizeof serr);
+		if (error & GNUTLS_CERT_REVOKED)
+			strlcat(serr, "revoked, ", sizeof serr);
+		if (error & GNUTLS_CERT_SIGNER_NOT_FOUND)
+			strlcat(serr, "signer not found, ", sizeof serr);
+		if (error & GNUTLS_CERT_SIGNER_NOT_CA)
+			strlcat(serr, "not signed by CA, ", sizeof serr);
+		if (error & GNUTLS_CERT_INSECURE_ALGORITHM)
+			strlcat(serr, "insecure algorithm, ", sizeof serr);
+#if LIBGNUTLS_VERSION_MAJOR >= 2 && LIBGNUTLS_VERSION_MINOR >= 6
+		if (error & GNUTLS_CERT_NOT_ACTIVATED)
+			strlcat(serr, "not activated, ", sizeof serr);
+		if (error & GNUTLS_CERT_EXPIRED)
+			strlcat(serr, "expired, ", sizeof serr);
+#endif
+		for (i = strlen(serr) - 1; i > 0; i--)
+			if (serr[i] == ',') {
+				serr[i] = '\0';
+				break;
+			}
+		*error_str = serr;
+	}
+
+	stop_tls(gsession, xcred);
+
+	return (rv);
+}
+
+int
+cert_cmd(struct tab *t, struct karg *args)
+{
+	const gchar		*uri, *error_str = NULL;
+	char			domain[8182];
+	int			s = -1;
+	size_t			cert_count;
+	gnutls_session_t	gsession;
+	gnutls_x509_crt_t	*certs;
+	gnutls_certificate_credentials_t xcred;
+
+	if (t == NULL)
+		return (1);
+
+	if (ssl_ca_file == NULL) {
+		show_oops(t, "Can't open CA file: %s", ssl_ca_file);
+		return (1);
+	}
+
+	if ((uri = get_uri(t)) == NULL) {
+		show_oops(t, "Invalid URI");
+		return (1);
+	}
+
+	if ((s = connect_socket_from_uri(uri, &error_str, domain,
+	    sizeof domain)) == -1) {
+		show_oops(t, "%s", error_str);
+		return (1);
+	}
+
+	/* go ssl/tls */
+	if (start_tls(&error_str, s, &gsession, &xcred))
+		goto done;
+
+	/* get certs */
+	if (get_connection_certs(gsession, &certs, &cert_count)) {
+		show_oops(t, "get_connection_certs failed");
+		goto done;
+	}
+
+	if (args->i & XT_SHOW)
+		show_certs(t, certs, cert_count, "Certificate Chain");
+	else if (args->i & XT_SAVE)
+		save_certs(t, certs, cert_count, domain);
+
+	free_connection_certs(certs, cert_count);
+done:
+	/* we close the socket first for speed */
+	if (s != -1)
+		close(s);
+	stop_tls(gsession, xcred);
+	if (error_str && strlen(error_str))
+		show_oops(t, "%s", error_str);
+	return (0);
+}
+
+int
+remove_cookie(int index)
+{
+	int			i, rv = 1;
+	GSList			*cf;
+	SoupCookie		*c;
+
+	DNPRINTF(XT_D_COOKIE, "remove_cookie: %d\n", index);
+
+	cf = soup_cookie_jar_all_cookies(s_cookiejar);
+
+	for (i = 1; cf; cf = cf->next, i++) {
+		if (i != index)
+			continue;
+		c = cf->data;
+		print_cookie("remove cookie", c);
+		soup_cookie_jar_delete_cookie(s_cookiejar, c);
+		rv = 0;
+		break;
+	}
+
+	soup_cookies_free(cf);
+
+	return (rv);
+}
+
+int
+remove_cookie_domain(int domain_id)
+{
+	int			domain_count, rv = 1;
+	GSList			*cf;
+	SoupCookie		*c;
+	char *last_domain;
+
+	DNPRINTF(XT_D_COOKIE, "remove_cookie_domain: %d\n", domain_id);
+
+	last_domain = "";
+	cf = soup_cookie_jar_all_cookies(s_cookiejar);
+
+	for (domain_count = 0; cf; cf = cf->next) {
+		c = cf->data;
+
+		if (strcmp(last_domain, c->domain) != 0) {
+			domain_count++;
+			last_domain = c->domain;
+		}
+
+		if (domain_count < domain_id)
+			continue;
+		else if (domain_count > domain_id)
+			break;
+
+		print_cookie("remove cookie", c);
+		soup_cookie_jar_delete_cookie(s_cookiejar, c);
+		rv = 0;
+	}
+
+	soup_cookies_free(cf);
+
+	return (rv);
+}
+
+int
+remove_cookie_all()
+{
+	int			rv = 1;
+	GSList			*cf;
+	SoupCookie		*c;
+
+	DNPRINTF(XT_D_COOKIE, "remove_cookie_all\n");
+
+	cf = soup_cookie_jar_all_cookies(s_cookiejar);
+
+	for (; cf; cf = cf->next) {
+		c = cf->data;
+
+		print_cookie("remove cookie", c);
+		soup_cookie_jar_delete_cookie(s_cookiejar, c);
+		rv = 0;
+	}
+
+	soup_cookies_free(cf);
+
+	return (rv);
+}
+
+int
+toplevel_cmd(struct tab *t, struct karg *args)
+{
+	js_toggle_cb(t->js_toggle, t);
+
+	return (0);
+}
+
+int
+can_go_back_for_real(struct tab *t)
+{
+	int			i;
+	WebKitWebHistoryItem	*item;
+	const gchar		*uri;
+
+	if (t == NULL)
+		return (FALSE);
+
+	/* rely on webkit to make sure we can go backward when on an about page */
+	uri = get_uri(t);
+	if (uri == NULL || g_str_has_prefix(uri, "about:"))
+		return (webkit_web_view_can_go_back(t->wv));
+
+	/* the back/forwars list is stupid so help determine if we can go back */
+	for (i = 0, item = webkit_web_back_forward_list_get_current_item(t->bfl);
+	    item != NULL;
+	    i--, item = webkit_web_back_forward_list_get_nth_item(t->bfl, i)) {
+		if (strcmp(webkit_web_history_item_get_uri(item), uri))
+			return (TRUE);
+	}
+
+	return (FALSE);
+}
+
+int
+can_go_forward_for_real(struct tab *t)
+{
+	int			i;
+	WebKitWebHistoryItem	*item;
+	const gchar		*uri;
+
+	if (t == NULL)
+		return (FALSE);
+
+	/* rely on webkit to make sure we can go forward when on an about page */
+	uri = get_uri(t);
+	if (uri == NULL || g_str_has_prefix(uri, "about:"))
+		return (webkit_web_view_can_go_forward(t->wv));
+
+	/* the back/forwars list is stupid so help selecting a different item */
+	for (i = 0, item = webkit_web_back_forward_list_get_current_item(t->bfl);
+	    item != NULL;
+	    i++, item = webkit_web_back_forward_list_get_nth_item(t->bfl, i)) {
+		if (strcmp(webkit_web_history_item_get_uri(item), uri))
+			return (TRUE);
+	}
+
+	return (FALSE);
+}
+
+void
+go_back_for_real(struct tab *t)
+{
+	int			i;
+	WebKitWebHistoryItem	*item;
+	const gchar		*uri;
+
+	if (t == NULL)
+		return;
+
+	uri = get_uri(t);
+	if (uri == NULL) {
+		webkit_web_view_go_back(t->wv);
+		return;
+	}
+	/* the back/forwars list is stupid so help selecting a different item */
+	for (i = 0, item = webkit_web_back_forward_list_get_current_item(t->bfl);
+	    item != NULL;
+	    i--, item = webkit_web_back_forward_list_get_nth_item(t->bfl, i)) {
+		if (strcmp(webkit_web_history_item_get_uri(item), uri)) {
+			webkit_web_view_go_to_back_forward_item(t->wv, item);
+			break;
+		}
+	}
+}
+
+void
+go_forward_for_real(struct tab *t)
+{
+	int			i;
+	WebKitWebHistoryItem	*item;
+	const gchar		*uri;
+
+	if (t == NULL)
+		return;
+
+	uri = get_uri(t);
+	if (uri == NULL) {
+		webkit_web_view_go_forward(t->wv);
+		return;
+	}
+	/* the back/forwars list is stupid so help selecting a different item */
+	for (i = 0, item = webkit_web_back_forward_list_get_current_item(t->bfl);
+	    item != NULL;
+	    i++, item = webkit_web_back_forward_list_get_nth_item(t->bfl, i)) {
+		if (strcmp(webkit_web_history_item_get_uri(item), uri)) {
+			webkit_web_view_go_to_back_forward_item(t->wv, item);
+			break;
+		}
+	}
+}
+
+int
+navaction(struct tab *t, struct karg *args)
+{
+	WebKitWebHistoryItem	*item;
+	WebKitWebFrame		*frame;
+
+	DNPRINTF(XT_D_NAV, "navaction: tab %d opcode %d\n",
+	    t->tab_id, args->i);
+
+	t->xtp_meaning = XT_XTP_TAB_MEANING_NORMAL;
+	if (t->item) {
+		if (args->i == XT_NAV_BACK)
+			item = webkit_web_back_forward_list_get_current_item(t->bfl);
+		else
+			item = webkit_web_back_forward_list_get_forward_item(t->bfl);
+		if (item == NULL)
+			return (XT_CB_PASSTHROUGH);
+		webkit_web_view_go_to_back_forward_item(t->wv, item);
+		t->item = NULL;
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	switch (args->i) {
+	case XT_NAV_BACK:
+		marks_clear(t);
+		go_back_for_real(t);
+		break;
+	case XT_NAV_FORWARD:
+		marks_clear(t);
+		go_forward_for_real(t);
+		break;
+	case XT_NAV_RELOAD:
+		frame = webkit_web_view_get_main_frame(t->wv);
+		webkit_web_frame_reload(frame);
+		break;
+	case XT_NAV_STOP:
+		frame = webkit_web_view_get_main_frame(t->wv);
+		webkit_web_frame_stop_loading(frame);
+		break;
+	}
+	return (XT_CB_PASSTHROUGH);
+}
+
+int
+move(struct tab *t, struct karg *args)
+{
+	GtkAdjustment		*adjust;
+	double			pi, si, pos, ps, upper, lower, max;
+	double			percent;
+
+	switch (args->i) {
+	case XT_MOVE_DOWN:
+	case XT_MOVE_UP:
+	case XT_MOVE_BOTTOM:
+	case XT_MOVE_TOP:
+	case XT_MOVE_PAGEDOWN:
+	case XT_MOVE_PAGEUP:
+	case XT_MOVE_HALFDOWN:
+	case XT_MOVE_HALFUP:
+	case XT_MOVE_PERCENT:
+	case XT_MOVE_CENTER:
+		adjust = t->adjust_v;
+		break;
+	default:
+		adjust = t->adjust_h;
+		break;
+	}
+
+	pos = gtk_adjustment_get_value(adjust);
+	ps = gtk_adjustment_get_page_size(adjust);
+	upper = gtk_adjustment_get_upper(adjust);
+	lower = gtk_adjustment_get_lower(adjust);
+	si = gtk_adjustment_get_step_increment(adjust);
+	pi = gtk_adjustment_get_page_increment(adjust);
+	max = upper - ps;
+
+	DNPRINTF(XT_D_MOVE, "move: opcode %d %s pos %f ps %f upper %f lower %f "
+	    "max %f si %f pi %f\n",
+	    args->i, adjust == t->adjust_h ? "horizontal" : "vertical",
+	    pos, ps, upper, lower, max, si, pi);
+
+	switch (args->i) {
+	case XT_MOVE_DOWN:
+	case XT_MOVE_RIGHT:
+		pos += si;
+		gtk_adjustment_set_value(adjust, MIN(pos, max));
+		break;
+	case XT_MOVE_UP:
+	case XT_MOVE_LEFT:
+		pos -= si;
+		gtk_adjustment_set_value(adjust, MAX(pos, lower));
+		break;
+	case XT_MOVE_BOTTOM:
+	case XT_MOVE_FARRIGHT:
+		gtk_adjustment_set_value(adjust, max);
+		break;
+	case XT_MOVE_TOP:
+	case XT_MOVE_FARLEFT:
+		gtk_adjustment_set_value(adjust, lower);
+		break;
+	case XT_MOVE_PAGEDOWN:
+		pos += pi;
+		gtk_adjustment_set_value(adjust, MIN(pos, max));
+		break;
+	case XT_MOVE_PAGEUP:
+		pos -= pi;
+		gtk_adjustment_set_value(adjust, MAX(pos, lower));
+		break;
+	case XT_MOVE_HALFDOWN:
+		pos += pi / 2;
+		gtk_adjustment_set_value(adjust, MIN(pos, max));
+		break;
+	case XT_MOVE_HALFUP:
+		pos -= pi / 2;
+		gtk_adjustment_set_value(adjust, MAX(pos, lower));
+		break;
+	case XT_MOVE_CENTER:
+		args->s = g_strdup("50.0");
+		/* FALLTHROUGH */
+	case XT_MOVE_PERCENT:
+		percent = atoi(args->s) / 100.0;
+		pos = max * percent;
+		if (pos < 0.0 || pos > max)
+			break;
+		gtk_adjustment_set_value(adjust, pos);
+		break;
+	default:
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_MOVE, "move: new pos %f %f\n", pos, MIN(pos, max));
+
+	return (XT_CB_HANDLED);
+}
+
+void
+url_set_visibility(void)
+{
+	struct tab		*t;
+
+	TAILQ_FOREACH(t, &tabs, entry)
+		if (show_url == 0) {
+			gtk_widget_hide(t->toolbar);
+			focus_webview(t);
+		} else
+			gtk_widget_show(t->toolbar);
+}
+
+void
+notebook_tab_set_visibility(void)
+{
+	if (show_tabs == 0) {
+		gtk_widget_hide(tab_bar);
+		gtk_notebook_set_show_tabs(notebook, FALSE);
+	} else {
+		if (tab_style == XT_TABS_NORMAL) {
+			gtk_widget_hide(tab_bar);
+			gtk_notebook_set_show_tabs(notebook, TRUE);
+		} else if (tab_style == XT_TABS_COMPACT) {
+			gtk_widget_show(tab_bar);
+			gtk_notebook_set_show_tabs(notebook, FALSE);
+		}
+	}
+}
+
+void
+statusbar_set_visibility(void)
+{
+	struct tab		*t;
+
+	TAILQ_FOREACH(t, &tabs, entry){
+		if (show_statusbar == 0)
+			gtk_widget_hide(t->statusbar_box);
+		else
+			gtk_widget_show(t->statusbar_box);
+
+		focus_webview(t);
+	}
+}
+
+void
+url_set(struct tab *t, int enable_url_entry)
+{
+	GdkPixbuf	*pixbuf;
+	int		progress;
+
+	show_url = enable_url_entry;
+
+	if (enable_url_entry) {
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(t->sbe.statusbar),
+		    GTK_ENTRY_ICON_PRIMARY, NULL);
+		gtk_entry_set_progress_fraction(GTK_ENTRY(t->sbe.statusbar), 0);
+	} else {
+		pixbuf = gtk_entry_get_icon_pixbuf(GTK_ENTRY(t->uri_entry),
+		    GTK_ENTRY_ICON_PRIMARY);
+		progress =
+		    gtk_entry_get_progress_fraction(GTK_ENTRY(t->uri_entry));
+		gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(t->sbe.statusbar),
+		    GTK_ENTRY_ICON_PRIMARY, pixbuf);
+		gtk_entry_set_progress_fraction(GTK_ENTRY(t->sbe.statusbar),
+		    progress);
+	}
+}
+
+int
+fullscreen(struct tab *t, struct karg *args)
+{
+	DNPRINTF(XT_D_TAB, "%s: %p %d\n", __func__, t, args->i);
+
+	if (t == NULL)
+		return (XT_CB_PASSTHROUGH);
+
+	if (show_url == 0) {
+		url_set(t, 1);
+		show_tabs = 1;
+	} else {
+		url_set(t, 0);
+		show_tabs = 0;
+	}
+
+	url_set_visibility();
+	notebook_tab_set_visibility();
+
+	return (XT_CB_HANDLED);
+}
+
+int
+statustoggle(struct tab *t, struct karg *args)
+{
+	DNPRINTF(XT_D_TAB, "%s: %p %d\n", __func__, t, args->i);
+
+	if (show_statusbar == 1) {
+		show_statusbar = 0;
+		statusbar_set_visibility();
+	} else if (show_statusbar == 0) {
+		show_statusbar = 1;
+		statusbar_set_visibility();
+	}
+	return (XT_CB_HANDLED);
+}
+
+int
+urlaction(struct tab *t, struct karg *args)
+{
+	int			rv = XT_CB_HANDLED;
+
+	DNPRINTF(XT_D_TAB, "%s: %p %d\n", __func__, t, args->i);
+
+	if (t == NULL)
+		return (XT_CB_PASSTHROUGH);
+
+	switch (args->i) {
+	case XT_URL_SHOW:
+		if (show_url == 0) {
+			url_set(t, 1);
+			url_set_visibility();
+		}
+		break;
+	case XT_URL_HIDE:
+		if (show_url == 1) {
+			url_set(t, 0);
+			url_set_visibility();
+		}
+		break;
+	}
+	return (rv);
+}
+
+int
+tabaction(struct tab *t, struct karg *args)
+{
+	int			rv = XT_CB_HANDLED;
+	char			*url = args->s;
+	struct undo		*u;
+	struct tab		*tt;
+
+	DNPRINTF(XT_D_TAB, "tabaction: %p %d\n", t, args->i);
+
+	if (t == NULL)
+		return (XT_CB_PASSTHROUGH);
+
+	switch (args->i) {
+	case XT_TAB_NEW:
+		if (strlen(url) > 0)
+			create_new_tab(url, NULL, 1, args->precount);
+		else
+			create_new_tab(NULL, NULL, 1, args->precount);
+		break;
+	case XT_TAB_DELETE:
+		if (args->precount < 0)
+			delete_tab(t);
+		else
+			TAILQ_FOREACH(tt, &tabs, entry)
+				if (tt->tab_id == args->precount - 1) {
+					delete_tab(tt);
+					break;
+				}
+		break;
+	case XT_TAB_DELQUIT:
+		if (gtk_notebook_get_n_pages(notebook) > 1)
+			delete_tab(t);
+		else
+			quit(t, args);
+		break;
+	case XT_TAB_OPEN:
+		if (strlen(url) > 0)
+			;
+		else {
+			rv = XT_CB_PASSTHROUGH;
+			goto done;
+		}
+		load_uri(t, url);
+		break;
+	case XT_TAB_SHOW:
+		if (show_tabs == 0) {
+			show_tabs = 1;
+			notebook_tab_set_visibility();
+		}
+		break;
+	case XT_TAB_HIDE:
+		if (show_tabs == 1) {
+			show_tabs = 0;
+			notebook_tab_set_visibility();
+		}
+		break;
+	case XT_TAB_NEXTSTYLE:
+		if (tab_style == XT_TABS_NORMAL) {
+			tab_style = XT_TABS_COMPACT;
+			recolor_compact_tabs();
+		}
+		else
+			tab_style = XT_TABS_NORMAL;
+		notebook_tab_set_visibility();
+		break;
+	case XT_TAB_UNDO_CLOSE:
+		if (undo_count == 0) {
+			DNPRINTF(XT_D_TAB, "%s: no tabs to undo close",
+			    __func__);
+			goto done;
+		} else {
+			undo_count--;
+			u = TAILQ_FIRST(&undos);
+			create_new_tab(u->uri, u, 1, -1);
+
+			TAILQ_REMOVE(&undos, u, entry);
+			g_free(u->uri);
+			/* u->history is freed in create_new_tab() */
+			g_free(u);
+		}
+		break;
+	case XT_TAB_LOAD_IMAGES:
+
+		if (!auto_load_images) {
+
+			/* Enable auto-load images (this will load all
+			 * previously unloaded images). */
+			g_object_set(G_OBJECT(t->settings),
+			    "auto-load-images", TRUE, (char *)NULL);
+			webkit_web_view_set_settings(t->wv, t->settings);
+
+			webkit_web_view_reload(t->wv);
+
+			/* Webkit triggers an event when we change the setting,
+			 * so we can't disable the auto-loading at once.
+			 *
+			 * Unfortunately, webkit does not tell us when it's done.
+			 * Instead, we wait until the next request, and then
+			 * disable autoloading again.
+			 */
+			t->load_images = TRUE;
+		}
+		break;
+	default:
+		rv = XT_CB_PASSTHROUGH;
+		goto done;
+	}
+
+done:
+	if (args->s) {
+		g_free(args->s);
+		args->s = NULL;
+	}
+
+	return (rv);
+}
+
+int
+resizetab(struct tab *t, struct karg *args)
+{
+	if (t == NULL || args == NULL) {
+		show_oops(NULL, "resizetab invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_TAB, "resizetab: tab %d %d\n",
+	    t->tab_id, args->i);
+
+	setzoom_webkit(t, args->i);
+
+	return (XT_CB_HANDLED);
+}
+
+int
+movetab(struct tab *t, struct karg *args)
+{
+	int			n, dest;
+
+	if (t == NULL || args == NULL) {
+		show_oops(NULL, "movetab invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_TAB, "movetab: tab %d opcode %d\n",
+	    t->tab_id, args->i);
+
+	if (args->i >= XT_TAB_INVALID)
+		return (XT_CB_PASSTHROUGH);
+
+	if (TAILQ_EMPTY(&tabs))
+		return (XT_CB_PASSTHROUGH);
+
+	n = gtk_notebook_get_n_pages(notebook);
+	dest = gtk_notebook_get_current_page(notebook);
+
+	switch (args->i) {
+	case XT_TAB_NEXT:
+		if (args->precount < 0)
+			dest = dest == n - 1 ? 0 : dest + 1;
+		else
+			dest = args->precount - 1;
+
+		break;
+	case XT_TAB_PREV:
+		if (args->precount < 0)
+			dest -= 1;
+		else
+			dest -= args->precount % n;
+
+		if (dest < 0)
+			dest += n;
+
+		break;
+	case XT_TAB_FIRST:
+		dest = 0;
+		break;
+	case XT_TAB_LAST:
+		dest = n - 1;
+		break;
+	default:
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	if (dest < 0 || dest >= n)
+		return (XT_CB_PASSTHROUGH);
+	if (t->tab_id == dest) {
+		DNPRINTF(XT_D_TAB, "movetab: do nothing\n");
+		return (XT_CB_HANDLED);
+	}
+
+	set_current_tab(dest);
+
+	return (XT_CB_HANDLED);
+}
+
+int cmd_prefix = 0;
+
+
+int
+command(struct tab *t, struct karg *args)
+{
+	char			*s = NULL, *ss = NULL;
+	GdkColor		color;
+	const gchar		*uri;
+	struct karg		a;
+
+	if (t == NULL || args == NULL) {
+		show_oops(NULL, "command invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	switch (args->i) {
+	case '/':
+		s = "/";
+		break;
+	case '?':
+		s = "?";
+		break;
+	case ':':
+		if (cmd_prefix == 0)
+			s = ":";
+		else {
+			ss = g_strdup_printf(":%d", cmd_prefix);
+			s = ss;
+			cmd_prefix = 0;
+		}
+		break;
+	case '.':
+		t->mode = XT_MODE_HINT;
+		bzero(&a, sizeof a);
+		a.i = 0;
+		hint(t, &a);
+		s = ".";
+		break;
+	case ',':
+		t->mode = XT_MODE_HINT;
+		bzero(&a, sizeof a);
+		a.i = XT_HINT_NEWTAB;
+		hint(t, &a);
+		s = ",";
+		break;
+	case XT_CMD_OPEN:
+		s = ":open ";
+		break;
+	case XT_CMD_TABNEW:
+		s = ":tabnew ";
+		break;
+	case XT_CMD_OPEN_CURRENT:
+		s = ":open ";
+		/* FALL THROUGH */
+	case XT_CMD_TABNEW_CURRENT:
+		if (!s) /* FALL THROUGH? */
+			s = ":tabnew ";
+		if ((uri = get_uri(t)) != NULL) {
+			ss = g_strdup_printf("%s%s", s, uri);
+			s = ss;
+		}
+		break;
+	default:
+		show_oops(t, "command: invalid opcode %d", args->i);
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_CMD, "%s: tab %d type %s\n", __func__, t->tab_id, s);
+
+	gtk_entry_set_text(GTK_ENTRY(t->cmd), s);
+	gdk_color_parse(XT_COLOR_WHITE, &color);
+	gtk_widget_modify_base(t->cmd, GTK_STATE_NORMAL, &color);
+	show_cmd(t);
+	gtk_widget_grab_focus(GTK_WIDGET(t->cmd));
+	gtk_editable_set_position(GTK_EDITABLE(t->cmd), -1);
+
+	if (ss)
+		g_free(ss);
+
+	return (XT_CB_HANDLED);
+}
+
+int
+search(struct tab *t, struct karg *args)
+{
+	gboolean	d;
+
+	if (t == NULL || args == NULL) {
+		show_oops(NULL, "search invalid parameters");
+		return (1);
+	}
+
+	switch (args->i) {
+	case  XT_SEARCH_NEXT:
+		d = t->search_forward;
+		break;
+	case  XT_SEARCH_PREV:
+		d = !t->search_forward;
+		break;
+	default:
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	if (t->search_text == NULL) {
+		if (global_search == NULL)
+			return (XT_CB_PASSTHROUGH);
+		else {
+			d = t->search_forward = TRUE;
+			t->search_text = g_strdup(global_search);
+			webkit_web_view_mark_text_matches(t->wv, global_search, FALSE, 0);
+			webkit_web_view_set_highlight_text_matches(t->wv, TRUE);
+		}
+	}
+
+	DNPRINTF(XT_D_CMD, "search: tab %d opc %d forw %d text %s\n",
+	    t->tab_id, args->i, t->search_forward, t->search_text);
+
+	webkit_web_view_search_text(t->wv, t->search_text, FALSE, d, TRUE);
+
+	return (XT_CB_HANDLED);
+}
+
+int
+session_save(struct tab *t, char *filename)
+{
+	struct karg		a;
+	int			rv = 1;
+	struct session		*s;
+
+	if (strlen(filename) == 0)
+		goto done;
+
+	if (filename[0] == '.' || filename[0] == '/')
+		goto done;
+
+	a.s = filename;
+	if (save_tabs(t, &a))
+		goto done;
+	strlcpy(named_session, filename, sizeof named_session);
+
+	/* add the new session to the list of sessions */
+	s = g_malloc(sizeof(struct session));
+	s->name = g_strdup(filename);
+	TAILQ_INSERT_TAIL(&sessions, s, entry);
+
+	rv = 0;
+done:
+	return (rv);
+}
+
+int
+session_open(struct tab *t, char *filename)
+{
+	struct karg		a;
+	int			rv = 1;
+
+	if (strlen(filename) == 0)
+		goto done;
+
+	if (filename[0] == '.' || filename[0] == '/')
+		goto done;
+
+	a.s = filename;
+	a.i = XT_SES_CLOSETABS;
+	if (open_tabs(t, &a))
+		goto done;
+
+	strlcpy(named_session, filename, sizeof named_session);
+
+	rv = 0;
+done:
+	return (rv);
+}
+
+int
+session_delete(struct tab *t, char *filename)
+{
+	char			file[PATH_MAX];
+	int			rv = 1;
+	struct session		*s;
+
+	if (strlen(filename) == 0)
+		goto done;
+
+	if (filename[0] == '.' || filename[0] == '/')
+		goto done;
+
+	snprintf(file, sizeof file, "%s" PS "%s", sessions_dir, filename);
+	if (unlink(file))
+		goto done;
+
+	if (!strcmp(filename, named_session))
+		strlcpy(named_session, XT_SAVED_TABS_FILE,
+		    sizeof named_session);
+
+	/* remove session from sessions list */
+	TAILQ_FOREACH(s, &sessions, entry) {
+		if (!strcmp(s->name, filename))
+			break;
+	}
+	if (s == NULL)
+		goto done;
+	TAILQ_REMOVE(&sessions, s, entry);
+	g_free((gpointer) s->name);
+	g_free(s);
+
+	rv = 0;
+done:
+	return (rv);
+}
+
+int
+session_cmd(struct tab *t, struct karg *args)
+{
+	char			*filename = args->s;
+
+	if (t == NULL)
+		return (1);
+
+	if (args->i & XT_SHOW)
+		show_oops(t, "Current session: %s", named_session[0] == '\0' ?
+		    XT_SAVED_TABS_FILE : named_session);
+	else if (args->i & XT_SAVE) {
+		if (session_save(t, filename)) {
+			show_oops(t, "Can't save session: %s",
+			    filename ? filename : "INVALID");
+			goto done;
+		}
+	} else if (args->i & XT_OPEN) {
+		if (session_open(t, filename)) {
+			show_oops(t, "Can't open session: %s",
+			    filename ? filename : "INVALID");
+			goto done;
+		}
+	} else if (args->i & XT_DELETE) {
+		if (session_delete(t, filename)) {
+			show_oops(t, "Can't delete session: %s",
+			    filename ? filename : "INVALID");
+			goto done;
+		}
+	}
+done:
+	return (XT_CB_PASSTHROUGH);
+}
+
+int
+script_cmd(struct tab *t, struct karg *args)
+{
+	struct stat		sb;
+	FILE			*f = NULL;
+	char			*buf = NULL;
+
+	if (t == NULL)
+		goto done;
+
+	if ((f = fopen(args->s, "r")) == NULL) {
+		show_oops(t, "Can't open script file: %s", args->s);
+		goto done;
+	}
+
+	if (fstat(fileno(f), &sb) == -1) {
+		show_oops(t, "Can't stat script file: %s", args->s);
+		goto done;
+	}
+
+	buf = g_malloc0(sb.st_size + 1);
+	if (fread(buf, 1, sb.st_size, f) != sb.st_size) {
+		show_oops(t, "Can't read script file: %s", args->s);
+		goto done;
+	}
+
+	DNPRINTF(XT_D_JS, "%s: about to run script\n", __func__);
+	run_script(t, buf);
+
+done:
+	if (f)
+		fclose(f);
+	if (buf)
+		g_free(buf);
+
+	return (XT_CB_PASSTHROUGH);
+}
+
+/*
+ * Make a hardcopy of the page
+ */
+int
+print_page(struct tab *t, struct karg *args)
+{
+	WebKitWebFrame			*frame;
+	GtkPageSetup			*ps;
+	GtkPrintOperation		*op;
+	GtkPrintOperationAction		action;
+	GtkPrintOperationResult		print_res;
+	GError				*g_err = NULL;
+	int				marg_l, marg_r, marg_t, marg_b;
+
+	DNPRINTF(XT_D_PRINTING, "%s:", __func__);
+
+	ps = gtk_page_setup_new();
+	op = gtk_print_operation_new();
+	action = GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
+	frame = webkit_web_view_get_main_frame(t->wv);
+
+	/* the default margins are too small, so we will bump them */
+	marg_l = gtk_page_setup_get_left_margin(ps, GTK_UNIT_MM) +
+	    XT_PRINT_EXTRA_MARGIN;
+	marg_r = gtk_page_setup_get_right_margin(ps, GTK_UNIT_MM) +
+	    XT_PRINT_EXTRA_MARGIN;
+	marg_t = gtk_page_setup_get_top_margin(ps, GTK_UNIT_MM) +
+	    XT_PRINT_EXTRA_MARGIN;
+	marg_b = gtk_page_setup_get_bottom_margin(ps, GTK_UNIT_MM) +
+	    XT_PRINT_EXTRA_MARGIN;
+
+	/* set margins */
+	gtk_page_setup_set_left_margin(ps, marg_l, GTK_UNIT_MM);
+	gtk_page_setup_set_right_margin(ps, marg_r, GTK_UNIT_MM);
+	gtk_page_setup_set_top_margin(ps, marg_t, GTK_UNIT_MM);
+	gtk_page_setup_set_bottom_margin(ps, marg_b, GTK_UNIT_MM);
+
+	gtk_print_operation_set_default_page_setup(op, ps);
+
+	/* this appears to free 'op' and 'ps' */
+	print_res = webkit_web_frame_print_full(frame, op, action, &g_err);
+
+	/* check it worked */
+	if (print_res == GTK_PRINT_OPERATION_RESULT_ERROR) {
+		show_oops(NULL, "can't print: %s", g_err->message);
+		g_error_free (g_err);
+		return (1);
+	}
+
+	return (0);
+}
+
+int
+go_home(struct tab *t, struct karg *args)
+{
+	load_uri(t, home);
+	return (0);
+}
+
+int
+set_encoding(struct tab *t, struct karg *args)
+{
+	const gchar	*e;
+
+	if (args->s && strlen(g_strstrip(args->s)) == 0) {
+		e = webkit_web_view_get_custom_encoding(t->wv);
+		if (e == NULL)
+			e = webkit_web_view_get_encoding(t->wv);
+		show_oops(t, "encoding: %s", e ? e : "N/A");
+	} else
+		webkit_web_view_set_custom_encoding(t->wv, args->s);
+
+	return (0);
+}
+
+int
+restart(struct tab *t, struct karg *args)
+{
+	struct karg		a;
+
+	a.s = XT_RESTART_TABS_FILE;
+	save_tabs(t, &a);
+	execvp(start_argv[0], start_argv);
+	/* NOTREACHED */
+
+	return (0);
+}
+
+char		*http_proxy_save; /* not a setting, used to toggle */
+
+int
+proxy_cmd(struct tab *t, struct karg *args)
+{
+	DNPRINTF(XT_D_CMD, "%s: tab %d\n", __func__, t->tab_id);
+
+	if (t == NULL)
+		return (1);
+
+	/* setup */
+	if (http_proxy) {
+		if (http_proxy_save)
+			g_free(http_proxy_save);
+		http_proxy_save = g_strdup(http_proxy);
+	}
+
+	if (args->i & XT_PRXY_SHOW) {
+		if (http_proxy)
+			show_oops(t, "http_proxy = %s", http_proxy);
+		else
+			show_oops(t, "proxy is currently disabled");
+	} else if (args->i & XT_PRXY_TOGGLE) {
+		if (http_proxy_save == NULL && http_proxy == NULL) {
+			show_oops(t, "can't toggle proxy");
+			goto done;
+		}
+		if (http_proxy)
+			setup_proxy(NULL);
+		else
+			setup_proxy(http_proxy_save);
+	}
+done:
+	return (XT_CB_PASSTHROUGH);
+}
+struct cmd {
+	char		*cmd;
+	int		level;
+	int		(*func)(struct tab *, struct karg *);
+	int		arg;
+	int		type;
+} cmds[] = {
+	{ "command_mode",	0,	command_mode,		XT_MODE_COMMAND,	0 },
+	{ "insert_mode",	0,	command_mode,		XT_MODE_INSERT,		0 },
+	{ "command",		0,	command,		':',			0 },
+	{ "search",		0,	command,		'/',			0 },
+	{ "searchb",		0,	command,		'?',			0 },
+	{ "hinting",		0,	command,		'.',			0 },
+	{ "hinting_newtab",	0,	command,		',',			0 },
+	{ "togglesrc",		0,	toggle_src,		0,			0 },
+	{ "editsrc",		0,	edit_src,		0,			0 },
+	{ "editelement",	0,	edit_element,		0,			0 },
+	{ "passthrough",	0,	passthrough,		0,	0 },
+
+	/* yanking and pasting */
+	{ "yankuri",		0,	yank_uri,		0,			0 },
+	/* XXX: pasteuri{cur,new} do not work from the cmd_entry? */
+	{ "pasteuricur",	0,	paste_uri,		XT_PASTE_CURRENT_TAB,	0 },
+	{ "pasteurinew",	0,	paste_uri,		XT_PASTE_NEW_TAB,	0 },
+
+	/* search */
+	{ "searchnext",		0,	search,			XT_SEARCH_NEXT,		0 },
+	{ "searchprevious",	0,	search,			XT_SEARCH_PREV,		0 },
+
+	/* focus */
+	{ "focusaddress",	0,	focus,			XT_FOCUS_URI,		0 },
+	{ "focussearch",	0,	focus,			XT_FOCUS_SEARCH,	0 },
+
+	/* hinting */
+	{ "hinting",		0,	hint,			0,			0 },
+	{ "hinting_newtab",	0,	hint,			XT_HINT_NEWTAB,		0 },
+
+	/* custom stylesheet */
+	{ "userstyle",		0,	userstyle,		XT_STYLE_CURRENT_TAB,	0 },
+	{ "userstyle_global",	0,	userstyle,		XT_STYLE_GLOBAL,	0 },
+
+	/* navigation */
+	{ "goback",		0,	navaction,		XT_NAV_BACK,		0 },
+	{ "goforward",		0,	navaction,		XT_NAV_FORWARD,		0 },
+	{ "reload",		0,	navaction,		XT_NAV_RELOAD,		0 },
+	{ "stop",		0,	navaction,		XT_NAV_STOP,		0 },
+
+	/* vertical movement */
+	{ "scrolldown",		0,	move,			XT_MOVE_DOWN,		0 },
+	{ "scrollup",		0,	move,			XT_MOVE_UP,		0 },
+	{ "scrollbottom",	0,	move,			XT_MOVE_BOTTOM,		0 },
+	{ "scrolltop",		0,	move,			XT_MOVE_TOP,		0 },
+	{ "1",			0,	move,			XT_MOVE_TOP,		0 },
+	{ "scrollhalfdown",	0,	move,			XT_MOVE_HALFDOWN,	0 },
+	{ "scrollhalfup",	0,	move,			XT_MOVE_HALFUP,		0 },
+	{ "scrollpagedown",	0,	move,			XT_MOVE_PAGEDOWN,	0 },
+	{ "scrollpageup",	0,	move,			XT_MOVE_PAGEUP,		0 },
+	/* horizontal movement */
+	{ "scrollright",	0,	move,			XT_MOVE_RIGHT,		0 },
+	{ "scrollleft",		0,	move,			XT_MOVE_LEFT,		0 },
+	{ "scrollfarright",	0,	move,			XT_MOVE_FARRIGHT,	0 },
+	{ "scrollfarleft",	0,	move,			XT_MOVE_FARLEFT,	0 },
+
+	{ "favorites",		0,	xtp_page_fl,		0,			0 },
+	{ "fav",		0,	xtp_page_fl,		0,			0 },
+	{ "favadd",		0,	add_favorite,		0,			0 },
+
+	{ "qall",		0,	quit,			0,			0 },
+	{ "quitall",		0,	quit,			0,			0 },
+	{ "w",			0,	save_tabs,		0,			0 },
+	{ "wq",			0,	save_tabs_and_quit,	0,			0 },
+	{ "help",		0,	help,			0,			0 },
+	{ "about",		0,	about,			0,			0 },
+	{ "stats",		0,	stats,			0,			0 },
+	{ "version",		0,	about,			0,			0 },
+
+	/* js command */
+	{ "js",			0,	js_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "save",		1,	js_cmd,			XT_SAVE | XT_WL_FQDN,				0 },
+	{ "domain",		2,	js_cmd,			XT_SAVE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	js_cmd,			XT_SAVE | XT_WL_FQDN,				0 },
+	{ "show",		1,	js_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "all",		2,	js_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "persistent",		2,	js_cmd,			XT_SHOW | XT_WL_PERSISTENT,			0 },
+	{ "session",		2,	js_cmd,			XT_SHOW | XT_WL_SESSION,			0 },
+	{ "toggle",		1,	js_cmd,			XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+	{ "domain",		2,	js_cmd,			XT_WL_TOGGLE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	js_cmd,			XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+
+	/* cookie command */
+	{ "cookie",		0,	cookie_cmd,		XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "save",		1,	cookie_cmd,		XT_SAVE | XT_WL_FQDN,				0 },
+	{ "domain",		2,	cookie_cmd,		XT_SAVE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	cookie_cmd,		XT_SAVE | XT_WL_FQDN,				0 },
+	{ "show",		1,	cookie_cmd,		XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "all",		2,	cookie_cmd,		XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "persistent",		2,	cookie_cmd,		XT_SHOW | XT_WL_PERSISTENT,			0 },
+	{ "session",		2,	cookie_cmd,		XT_SHOW | XT_WL_SESSION,			0 },
+	{ "toggle",		1,	cookie_cmd,		XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+	{ "domain",		2,	cookie_cmd,		XT_WL_TOGGLE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	cookie_cmd,		XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+	{ "purge",		1,	cookie_cmd,		XT_DELETE,					0 },
+
+	/* plugin command */
+	{ "plugin",		0,	pl_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "save",		1,	pl_cmd,			XT_SAVE | XT_WL_FQDN,				0 },
+	{ "domain",		2,	pl_cmd,			XT_SAVE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	pl_cmd,			XT_SAVE | XT_WL_FQDN,				0 },
+	{ "show",		1,	pl_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "all",		2,	pl_cmd,			XT_SHOW | XT_WL_PERSISTENT | XT_WL_SESSION,	0 },
+	{ "persistent",		2,	pl_cmd,			XT_SHOW | XT_WL_PERSISTENT,			0 },
+	{ "session",		2,	pl_cmd,			XT_SHOW | XT_WL_SESSION,			0 },
+	{ "toggle",		1,	pl_cmd,			XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+	{ "domain",		2,	pl_cmd,			XT_WL_TOGGLE | XT_WL_TOPLEVEL,			0 },
+	{ "fqdn",		2,	pl_cmd,			XT_WL_TOGGLE | XT_WL_FQDN,			0 },
+
+	/* toplevel (domain) command */
+	{ "toplevel",		0,	toplevel_cmd,		XT_WL_TOGGLE | XT_WL_TOPLEVEL | XT_WL_RELOAD,	0 },
+	{ "toggle",		1,	toplevel_cmd,		XT_WL_TOGGLE | XT_WL_TOPLEVEL | XT_WL_RELOAD,	0 },
+
+	/* cookie jar */
+	{ "cookiejar",		0,	xtp_page_cl,		0,			0 },
+
+	/* cert command */
+	{ "cert",		0,	cert_cmd,		XT_SHOW,		0 },
+	{ "save",		1,	cert_cmd,		XT_SAVE,		0 },
+	{ "show",		1,	cert_cmd,		XT_SHOW,		0 },
+
+	{ "ca",			0,	ca_cmd,			0,			0 },
+	{ "downloadmgr",	0,	xtp_page_dl,		0,			0 },
+	{ "dl",			0,	xtp_page_dl,		0,			0 },
+	{ "h",			0,	xtp_page_hl,		0,			0 },
+	{ "history",		0,	xtp_page_hl,		0,			0 },
+	{ "home",		0,	go_home,		0,			0 },
+	{ "restart",		0,	restart,		0,			0 },
+	{ "urlhide",		0,	urlaction,		XT_URL_HIDE,		0 },
+	{ "urlshow",		0,	urlaction,		XT_URL_SHOW,		0 },
+	{ "statustoggle",	0,	statustoggle,		0,			0 },
+	{ "run_script",		0,	run_page_script,	0,			XT_USERARG },
+
+	{ "print",		0,	print_page,		0,			0 },
+
+	/* tabs */
+	{ "focusin",		0,	resizetab,		XT_ZOOM_IN,		0 },
+	{ "focusout",		0,	resizetab,		XT_ZOOM_OUT,		0 },
+	{ "focusreset",		0,	resizetab,		XT_ZOOM_NORMAL,		0 },
+	{ "q",			0,	tabaction,		XT_TAB_DELQUIT,		0 },
+	{ "quit",		0,	tabaction,		XT_TAB_DELQUIT,		0 },
+	{ "open",		0,	tabaction,		XT_TAB_OPEN,		XT_URLARG },
+	{ "tabclose",		0,	tabaction,		XT_TAB_DELETE,		XT_PREFIX | XT_INTARG},
+	{ "tabedit",		0,	tabaction,		XT_TAB_NEW,		XT_PREFIX | XT_URLARG },
+	{ "tabfirst",		0,	movetab,		XT_TAB_FIRST,		0 },
+	{ "tabhide",		0,	tabaction,		XT_TAB_HIDE,		0 },
+	{ "tablast",		0,	movetab,		XT_TAB_LAST,		0 },
+	{ "tabnew",		0,	tabaction,		XT_TAB_NEW,		XT_PREFIX | XT_URLARG },
+	{ "tabnext",		0,	movetab,		XT_TAB_NEXT,		XT_PREFIX | XT_INTARG},
+	{ "tabnextstyle",	0,	tabaction,		XT_TAB_NEXTSTYLE,	0 },
+	{ "tabprevious",	0,	movetab,		XT_TAB_PREV,		XT_PREFIX | XT_INTARG},
+	{ "tabrewind",		0,	movetab,		XT_TAB_FIRST,		0 },
+	{ "tabshow",		0,	tabaction,		XT_TAB_SHOW,		0 },
+	{ "tabs",		0,	buffers,		0,			0 },
+	{ "tabundoclose",	0,	tabaction,		XT_TAB_UNDO_CLOSE,	0 },
+	{ "buffers",		0,	buffers,		0,			0 },
+	{ "ls",			0,	buffers,		0,			0 },
+	{ "encoding",		0,	set_encoding,		0,			XT_USERARG },
+	{ "loadimages",		0,	tabaction,		XT_TAB_LOAD_IMAGES,	0 },
+
+	/* command aliases (handy when -S flag is used) */
+	{ "promptopen",		0,	command,		XT_CMD_OPEN,		0 },
+	{ "promptopencurrent",	0,	command,		XT_CMD_OPEN_CURRENT,	0 },
+	{ "prompttabnew",	0,	command,		XT_CMD_TABNEW,		0 },
+	{ "prompttabnewcurrent",0,	command,		XT_CMD_TABNEW_CURRENT,	0 },
+
+	/* settings */
+	{ "set",		0,	set,			0,			XT_SETARG },
+
+	{ "fullscreen",		0,	fullscreen,		0,			0 },
+	{ "f",			0,	fullscreen,		0,			0 },
+
+	/* sessions */
+	{ "session",		0,	session_cmd,		XT_SHOW,		0 },
+	{ "delete",		1,	session_cmd,		XT_DELETE,		XT_SESSARG },
+	{ "open",		1,	session_cmd,		XT_OPEN,		XT_SESSARG },
+	{ "save",		1,	session_cmd,		XT_SAVE,		XT_USERARG },
+	{ "show",		1,	session_cmd,		XT_SHOW,		0 },
+
+	/* external javascript */
+	{ "script",		0,	script_cmd,		XT_EJS_SHOW,		XT_USERARG },
+
+	/* inspector */
+	{ "inspector",		0,	inspector_cmd,		XT_INS_SHOW,		0 },
+	{ "show",		1,	inspector_cmd,		XT_INS_SHOW,		0 },
+	{ "hide",		1,	inspector_cmd,		XT_INS_HIDE,		0 },
+
+	/* proxy */
+	{ "proxy",		0,	proxy_cmd,		XT_PRXY_SHOW,		0 },
+	{ "show",		1,	proxy_cmd,		XT_PRXY_SHOW,		0 },
+	{ "toggle",		1,	proxy_cmd,		XT_PRXY_TOGGLE,		0 },
+};
+
+struct {
+	int			index;
+	int			len;
+	gchar			*list[256];
+} cmd_status = {-1, 0};
+
+gboolean
+wv_release_button_cb(GtkWidget *btn, GdkEventButton *e, struct tab *t)
+{
+
+	if (e->type == GDK_BUTTON_RELEASE && e->button == 1)
+		btn_down = 0;
+
+	return (FALSE);
+}
+
+gboolean
+wv_button_cb(GtkWidget *btn, GdkEventButton *e, struct tab *t)
+{
+	struct karg		a;
+	WebKitHitTestResult	*hit_test_result;
+	guint			context;
+
+	hit_test_result = webkit_web_view_get_hit_test_result(t->wv, e);
+	g_object_get(hit_test_result, "context", &context, NULL);
+
+	hide_oops(t);
+	hide_buffers(t);
+
+	if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)
+		t->mode = XT_MODE_INSERT;
+	else
+		t->mode = XT_MODE_COMMAND;
+
+	if (e->type == GDK_BUTTON_PRESS && e->button == 1)
+		btn_down = 1;
+	else if (e->type == GDK_BUTTON_PRESS && e->button == 8 /* btn 4 */) {
+		/* go backward */
+		a.i = XT_NAV_BACK;
+		navaction(t, &a);
+
+		return (TRUE);
+	} else if (e->type == GDK_BUTTON_PRESS && e->button == 9 /* btn 5 */) {
+		/* go forward */
+		a.i = XT_NAV_FORWARD;
+		navaction(t, &a);
+
+		return (TRUE);
+	}
+
+	return (FALSE);
+}
+
+gboolean
+tab_close_cb(GtkWidget *btn, GdkEventButton *e, struct tab *t)
+{
+	DNPRINTF(XT_D_TAB, "tab_close_cb: tab %d\n", t->tab_id);
+
+	if (e->type == GDK_BUTTON_PRESS && e->button == 1)
+		delete_tab(t);
+
+	return (FALSE);
+}
+
+
+
+void
+activate_uri_entry_cb(GtkWidget* entry, struct tab *t)
+{
+	const gchar		*uri = gtk_entry_get_text(GTK_ENTRY(entry));
+
+	DNPRINTF(XT_D_URL, "activate_uri_entry_cb: %s\n", uri);
+
+	if (t == NULL) {
+		show_oops(NULL, "activate_uri_entry_cb invalid parameters");
+		return;
+	}
+
+	if (uri == NULL) {
+		show_oops(t, "activate_uri_entry_cb no uri");
+		return;
+	}
+
+	uri += strspn(uri, "\t ");
+
+	/* if xxxt:// treat specially */
+	if (parse_xtp_url(t, uri))
+		return;
+
+	/* otherwise continue to load page normally */
+	load_uri(t, (gchar *)uri);
+	focus_webview(t);
+}
+
+void
+activate_search_entry_cb(GtkWidget* entry, struct tab *t)
+{
+	const gchar		*search = gtk_entry_get_text(GTK_ENTRY(entry));
+	char			*newuri = NULL;
+	gchar			*enc_search;
+
+	DNPRINTF(XT_D_URL, "activate_search_entry_cb: %s\n", search);
+
+	if (t == NULL) {
+		show_oops(NULL, "activate_search_entry_cb invalid parameters");
+		return;
+	}
+
+	if (search_string == NULL) {
+		show_oops(t, "no search_string");
+		return;
+	}
+
+	t->xtp_meaning = XT_XTP_TAB_MEANING_NORMAL;
+
+	enc_search = soup_uri_encode(search, XT_RESERVED_CHARS);
+	newuri = g_strdup_printf(search_string, enc_search);
+	g_free(enc_search);
+
+	marks_clear(t);
+	webkit_web_view_load_uri(t->wv, newuri);
+	focus_webview(t);
+
+	if (newuri)
+		g_free(newuri);
+}
+
+void
+check_and_set_cookie(const gchar *uri, struct tab *t)
+{
+	struct domain		*d = NULL;
+	int			es = 0;
+
+	if (uri == NULL || t == NULL)
+		return;
+
+	if ((d = wl_find_uri(uri, &c_wl)) == NULL)
+		es = 0;
+	else
+		es = 1;
+
+	DNPRINTF(XT_D_COOKIE, "check_and_set_cookie: %s %s\n",
+	    es ? "enable" : "disable", uri);
+
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-html5-local-storage", es, (char *)NULL);
+	webkit_web_view_set_settings(t->wv, t->settings);
+}
+
+void
+check_and_set_js(const gchar *uri, struct tab *t)
+{
+	struct domain		*d = NULL;
+	int			es = 0;
+
+	if (uri == NULL || t == NULL)
+		return;
+
+	if ((d = wl_find_uri(uri, &js_wl)) == NULL)
+		es = 0;
+	else
+		es = 1;
+
+	DNPRINTF(XT_D_JS, "check_and_set_js: %s %s\n",
+	    es ? "enable" : "disable", uri);
+
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-scripts", es, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "javascript-can-open-windows-automatically", es, (char *)NULL);
+	webkit_web_view_set_settings(t->wv, t->settings);
+
+	button_set_stockid(t->js_toggle,
+	    es ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE);
+}
+
+void
+check_and_set_pl(const gchar *uri, struct tab *t)
+{
+	struct domain		*d = NULL;
+	int			es = 0;
+
+	if (uri == NULL || t == NULL)
+		return;
+
+	if ((d = wl_find_uri(uri, &pl_wl)) == NULL)
+		es = 0;
+	else
+		es = 1;
+
+	DNPRINTF(XT_D_JS, "check_and_set_pl: %s %s\n",
+	    es ? "enable" : "disable", uri);
+
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-plugins", es, (char *)NULL);
+	webkit_web_view_set_settings(t->wv, t->settings);
+}
+
+void
+color_address_bar(gpointer p)
+{
+	GdkColor		color;
+	struct tab		*tt, *t = p;
+	gchar			*col_str = XT_COLOR_WHITE;
+	const gchar		*uri, *u = NULL, *error_str = NULL;
+
+#ifdef USE_THREADS
+	gdk_threads_enter();
+#endif
+	DNPRINTF(XT_D_URL, "%s:\n", __func__);
+
+	/* make sure t still exists */
+	if (t == NULL)
+		return;
+	TAILQ_FOREACH(tt, &tabs, entry)
+		if (t == tt)
+			break;
+	if (t != tt)
+		goto done;
+
+	if ((uri = get_uri(t)) == NULL)
+		goto white;
+	u = g_strdup(uri);
+
+#ifdef USE_THREADS
+	gdk_threads_leave();
+#endif
+
+	col_str = XT_COLOR_YELLOW;
+	switch (load_compare_cert(u, &error_str)) {
+	case CERT_LOCAL:
+		col_str = XT_COLOR_BLUE;
+		break;
+	case CERT_TRUSTED:
+		col_str = XT_COLOR_GREEN;
+		break;
+	case CERT_UNTRUSTED:
+		col_str = XT_COLOR_YELLOW;
+		break;
+	case CERT_BAD:
+		col_str = XT_COLOR_RED;
+		break;
+	}
+
+#ifdef USE_THREADS
+	gdk_threads_enter();
+#endif
+	/* make sure t isn't deleted */
+	TAILQ_FOREACH(tt, &tabs, entry)
+		if (t == tt)
+			break;
+	if (t != tt)
+		goto done;
+
+#ifdef USE_THREADS
+	/* test to see if the user navigated away and canceled the thread */
+	if (t->thread != g_thread_self())
+		goto done;
+	if ((uri = get_uri(t)) == NULL) {
+		t->thread = NULL;
+		goto done;
+	}
+	if (strcmp(uri, u)) {
+		/* make sure we are still the same url */
+		t->thread = NULL;
+		goto done;
+	}
+#endif
+white:
+	gdk_color_parse(col_str, &color);
+	gtk_widget_modify_base(t->uri_entry, GTK_STATE_NORMAL, &color);
+
+	if (!strcmp(col_str, XT_COLOR_WHITE))
+		statusbar_modify_attr(t, col_str, XT_COLOR_BLACK);
+	else
+		statusbar_modify_attr(t, XT_COLOR_BLACK, col_str);
+
+	if (error_str && error_str[0] != '\0')
+		show_oops(t, "%s", error_str);
+#ifdef USE_THREADS
+	t->thread = NULL;
+#endif
+done:
+	/* t is invalid at this point */
+	if (u)
+		g_free((gpointer)u);
+#ifdef USE_THREADS
+	gdk_threads_leave();
+#endif
+}
+
+void
+show_ca_status(struct tab *t, const char *uri)
+{
+	GdkColor		color;
+	gchar			*col_str = XT_COLOR_WHITE;
+
+	DNPRINTF(XT_D_URL, "show_ca_status: %d %s %s\n",
+	    ssl_strict_certs, ssl_ca_file, uri);
+
+	if (t == NULL)
+		return;
+
+	if (uri == NULL)
+		goto done;
+	if (ssl_ca_file == NULL) {
+		if (g_str_has_prefix(uri, "http://"))
+			goto done;
+		if (g_str_has_prefix(uri, "https://")) {
+			col_str = XT_COLOR_RED;
+			goto done;
+		}
+		return;
+	}
+	if (g_str_has_prefix(uri, "http://") ||
+	    !g_str_has_prefix(uri, "https://"))
+		goto done;
+#ifdef USE_THREADS
+	/*
+	 * It is not necessary to see if the thread is already running.
+	 * If the thread is in progress setting it to something else aborts it
+	 * on the way out.
+	 */
+
+	/* thread the coloring of the address bar */
+	t->thread = g_thread_create((GThreadFunc)color_address_bar, t, TRUE, NULL);
+#else
+	color_address_bar(t);
+#endif
+	return;
+
+done:
+	if (col_str) {
+		gdk_color_parse(col_str, &color);
+		gtk_widget_modify_base(t->uri_entry, GTK_STATE_NORMAL, &color);
+
+		if (!strcmp(col_str, XT_COLOR_WHITE))
+			statusbar_modify_attr(t, col_str, XT_COLOR_BLACK);
+		else
+			statusbar_modify_attr(t, XT_COLOR_BLACK, col_str);
+	}
+}
+
+void
+free_favicon(struct tab *t)
+{
+	DNPRINTF(XT_D_DOWNLOAD, "%s: down %p req %p\n",
+	    __func__, t->icon_download, t->icon_request);
+
+	if (t->icon_request)
+		g_object_unref(t->icon_request);
+	if (t->icon_dest_uri)
+		g_free(t->icon_dest_uri);
+
+	t->icon_request = NULL;
+	t->icon_dest_uri = NULL;
+}
+
+void
+xt_icon_from_name(struct tab *t, gchar *name)
+{
+	if (!enable_favicon_entry)
+		return;
+
+	gtk_entry_set_icon_from_icon_name(GTK_ENTRY(t->uri_entry),
+	    GTK_ENTRY_ICON_PRIMARY, "text-html");
+	if (show_url == 0)
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(t->sbe.statusbar),
+		    GTK_ENTRY_ICON_PRIMARY, "text-html");
+	else
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(t->sbe.statusbar),
+		    GTK_ENTRY_ICON_PRIMARY, NULL);
+}
+
+void
+xt_icon_from_pixbuf(struct tab *t, GdkPixbuf *pb)
+{
+	GdkPixbuf		*pb_scaled;
+
+	if (gdk_pixbuf_get_width(pb) > 16 || gdk_pixbuf_get_height(pb) > 16)
+		pb_scaled = gdk_pixbuf_scale_simple(pb, 16, 16,
+		    GDK_INTERP_BILINEAR);
+	else
+		pb_scaled = pb;
+
+	if (enable_favicon_entry) {
+
+		/* Classic tabs. */
+		gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(t->uri_entry),
+		    GTK_ENTRY_ICON_PRIMARY, pb_scaled);
+
+		/* Minimal tabs. */
+		if (show_url == 0) {
+			gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(t->sbe.statusbar),
+			    GTK_ENTRY_ICON_PRIMARY, pb_scaled);
+		} else
+			gtk_entry_set_icon_from_icon_name(GTK_ENTRY(t->sbe.statusbar),
+			    GTK_ENTRY_ICON_PRIMARY, NULL);
+	}
+
+	/* XXX: Only supports the minimal tabs atm. */
+	if (enable_favicon_tabs)
+		gtk_image_set_from_pixbuf(GTK_IMAGE(t->tab_elems.favicon),
+		    pb_scaled);
+
+	if (pb_scaled != pb)
+		g_object_unref(pb_scaled);
+}
+
+void
+xt_icon_from_file(struct tab *t, char *file)
+{
+	GdkPixbuf		*pb;
+
+	if (g_str_has_prefix(file, "file://"))
+		file += strlen("file://");
+
+	pb = gdk_pixbuf_new_from_file(file, NULL);
+	if (pb) {
+		xt_icon_from_pixbuf(t, pb);
+		g_object_unref(pb);
+	} else
+		xt_icon_from_name(t, "text-html");
+}
+
+gboolean
+is_valid_icon(char *file)
+{
+	gboolean		valid = 0;
+	const char		*mime_type;
+	GFileInfo		*fi;
+	GFile			*gf;
+
+	gf = g_file_new_for_path(file);
+	fi = g_file_query_info(gf, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0,
+	    NULL, NULL);
+	mime_type = g_file_info_get_content_type(fi);
+	valid = g_strcmp0(mime_type, "image/x-ico") == 0 ||
+	    g_strcmp0(mime_type, "image/vnd.microsoft.icon") == 0 ||
+	    g_strcmp0(mime_type, "image/png") == 0 ||
+	    g_strcmp0(mime_type, "image/gif") == 0 ||
+	    g_strcmp0(mime_type, "application/octet-stream") == 0;
+	g_object_unref(fi);
+	g_object_unref(gf);
+
+	return (valid);
+}
+
+void
+set_favicon_from_file(struct tab *t, char *file)
+{
+	struct stat		sb;
+
+	if (t == NULL || file == NULL)
+		return;
+
+	if (g_str_has_prefix(file, "file://"))
+		file += strlen("file://");
+	DNPRINTF(XT_D_DOWNLOAD, "%s: loading %s\n", __func__, file);
+
+	if (!stat(file, &sb)) {
+		if (sb.st_size == 0 || !is_valid_icon(file)) {
+			/* corrupt icon so trash it */
+			DNPRINTF(XT_D_DOWNLOAD, "%s: corrupt icon %s\n",
+			    __func__, file);
+			unlink(file);
+			/* no need to set icon to default here */
+			return;
+		}
+	}
+	xt_icon_from_file(t, file);
+}
+
+void
+favicon_download_status_changed_cb(WebKitDownload *download, GParamSpec *spec,
+    WebKitWebView *wv)
+{
+	WebKitDownloadStatus	status = webkit_download_get_status(download);
+	struct tab		*tt = NULL, *t = NULL;
+
+	/*
+	 * find the webview instead of passing in the tab as it could have been
+	 * deleted from underneath us.
+	 */
+	TAILQ_FOREACH(tt, &tabs, entry) {
+		if (tt->wv == wv) {
+			t = tt;
+			break;
+		}
+	}
+	if (t == NULL)
+		return;
+
+	DNPRINTF(XT_D_DOWNLOAD, "%s: tab %d status %d\n",
+	    __func__, t->tab_id, status);
+
+	switch (status) {
+	case WEBKIT_DOWNLOAD_STATUS_ERROR:
+		/* -1 */
+		t->icon_download = NULL;
+		free_favicon(t);
+		break;
+	case WEBKIT_DOWNLOAD_STATUS_CREATED:
+		/* 0 */
+		break;
+	case WEBKIT_DOWNLOAD_STATUS_STARTED:
+		/* 1 */
+		break;
+	case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
+		/* 2 */
+		DNPRINTF(XT_D_DOWNLOAD, "%s: freeing favicon %d\n",
+		    __func__, t->tab_id);
+		t->icon_download = NULL;
+		free_favicon(t);
+		break;
+	case WEBKIT_DOWNLOAD_STATUS_FINISHED:
+		/* 3 */
+
+		DNPRINTF(XT_D_DOWNLOAD, "%s: setting icon to %s\n",
+		    __func__, t->icon_dest_uri);
+		set_favicon_from_file(t, t->icon_dest_uri);
+		/* these will be freed post callback */
+		t->icon_request = NULL;
+		t->icon_download = NULL;
+		break;
+	default:
+		break;
+	}
+}
+
+void
+abort_favicon_download(struct tab *t)
+{
+	DNPRINTF(XT_D_DOWNLOAD, "%s: down %p\n", __func__, t->icon_download);
+
+#if !WEBKIT_CHECK_VERSION(1, 4, 0)
+	if (t->icon_download) {
+		g_signal_handlers_disconnect_by_func(G_OBJECT(t->icon_download),
+		    G_CALLBACK(favicon_download_status_changed_cb), t->wv);
+		webkit_download_cancel(t->icon_download);
+		t->icon_download = NULL;
+	} else
+		free_favicon(t);
+#endif
+
+	xt_icon_from_name(t, "text-html");
+}
+
+void
+notify_icon_loaded_cb(WebKitWebView *wv, gchar *uri, struct tab *t)
+{
+	DNPRINTF(XT_D_DOWNLOAD, "%s %s\n", __func__, uri);
+
+	if (uri == NULL || t == NULL)
+		return;
+
+#if WEBKIT_CHECK_VERSION(1, 4, 0)
+	/* take icon from WebKitIconDatabase */
+	GdkPixbuf		*pb;
+
+	pb = webkit_web_view_get_icon_pixbuf(wv);
+	if (pb) {
+		xt_icon_from_pixbuf(t, pb);
+		g_object_unref(pb);
+	} else
+		xt_icon_from_name(t, "text-html");
+#elif WEBKIT_CHECK_VERSION(1, 1, 18)
+	/* download icon to cache dir */
+	gchar			*name_hash, file[PATH_MAX];
+	struct stat		sb;
+
+	if (t->icon_request) {
+		DNPRINTF(XT_D_DOWNLOAD, "%s: download in progress\n", __func__);
+		return;
+	}
+
+	/* check to see if we got the icon in cache */
+	name_hash = g_compute_checksum_for_string(G_CHECKSUM_SHA256, uri, -1);
+	snprintf(file, sizeof file, "%s" PS "%s.ico", cache_dir, name_hash);
+	g_free(name_hash);
+
+	if (!stat(file, &sb)) {
+		if (sb.st_size > 0) {
+			DNPRINTF(XT_D_DOWNLOAD, "%s: loading from cache %s\n",
+			    __func__, file);
+			set_favicon_from_file(t, file);
+			return;
+		}
+
+		/* corrupt icon so trash it */
+		DNPRINTF(XT_D_DOWNLOAD, "%s: corrupt icon %s\n",
+		    __func__, file);
+		unlink(file);
+	}
+
+	/* create download for icon */
+	t->icon_request = webkit_network_request_new(uri);
+	if (t->icon_request == NULL) {
+		DNPRINTF(XT_D_DOWNLOAD, "%s: invalid uri %s\n",
+		    __func__, uri);
+		return;
+	}
+
+	t->icon_download = webkit_download_new(t->icon_request);
+	if (t->icon_download == NULL)
+		return;
+
+	/* we have to free icon_dest_uri later */
+	t->icon_dest_uri = g_strdup_printf("file://%s", file);
+	webkit_download_set_destination_uri(t->icon_download,
+	    t->icon_dest_uri);
+
+	if (webkit_download_get_status(t->icon_download) ==
+	    WEBKIT_DOWNLOAD_STATUS_ERROR) {
+		g_object_unref(t->icon_request);
+		g_free(t->icon_dest_uri);
+		t->icon_request = NULL;
+		t->icon_dest_uri = NULL;
+		return;
+	}
+
+	g_signal_connect(G_OBJECT(t->icon_download), "notify::status",
+	    G_CALLBACK(favicon_download_status_changed_cb), t->wv);
+
+	webkit_download_start(t->icon_download);
+#endif
+}
+
+void
+notify_load_status_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t)
+{
+	const gchar		*uri = NULL;
+	struct history		*h, find;
+	struct karg		a;
+	GdkColor		color;
+
+	DNPRINTF(XT_D_URL, "notify_load_status_cb: %d  %s\n",
+	    webkit_web_view_get_load_status(wview),
+	    get_uri(t) ? get_uri(t) : "NOTHING");
+
+	if (t == NULL) {
+		show_oops(NULL, "notify_load_status_cb invalid parameters");
+		return;
+	}
+
+	switch (webkit_web_view_get_load_status(wview)) {
+	case WEBKIT_LOAD_PROVISIONAL:
+		/* 0 */
+		abort_favicon_download(t);
+#if GTK_CHECK_VERSION(2, 20, 0)
+		gtk_widget_show(t->spinner);
+		gtk_spinner_start(GTK_SPINNER(t->spinner));
+#endif
+		gtk_label_set_text(GTK_LABEL(t->label), "Loading");
+
+		gtk_widget_set_sensitive(GTK_WIDGET(t->stop), TRUE);
+
+		/* assume we are a new address */
+		gdk_color_parse("white", &color);
+		gtk_widget_modify_base(t->uri_entry, GTK_STATE_NORMAL, &color);
+		statusbar_modify_attr(t, "white", XT_COLOR_BLACK);
+
+		/* take focus if we are visible */
+		focus_webview(t);
+		t->focus_wv = 1;
+
+		marks_clear(t);
+#ifdef USE_THREAD
+		/* kill color thread */
+		t->thread = NULL;
+#endif
+		break;
+
+	case WEBKIT_LOAD_COMMITTED:
+		/* 1 */
+		uri = get_uri(t);
+		if (uri == NULL)
+			return;
+		gtk_entry_set_text(GTK_ENTRY(t->uri_entry), uri);
+
+		if (t->status) {
+			g_free(t->status);
+			t->status = NULL;
+		}
+		set_status(t, (char *)uri, XT_STATUS_LOADING);
+
+		/* check if js white listing is enabled */
+		if (enable_plugin_whitelist)
+			check_and_set_pl(uri, t);
+		if (enable_cookie_whitelist)
+			check_and_set_cookie(uri, t);
+		if (enable_js_whitelist)
+			check_and_set_js(uri, t);
+
+		if (t->styled)
+			apply_style(t);
+
+
+		/* we know enough to autosave the session */
+		if (session_autosave) {
+			a.s = NULL;
+			save_tabs(t, &a);
+		}
+
+		show_ca_status(t, uri);
+		run_script(t, JS_HINTING);
+		if (enable_autoscroll)
+			run_script(t, JS_AUTOSCROLL);
+		break;
+
+	case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+		/* 3 */
+		if (color_visited_uris) {
+			color_visited(t, color_visited_helper());
+
+			/* This colors the links you middle-click (open in new
+			 * tab) in the current tab. */
+			if (t->tab_id != gtk_notebook_get_current_page(notebook) &&
+			    (uri = get_uri(t)) != NULL)
+				color_visited(get_current_tab(),
+				    g_strdup_printf("{'%s' : 'dummy'}", uri));
+		}
+		break;
+
+	case WEBKIT_LOAD_FINISHED:
+		/* 2 */
+		if ((uri = get_uri(t)) == NULL)
+			return;
+
+		if (!strncmp(uri, "http://", strlen("http://")) ||
+		    !strncmp(uri, "https://", strlen("https://")) ||
+		    !strncmp(uri, "file://", strlen("file://"))) {
+			find.uri = (gchar *)uri;
+			h = RB_FIND(history_list, &hl, &find);
+			if (!h)
+				insert_history_item(uri,
+				    get_title(t, FALSE), time(NULL));
+			else
+				h->time = time(NULL);
+		}
+
+		set_status(t, (char *)uri, XT_STATUS_URI);
+#if WEBKIT_CHECK_VERSION(1, 1, 18)
+	case WEBKIT_LOAD_FAILED:
+		/* 4 */
+#endif
+#if GTK_CHECK_VERSION(2, 20, 0)
+		gtk_spinner_stop(GTK_SPINNER(t->spinner));
+		gtk_widget_hide(t->spinner);
+#endif
+	default:
+		gtk_widget_set_sensitive(GTK_WIDGET(t->stop), FALSE);
+		break;
+	}
+
+	if (t->item)
+		gtk_widget_set_sensitive(GTK_WIDGET(t->backward), TRUE);
+	else
+		gtk_widget_set_sensitive(GTK_WIDGET(t->backward),
+		    can_go_back_for_real(t));
+
+	gtk_widget_set_sensitive(GTK_WIDGET(t->forward),
+	    can_go_forward_for_real(t));
+}
+
+void
+notify_title_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t)
+{
+	const gchar		*title = NULL, *win_title = NULL;
+
+	title = get_title(t, FALSE);
+	win_title = get_title(t, TRUE);
+	if (title) {
+		gtk_label_set_text(GTK_LABEL(t->label), title);
+		gtk_label_set_text(GTK_LABEL(t->tab_elems.label), title);
+	}
+
+	if (win_title && t->tab_id == gtk_notebook_get_current_page(notebook))
+		gtk_window_set_title(GTK_WINDOW(main_window), win_title);
+}
+
+char *
+get_domain(const gchar *host)
+{
+	size_t		x;
+	char		*p;
+
+	/* handle silly domains like .co.uk */
+
+	if ((x = strlen(host)) <= 6)
+		return (g_strdup(host));
+
+	if (host[x - 3] == '.' && host[x - 6] == '.') {
+		x = x - 7;
+		while (x > 0)
+			if (host[x] != '.')
+				x--;
+			else
+				return (g_strdup(&host[x + 1]));
+	}
+
+	/* find first . */
+	p = g_strrstr(host, ".");
+	if (p == NULL)
+		return (g_strdup(""));
+	p--;
+	while (p > host)
+		if (*p != '.')
+			p--;
+		else
+			return (g_strdup(p + 1));
+
+	return (g_strdup(host));
+}
+
+void
+js_autorun(struct tab *t)
+{
+	SoupURI			*su = NULL;
+	const gchar		*uri;
+	size_t			got_default = 0, got_host = 0;
+	struct stat		sb;
+	char			deff[PATH_MAX], hostf[PATH_MAX];
+	char			*js = NULL, *jsat, *domain = NULL;
+	FILE			*deffile = NULL, *hostfile = NULL;
+
+	if (js_autorun_enabled == 0)
+		return;
+
+	uri = get_uri(t);
+	if (uri &&
+	    !(g_str_has_prefix(uri, "http://") ||
+	    g_str_has_prefix(uri, "https://")))
+		goto done;
+
+	su = soup_uri_new(uri);
+	if (su == NULL)
+		goto done;
+	if (!SOUP_URI_VALID_FOR_HTTP(su))
+		goto done;
+
+	DNPRINTF(XT_D_JS, "%s: host: %s domain: %s\n", __func__,
+	    su->host, domain);
+	domain = get_domain(su->host);
+
+	snprintf(deff, sizeof deff, "%s" PS "default.js", js_dir);
+	if ((deffile = fopen(deff, "r")) != NULL) {
+		if (fstat(fileno(deffile), &sb) == -1) {
+			show_oops(t, "can't stat default JS file");
+			goto done;
+		}
+		got_default = sb.st_size;
+	}
+
+	/* try host first followed by domain */
+	snprintf(hostf, sizeof hostf, "%s" PS "%s.js", js_dir, su->host);
+	DNPRINTF(XT_D_JS, "trying file: %s\n", hostf);
+	if ((hostfile = fopen(hostf, "r")) == NULL) {
+		snprintf(hostf, sizeof hostf, "%s" PS "%s.js", js_dir, domain);
+		DNPRINTF(XT_D_JS, "trying file: %s\n", hostf);
+		if ((hostfile = fopen(hostf, "r")) == NULL)
+			goto nofile;
+	}
+	DNPRINTF(XT_D_JS, "file: %s\n", hostf);
+	if (fstat(fileno(hostfile), &sb) == -1) {
+		show_oops(t, "can't stat %s JS file", hostf);
+		goto done;
+	}
+	got_host = sb.st_size;
+
+nofile:
+	if (got_default + got_host == 0)
+		goto done;
+
+	js = g_malloc0(got_default + got_host + 1);
+	jsat = js;
+
+	if (got_default) {
+		if (fread(js, got_default, 1, deffile) != 1) {
+			show_oops(t, "default file read error");
+			goto done;
+		}
+		jsat = js + got_default;
+	}
+
+	if (got_host) {
+		if (fread(jsat, got_host, 1, hostfile) != 1) {
+			show_oops(t, "host file read error");
+			goto done;
+		}
+	}
+
+	DNPRINTF(XT_D_JS, "%s: about to run script\n", __func__);
+	run_script(t, js);
+
+done:
+	if (su)
+		soup_uri_free(su);
+	if (js)
+		g_free(js);
+	if (deffile)
+		fclose(deffile);
+	if (hostfile)
+		fclose(hostfile);
+	if (domain)
+		g_free(domain);
+}
+
+void
+webview_load_finished_cb(WebKitWebView *wv, WebKitWebFrame *wf, struct tab *t)
+{
+	/* autorun some js if enabled */
+	js_autorun(t);
+
+	input_autofocus(t);
+
+}
+
+void
+webview_progress_changed_cb(WebKitWebView *wv, int progress, struct tab *t)
+{
+	gtk_entry_set_progress_fraction(GTK_ENTRY(t->uri_entry),
+	    progress == 100 ? 0 : (double)progress / 100);
+	if (show_url == 0) {
+		gtk_entry_set_progress_fraction(GTK_ENTRY(t->sbe.statusbar),
+		    progress == 100 ? 0 : (double)progress / 100);
+	}
+
+	update_statusbar_position(NULL, NULL);
+}
+
+int
+strict_transport_rb_cmp(struct strict_transport *a, struct strict_transport *b)
+{
+	char			*p1, *p2;
+	int			l1, l2;
+
+	/* compare strings from the end */
+	l1 = strlen(a->host);
+	l2 = strlen(b->host);
+
+	p1 = a->host + l1;
+	p2 = b->host + l2;
+	for (; *p1 == *p2 && p1 > a->host && p2 > b->host;
+	    p1--, p2--)
+		;
+
+	/*
+	 * Check if we need to do pattern expansion,
+	 * or if we're just keeping the tree in order
+	 */
+	if (a->flags & XT_STS_FLAGS_EXPAND &&
+	    b->flags & XT_STS_FLAGS_INCLUDE_SUBDOMAINS) {
+		/* Check if we're matching the
+		 * 'host.xyz' part in '*.host.xyz'
+		 */
+		if (p2 == b->host && (p1 == a->host || *(p1-1) == '.')) {
+			return (0);
+		}
+	}
+
+	if (p1 == a->host && p2 == b->host)
+		return (0);
+	if (p1 == a->host)
+		return (1);
+	if (p2 == b->host)
+		return (-1);
+
+	if (*p1 < *p2)
+		return (-1);
+	if (*p1 > *p2)
+		return (1);
+
+	return (0);
+}
+RB_GENERATE(strict_transport_tree, strict_transport, entry,
+    strict_transport_rb_cmp);
+
+int
+strict_transport_add(const char *domain, time_t timeout, int subdomains)
+{
+	struct strict_transport	*d, find;
+	time_t			now;
+	FILE			*f;
+
+	if (enable_strict_transport == FALSE)
+		return (0);
+
+	DPRINTF("strict_transport_add(%s,%ld,%d)\n", domain, timeout,
+	    subdomains);
+
+	now = time(NULL);
+	if (timeout < now)
+		return (0);
+
+	find.host = (char *)domain;
+	find.flags = 0;
+	d = RB_FIND(strict_transport_tree, &st_tree, &find);
+
+	/* update flags */
+	if (d) {
+		/* check if update is needed */
+		if (d->timeout == timeout &&
+		    (d->flags & XT_STS_FLAGS_INCLUDE_SUBDOMAINS) == subdomains)
+			return (0);
+
+		d->timeout = timeout;
+		if (subdomains)
+			d->flags |= XT_STS_FLAGS_INCLUDE_SUBDOMAINS;
+
+		/* We're still initializing */
+		if (strict_transport_file == NULL)
+			return (0);
+
+		if ((f = fopen(strict_transport_file, "w")) == NULL) {
+			show_oops(NULL,
+			    "can't open strict-transport rules file");
+			return (1);
+		}
+
+		fprintf(f, "# Generated file - do not update unless you know "
+		    "what you're doing\n");
+		RB_FOREACH(d, strict_transport_tree, &st_tree) {
+			if (d->timeout < now)
+				continue;
+			fprintf(f, "%s\t%d\t%d\n", d->host, (int)d->timeout,
+			    d->flags & XT_STS_FLAGS_INCLUDE_SUBDOMAINS);
+		}
+		fclose(f);
+	} else {
+		d = g_malloc(sizeof *d);
+		d->host= g_strdup(domain);
+		d->timeout = timeout;
+		if (subdomains)
+			d->flags = XT_STS_FLAGS_INCLUDE_SUBDOMAINS;
+		else
+			d->flags = 0;
+		RB_INSERT(strict_transport_tree, &st_tree, d);
+
+		/* We're still initializing */
+		if (strict_transport_file == NULL)
+			return (0);
+
+		if ((f = fopen(strict_transport_file, "a+")) == NULL) {
+			show_oops(NULL,
+			    "can't open strict-transport rules file");
+			return (1);
+		}
+
+		fseek(f, 0, SEEK_END);
+		fprintf(f,"%s\t%d\t%d\n", d->host, (int)timeout, subdomains);
+		fclose(f);
+	}
+	return (0);
+}
+
+int
+strict_transport_check(const char *host)
+{
+	static struct strict_transport	*d = NULL;
+	struct strict_transport		find;
+
+	if (enable_strict_transport == FALSE)
+		return (0);
+
+	find.host = (char *)host;
+
+	/* match for domains that include subdomains */
+	find.flags = XT_STS_FLAGS_EXPAND;
+
+	/* First, check if we're already at the right node */
+	if (d != NULL && strict_transport_rb_cmp(&find, d) == 0) {
+		return (1);
+	}
+
+	d = RB_FIND(strict_transport_tree, &st_tree, &find);
+	if (d != NULL)
+		return (1);
+
+	return (0);
+}
+
+int
+strict_transport_init()
+{
+	char			file[PATH_MAX];
+	char			delim[3];
+	char			*rule;
+	char			*ptr;
+	FILE			*f;
+	size_t			len;
+	time_t			timeout, now;
+	int			subdomains;
+
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_STS_FILE);
+	if ((f = fopen(file, "r")) == NULL) {
+		strict_transport_file = g_strdup(file);
+		return (0);
+	}
+
+	delim[0] = '\\';
+	delim[1] = '\\';
+	delim[2] = '#';
+	rule = NULL;
+	now = time(NULL);
+
+	for (;;) {
+		if ((rule = fparseln(f, &len, NULL, delim, 0)) == NULL) {
+			if (!feof(f) || ferror(f))
+				goto corrupt_file;
+			else
+				break;
+		}
+
+		/* get second entry */
+		if ((ptr = strpbrk(rule, " \t")) == NULL)
+			goto corrupt_file;
+
+		*ptr++ = '\0';
+		timeout = atoi(ptr);
+
+		/* get third entry */
+		if ((ptr = strpbrk(ptr, " \t")) == NULL)
+			goto corrupt_file;
+
+		ptr ++;
+		subdomains = atoi(ptr);
+
+		if (timeout > now)
+			strict_transport_add(rule, timeout, subdomains);
+		free(rule);
+	}
+
+	fclose(f);
+	strict_transport_file = g_strdup(file);
+	return (0);
+
+corrupt_file:
+	startpage_add("strict-transport rules file ('%s') is corrupt", file);
+	if (rule)
+		free(rule);
+	fclose(f);
+	return (1);
+}
+
+void
+strict_transport_security_cb(SoupMessage *msg, gpointer data)
+{
+	SoupURI		*uri;
+	const char	*sts;
+	char		*ptr;
+	int		timeout = 0;
+	int		subdomains = FALSE;
+
+	if (msg == NULL)
+		return;
+
+	sts = soup_message_headers_get_one(msg->response_headers,
+	    "Strict-Transport-Security");
+	uri = soup_message_get_uri(msg);
+
+	if (sts == NULL || uri == NULL)
+		return;
+
+	if ((ptr = strcasestr(sts, "max-age="))) {
+		ptr += strlen("max-age=");
+		timeout = atoi(ptr);
+	} else
+		return; /* malformed header - max-age must be included */
+
+	if ((ptr = strcasestr(sts, "includeSubDomains")))
+		subdomains = TRUE;
+
+	strict_transport_add(uri->host, timeout + time(NULL), subdomains);
+}
+
+void
+session_rq_cb(SoupSession *s, SoupMessage *msg, SoupSocket *socket,
+    gpointer data)
+{
+	SoupURI			*dest;
+	const char		*ref;
+
+	if (s == NULL || msg == NULL)
+		return;
+
+	if (referer_mode == XT_REFERER_ALWAYS)
+		return;
+
+	/* Check if referer is set - and what the user requested for referers */
+	ref = soup_message_headers_get_one(msg->request_headers, "Referer");
+	if (ref) {
+		DNPRINTF(XT_D_NAV, "session_rq_cb: Referer: %s\n", ref);
+		switch (referer_mode) {
+		case XT_REFERER_NEVER:
+			DNPRINTF(XT_D_NAV, "session_rq_cb: removing referer\n");
+			soup_message_headers_remove(msg->request_headers,
+			    "Referer");
+			break;
+		case XT_REFERER_SAME_DOMAIN:
+			dest = soup_message_get_uri(msg);
+
+			if (dest && !strstr(ref, dest->host)) {
+				soup_message_headers_remove(msg->request_headers,
+				    "Referer");
+				DNPRINTF(XT_D_NAV, "session_rq_cb: removing "
+				    "referer (not same domain) (should be %s)\n",
+				    dest->host);
+			}
+			break;
+		case XT_REFERER_CUSTOM:
+			DNPRINTF(XT_D_NAV, "session_rq_cb: setting referer "
+			    "to %s\n", referer_custom);
+			soup_message_headers_replace(msg->request_headers,
+			    "Referer", referer_custom);
+			break;
+		}
+	}
+
+	if (enable_strict_transport) {
+		soup_message_add_header_handler(msg, "finished",
+		    "Strict-Transport-Security",
+		    G_CALLBACK(strict_transport_security_cb), NULL);
+	}
+}
+
+int
+webview_npd_cb(WebKitWebView *wv, WebKitWebFrame *wf,
+    WebKitNetworkRequest *request, WebKitWebNavigationAction *na,
+    WebKitWebPolicyDecision *pd, struct tab *t)
+{
+	char				*uri;
+	WebKitWebNavigationReason	reason;
+	struct domain			*d = NULL;
+
+	if (t == NULL) {
+		show_oops(NULL, "webview_npd_cb invalid parameters");
+		return (FALSE);
+	}
+
+	DNPRINTF(XT_D_NAV, "webview_npd_cb: ctrl_click %d %s\n",
+	    t->ctrl_click,
+	    webkit_network_request_get_uri(request));
+
+	uri = (char *)webkit_network_request_get_uri(request);
+
+	if (!auto_load_images && t->load_images) {
+
+		/* Disable autoloading of images, now that we're done loading
+		 * them. */
+		g_object_set(G_OBJECT(t->settings),
+		    "auto-load-images", FALSE, (char *)NULL);
+		webkit_web_view_set_settings(t->wv, t->settings);
+
+		t->load_images = FALSE;
+	}
+
+	/* If this is an xtp url, we don't load anything else. */
+	if (parse_xtp_url(t, uri))
+		    return (TRUE);
+
+	if ((t->mode == XT_MODE_HINT && t->new_tab) || t->ctrl_click) {
+		t->ctrl_click = 0;
+		create_new_tab(uri, NULL, ctrl_click_focus, -1);
+		webkit_web_policy_decision_ignore(pd);
+		return (TRUE); /* we made the decission */
+	}
+
+	/* Change user agent if more than one has been given. */
+	if (user_agent_count > 1) {
+		struct user_agent *ua;
+
+		if ((ua = TAILQ_NEXT(user_agent, entry)) == NULL)
+			user_agent = TAILQ_FIRST(&ua_list);
+		else
+			user_agent = ua;
+
+		free(t->user_agent);
+		t->user_agent = g_strdup(user_agent->value);
+
+		DNPRINTF(XT_D_NAV, "user-agent: %s\n", t->user_agent);
+
+		g_object_set(G_OBJECT(t->settings),
+			"user-agent", t->user_agent, (char *)NULL);
+
+		webkit_web_view_set_settings(wv, t->settings);
+	}
+
+	/*
+	 * This is a little hairy but it comes down to this:
+	 * when we run in whitelist mode we have to assist the browser in
+	 * opening the URL that it would have opened in a new tab.
+	 */
+	reason = webkit_web_navigation_action_get_reason(na);
+	if (reason == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
+		t->xtp_meaning = XT_XTP_TAB_MEANING_NORMAL;
+		if (enable_scripts == 0 && enable_cookie_whitelist == 1)
+			if (uri && (d = wl_find_uri(uri, &js_wl)) == NULL)
+				load_uri(t, uri);
+		webkit_web_policy_decision_use(pd);
+		return (TRUE); /* we made the decision */
+	}
+
+	return (FALSE);
+}
+
+void
+webview_rrs_cb(WebKitWebView *wv, WebKitWebFrame *wf, WebKitWebResource *res,
+    WebKitNetworkRequest *request, WebKitNetworkResponse *response,
+    struct tab *t)
+{
+	SoupMessage		*msg;
+	SoupURI			*uri;
+
+	msg = webkit_network_request_get_message(request);
+	if (!msg) return;
+
+	uri = soup_message_get_uri(msg);
+	if (!uri) return;
+
+	if (strcmp(soup_uri_get_scheme(uri), SOUP_URI_SCHEME_HTTP) == 0) {
+		if (strict_transport_check(uri->host)) {
+			DNPRINTF(XT_D_NAV, "webview_rrs_cb: force https for %s\n",
+					uri->host);
+			soup_uri_set_scheme(uri, SOUP_URI_SCHEME_HTTPS);
+		}
+	}
+}
+
+WebKitWebView *
+webview_cwv_cb(WebKitWebView *wv, WebKitWebFrame *wf, struct tab *t)
+{
+	struct tab		*tt;
+	struct domain		*d = NULL;
+	const gchar		*uri;
+	WebKitWebView		*webview = NULL;
+	int			x = 1;
+
+	DNPRINTF(XT_D_NAV, "webview_cwv_cb: %s\n",
+	    webkit_web_view_get_uri(wv));
+
+	if (tabless) {
+		/* open in current tab */
+		webview = t->wv;
+	} else if (enable_scripts == 0 && enable_js_whitelist == 1) {
+		uri = webkit_web_view_get_uri(wv);
+		if (uri && (d = wl_find_uri(uri, &js_wl)) == NULL)
+			return (NULL);
+
+		if (t->ctrl_click) {
+			x = ctrl_click_focus;
+			t->ctrl_click = 0;
+		}
+		tt = create_new_tab(NULL, NULL, x, -1);
+		webview = tt->wv;
+	} else if (enable_scripts == 1) {
+		if (t->ctrl_click) {
+			x = ctrl_click_focus;
+			t->ctrl_click = 0;
+		}
+		tt = create_new_tab(NULL, NULL, x, -1);
+		webview = tt->wv;
+	}
+
+	return (webview);
+}
+
+gboolean
+webview_closewv_cb(WebKitWebView *wv, struct tab *t)
+{
+	const gchar		*uri;
+	struct domain		*d = NULL;
+
+	DNPRINTF(XT_D_NAV, "webview_close_cb: %d\n", t->tab_id);
+
+	if (enable_scripts == 0 && enable_cookie_whitelist == 1) {
+		uri = webkit_web_view_get_uri(wv);
+		if (uri && (d = wl_find_uri(uri, &js_wl)) == NULL)
+			return (FALSE);
+
+		delete_tab(t);
+	} else if (enable_scripts == 1)
+		delete_tab(t);
+
+	return (TRUE);
+}
+
+int
+webview_event_cb(GtkWidget *w, GdkEventButton *e, struct tab *t)
+{
+	/* we can not eat the event without throwing gtk off so defer it */
+
+	/* catch middle click */
+	if (e->type == GDK_BUTTON_RELEASE && e->button == 2) {
+		t->ctrl_click = 1;
+		goto done;
+	}
+
+	/* catch ctrl click */
+	if (e->type == GDK_BUTTON_RELEASE &&
+	    CLEAN(e->state) == GDK_CONTROL_MASK)
+		t->ctrl_click = 1;
+	else
+		t->ctrl_click = 0;
+done:
+	return (XT_CB_PASSTHROUGH);
+}
+
+int
+run_mimehandler(struct tab *t, char *mime_type, WebKitNetworkRequest *request)
+{
+	struct mime_type	*m;
+
+	m = find_mime_type(mime_type);
+	if (m == NULL)
+		return (1);
+	if (m->mt_download)
+		return (1);
+
+	return (fork_exec(t, m->mt_action,
+	    webkit_network_request_get_uri(request),
+	    "can't launch MIME handler", 0));
+}
+
+char *
+get_mime_type(const char *file)
+{
+	const gchar		*m;
+	char			*mime_type = NULL;
+	GFileInfo		*fi;
+	GFile			*gf;
+
+	if (g_str_has_prefix(file, "file://"))
+		file += strlen("file://");
+
+	gf = g_file_new_for_path(file);
+	fi = g_file_query_info(gf, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0,
+	    NULL, NULL);
+	if ((m = g_file_info_get_content_type(fi)) != NULL)
+		mime_type = g_strdup(m);
+	g_object_unref(fi);
+	g_object_unref(gf);
+
+	return (mime_type);
+}
+
+int
+run_download_mimehandler(char *mime_type, char *file)
+{
+	struct mime_type	*m;
+
+	m = find_mime_type(mime_type);
+	if (m == NULL)
+		return (1);
+
+	return (fork_exec(NULL, m->mt_action, file,
+	    "can't launch download MIME handler", 0));
+}
+
+void
+download_status_changed_cb(WebKitDownload *download, GParamSpec *spec,
+    WebKitWebView *wv)
+{
+	WebKitDownloadStatus	status;
+	const char		*file = NULL;
+	char			*mime = NULL;
+
+	if (download == NULL)
+		return;
+	status = webkit_download_get_status(download);
+	if (status != WEBKIT_DOWNLOAD_STATUS_FINISHED)
+		return;
+
+	file = webkit_download_get_destination_uri(download);
+	if (file == NULL)
+		return;
+	mime = get_mime_type(file);
+	if (mime == NULL)
+		return;
+
+	if (g_str_has_prefix(file, "file://"))
+		file += strlen("file://");
+	run_download_mimehandler((char *)mime, (char *)file);
+	g_free(mime);
+}
+
+int
+webview_mimetype_cb(WebKitWebView *wv, WebKitWebFrame *frame,
+    WebKitNetworkRequest *request, char *mime_type,
+    WebKitWebPolicyDecision *decision, struct tab *t)
+{
+	if (t == NULL) {
+		show_oops(NULL, "webview_mimetype_cb invalid parameters");
+		return (FALSE);
+	}
+
+	DNPRINTF(XT_D_DOWNLOAD, "webview_mimetype_cb: tab %d mime %s\n",
+	    t->tab_id, mime_type);
+
+	if (run_mimehandler(t, mime_type, request) == 0) {
+		webkit_web_policy_decision_ignore(decision);
+		focus_webview(t);
+		return (TRUE);
+	}
+
+	if (webkit_web_view_can_show_mime_type(wv, mime_type) == FALSE) {
+		webkit_web_policy_decision_download(decision);
+		return (TRUE);
+	}
+
+	return (FALSE);
+}
+
+int
+download_start(struct tab *t, struct download *d, int flag)
+{
+	WebKitNetworkRequest	*req;
+	struct stat		sb;
+	const gchar		*suggested_name;
+	gchar			*filename = NULL;
+	char			*uri = NULL;
+	int			ret = TRUE;
+	int			i;
+
+	if (d == NULL || t == NULL) {
+		show_oops(NULL, "%s invalid parameters", __func__);
+		return (FALSE);
+	}
+
+	suggested_name = webkit_download_get_suggested_filename(d->download);
+	if (suggested_name == NULL)
+		return (FALSE); /* abort download */
+
+	i = 0;
+	do {
+		if (filename) {
+			g_free(filename);
+			filename = NULL;
+		}
+		if (i) {
+			g_free(uri);
+			uri = NULL;
+			filename = g_strdup_printf("%d%s", i, suggested_name);
+		}
+#ifdef __MINGW32__
+		uri = g_strdup_printf("%s\\%s", download_dir, i ?
+		    filename : suggested_name);
+#else
+		uri = g_strdup_printf("file://%s/%s", download_dir, i ?
+		    filename : suggested_name);
+#endif
+		i++;
+#ifdef __MINGW32__
+	} while (!stat(uri, &sb));
+#else
+	} while (!stat(uri + strlen("file://"), &sb)); /* XXX is the + strlen right? */
+#endif
+
+	DNPRINTF(XT_D_DOWNLOAD, "%s: tab %d filename %s "
+	    "local %s\n", __func__, t->tab_id, filename, uri);
+
+	/* if we're restarting the download, or starting
+	 * it after doing something else, we need to recreate
+	 * the download request.
+	 */
+	if (flag == XT_DL_RESTART) {
+		req = webkit_network_request_new(webkit_download_get_uri(d->download));
+		webkit_download_cancel(d->download);
+		g_object_unref(d->download);
+		d->download = webkit_download_new(req);
+	}
+
+	webkit_download_set_destination_uri(d->download, uri);
+
+	if (webkit_download_get_status(d->download) ==
+	    WEBKIT_DOWNLOAD_STATUS_ERROR) {
+		show_oops(t, "%s: download failed to start", __func__);
+		ret = FALSE;
+		gtk_label_set_text(GTK_LABEL(t->label), "Download Failed");
+	} else {
+		/* connect "download first" mime handler */
+		g_signal_connect(G_OBJECT(d->download), "notify::status",
+		    G_CALLBACK(download_status_changed_cb), NULL);
+
+		/* get from history */
+		g_object_ref(d->download);
+		gtk_label_set_text(GTK_LABEL(t->label), "Downloading");
+		show_oops(t, "Download of '%s' started...",
+		    basename((char *)webkit_download_get_destination_uri(d->download)));
+	}
+
+	if (flag != XT_DL_START)
+		webkit_download_start(d->download);
+
+	DNPRINTF(XT_D_DOWNLOAD, "download status : %d",
+			webkit_download_get_status(d->download));
+
+	/* sync other download manager tabs */
+	update_download_tabs(NULL);
+
+	if (uri)
+		g_free(uri);
+
+	if (filename)
+		g_free(filename);
+
+	return (ret);
+}
+
+int
+download_ask_cb(struct tab *t, GdkEventKey *e, gpointer data)
+{
+	struct download *d = data;
+
+	/* unset mode */
+	t->mode_cb = NULL;
+	t->mode_cb_data = NULL;
+
+	if (!e || !d) {
+		e->keyval = GDK_Escape;
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DPRINTF("download_ask_cb: User pressed %c\n", e->keyval);
+	if (e->keyval == 'y' || e->keyval == 'Y' || e->keyval == GDK_Return)
+		/* We need to do a RESTART, because we're not calling from
+		 * webview_download_cb
+		 */
+		download_start(t, d, XT_DL_RESTART);
+
+	/* for all other keyvals, we just let the download be */
+	e->keyval = GDK_Escape;
+	return (XT_CB_HANDLED);
+}
+
+int
+download_ask(struct tab *t, struct download *d)
+{
+	const gchar		*suggested_name;
+
+	suggested_name = webkit_download_get_suggested_filename(d->download);
+	if (suggested_name == NULL)
+		return (FALSE); /* abort download */
+
+	show_oops(t, "download file %s [y/n] ?", suggested_name);
+	t->mode_cb = download_ask_cb;
+	t->mode_cb_data = d;
+
+	return (TRUE);
+}
+
+int
+webview_download_cb(WebKitWebView *wv, WebKitDownload *wk_download,
+    struct tab *t)
+{
+	const gchar		*suggested_name;
+	struct download		*download_entry;
+	int			ret = TRUE;
+
+	if (wk_download == NULL || t == NULL) {
+		show_oops(NULL, "%s invalid parameters", __func__);
+		return (FALSE);
+	}
+
+	suggested_name = webkit_download_get_suggested_filename(wk_download);
+	if (suggested_name == NULL)
+		return (FALSE); /* abort download */
+
+	download_entry = g_malloc(sizeof(struct download));
+	download_entry->download = wk_download;
+	download_entry->tab = t;
+	download_entry->id = next_download_id++;
+	RB_INSERT(download_list, &downloads, download_entry);
+
+	if (download_mode == XT_DM_START)
+		ret = download_start(t, download_entry, XT_DL_START);
+	else if (download_mode == XT_DM_ASK)
+		ret = download_ask(t, download_entry);
+	else if (download_mode == XT_DM_ADD)
+		show_oops(t, "added %s to download manager",
+		    suggested_name);
+
+	/* sync other download manager tabs */
+	update_download_tabs(NULL);
+
+	/*
+	 * NOTE: never redirect/render the current tab before this
+	 * function returns. This will cause the download to never start.
+	 */
+	return (ret); /* start download */
+}
+
+void
+webview_hover_cb(WebKitWebView *wv, gchar *title, gchar *uri, struct tab *t)
+{
+	DNPRINTF(XT_D_KEY, "webview_hover_cb: %s %s\n", title, uri);
+
+	if (t == NULL) {
+		show_oops(NULL, "webview_hover_cb");
+		return;
+	}
+
+	if (uri)
+		set_status(t, uri, XT_STATUS_LINK);
+	else {
+		if (t->status)
+			set_status(t, t->status, XT_STATUS_NOTHING);
+	}
+}
+
+int
+mark(struct tab *t, struct karg *arg)
+{
+	char                    mark;
+	int                     index;
+
+	mark = arg->s[1];
+	if ((index = marktoindex(mark)) == -1)
+		return (-1);
+
+	if (arg->i == XT_MARK_SET)
+		t->mark[index] = gtk_adjustment_get_value(t->adjust_v);
+	else if (arg->i == XT_MARK_GOTO) {
+		if (t->mark[index] == XT_INVALID_MARK) {
+			show_oops(t, "mark '%c' does not exist", mark);
+			return (-1);
+		}
+		/* XXX t->mark[index] can be bigger than the maximum if ajax or
+		   something changes the document size */
+		gtk_adjustment_set_value(t->adjust_v, t->mark[index]);
+	}
+
+	return (0);
+}
+
+void
+marks_clear(struct tab *t)
+{
+	int			i;
+
+	for (i = 0; i < LENGTH(t->mark); i++)
+		t->mark[i] = XT_INVALID_MARK;
+}
+
+int
+qmarks_load(void)
+{
+	char			file[PATH_MAX];
+	char			*line = NULL, *p;
+	int			index, i;
+	FILE			*f;
+	size_t			linelen;
+
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_QMARKS_FILE);
+	if ((f = fopen(file, "r+")) == NULL) {
+		show_oops(NULL, "Can't open quickmarks file: %s", strerror(errno));
+		return (1);
+	}
+
+	for (i = 1; ; i++) {
+		if ((line = fparseln(f, &linelen, NULL, NULL, 0)) == NULL)
+			break;
+		if (strlen(line) == 0 || line[0] == '#') {
+			free(line);
+			line = NULL;
+			continue;
+		}
+
+		p = strtok(line, " \t");
+
+		if (p == NULL || strlen(p) != 1 ||
+		    (index = marktoindex(*p)) == -1) {
+			warnx("corrupt quickmarks file, line %d", i);
+			break;
+		}
+
+		p = strtok(NULL, " \t");
+		if (qmarks[index] != NULL)
+			g_free(qmarks[index]);
+		qmarks[index] = g_strdup(p);
+	}
+
+	fclose(f);
+
+	return (0);
+}
+
+int
+qmarks_save(void)
+{
+	char			 file[PATH_MAX];
+	int			 i;
+	FILE			*f;
+
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_QMARKS_FILE);
+	if ((f = fopen(file, "r+")) == NULL) {
+		show_oops(NULL, "Can't open quickmarks file: %s", strerror(errno));
+		return (1);
+	}
+
+	for (i = 0; i < XT_NOMARKS; i++)
+		if (qmarks[i] != NULL)
+			fprintf(f, "%c %s\n", indextomark(i), qmarks[i]);
+
+	fclose(f);
+
+	return (0);
+}
+
+int
+qmark(struct tab *t, struct karg *arg)
+{
+	char		mark;
+	int		index;
+
+	mark = arg->s[strlen(arg->s)-1];
+	index = marktoindex(mark);
+	if (index == -1)
+		return (-1);
+
+	switch (arg->i) {
+	case XT_QMARK_SET:
+		if (qmarks[index] != NULL) {
+			g_free(qmarks[index]);
+			qmarks[index] = NULL;
+		}
+
+		qmarks_load(); /* sync if multiple instances */
+		qmarks[index] = g_strdup(get_uri(t));
+		qmarks_save();
+		break;
+	case XT_QMARK_OPEN:
+		if (qmarks[index] != NULL)
+			load_uri(t, qmarks[index]);
+		else {
+			show_oops(t, "quickmark \"%c\" does not exist",
+			    mark);
+			return (-1);
+		}
+		break;
+	case XT_QMARK_TAB:
+		if (qmarks[index] != NULL)
+			create_new_tab(qmarks[index], NULL, 1, -1);
+		else {
+			show_oops(t, "quickmark \"%c\" does not exist",
+			    mark);
+			return (-1);
+		}
+		break;
+	}
+
+	return (0);
+}
+
+int
+go_up(struct tab *t, struct karg *args)
+{
+	int		levels;
+	int		lastidx;
+	char		*uri;
+	char		*tmp;
+	char		*p;
+
+	if (args->i == XT_GO_UP_ROOT)
+		levels = XT_GO_UP_ROOT;
+	else if ((levels = atoi(args->s)) == 0)
+		levels = 1;
+
+	uri = g_strdup(get_uri(t));
+
+	if ((tmp = strstr(uri, XT_PROTO_DELIM)) == NULL)
+		return (1);
+
+	tmp += strlen(XT_PROTO_DELIM);
+
+	/* if an uri starts with a slash, leave it alone (for file:///) */
+	if (tmp[0] == '/')
+		tmp++;
+
+	/* it makes no sense to strip the last slash from ".../dir/", skip it */
+	lastidx = strlen(tmp) - 1;
+	if (lastidx >= 0) {
+		if (tmp[lastidx] == '/')
+			tmp[lastidx] = '\0';
+	}
+
+	while (levels--) {
+		p = strrchr(tmp, '/');
+		if (p != NULL)
+			*p = '\0';
+		else
+			break;
+	}
+
+	load_uri(t, uri);
+	g_free(uri);
+
+	return (0);
+}
+
+int
+gototab(struct tab *t, struct karg *args)
+{
+	int		tab;
+	struct karg	arg = {0, NULL, -1};
+
+	tab = atoi(args->s);
+
+	if (args->i == 0)
+		arg.i = XT_TAB_NEXT;
+	else
+		arg.i = args->i;
+
+	arg.precount = tab;
+
+	movetab(t, &arg);
+
+	return (0);
+}
+
+int
+zoom_amount(struct tab *t, struct karg *arg)
+{
+	struct karg	narg = {0, NULL, -1};
+
+	narg.i = atoi(arg->s);
+	resizetab(t, &narg);
+
+	return (0);
+}
+
+int
+flip_colon(struct tab *t, struct karg *arg)
+{
+	struct karg	narg = {0, NULL, -1};
+	char		*p;
+
+	if (t == NULL || arg == NULL)
+		return (1);
+
+	p = strstr(arg->s, ":");
+	if (p == NULL)
+		return (1);
+	*p = '\0';
+
+	narg.i = ':';
+	narg.s = arg->s;
+	command(t, &narg);
+
+	return (0);
+}
+
+/* buffer commands receive the regex that triggered them in arg.s */
+char bcmd[XT_BUFCMD_SZ];
+struct buffercmd {
+	char		*regex;
+	int		precount;
+#define XT_PRE_NO	(0)
+#define XT_PRE_YES	(1)
+#define XT_PRE_MAYBE	(2)
+	char		*cmd;
+	int		(*func)(struct tab *, struct karg *);
+	int		arg;
+	regex_t		cregex;
+} buffercmds[] = {
+	{ "^[0-9]*gu$",		XT_PRE_MAYBE,	"gu",	go_up,		0 },
+	{ "^gU$",		XT_PRE_NO,	"gU",	go_up,		XT_GO_UP_ROOT },
+	{ "^gg$",		XT_PRE_NO,	"gg",	move,		XT_MOVE_TOP },
+	{ "^gG$",		XT_PRE_NO,	"gG",	move,		XT_MOVE_BOTTOM },
+	{ "^[0-9]+%$",		XT_PRE_YES,	"%",	move,		XT_MOVE_PERCENT },
+	{ "^zz$",		XT_PRE_NO,	"zz",	move,		XT_MOVE_CENTER },
+	{ "^gh$",		XT_PRE_NO,	"gh",	go_home,	0 },
+	{ "^m[a-zA-Z0-9]$",	XT_PRE_NO,	"m",	mark,		XT_MARK_SET },
+	{ "^['][a-zA-Z0-9]$",	XT_PRE_NO,	"'",	mark,		XT_MARK_GOTO },
+	{ "^[0-9]+t$",		XT_PRE_YES,	"t",	gototab,	0 },
+	{ "^g0$",		XT_PRE_YES,	"g0",	movetab,	XT_TAB_FIRST },
+	{ "^g[$]$",		XT_PRE_YES,	"g$",	movetab,	XT_TAB_LAST },
+	{ "^[0-9]*gt$",		XT_PRE_YES,	"t",	movetab,	XT_TAB_NEXT },
+	{ "^[0-9]*gT$",		XT_PRE_YES,	"T",	movetab,	XT_TAB_PREV },
+	{ "^M[a-zA-Z0-9]$",	XT_PRE_NO,	"M",	qmark,		XT_QMARK_SET },
+	{ "^go[a-zA-Z0-9]$",	XT_PRE_NO,	"go",	qmark,		XT_QMARK_OPEN },
+	{ "^gn[a-zA-Z0-9]$",	XT_PRE_NO,	"gn",	qmark,		XT_QMARK_TAB },
+	{ "^ZR$",		XT_PRE_NO,	"ZR",	restart,	0 },
+	{ "^ZZ$",		XT_PRE_NO,	"ZZ",	quit,		0 },
+	{ "^zi$",		XT_PRE_NO,	"zi",	resizetab,	XT_ZOOM_IN },
+	{ "^zo$",		XT_PRE_NO,	"zo",	resizetab,	XT_ZOOM_OUT },
+	{ "^z0$",		XT_PRE_NO,	"z0",	resizetab,	XT_ZOOM_NORMAL },
+	{ "^[0-9]+Z$",		XT_PRE_YES,	"Z",	zoom_amount,	0 },
+	{ "^[0-9]+:$",		XT_PRE_YES,	":",	flip_colon,	0 },
+};
+
+void
+buffercmd_init(void)
+{
+	int			i;
+
+	for (i = 0; i < LENGTH(buffercmds); i++)
+		if (regcomp(&buffercmds[i].cregex, buffercmds[i].regex,
+		    REG_EXTENDED | REG_NOSUB))
+			startpage_add("invalid buffercmd regex %s",
+			    buffercmds[i].regex);
+}
+
+void
+buffercmd_abort(struct tab *t)
+{
+	int			i;
+
+	if (t == NULL)
+		return;
+
+	DNPRINTF(XT_D_BUFFERCMD, "%s: clearing buffer\n", __func__);
+
+	for (i = 0; i < LENGTH(bcmd); i++)
+		bcmd[i] = '\0';
+
+	cmd_prefix = 0; /* clear prefix for non-buffer commands */
+	gtk_entry_set_text(GTK_ENTRY(t->sbe.buffercmd), bcmd);
+}
+
+void
+buffercmd_execute(struct tab *t, struct buffercmd *cmd)
+{
+	struct karg		arg = {0, NULL, -1};
+
+	arg.i = cmd->arg;
+	arg.s = g_strdup(bcmd);
+
+	DNPRINTF(XT_D_BUFFERCMD, "buffercmd_execute: buffer \"%s\" "
+	    "matches regex \"%s\", executing\n", bcmd, cmd->regex);
+	cmd->func(t, &arg);
+
+	if (arg.s)
+		g_free(arg.s);
+
+	buffercmd_abort(t);
+}
+
+gboolean
+buffercmd_addkey(struct tab *t, guint keyval)
+{
+	int			i, c, match ;
+	char			s[XT_BUFCMD_SZ];
+
+	if (gtk_widget_get_visible(GTK_WIDGET(t->buffers))) {
+		buffercmd_abort(t);
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	if (keyval == GDK_Escape) {
+		buffercmd_abort(t);
+		return (XT_CB_HANDLED);
+	}
+
+	/* key with modifier or non-ascii character */
+	if (!isascii(keyval)) {
+		/*
+		 * XXX this looks wrong but fixes some sites like
+		 * http://www.seslisozluk.com/
+		 * that eat a shift or ctrl and end putting default focus in js
+		 * instead of ignoring the keystroke
+		 * so instead of return (XT_CB_PASSTHROUGH); eat the key
+		 */
+		return (XT_CB_HANDLED);
+	}
+
+	DNPRINTF(XT_D_BUFFERCMD, "buffercmd_addkey: adding key \"%c\" "
+	    "to buffer \"%s\"\n", keyval, bcmd);
+
+	for (i = 0; i < LENGTH(bcmd); i++)
+		if (bcmd[i] == '\0') {
+			bcmd[i] = keyval;
+			break;
+		}
+
+	/* buffer full, ignore input */
+	if (i >= LENGTH(bcmd) -1) {
+		DNPRINTF(XT_D_BUFFERCMD, "buffercmd_addkey: buffer full\n");
+		buffercmd_abort(t);
+		return (XT_CB_HANDLED);
+	}
+
+	gtk_entry_set_text(GTK_ENTRY(t->sbe.buffercmd), bcmd);
+
+	/* find exact match */
+	for (i = 0; i < LENGTH(buffercmds); i++)
+		if (regexec(&buffercmds[i].cregex, bcmd,
+		    (size_t) 0, NULL, 0) == 0) {
+			buffercmd_execute(t, &buffercmds[i]);
+			goto done;
+		}
+
+	/* find non exact matches to see if we need to abort ot not */
+	for (i = 0, match = 0; i < LENGTH(buffercmds); i++) {
+		DNPRINTF(XT_D_BUFFERCMD, "trying: %s\n", bcmd);
+		c = -1;
+		s[0] = '\0';
+		if (buffercmds[i].precount == XT_PRE_MAYBE) {
+			if (isdigit(bcmd[0])) {
+				if (sscanf(bcmd, "%d%s", &c, s) == 0)
+					continue;
+			} else {
+				c = 0;
+				if (sscanf(bcmd, "%s", s) == 0)
+					continue;
+			}
+		} else if (buffercmds[i].precount == XT_PRE_YES) {
+			if (sscanf(bcmd, "%d%s", &c, s) == 0)
+				continue;
+		} else {
+			if (sscanf(bcmd, "%s", s) == 0)
+				continue;
+		}
+		if (c == -1 && buffercmds[i].precount)
+			continue;
+		if (!strncmp(s, buffercmds[i].cmd, strlen(s)))
+			match++;
+
+		DNPRINTF(XT_D_BUFFERCMD, "got[%d] %d <%s>: %d %s\n",
+		    i, match, buffercmds[i].cmd, c, s);
+	}
+	if (match == 0) {
+		DNPRINTF(XT_D_BUFFERCMD, "aborting: %s\n", bcmd);
+		buffercmd_abort(t);
+	}
+
+done:
+	return (XT_CB_HANDLED);
+}
+
+gboolean
+handle_keypress(struct tab *t, GdkEventKey *e, int entry)
+{
+	struct key_binding	*k;
+
+	/* handle keybindings if buffercmd is empty.
+	   if not empty, allow commands like C-n */
+	if (bcmd[0] == '\0' || ((e->state & (CTRL | MOD1)) != 0))
+		TAILQ_FOREACH(k, &kbl, entry)
+			if (e->keyval == k->key
+			    && (entry ? k->use_in_entry : 1)) {
+				/* when we are edditing eat ctrl/mod keys */
+				if (edit_mode == XT_EM_VI &&
+				    t->mode == XT_MODE_INSERT &&
+				    (e->state & CTRL || e->state & MOD1))
+					return (XT_CB_PASSTHROUGH);
+
+				if (k->mask == 0) {
+					if ((e->state & (CTRL | MOD1)) == 0)
+						return (cmd_execute(t, k->cmd));
+				} else if ((e->state & k->mask) == k->mask) {
+					return (cmd_execute(t, k->cmd));
+				}
+			}
+
+	if (!entry && ((e->state & (CTRL | MOD1)) == 0))
+		return buffercmd_addkey(t, e->keyval);
+
+	return (XT_CB_PASSTHROUGH);
+}
+
+int
+wv_keypress_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
+{
+	char			s[2];
+
+	/* don't use w directly; use t->whatever instead */
+
+	if (t == NULL) {
+		show_oops(NULL, "wv_keypress_cb");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	hide_oops(t);
+
+	if (t->mode_cb)
+		return t->mode_cb(t, e, t->mode_cb_data);
+
+	DNPRINTF(XT_D_KEY, "wv_keypress_cb: mode %d keyval 0x%x mask "
+	    "0x%x tab %d\n", t->mode, e->keyval, e->state, t->tab_id);
+
+	/* Hide buffers, if they are visible, with escape. */
+	if (gtk_widget_get_visible(GTK_WIDGET(t->buffers)) &&
+	    CLEAN(e->state) == 0 && e->keyval == GDK_Escape) {
+		gtk_widget_grab_focus(GTK_WIDGET(t->wv));
+		hide_buffers(t);
+		return (XT_CB_HANDLED);
+	}
+
+	if (t->mode == XT_MODE_HINT)
+		return (XT_CB_HANDLED);
+
+	if ((CLEAN(e->state) == 0 && e->keyval == GDK_Tab) ||
+	    (CLEAN(e->state) == SHFT && e->keyval == GDK_Tab))
+		/* something focussy is about to happen */
+		return (XT_CB_PASSTHROUGH);
+
+	/* check if we are some sort of text input thing in the dom */
+	input_check_mode(t);
+
+	if (t->mode == XT_MODE_HINT) {
+		/* XXX make sure cmd entry is enabled */
+		return (XT_CB_HANDLED);
+	} else if (t->mode == XT_MODE_PASSTHROUGH) {
+		if (CLEAN(e->state) == 0 && e->keyval == GDK_Escape)
+			t->mode = XT_MODE_COMMAND;
+		return (XT_CB_PASSTHROUGH);
+	} else if (t->mode == XT_MODE_COMMAND) {
+		/* prefix input */
+		snprintf(s, sizeof s, "%c", e->keyval);
+		if (CLEAN(e->state) == 0 && isdigit(s[0]))
+			cmd_prefix = 10 * cmd_prefix + atoi(s);
+		return (handle_keypress(t, e, 0));
+	} else {
+		/* insert mode */
+		return (handle_keypress(t, e, 1));
+	}
+
+	/* NOTREACHED */
+	return (XT_CB_PASSTHROUGH);
+}
+
+gboolean
+hint_continue(struct tab *t)
+{
+	const gchar		*c = gtk_entry_get_text(GTK_ENTRY(t->cmd));
+	char			*s;
+	const gchar		*errstr = NULL;
+	gboolean		rv = TRUE;
+	int			i;
+
+	if (!(c[0] == '.' || c[0] == ','))
+		goto done;
+	if (strlen(c) == 1) {
+		/* XXX should not happen */
+		rv = TRUE;
+		goto done;
+	}
+
+	if (isdigit(c[1])) {
+		/* numeric input */
+		i = strtonum(&c[1], 1, 4096, &errstr);
+		if (errstr) {
+			show_oops(t, "invalid numerical hint %s", &c[1]);
+			goto done;
+		}
+		s = g_strdup_printf("hints.updateHints(%d);", i);
+		run_script(t, s);
+		g_free(s);
+	} else {
+		/* alphanumeric input */
+		s = g_strdup_printf("hints.createHints('%s', '%c');",
+		    &c[1], c[0] == '.' ? 'f' : 'F');
+		run_script(t, s);
+		g_free(s);
+	}
+
+	rv = FALSE;
+done:
+	return (rv);
+}
+
+gboolean
+search_continue(struct tab *t)
+{
+	const gchar		*c = gtk_entry_get_text(GTK_ENTRY(t->cmd));
+	gboolean		rv = FALSE;
+
+	if (c[0] == ':' || c[0] == '.' || c[0] == ',')
+		goto done;
+	if (strlen(c) == 1) {
+		webkit_web_view_unmark_text_matches(t->wv);
+		goto done;
+	}
+
+	if (c[0] == '/')
+		t->search_forward = TRUE;
+	else if (c[0] == '?')
+		t->search_forward = FALSE;
+	else
+		goto done;
+
+	rv = TRUE;
+done:
+	return (rv);
+}
+
+gboolean
+search_cb(struct tab *t)
+{
+	const gchar		*c = gtk_entry_get_text(GTK_ENTRY(t->cmd));
+	GdkColor		color;
+
+	if (search_continue(t) == FALSE)
+		goto done;
+
+	/* search */
+	if (webkit_web_view_search_text(t->wv, &c[1], FALSE, t->search_forward,
+	    TRUE) == FALSE) {
+		/* not found, mark red */
+		gdk_color_parse(XT_COLOR_RED, &color);
+		gtk_widget_modify_base(t->cmd, GTK_STATE_NORMAL, &color);
+		/* unmark and remove selection */
+		webkit_web_view_unmark_text_matches(t->wv);
+		/* my kingdom for a way to unselect text in webview */
+	} else {
+		/* found, highlight all */
+		webkit_web_view_unmark_text_matches(t->wv);
+		webkit_web_view_mark_text_matches(t->wv, &c[1], FALSE, 0);
+		webkit_web_view_set_highlight_text_matches(t->wv, TRUE);
+		gdk_color_parse(XT_COLOR_WHITE, &color);
+		gtk_widget_modify_base(t->cmd, GTK_STATE_NORMAL, &color);
+	}
+done:
+	t->search_id = 0;
+	return (FALSE);
+}
+
+int
+cmd_keyrelease_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
+{
+	const gchar		*c = gtk_entry_get_text(w);
+
+	if (t == NULL) {
+		show_oops(NULL, "cmd_keyrelease_cb invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_CMD, "cmd_keyrelease_cb: keyval 0x%x mask 0x%x tab %d\n",
+	    e->keyval, e->state, t->tab_id);
+
+	/* hinting */
+	if (!(e->keyval == GDK_Tab || e->keyval == GDK_ISO_Left_Tab)) {
+		if (hint_continue(t) == FALSE)
+			goto done;
+	}
+
+	/* search */
+	if (search_continue(t) == FALSE)
+		goto done;
+
+	/* if search length is > 4 then no longer play timeout games */
+	if (strlen(c) > 4) {
+		if (t->search_id) {
+			g_source_remove(t->search_id);
+			t->search_id = 0;
+		}
+		search_cb(t);
+		goto done;
+	}
+
+	/* reestablish a new timer if the user types fast */
+	if (t->search_id)
+		g_source_remove(t->search_id);
+	t->search_id = g_timeout_add(250, (GSourceFunc)search_cb, (gpointer)t);
+
+done:
+	return (XT_CB_PASSTHROUGH);
+}
+
+gboolean
+match_uri(const gchar *uri, const gchar *key) {
+	gchar			*voffset;
+	size_t			len;
+	gboolean		match = FALSE;
+
+	len = strlen(key);
+
+	if (!strncmp(key, uri, len))
+		match = TRUE;
+	else {
+		voffset = strstr(uri, "/") + 2;
+		if (!strncmp(key, voffset, len))
+			match = TRUE;
+		else if (g_str_has_prefix(voffset, "www.")) {
+			voffset = voffset + strlen("www.");
+			if (!strncmp(key, voffset, len))
+				match = TRUE;
+		}
+	}
+
+	return (match);
+}
+
+gboolean
+match_session(const gchar *name, const gchar *key) {
+	char		*sub;
+
+	sub = strcasestr(name, key);
+
+	return sub == name;
+}
+
+void
+cmd_getlist(int id, char *key)
+{
+	int			i,  dep, c = 0;
+	struct history		*h;
+	struct session		*s;
+
+	if (id >= 0) {
+		if (cmds[id].type & XT_URLARG) {
+			RB_FOREACH_REVERSE(h, history_list, &hl)
+				if (match_uri(h->uri, key)) {
+					cmd_status.list[c] = (char *)h->uri;
+					if (++c > 255)
+						break;
+				}
+			cmd_status.len = c;
+			return;
+		} else if (cmds[id].type & XT_SESSARG) {
+			TAILQ_FOREACH(s, &sessions, entry)
+				if (match_session(s->name, key)) {
+					cmd_status.list[c] = (char *)s->name;
+					if (++c > 255)
+						break;
+				}
+			cmd_status.len = c;
+			return;
+		} else if (cmds[id].type & XT_SETARG) {
+			for (i = 0; i < get_settings_size(); i++)
+				if (!strncmp(key, get_setting_name(i),
+				    strlen(key)))
+					cmd_status.list[c++] =
+					    get_setting_name(i);
+			cmd_status.len = c;
+			return;
+		}
+	}
+
+	dep = (id == -1) ? 0 : cmds[id].level + 1;
+
+	for (i = id + 1; i < LENGTH(cmds); i++) {
+		if (cmds[i].level < dep)
+			break;
+		if (cmds[i].level == dep && !strncmp(key, cmds[i].cmd,
+		    strlen(key)) && !isdigit(cmds[i].cmd[0]))
+			cmd_status.list[c++] = cmds[i].cmd;
+
+	}
+
+	cmd_status.len = c;
+}
+
+char *
+cmd_getnext(int dir)
+{
+	cmd_status.index += dir;
+
+	if (cmd_status.index < 0)
+		cmd_status.index = cmd_status.len - 1;
+	else if (cmd_status.index >= cmd_status.len)
+		cmd_status.index = 0;
+
+	return cmd_status.list[cmd_status.index];
+}
+
+int
+cmd_tokenize(char *s, char *tokens[])
+{
+	int			i = 0;
+	char			*tok, *last = NULL;
+	size_t			len = strlen(s);
+	bool			blank;
+
+	blank = len == 0 || (len > 0 && s[len - 1] == ' ');
+	for (tok = strtok_r(s, " ", &last); tok && i < 3;
+	    tok = strtok_r(NULL, " ", &last), i++)
+		tokens[i] = tok;
+
+	if (blank && i < 3)
+		tokens[i++] = "";
+
+	return (i);
+}
+
+void
+cmd_complete(struct tab *t, char *str, int dir)
+{
+	GtkEntry		*w = GTK_ENTRY(t->cmd);
+	int			i, j, levels, c = 0, dep = 0, parent = -1;
+	int			matchcount = 0;
+	char			*tok, *match, *s = g_strdup(str);
+	char			*tokens[3];
+	char			res[XT_MAX_URL_LENGTH + 32] = ":";
+	char			*sc = s;
+
+	DNPRINTF(XT_D_CMD, "%s: complete %s\n", __func__, str);
+
+	/* copy prefix*/
+	for (i = 0; isdigit(s[i]); i++)
+		res[i + 1] = s[i];
+
+	for (; isspace(s[i]); i++)
+		 res[i + 1] = s[i];
+
+	s += i;
+
+	levels = cmd_tokenize(s, tokens);
+
+	for (i = 0; i < levels - 1; i++) {
+		tok = tokens[i];
+		matchcount = 0;
+		for (j = c; j < LENGTH(cmds); j++) {
+			if (cmds[j].level < dep)
+				break;
+			if (cmds[j].level == dep && !strncmp(tok, cmds[j].cmd,
+			    strlen(tok))) {
+				matchcount++;
+				c = j + 1;
+				if (strlen(tok) == strlen(cmds[j].cmd)) {
+					matchcount = 1;
+					break;
+				}
+			}
+		}
+
+		if (matchcount == 1) {
+			strlcat(res, tok, sizeof res);
+			strlcat(res, " ", sizeof res);
+			dep++;
+		} else {
+			g_free(sc);
+			return;
+		}
+
+		parent = c - 1;
+	}
+
+	if (cmd_status.index == -1)
+		cmd_getlist(parent, tokens[i]);
+
+	if (cmd_status.len > 0) {
+		match = cmd_getnext(dir);
+		strlcat(res, match, sizeof res);
+		gtk_entry_set_text(w, res);
+		gtk_editable_set_position(GTK_EDITABLE(w), -1);
+	}
+
+	g_free(sc);
+}
+
+gboolean
+cmd_execute(struct tab *t, char *str)
+{
+	struct cmd		*cmd = NULL;
+	char			*tok, *last = NULL, *s = g_strdup(str), *sc;
+	char			prefixstr[4];
+	int			j, len, c = 0, dep = 0, matchcount = 0;
+	int			prefix = -1, rv = XT_CB_PASSTHROUGH;
+	struct karg		arg = {0, NULL, -1};
+
+	sc = s;
+
+	/* copy prefix*/
+	for (j = 0; j<3 && isdigit(s[j]); j++)
+		prefixstr[j]=s[j];
+
+	prefixstr[j]='\0';
+
+	s += j;
+	while (isspace(s[0]))
+		s++;
+
+	if (strlen(s) > 0 && strlen(prefixstr) > 0)
+		prefix = atoi(prefixstr);
+	else
+		s = sc;
+
+	for (tok = strtok_r(s, " ", &last); tok;
+	    tok = strtok_r(NULL, " ", &last)) {
+		matchcount = 0;
+		for (j = c; j < LENGTH(cmds); j++) {
+			if (cmds[j].level < dep)
+				break;
+			len = (tok[strlen(tok) - 1] == '!') ? strlen(tok) - 1 :
+			    strlen(tok);
+			if (cmds[j].level == dep &&
+			    !strncmp(tok, cmds[j].cmd, len)) {
+				matchcount++;
+				c = j + 1;
+				cmd = &cmds[j];
+				if (len == strlen(cmds[j].cmd)) {
+					matchcount = 1;
+					break;
+				}
+			}
+		}
+		if (matchcount == 1) {
+			if (cmd->type > 0)
+				goto execute_cmd;
+			dep++;
+		} else {
+			show_oops(t, "Invalid command: %s", str);
+			goto done;
+		}
+	}
+execute_cmd:
+	if (cmd == NULL) {
+		show_oops(t, "Empty command");
+		goto done;
+	}
+	arg.i = cmd->arg;
+
+	if (prefix != -1)
+		arg.precount = prefix;
+	else if (cmd_prefix > 0)
+		arg.precount = cmd_prefix;
+
+	if (j > 0 && !(cmd->type & XT_PREFIX) && arg.precount > -1) {
+		show_oops(t, "No prefix allowed: %s", str);
+		goto done;
+	}
+	if (cmd->type > 1)
+		arg.s = last ? g_strdup(last) : g_strdup("");
+	if (cmd->type & XT_INTARG && last && strlen(last) > 0) {
+		if (arg.s == NULL) {
+			show_oops(t, "Invalid command");
+			goto done;
+		}
+		arg.precount = atoi(arg.s);
+		if (arg.precount <= 0) {
+			if (arg.s[0] == '0')
+				show_oops(t, "Zero count");
+			else
+				show_oops(t, "Trailing characters");
+			goto done;
+		}
+	}
+
+	DNPRINTF(XT_D_CMD, "%s: prefix %d arg %s\n",
+	    __func__, arg.precount, arg.s);
+
+	cmd->func(t, &arg);
+
+	rv = XT_CB_HANDLED;
+done:
+	if (j > 0)
+		cmd_prefix = 0;
+	g_free(sc);
+	if (arg.s)
+		g_free(arg.s);
+
+	return (rv);
+}
+
+int
+entry_key_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
+{
+	if (t == NULL) {
+		show_oops(NULL, "entry_key_cb invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_CMD, "entry_key_cb: keyval 0x%x mask 0x%x tab %d\n",
+	    e->keyval, e->state, t->tab_id);
+
+	hide_oops(t);
+
+	if (e->keyval == GDK_Escape) {
+		/* don't use focus_webview(t) because we want to type :cmds */
+		gtk_widget_grab_focus(GTK_WIDGET(t->wv));
+	}
+
+	return (handle_keypress(t, e, 1));
+}
+
+struct command_entry *
+history_prev(struct command_list *l, struct command_entry *at)
+{
+	if (at == NULL)
+		at = TAILQ_LAST(l, command_list);
+	else {
+		at = TAILQ_PREV(at, command_list, entry);
+		if (at == NULL)
+			at = TAILQ_LAST(l, command_list);
+	}
+
+	return (at);
+}
+
+struct command_entry *
+history_next(struct command_list *l, struct command_entry *at)
+{
+	if (at == NULL)
+		at = TAILQ_FIRST(l);
+	else {
+		at = TAILQ_NEXT(at, entry);
+		if (at == NULL)
+			at = TAILQ_FIRST(l);
+	}
+
+	return (at);
+}
+
+int
+cmd_keypress_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
+{
+	int			rv = XT_CB_HANDLED;
+	const gchar		*c = gtk_entry_get_text(w);
+	char			*s;
+
+	if (t == NULL) {
+		show_oops(NULL, "cmd_keypress_cb parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_CMD, "cmd_keypress_cb: keyval 0x%x mask 0x%x tab %d\n",
+	    e->keyval, e->state, t->tab_id);
+
+	/* sanity */
+	if (c == NULL)
+		e->keyval = GDK_Escape;
+	else if (!(c[0] == ':' || c[0] == '/' || c[0] == '?' ||
+	    c[0] == '.' || c[0] == ','))
+		e->keyval = GDK_Escape;
+
+	if (e->keyval != GDK_Tab && e->keyval != GDK_Shift_L &&
+	    e->keyval != GDK_ISO_Left_Tab)
+		cmd_status.index = -1;
+
+	switch (e->keyval) {
+	case GDK_Tab:
+		if (c[0] == ':')
+			cmd_complete(t, (char *)&c[1], 1);
+		else if (c[0] == '.' || c[0] == ',')
+			run_script(t, "hints.focusNextHint();");
+		goto done;
+	case GDK_ISO_Left_Tab:
+		if (c[0] == ':')
+			cmd_complete(t, (char *)&c[1], -1);
+		else if (c[0] == '.' || c[0] == ',')
+			run_script(t, "hints.focusPreviousHint();");
+		goto done;
+	case GDK_Down:
+		if (c[0] == '?') {
+			if ((search_at = history_next(&shl, search_at))) {
+				search_at->line[0] = c[0];
+				gtk_entry_set_text(w, search_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		} else if (c[0] == '/') {
+			if ((search_at = history_prev(&shl, search_at))) {
+				search_at->line[0] = c[0];
+				gtk_entry_set_text(w, search_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		} if (c[0] == ':') {
+			if ((history_at = history_prev(&chl, history_at))) {
+				history_at->line[0] = c[0];
+				gtk_entry_set_text(w, history_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		}
+		goto done;
+	case GDK_Up:
+		if (c[0] == '/') {
+			if ((search_at = history_next(&shl, search_at))) {
+				search_at->line[0] = c[0];
+				gtk_entry_set_text(w, search_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		} else if (c[0] == '?') {
+			if ((search_at = history_prev(&shl, search_at))) {
+				search_at->line[0] = c[0];
+				gtk_entry_set_text(w, search_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		} if (c[0] == ':') {
+			if ((history_at = history_next(&chl, history_at))) {
+				history_at->line[0] = c[0];
+				gtk_entry_set_text(w, history_at->line);
+				gtk_editable_set_position(GTK_EDITABLE(w), -1);
+			}
+		}
+		goto done;
+	case GDK_BackSpace:
+		if (!(!strcmp(c, ":") || !strcmp(c, "/") || !strcmp(c, "?") ||
+		    !strcmp(c, ".") || !strcmp(c, ","))) {
+			/* see if we are doing hinting and reset it */
+			if (c[0] == '.' || c[0] == ',') {
+				/* recreate hints */
+				s = g_strdup_printf("hints.createHints('', "
+				    "'%c');", c[0] == '.' ? 'f' : 'F');
+				run_script(t, s);
+				g_free(s);
+			}
+			break;
+		}
+
+		/* FALLTHROUGH */
+	case GDK_Escape:
+		hide_cmd(t);
+		focus_webview(t);
+
+		/* cancel search */
+		if (c != NULL && (c[0] == '/' || c[0] == '?'))
+			webkit_web_view_unmark_text_matches(t->wv);
+
+		/* no need to cancel hints */
+		goto done;
+	}
+
+	rv = XT_CB_PASSTHROUGH;
+done:
+	return (rv);
+}
+
+void
+wv_popup_cb(GtkEntry *entry, GtkMenu *menu, struct tab *t)
+{
+	DNPRINTF(XT_D_CMD, "wv_popup_cb: tab %d\n", t->tab_id);
+}
+
+void
+cmd_popup_cb(GtkEntry *entry, GtkMenu *menu, struct tab *t)
+{
+	/* popup menu enabled */
+	t->popup = 1;
+}
+
+int
+cmd_focusout_cb(GtkWidget *w, GdkEventFocus *e, struct tab *t)
+{
+	if (t == NULL) {
+		show_oops(NULL, "cmd_focusout_cb invalid parameters");
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	DNPRINTF(XT_D_CMD, "cmd_focusout_cb: tab %d popup %d\n",
+	    t->tab_id, t->popup);
+
+	/* if popup is enabled don't lose focus */
+	if (t->popup) {
+		t->popup = 0;
+		return (XT_CB_PASSTHROUGH);
+	}
+
+	hide_cmd(t);
+	hide_oops(t);
+	disable_hints(t);
+
+	if (show_url == 0 || t->focus_wv)
+		focus_webview(t);
+	else
+		gtk_widget_grab_focus(GTK_WIDGET(t->uri_entry));
+
+	return (XT_CB_PASSTHROUGH);
+}
+
+void
+cmd_activate_cb(GtkEntry *entry, struct tab *t)
+{
+	char			*s;
+	const gchar		*c = gtk_entry_get_text(entry);
+
+	if (t == NULL) {
+		show_oops(NULL, "cmd_activate_cb invalid parameters");
+		return;
+	}
+
+	DNPRINTF(XT_D_CMD, "cmd_activate_cb: tab %d %s\n", t->tab_id, c);
+
+	/* sanity */
+	if (c == NULL)
+		goto done;
+	else if (!(c[0] == ':' || c[0] == '/' || c[0] == '?' ||
+	    c[0] == '.' || c[0] == ','))
+		goto done;
+	if (strlen(c) < 1)
+		goto done;
+	s = (char *)&c[1];
+
+	if (c[0] == '/' || c[0] == '?') {
+		/* see if there is a timer pending */
+		if (t->search_id) {
+			g_source_remove(t->search_id);
+			t->search_id = 0;
+			search_cb(t);
+		}
+
+		if (t->search_text) {
+			g_free(t->search_text);
+			t->search_text = NULL;
+		}
+
+		t->search_text = g_strdup(s);
+		if (global_search)
+			g_free(global_search);
+		global_search = g_strdup(s);
+		t->search_forward = c[0] == '/';
+
+		history_add(&shl, search_file, s, &search_history_count);
+	} else if (c[0] == '.' || c[0] == ',') {
+		run_script(t, "hints.fire();");
+		/* XXX history for link following? */
+	} else if (c[0] == ':') {
+		history_add(&chl, command_file, s, &cmd_history_count);
+		/* can't call hide_cmd after cmd_execute */
+		hide_cmd(t);
+		cmd_execute(t, s);
+		return;
+	}
+
+done:
+	hide_cmd(t);
+}
+
+void
+backward_cb(GtkWidget *w, struct tab *t)
+{
+	struct karg		a;
+
+	if (t == NULL) {
+		show_oops(NULL, "backward_cb invalid parameters");
+		return;
+	}
+
+	DNPRINTF(XT_D_NAV, "backward_cb: tab %d\n", t->tab_id);
+
+	a.i = XT_NAV_BACK;
+	navaction(t, &a);
+}
+
+void
+forward_cb(GtkWidget *w, struct tab *t)
+{
+	struct karg		a;
+
+	if (t == NULL) {
+		show_oops(NULL, "forward_cb invalid parameters");
+		return;
+	}
+
+	DNPRINTF(XT_D_NAV, "forward_cb: tab %d\n", t->tab_id);
+
+	a.i = XT_NAV_FORWARD;
+	navaction(t, &a);
+}
+
+void
+home_cb(GtkWidget *w, struct tab *t)
+{
+	if (t == NULL) {
+		show_oops(NULL, "home_cb invalid parameters");
+		return;
+	}
+
+	DNPRINTF(XT_D_NAV, "home_cb: tab %d\n", t->tab_id);
+
+	load_uri(t, home);
+}
+
+void
+stop_cb(GtkWidget *w, struct tab *t)
+{
+	WebKitWebFrame		*frame;
+
+	if (t == NULL) {
+		show_oops(NULL, "stop_cb invalid parameters");
+		return;
+	}
+
+	DNPRINTF(XT_D_NAV, "stop_cb: tab %d\n", t->tab_id);
+
+	frame = webkit_web_view_get_main_frame(t->wv);
+	if (frame == NULL) {
+		show_oops(t, "stop_cb: no frame");
+		return;
+	}
+
+	webkit_web_frame_stop_loading(frame);
+	abort_favicon_download(t);
+}
+
+void
+setup_webkit(struct tab *t)
+{
+	if (is_g_object_setting(G_OBJECT(t->settings), "enable-dns-prefetching"))
+		g_object_set(G_OBJECT(t->settings), "enable-dns-prefetching",
+		    FALSE, (char *)NULL);
+	else
+		warnx("webkit does not have \"enable-dns-prefetching\" property");
+	g_object_set(G_OBJECT(t->settings),
+	    "user-agent", t->user_agent, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-scripts", enable_scripts, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-plugins", enable_plugins, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "javascript-can-open-windows-automatically", enable_scripts,
+	    (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-html5-database", FALSE, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-html5-local-storage", enable_localstorage, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable_spell_checking", enable_spell_checking, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "spell_checking_languages", spell_check_languages, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-developer-extras", TRUE, (char *)NULL);
+	g_object_set(G_OBJECT(t->wv),
+	    "full-content-zoom", TRUE, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "auto-load-images", auto_load_images, (char *)NULL);
+
+	webkit_web_view_set_settings(t->wv, t->settings);
+}
+
+gboolean
+update_statusbar_position(GtkAdjustment* adjustment, gpointer data)
+{
+	struct tab	*ti, *t = NULL;
+	gdouble		view_size, value, max;
+	gchar		*position;
+
+	TAILQ_FOREACH(ti, &tabs, entry)
+		if (ti->tab_id == gtk_notebook_get_current_page(notebook)) {
+			t = ti;
+			break;
+		}
+
+	if (t == NULL)
+		return FALSE;
+
+	if (adjustment == NULL)
+		adjustment = gtk_scrolled_window_get_vadjustment(
+		    GTK_SCROLLED_WINDOW(t->browser_win));
+
+	view_size = gtk_adjustment_get_page_size(adjustment);
+	value = gtk_adjustment_get_value(adjustment);
+	max = gtk_adjustment_get_upper(adjustment) - view_size;
+
+	if (max == 0)
+		position = g_strdup("All");
+	else if (value == max)
+		position = g_strdup("Bot");
+	else if (value == 0)
+		position = g_strdup("Top");
+	else
+		position = g_strdup_printf("%d%%", (int) ((value / max) * 100));
+
+	gtk_entry_set_text(GTK_ENTRY(t->sbe.position), position);
+	g_free(position);
+
+	return (TRUE);
+}
+
+GtkWidget *
+create_window(const gchar *name)
+{
+	GtkWidget		*w;
+
+	w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	if (window_maximize)
+		gtk_window_maximize(GTK_WINDOW(w));
+	else
+		gtk_window_set_default_size(GTK_WINDOW(w), window_width, window_height);
+	gtk_widget_set_name(w, name);
+	gtk_window_set_wmclass(GTK_WINDOW(w), name, "XXXTerm");
+
+	return (w);
+}
+
+GtkWidget *
+create_browser(struct tab *t)
+{
+	GtkWidget		*w;
+	gchar			*strval;
+	GtkAdjustment		*adjustment;
+
+	if (t == NULL) {
+		show_oops(NULL, "create_browser invalid parameters");
+		return (NULL);
+	}
+
+	t->sb_h = GTK_SCROLLBAR(gtk_hscrollbar_new(NULL));
+	t->sb_v = GTK_SCROLLBAR(gtk_vscrollbar_new(NULL));
+	t->adjust_h = gtk_range_get_adjustment(GTK_RANGE(t->sb_h));
+	t->adjust_v = gtk_range_get_adjustment(GTK_RANGE(t->sb_v));
+
+	w = gtk_scrolled_window_new(t->adjust_h, t->adjust_v);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w),
+	    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+	t->wv = WEBKIT_WEB_VIEW(webkit_web_view_new());
+	gtk_container_add(GTK_CONTAINER(w), GTK_WIDGET(t->wv));
+
+	/* set defaults */
+	t->settings = webkit_web_settings_new();
+
+	g_object_set(t->settings, "default-encoding", encoding, (char *)NULL);
+
+	if (user_agent == NULL) {
+		g_object_get(G_OBJECT(t->settings), "user-agent", &strval,
+		    (char *)NULL);
+		t->user_agent = g_strdup_printf("%s %s+", strval, version);
+		g_free(strval);
+	} else
+		t->user_agent = g_strdup(user_agent->value);
+
+	t->stylesheet = g_strdup_printf("file://%s/style.css", resource_dir);
+	t->load_images = auto_load_images;
+
+	adjustment =
+	    gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(w));
+	g_signal_connect(G_OBJECT(adjustment), "value-changed",
+	    G_CALLBACK(update_statusbar_position), NULL);
+
+	setup_webkit(t);
+	setup_inspector(t);
+
+	return (w);
+}
+
+GtkWidget *
+create_kiosk_toolbar(struct tab *t)
+{
+	GtkWidget		*toolbar = NULL, *b;
+
+	b = gtk_hbox_new(FALSE, 0);
+	toolbar = b;
+	gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
+
+	/* backward button */
+	t->backward = create_button("Back", GTK_STOCK_GO_BACK, 0);
+	gtk_widget_set_sensitive(t->backward, FALSE);
+	g_signal_connect(G_OBJECT(t->backward), "clicked",
+	    G_CALLBACK(backward_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->backward, TRUE, TRUE, 0);
+
+	/* forward button */
+	t->forward = create_button("Forward", GTK_STOCK_GO_FORWARD, 0);
+	gtk_widget_set_sensitive(t->forward, FALSE);
+	g_signal_connect(G_OBJECT(t->forward), "clicked",
+	    G_CALLBACK(forward_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->forward, TRUE, TRUE, 0);
+
+	/* home button */
+	t->gohome = create_button("Home", GTK_STOCK_HOME, 0);
+	gtk_widget_set_sensitive(t->gohome, true);
+	g_signal_connect(G_OBJECT(t->gohome), "clicked",
+	    G_CALLBACK(home_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->gohome, TRUE, TRUE, 0);
+
+	/* create widgets but don't use them */
+	t->uri_entry = gtk_entry_new();
+	t->stop = create_button("Stop", GTK_STOCK_STOP, 0);
+	t->js_toggle = create_button("JS-Toggle", enable_scripts ?
+	    GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE, 0);
+
+	return (toolbar);
+}
+
+GtkWidget *
+create_toolbar(struct tab *t)
+{
+	GtkWidget		*toolbar = NULL, *b, *eb1;
+
+	b = gtk_hbox_new(FALSE, 0);
+	toolbar = b;
+	gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
+
+	/* backward button */
+	t->backward = create_button("Back", GTK_STOCK_GO_BACK, 0);
+	gtk_widget_set_sensitive(t->backward, FALSE);
+	g_signal_connect(G_OBJECT(t->backward), "clicked",
+	    G_CALLBACK(backward_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->backward, FALSE, FALSE, 0);
+
+	/* forward button */
+	t->forward = create_button("Forward",GTK_STOCK_GO_FORWARD, 0);
+	gtk_widget_set_sensitive(t->forward, FALSE);
+	g_signal_connect(G_OBJECT(t->forward), "clicked",
+	    G_CALLBACK(forward_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->forward, FALSE,
+	    FALSE, 0);
+
+	/* stop button */
+	t->stop = create_button("Stop", GTK_STOCK_STOP, 0);
+	gtk_widget_set_sensitive(t->stop, FALSE);
+	g_signal_connect(G_OBJECT(t->stop), "clicked",
+	    G_CALLBACK(stop_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->stop, FALSE,
+	    FALSE, 0);
+
+	/* JS button */
+	t->js_toggle = create_button("JS-Toggle", enable_scripts ?
+	    GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE, 0);
+	gtk_widget_set_sensitive(t->js_toggle, TRUE);
+	g_signal_connect(G_OBJECT(t->js_toggle), "clicked",
+	    G_CALLBACK(js_toggle_cb), t);
+	gtk_box_pack_start(GTK_BOX(b), t->js_toggle, FALSE, FALSE, 0);
+
+	t->uri_entry = gtk_entry_new();
+	g_signal_connect(G_OBJECT(t->uri_entry), "activate",
+	    G_CALLBACK(activate_uri_entry_cb), t);
+	g_signal_connect(G_OBJECT(t->uri_entry), "key-press-event",
+	    G_CALLBACK(entry_key_cb), t);
+	completion_add(t);
+	eb1 = gtk_hbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(eb1), 1);
+	gtk_box_pack_start(GTK_BOX(eb1), t->uri_entry, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(b), eb1, TRUE, TRUE, 0);
+
+	/* search entry */
+	if (search_string) {
+		GtkWidget *eb2;
+		t->search_entry = gtk_entry_new();
+		gtk_entry_set_width_chars(GTK_ENTRY(t->search_entry), 30);
+		g_signal_connect(G_OBJECT(t->search_entry), "activate",
+		    G_CALLBACK(activate_search_entry_cb), t);
+		g_signal_connect(G_OBJECT(t->search_entry), "key-press-event",
+		    G_CALLBACK(entry_key_cb), t);
+		gtk_widget_set_size_request(t->search_entry, -1, -1);
+		eb2 = gtk_hbox_new(FALSE, 0);
+		gtk_container_set_border_width(GTK_CONTAINER(eb2), 1);
+		gtk_box_pack_start(GTK_BOX(eb2), t->search_entry, TRUE, TRUE,
+		    0);
+		gtk_box_pack_start(GTK_BOX(b), eb2, FALSE, FALSE, 0);
+	}
+
+	return (toolbar);
+}
+
+GtkWidget *
+create_buffers(struct tab *t)
+{
+	GtkCellRenderer		*renderer;
+	GtkWidget		*view;
+
+	view = gtk_tree_view_new();
+
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes
+	    (GTK_TREE_VIEW(view), -1, "Id", renderer, "text", COL_ID, (char *)NULL);
+
+	renderer = gtk_cell_renderer_pixbuf_new();
+	gtk_tree_view_insert_column_with_attributes
+	    (GTK_TREE_VIEW(view), -1, "Favicon", renderer, "pixbuf", COL_FAVICON,
+	    (char *)NULL);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes
+	    (GTK_TREE_VIEW(view), -1, "Title", renderer, "text", COL_TITLE,
+	    (char *)NULL);
+
+	gtk_tree_view_set_model
+	    (GTK_TREE_VIEW(view), GTK_TREE_MODEL(buffers_store));
+
+	return (view);
+}
+
+void
+row_activated_cb(GtkTreeView *view, GtkTreePath *path,
+    GtkTreeViewColumn *col, struct tab *t)
+{
+	GtkTreeIter		iter;
+	guint			id;
+
+	gtk_widget_grab_focus(GTK_WIDGET(t->wv));
+
+	if (gtk_tree_model_get_iter(GTK_TREE_MODEL(buffers_store), &iter,
+	    path)) {
+		gtk_tree_model_get
+		    (GTK_TREE_MODEL(buffers_store), &iter, COL_ID, &id, -1);
+		set_current_tab(id - 1);
+	}
+
+	hide_buffers(t);
+}
+
+/* after tab reordering/creation/removal */
+void
+recalc_tabs(void)
+{
+	struct tab		*t;
+	int			 maxid = 0;
+
+	TAILQ_FOREACH(t, &tabs, entry) {
+		t->tab_id = gtk_notebook_page_num(notebook, t->vbox);
+		if (t->tab_id > maxid)
+			maxid = t->tab_id;
+
+		gtk_widget_show(t->tab_elems.sep);
+	}
+
+	TAILQ_FOREACH(t, &tabs, entry) {
+		if (t->tab_id == maxid) {
+			gtk_widget_hide(t->tab_elems.sep);
+			break;
+		}
+	}
+}
+
+/* after active tab change */
+void
+recolor_compact_tabs(void)
+{
+	struct tab		*t;
+	int			 curid = 0;
+	GdkColor		 color;
+
+	gdk_color_parse(XT_COLOR_CT_INACTIVE, &color);
+	TAILQ_FOREACH(t, &tabs, entry)
+		gtk_widget_modify_fg(t->tab_elems.label, GTK_STATE_NORMAL,
+		    &color);
+
+	curid = gtk_notebook_get_current_page(notebook);
+	TAILQ_FOREACH(t, &tabs, entry)
+		if (t->tab_id == curid) {
+			gdk_color_parse(XT_COLOR_CT_ACTIVE, &color);
+			gtk_widget_modify_fg(t->tab_elems.label,
+			    GTK_STATE_NORMAL, &color);
+			break;
+		}
+}
+
+void
+set_current_tab(int page_num)
+{
+	buffercmd_abort(get_current_tab());
+	gtk_notebook_set_current_page(notebook, page_num);
+	recolor_compact_tabs();
+}
+
+int
+undo_close_tab_save(struct tab *t)
+{
+	int				m, n;
+	const gchar			*uri;
+	struct undo			*u1, *u2;
+	GList				*items;
+	WebKitWebHistoryItem		*item;
+
+	if ((uri = get_uri(t)) == NULL)
+		return (1);
+
+	u1 = g_malloc0(sizeof(struct undo));
+	u1->uri = g_strdup(uri);
+
+	t->bfl = webkit_web_view_get_back_forward_list(t->wv);
+
+	m = webkit_web_back_forward_list_get_forward_length(t->bfl);
+	n = webkit_web_back_forward_list_get_back_length(t->bfl);
+	u1->back = n;
+
+	/* forward history */
+	items = webkit_web_back_forward_list_get_forward_list_with_limit(t->bfl, m);
+
+	while (items) {
+		item = items->data;
+		u1->history = g_list_prepend(u1->history,
+		    webkit_web_history_item_copy(item));
+		items = g_list_next(items);
+	}
+
+	/* current item */
+	if (m) {
+		item = webkit_web_back_forward_list_get_current_item(t->bfl);
+		u1->history = g_list_prepend(u1->history,
+		    webkit_web_history_item_copy(item));
+	}
+
+	/* back history */
+	items = webkit_web_back_forward_list_get_back_list_with_limit(t->bfl, n);
+
+	while (items) {
+		item = items->data;
+		u1->history = g_list_prepend(u1->history,
+		    webkit_web_history_item_copy(item));
+		items = g_list_next(items);
+	}
+
+	TAILQ_INSERT_HEAD(&undos, u1, entry);
+
+	if (undo_count > XT_MAX_UNDO_CLOSE_TAB) {
+		u2 = TAILQ_LAST(&undos, undo_tailq);
+		TAILQ_REMOVE(&undos, u2, entry);
+		g_free(u2->uri);
+		g_list_free(u2->history);
+		g_free(u2);
+	} else
+		undo_count++;
+
+	return (0);
+}
+
+void
+delete_tab(struct tab *t)
+{
+	struct karg		a;
+
+	DNPRINTF(XT_D_TAB, "delete_tab: %p\n", t);
+
+	if (t == NULL)
+		return;
+
+	/*
+	 * no need to join thread here because it won't access t on completion
+	 */
+
+	TAILQ_REMOVE(&tabs, t, entry);
+	buffercmd_abort(t);
+
+	/* Halt all webkit activity. */
+	abort_favicon_download(t);
+	webkit_web_view_stop_loading(t->wv);
+
+	/* Save the tab, so we can undo the close. */
+	undo_close_tab_save(t);
+
+	/* just in case */
+	if (t->search_id)
+		g_source_remove(t->search_id);
+
+	/* inspector */
+	bzero(&a, sizeof a);
+	a.i = XT_INS_CLOSE;
+	inspector_cmd(t, &a);
+
+	if (browser_mode == XT_BM_KIOSK) {
+		gtk_widget_destroy(t->uri_entry);
+		gtk_widget_destroy(t->stop);
+		gtk_widget_destroy(t->js_toggle);
+	}
+
+	gtk_widget_destroy(t->tab_elems.eventbox);
+	gtk_widget_destroy(t->vbox);
+
+	g_free(t->user_agent);
+	g_free(t->stylesheet);
+	g_free(t->tmp_uri);
+	g_free(t);
+	t = NULL;
+
+	if (TAILQ_EMPTY(&tabs)) {
+		if (browser_mode == XT_BM_KIOSK)
+			create_new_tab(home, NULL, 1, -1);
+		else
+			create_new_tab(NULL, NULL, 1, -1);
+	}
+
+	/* recreate session */
+	if (session_autosave) {
+		bzero(&a, sizeof a);
+		a.s = NULL;
+		save_tabs(NULL, &a);
+	}
+
+	recalc_tabs();
+	recolor_compact_tabs();
+}
+
+void
+update_statusbar_zoom(struct tab *t)
+{
+	gfloat			zoom;
+	char			s[16] = { '\0' };
+
+	g_object_get(G_OBJECT(t->wv), "zoom-level", &zoom, (char *)NULL);
+	if ((zoom <= 0.99 || zoom >= 1.01))
+		snprintf(s, sizeof s, "%d%%", (int)(zoom * 100));
+	gtk_entry_set_text(GTK_ENTRY(t->sbe.zoom), s);
+}
+
+void
+setzoom_webkit(struct tab *t, int adjust)
+{
+#define XT_ZOOMPERCENT		0.04
+
+	gfloat			zoom;
+
+	if (t == NULL) {
+		show_oops(NULL, "setzoom_webkit invalid parameters");
+		return;
+	}
+
+	g_object_get(G_OBJECT(t->wv), "zoom-level", &zoom, (char *)NULL);
+	if (adjust == XT_ZOOM_IN)
+		zoom += XT_ZOOMPERCENT;
+	else if (adjust == XT_ZOOM_OUT)
+		zoom -= XT_ZOOMPERCENT;
+	else if (adjust > 0)
+		zoom = default_zoom_level + adjust / 100.0 - 1.0;
+	else {
+		show_oops(t, "setzoom_webkit invalid zoom value");
+		return;
+	}
+
+	if (zoom < XT_ZOOMPERCENT)
+		zoom = XT_ZOOMPERCENT;
+	g_object_set(G_OBJECT(t->wv), "zoom-level", zoom, (char *)NULL);
+	update_statusbar_zoom(t);
+}
+
+gboolean
+tab_clicked_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+	struct tab *t = (struct tab *) data;
+
+	DNPRINTF(XT_D_TAB, "tab_clicked_cb: tab: %d\n", t->tab_id);
+
+	switch (event->button) {
+	case 1:
+		set_current_tab(t->tab_id);
+		break;
+	case 2:
+		delete_tab(t);
+		break;
+	}
+
+	return TRUE;
+}
+
+void
+append_tab(struct tab *t)
+{
+	if (t == NULL)
+		return;
+
+	TAILQ_INSERT_TAIL(&tabs, t, entry);
+	t->tab_id = gtk_notebook_append_page(notebook, t->vbox, t->tab_content);
+}
+
+GtkWidget *
+create_sbe(int width)
+{
+	GtkWidget		*sbe;
+
+	sbe = gtk_entry_new();
+	gtk_entry_set_inner_border(GTK_ENTRY(sbe), NULL);
+	gtk_entry_set_has_frame(GTK_ENTRY(sbe), FALSE);
+	gtk_widget_set_can_focus(GTK_WIDGET(sbe), FALSE);
+	gtk_widget_modify_font(GTK_WIDGET(sbe), statusbar_font);
+	gtk_entry_set_alignment(GTK_ENTRY(sbe), 1.0);
+	gtk_widget_set_size_request(sbe, width, -1);
+
+	return sbe;
+}
+
+struct tab *
+create_new_tab(char *title, struct undo *u, int focus, int position)
+{
+	struct tab			*t;
+	int				load = 1, id;
+	GtkWidget			*b, *bb;
+	WebKitWebHistoryItem		*item;
+	GList				*items;
+	GdkColor			color;
+	char				*p;
+	int				sbe_p = 0, sbe_b = 0,
+					sbe_z = 0;
+
+	DNPRINTF(XT_D_TAB, "create_new_tab: title %s focus %d\n", title, focus);
+
+	if (tabless && !TAILQ_EMPTY(&tabs)) {
+		DNPRINTF(XT_D_TAB, "create_new_tab: new tab rejected\n");
+		return (NULL);
+	}
+
+	t = g_malloc0(sizeof *t);
+
+	if (title == NULL) {
+		title = "(untitled)";
+		load = 0;
+	}
+
+	t->vbox = gtk_vbox_new(FALSE, 0);
+
+	/* label + button for tab */
+	b = gtk_hbox_new(FALSE, 0);
+	t->tab_content = b;
+
+#if GTK_CHECK_VERSION(2, 20, 0)
+	t->spinner = gtk_spinner_new();
+#endif
+	t->label = gtk_label_new(title);
+	bb = create_button("Close", GTK_STOCK_CLOSE, 1);
+	gtk_widget_set_size_request(t->label, 100, 0);
+	gtk_label_set_max_width_chars(GTK_LABEL(t->label), 20);
+	gtk_label_set_ellipsize(GTK_LABEL(t->label), PANGO_ELLIPSIZE_END);
+	gtk_widget_set_size_request(b, 130, 0);
+
+	gtk_box_pack_start(GTK_BOX(b), bb, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(b), t->label, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(2, 20, 0)
+	gtk_box_pack_start(GTK_BOX(b), t->spinner, FALSE, FALSE, 0);
+#endif
+
+	/* toolbar */
+	if (browser_mode == XT_BM_KIOSK) {
+		t->toolbar = create_kiosk_toolbar(t);
+		gtk_box_pack_start(GTK_BOX(t->vbox), t->toolbar, FALSE, FALSE,
+		    0);
+	} else {
+		t->toolbar = create_toolbar(t);
+		if (fancy_bar)
+			gtk_box_pack_start(GTK_BOX(t->vbox), t->toolbar, FALSE,
+			    FALSE, 0);
+	}
+
+	/* marks */
+	marks_clear(t);
+
+	/* browser */
+	t->browser_win = create_browser(t);
+	gtk_box_pack_start(GTK_BOX(t->vbox), t->browser_win, TRUE, TRUE, 0);
+
+	/* oops message for user feedback */
+	t->oops = gtk_entry_new();
+	gtk_entry_set_inner_border(GTK_ENTRY(t->oops), NULL);
+	gtk_entry_set_has_frame(GTK_ENTRY(t->oops), FALSE);
+	gtk_widget_set_can_focus(GTK_WIDGET(t->oops), FALSE);
+	gdk_color_parse(XT_COLOR_RED, &color);
+	gtk_widget_modify_base(t->oops, GTK_STATE_NORMAL, &color);
+	gtk_box_pack_end(GTK_BOX(t->vbox), t->oops, FALSE, FALSE, 0);
+	gtk_widget_modify_font(GTK_WIDGET(t->oops), oops_font);
+
+	/* command entry */
+	t->cmd = gtk_entry_new();
+	gtk_entry_set_inner_border(GTK_ENTRY(t->cmd), NULL);
+	gtk_entry_set_has_frame(GTK_ENTRY(t->cmd), FALSE);
+	gtk_box_pack_end(GTK_BOX(t->vbox), t->cmd, FALSE, FALSE, 0);
+	gtk_widget_modify_font(GTK_WIDGET(t->cmd), cmd_font);
+
+	/* status bar */
+	t->statusbar_box = gtk_hbox_new(FALSE, 0);
+
+	t->sbe.statusbar = gtk_entry_new();
+	gtk_entry_set_inner_border(GTK_ENTRY(t->sbe.statusbar), NULL);
+	gtk_entry_set_has_frame(GTK_ENTRY(t->sbe.statusbar), FALSE);
+	gtk_widget_set_can_focus(GTK_WIDGET(t->sbe.statusbar), FALSE);
+	gtk_widget_modify_font(GTK_WIDGET(t->sbe.statusbar), statusbar_font);
+
+	/* create these widgets only if specified in statusbar_elems */
+
+	t->sbe.position = create_sbe(40);
+	t->sbe.zoom = create_sbe(40);
+	t->sbe.buffercmd = create_sbe(60);
+
+	statusbar_modify_attr(t, XT_COLOR_WHITE, XT_COLOR_BLACK);
+
+	gtk_box_pack_start(GTK_BOX(t->statusbar_box), t->sbe.statusbar, TRUE,
+	    TRUE, FALSE);
+
+	/* gtk widgets cannot be added to a box twice. sbe_* variables
+	   make sure of this */
+	for (p = statusbar_elems; *p != '\0'; p++) {
+		switch (*p) {
+		case '|':
+		{
+			GtkWidget *sep = gtk_vseparator_new();
+
+			gdk_color_parse(XT_COLOR_SB_SEPARATOR, &color);
+			gtk_widget_modify_bg(sep, GTK_STATE_NORMAL, &color);
+			gtk_box_pack_start(GTK_BOX(t->statusbar_box), sep,
+			    FALSE, FALSE, FALSE);
+			break;
+		}
+		case 'P':
+			if (sbe_p) {
+				warnx("flag \"%c\" specified more than "
+				    "once in statusbar_elems\n", *p);
+				break;
+			}
+			sbe_p = 1;
+			gtk_box_pack_start(GTK_BOX(t->statusbar_box),
+			    t->sbe.position, FALSE, FALSE, FALSE);
+			break;
+		case 'B':
+			if (sbe_b) {
+				warnx("flag \"%c\" specified more than "
+				    "once in statusbar_elems\n", *p);
+				break;
+			}
+			sbe_b = 1;
+			gtk_box_pack_start(GTK_BOX(t->statusbar_box),
+			    t->sbe.buffercmd, FALSE, FALSE, FALSE);
+			break;
+		case 'Z':
+			if (sbe_z) {
+				warnx("flag \"%c\" specified more than "
+				    "once in statusbar_elems\n", *p);
+				break;
+			}
+			sbe_z = 1;
+			gtk_box_pack_start(GTK_BOX(t->statusbar_box),
+			    t->sbe.zoom, FALSE, FALSE, FALSE);
+			break;
+		default:
+			warnx("illegal flag \"%c\" in statusbar_elems\n", *p);
+			break;
+		}
+	}
+
+	gtk_box_pack_end(GTK_BOX(t->vbox), t->statusbar_box, FALSE, FALSE, 0);
+
+	/* buffer list */
+	t->buffers = create_buffers(t);
+	gtk_box_pack_end(GTK_BOX(t->vbox), t->buffers, FALSE, FALSE, 0);
+
+	/* xtp meaning is normal by default */
+	t->xtp_meaning = XT_XTP_TAB_MEANING_NORMAL;
+
+	/* set empty favicon */
+	xt_icon_from_name(t, "text-html");
+
+	/* and show it all */
+	gtk_widget_show_all(b);
+	gtk_widget_show_all(t->vbox);
+
+	/* compact tab bar */
+	t->tab_elems.label = gtk_label_new(title);
+	t->tab_elems.favicon = gtk_image_new();
+	gtk_label_set_width_chars(GTK_LABEL(t->tab_elems.label), 1.0);
+	gtk_misc_set_alignment(GTK_MISC(t->tab_elems.label), 0.0, 0.0);
+	gtk_misc_set_padding(GTK_MISC(t->tab_elems.label), 4.0, 4.0);
+	gtk_widget_modify_font(GTK_WIDGET(t->tab_elems.label), tabbar_font);
+
+	t->tab_elems.eventbox = gtk_event_box_new();
+	t->tab_elems.box = gtk_hbox_new(FALSE, 0);
+	t->tab_elems.sep = gtk_vseparator_new();
+
+	gdk_color_parse(XT_COLOR_CT_BACKGROUND, &color);
+	gtk_widget_modify_bg(t->tab_elems.eventbox, GTK_STATE_NORMAL, &color);
+	gdk_color_parse(XT_COLOR_CT_INACTIVE, &color);
+	gtk_widget_modify_fg(t->tab_elems.label, GTK_STATE_NORMAL, &color);
+	gdk_color_parse(XT_COLOR_CT_SEPARATOR, &color);
+	gtk_widget_modify_bg(t->tab_elems.sep, GTK_STATE_NORMAL, &color);
+
+	gtk_box_pack_start(GTK_BOX(t->tab_elems.box), t->tab_elems.favicon, FALSE,
+	    FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(t->tab_elems.box), t->tab_elems.label, TRUE,
+	    TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(t->tab_elems.box), t->tab_elems.sep, FALSE,
+	    FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(t->tab_elems.eventbox),
+	    t->tab_elems.box);
+
+	gtk_box_pack_start(GTK_BOX(tab_bar), t->tab_elems.eventbox, TRUE,
+	    TRUE, 0);
+	gtk_widget_show_all(t->tab_elems.eventbox);
+
+	if (append_next == 0 || gtk_notebook_get_n_pages(notebook) == 0)
+		append_tab(t);
+	else {
+		id = position >= 0 ? position :
+		    gtk_notebook_get_current_page(notebook) + 1;
+		if (id > gtk_notebook_get_n_pages(notebook))
+			append_tab(t);
+		else {
+			TAILQ_INSERT_TAIL(&tabs, t, entry);
+			gtk_notebook_insert_page(notebook, t->vbox, b, id);
+			gtk_box_reorder_child(GTK_BOX(tab_bar),
+			    t->tab_elems.eventbox, id);
+			recalc_tabs();
+		}
+	}
+
+#if GTK_CHECK_VERSION(2, 20, 0)
+	/* turn spinner off if we are a new tab without uri */
+	if (!load) {
+		gtk_spinner_stop(GTK_SPINNER(t->spinner));
+		gtk_widget_hide(t->spinner);
+	}
+#endif
+	/* make notebook tabs reorderable */
+	gtk_notebook_set_tab_reorderable(notebook, t->vbox, TRUE);
+
+	/* compact tabs clickable */
+	g_signal_connect(G_OBJECT(t->tab_elems.eventbox),
+	    "button_press_event", G_CALLBACK(tab_clicked_cb), t);
+
+	g_object_connect(G_OBJECT(t->cmd),
+	    "signal::key-press-event", G_CALLBACK(cmd_keypress_cb), t,
+	    "signal::key-release-event", G_CALLBACK(cmd_keyrelease_cb), t,
+	    "signal::focus-out-event", G_CALLBACK(cmd_focusout_cb), t,
+	    "signal::activate", G_CALLBACK(cmd_activate_cb), t,
+	    "signal::populate-popup", G_CALLBACK(cmd_popup_cb), t,
+	    (char *)NULL);
+
+	/* reuse wv_button_cb to hide oops */
+	g_object_connect(G_OBJECT(t->oops),
+	    "signal::button_press_event", G_CALLBACK(wv_button_cb), t,
+	    (char *)NULL);
+
+	g_signal_connect(t->buffers,
+	    "row-activated", G_CALLBACK(row_activated_cb), t);
+	g_object_connect(G_OBJECT(t->buffers),
+	    "signal::key-press-event", G_CALLBACK(wv_keypress_cb), t, (char *)NULL);
+
+	g_object_connect(G_OBJECT(t->wv),
+	    "signal::key-press-event", G_CALLBACK(wv_keypress_cb), t,
+	    "signal::hovering-over-link", G_CALLBACK(webview_hover_cb), t,
+	    "signal::download-requested", G_CALLBACK(webview_download_cb), t,
+	    "signal::mime-type-policy-decision-requested", G_CALLBACK(webview_mimetype_cb), t,
+	    "signal::navigation-policy-decision-requested", G_CALLBACK(webview_npd_cb), t,
+	    "signal::new-window-policy-decision-requested", G_CALLBACK(webview_npd_cb), t,
+	    "signal::resource-request-starting", G_CALLBACK(webview_rrs_cb), t,
+	    "signal::create-web-view", G_CALLBACK(webview_cwv_cb), t,
+	    "signal::close-web-view", G_CALLBACK(webview_closewv_cb), t,
+	    "signal::event", G_CALLBACK(webview_event_cb), t,
+	    "signal::load-finished", G_CALLBACK(webview_load_finished_cb), t,
+	    "signal::load-progress-changed", G_CALLBACK(webview_progress_changed_cb), t,
+	    "signal::icon-loaded", G_CALLBACK(notify_icon_loaded_cb), t,
+	    "signal::button_press_event", G_CALLBACK(wv_button_cb), t,
+	    "signal::button_release_event", G_CALLBACK(wv_release_button_cb), t,
+	    "signal::populate-popup", G_CALLBACK(wv_popup_cb), t,
+	    (char *)NULL);
+	g_signal_connect(t->wv,
+	    "notify::load-status", G_CALLBACK(notify_load_status_cb), t);
+	g_signal_connect(t->wv,
+	    "notify::title", G_CALLBACK(notify_title_cb), t);
+
+	/* hijack the unused keys as if we were the browser */
+	//g_object_connect(G_OBJECT(t->toolbar),
+	//    "signal-after::key-press-event", G_CALLBACK(wv_keypress_after_cb), t,
+	//    (char *)NULL);
+
+	g_signal_connect(G_OBJECT(bb), "button_press_event",
+	    G_CALLBACK(tab_close_cb), t);
+
+	/* setup history */
+	t->bfl = webkit_web_view_get_back_forward_list(t->wv);
+	/* restore the tab's history */
+	if (u && u->history) {
+		items = u->history;
+		while (items) {
+			item = items->data;
+			webkit_web_back_forward_list_add_item(t->bfl, item);
+			items = g_list_next(items);
+		}
+
+		item = g_list_nth_data(u->history, u->back);
+		if (item)
+			webkit_web_view_go_to_back_forward_item(t->wv, item);
+
+		g_list_free(items);
+		g_list_free(u->history);
+	} else
+		webkit_web_back_forward_list_clear(t->bfl);
+
+	/* hide stuff */
+	hide_cmd(t);
+	hide_oops(t);
+	hide_buffers(t);
+	url_set_visibility();
+	statusbar_set_visibility();
+
+	if (focus) {
+		set_current_tab(t->tab_id);
+		DNPRINTF(XT_D_TAB, "create_new_tab: going to tab: %d\n",
+		    t->tab_id);
+
+		if (load) {
+			gtk_entry_set_text(GTK_ENTRY(t->uri_entry), title);
+			load_uri(t, title);
+		} else {
+			if (show_url == 1)
+				gtk_widget_grab_focus(GTK_WIDGET(t->uri_entry));
+			else
+				focus_webview(t);
+		}
+	} else if (load)
+		load_uri(t, title);
+
+	if (userstyle_global)
+		apply_style(t);
+
+	recolor_compact_tabs();
+	setzoom_webkit(t, XT_ZOOM_NORMAL);
+	return (t);
+}
+
+void
+notebook_switchpage_cb(GtkNotebook *nb, GtkWidget *nbp, guint pn,
+    gpointer *udata)
+{
+	struct tab		*t;
+	const gchar		*uri;
+
+	DNPRINTF(XT_D_TAB, "notebook_switchpage_cb: tab: %d\n", pn);
+
+	if (gtk_notebook_get_current_page(notebook) == -1)
+		recalc_tabs();
+
+	TAILQ_FOREACH(t, &tabs, entry) {
+		if (t->tab_id == pn) {
+			DNPRINTF(XT_D_TAB, "notebook_switchpage_cb: going to "
+			    "%d\n", pn);
+
+			uri = get_title(t, TRUE);
+			gtk_window_set_title(GTK_WINDOW(main_window), uri);
+
+			hide_cmd(t);
+			hide_oops(t);
+
+			if (t->focus_wv) {
+				/* can't use focus_webview here */
+				gtk_widget_grab_focus(GTK_WIDGET(t->wv));
+			}
+		}
+	}
+}
+
+void
+notebook_pagereordered_cb(GtkNotebook *nb, GtkWidget *nbp, guint pn,
+    gpointer *udata)
+{
+	struct tab		*t = NULL, *tt;
+
+	recalc_tabs();
+
+	TAILQ_FOREACH(tt, &tabs, entry)
+		if (tt->tab_id == pn) {
+			t = tt;
+			break;
+		}
+	if (t == NULL)
+		return;
+	DNPRINTF(XT_D_TAB, "page_reordered_cb: tab: %d\n", t->tab_id);
+
+	gtk_box_reorder_child(GTK_BOX(tab_bar), t->tab_elems.eventbox,
+	    t->tab_id);
+}
+
+void
+menuitem_response(struct tab *t)
+{
+	gtk_notebook_set_current_page(notebook, t->tab_id);
+}
+
+gboolean
+arrow_cb(GtkWidget *w, GdkEventButton *event, gpointer user_data)
+{
+	GtkWidget		*menu, *menu_items;
+	GdkEventButton		*bevent;
+	const gchar		*uri;
+	struct tab		*ti;
+
+	if (event->type == GDK_BUTTON_PRESS) {
+		bevent = (GdkEventButton *) event;
+		menu = gtk_menu_new();
+
+		TAILQ_FOREACH(ti, &tabs, entry) {
+			if ((uri = get_uri(ti)) == NULL)
+				/* XXX make sure there is something to print */
+				/* XXX add gui pages in here to look purdy */
+				uri = "(untitled)";
+			menu_items = gtk_menu_item_new_with_label(uri);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_items);
+			gtk_widget_show(menu_items);
+
+			g_signal_connect_swapped((menu_items),
+			    "activate", G_CALLBACK(menuitem_response),
+			    (gpointer)ti);
+		}
+
+		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+		    bevent->button, bevent->time);
+
+		/* unref object so it'll free itself when popped down */
+#if !GTK_CHECK_VERSION(3, 0, 0)
+		/* XXX does not need unref with gtk+3? */
+		g_object_ref_sink(menu);
+		g_object_unref(menu);
+#endif
+
+		return (TRUE /* eat event */);
+	}
+
+	return (FALSE /* propagate */);
+}
+
+int
+icon_size_map(int iconsz)
+{
+	if (iconsz <= GTK_ICON_SIZE_INVALID ||
+	    iconsz > GTK_ICON_SIZE_DIALOG)
+		return (GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+	return (iconsz);
+}
+
+GtkWidget *
+create_button(char *name, char *stockid, int size)
+{
+	GtkWidget		*button, *image;
+	gchar			*rcstring;
+	int			gtk_icon_size;
+
+	rcstring = g_strdup_printf(
+	    "style \"%s-style\"\n"
+	    "{\n"
+	    "  GtkWidget::focus-padding = 0\n"
+	    "  GtkWidget::focus-line-width = 0\n"
+	    "  xthickness = 0\n"
+	    "  ythickness = 0\n"
+	    "}\n"
+	    "widget \"*.%s\" style \"%s-style\"", name, name, name);
+	gtk_rc_parse_string(rcstring);
+	g_free(rcstring);
+	button = gtk_button_new();
+	gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+	gtk_icon_size = icon_size_map(size ? size : icon_size);
+
+	image = gtk_image_new_from_stock(stockid, gtk_icon_size);
+	gtk_widget_set_size_request(GTK_WIDGET(image), -1, -1);
+	gtk_container_set_border_width(GTK_CONTAINER(button), 1);
+	gtk_container_add(GTK_CONTAINER(button), GTK_WIDGET(image));
+	gtk_widget_set_name(button, name);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	return (button);
+}
+
+void
+button_set_stockid(GtkWidget *button, char *stockid)
+{
+	GtkWidget		*image;
+
+	image = gtk_image_new_from_stock(stockid, icon_size_map(icon_size));
+	gtk_widget_set_size_request(GTK_WIDGET(image), -1, -1);
+	gtk_button_set_image(GTK_BUTTON(button), image);
+}
+
+void
+clipb_primary_cb(GtkClipboard *primary, GdkEvent *event, gpointer notused)
+{
+	gchar			*p = NULL;
+	GdkAtom			atom = gdk_atom_intern("CUT_BUFFER0", FALSE);
+	gint			len;
+
+	if (xterm_workaround == 0)
+		return;
+
+	/*
+	 * xterm doesn't play nice with clipboards because it clears the
+	 * primary when clicked.  We rely on primary being set to properly
+	 * handle middle mouse button clicks (paste).  So when someone clears
+	 * primary copy whatever is in CUT_BUFFER0 into primary to simualte
+	 * other application behavior (as in DON'T clear primary).
+	 */
+
+	p = gtk_clipboard_wait_for_text(primary);
+	if (p == NULL) {
+		if (gdk_property_get(gdk_get_default_root_window(),
+		    atom,
+		    gdk_atom_intern("STRING", FALSE),
+		    0,
+		    1024 * 1024 /* picked out of my butt */,
+		    FALSE,
+		    NULL,
+		    NULL,
+		    &len,
+		    (guchar **)&p)) {
+			if (p == NULL)
+				return;
+			/* yes sir, we need to NUL the string */
+			p[len] = '\0';
+			gtk_clipboard_set_text(primary, p, -1);
+		}
+	}
+
+	if (p)
+		g_free(p);
+}
+
+void
+create_canvas(void)
+{
+	GtkWidget		*vbox;
+	GList			*l = NULL;
+	GdkPixbuf		*pb;
+	char			file[PATH_MAX];
+	int			i;
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_box_set_spacing(GTK_BOX(vbox), 0);
+	notebook = GTK_NOTEBOOK(gtk_notebook_new());
+#if !GTK_CHECK_VERSION(3, 0, 0)
+	/* XXX seems to be needed with gtk+2 */
+	gtk_notebook_set_tab_hborder(notebook, 0);
+	gtk_notebook_set_tab_vborder(notebook, 0);
+#endif
+	gtk_notebook_set_scrollable(notebook, TRUE);
+	gtk_notebook_set_show_border(notebook, FALSE);
+	gtk_widget_set_can_focus(GTK_WIDGET(notebook), FALSE);
+
+	abtn = gtk_button_new();
+	arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+	gtk_widget_set_size_request(arrow, -1, -1);
+	gtk_container_add(GTK_CONTAINER(abtn), arrow);
+	gtk_widget_set_size_request(abtn, -1, 20);
+
+#if GTK_CHECK_VERSION(2, 20, 0)
+	gtk_notebook_set_action_widget(notebook, abtn, GTK_PACK_END);
+#endif
+	gtk_widget_set_size_request(GTK_WIDGET(notebook), -1, -1);
+
+	/* compact tab bar */
+	tab_bar = gtk_hbox_new(TRUE, 0);
+
+	gtk_box_pack_start(GTK_BOX(vbox), tab_bar, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(notebook), TRUE, TRUE, 0);
+	gtk_widget_set_size_request(vbox, -1, -1);
+
+	g_object_connect(G_OBJECT(notebook),
+	    "signal::switch-page", G_CALLBACK(notebook_switchpage_cb), NULL,
+	    (char *)NULL);
+	g_object_connect(G_OBJECT(notebook),
+	    "signal::page-reordered", G_CALLBACK(notebook_pagereordered_cb),
+	    NULL, (char *)NULL);
+	g_signal_connect(G_OBJECT(abtn), "button_press_event",
+	    G_CALLBACK(arrow_cb), NULL);
+
+	main_window = create_window("xxxterm");
+	gtk_container_add(GTK_CONTAINER(main_window), vbox);
+	g_signal_connect(G_OBJECT(main_window), "delete_event",
+	    G_CALLBACK(gtk_main_quit), NULL);
+
+	/* icons */
+	for (i = 0; i < LENGTH(icons); i++) {
+		snprintf(file, sizeof file, "%s" PS "%s", resource_dir, icons[i]);
+		pb = gdk_pixbuf_new_from_file(file, NULL);
+		l = g_list_append(l, pb);
+	}
+	gtk_window_set_default_icon_list(l);
+
+	/* clipboard work around */
+	if (xterm_workaround)
+		g_signal_connect(
+		    G_OBJECT(gtk_clipboard_get(GDK_SELECTION_PRIMARY)),
+		    "owner-change", G_CALLBACK(clipb_primary_cb), NULL);
+
+	gtk_widget_show_all(abtn);
+	gtk_widget_show_all(main_window);
+	notebook_tab_set_visibility();
+}
+
+#ifndef XT_SOCKET_DISABLE
+int
+send_cmd_to_socket(char *cmd)
+{
+	int			s, len, rv = 1;
+	struct sockaddr_un	sa;
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+		warnx("%s: socket", __func__);
+		return (rv);
+	}
+
+	sa.sun_family = AF_UNIX;
+	snprintf(sa.sun_path, sizeof(sa.sun_path), "%s" PS "%s",
+	    work_dir, XT_SOCKET_FILE);
+	len = SUN_LEN(&sa);
+
+	if (connect(s, (struct sockaddr *)&sa, len) == -1) {
+		warnx("%s: connect", __func__);
+		goto done;
+	}
+
+	if (send(s, cmd, strlen(cmd) + 1, 0) == -1) {
+		warnx("%s: send", __func__);
+		goto done;
+	}
+
+	rv = 0;
+done:
+	close(s);
+	return (rv);
+}
+
+gboolean
+socket_watcher(GIOChannel *source, GIOCondition condition, gpointer data)
+{
+	int			s, n;
+	char			str[XT_MAX_URL_LENGTH];
+	socklen_t		t = sizeof(struct sockaddr_un);
+	struct sockaddr_un	sa;
+	struct passwd		*p;
+	uid_t			uid;
+	gid_t			gid;
+	struct tab		*tt;
+	gint			fd = g_io_channel_unix_get_fd(source);
+
+	if ((s = accept(fd, (struct sockaddr *)&sa, &t)) == -1) {
+		warn("accept");
+		return (FALSE);
+	}
+
+	if (getpeereid(s, &uid, &gid) == -1) {
+		warn("getpeereid");
+		return (FALSE);
+	}
+	if (uid != getuid() || gid != getgid()) {
+		warnx("unauthorized user");
+		return (FALSE);
+	}
+
+	p = getpwuid(uid);
+	if (p == NULL) {
+		warnx("not a valid user");
+		return (FALSE);
+	}
+
+	n = recv(s, str, sizeof(str), 0);
+	if (n <= 0)
+		return (TRUE);
+
+	tt = TAILQ_LAST(&tabs, tab_list);
+	cmd_execute(tt, str);
+	return (TRUE);
+}
+
+int
+is_running(void)
+{
+	int			s, len, rv = 1;
+	struct sockaddr_un	sa;
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+		warn("is_running: socket");
+		return (-1);
+	}
+
+	sa.sun_family = AF_UNIX;
+	snprintf(sa.sun_path, sizeof(sa.sun_path), "%s" PS "%s",
+	    work_dir, XT_SOCKET_FILE);
+	len = SUN_LEN(&sa);
+
+	/* connect to see if there is a listener */
+	if (connect(s, (struct sockaddr *)&sa, len) == -1)
+		rv = 0; /* not running */
+	else
+		rv = 1; /* already running */
+
+	close(s);
+
+	return (rv);
+}
+
+int
+build_socket(void)
+{
+	int			s, len;
+	struct sockaddr_un	sa;
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+		warn("build_socket: socket");
+		return (-1);
+	}
+
+	sa.sun_family = AF_UNIX;
+	snprintf(sa.sun_path, sizeof(sa.sun_path), "%s" PS "%s",
+	    work_dir, XT_SOCKET_FILE);
+	len = SUN_LEN(&sa);
+
+	/* connect to see if there is a listener */
+	if (connect(s, (struct sockaddr *)&sa, len) == -1) {
+		/* no listener so we will */
+		unlink(sa.sun_path);
+
+		if (bind(s, (struct sockaddr *)&sa, len) == -1) {
+			warn("build_socket: bind");
+			goto done;
+		}
+
+		if (listen(s, 1) == -1) {
+			warn("build_socket: listen");
+			goto done;
+		}
+
+		return (s);
+	}
+
+done:
+	close(s);
+	return (-1);
+}
+#endif
+
+void
+xxx_dir(char *dir)
+{
+	struct stat		sb;
+
+	if (stat(dir, &sb)) {
+#if defined __MINGW32__
+printf("making: %s\n", dir);
+		if (mkdir(dir) == -1)
+#else
+		if (mkdir(dir, S_IRWXU) == -1)
+#endif
+			err(1, "mkdir %s", dir);
+		if (stat(dir, &sb))
+			err(1, "stat %s", dir);
+	}
+	if (S_ISDIR(sb.st_mode) == 0)
+		errx(1, "%s not a dir", dir);
+#if !defined __MINGW32__
+	if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) {
+		warnx("fixing invalid permissions on %s", dir);
+		if (chmod(dir, S_IRWXU) == -1)
+			err(1, "chmod %s", dir);
+	}
+#endif
+}
+
+void
+usage(void)
+{
+	fprintf(stderr,
+	    "%s [-nSTVt][-f file][-s session] url ...\n", __progname);
+	exit(0);
+}
+
+GStaticRecMutex		my_gdk_mtx = G_STATIC_REC_MUTEX_INIT;
+volatile int		mtx_depth;
+int			mtx_complain;
+
+/*
+ * The linux flash plugin violates the gdk locking mechanism.
+ * Work around the issue by using a recursive mutex with some match applied
+ * to see if we hit a buggy condition.
+ *
+ * The following code is painful so just don't read it.  It really doesn't
+ * make much sense but seems to work.
+ */
+void
+mtx_lock(void)
+{
+	g_static_rec_mutex_lock(&my_gdk_mtx);
+	mtx_depth++;
+
+	if (mtx_depth <= 0) {
+		/* should not happen */
+		show_oops(NULL, "negative mutex locking bug, trying to "
+		    "correct");
+		fprintf(stderr, "negative mutex locking bug, trying to "
+		    "correct\n");
+		g_static_rec_mutex_unlock_full(&my_gdk_mtx);
+		g_static_rec_mutex_lock(&my_gdk_mtx);
+		mtx_depth = 1;
+		return;
+	}
+
+	if (mtx_depth != 1) {
+		/* decrease mutext depth to 1 */
+		do {
+			g_static_rec_mutex_unlock(&my_gdk_mtx);
+			mtx_depth--;
+		} while (mtx_depth > 1);
+	}
+}
+
+void
+mtx_unlock(void)
+{
+	guint x;
+
+	/* if mutex depth isn't 1 then something went bad */
+	if (mtx_depth != 1) {
+		x = g_static_rec_mutex_unlock_full(&my_gdk_mtx);
+		if (x != 1) {
+			/* should not happen */
+			show_oops(NULL, "mutex unlocking bug, trying to "
+			    "correct");
+			fprintf(stderr, "mutex unlocking bug, trying to "
+			    "correct\n");
+		}
+		mtx_depth = 0;
+		if (mtx_complain == 0) {
+			show_oops(NULL, "buggy mutex implementation detected, "
+			    "work around implemented");
+			fprintf(stderr, "buggy mutex implementation detected, "
+			    "work around implemented");
+			mtx_complain = 1;
+		}
+		return;
+	}
+
+	mtx_depth--;
+	g_static_rec_mutex_unlock(&my_gdk_mtx);
+}
+
+void
+welcome(void)
+{
+	startpage_add("<b>Welcome to xxxterm %s!</b><p>", version);
+	startpage_add("Beware that this is the final version that will use the"
+	    " xxxterm name.<br>Moving forward the browser will be called "
+	    "xombrero.<p>", version);
+	startpage_add("Details will soon appear on the "
+	    "<a href=https://opensource.conformal.com/wiki/xombrero>xombrero "
+	    "wiki page</a><p>");
+	startpage_add("Unfortunately scroogle has shut it's doors and due to "
+	   "that one has to edit search_string in ~/.xxxterm.conf.<br>"
+	   "There are various examples in the configuration file.<br>"
+	   "The authors of xxxterm are not in a position to suggest a search "
+	   "engine.");
+}
+
+int
+main(int argc, char **argv)
+{
+	struct stat		sb;
+	int			c, optn = 0, opte = 0, focus = 1;
+	char			conf[PATH_MAX] = { '\0' };
+	char			file[PATH_MAX];
+	char			sodversion[32];
+	char			*env_proxy = NULL;
+	FILE			*f = NULL;
+	struct karg		a;
+
+	start_argv = (char * const *)argv;
+
+	/* prepare gtk */
+#ifdef USE_THREADS
+	g_thread_init(NULL);
+	gdk_threads_set_lock_functions(mtx_lock, mtx_unlock);
+	gdk_threads_init();
+	gdk_threads_enter();
+
+	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+	gtk_init(&argc, &argv);
+
+	gnutls_global_init();
+
+	strlcpy(named_session, XT_SAVED_TABS_FILE, sizeof named_session);
+
+	RB_INIT(&hl);
+	RB_INIT(&js_wl);
+	RB_INIT(&pl_wl);
+	RB_INIT(&downloads);
+	RB_INIT(&st_tree);
+
+	TAILQ_INIT(&sessions);
+	TAILQ_INIT(&tabs);
+	TAILQ_INIT(&mtl);
+	TAILQ_INIT(&aliases);
+	TAILQ_INIT(&undos);
+	TAILQ_INIT(&kbl);
+	TAILQ_INIT(&spl);
+	TAILQ_INIT(&chl);
+	TAILQ_INIT(&shl);
+	TAILQ_INIT(&ua_list);
+
+#ifndef XT_RESOURCE_LIMITS_DISABLE
+	struct rlimit		rlp;
+	char			*cmd = NULL;
+	int			s;
+	GIOChannel		*channel;
+
+	/* fiddle with ulimits */
+	if (getrlimit(RLIMIT_NOFILE, &rlp) == -1)
+		warn("getrlimit");
+	else {
+		/* just use them all */
+		rlp.rlim_cur = rlp.rlim_max;
+		if (setrlimit(RLIMIT_NOFILE, &rlp) == -1)
+			warn("setrlimit");
+		if (getrlimit(RLIMIT_NOFILE, &rlp) == -1)
+			warn("getrlimit");
+		else if (rlp.rlim_cur <= 1024)
+			startpage_add("%s requires at least 1024 "
+			    "(2048 recommended) file " "descriptors, "
+			    "currently it has up to %d available",
+			   __progname, rlp.rlim_cur);
+	}
+#endif
+
+	while ((c = getopt(argc, argv, "STVf:s:tne")) != -1) {
+		switch (c) {
+		case 'S':
+			show_url = 0;
+			break;
+		case 'T':
+			show_tabs = 0;
+			break;
+		case 'V':
+#ifdef XXXTERM_BUILDSTR
+			errx(0 , "Version: %s Build: %s",
+			    version, XXXTERM_BUILDSTR);
+#else
+			errx(0 , "Version: %s", version);
+#endif
+			break;
+		case 'f':
+			strlcpy(conf, optarg, sizeof(conf));
+			break;
+		case 's':
+			strlcpy(named_session, optarg, sizeof(named_session));
+			break;
+		case 't':
+			tabless = 1;
+			break;
+		case 'n':
+			optn = 1;
+			break;
+		case 'e':
+			opte = 1;
+			break;
+		default:
+			usage();
+			/* NOTREACHED */
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	init_keybindings();
+
+	xtp_generate_keys();
+
+	/* XXX this hammer is way too big but treat all signaling the same */
+#ifndef XT_SIGNALS_DISABLE
+	/* signals */
+	struct sigaction	sact;
+
+	bzero(&sact, sizeof(sact));
+	sigemptyset(&sact.sa_mask);
+	sact.sa_handler = sigchild;
+	sact.sa_flags = SA_NOCLDSTOP;
+	sigaction(SIGCHLD, &sact, NULL);
+#endif
+
+	/* set download dir */
+	pwd = getpwuid(getuid());
+	if (pwd == NULL)
+		errx(1, "invalid user %d", getuid());
+	strlcpy(download_dir, pwd->pw_dir, sizeof download_dir);
+
+	/* compile buffer command regexes */
+	buffercmd_init();
+
+	/* set default string settings */
+	home = g_strdup("");
+	search_string = g_strdup("https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=%s");
+	resource_dir = g_strdup("/usr/share/xxxterm/");
+	strlcpy(runtime_settings, "runtime", sizeof runtime_settings);
+	cmd_font_name = g_strdup("monospace normal 9");
+	oops_font_name = g_strdup("monospace normal 9");
+	statusbar_font_name = g_strdup("monospace normal 9");
+	tabbar_font_name = g_strdup("monospace normal 9");
+	statusbar_elems = g_strdup("BP");
+	spell_check_languages = g_strdup("en_US");
+	encoding = g_strdup("UTF-8");
+
+	/* read config file */
+	if (strlen(conf) == 0)
+		snprintf(conf, sizeof conf, "%s" PS ".%s",
+		    pwd->pw_dir, XT_CONF_FILE);
+	config_parse(conf, 0);
+
+	/* init fonts */
+	cmd_font = pango_font_description_from_string(cmd_font_name);
+	oops_font = pango_font_description_from_string(oops_font_name);
+	statusbar_font = pango_font_description_from_string(statusbar_font_name);
+	tabbar_font = pango_font_description_from_string(tabbar_font_name);
+
+	/* working directory */
+	if (strlen(work_dir) == 0)
+		snprintf(work_dir, sizeof work_dir, "%s" PS "%s",
+		    pwd->pw_dir, XT_DIR);
+	xxx_dir(work_dir);
+
+	/* icon cache dir */
+	snprintf(cache_dir, sizeof cache_dir, "%s" PS "%s", work_dir, XT_CACHE_DIR);
+	xxx_dir(cache_dir);
+
+	/* certs dir */
+	snprintf(certs_dir, sizeof certs_dir, "%s" PS "%s", work_dir, XT_CERT_DIR);
+	xxx_dir(certs_dir);
+
+	/* sessions dir */
+	snprintf(sessions_dir, sizeof sessions_dir, "%s" PS "%s",
+	    work_dir, XT_SESSIONS_DIR);
+	xxx_dir(sessions_dir);
+
+	/* js dir */
+	snprintf(js_dir, sizeof js_dir, "%s" PS "%s", work_dir, XT_JS_DIR);
+	xxx_dir(js_dir);
+
+	/* temp dir */
+	snprintf(temp_dir, sizeof temp_dir, "%s" PS "%s", work_dir, XT_TEMP_DIR);
+	xxx_dir(temp_dir);
+
+	/* runtime settings that can override config file */
+	if (runtime_settings[0] != '\0')
+		config_parse(runtime_settings, 1);
+
+	/* download dir */
+	if (!strcmp(download_dir, pwd->pw_dir))
+		strlcat(download_dir, PS "downloads", sizeof download_dir);
+	xxx_dir(download_dir);
+
+	/* first start file */
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_SOD_FILE);
+	if (stat(file, &sb)) {
+		warnx("start of day file doesn't exist, creating it");
+		if ((f = fopen(file, "w")) == NULL)
+			err(1, "startofday");
+		if (fputs(version, f) == EOF)
+			err(1, "fputs");
+		fclose(f);
+
+		/* welcome user */
+		welcome();
+	} else {
+		if ((f = fopen(file, "r+")) == NULL)
+			err(1, "startofday");
+		if (fgets(sodversion, sizeof sodversion, f) == NULL)
+			err(1, "fgets");
+		sodversion[strcspn(sodversion, "\n")] = '\0';
+		if (strcmp(version, sodversion)) {
+			rewind(f);
+			if (fputs(version, f) == EOF)
+				err(1, "fputs");
+
+			/* upgrade, say something smart */
+			welcome();
+		}
+		fclose(f);
+	}
+
+	/* favorites file */
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_FAVS_FILE);
+	if (stat(file, &sb)) {
+		warnx("favorites file doesn't exist, creating it");
+		if ((f = fopen(file, "w")) == NULL)
+			err(1, "favorites");
+		fclose(f);
+	}
+
+	/* quickmarks file */
+	snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_QMARKS_FILE);
+	if (stat(file, &sb)) {
+		warnx("quickmarks file doesn't exist, creating it");
+		if ((f = fopen(file, "w")) == NULL)
+			err(1, "quickmarks");
+		fclose(f);
+	}
+
+	/* search history */
+	if (history_autosave) {
+		snprintf(search_file, sizeof search_file, "%s" PS "%s",
+		    work_dir, XT_SEARCH_FILE);
+		if (stat(search_file, &sb)) {
+			warnx("search history file doesn't exist, creating it");
+			if ((f = fopen(search_file, "w")) == NULL)
+				err(1, "search_history");
+			fclose(f);
+		}
+		history_read(&shl, search_file, &search_history_count);
+	}
+
+	/* command history */
+	if (history_autosave) {
+		snprintf(command_file, sizeof command_file, "%s" PS "%s",
+		    work_dir, XT_COMMAND_FILE);
+		if (stat(command_file, &sb)) {
+			warnx("command history file doesn't exist, creating it");
+			if ((f = fopen(command_file, "w")) == NULL)
+				err(1, "command_history");
+			fclose(f);
+		}
+		history_read(&chl, command_file, &cmd_history_count);
+	}
+
+	/* cookies */
+	session = webkit_get_default_session();
+	setup_cookies();
+
+	/* certs */
+	if (ssl_ca_file) {
+		if (stat(ssl_ca_file, &sb)) {
+			warnx("no CA file: %s", ssl_ca_file);
+			g_free(ssl_ca_file);
+			ssl_ca_file = NULL;
+		} else
+			g_object_set(session,
+			    SOUP_SESSION_SSL_CA_FILE, ssl_ca_file,
+			    SOUP_SESSION_SSL_STRICT, ssl_strict_certs,
+			    (void *)NULL);
+	}
+
+	/* guess_search regex */
+	if (url_regex == NULL)
+		url_regex = g_strdup(XT_URL_REGEX);
+	if (url_regex)
+		if (regcomp(&url_re, url_regex, REG_EXTENDED | REG_NOSUB))
+			startpage_add("invalid url regex %s", url_regex);
+
+	/* proxy */
+	env_proxy = getenv("http_proxy");
+	if (env_proxy)
+		setup_proxy(env_proxy);
+	else {
+		env_proxy = getenv("HTTP_PROXY");
+		if (env_proxy)
+			setup_proxy(env_proxy);
+		else
+			setup_proxy(http_proxy);
+	}
+#ifndef XT_SOCKET_DISABLE
+	if (opte) {
+		send_cmd_to_socket(argv[0]);
+		exit(0);
+	}
+#else
+	opte = opte; /* shut mingw up */
+#endif
+	/* set some connection parameters */
+	g_object_set(session, "max-conns", max_connections, (char *)NULL);
+	g_object_set(session, "max-conns-per-host", max_host_connections,
+	    (char *)NULL);
+
+	g_signal_connect(session, "request-queued", G_CALLBACK(session_rq_cb),
+	    NULL);
+
+#ifndef XT_SOCKET_DISABLE
+	/* see if there is already an xxxterm running */
+	if (single_instance && is_running()) {
+		optn = 1;
+		warnx("already running");
+	}
+
+	if (optn) {
+		while (argc) {
+			cmd = g_strdup_printf("%s %s", "tabnew", argv[0]);
+			send_cmd_to_socket(cmd);
+			if (cmd)
+				g_free(cmd);
+
+			argc--;
+			argv++;
+		}
+		exit(0);
+	}
+#else
+	optn = optn; /* shut mingw up */
+#endif
+	/* tld list */
+	tld_tree_init();
+
+	if (enable_strict_transport)
+		strict_transport_init();
+
+	/* uri completion */
+	completion_model = gtk_list_store_new(1, G_TYPE_STRING);
+
+	/* buffers */
+	buffers_store = gtk_list_store_new
+	    (NUM_COLS, G_TYPE_UINT, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+	qmarks_load();
+
+	/* go graphical */
+	create_canvas();
+	notebook_tab_set_visibility();
+
+	if (save_global_history)
+		restore_global_history();
+
+	/* restore session list */
+	restore_sessions_list();
+
+	if (!strcmp(named_session, XT_SAVED_TABS_FILE))
+		restore_saved_tabs();
+	else {
+		a.s = named_session;
+		a.i = XT_SES_DONOTHING;
+		open_tabs(NULL, &a);
+	}
+
+	/* see if we have an exception */
+	if (!TAILQ_EMPTY(&spl)) {
+		create_new_tab("about:startpage", NULL, focus, -1);
+		focus = 0;
+	}
+
+	while (argc) {
+		create_new_tab(argv[0], NULL, focus, -1);
+		focus = 0;
+
+		argc--;
+		argv++;
+	}
+
+	if (TAILQ_EMPTY(&tabs))
+		create_new_tab(home, NULL, 1, -1);
+#ifndef XT_SOCKET_DISABLE
+	if (enable_socket)
+		if ((s = build_socket()) != -1) {
+			channel = g_io_channel_unix_new(s);
+			g_io_add_watch(channel, G_IO_IN, socket_watcher, NULL);
+		}
+#endif
+
+	gtk_main();
+
+#ifdef USE_THREADS
+	gdk_threads_leave();
+	g_static_rec_mutex_unlock_full(&my_gdk_mtx); /* just in case */
+#endif
+
+	gnutls_global_deinit();
+
+	if (url_regex)
+		regfree(&url_re);
+
+	return (0);
+}
diff --git a/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.h b/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.h
new file mode 100644
index 0000000..38d9cfc
--- /dev/null
+++ b/.pc/0007-Unnecessary-gcrypt-requirement.diff/xxxterm.h
@@ -0,0 +1,681 @@
+/*
+ * Copyright (c) 2011 Conformal Systems LLC <info@conformal.com>
+ * Copyright (c) 2011 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2010, 2011, 2012 Edd Barrett <vext01@gmail.com>
+ *
+ * Permission to use, copy, modify, and 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.
+ */
+
+#include <ctype.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <libgen.h>
+#include <pwd.h>
+#include <regex.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <inttypes.h>
+
+#include <sys/types.h>
+#if defined(__linux__)
+#include "linux/util.h"
+#include "linux/tree.h"
+#include <bsd/stdlib.h>
+# if !defined(sane_libbsd_headers)
+void		arc4random_buf(void *, size_t);
+u_int32_t	arc4random_uniform(u_int32_t);
+# endif
+#elif defined(__FreeBSD__)
+#include <libutil.h>
+#include "freebsd/util.h"
+#include <sys/tree.h>
+#elif defined(__OpenBSD__)
+#include <util.h>
+#include <sys/tree.h>
+#else
+void		arc4random_buf(void *, size_t);
+u_int32_t	arc4random_uniform(u_int32_t);
+#include "util.h"
+#include "tree.h"
+#endif
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/un.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#if GTK_CHECK_VERSION(3,0,0)
+/* we still use GDK_* instead of GDK_KEY_* */
+#include <gdk/gdkkeysyms-compat.h>
+#endif
+
+#include <webkit/webkit.h>
+#include <libsoup/soup.h>
+#include <JavaScriptCore/JavaScript.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+
+/* comment if you don't want to use threads */
+#define USE_THREADS
+
+#ifdef USE_THREADS
+#include <gcrypt.h>
+#include <pthread.h>
+#endif
+
+/* set if you don't want to use signals */
+#ifndef XT_SIGNALS_DISABLE
+#include <sys/wait.h>
+#endif
+
+/* set if you don't want to use resource limits */
+#ifndef XT_RESOURCE_LIMITS_DISABLE
+#include <sys/resource.h>
+#endif
+
+#include "javascript.h"
+/*
+javascript.h borrowed from vimprobable2 under the following license:
+
+Copyright (c) 2009 Leon Winter
+Copyright (c) 2009-2011 Hannes Schueller
+Copyright (c) 2009-2010 Matto Fransen
+Copyright (c) 2010-2011 Hans-Peter Deifel
+Copyright (c) 2010-2011 Thomas Adam
+Copyright (c) 2011 Albert Kim
+Copyright (c) 2011 Daniel Carl
+
+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.
+*/
+
+/*#define XT_DEBUG*/
+#ifdef XT_DEBUG
+#define DPRINTF(x...)		do { if (swm_debug) fprintf(stderr, x); } while (0)
+#define DNPRINTF(n,x...)	do { if (swm_debug & n) fprintf(stderr, x); } while (0)
+#define XT_D_MOVE		0x0001
+#define XT_D_KEY		0x0002
+#define XT_D_TAB		0x0004
+#define XT_D_URL		0x0008
+#define XT_D_CMD		0x0010
+#define XT_D_NAV		0x0020
+#define XT_D_DOWNLOAD		0x0040
+#define XT_D_CONFIG		0x0080
+#define XT_D_JS			0x0100
+#define XT_D_FAVORITE		0x0200
+#define XT_D_PRINTING		0x0400
+#define XT_D_COOKIE		0x0800
+#define XT_D_KEYBINDING		0x1000
+#define XT_D_CLIP		0x2000
+#define XT_D_BUFFERCMD		0x4000
+#define XT_D_INSPECTOR		0x8000
+#define XT_D_VISITED		0x10000
+#define XT_D_HISTORY		0x20000
+extern uint32_t	swm_debug;
+#else
+#define DPRINTF(x...)
+#define DNPRINTF(n,x...)
+#endif
+
+#define LENGTH(x)		(sizeof x / sizeof x[0])
+#define CLEAN(mask)		(mask & ~(GDK_MOD2_MASK) &	\
+				    ~(GDK_BUTTON1_MASK) &	\
+				    ~(GDK_BUTTON2_MASK) &	\
+				    ~(GDK_BUTTON3_MASK) &	\
+				    ~(GDK_BUTTON4_MASK) &	\
+				    ~(GDK_BUTTON5_MASK))
+
+#define XT_NOMARKS		(('z' - 'a' + 1) * 2 + 10)
+
+/* Path Separator */
+#ifndef	PS
+#define PS			"/"
+#endif
+
+struct tab {
+	TAILQ_ENTRY(tab)	entry;
+	GtkWidget		*vbox;
+	GtkWidget		*tab_content;
+	struct {
+		GtkWidget	*label;
+		GtkWidget	*favicon;
+		GtkWidget	*eventbox;
+		GtkWidget	*box;
+		GtkWidget	*sep;
+	} tab_elems;
+	GtkWidget		*label;
+	GtkWidget		*spinner;
+	GtkWidget		*uri_entry;
+	GtkWidget		*search_entry;
+	GtkWidget		*toolbar;
+	GtkWidget		*browser_win;
+	GtkWidget		*statusbar_box;
+	struct {
+		GtkWidget	*statusbar;
+		GtkWidget	*buffercmd;
+		GtkWidget	*zoom;
+		GtkWidget	*position;
+	} sbe;
+	GtkWidget		*cmd;
+	GtkWidget		*buffers;
+	GtkWidget		*oops;
+	GtkWidget		*backward;
+	GtkWidget		*forward;
+	GtkWidget		*stop;
+	GtkWidget		*gohome;
+	GtkWidget		*js_toggle;
+	GtkEntryCompletion	*completion;
+	guint			tab_id;
+	WebKitWebView		*wv;
+
+	WebKitWebHistoryItem		*item;
+	WebKitWebBackForwardList	*bfl;
+
+	/* favicon */
+	WebKitNetworkRequest	*icon_request;
+	WebKitDownload		*icon_download;
+	gchar			*icon_dest_uri;
+
+	/* adjustments for browser */
+	GtkScrollbar		*sb_h;
+	GtkScrollbar		*sb_v;
+	GtkAdjustment		*adjust_h;
+	GtkAdjustment		*adjust_v;
+
+	/* flags */
+	int			mode;
+#define XT_MODE_COMMAND		(0)
+#define XT_MODE_INSERT		(1)
+#define XT_MODE_HINT		(2)
+#define XT_MODE_PASSTHROUGH	(3)
+	int			(*mode_cb)(struct tab *, GdkEventKey *, gpointer);
+	gpointer		mode_cb_data;
+	int			focus_wv;
+	int			ctrl_click;
+	gchar			*status;
+	int			xtp_meaning; /* identifies dls/favorites */
+	gchar			*tmp_uri;
+	int			popup; /* 1 if cmd_entry has popup visible */
+#ifdef USE_THREADS
+	/* https thread stuff */
+	GThread			*thread;
+#endif
+	/* hints */
+	int			script_init;
+	int			new_tab;
+
+	/* custom stylesheet */
+	int			styled;
+	char			*stylesheet;
+
+	/* search */
+	char			*search_text;
+	int			search_forward;
+	guint			search_id;
+
+	/* settings */
+	WebKitWebSettings	*settings;
+	gchar			*user_agent;
+	gboolean		load_images;
+
+	/* marks */
+	double			mark[XT_NOMARKS];
+
+	/* inspector */
+	WebKitWebInspector	*inspector;
+	GtkWidget		*inspector_window;
+	GtkWidget		*inspector_view;
+};
+TAILQ_HEAD(tab_list, tab);
+
+struct karg {
+	int		i;
+	char		*s;
+	int		precount;
+};
+
+struct download {
+	RB_ENTRY(download)	entry;
+	int			id;
+	WebKitDownload		*download;
+	struct tab		*tab;
+};
+RB_HEAD(download_list, download);
+RB_PROTOTYPE(download_list, download, entry, download_rb_cmp);
+
+struct history {
+	RB_ENTRY(history)	entry;
+	gchar			*uri;
+	gchar			*title;
+	time_t			time; /* When the item was added. */
+};
+RB_HEAD(history_list, history);
+RB_PROTOTYPE(history_list, history, entry, history_rb_cmp);
+
+#define XT_STS_FLAGS_INCLUDE_SUBDOMAINS		(1)
+#define XT_STS_FLAGS_EXPAND			(2)
+#define XT_STS_FILE				("strict-transport")
+
+struct strict_transport {
+	RB_ENTRY(strict_transport)	entry;
+	gchar				*host;
+	time_t				timeout;
+	int				flags;
+};
+RB_HEAD(strict_transport_tree, strict_transport);
+RB_PROTOTYPE(strict_transport_tree, strict_transport, entry, strict_transport_rb_cmp);
+
+/* utility */
+#define XT_NAME			("XXXTerm")
+#define XT_CB_HANDLED		(TRUE)
+#define XT_CB_PASSTHROUGH	(FALSE)
+#define XT_FAVS_FILE		("favorites")
+#define XT_SOD_FILE		("startofday")
+
+int			run_script(struct tab *, char *);
+void			xt_icon_from_file(struct tab *, char *);
+GtkWidget		*create_window(const gchar *);
+void			show_oops(struct tab *, const char *, ...);
+gchar			*get_html_page(gchar *, gchar *, gchar *, bool);
+const gchar		*get_uri(struct tab *);
+const gchar		*get_title(struct tab *, bool);
+void			load_uri(struct tab *t, gchar *uri);
+gboolean		match_uri(const gchar *uri, const gchar *key);
+int			valid_url_type(char *);
+
+void			load_webkit_string(struct tab *, const char *, gchar *);
+void			button_set_stockid(GtkWidget *, char *);
+
+/* cookies */
+int			remove_cookie(int);
+int			remove_cookie_domain(int);
+int			remove_cookie_all(void);
+void			print_cookie(char *msg, SoupCookie *);
+void			setup_cookies(void);
+
+/* history */
+int			insert_history_item(const gchar *uri, const gchar *title, time_t time);
+int			save_global_history_to_disk(struct tab *t);
+int			restore_global_history(void);
+char			*color_visited_helper(void);
+int			color_visited(struct tab *t, char *visited);
+
+/* completion */
+void			completion_add(struct tab *);
+void			completion_add_uri(const gchar *uri);
+
+/* external editor */
+#define XT_EE_BUFSZ	(64 * 1024)
+int			edit_src(struct tab *t, struct karg *args);
+int			edit_element(struct tab *t, struct karg *a);
+
+/* proxy */
+#define XT_PRXY_SHOW		(1<<0)
+#define XT_PRXY_TOGGLE		(1<<1)
+
+/* inspector */
+#define XT_INS_SHOW		(1<<0)
+#define XT_INS_HIDE		(1<<1)
+#define XT_INS_CLOSE		(1<<2)
+
+WebKitWebView*		inspector_inspect_web_view_cb(WebKitWebInspector *,
+			    WebKitWebView*, struct tab *);
+void			setup_inspector(struct tab *);
+int			inspector_cmd(struct tab *, struct karg *);
+
+/* tld public suffix */
+void			tld_tree_init();
+char			*tld_get_suffix(const char *);
+
+/* about */
+#define XT_XTP_STR		"xxxt://"
+#define XT_URI_ABOUT		("about:")
+#define XT_URI_ABOUT_LEN	(strlen(XT_URI_ABOUT))
+#define XT_URI_ABOUT_ABOUT	("about")
+#define XT_URI_ABOUT_ALLTHETHINGS ("allthethings")
+#define XT_URI_ABOUT_BLANK	("blank")
+#define XT_URI_ABOUT_CERTS	("certs")
+#define XT_URI_ABOUT_COOKIEWL	("cookiewl")
+#define XT_URI_ABOUT_COOKIEJAR	("cookiejar")
+#define XT_URI_ABOUT_DOWNLOADS	("downloads")
+#define XT_URI_ABOUT_FAVORITES	("favorites")
+#define XT_URI_ABOUT_HELP	("help")
+#define XT_URI_ABOUT_HISTORY	("history")
+#define XT_URI_ABOUT_JSWL	("jswl")
+#define XT_URI_ABOUT_PLUGINWL	("plwl")
+#define XT_URI_ABOUT_SET	("set")
+#define XT_URI_ABOUT_STATS	("stats")
+#define XT_URI_ABOUT_MARCO	("marco")
+#define XT_URI_ABOUT_STARTPAGE	("startpage")
+#define XT_URI_ABOUT_WEBKIT	("webkit")
+
+struct about_type {
+	char		*name;
+	int		(*func)(struct tab *, struct karg *);
+};
+
+struct sp {
+	char			*line;
+	TAILQ_ENTRY(sp)		entry;
+};
+TAILQ_HEAD(sp_list, sp);
+
+int			blank(struct tab *, struct karg *);
+int			help(struct tab *, struct karg *);
+int			about(struct tab *, struct karg *);
+int			stats(struct tab *, struct karg *);
+void			show_certs(struct tab *, gnutls_x509_crt_t *,
+			    size_t, char *);
+int			ca_cmd(struct tab *, struct karg *);
+int			cookie_show_wl(struct tab *, struct karg *);
+int			xtp_page_cl(struct tab *, struct karg *);
+int			xtp_page_dl(struct tab *, struct karg *);
+int			xtp_page_fl(struct tab *, struct karg *);
+int			xtp_page_hl(struct tab *, struct karg *);
+int			parse_xtp_url(struct tab *, const char *);
+int			add_favorite(struct tab *, struct karg *);
+void			update_favorite_tabs(struct tab *);
+void			update_history_tabs(struct tab *);
+void			update_download_tabs(struct tab *);
+void			xtp_generate_keys(void);
+size_t			about_list_size(void);
+int			cookie_cmd(struct tab *, struct karg *);
+int			js_cmd(struct tab *, struct karg *);
+int			pl_cmd(struct tab *, struct karg *);
+void			startpage_add(const char *, ...);
+
+/*
+ * xtp tab meanings
+ * identifies which tabs have xtp pages in (corresponding to about_list indices)
+ */
+#define XT_XTP_TAB_MEANING_NORMAL	(-1) /* normal url */
+#define XT_XTP_TAB_MEANING_BL		(1)  /* about:blank in this tab */
+#define XT_XTP_TAB_MEANING_CL		(4)  /* cookie manager in this tab */
+#define XT_XTP_TAB_MEANING_DL		(5)  /* download manager in this tab */
+#define XT_XTP_TAB_MEANING_FL		(6)  /* favorite manager in this tab */
+#define XT_XTP_TAB_MEANING_HL		(8)  /* history manager in this tab */
+
+/* whitelists */
+#define XT_WL_TOGGLE		(1<<0)
+#define XT_WL_ENABLE		(1<<1)
+#define XT_WL_DISABLE		(1<<2)
+#define XT_WL_FQDN		(1<<3) /* default */
+#define XT_WL_TOPLEVEL		(1<<4)
+#define XT_WL_PERSISTENT	(1<<5)
+#define XT_WL_SESSION		(1<<6)
+#define XT_WL_RELOAD		(1<<7)
+#define XT_SHOW			(1<<8)
+#define XT_DELETE		(1<<9)
+#define XT_SAVE			(1<<10)
+#define XT_OPEN			(1<<11)
+
+#define XT_WL_INVALID		(0)
+#define XT_WL_JAVASCRIPT	(1)
+#define XT_WL_COOKIE		(2)
+#define XT_WL_PLUGIN		(3)
+
+struct domain {
+	RB_ENTRY(domain)	entry;
+	gchar			*d;
+	int			handy; /* app use */
+};
+RB_HEAD(domain_list, domain);
+RB_PROTOTYPE(domain_list, domain, entry, domain_rb_cmp);
+
+int			wl_show(struct tab *, struct karg *, char *,
+			    struct domain_list *);
+
+/* uri aliases */
+struct alias {
+	char			*a_name;
+	char			*a_uri;
+	TAILQ_ENTRY(alias)	 entry;
+};
+TAILQ_HEAD(alias_list, alias);
+
+/* mime types */
+struct mime_type {
+	char			*mt_type;
+	char			*mt_action;
+	int			mt_default;
+	int			mt_download;
+	TAILQ_ENTRY(mime_type)	entry;
+};
+TAILQ_HEAD(mime_type_list, mime_type);
+
+struct domain *	wl_find(const gchar *, struct domain_list *);
+int		wl_save(struct tab *, struct karg *, int);
+int		toggle_cwl(struct tab *, struct karg *);
+int		toggle_js(struct tab *, struct karg *);
+int		toggle_pl(struct tab *, struct karg *);
+
+/* input autofocus */
+void		input_autofocus(struct tab *);
+void		input_focus_blur(struct tab *, void *);
+void		*input_check_mode(struct tab *);
+int		command_mode(struct tab *, struct karg *);
+
+/* OS specific */
+int		fork_exec(struct tab *, char *, const gchar *, char *, int);
+
+/* settings */
+#define XT_BM_NORMAL		(0)
+#define XT_BM_WHITELIST		(1)
+#define XT_BM_KIOSK		(2)
+
+#define XT_GM_CLASSIC		(0)
+#define XT_GM_MINIMAL		(1)
+
+#define XT_TABS_NORMAL		(0)
+#define XT_TABS_COMPACT		(1)
+
+#define XT_EM_HYBRID		(0)
+#define XT_EM_VI		(1)
+
+#define XT_DM_START		(0)
+#define XT_DM_ASK		(1)
+#define XT_DM_ADD		(2)
+
+#define XT_REFERER_ALWAYS	(0)
+#define XT_REFERER_NEVER	(1)
+#define XT_REFERER_SAME_DOMAIN	(2)
+#define XT_REFERER_CUSTOM	(3)
+
+#define CTRL			GDK_CONTROL_MASK
+#define MOD1			GDK_MOD1_MASK
+#define SHFT			GDK_SHIFT_MASK
+
+struct key_binding {
+	char				*cmd;
+	guint				mask;
+	guint				use_in_entry;
+	guint				key;
+	TAILQ_ENTRY(key_binding)	entry;	/* in bss so no need to init */
+};
+TAILQ_HEAD(keybinding_list, key_binding);
+
+struct user_agent {
+	char *value;
+	TAILQ_ENTRY(user_agent)	entry;
+};
+TAILQ_HEAD(user_agent_list, user_agent);
+
+struct settings {
+	char		*name;
+	int		type;
+#define XT_S_INVALID	(0)
+#define XT_S_INT	(1)
+#define XT_S_STR	(2)
+#define XT_S_FLOAT	(3)
+	uint32_t	flags;
+#define XT_SF_RESTART	(1<<0)
+#define XT_SF_RUNTIME	(1<<1)
+	int		*ival;
+	char		**sval;
+	struct special	*s;
+	gfloat		*fval;
+	int		(*activate)(char *);
+};
+
+int		set(struct tab *, struct karg *);
+size_t		get_settings_size(void);
+int		settings_add(char *, char *);
+void		setup_proxy(char *);
+int		set_browser_mode(struct settings *, char *);
+int		set_gui_mode(struct settings *, char *);
+int		set_cookie_policy(struct settings *, char *);
+char		*get_browser_mode(struct settings *);
+char		*get_gui_mode(struct settings *);
+char		*get_cookie_policy(struct settings *);
+void		init_keybindings(void);
+void		config_parse(char *, int);
+char		*get_setting_name(int);
+
+#define		XT_DL_START	(0)
+#define		XT_DL_RESTART	(1)
+int		download_start(struct tab *, struct download *, int flag);
+
+extern int	tabless;
+extern int	enable_socket;
+extern int	single_instance;
+extern int	fancy_bar;
+extern int	browser_mode;
+extern int	enable_localstorage;
+extern char	*statusbar_elems;
+
+extern int	show_tabs;
+extern int	tab_style;
+extern int	show_url;
+extern int	show_statusbar;
+extern int	ctrl_click_focus;
+extern int	cookies_enabled;
+extern int	read_only_cookies;
+extern int	enable_scripts;
+extern int	enable_plugins;
+extern gfloat	default_zoom_level;
+extern char	default_script[PATH_MAX];
+extern int	window_height;
+extern int	window_width;
+extern int	window_maximize;
+extern int	icon_size;
+extern int	refresh_interval;
+extern int	enable_plugin_whitelist;
+extern int	enable_cookie_whitelist;
+extern int	enable_js_whitelist;
+extern int	session_timeout;
+extern int	cookie_policy;
+extern char	*ssl_ca_file;
+extern char	*resource_dir;
+extern gboolean	ssl_strict_certs;
+extern gboolean	enable_strict_transport;
+extern int	append_next;
+extern char	*home;
+extern char	*search_string;
+extern char	*http_proxy;
+extern char	*external_editor;
+extern char	download_dir[PATH_MAX];
+extern int	download_mode;
+extern char	runtime_settings[PATH_MAX];
+extern int	allow_volatile_cookies;
+extern int	color_visited_uris;
+extern int	save_global_history;
+extern struct user_agent	*user_agent;
+extern int	save_rejected_cookies;
+extern int	session_autosave;
+extern int	guess_search;
+extern int	dns_prefetch;
+extern gint	max_connections;
+extern gint	max_host_connections;
+extern gint	enable_spell_checking;
+extern char	*spell_check_languages;
+extern int	xterm_workaround;
+extern char	*url_regex;
+extern int	history_autosave;
+extern char	search_file[PATH_MAX];
+extern char	command_file[PATH_MAX];
+extern char	*encoding;
+extern int	autofocus_onload;
+extern int	js_autorun_enabled;
+extern char	*cmd_font_name;
+extern char	*oops_font_name;
+extern char	*statusbar_font_name;
+extern char	*tabbar_font_name;
+extern int	edit_mode;
+extern int	userstyle_global;
+extern int	auto_load_images;
+extern int	enable_autoscroll;
+extern int	enable_favicon_entry;
+extern int	enable_favicon_tabs;
+extern int	referer_mode;
+extern char	*referer_custom;
+
+/* globals */
+extern char		*version;
+extern char		*icons[];
+extern char		rc_fname[PATH_MAX];
+extern char		work_dir[PATH_MAX];
+extern char		temp_dir[PATH_MAX];
+extern struct passwd	*pwd;
+extern SoupCookieJar	*s_cookiejar;
+extern SoupCookieJar	*p_cookiejar;
+extern SoupSession	*session;
+extern GtkNotebook	*notebook;
+extern GtkListStore	*completion_model;
+extern uint64_t		blocked_cookies;
+
+extern void	(*_soup_cookie_jar_add_cookie)(SoupCookieJar *, SoupCookie *);
+
+extern struct history_list	hl;
+extern int			hl_purge_count;
+extern struct download_list	downloads;
+extern struct tab_list		tabs;
+extern struct about_type	about_list[];
+extern struct domain_list	c_wl;
+extern struct domain_list	js_wl;
+extern struct domain_list	pl_wl;
+extern struct strict_transport_tree	st_tree;
+extern struct alias_list	aliases;
+extern struct mime_type_list	mtl;
+extern struct keybinding_list	kbl;
+extern struct sp_list		spl;
+extern struct user_agent_list	ua_list;
+extern int			user_agent_count;
+
+extern PangoFontDescription	*cmd_font;
+extern PangoFontDescription	*oops_font;
+extern PangoFontDescription	*statusbar_font;
+extern PangoFontDescription	*tabbar_font;
diff --git a/.pc/applied-patches b/.pc/applied-patches
index e146284..294ca73 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -4,3 +4,4 @@
 0004-Fix-lintian-error-hyphen-used-as-minus-sign.patch
 0005-Fix-Icon-path-in-desktop-file.patch
 0006-Add-missing-includes.patch
+0007-Unnecessary-gcrypt-requirement.diff
diff --git a/debian/changelog b/debian/changelog
index af1394b..5bd3458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xxxterm (1:1.11.3-1.3) unstable; urgency=medium
+
+  [ Andreas Metzler ]
+  * 0007-Unnecessary-gcrypt-requirement.diff: Only link against and #include
+    gcrypt for gnutls < 2.12.
+
+  [ Dimitri John Ledkov ]
+  * Non-maintainer upload.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sat, 17 May 2014 02:09:26 +0100
+
 xxxterm (1:1.11.3-1.2) unstable; urgency=medium
 
   * Non-maintainer upload
diff --git a/debian/patches/0007-Unnecessary-gcrypt-requirement.diff b/debian/patches/0007-Unnecessary-gcrypt-requirement.diff
new file mode 100644
index 0000000..36ec5ff
--- /dev/null
+++ b/debian/patches/0007-Unnecessary-gcrypt-requirement.diff
@@ -0,0 +1,54 @@
+Description: Drop unnecessary gcrypt requirement
+ Only link against and #include gcrypt for gnutls < 2.12.
+Author: Andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Last-Update: 2014-04-27
+
+--- xxxterm-1.11.3.orig/linux/Makefile
++++ xxxterm-1.11.3/linux/Makefile
+@@ -1,7 +1,8 @@
+ LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4 gnutls gthread-2.0
+ 
++REQUIREGCRYPT := $(shell if pkg-config --exists 'gnutls < 2.12' ; then echo "-lgcrypt" ; fi )
+ CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS))
+-LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl -lgcrypt
++LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl $(REQUIREGCRYPT)
+ 
+ PREFIX?= /usr/local
+ BINDIR?= $(PREFIX)/bin
+--- xxxterm-1.11.3.orig/xxxterm.c
++++ xxxterm-1.11.3/xxxterm.c
+@@ -49,8 +49,10 @@ uint32_t		swm_debug = 0
+ #endif
+ 
+ #ifdef USE_THREADS
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ #endif
++#endif
+ 
+ char		*icons[] = {
+ 	"xxxtermicon16.png",
+@@ -7602,8 +7604,10 @@ main(int argc, char **argv)
+ 	gdk_threads_init();
+ 	gdk_threads_enter();
+ 
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+ #endif
++#endif
+ 	gtk_init(&argc, &argv);
+ 
+ 	gnutls_global_init();
+--- xxxterm-1.11.3.orig/xxxterm.h
++++ xxxterm-1.11.3/xxxterm.h
+@@ -78,7 +78,9 @@ u_int32_t	arc4random_uniform(u_int32_t);
+ #define USE_THREADS
+ 
+ #ifdef USE_THREADS
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ #include <gcrypt.h>
++#endif
+ #include <pthread.h>
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e146284..294ca73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Fix-lintian-error-hyphen-used-as-minus-sign.patch
 0005-Fix-Icon-path-in-desktop-file.patch
 0006-Add-missing-includes.patch
+0007-Unnecessary-gcrypt-requirement.diff
diff --git a/linux/Makefile b/linux/Makefile
index 68ad52a..b8ebe9c 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,7 +1,8 @@
 LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4 gnutls gthread-2.0
 
+REQUIREGCRYPT := $(shell if pkg-config --exists 'gnutls < 2.12' ; then echo "-lgcrypt" ; fi )
 CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS))
-LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl -lgcrypt
+LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl $(REQUIREGCRYPT)
 
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
diff --git a/xxxterm.c b/xxxterm.c
index 26c6987..91adff8 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -49,8 +49,10 @@ uint32_t		swm_debug = 0
 #endif
 
 #ifdef USE_THREADS
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
+#endif
 
 char		*icons[] = {
 	"xxxtermicon16.png",
@@ -7602,8 +7604,10 @@ main(int argc, char **argv)
 	gdk_threads_init();
 	gdk_threads_enter();
 
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #endif
+#endif
 	gtk_init(&argc, &argv);
 
 	gnutls_global_init();
diff --git a/xxxterm.h b/xxxterm.h
index 38d9cfc..a1185be 100644
--- a/xxxterm.h
+++ b/xxxterm.h
@@ -78,7 +78,9 @@ u_int32_t	arc4random_uniform(u_int32_t);
 #define USE_THREADS
 
 #ifdef USE_THREADS
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
 #include <gcrypt.h>
+#endif
 #include <pthread.h>
 #endif