X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=fe63fd4a642033a2bca0aeba789742372a962ca3;hb=1cbeab188d8769ae67dfa99a4191088ab42db415;hp=042bdf40878865d4c5c1a984e654df4ad34a8977;hpb=b298d889de769086e06b7bc71188ea7e4e38f259;p=surf.git

diff --git a/surf.c b/surf.c
index 042bdf4..fe63fd4 100644
--- a/surf.c
+++ b/surf.c
@@ -24,18 +24,21 @@
 
 typedef union Arg Arg;
 union Arg {
-	const gboolean b;
-	const gint i;
+	gboolean b;
+	gint i;
 	const void *v;
 };
 
 typedef struct Client {
-	GtkWidget *win, *scroll, *vbox, *uribar, *searchbar, *indicator;
+	GtkWidget *win, *scroll, *vbox, *indicator;
+	GtkWidget **items;
 	WebKitWebView *view;
 	WebKitDownload *download;
-	gchar *title, *linkhover;
+	char *title, *linkhover;
+	const char *uri, *needle;
 	gint progress;
 	struct Client *next;
+	gboolean zoomed;
 } Client;
 
 typedef struct {
@@ -44,110 +47,77 @@ typedef struct {
 	const Arg arg;
 } Item;
 
-typedef struct Cookie {
-	gchar *name;
-	gchar *value;
-	gchar *domain;
-	gchar *path;
-	struct Cookie *next;
-} Cookie;
-
-typedef enum {
-	Browser = 0x0001,
-	SearchBar = 0x0010,
-	UriBar = 0x0100,
-	Any = ~0,
-} KeyFocus;
-
 typedef struct {
 	guint mod;
 	guint keyval;
 	void (*func)(Client *c, const Arg *arg);
 	const Arg arg;
-	KeyFocus focus;
 } Key;
 
 static Display *dpy;
-static Atom uriprop;
-static SoupCookieJar *cookiejar;
+static Atom uriprop, findprop;
 static SoupSession *session;
 static Client *clients = NULL;
-/*static Cookie *cookies = NULL;*/
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
-static gboolean ignore_once = FALSE;
-static gchar winid[64];
-static gchar *progname;
+static int ignorexprop = 0;
+static char winid[64];
+static char *progname;
 
-static const gchar *autouri(Client *c);
-static gchar *buildpath(const gchar *path);
+static char *buildpath(const char *path);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 static void context(WebKitWebView *v, GtkMenu *m, Client *c);
-static gchar *copystr(gchar **str, const gchar *src);
+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, Client *c);
 static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
-static void die(gchar *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void die(char *str);
+static void download(Client *c, const Arg *arg);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
+static void find(Client *c, const Arg *arg);
+static const char *getatom(Client *c, Atom a);
+static char *geturi(Client *c);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-static gchar *geturi(Client *c);
-static void hidesearch(Client *c, const Arg *arg);
-static void hideuri(Client *c, const Arg *arg);
 static void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
-static void linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c);
-static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void loadstart(WebKitWebView *v, WebKitWebFrame *f, 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);
-static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void pasteuri(GtkClipboard *clipboard, const gchar *text, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
+static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c);
+static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static void print(Client *c, const Arg *arg);
-static void proccookies(SoupMessage *m, Client *c);
-static void progresschange(WebKitWebView *v, gint p, Client *c);
-static void request(SoupSession *s, SoupMessage *m, Client *c);
+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 rereadcookies(void);
-static void sigchld(int unused);
-static void setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp);
-static void setup(void);
-static void spawn(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, Client *c);
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void scroll(Client *c, const Arg *arg);
-static void searchtext(Client *c, const Arg *arg);
+static void setatom(Client *c, Atom a, const char *v);
+static void setup(void);
+static void sigchld(int unused);
 static void source(Client *c, const Arg *arg);
-static void showsearch(Client *c, const Arg *arg);
-static void showuri(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 gchar* title, Client *c);
-static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
-static void usage(void);
+static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 static void update(Client *c);
+static void updatedownload(WebKitDownload *o, GParamSpec *pspec, 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"
 
-const gchar *
-autouri(Client *c) {
-	if(GTK_WIDGET_HAS_FOCUS(c->uribar))
-		return gtk_entry_get_text(GTK_ENTRY(c->uribar));
-	else if(c->linkhover)
-		return c->linkhover;
-	return NULL;
-}
-
-gchar *
-buildpath(const gchar *path) {
-	gchar *apath, *p;
+char *
+buildpath(const char *path) {
+	char *apath, *p;
 	FILE *f;
 
 	/* creating directory */
@@ -183,28 +153,28 @@ clipboard(Client *c, const Arg *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), webkit_web_view_get_uri(c->view), -1);
+		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1);
 }
 
 void
 context(WebKitWebView *v, GtkMenu *m, Client *c) {
 	int i;
-	GtkWidget *item;
+	GtkContainer *parent;
 
 	gtk_widget_hide_all(GTK_WIDGET(m));
 	gtk_widget_show(GTK_WIDGET(m));
 	for(i = 0; i < LENGTH(items); i++) {
-		item = gtk_menu_item_new_with_label(items[i].label);
-		gtk_menu_shell_append(GTK_MENU_SHELL(m), item);
-		g_signal_connect(G_OBJECT(item), "activate",
-				G_CALLBACK(itemclick), c);
-		gtk_widget_show(item);
+		parent = GTK_CONTAINER(gtk_widget_get_parent(c->items[i]));
+		if(parent)
+			gtk_container_remove(parent, c->items[i]);
+		gtk_menu_shell_append(GTK_MENU_SHELL(m), c->items[i]);
+		gtk_widget_show(c->items[i]);
 	}
 }
 
-gchar *
-copystr(gchar **str, const gchar *src) {
-	gchar *tmp;
+char *
+copystr(char **str, const char *src) {
+	char *tmp;
 	tmp = g_strdup(src);
 
 	if(str && *str) {
@@ -214,16 +184,48 @@ copystr(gchar **str, const gchar *src) {
 	return tmp;
 }
 
+WebKitWebView *
+createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
+	Client *n = newclient();
+	return n->view;
+}
+
+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;
+}
+
+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);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 void
 destroyclient(Client *c) {
+	int i;
 	Client *p;
 
+	gtk_widget_destroy(c->indicator);
 	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
-	gtk_widget_destroy(c->uribar);
-	gtk_widget_destroy(c->searchbar);
 	gtk_widget_destroy(c->vbox);
 	gtk_widget_destroy(c->win);
+	for(i = 0; i < LENGTH(items); i++)
+		gtk_widget_destroy(c->items[i]);
+	free(c->items);
+
 	for(p = clients; p && p->next != c; p = p->next);
 	if(p)
 		p->next = c->next;
@@ -234,38 +236,41 @@ destroyclient(Client *c) {
 		gtk_main_quit();
 }
 
-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);
-		return TRUE;
-	}
-	return FALSE;
-}
-
 void
 destroywin(GtkWidget* w, Client *c) {
 	destroyclient(c);
 }
 
 void
-die(gchar *str) {
+die(char *str) {
 	fputs(str, stderr);
 	exit(EXIT_FAILURE);
 }
 
+void
+download(Client *c, const Arg *arg) {
+	char *uri;
+	WebKitNetworkRequest *r;
+	WebKitDownload       *dl;
+
+	if(arg->v)
+		uri = (char *)arg->v;
+	else
+		uri = c->linkhover ? c->linkhover : geturi(c);
+	r = webkit_network_request_new(uri);
+	dl = webkit_download_new(r);
+	initdownload(c->view, dl, c);
+}
+
 void
 drawindicator(Client *c) {
 	gint width;
-	gchar *uri;
+	const char *uri;
 	GtkWidget *w;
 	GdkGC *gc;
 	GdkColor fg;
 
-	uri = geturi(c);
+	uri = getatom(c, uriprop);
 	w = c->indicator;
 	width = c->progress * w->allocation.width / 100;
 	gc = gdk_gc_new(w->window);
@@ -287,24 +292,52 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
 }
 
 void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
-	WebKitDownloadStatus status;
+find(Client *c, const Arg *arg) {
+	const char *s;
 
-	status = webkit_download_get_status(c->download);
-	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
-		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
-	}
-	update(c);
+	s = getatom(c, findprop);
+	gboolean forward = *(gboolean *)arg;
+	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+}
+
+const char *
+getatom(Client *c, Atom 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),
+			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;
+}
+
+char *
+geturi(Client *c) {
+	char *uri;
+
+	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
+		uri = "about:blank";
+	return uri;
 }
 
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
-	const gchar *filename;
-	gchar *uri, *html;
+	const char *filename;
+	char *uri, *html;
 
 	stop(c, NULL);
 	c->download = o;
 	filename = webkit_download_get_suggested_filename(o);
+	if(!strcmp("", filename))
+		filename = "index.html";
 	uri = g_strconcat("file://", dldir, "/", filename, NULL);
 	webkit_download_set_destination_uri(c->download, uri);
 	c->progress = 0;
@@ -312,8 +345,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	html = g_strdup_printf("Download <b>%s</b>...", filename);
 	webkit_web_view_load_html_string(c->view, html,
 			webkit_download_get_uri(c->download));
-	g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
-	g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
+	g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
+	g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
 	webkit_download_start(c->download);
 	
 	c->title = copystr(&c->title, filename);
@@ -322,31 +355,10 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	return TRUE;
 }
 
-gchar *
-geturi(Client *c) {
-	gchar *uri;
-
-	if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
-		uri = copystr(NULL, "about:blank");
-	return uri;
-}
-
-void
-hidesearch(Client *c, const Arg *arg) {
-	gtk_widget_hide(c->searchbar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
-void
-hideuri(Client *c, const Arg *arg) {
-	gtk_widget_hide(c->uribar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
 void
 itemclick(GtkMenuItem *mi, Client *c) {
 	int i;
-	const gchar *label;
+	const char *label;
 
 	label = gtk_menu_item_get_label(mi);
 	for(i = 0; i < LENGTH(items); i++)
@@ -356,21 +368,12 @@ itemclick(GtkMenuItem *mi, Client *c) {
 
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-	guint i, focus;
+	guint i;
 	gboolean processed = FALSE;
 
-	if(ev->type != GDK_KEY_PRESS)
-		return FALSE;
-	if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
-		focus = SearchBar;
-	else if(GTK_WIDGET_HAS_FOCUS(c->uribar))
-		focus = UriBar;
-	else
-		focus = Browser;
 	updatewinid(c);
 	for(i = 0; i < LENGTH(keys); i++) {
-		if(focus & keys[i].focus
-				&& gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+		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));
@@ -381,7 +384,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 }
 
 void
-linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) {
+linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 	if(l)
 		c->linkhover = copystr(&c->linkhover, l);
 	else if(c->linkhover) {
@@ -392,51 +395,57 @@ linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) {
 }
 
 void
-loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	gchar *uri;
-
-	ignore_once = TRUE;
-	uri = geturi(c);
-	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), uriprop,
-			XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
-			strlen(uri) + 1);
-}
-
-void
-loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	c->progress = 0;
-	update(c);
+loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	switch(webkit_web_view_get_load_status (c->view)) {
+	case WEBKIT_LOAD_COMMITTED:
+		setatom(c, uriprop, geturi(c));
+		break;
+	case WEBKIT_LOAD_FINISHED:
+		c->progress = 0;
+		update(c);
+		break;
+	case WEBKIT_LOAD_PROVISIONAL:
+	case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+		break;
+	}
 }
 
 void
 loaduri(Client *c, const Arg *arg) {
-	gchar *u;
-	const gchar *uri = (gchar *)arg->v;
+	char *u;
+	const char *uri = (char *)arg->v;
+	Arg a = { .b = FALSE };
 
-	if(!uri)
-		uri = autouri(c);
-	if(!uri)
+	if(strcmp(uri, "") == 0)
 		return;
 	u = g_strrstr(uri, "://") ? g_strdup(uri)
 		: g_strdup_printf("http://%s", uri);
-	webkit_web_view_load_uri(c->view, u);
-	c->progress = 0;
-	c->title = copystr(&c->title, u);
-	g_free(u);
-	update(c);
+	/* 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
 navigate(Client *c, const Arg *arg) {
-	gint steps = *(gint *)arg;
+	int steps = *(int *)arg;
 	webkit_web_view_go_back_or_forward(c->view, steps);
 }
 
 Client *
 newclient(void) {
+	int i;
 	Client *c;
 	WebKitWebSettings *settings;
-	gchar *uri;
+	GdkGeometry hints = { 1, 1 };
+	char *uri, *ua;
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
@@ -446,44 +455,58 @@ newclient(void) {
 	}
 	else {
 		c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+		/* 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), "size-allocate", G_CALLBACK(resize), c);
+
+	if(!(c->items = calloc(1, sizeof(GtkWidget *) * LENGTH(items))))
+		die("Cannot malloc!\n");
+
+	/* contextmenu */
+	for(i = 0; i < LENGTH(items); i++) {
+		c->items[i] = gtk_menu_item_new_with_label(items[i].label);
+		g_signal_connect(G_OBJECT(c->items[i]), "activate",
+				G_CALLBACK(itemclick), 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), "load-started", G_CALLBACK(loadstart), 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), "download-requested", G_CALLBACK(initdownload), c);
 	g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
-	g_signal_connect_after(session, "request-started", G_CALLBACK(request), c);
-	g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
 	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), 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), "resource-request-starting", G_CALLBACK(newrequest), c);
 
-	/* uribar */
-	c->uribar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->uribar), FALSE);
-
-	/* searchbar */
-	c->searchbar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
-
-	/* indicator */
+	/* Indicator */
 	c->indicator = gtk_drawing_area_new();
 	gtk_widget_set_size_request(c->indicator, 0, 2);
 	g_signal_connect (G_OBJECT (c->indicator), "expose_event",
@@ -493,31 +516,30 @@ newclient(void) {
 	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->uribar);
 	gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
 
 	/* Setup */
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->uribar, 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->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->uribar);
 	gtk_widget_show(c->vbox);
 	gtk_widget_show(c->indicator);
 	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);
 	settings = webkit_web_view_get_settings(c->view);
-	g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
+	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_free(uri);
+	setatom(c, findprop, "");
+	setatom(c, uriprop, "");
 
 	c->download = NULL;
 	c->title = NULL;
@@ -531,12 +553,21 @@ newclient(void) {
 	return c;
 }
 
+static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) {
+	SoupMessage *msg = webkit_network_request_get_message(req);
+	SoupMessageHeaders *h;
+	if(!msg)
+		return;
+	h = msg->request_headers;
+	soup_message_headers_remove(h, "Cookies");
+}
+
 void
 newwindow(Client *c, const Arg *arg) {
 	guint i = 0;
-	const gchar *cmd[7], *uri;
+	const char *cmd[7], *uri;
 	const Arg a = { .v = (void *)cmd };
-	gchar tmp[64];
+	char tmp[64];
 
 	cmd[i++] = progname;
 	if(embed) {
@@ -548,47 +579,43 @@ newwindow(Client *c, const Arg *arg) {
 		cmd[i++] = "-x";
 	}
 	cmd[i++] = "--";
-	uri = arg->v ? (char *)arg->v : autouri(c);
+	uri = arg->v ? (char *)arg->v : c->linkhover;
 	if(uri)
 		cmd[i++] = uri;
 	cmd[i++] = NULL;
 	spawn(NULL, &a);
 }
 
-WebKitWebView *
-createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
-	Client *n = newclient();
-	return n->view;
-}
-
 void
-pasteuri(GtkClipboard *clipboard, const gchar *text, gpointer d) {
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
 	Arg arg = {.v = text };
 	if(text != NULL)
 		loaduri((Client *) d, &arg);
 }
 
+void
+print(Client *c, const Arg *arg) {
+	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+}
+
 GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	Client *c = (Client *)d;
 	XPropertyEvent *ev;
-	Atom adummy;
-	gint idummy;
-	unsigned long ldummy;
-	unsigned char *buf = NULL;
 	Arg arg;
 
 	if(((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
-		if(ev->atom == uriprop && ev->state == PropertyNewValue) {
-			if(ignore_once)
-			       ignore_once = FALSE;
-			else {
-				XGetWindowProperty(dpy, ev->window, uriprop, 0L, BUFSIZ, False, XA_STRING,
-					&adummy, &idummy, &ldummy, &ldummy, &buf);
-				arg.v = buf;
+		if(ignorexprop)
+			ignorexprop--;
+		else if(ev->state == PropertyNewValue) {
+			if(ev->atom == uriprop) {
+				arg.v = getatom(c, uriprop);
 				loaduri(c, &arg);
-				XFree(buf);
+			}
+			else if(ev->atom == findprop) {
+				arg.b = TRUE;
+				find(c, &arg);
 			}
 			return GDK_FILTER_REMOVE;
 		}
@@ -597,37 +624,11 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 }
 
 void
-print(Client *c, const Arg *arg) {
-	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
-}
-
-void
-proccookies(SoupMessage *m, Client *c) {
-	GSList *l;
-	SoupCookie *co;
-	long t;
-
-	rereadcookies();
-	for (l = soup_cookies_from_response(m); l; l = l->next){
-		co = (SoupCookie *)l->data;
-		t = co->expires ?  soup_date_to_time_t(co->expires) : 0;
-		setcookie(co->name, co->value, co->domain, co->value, t);
-	}
-	g_slist_free(l);
-}
-
-void
-progresschange(WebKitWebView *v, gint p, Client *c) {
-	c->progress = p;
+progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	c->progress = webkit_web_view_get_progress(c->view) * 100;
 	update(c);
 }
 
-void
-request(SoupSession *s, SoupMessage *m, Client *c) {
-	soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
-			G_CALLBACK(proccookies), c);
-}
-
 void
 reload(Client *c, const Arg *arg) {
 	gboolean nocache = *(gboolean *)arg;
@@ -638,8 +639,16 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-rereadcookies(void) {
+resize(GtkWidget *w, GtkAllocation *a, Client *c) {
+	double zoom;
 
+	if(c->zoomed)
+		return;
+	zoom = webkit_web_view_get_zoom_level(c->view);
+	if(a->width * a->height < 300 * 400 && zoom != 0.2)
+		webkit_web_view_set_zoom_level(c->view, 0.2);
+	else if(zoom != 1.0)
+		webkit_web_view_set_zoom_level(c->view, 1.0);
 }
 
 void
@@ -656,20 +665,20 @@ scroll(Client *c, const Arg *arg) {
 }
 
 void
-sigchld(int unused) {
-	if(signal(SIGCHLD, sigchld) == SIG_ERR)
-		die("Can't install SIGCHLD handler");
-	while(0 < waitpid(-1, NULL, WNOHANG));
-}
-
-void
-setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp) {
-
+setatom(Client *c, Atom a, const char *v) {
+	XSync(dpy, False);
+	ignorexprop++;
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
+			XA_STRING, 8, PropModeReplace, (unsigned char *)v,
+			strlen(v) + 1);
 }
 
 void
 setup(void) {
 	SoupSession *s;
+	char *proxy;
+	char *new_proxy;
+	SoupURI *puri;
 
 	/* clean up any zombies immediately */
 	sigchld(0);
@@ -679,7 +688,8 @@ setup(void) {
 
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
-	uriprop = XInternAtom(dpy, "_SURF_uri", False);
+	uriprop = XInternAtom(dpy, "_SURF_URI", False);
+	findprop = XInternAtom(dpy, "_SURF_FIND", False);
 
 	/* create dirs and files */
 	cookiefile = buildpath(cookiefile);
@@ -687,17 +697,23 @@ setup(void) {
 	scriptfile = buildpath(scriptfile);
 	stylefile = buildpath(stylefile);
 
-	/* cookie persistance */
-	s = webkit_get_default_session();
-	cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	/* 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);
+	}
 }
 
 void
-showsearch(Client *c, const Arg *arg) {
-	hideuri(c, NULL);
-	gtk_widget_show(c->searchbar);
-	gtk_widget_grab_focus(c->searchbar);
+sigchld(int unused) {
+	if(signal(SIGCHLD, sigchld) == SIG_ERR)
+		die("Can't install SIGCHLD handler");
+	while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
 void
@@ -710,73 +726,40 @@ source(Client *c, const Arg *arg) {
 	reload(c, &a);
 }
 
-void
-searchtext(Client *c, const Arg *arg) {
-	const gchar *text;
-	gboolean forward = *(gboolean *)arg;
-	text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
-	webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
-	webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
-}
-
-void
-showuri(Client *c, const Arg *arg) {
-	gchar *uri;
-
-	hidesearch(c, NULL);
-	uri = geturi(c);
-	gtk_entry_set_text(GTK_ENTRY(c->uribar), uri);
-	gtk_widget_show(c->uribar);
-	gtk_widget_grab_focus(c->uribar);
-}
-
-void
-stop(Client *c, const Arg *arg) {
-	if(c->download)
-		webkit_download_cancel(c->download);
-	else
-		webkit_web_view_stop_loading(c->view);
-	c->download = NULL;
-}
-
 void
 spawn(Client *c, const Arg *arg) {
 	if(fork() == 0) {
 		if(dpy)
 			close(ConnectionNumber(dpy));
 		setsid();
-		execvp(((gchar **)arg->v)[0], (gchar **)arg->v);
-		fprintf(stderr, "tabbed: execvp %s", ((gchar **)arg->v)[0]);
+		execvp(((char **)arg->v)[0], (char **)arg->v);
+		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
 		perror(" failed");
 		exit(0);
 	}
 }
 
 void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
-	c->title = copystr(&c->title, t);
-	update(c);
-}
-
-gboolean
-focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
-	hidesearch(c, NULL);
-	hideuri(c, NULL);
-	return FALSE;
+stop(Client *c, const Arg *arg) {
+	if(c->download)
+		webkit_download_cancel(c->download);
+	else
+		webkit_web_view_stop_loading(c->view);
+	c->download = NULL;
 }
 
 void
-usage(void) {
-	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [uri]\n");
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
+	c->title = copystr(&c->title, t);
+	update(c);
 }
 
 void
 update(Client *c) {
-	gchar *t;
+	char *t;
 
 	if(c->progress != 100)
-		t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+		t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
 	else if(c->linkhover)
 		t = g_strdup(c->linkhover);
 	else
@@ -784,7 +767,17 @@ update(Client *c) {
 	drawindicator(c);
 	gtk_window_set_title(GTK_WINDOW(c->win), t);
 	g_free(t);
+}
+
+void
+updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) {
+	WebKitDownloadStatus status;
 
+	status = webkit_download_get_status(c->download);
+	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
+	}
+	update(c);
 }
 
 void
@@ -793,10 +786,16 @@ updatewinid(Client *c) {
 			(int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
 }
 
+void
+usage(void) {
+	fputs("surf - simple browser\n", stderr);
+	die("usage: surf [-e Window] [-x] [uri]\n");
+}
+
 void
 windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
 	JSStringRef jsscript;
-	gchar *script;
+	char *script;
 	JSValueRef exception = NULL;
 	GError *error;
 	
@@ -808,12 +807,15 @@ windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObje
 
 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 */
+	else {			/* reset */
+		c->zoomed = FALSE;
 		webkit_web_view_set_zoom_level(c->view, 1.0);
+	}
 }
 
 int main(int argc, char *argv[]) {
@@ -844,9 +846,8 @@ int main(int argc, char *argv[]) {
 		arg.v = argv[i];
 	setup();
 	newclient();
-	if(arg.v) {
+	if(arg.v)
 		loaduri(clients, &arg);
-	}
 	gtk_main();
 	cleanup();
 	return EXIT_SUCCESS;