typo

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index b4e77f3..42b250a 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -45,7 +45,8 @@ static void progresschange(WebKitWebView *view, gint p, gpointer d);
 static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
 static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
 static void destroyclient(Client *c);
-static gboolean newwindow(WebKitWebView *view, WebKitWebFrame *f,
+static WebKitWebView *newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d);
+static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f,
                WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
                WebKitWebPolicyDecision *p, gpointer d);
 static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
@@ -123,16 +124,20 @@ download(WebKitWebView *view, GObject *o, gpointer d) {
 }
 
 gboolean
-newwindow(WebKitWebView *view, WebKitWebFrame *f,
+decidewindow(WebKitWebView *view, WebKitWebFrame *f,
                WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
                WebKitWebPolicyDecision *p, gpointer d) {
        /* TODO */
-       puts("new");
-       Client *c = newclient();
-       webkit_web_view_load_request(c->view, r);
        return TRUE;
 }
 
+WebKitWebView *
+newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d) {
+       /* TODO */
+       Client *c = newclient();
+       return c->view;
+}
+
 void
 linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
        Client *c = (Client *)d;
@@ -154,7 +159,6 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
        XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
                        XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
                        strlen(uri) + 1);
-       gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
 }
 
 void
@@ -196,25 +200,27 @@ void
 destroyclient(Client *c) {
        Client *p;
 
-       gtk_widget_destroy(c->win);
+       gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
        gtk_widget_destroy(c->scroll);
-       gtk_widget_destroy(c->vbox);
        gtk_widget_destroy(c->urlbar);
        gtk_widget_destroy(c->urllist);
        gtk_widget_destroy(c->searchbar);
-       if(clients == c && c->next == NULL)
-               gtk_main_quit();
+       gtk_widget_destroy(c->vbox);
+       gtk_widget_destroy(c->win);
        for(p = clients; p && p->next != c; p = p->next);
        if(p)
                p->next = c->next;
        else
                clients = c->next;
        free(c);
+       if(clients == NULL)
+               gtk_main_quit();
 }
 
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
        Client *c = (Client *)d;
+       gchar *uri;
 
        if(ev->type != GDK_KEY_PRESS)
                return FALSE;
@@ -231,6 +237,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
                        return TRUE;
                case GDK_g:
                        gtk_widget_hide(c->searchbar);
+                       if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
+                               uri = "(null)";
+                       gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
                        gtk_widget_show(c->urlbar);
                        gtk_widget_grab_focus(c->urlbar);
                        return TRUE;
@@ -316,7 +325,8 @@ newclient(void) {
        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), "hovering-over-link", G_CALLBACK(linkhover), c);
-       g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(newwindow), c);
+       g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
+       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(download), c);
 
        /* urlbar */