From: Enno Boland (tox) <tox@s01.de>
Date: Fri, 16 Oct 2009 08:55:05 +0000 (+0200)
Subject: improving urlbar hiding.
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=7e86ea553f88a0be2b15de257a231e5783daa49f;p=surf.git

improving urlbar hiding.
---

diff --git a/surf.c b/surf.c
index 187d1e1..948ca28 100644
--- a/surf.c
+++ b/surf.c
@@ -117,7 +117,7 @@ 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 gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
+static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
 static void usage(void);
 static void update(Client *c);
 static void updatewinid(Client *c);
@@ -419,16 +419,15 @@ newclient(void) {
 	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);
 
 	/* 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();
@@ -508,7 +507,6 @@ createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
 	return n->view;
 }
 
- 
 void
 pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
 	Arg arg = {.v = text };
@@ -707,7 +705,7 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
 }
 
 gboolean
-unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
 	hidesearch(c, NULL);
 	hideurl(c, NULL);
 	return FALSE;