X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=cd01b8336784ddcfbd78177b7851723d8d975831;hb=0415175e10880585c765613af0bd43e02de87116;hp=1ccb1cc4c4e533399db4170c5fa3c3dffac1ebf9;hpb=08b45f411a39c07e5e0751c75abf5323c3c888d7;p=surf.git

diff --git a/surf.c b/surf.c
index 1ccb1cc..682c1e2 100644
--- a/surf.c
+++ b/surf.c
@@ -2,6 +2,7 @@
  *
  * To understand surf, start reading main().
  */
+#include <signal.h>
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <gtk/gtk.h>
@@ -9,459 +10,1203 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
-#include <getopt.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <webkit/webkit.h>
+#include <glib/gstdio.h>
+#include <JavaScriptCore/JavaScript.h>
+#include <sys/file.h>
+#include <libgen.h>
+#include <stdarg.h>
 
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#include "arg.h"
+
+char *argv0;
+
+#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define CLEANMASK(mask)		(mask & (MODKEY|GDK_SHIFT_MASK))
+#define COOKIEJAR_TYPE          (cookiejar_get_type ())
+#define COOKIEJAR(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar))
+
+enum { AtomFind, AtomGo, AtomUri, AtomLast };
+
+typedef union Arg Arg;
+union Arg {
+	gboolean b;
+	gint i;
+	const void *v;
+};
 
-Display *dpy;
-Atom urlprop;
 typedef struct Client {
-	GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
+	GtkWidget *win, *scroll, *vbox, *indicator;
 	WebKitWebView *view;
-	gchar *title;
+	WebKitWebInspector *inspector;
+	char *title, *linkhover;
+	const char *uri, *needle;
 	gint progress;
 	struct Client *next;
+	gboolean zoomed, fullscreen, isinspector, sslfailed;
 } Client;
-Client *clients = NULL;
-gboolean embed = FALSE;
-gboolean showxid = FALSE;
-gboolean ignore_once = FALSE;
-extern char *optarg;
-extern int optind;
 
+typedef struct {
+	char *label;
+	void (*func)(Client *c, const Arg *arg);
+	const Arg arg;
+} Item;
+
+typedef struct {
+	guint mod;
+	guint keyval;
+	void (*func)(Client *c, const Arg *arg);
+	const Arg arg;
+} Key;
+
+typedef struct {
+	SoupCookieJarText parent_instance;
+	int lock;
+} CookieJar;
+
+typedef struct {
+	SoupCookieJarTextClass parent_class;
+} CookieJarClass;
+
+G_DEFINE_TYPE(CookieJar, cookiejar, SOUP_TYPE_COOKIE_JAR_TEXT)
+
+static Display *dpy;
+static Atom atoms[AtomLast];
+static Client *clients = NULL;
+static GdkNativeWindow embed = 0;
+static gboolean showxid = FALSE;
+static char winid[64];
+static gboolean usingproxy = 0;
+static char togglestat[5];
+
+static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
+		WebKitWebResource *r, WebKitNetworkRequest *req,
+		WebKitNetworkResponse *resp, gpointer d);
+static char *buildpath(const char *path);
+static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e,
+		GList *gl);
 static void cleanup(void);
-static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f,
+static void clipboard(Client *c, const Arg *arg);
+
+static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie,
+		SoupCookie *new_cookie);
+static void cookiejar_finalize(GObject *self);
+static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only);
+static void cookiejar_set_property(GObject *self, guint prop_id,
+		const GValue *value, GParamSpec *pspec);
+
+static char *copystr(char **str, const char *src);
+static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f,
+		Client *c);
+static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f,
+		WebKitNetworkRequest *r, gchar *m,  WebKitWebPolicyDecision *p,
+		Client *c);
+static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f,
 		WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
-		WebKitWebPolicyDecision *p, gpointer d);
+		WebKitWebPolicyDecision *p, Client *c);
 static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, gpointer d);
-static void die(char *str);
-static gboolean download(WebKitWebView *view, WebKitDownload *o, gpointer d);
-static gchar *geturi(Client *c);
-static void hidesearch(Client *c);
-static void hideurl(Client *c);
-static gboolean keypress(GtkWidget* w, GdkEventKey *ev, gpointer d);
-static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
-static void loadfile(const Client *c, const gchar *f);
-static void loaduri(const Client *c, const gchar *uri);
-static Client *newclient();
-static WebKitWebView *newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d);
-static void progresschange(WebKitWebView *view, gint p, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+static void destroywin(GtkWidget* w, Client *c);
+static void die(const char *errstr, ...);
+static void drawindicator(Client *c);
+static void eval(Client *c, const Arg *arg);
+static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
+static void find(Client *c, const Arg *arg);
+static void fullscreen(Client *c, const Arg *arg);
+static const char *getatom(Client *c, int a);
+static void gettogglestat(Client *c);
+static char *geturi(Client *c);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
+
+static void inspector(Client *c, const Arg *arg);
+static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v,
+		Client *c);
+static gboolean inspector_show(WebKitWebInspector *i, Client *c);
+static gboolean inspector_close(WebKitWebInspector *i, Client *c);
+static void inspector_finished(WebKitWebInspector *i, Client *c);
+
+static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
+static void linkhover(WebKitWebView *v, const char* t, const char* l,
+		Client *c);
+static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
+		Client *c);
+static void loaduri(Client *c, const Arg *arg);
+static void navigate(Client *c, const Arg *arg);
+static Client *newclient(void);
+static void newwindow(Client *c, const Arg *arg, gboolean noembed);
+static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
+static void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c);
+static void popupactivate(GtkMenuItem *menu, Client *);
+static void print(Client *c, const Arg *arg);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
+		gpointer d);
+static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
+static void reload(Client *c, const Arg *arg);
+static void scroll_h(Client *c, const Arg *arg);
+static void scroll_v(Client *c, const Arg *arg);
+static void scroll(GtkAdjustment *a, const Arg *arg);
+static void setatom(Client *c, int a, const char *v);
 static void setup(void);
-static void showsearch(Client *c);
-static void showurl(Client *c);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
-static void updatetitle(Client *c);
+static void sigchld(int unused);
+static void source(Client *c, const Arg *arg);
+static void spawn(Client *c, const Arg *arg);
+static void stop(Client *c, const Arg *arg);
+static void titlechange(WebKitWebView *v, WebKitWebFrame *frame,
+		const char *title, Client *c);
+static void toggle(Client *c, const Arg *arg);
+static void update(Client *c);
+static void updatewinid(Client *c);
+static void usage(void);
+static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
+		JSContextRef js, JSObjectRef win, Client *c);
+static void zoom(Client *c, const Arg *arg);
+
+/* configuration, allows nested code to access above variables */
+#include "config.h"
+
+static void
+beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
+		WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
+		gpointer d) {
+	const gchar *uri = webkit_network_request_get_uri(req);
+	if(g_str_has_suffix(uri, "/favicon.ico"))
+		webkit_network_request_set_uri(req, "about:blank");
+}
+
+static char *
+buildpath(const char *path) {
+	char *apath, *p;
+	FILE *f;
+
+	/* creating directory */
+	if(path[0] == '/') {
+		apath = g_strdup(path);
+	} else if(path[0] == '~') {
+		if(path[1] == '/') {
+			apath = g_strconcat(g_get_home_dir(), &path[1], NULL);
+		} else {
+			apath = g_strconcat(g_get_home_dir(), "/",
+					&path[1], NULL);
+		}
+	} else {
+		apath = g_strconcat(g_get_current_dir(), "/", path, NULL);
+	}
+
+	if((p = strrchr(apath, '/'))) {
+		*p = '\0';
+		g_mkdir_with_parents(apath, 0700);
+		g_chmod(apath, 0700); /* in case it existed */
+		*p = '/';
+	}
+	/* creating file (gives error when apath ends with "/") */
+	if((f = fopen(apath, "a"))) {
+		g_chmod(apath, 0600); /* always */
+		fclose(f);
+	}
+
+	return apath;
+}
+
+static gboolean
+buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
+	WebKitHitTestResultContext context;
+	WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web,
+			e);
+	Arg arg;
+
+	g_object_get(result, "context", &context, NULL);
+	if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) {
+		if(e->button == 2) {
+			g_object_get(result, "link-uri", &arg.v, NULL);
+			newwindow(NULL, &arg, e->state & GDK_CONTROL_MASK);
+			return true;
+		}
+	}
+	return false;
+}
 
-void
+static void
 cleanup(void) {
 	while(clients)
 		destroyclient(clients);
+	g_free(cookiefile);
+	g_free(scriptfile);
+	g_free(stylefile);
 }
 
-gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f,
-		WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
-		WebKitWebPolicyDecision *p, gpointer d) {
-	/* TODO */
-	return TRUE;
+static void
+cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie,
+		SoupCookie *new_cookie) {
+	flock(COOKIEJAR(self)->lock, LOCK_EX);
+	if(new_cookie && !new_cookie->expires && sessiontime) {
+		soup_cookie_set_expires(new_cookie,
+				soup_date_new_from_now(sessiontime));
+	}
+	SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self,
+			old_cookie, new_cookie);
+	flock(COOKIEJAR(self)->lock, LOCK_UN);
+}
+
+static void
+cookiejar_class_init(CookieJarClass *klass) {
+	SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed;
+	G_OBJECT_CLASS(klass)->get_property =
+		G_OBJECT_CLASS(cookiejar_parent_class)->get_property;
+	G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property;
+	G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize;
+	g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename");
+}
+
+static void
+cookiejar_finalize(GObject *self) {
+	close(COOKIEJAR(self)->lock);
+	G_OBJECT_CLASS(cookiejar_parent_class)->finalize(self);
+}
+
+static void
+cookiejar_init(CookieJar *self) {
+	self->lock = open(cookiefile, 0);
+}
+
+static SoupCookieJar *
+cookiejar_new(const char *filename, gboolean read_only) {
+	return g_object_new(COOKIEJAR_TYPE,
+	                    SOUP_COOKIE_JAR_TEXT_FILENAME, filename,
+	                    SOUP_COOKIE_JAR_READ_ONLY, read_only, NULL);
+}
+
+static void
+cookiejar_set_property(GObject *self, guint prop_id, const GValue *value,
+		GParamSpec *pspec) {
+	flock(COOKIEJAR(self)->lock, LOCK_SH);
+	G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id,
+			value, pspec);
+	flock(COOKIEJAR(self)->lock, LOCK_UN);
+}
+
+static void
+evalscript(JSContextRef js, char *script, char* scriptname) {
+	JSStringRef jsscript, jsscriptname;
+	JSValueRef exception = NULL;
+
+	jsscript = JSStringCreateWithUTF8CString(script);
+	jsscriptname = JSStringCreateWithUTF8CString(scriptname);
+	JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), jsscriptname, 0, &exception);
+	JSStringRelease(jsscript);
+	JSStringRelease(jsscriptname);
+}
+
+static void
+runscript(WebKitWebFrame *frame) {
+	char *script;
+	GError *error;
+
+	if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
+		evalscript(webkit_web_frame_get_global_context(frame), script, scriptfile);
+	}
+}
+
+static void
+clipboard(Client *c, const Arg *arg) {
+	gboolean paste = *(gboolean *)arg;
+
+	if(paste)
+		gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c);
+	else
+		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1);
+}
+
+static char *
+copystr(char **str, const char *src) {
+	char *tmp;
+	tmp = g_strdup(src);
+
+	if(str && *str) {
+		g_free(*str);
+		*str = tmp;
+	}
+	return tmp;
+}
+
+static WebKitWebView *
+createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
+	Client *n = newclient();
+	return n->view;
+}
+
+static gboolean
+decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r,
+		gchar *m,  WebKitWebPolicyDecision *p, Client *c) {
+	if(!webkit_web_view_can_show_mime_type(v, m)) {
+		webkit_web_policy_decision_download(p);
+		return TRUE;
+	}
+	return FALSE;
 }
 
-void
+static gboolean
+decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r,
+		WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p,
+		Client *c) {
+	Arg arg;
+
+	if(webkit_web_navigation_action_get_reason(n) ==
+			WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
+		webkit_web_policy_decision_ignore(p);
+		arg.v = (void *)webkit_network_request_get_uri(r);
+		newwindow(NULL, &arg, 0);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
 destroyclient(Client *c) {
 	Client *p;
 
-	gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
+	webkit_web_view_stop_loading(c->view);
+	gtk_widget_destroy(c->indicator);
+	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
-	gtk_widget_destroy(c->urlbar);
-	gtk_widget_destroy(c->searchbar);
 	gtk_widget_destroy(c->vbox);
 	gtk_widget_destroy(c->win);
+
 	for(p = clients; p && p->next != c; p = p->next);
-	if(p)
+	if(p) {
 		p->next = c->next;
-	else
+	} else {
 		clients = c->next;
+	}
 	free(c);
 	if(clients == NULL)
 		gtk_main_quit();
 }
 
-void
-destroywin(GtkWidget* w, gpointer d) {
-	Client *c = (Client *)d;
-
+static void
+destroywin(GtkWidget* w, Client *c) {
 	destroyclient(c);
 }
 
-void die(char *str) {
-	fputs(str, stderr);
+static void
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
 	exit(EXIT_FAILURE);
 }
 
-gboolean
-download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
-	/* TODO */
-	const gchar *home;
-	gchar *uri, *filename;
+static void
+drawindicator(Client *c) {
+	gint width;
+	const char *uri;
+	char *colorname;
+	GtkWidget *w;
+	GdkGC *gc;
+	GdkColor fg;
 
-	home = g_get_home_dir();
-	filename = g_build_filename(home, "Desktop", 
-			webkit_download_get_suggested_filename(o), NULL);
-	uri = g_strconcat("file://", filename, NULL);
-	webkit_download_set_destination_uri(o, uri);
-	g_free(filename);
-	g_free(uri);
-	webkit_download_start(o);
+	uri = geturi(c);
+	w = c->indicator;
+	width = c->progress * w->allocation.width / 100;
+	gc = gdk_gc_new(w->window);
+	if(strstr(uri, "https://") == uri) {
+		if(usingproxy) {
+			colorname = c->sslfailed? progress_proxy_untrust :
+				progress_proxy_trust;
+		} else {
+			colorname = c->sslfailed? progress_untrust :
+				progress_trust;
+		}
+	} else {
+		if(usingproxy) {
+			colorname = progress_proxy;
+		} else {
+			colorname = progress;
+		}
+	}
+
+	gdk_color_parse(colorname, &fg);
+	gdk_gc_set_rgb_fg_color(gc, &fg);
+	gdk_draw_rectangle(w->window,
+			w->style->bg_gc[GTK_WIDGET_STATE(w)],
+			TRUE, 0, 0, w->allocation.width, w->allocation.height);
+	gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width,
+			w->allocation.height);
+	g_object_unref(gc);
+}
+
+static gboolean
+exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
+	drawindicator(c);
 	return TRUE;
 }
 
-gchar *
+static void
+find(Client *c, const Arg *arg) {
+	const char *s;
+
+	s = getatom(c, AtomFind);
+	gboolean forward = *(gboolean *)arg;
+	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+}
+
+static void
+fullscreen(Client *c, const Arg *arg) {
+	if(c->fullscreen) {
+		gtk_window_unfullscreen(GTK_WINDOW(c->win));
+	} else {
+		gtk_window_fullscreen(GTK_WINDOW(c->win));
+	}
+	c->fullscreen = !c->fullscreen;
+}
+
+static const char *
+getatom(Client *c, int a) {
+	static char buf[BUFSIZ];
+	Atom adummy;
+	int idummy;
+	unsigned long ldummy;
+	unsigned char *p = NULL;
+
+	XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
+			atoms[a], 0L, BUFSIZ, False, XA_STRING,
+			&adummy, &idummy, &ldummy, &ldummy, &p);
+	if(p)
+		strncpy(buf, (char *)p, LENGTH(buf)-1);
+	else
+		buf[0] = '\0';
+	XFree(p);
+	return buf;
+}
+
+static char *
 geturi(Client *c) {
-	gchar *uri;
+	char *uri;
 
-	if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
-		uri = g_strdup("about:blank");
+	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
+		uri = "about:blank";
 	return uri;
 }
 
-void
-hidesearch(Client *c) {
-	gtk_widget_hide(c->searchbar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
+static gboolean
+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
+	Arg arg;
+
+	updatewinid(c);
+	arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
+	spawn(c, &arg);
+	return FALSE;
 }
 
-void
-hideurl(Client *c) {
-	gtk_widget_hide(c->urlbar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
+static void
+inspector(Client *c, const Arg *arg) {
+	if(c->isinspector)
+		return;
+	webkit_web_inspector_show(c->inspector);
 }
 
-gboolean
-keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
-	Client *c = (Client *)d;
+static WebKitWebView *
+inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) {
+	Client *n = newclient();
+	n->isinspector = true;
 
-	if(ev->type != GDK_KEY_PRESS)
-		return FALSE;
-	if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
-		switch(ev->keyval) {
-		case GDK_Escape:
-			hidesearch(c);
-			return TRUE;
-		case GDK_Return:
-			webkit_web_view_search_text(c->view,
-					gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
-					FALSE,
-					!(ev->state & GDK_SHIFT_MASK),
-					TRUE);
-			return TRUE;
-		case GDK_Left:
-		case GDK_Right:
-		case GDK_r:
-			return FALSE;
-		}
-	}
-	else if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) {
-		switch(ev->keyval) {
-		case GDK_Escape:
-			hideurl(c);
-			return TRUE;
-		case GDK_Return:
-			loaduri(c, gtk_entry_get_text(GTK_ENTRY(c->urlbar)));
-			hideurl(c);
-			return TRUE;
-		case GDK_Left:
-		case GDK_Right:
-		case GDK_r:
-			return FALSE;
+	return n->view;
+}
+
+static gboolean
+inspector_show(WebKitWebInspector *i, Client *c) {
+	gtk_widget_show(GTK_WIDGET(webkit_web_inspector_get_web_view(i)));
+	return true;
+}
+
+static gboolean
+inspector_close(WebKitWebInspector *i, Client *c) {
+	gtk_widget_hide(GTK_WIDGET(webkit_web_inspector_get_web_view(i)));
+	return true;
+}
+
+static void
+inspector_finished(WebKitWebInspector *i, Client *c) {
+	g_free(c->inspector);
+}
+
+static gboolean
+keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
+	guint i;
+	gboolean processed = FALSE;
+
+	updatewinid(c);
+	for(i = 0; i < LENGTH(keys); i++) {
+		if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+				&& CLEANMASK(ev->state) == keys[i].mod
+				&& keys[i].func) {
+			keys[i].func(c, &(keys[i].arg));
+			processed = TRUE;
 		}
 	}
-	if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-		switch(ev->keyval) {
-		case GDK_r:
-		case GDK_R:
-			if((ev->state & GDK_SHIFT_MASK))
-				 webkit_web_view_reload_bypass_cache(c->view);
-			else
-				 webkit_web_view_reload(c->view);
-			return TRUE;
-		case GDK_b:
-			return TRUE;
-		case GDK_g:
-			showurl(c);
-			return TRUE;
-		case GDK_slash:
-			showsearch(c);
-			return TRUE;
-		case GDK_Left:
-			webkit_web_view_go_back(c->view);
-			return TRUE;
-		case GDK_Right:
-			webkit_web_view_go_forward(c->view);
-			return TRUE;
-		}
+
+	return processed;
+}
+
+static void
+linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
+	if(l) {
+		c->linkhover = copystr(&c->linkhover, l);
+	} else if(c->linkhover) {
+		free(c->linkhover);
+		c->linkhover = NULL;
 	}
-	return FALSE;
+	update(c);
 }
 
-void
-linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
-	Client *c = (Client *)d;
+static void
+loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	WebKitWebFrame *frame;
+	WebKitWebDataSource *src;
+	WebKitNetworkRequest *request;
+	SoupMessage *msg;
+	char *uri;
 
-	if(l)
-		gtk_window_set_title(GTK_WINDOW(c->win), l);
-	else
-		updatetitle(c);
+	switch(webkit_web_view_get_load_status (c->view)) {
+	case WEBKIT_LOAD_COMMITTED:
+		uri = geturi(c);
+		if(strstr(uri, "https://") == uri) {
+			frame = webkit_web_view_get_main_frame(c->view);
+			src = webkit_web_frame_get_data_source(frame);
+			request = webkit_web_data_source_get_request(src);
+			msg = webkit_network_request_get_message(request);
+			c->sslfailed = soup_message_get_flags(msg)
+			               ^ SOUP_MESSAGE_CERTIFICATE_TRUSTED;
+		}
+		setatom(c, AtomUri, uri);
+		break;
+	case WEBKIT_LOAD_FINISHED:
+		c->progress = 100;
+		update(c);
+		break;
+	default:
+		break;
+	}
 }
 
-void
-loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
-	Client *c = (Client *)d;
-	gchar *uri;
+static void
+loaduri(Client *c, const Arg *arg) {
+	char *u, *rp;
+	const char *uri = (char *)arg->v;
+	Arg a = { .b = FALSE };
 
-	uri = geturi(c);
-	ignore_once = TRUE;
-	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
-			XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
-			strlen(uri) + 1);
-}
-
-void
-loadfile(const Client *c, const gchar *f) {
-	GIOChannel *chan = NULL;
-	GError *e = NULL;
-	GString *code = g_string_new("");
-	GString *uri = g_string_new(f);
-	gchar *line;
-
-	if(strcmp(f, "-") == 0) {
-		chan = g_io_channel_unix_new(STDIN_FILENO);
-		if (chan) {
-			while(g_io_channel_read_line(chan, &line, NULL, NULL, &e) == G_IO_STATUS_NORMAL) {
-				g_string_append(code, line);
-				g_free(line);
-			}
-			webkit_web_view_load_html_string(c->view, code->str, NULL);
-			g_io_channel_shutdown(chan, FALSE, NULL);
-		}
+	if(strcmp(uri, "") == 0)
+		return;
+
+	/* In case it's a file path. */
+	if(uri[0] == '/') {
+		rp = realpath(uri, NULL);
+		u = g_strdup_printf("file://%s", rp);
+		free(rp);
+	} else {
+		u = g_strrstr(uri, "://") ? g_strdup(uri)
+			: g_strdup_printf("http://%s", uri);
 	}
-	else {
-		g_string_prepend(uri, "file://");
-		loaduri(c, uri->str);
+
+	/* prevents endless loop */
+	if(c->uri && strcmp(u, c->uri) == 0) {
+		reload(c, &a);
+	} else {
+		webkit_web_view_load_uri(c->view, u);
+		c->progress = 0;
+		c->title = copystr(&c->title, u);
+		g_free(u);
+		update(c);
 	}
-	
 }
 
-void
-loaduri(const Client *c, const gchar *uri) {
-	GString* u = g_string_new(uri);
-	if(g_strrstr(u->str, ":") == NULL)
-		g_string_prepend(u, "http://");
-	webkit_web_view_load_uri(c->view, u->str);
-	g_string_free(u, TRUE);
+static void
+navigate(Client *c, const Arg *arg) {
+	int steps = *(int *)arg;
+	webkit_web_view_go_back_or_forward(c->view, steps);
 }
 
-Client *
+static Client *
 newclient(void) {
 	Client *c;
+	WebKitWebSettings *settings;
+	WebKitWebFrame *frame;
+	GdkGeometry hints = { 1, 1 };
+	char *uri, *ua;
+
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
+
 	/* Window */
 	if(embed) {
-		c->win = gtk_plug_new(0);
-	}
-	else {
+		c->win = gtk_plug_new(embed);
+	} else {
 		c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf");
+
+		/* TA:  20091214:  Despite what the GNOME docs say, the ICCCM
+		 * is always correct, so we should still call this function.
+		 * But when doing so, we *must* differentiate between a
+		 * WM_CLASS and a resource on the window.  By convention, the
+		 * window class (WM_CLASS) is capped, while the resource is in
+		 * lowercase.   Both these values come as a pair.
+		 */
+		gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "Surf");
+
+		/* TA:  20091214:  And set the role here as well -- so that
+		 * sessions can pick this up.
+		 */
+		gtk_window_set_role(GTK_WINDOW(c->win), "Surf");
 	}
 	gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
-	g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
-	g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+	g_signal_connect(G_OBJECT(c->win),
+			"destroy",
+			G_CALLBACK(destroywin), c);
+	g_signal_connect(G_OBJECT(c->win),
+			"key-press-event",
+			G_CALLBACK(keypress), c);
 
 	/* VBox */
 	c->vbox = gtk_vbox_new(FALSE, 0);
 
-	/* scrolled window */
+	/* Scrolled Window */
 	c->scroll = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
 			GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
-	/* webview */
+	/* Webview */
 	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
-	g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
-	g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
-	g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
-	g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
-	g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
-	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
-	g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c);
-
-	/* urlbar */
-	c->urlbar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
-
-	/* searchbar */
-	c->searchbar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+	g_signal_connect(G_OBJECT(c->view),
+			"title-changed",
+			G_CALLBACK(titlechange), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"hovering-over-link",
+			G_CALLBACK(linkhover), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"create-web-view",
+			G_CALLBACK(createwindow), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"new-window-policy-decision-requested",
+			G_CALLBACK(decidewindow), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"mime-type-policy-decision-requested",
+			G_CALLBACK(decidedownload), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"window-object-cleared",
+			G_CALLBACK(windowobjectcleared), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"notify::load-status",
+			G_CALLBACK(loadstatuschange), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"notify::progress",
+			G_CALLBACK(progresschange), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"download-requested",
+			G_CALLBACK(initdownload), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"button-release-event",
+			G_CALLBACK(buttonrelease), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"populate-popup",
+			G_CALLBACK(populatepopup), c);
+	g_signal_connect(G_OBJECT(c->view),
+			"resource-request-starting",
+			G_CALLBACK(beforerequest), c);
+
+	/* Indicator */
+	c->indicator = gtk_drawing_area_new();
+	gtk_widget_set_size_request(c->indicator, 0, indicator_thickness);
+	g_signal_connect (G_OBJECT (c->indicator), "expose_event",
+			G_CALLBACK (exposeindicator), c);
 
 	/* Arranging */
 	gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
 	gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
 	gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
-	gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
-	gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
+	gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
 
 	/* Setup */
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
+	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE,
+			FALSE, 0, GTK_PACK_START);
+	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE,
+			TRUE, 0, GTK_PACK_START);
 	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-	gtk_widget_hide_all(c->searchbar);
-	gtk_widget_hide_all(c->urlbar);
 	gtk_widget_show(c->vbox);
 	gtk_widget_show(c->scroll);
 	gtk_widget_show(GTK_WIDGET(c->view));
 	gtk_widget_show(c->win);
+	gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
+			GDK_HINT_MIN_SIZE);
 	gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
+	webkit_web_view_set_full_content_zoom(c->view, TRUE);
+
+	frame = webkit_web_view_get_main_frame(c->view);
+	runscript(frame);
+	settings = webkit_web_view_get_settings(c->view);
+	if(!(ua = getenv("SURF_USERAGENT")))
+		ua = useragent;
+	g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
+	uri = g_strconcat("file://", stylefile, NULL);
+	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+	g_object_set(G_OBJECT(settings), "auto-load-images", loadimages,
+			NULL);
+	g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins,
+			NULL);
+	g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts,
+			NULL);
+	g_object_set(G_OBJECT(settings), "enable-spatial-navigation",
+			enablespatialbrowsing, NULL);
+	g_object_set(G_OBJECT(settings), "enable-developer-extras",
+			enableinspector, NULL);
+
+	if(enableinspector) {
+		c->inspector = WEBKIT_WEB_INSPECTOR(
+				webkit_web_view_get_inspector(c->view));
+		g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view",
+				G_CALLBACK(inspector_new), c);
+		g_signal_connect(G_OBJECT(c->inspector), "show-window",
+				G_CALLBACK(inspector_show), c);
+		g_signal_connect(G_OBJECT(c->inspector), "close-window",
+				G_CALLBACK(inspector_close), c);
+		g_signal_connect(G_OBJECT(c->inspector), "finished",
+				G_CALLBACK(inspector_finished), c);
+		c->isinspector = false;
+	}
+
+	g_free(uri);
+
+	setatom(c, AtomFind, "");
+	setatom(c, AtomUri, "about:blank");
+	if(hidebackground)
+		webkit_web_view_set_transparent(c->view, TRUE);
+
+	c->title = NULL;
 	c->next = clients;
 	clients = c;
-	if(showxid)
-		printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+	if(showxid) {
+		gdk_display_sync(gtk_widget_get_display(c->win));
+		printf("%u\n",
+			(guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+		fflush(NULL);
+                if (fclose(stdout) != 0) {
+			die("Error closing stdout");
+                }
+	}
 	return c;
 }
 
-WebKitWebView *
-newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d) {
-	/* TODO */
-	Client *c = newclient();
-	return c->view;
+static void
+newwindow(Client *c, const Arg *arg, gboolean noembed) {
+	guint i = 0;
+	const char *cmd[10], *uri;
+	const Arg a = { .v = (void *)cmd };
+	char tmp[64];
+
+	cmd[i++] = argv0;
+	if(embed && !noembed) {
+		cmd[i++] = "-e";
+		snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
+		cmd[i++] = tmp;
+	}
+	if(!enablescripts)
+		cmd[i++] = "-s";
+	if(!enableplugins)
+		cmd[i++] = "-p";
+	if(!loadimages)
+		cmd[i++] = "-i";
+	if(showxid)
+		cmd[i++] = "-x";
+	cmd[i++] = "--";
+	uri = arg->v ? (char *)arg->v : c->linkhover;
+	if(uri)
+		cmd[i++] = uri;
+	cmd[i++] = NULL;
+	spawn(NULL, &a);
 }
 
-void
-progresschange(WebKitWebView* view, gint p, gpointer d) {
-	Client *c = (Client *)d;
+static void
+populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c) {
+	GList *items = gtk_container_get_children(GTK_CONTAINER(menu));
+
+	for(GList *l = items; l; l = l->next) {
+		g_signal_connect(l->data, "activate", G_CALLBACK(popupactivate), c);
+	}
+
+	g_list_free(items);
+}
+
+static void
+popupactivate(GtkMenuItem *menu, Client *c) {
+	/*
+	 * context-menu-action-2000	open link
+	 * context-menu-action-1	open link in window
+	 * context-menu-action-2	download linked file
+	 * context-menu-action-3	copy link location
+	 * context-menu-action-13	reload
+	 * context-menu-action-10	back
+	 * context-menu-action-11	forward
+	 * context-menu-action-12	stop
+	 */
 
-	c->progress = p;
-	updatetitle(c);
+	GtkAction *a = NULL;
+	const char *name;
+	GtkClipboard *prisel;
+
+	a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(menu));
+	if(a == NULL)
+		return;
+
+	name = gtk_action_get_name(a);
+	if(!g_strcmp0(name, "context-menu-action-3")) {
+		prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+		gtk_clipboard_set_text(prisel, c->linkhover, -1);
+	}
 }
 
-GdkFilterReturn
+static void
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
+	Arg arg = {.v = text };
+	if(text != NULL)
+		loaduri((Client *) d, &arg);
+}
+
+static void
+print(Client *c, const Arg *arg) {
+	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+}
+
+static GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
-	XPropertyEvent *ev;
 	Client *c = (Client *)d;
-	Atom adummy;
-	int idummy;
-	unsigned long ldummy;
-	unsigned char *buf = NULL;
+	XPropertyEvent *ev;
+	Arg arg;
+
 	if(((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
-		if(ignore_once == FALSE && ev->atom == urlprop && ev->state == PropertyNewValue) {
-			XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING, 
-				&adummy, &idummy, &ldummy, &ldummy, &buf);
-			loaduri(c, (gchar *)buf);
-			XFree(buf);
-			return GDK_FILTER_REMOVE;
+		if(ev->state == PropertyNewValue) {
+			if(ev->atom == atoms[AtomFind]) {
+				arg.b = TRUE;
+				find(c, &arg);
+				return GDK_FILTER_REMOVE;
+			}
+			else if(ev->atom == atoms[AtomGo]) {
+				arg.v = getatom(c, AtomGo);
+				loaduri(c, &arg);
+				return GDK_FILTER_REMOVE;
+			}
 		}
 	}
 	return GDK_FILTER_CONTINUE;
 }
 
-void setup(void) {
-	dpy = GDK_DISPLAY();
-	urlprop = XInternAtom(dpy, "_SURF_URL", False);
+static void
+progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	c->progress = webkit_web_view_get_progress(c->view) * 100;
+	update(c);
 }
 
-void
-showsearch(Client *c) {
-	hideurl(c);
-	gtk_widget_show(c->searchbar);
-	gtk_widget_grab_focus(c->searchbar);
+static void
+reload(Client *c, const Arg *arg) {
+	gboolean nocache = *(gboolean *)arg;
+	if(nocache)
+		 webkit_web_view_reload_bypass_cache(c->view);
+	else
+		 webkit_web_view_reload(c->view);
 }
 
-void
-showurl(Client *c) {
-	gchar *uri;
+static void
+scroll_h(Client *c, const Arg *arg) {
+	scroll(gtk_scrolled_window_get_hadjustment(
+				GTK_SCROLLED_WINDOW(c->scroll)), arg);
+}
 
-	hidesearch(c);
-	uri = geturi(c);
-	gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
-	gtk_widget_show(c->urlbar);
-	gtk_widget_grab_focus(c->urlbar);
+static void
+scroll_v(Client *c, const Arg *arg) {
+	scroll(gtk_scrolled_window_get_vadjustment(
+				GTK_SCROLLED_WINDOW(c->scroll)), arg);
 }
 
-void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
-	Client *c = (Client *)d;
+static void
+scroll(GtkAdjustment *a, const Arg *arg) {
+	gdouble v;
+
+	v = gtk_adjustment_get_value(a);
+	switch (arg->i){
+	case +10000:
+	case -10000:
+		v += gtk_adjustment_get_page_increment(a) *
+			(arg->i / 10000);
+		break;
+	case +20000:
+	case -20000:
+	default:
+		v += gtk_adjustment_get_step_increment(a) * arg->i;
+	}
 
-	if(c->title)
-		g_free(c->title);
-	c->title = g_strdup(t);
-	updatetitle(c);
+	v = MAX(v, 0.0);
+	v = MIN(v, gtk_adjustment_get_upper(a) -
+			gtk_adjustment_get_page_size(a));
+	gtk_adjustment_set_value(a, v);
 }
 
-void
-updatetitle(Client *c) {
-	char t[512];
-	if(c->progress == 100)
-		snprintf(t, LENGTH(t), "%s", c->title);
-	else
-		snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress);
-	gtk_window_set_title(GTK_WINDOW(c->win), t);
+static void
+setatom(Client *c, int a, const char *v) {
+	XSync(dpy, False);
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
+			atoms[a], XA_STRING, 8, PropModeReplace,
+			(unsigned char *)v, strlen(v) + 1);
 }
 
-int main(int argc, char *argv[]) {
-	gchar *uri = NULL, *file = NULL;
-	Client *c;
-	int o;
+static void
+setup(void) {
+	char *proxy;
+	char *new_proxy;
+	SoupURI *puri;
+	SoupSession *s;
 
+	/* clean up any zombies immediately */
+	sigchld(0);
 	gtk_init(NULL, NULL);
 	if (!g_thread_supported())
 		g_thread_init(NULL);
+
+	dpy = GDK_DISPLAY();
+
+	/* atoms */
+	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+
+	/* dirs and files */
+	cookiefile = buildpath(cookiefile);
+	scriptfile = buildpath(scriptfile);
+	stylefile = buildpath(stylefile);
+
+	/* request handler */
+	s = webkit_get_default_session();
+
+	/* cookie jar */
+	soup_session_add_feature(s,
+			SOUP_SESSION_FEATURE(cookiejar_new(cookiefile,
+					FALSE)));
+
+	/* ssl */
+	g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+	g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
+
+	/* proxy */
+	if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
+		new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
+			g_strdup_printf("http://%s", proxy);
+		puri = soup_uri_new(new_proxy);
+		g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
+		soup_uri_free(puri);
+		g_free(new_proxy);
+		usingproxy = 1;
+	}
+}
+
+static void
+sigchld(int unused) {
+	if(signal(SIGCHLD, sigchld) == SIG_ERR)
+		die("Can't install SIGCHLD handler");
+	while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
+static void
+source(Client *c, const Arg *arg) {
+	Arg a = { .b = FALSE };
+	gboolean s;
+
+	s = webkit_web_view_get_view_source_mode(c->view);
+	webkit_web_view_set_view_source_mode(c->view, !s);
+	reload(c, &a);
+}
+
+static void
+spawn(Client *c, const Arg *arg) {
+	if(fork() == 0) {
+		if(dpy)
+			close(ConnectionNumber(dpy));
+		setsid();
+		execvp(((char **)arg->v)[0], (char **)arg->v);
+		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
+		perror(" failed");
+		exit(0);
+	}
+}
+
+static void
+eval(Client *c, const Arg *arg) {
+	WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
+	evalscript(webkit_web_frame_get_global_context(frame),
+			((char **)arg->v)[0], "");
+}
+
+static void
+stop(Client *c, const Arg *arg) {
+	webkit_web_view_stop_loading(c->view);
+}
+
+static void
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
+	c->title = copystr(&c->title, t);
+	update(c);
+}
+
+static void
+toggle(Client *c, const Arg *arg) {
+	WebKitWebSettings *settings;
+	char *name = (char *)arg->v;
+	gboolean value;
+	Arg a = { .b = FALSE };
+
+	settings = webkit_web_view_get_settings(c->view);
+	g_object_get(G_OBJECT(settings), name, &value, NULL);
+	g_object_set(G_OBJECT(settings), name, !value, NULL);
+
+	reload(c,&a);
+}
+
+static void
+gettogglestat(Client *c){
+	gboolean value;
+	WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+
+	g_object_get(G_OBJECT(settings), "enable-caret-browsing",
+			&value, NULL);
+	togglestat[0] = value? 'C': 'c';
+
+	g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
+	togglestat[1] = value? 'I': 'i';
+
+	g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
+	togglestat[2] = value? 'S': 's';
+
+	g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
+	togglestat[3] = value? 'V': 'v';
+
+	togglestat[4] = '\0';
+}
+
+
+static void
+update(Client *c) {
+	char *t;
+
+	gettogglestat(c);
+
+	if(c->linkhover) {
+		t = g_strdup_printf("%s| %s", togglestat, c->linkhover);
+	} else if(c->progress != 100) {
+		drawindicator(c);
+		gtk_widget_show(c->indicator);
+		t = g_strdup_printf("[%i%%] %s| %s", c->progress, togglestat,
+				c->title);
+	} else {
+		gtk_widget_hide_all(c->indicator);
+		t = g_strdup_printf("%s| %s", togglestat, c->title);
+	}
+
+	gtk_window_set_title(GTK_WINDOW(c->win), t);
+	g_free(t);
+}
+
+static void
+updatewinid(Client *c) {
+	snprintf(winid, LENGTH(winid), "%u",
+			(int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+}
+
+static void
+usage(void) {
+	die("usage: %s [-inpsvx] [-c cookiefile] [-e xid] [-r scriptfile]"
+		" [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
+}
+
+static void
+windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
+		JSObjectRef win, Client *c) {
+	runscript(frame);
+}
+
+static void
+zoom(Client *c, const Arg *arg) {
+	c->zoomed = TRUE;
+	if(arg->i < 0) {
+		/* zoom out */
+		webkit_web_view_zoom_out(c->view);
+	} else if(arg->i > 0) {
+		/* zoom in */
+		webkit_web_view_zoom_in(c->view);
+	} else {
+		/* reset */
+		c->zoomed = FALSE;
+		webkit_web_view_set_zoom_level(c->view, 1.0);
+	}
+}
+
+int
+main(int argc, char *argv[]) {
+	Arg arg;
+
+	memset(&arg, 0, sizeof(arg));
+
+	/* command line args */
+	ARGBEGIN {
+	case 'c':
+		cookiefile = EARGF(usage());
+		break;
+	case 'e':
+		embed = strtol(EARGF(usage()), NULL, 0);
+		break;
+	case 'i':
+		loadimages = 0;
+		break;
+	case 'n':
+		enableinspector = 0;
+		break;
+	case 'p':
+		enableplugins = 0;
+		break;
+	case 'r':
+		scriptfile = EARGF(usage());
+		break;
+	case 's':
+		enablescripts = 0;
+		break;
+	case 't':
+		stylefile = EARGF(usage());
+		break;
+	case 'u':
+		useragent = EARGF(usage());
+		break;
+	case 'v':
+		die("surf-"VERSION", ©2009-2012 surf engineers, "
+				"see LICENSE for details\n");
+	case 'x':
+		showxid = TRUE;
+		break;
+	default:
+		usage();
+	} ARGEND;
+	if(argc > 0)
+		arg.v = argv[0];
+
 	setup();
-	while((o = getopt(argc, argv, "vhxeu:f:")) != -1)
-		switch(o) {
-		case 'x':
-			showxid = TRUE;
-			break;
-		case 'e':
-			showxid = TRUE;
-			embed = TRUE;
-			break;
-		case 'u':
-			if(!(uri = optarg))
-				goto argerr;
-			c = newclient();
-			loaduri(c, uri);
-			updatetitle(c);
-			break;
-		case 'f':
-			if(!(file = optarg))
-				goto argerr;
-			c = newclient();
-			loadfile(c, file);
-			updatetitle(c);
-			break;
-		case 'v':
-			die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
-			break;
-		argerr:
-		default:
-			puts("surf - simple browser");
-			die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
-			return EXIT_FAILURE;
-		}
-	if(optind != argc)
-		goto argerr;
-	if(!clients)
-		newclient();
+	newclient();
+	if(arg.v)
+		loaduri(clients, &arg);
+
 	gtk_main();
 	cleanup();
+
 	return EXIT_SUCCESS;
 }
+