next version is 0.2

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index a36af8f..0fbd004 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -15,12 +15,11 @@
 #include <stdio.h>
 #include <webkit/webkit.h>
 #include <glib/gstdio.h>
+#include <JavaScriptCore/JavaScript.h>
 
 #define LENGTH(x)               (sizeof x / sizeof x[0])
 #define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
-Display *dpy;
-Atom urlprop;
 typedef union Arg Arg;
 union Arg {
        const gboolean b;
@@ -60,14 +59,16 @@ typedef struct {
        KeyFocus focus;
 } Key;
 
-SoupCookieJar *cookiejar;
-SoupSession *session;
-Client *clients = NULL;
-Cookie *cookies = NULL;
-GdkNativeWindow embed = 0;
-gboolean showxid = FALSE;
-gboolean ignore_once = FALSE;
-gchar *workdir;
+static Display *dpy;
+static Atom urlprop;
+static SoupCookieJar *cookiejar;
+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 *workdir;
 extern char *optarg;
 extern gint optind;
 
@@ -115,6 +116,7 @@ static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar*
 static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
 static void usage(void);
 static void update(Client *c);
+static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c);
 static void zoom(Client *c, const Arg *arg);
 
 #include "config.h"
@@ -123,6 +125,7 @@ void
 cleanup(void) {
        while(clients)
                destroyclient(clients);
+       g_free(workdir);
 }
 
 void
@@ -407,6 +410,7 @@ newclient(void) {
        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(newwindow), 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);
 
        /* urlbar */
@@ -425,8 +429,6 @@ newclient(void) {
        g_signal_connect (G_OBJECT (c->indicator), "expose_event",
                        G_CALLBACK (exposeindicator), c);
 
-       /* downloadbar */
-
        /* Arranging */
        gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
        gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
@@ -590,13 +592,16 @@ setup(void) {
 
        /* create dirs and files */
        home = g_get_home_dir();
-       workdir = g_build_filename(home, ".surf", NULL);
+       workdir = g_strdup(g_build_filename(home, ".surf", NULL));
        g_mkdir_with_parents(workdir, 0755);
        name = g_build_filename(workdir, "dl", NULL);
        g_mkdir(name, 0755);
        name = g_build_filename(workdir, "style.css", NULL);
        if((tmp = g_fopen(name, "a")));
                fclose(tmp);
+       name = g_build_filename(workdir, "script.js", NULL);
+       if((tmp = g_fopen(name, "a")));
+               fclose(tmp);
 
 
        /* cookie persistance */
@@ -686,6 +691,23 @@ update(Client *c) {
 
 }
 
+void
+windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
+       JSStringRef jsscript;
+       gchar *script, *filename;
+       JSValueRef exception = NULL;
+       GError *error;
+       
+       filename = g_build_filename(workdir, "script.js", NULL);
+       if(g_file_get_contents(filename, &script, NULL, &error)) {
+               script = g_strdup_printf("window.addEventListener"
+                               "('DOMContentLoaded', function () { %s }, true);",
+                               script);
+               jsscript = JSStringCreateWithUTF8CString (script);
+               JSEvaluateScript (js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
+       }
+}
+
 void
 zoom(Client *c, const Arg *arg) {
        if(arg->i < 0)          /* zoom out */
@@ -720,6 +742,7 @@ int main(int argc, char *argv[]) {
                default:
                        usage();
                }
+       setup();
        if(optind + 1 == argc) {
                c = newclient();
                arg.v = argv[optind];
@@ -731,7 +754,6 @@ int main(int argc, char *argv[]) {
        }
        else if(optind != argc)
                usage();
-       setup();
        if(!clients)
                newclient();