Use JavaScriptCore for evaluation, with Uzbl.run()

Both "js" and "script" commands use eval_js(), which creates an instance
of the Uzbl object class (created by js_init()) which right now provides
only a run() method (handled by js_run_command()). After evaluating the
code, eval_js() removes the object so the scripts from the loaded page
can't access it.

eval_js() supports returning a string result, and you can use it with
uzblctrl to query the DOM. Uzbl.run() also returns a string, but the
only useful thing you can do right now with that is to print @uri or
other variables.

1 files changed, 10 insertions, 0 deletions

diff --git a/uzbl.h b/uzbl.h
index 2b36edd..2cf0346 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -176,6 +176,12 @@ typedef struct {
     GHashTable* commands;
 } Behaviour;
 
+/* javascript */
+typedef struct {
+    gboolean            initialized;
+    JSClassDefinition   classdef;
+    JSClassRef          classref;
+} Javascript;
 
 /* main uzbl data structure */
 typedef struct {
@@ -184,6 +190,7 @@ typedef struct {
     Network       net;
     Behaviour     behave;
     Communication comm;
+    Javascript    js;
 
     Window        xwin;
     GScanner      *scan;
@@ -458,6 +465,9 @@ static void
 dehilight (WebKitWebView *page, GArray *argv, GString *result);
 
 static void
+eval_js(WebKitWebView * web_view, gchar *script, GString *result);
+
+static void
 run_js (WebKitWebView * web_view, GArray *argv, GString *result);
 
 static void