X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=3460e36858aadf1be119e17b6cb6713f99a56cdc;hb=486a9cc9085d84816bbcaadc179669441f5f5aae;hp=5e3fc12637b47f102835c61d18034e44bbbf9238;hpb=b35dd763449dcfce376844565133f2149b9f4084;p=surf.git

diff --git a/surf.c b/surf.c
index 5e3fc12..3460e36 100644
--- a/surf.c
+++ b/surf.c
@@ -72,6 +72,7 @@ extern gint optind;
 
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
+static gchar *copystr(gchar **str, const gchar *src);
 static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
 static void die(char *str);
@@ -89,7 +90,7 @@ static void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c);
 static void loadfile(Client *c, const gchar *f);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
-static Client *newclient();
+static Client *newclient(void);
 static WebKitWebView *newwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c);
 static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
@@ -98,9 +99,9 @@ static void proccookies(SoupMessage *m, Client *c);
 static void progresschange(WebKitWebView *view, gint p, Client *c);
 static void request(SoupSession *s, SoupMessage *m, Client *c);
 static void reload(Client *c, const Arg *arg);
-static void rereadcookies();
+static void rereadcookies(void);
 static void setcookie(char *name, char *val, char *dom, char *path, long exp);
-static void setup();
+static void setup(void);
 static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
 		const gchar* title, Client *c);
 static void scroll(Client *c, const Arg *arg);
@@ -110,8 +111,9 @@ static void showsearch(Client *c, const Arg *arg);
 static void showurl(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
 static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
-static void usage();
-static void update(Client *c, const gchar *title);
+static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
+static void usage(void);
+static void update(Client *c);
 static void zoom(Client *c, const Arg *arg);
 
 #include "config.h"
@@ -125,12 +127,25 @@ cleanup(void) {
 void
 clipboard(Client *c, const Arg *arg) {
 	gboolean paste = *(gboolean *)arg;
+
 	if(paste)
 		gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
 	else
 		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
 }
 
+gchar *
+copystr(gchar **str, const gchar *src) {
+	gchar *tmp;
+	tmp = g_strdup(src);
+
+	if(str && *str) {
+		g_free(*str);
+		*str = tmp;
+	}
+	return tmp;
+}
+
 void
 destroyclient(Client *c) {
 	Client *p;
@@ -182,7 +197,7 @@ drawindicator(Client *c) {
 			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);/*g_free(gc);*/
+	g_object_unref(gc);
 }
 
 gboolean
@@ -199,7 +214,7 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
 		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
 	}
-	update(c, NULL);
+	update(c);
 }
 
 gboolean
@@ -223,7 +238,9 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
 	g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
 	webkit_download_start(c->download);
-	update(c, filename);
+	
+	c->title = copystr(&c->title, filename);
+	update(c);
 	g_free(html);
 	return TRUE;
 }
@@ -233,7 +250,7 @@ geturi(Client *c) {
 	gchar *uri;
 
 	if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
-		uri = g_strdup("about:blank");
+		uri = copystr(NULL, "about:blank");
 	return uri;
 }
 
@@ -263,8 +280,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	else
 		focus = BROWSER;
 	for(i = 0; i < LENGTH(keys); i++) {
-		if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
-				CLEANMASK(ev->state) == keys[i].mod
+		if(focus & keys[i].focus
+				&& 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;
@@ -278,7 +296,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
 	if(l)
 		gtk_window_set_title(GTK_WINDOW(c->win), l);
 	else
-		update(c, NULL);
+		update(c);
 }
 
 void
@@ -295,7 +313,7 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 	c->progress = 0;
-	update(c, NULL);
+	update(c);
 }
 
 void
@@ -326,7 +344,8 @@ loadfile(Client *c, const gchar *f) {
 		arg.v = uri = g_strdup_printf("file://%s", f);
 		loaduri(c, &arg);
 	}
-	update(c, uri);
+	c->title = copystr(&c->title, uri);
+	update(c);
 	g_free(uri);
 }
 
@@ -340,8 +359,9 @@ loaduri(Client *c, const Arg *arg) {
 		: g_strdup_printf("http://%s", uri);
 	webkit_web_view_load_uri(c->view, u);
 	c->progress = 0;
-	update(c, u);
+	c->title = copystr(&c->title, u);
 	g_free(u);
+	update(c);
 }
 
 void
@@ -389,10 +409,12 @@ newclient(void) {
 	/* urlbar */
 	c->urlbar = gtk_entry_new();
 	gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
+	g_signal_connect(G_OBJECT(c->urlbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
 
 	/* searchbar */
 	c->searchbar = gtk_entry_new();
 	gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+	g_signal_connect(G_OBJECT(c->searchbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
 
 	/* indicator */
 	c->indicator = gtk_drawing_area_new();
@@ -503,7 +525,7 @@ proccookies(SoupMessage *m, Client *c) {
 void
 progresschange(WebKitWebView* view, gint p, Client *c) {
 	c->progress = p;
-	update(c, NULL);
+	update(c);
 }
 
 void
@@ -522,7 +544,7 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-rereadcookies() {
+rereadcookies(void) {
 	const gchar *filename, *home;
 
 	home = g_get_home_dir();
@@ -548,7 +570,7 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) {
 }
 
 void
-setup() {
+setup(void) {
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
 	urlprop = XInternAtom(dpy, "_SURF_URL", False);
@@ -603,24 +625,27 @@ stop(Client *c, const Arg *arg) {
 
 void
 titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
-	update(c, t);
+	c->title = copystr(&c->title, t);
+	update(c);
+}
+
+gboolean
+unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+	hidesearch(c, NULL);
+	hideurl(c, NULL);
+	return TRUE;
 }
 
 void
-usage() {
+usage(void) {
 	fputs("surf - simple browser\n", stderr);
 	die("usage: surf [-e] [-x] [uri]\n");
 }
 
 void
-update(Client *c, const char *title) {
+update(Client *c) {
 	gchar *t;
 
-	if(title) {
-		if(c->title)
-			g_free(c->title);
-		c->title = g_strdup(title);
-	}
 	if(c->progress == 100)
 		t = g_strdup(c->title);
 	else