Adapt JavaScript functions

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index d6d644d..e8b2c3d 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -124,7 +124,8 @@ static void closeview(WebKitWebView *v, Client *c);
 static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
 static void die(const char *errstr, ...);
-static void eval(Client *c, const Arg *arg);
+static void evalscript(Client *c, const char *jsstr, ...);
+static void runscript(Client *c);
 static void find(Client *c, const Arg *arg);
 static void fullscreen(Client *c, const Arg *arg);
 static gboolean permissionrequested(WebKitWebView *v,
@@ -188,8 +189,6 @@ static void togglestyle(Client *c, const Arg *arg);
 static void updatetitle(Client *c);
 static void updatewinid(Client *c);
 static void usage(void);
-static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
-                                JSContextRef js, JSObjectRef win, Client *c);
 static void zoom(Client *c, const Arg *arg);
 
 /* configuration, allows nested code to access above variables */
@@ -338,29 +337,28 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
 }
 
 void
-evalscript(JSContextRef js, char *script, char* scriptname)
+evalscript(Client *c, const char *jsstr, ...)
 {
-       JSStringRef jsscript, jsscriptname;
-       JSValueRef exception = NULL;
+       va_list ap;
+       gchar *script;
+
+       va_start(ap, jsstr);
+       script = g_strdup_vprintf(jsstr, ap);
+       va_end(ap);
 
-       jsscript = JSStringCreateWithUTF8CString(script);
-       jsscriptname = JSStringCreateWithUTF8CString(scriptname);
-       JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js),
-                        jsscriptname, 0, &exception);
-       JSStringRelease(jsscript);
-       JSStringRelease(jsscriptname);
+       webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+       g_free(script);
 }
 
 void
-runscript(WebKitWebFrame *frame)
+runscript(Client *c)
 {
-       char *script;
-       GError *error;
+       gchar *script;
+       gsize l;
 
-       if (g_file_get_contents(scriptfile, &script, NULL, &error)) {
-               evalscript(webkit_web_frame_get_global_context(frame), script,
-                          scriptfile);
-       }
+       if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+               evalscript(c, script);
+       g_free(script);
 }
 
 void
@@ -993,9 +991,6 @@ newview(Client *c, WebKitWebView *rv)
        g_signal_connect(G_OBJECT(v),
                         "decide-policy",
                         G_CALLBACK(decidepolicy), c);
-       g_signal_connect(G_OBJECT(v),
-                        "window-object-cleared",
-                        G_CALLBACK(windowobjectcleared), c);
        g_signal_connect(G_OBJECT(v),
                         "load-changed",
                         G_CALLBACK(loadchanged), c);
@@ -1037,8 +1032,6 @@ showview(WebKitWebView *v, Client *c)
        gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
        gdk_window_add_filter(gwin, processx, c);
 
-       runscript(frame);
-
        /* This might conflict with _zoomto96dpi_. */
        if (zoomlevel != 1.0)
                webkit_web_view_set_zoom_level(c->view, zoomlevel);
@@ -1325,14 +1318,6 @@ spawn(Client *c, const Arg *arg)
        }
 }
 
-void
-eval(Client *c, const Arg *arg)
-{
-       WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
-       evalscript(webkit_web_frame_get_global_context(frame),
-                  ((char **)arg->v)[0], "");
-}
-
 void
 stop(Client *c, const Arg *arg)
 {
@@ -1528,13 +1513,6 @@ usage(void)
            "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
 
-void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
-                    JSObjectRef win, Client *c)
-{
-       runscript(frame);
-}
-
 void
 zoom(Client *c, const Arg *arg)
 {