changing SETPROP()-macro

.hgtags

@@ -3,3 +3,4 @@ d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
 9c8ebcf54061112b5979742b403de26fc94007ff 0.1
 3ef997607115303fe93873b592d152f0ec186f77 0.1.1
 bffb0c3c23410ac7f260d167f4b9771497fc1127 0.1.2
+a5db79d487c85615be2ecf30815c6b4977e88000 0.2

config.def.h

@@ -4,41 +4,44 @@ static char *progress       = "#FF0000";
 static char *progress_trust = "#00FF00";
 static char *stylefile      = ".surf/style.css";
 static char *scriptfile     = ".surf/script.js";
-static char *cookiefile     = ".surf/cookie.txt";
+static char *cookiefile     = ".surf/cookies.txt";
 static char *dldir          = ".surf/dl";
+static time_t sessiontime   = 3600;
+
+#define SETPROP(p)       { .v = (char *[]){ "/bin/sh", "-c", \
+	"prop=\"`dmenu < /dev/null`\" &&" \
+		"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
+	p, winid, NULL } }
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE },  Any },
+    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE }, Any },
+    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY,               GDK_g,      showuri,    { 0 },          Any },
+    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
-    { MODKEY,               GDK_slash,  showsearch, { 0 },          Any },
+    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { 0,                    GDK_Escape, hidesearch, { 0 },          Any },
+    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
-    { 0,                    GDK_Escape, hideuri,    { 0 },          Any },
+    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 },          Any },
+    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  Browser },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, Browser },
+    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 },    Browser },
+    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 },    Browser },
+    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  },    Browser },
+    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 },    Browser },
+    { 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 },    Browser },
+    { MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 },    Browser },
+    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI") },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 },    Browser },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND") },
-    { 0,                    GDK_Escape, stop,       { 0 },          Browser },
+    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY,               GDK_o,      source,     { 0 },          Browser },
+    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
-    { MODKEY,               GDK_n,      searchtext, { .b = TRUE },  Browser|SearchBar },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      searchtext, { .b = FALSE }, Browser|SearchBar },
-    { 0,                    GDK_Return, searchtext, { .b = TRUE },  SearchBar },
-    { GDK_SHIFT_MASK,       GDK_Return, searchtext, { .b = FALSE }, SearchBar },
-    { 0,                    GDK_Return, loaduri,    { .v = NULL },  UriBar },
-    { 0,                    GDK_Return, hideuri,    { 0 },          UriBar },
 };
 
 static Item items[] = {
+    { "Back",           navigate,  { .i = -1 } },
+    { "Forward",        navigate,  { .i = +1 } },
     { "New Window",     newwindow, { .v = NULL } },
     { "Reload",         reload,    { .b = FALSE } },
     { "Stop",           stop,      { 0 } },
-    { "<===",           navigate,  { .i = -1 } },
+    { "Paste URI",      clipboard, { .b = TRUE } },
-    { "===>",           navigate,  { .i = +1 } },
+    { "Copy URI",       clipboard, { .b = FALSE } },
+    { "Download",       download,  { 0 } },
 };

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.2
+VERSION = 0.3
 
 # Customize below to fit your system
 
@@ -17,10 +17,8 @@ LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Werror -O0 ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
-#LDFLAGS = -s ${LIBS}
-LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

surf.1

@@ -33,6 +33,21 @@ Walks back the history.
 .B Ctrl\-l
 Walks forward the history.
 .TP
+.B Ctrl\-k
+Scrolls page upwards.
+.TP
+.B Ctrl\-j
+Scrolls page downwards.
+.TP
+.B Ctrl\-Shift\-k
+Zooms page in.
+.TP
+.B Ctrl\-Shift\-j
+Zooms page out
+.TP
+.B Ctrl\-Shift\-i
+Resets Zoom
+.TP
 .B Ctrl\-/
 Opens the search-bar.
 .TP
@@ -42,6 +57,9 @@ Opens the URL-bar.
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP
+.B Ctrl\-Shift\-p
+Calls Printpage Dialog.
+.TP
 .B Ctrl\-r
 Reloads the website.
 .TP
@@ -50,6 +68,9 @@ Reloads the website without using cache.
 .TP
 .B Ctrl\-y
 Copies current URI to primary selection.
+.TP
+.B Ctrl\-o
+show the sourcecode of the current page.
 .SH SEE ALSO
 .BR dmenu(1)
 .BR xprop(1)

surf.c

@@ -24,19 +24,21 @@
 
 typedef union Arg Arg;
 union Arg {
-	const gboolean b;
+	gboolean b;
-	const gint i;
+	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;
 	char *title, *linkhover;
+	const char *uri, *needle;
 	gint progress;
 	struct Client *next;
+	gboolean zoomed;
 } Client;
 
 typedef struct {
@@ -45,95 +47,78 @@ typedef struct {
 	const Arg arg;
 } Item;
 
-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 Atom uriprop, findprop;
-static SoupCookieJar *cookiejar;
+static SoupCookieJar *cookies;
 static SoupSession *session;
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
-static gboolean ignore_once = FALSE;
+static int ignorexprop = 0;
 static char winid[64];
 static char *progname;
+static gboolean lockcookie = FALSE;
 
-static const char *autouri(Client *c);
 static char *buildpath(const char *path);
+static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 static void context(WebKitWebView *v, GtkMenu *m, Client *c);
 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(char *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void download(Client *c, const Arg *arg);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
-static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
+static void find(Client *c, const Arg *arg);
+static const char *getatom(Client *c, Atom a);
 static char *geturi(Client *c);
-static void hidesearch(Client *c, const Arg *arg);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-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 char* t, const char* l, Client *c);
 static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loadstart(WebKitWebView *v, WebKitWebFrame *f, 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 char *text, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void progresschange(WebKitWebView *v, gint p, Client *c);
 static void reload(Client *c, const Arg *arg);
-static void reloadcookie();
+static void reloadcookies();
-static void sigchld(int unused);
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
-static void setup(void);
-static void spawn(Client *c, const Arg *arg);
 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 spawn(Client *c, const Arg *arg);
-static void showuri(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 gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
-static void usage(void);
 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 char *
-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;
-}
-
 char *
 buildpath(const char *path) {
 	char *apath, *p;
@@ -155,6 +140,27 @@ buildpath(const char *path) {
 	return apath;
 }
 
+void
+changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) {
+	SoupDate *e;
+	SoupCookieJar *jar;
+
+	if(lockcookie)
+		return;
+	if(c && c->expires == NULL) {
+		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+		c = soup_cookie_copy(c);
+		soup_cookie_set_expires(c, e);
+	}
+	
+	jar = soup_cookie_jar_text_new(cookiefile, FALSE);
+	if(c)
+		soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c));
+	else
+		soup_cookie_jar_delete_cookie(jar, oc);
+	g_object_unref(jar);
+}
+
 void
 cleanup(void) {
 	while(clients)
@@ -172,7 +178,7 @@ 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
@@ -203,15 +209,42 @@ copystr(char **str, const char *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++)
@@ -228,18 +261,6 @@ 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);
@@ -251,15 +272,30 @@ die(char *str) {
 	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;
-	char *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);
@@ -281,14 +317,40 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
 }
 
 void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
+find(Client *c, const Arg *arg) {
-	WebKitDownloadStatus status;
+	const char *s;
 
-	status = webkit_download_get_status(c->download);
+	s = getatom(c, findprop);
-	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+	gboolean forward = *(gboolean *)arg;
-		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
+	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
-	update(c);
+
+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
@@ -299,6 +361,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	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;
@@ -306,8 +370,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::progress", G_CALLBACK(updatedownload), c);
-	g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
+	g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
 	webkit_download_start(c->download);
 	
 	c->title = copystr(&c->title, filename);
@@ -316,27 +380,6 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	return TRUE;
 }
 
-char *
-geturi(Client *c) {
-	char *uri;
-
-	if(!(uri = (char *)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;
@@ -350,21 +393,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
+		if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
-				&& 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));
@@ -387,25 +421,14 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 
 void
 loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	char *uri;
+	setatom(c, uriprop, geturi(c));
-
-	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
-loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
 }
 
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
 	c->progress = 0;
 	update(c);
+	reloadcookies();
 }
 
 void
@@ -413,10 +436,6 @@ loaduri(Client *c, const Arg *arg) {
 	char *u;
 	const char *uri = (char *)arg->v;
 
-	if(!uri)
-		uri = autouri(c);
-	if(!uri)
-		return;
 	u = g_strrstr(uri, "://") ? g_strdup(uri)
 		: g_strdup_printf("http://%s", uri);
 	webkit_web_view_load_uri(c->view, u);
@@ -437,6 +456,7 @@ newclient(void) {
 	int i;
 	Client *c;
 	WebKitWebSettings *settings;
+	GdkGeometry hints = { 1, 1 };
 	char *uri;
 
 	if(!(c = calloc(1, sizeof(Client))))
@@ -452,6 +472,7 @@ newclient(void) {
 	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");
@@ -463,39 +484,29 @@ newclient(void) {
 				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-finished", G_CALLBACK(loadfinished), 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(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
 	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 
-	/* uribar */
+	/* Indicator */
-	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 */
 	c->indicator = gtk_drawing_area_new();
 	gtk_widget_set_size_request(c->indicator, 0, 2);
 	g_signal_connect (G_OBJECT (c->indicator), "expose_event",
@@ -505,23 +516,18 @@ 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);
@@ -530,6 +536,7 @@ newclient(void) {
 	uri = g_strconcat("file://", stylefile, NULL);
 	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
 	g_free(uri);
+	setatom(c, findprop, "");
 
 	c->download = NULL;
 	c->title = NULL;
@@ -560,19 +567,13 @@ 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 char *text, gpointer d) {
 	Arg arg = {.v = text };
@@ -580,27 +581,29 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
 		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(ignorexprop)
-			if(ignore_once)
+			ignorexprop--;
-			       ignore_once = FALSE;
+		else if(ev->state == PropertyNewValue) {
-			else {
+			if(ev->atom == uriprop) {
-				XGetWindowProperty(dpy, ev->window, uriprop, 0L, BUFSIZ, False, XA_STRING,
+				arg.v = getatom(c, uriprop);
-					&adummy, &idummy, &ldummy, &ldummy, &buf);
-				arg.v = buf;
 				loaduri(c, &arg);
-				XFree(buf);
+			}
+			else if(ev->atom == findprop) {
+				arg.b = TRUE;
+				find(c, &arg);
 			}
 			return GDK_FILTER_REMOVE;
 		}
@@ -608,11 +611,6 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	return GDK_FILTER_CONTINUE;
 }
 
-void
-print(Client *c, const Arg *arg) {
-	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
-}
-
 void
 progresschange(WebKitWebView *v, gint p, Client *c) {
 	c->progress = p;
@@ -629,13 +627,33 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-reloadcookie(void) {
+reloadcookies() {
-	SoupSession *s;
+	SoupCookieJar *jar;
+	GSList *l, *e;
 
-	/* This forces the cookie to be written to hdd */
+	lockcookie = TRUE;
-	s = webkit_get_default_session();
+	for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next)
-	soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+		soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data);
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	soup_cookies_free(l);
+	jar = soup_cookie_jar_text_new(cookiefile, TRUE);
+	for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next)
+		soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data);
+	g_slist_free(l);
+	lockcookie = FALSE;
+	g_object_unref(jar);
+}
+
+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
@@ -652,10 +670,12 @@ scroll(Client *c, const Arg *arg) {
 }
 
 void
-sigchld(int unused) {
+setatom(Client *c, Atom a, const char *v) {
-	if(signal(SIGCHLD, sigchld) == SIG_ERR)
+	XSync(dpy, False);
-		die("Can't install SIGCHLD handler");
+	ignorexprop++;
-	while(0 < waitpid(-1, NULL, WNOHANG));
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
+			XA_STRING, 8, PropModeReplace, (unsigned char *)v,
+			strlen(v) + 1);
 }
 
 void
@@ -670,7 +690,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);
@@ -680,15 +701,17 @@ setup(void) {
 
 	/* cookie persistance */
 	s = webkit_get_default_session();
-	cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
+	cookies = soup_cookie_jar_new();
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
+	g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
+	reloadcookies();
 }
 
 void
-showsearch(Client *c, const Arg *arg) {
+sigchld(int unused) {
-	hideuri(c, NULL);
+	if(signal(SIGCHLD, sigchld) == SIG_ERR)
-	gtk_widget_show(c->searchbar);
+		die("Can't install SIGCHLD handler");
-	gtk_widget_grab_focus(c->searchbar);
+	while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
 void
@@ -702,23 +725,16 @@ source(Client *c, const Arg *arg) {
 }
 
 void
-searchtext(Client *c, const Arg *arg) {
+spawn(Client *c, const Arg *arg) {
-	const char *text;
+	if(fork() == 0) {
-	gboolean forward = *(gboolean *)arg;
+		if(dpy)
-	text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
+			close(ConnectionNumber(dpy));
-	webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
+		setsid();
-	webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
+		execvp(((char **)arg->v)[0], (char **)arg->v);
+		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
+		perror(" failed");
+		exit(0);
 	}
-
-void
-showuri(Client *c, const Arg *arg) {
-	char *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
@@ -730,44 +746,18 @@ stop(Client *c, const Arg *arg) {
 	c->download = NULL;
 }
 
-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, "tabbed: execvp %s", ((char **)arg->v)[0]);
-		perror(" failed");
-		exit(0);
-	}
-}
-
 void
 titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *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;
-}
-
-void
-usage(void) {
-	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [uri]\n");
-}
-
 void
 update(Client *c) {
 	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
@@ -775,7 +765,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
@@ -784,6 +784,12 @@ 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;
@@ -799,13 +805,16 @@ 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[]) {
 	int i;
@@ -835,9 +844,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;