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 void togglefullscreen(Client *c, const Arg *a);
static gboolean permissionrequested(WebKitWebView *v,
WebKitPermissionRequest *r, Client *c);
static const char *getatom(Client *c, int a);
static void print(Client *c, const Arg *arg);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
gpointer d);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
static void linkopen(Client *c, const Arg *arg);
static void linkopenembed(Client *c, const Arg *arg);
static void spawn(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
-static void titlechangeleave(void *a, void *b, Client *c);
static void toggle(Client *c, const Arg *arg);
static void togglecookiepolicy(Client *c, const Arg *arg);
static void togglegeolocation(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 */
}
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
}
void
-fullscreen(Client *c, const Arg *arg)
+togglefullscreen(Client *c, const Arg *a)
{
+ /* toggling value is handled in winevent() */
if (c->fullscreen)
gtk_window_unfullscreen(GTK_WINDOW(c->win));
else
gtk_window_fullscreen(GTK_WINDOW(c->win));
- c->fullscreen = !c->fullscreen;
}
gboolean
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);
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);
if (runinfullscreen)
- fullscreen(c, NULL);
+ togglefullscreen(c, NULL);
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
g_signal_connect(G_OBJECT(w), "destroy",
G_CALLBACK(destroywin), c);
- g_signal_connect(G_OBJECT(w), "leave_notify_event",
- G_CALLBACK(titlechangeleave), c);
+ g_signal_connect(G_OBJECT(w), "leave-notify-event",
+ G_CALLBACK(winevent), c);
+ g_signal_connect(G_OBJECT(w), "window-state-event",
+ G_CALLBACK(winevent), c);
return w;
}
}
}
-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)
{
updatetitle(c);
}
-void
-titlechangeleave(void *a, void *b, Client *c)
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
{
- c->linkhover = NULL;
- updatetitle(c);
+ switch (e->type) {
+ case GDK_LEAVE_NOTIFY:
+ c->targeturi = NULL;
+ updatetitle(c);
+ break;
+ case GDK_WINDOW_STATE: /* fallthrough */
+ if (e->window_state.changed_mask ==
+ GDK_WINDOW_STATE_FULLSCREEN) {
+ c->fullscreen = e->window_state.new_window_state &
+ GDK_WINDOW_STATE_FULLSCREEN;
+ break;
+ }
+ default:
+ return FALSE;
+ }
+
+ return TRUE;
}
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)
{