changeset: 104:8b96628da4e9
tag: tip
user: Enno Boland (tox) <tox_AT_s01.de>
date: Wed Sep 16 10:06:21 2009 +0200
files: surf.c
description:
adding user.js support.
diff -r e0565db32ec1 -r 8b96628da4e9 surf.c
--- a/surf.c Sun Sep 13 16:15:28 2009 +0200
+++ b/surf.c Wed Sep 16 10:06:21 2009 +0200
@@ -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,6 +59,8 @@
KeyFocus focus;
} Key;
+static Display *dpy;
+static Atom urlprop;
static SoupCookieJar *cookiejar;
static SoupSession *session;
static Client *clients = NULL;
@@ -115,6 +116,7 @@
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"
@@ -408,6 +410,7 @@
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 */
@@ -426,8 +429,6 @@
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);
@@ -688,6 +689,23 @@
}
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 */
webkit_web_view_zoom_out(c->view);
Received on Wed Sep 16 2009 - 08:04:42 UTC
This archive was generated by hypermail 2.2.0 : Wed Sep 16 2009 - 08:12:17 UTC