summaryrefslogtreecommitdiff
path: root/surf.c
diff options
context:
space:
mode:
Diffstat (limited to 'surf.c')
-rw-r--r--surf.c33
1 files changed, 24 insertions, 9 deletions
diff --git a/surf.c b/surf.c
index 652889b..09cf840 100644
--- a/surf.c
+++ b/surf.c
@@ -18,6 +18,7 @@
#include <webkit/webkit.h>
#include <glib/gstdio.h>
#include <JavaScriptCore/JavaScript.h>
+#include <sys/file.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK))
@@ -150,6 +151,19 @@ cleanup(void) {
}
void
+runscript(WebKitWebFrame *frame, JSContextRef js) {
+ JSStringRef jsscript;
+ char *script;
+ JSValueRef exception = NULL;
+ GError *error;
+
+ if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
+ jsscript = JSStringCreateWithUTF8CString(script);
+ JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
+ }
+}
+
+void
clipboard(Client *c, const Arg *arg) {
gboolean paste = *(gboolean *)arg;
@@ -469,6 +483,7 @@ newclient(void) {
int i;
Client *c;
WebKitWebSettings *settings;
+ WebKitWebFrame *frame;
GdkGeometry hints = { 1, 1 };
char *uri, *ua;
@@ -555,6 +570,8 @@ newclient(void) {
gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
webkit_web_view_set_full_content_zoom(c->view, TRUE);
+ frame = webkit_web_view_get_main_frame(c->view);
+ runscript(frame, webkit_web_frame_get_global_context(frame));
settings = webkit_web_view_get_settings(c->view);
if(!(ua = getenv("SURF_USERAGENT")))
ua = useragent;
@@ -704,6 +721,10 @@ scroll(Client *c, const Arg *arg) {
void
setcookie(SoupCookie *c) {
+ int lock;
+
+ lock = open(cookiefile, 0);
+ flock(lock, LOCK_EX);
SoupDate *e;
SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
c = soup_cookie_copy(c);
@@ -713,6 +734,8 @@ setcookie(SoupCookie *c) {
}
soup_cookie_jar_add_cookie(j, c);
g_object_unref(j);
+ flock(lock, LOCK_UN);
+ close(lock);
}
void
@@ -853,15 +876,7 @@ usage(void) {
void
windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
- JSStringRef jsscript;
- char *script;
- JSValueRef exception = NULL;
- GError *error;
-
- if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
- jsscript = JSStringCreateWithUTF8CString(script);
- JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
- }
+ runscript(frame, js);
}
void