X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=934694eba39ffd35343f5134d0a666670590e5ae;hb=60dd7545d3ff693d159eef10d0645245c494c35f;hp=b6b8c928c13961a56f7849c107eff5d11566c4c7;hpb=e3690dffed6b6ebd09f53d70d05af6c8504aa0f1;p=surf.git

diff --git a/surf.c b/surf.c
index b6b8c92..934694e 100644
--- a/surf.c
+++ b/surf.c
@@ -30,32 +30,26 @@ union Arg {
 };
 
 typedef struct Client {
-	GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
+	GtkWidget *win, *scroll, *vbox, *uribar, *searchbar, *indicator;
+	GtkWidget **items;
 	WebKitWebView *view;
 	WebKitDownload *download;
-	gchar *title;
+	char *title, *linkhover;
 	gint progress;
 	struct Client *next;
+	gboolean zoomed;
 } Client;
 
 typedef struct {
 	char *label;
 	void (*func)(Client *c, const Arg *arg);
 	const Arg arg;
-} Context;
-
-typedef struct Cookie {
-	gchar *name;
-	gchar *value;
-	gchar *domain;
-	gchar *path;
-	struct Cookie *next;
-} Cookie;
+} Item;
 
 typedef enum {
 	Browser = 0x0001,
 	SearchBar = 0x0010,
-	UrlBar = 0x0100,
+	UriBar = 0x0100,
 	Any = ~0,
 } KeyFocus;
 
@@ -68,35 +62,38 @@ typedef struct {
 } Key;
 
 static Display *dpy;
-static Atom urlprop;
-static SoupCookieJar *cookiejar;
+static Atom uriprop;
+static SoupCookieJar *cookies;
 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 char winid[64];
+static char *progname;
+static gboolean lockcookie = FALSE;
 
-static gchar *buildpath(const gchar *path);
+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 gchar *copystr(gchar **str, const gchar *src);
+static char *copystr(char **str, const char *src);
 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 die(char *str);
 static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-static gchar *geturi(Client *c);
+static char *geturi(Client *c);
 static void hidesearch(Client *c, const Arg *arg);
-static void hideurl(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 linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loaduri(Client *c, const Arg *arg);
@@ -104,26 +101,23 @@ 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 pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
+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 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 void reloadcookies();
 static void reload(Client *c, const Arg *arg);
-static void rereadcookies(void);
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 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 scroll(Client *c, const Arg *arg);
 static void searchtext(Client *c, const Arg *arg);
 static void source(Client *c, const Arg *arg);
 static void showsearch(Client *c, const Arg *arg);
-static void showurl(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 gchar* title, Client *c);
+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);
@@ -134,9 +128,18 @@ static void zoom(Client *c, const Arg *arg);
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-gchar *
-buildpath(const gchar *path) {
-	gchar *apath, *p;
+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;
 	FILE *f;
 
 	/* creating directory */
@@ -155,6 +158,27 @@ buildpath(const gchar *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)
@@ -170,20 +194,30 @@ clipboard(Client *c, const Arg *arg) {
 	gboolean paste = *(gboolean *)arg;
 
 	if(paste)
-		gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
+		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);
 }
 
 void
 context(WebKitWebView *v, GtkMenu *m, Client *c) {
-
-	//gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
+	int i;
+	GtkContainer *parent;
+
+	gtk_widget_hide_all(GTK_WIDGET(m));
+	gtk_widget_show(GTK_WIDGET(m));
+	for(i = 0; i < LENGTH(items); i++) {
+		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) {
@@ -195,14 +229,20 @@ copystr(gchar **str, const gchar *src) {
 
 void
 destroyclient(Client *c) {
+	int i;
 	Client *p;
 
 	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
-	gtk_widget_destroy(c->urlbar);
+	gtk_widget_destroy(c->uribar);
 	gtk_widget_destroy(c->searchbar);
 	gtk_widget_destroy(c->vbox);
+	gtk_widget_destroy(c->indicator);
 	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;
@@ -231,7 +271,7 @@ destroywin(GtkWidget* w, Client *c) {
 }
 
 void
-die(gchar *str) {
+die(char *str) {
 	fputs(str, stderr);
 	exit(EXIT_FAILURE);
 }
@@ -239,7 +279,7 @@ die(gchar *str) {
 void
 drawindicator(Client *c) {
 	gint width;
-	gchar *uri;
+	char *uri;
 	GtkWidget *w;
 	GdkGC *gc;
 	GdkColor fg;
@@ -278,8 +318,8 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 
 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;
@@ -301,12 +341,12 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	return TRUE;
 }
 
-gchar *
+char *
 geturi(Client *c) {
-	gchar *uri;
+	char *uri;
 
-	if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
-		uri = copystr(NULL, "about:blank");
+	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
+		uri = "about:blank";
 	return uri;
 }
 
@@ -317,11 +357,22 @@ hidesearch(Client *c, const Arg *arg) {
 }
 
 void
-hideurl(Client *c, const Arg *arg) {
-	gtk_widget_hide(c->urlbar);
+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 char *label;
+
+	label = gtk_menu_item_get_label(mi);
+	for(i = 0; i < LENGTH(items); i++)
+		if(!strcmp(items[i].label, label))
+			items[i].func(c, &(items[i].arg));
+}
+
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	guint i, focus;
@@ -331,8 +382,8 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 		return FALSE;
 	if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
 		focus = SearchBar;
-	else if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
-		focus = UrlBar;
+	else if(GTK_WIDGET_HAS_FOCUS(c->uribar))
+		focus = UriBar;
 	else
 		focus = Browser;
 	updatewinid(c);
@@ -349,22 +400,27 @@ 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)
-		gtk_window_set_title(GTK_WINDOW(c->win), l);
-	else
-		update(c);
+		c->linkhover = copystr(&c->linkhover, l);
+	else if(c->linkhover) {
+		free(c->linkhover);
+		c->linkhover = NULL;
+	}
+	update(c);
 }
 
 void
 loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	gchar *uri;
+	char *uri;
 
 	ignore_once = TRUE;
 	uri = geturi(c);
-	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), uriprop,
 			XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
 			strlen(uri) + 1);
+
+	reloadcookies();
 }
 
 void
@@ -375,10 +431,13 @@ loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 
 void
 loaduri(Client *c, const Arg *arg) {
-	gchar *u;
-	const gchar *uri = (gchar *)arg->v;
+	char *u;
+	const char *uri = (char *)arg->v;
+
 	if(!uri)
-		uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar));
+		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);
@@ -396,9 +455,10 @@ navigate(Client *c, const Arg *arg) {
 
 Client *
 newclient(void) {
+	int i;
 	Client *c;
 	WebKitWebSettings *settings;
-	gchar *uri;
+	char *uri;
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
@@ -413,6 +473,17 @@ 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");
+
+	/* 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);
@@ -433,13 +504,12 @@ newclient(void) {
 	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(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);
 
-	/* urlbar */
-	c->urlbar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
+	/* uribar */
+	c->uribar = gtk_entry_new();
+	gtk_entry_set_has_frame(GTK_ENTRY(c->uribar), FALSE);
 
 	/* searchbar */
 	c->searchbar = gtk_entry_new();
@@ -456,17 +526,17 @@ newclient(void) {
 	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->uribar);
 	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->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->urlbar);
+	gtk_widget_hide_all(c->uribar);
 	gtk_widget_show(c->vbox);
 	gtk_widget_show(c->indicator);
 	gtk_widget_show(c->scroll);
@@ -495,10 +565,10 @@ newclient(void) {
 
 void
 newwindow(Client *c, const Arg *arg) {
-	guint i = 0, urlindex;
-	const gchar *cmd[7];
+	guint i = 0;
+	const char *cmd[7], *uri;
 	const Arg a = { .v = (void *)cmd };
-	gchar tmp[64];
+	char tmp[64];
 
 	cmd[i++] = progname;
 	if(embed) {
@@ -510,9 +580,9 @@ newwindow(Client *c, const Arg *arg) {
 		cmd[i++] = "-x";
 	}
 	cmd[i++] = "--";
-	urlindex = i;
-	if(arg->v)
-		cmd[i++] = (char *)arg->v;
+	uri = arg->v ? (char *)arg->v : autouri(c);
+	if(uri)
+		cmd[i++] = uri;
 	cmd[i++] = NULL;
 	spawn(NULL, &a);
 }
@@ -524,7 +594,7 @@ createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
 }
 
 void
-pasteurl(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);
@@ -542,11 +612,11 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 
 	if(((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
-		if(ev->atom == urlprop && ev->state == PropertyNewValue) {
+		if(ev->atom == uriprop && ev->state == PropertyNewValue) {
 			if(ignore_once)
 			       ignore_once = FALSE;
 			else {
-				XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
+				XGetWindowProperty(dpy, ev->window, uriprop, 0L, BUFSIZ, False, XA_STRING,
 					&adummy, &idummy, &ldummy, &ldummy, &buf);
 				arg.v = buf;
 				loaduri(c, &arg);
@@ -563,33 +633,12 @@ 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;
 	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;
@@ -600,8 +649,20 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-rereadcookies(void) {
+reloadcookies() {
+	SoupCookieJar *jar;
+	GSList *l, *e;
 
+	lockcookie = TRUE;
+	for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next)
+		soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data);
+	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
@@ -617,6 +678,19 @@ scroll(Client *c, const Arg *arg) {
 	gtk_adjustment_set_value(a, v);
 }
 
+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
 sigchld(int unused) {
 	if(signal(SIGCHLD, sigchld) == SIG_ERR)
@@ -624,11 +698,6 @@ sigchld(int unused) {
 	while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
-void
-setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp) {
-
-}
-
 void
 setup(void) {
 	SoupSession *s;
@@ -641,7 +710,7 @@ setup(void) {
 
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
-	urlprop = XInternAtom(dpy, "_SURF_URL", False);
+	uriprop = XInternAtom(dpy, "_SURF_URI", False);
 
 	/* create dirs and files */
 	cookiefile = buildpath(cookiefile);
@@ -651,13 +720,15 @@ setup(void) {
 
 	/* cookie persistance */
 	s = webkit_get_default_session();
-	cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	cookies = soup_cookie_jar_new();
+	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) {
-	hideurl(c, NULL);
+	hideuri(c, NULL);
 	gtk_widget_show(c->searchbar);
 	gtk_widget_grab_focus(c->searchbar);
 }
@@ -674,7 +745,7 @@ source(Client *c, const Arg *arg) {
 
 void
 searchtext(Client *c, const Arg *arg) {
-	const gchar *text;
+	const char *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);
@@ -682,14 +753,14 @@ searchtext(Client *c, const Arg *arg) {
 }
 
 void
-showurl(Client *c, const Arg *arg) {
-	gchar *uri;
+showuri(Client *c, const Arg *arg) {
+	char *uri;
 
 	hidesearch(c, NULL);
 	uri = geturi(c);
-	gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
-	gtk_widget_show(c->urlbar);
-	gtk_widget_grab_focus(c->urlbar);
+	gtk_entry_set_text(GTK_ENTRY(c->uribar), uri);
+	gtk_widget_show(c->uribar);
+	gtk_widget_grab_focus(c->uribar);
 }
 
 void
@@ -707,15 +778,15 @@ spawn(Client *c, const Arg *arg) {
 		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) {
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
 	c->title = copystr(&c->title, t);
 	update(c);
 }
@@ -723,7 +794,7 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
 gboolean
 focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
 	hidesearch(c, NULL);
-	hideurl(c, NULL);
+	hideuri(c, NULL);
 	return FALSE;
 }
 
@@ -735,12 +806,14 @@ usage(void) {
 
 void
 update(Client *c) {
-	gchar *t;
+	char *t;
 
-	if(c->progress == 100)
-		t = g_strdup(c->title);
-	else
+	if(c->progress != 100)
 		t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+	else if(c->linkhover)
+		t = g_strdup(c->linkhover);
+	else
+		t = g_strdup(c->title);
 	drawindicator(c);
 	gtk_window_set_title(GTK_WINDOW(c->win), t);
 	g_free(t);
@@ -756,7 +829,7 @@ updatewinid(Client *c) {
 void
 windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
 	JSStringRef jsscript;
-	gchar *script;
+	char *script;
 	JSValueRef exception = NULL;
 	GError *error;
 	
@@ -768,12 +841,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[]) {