X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=09cf8401abf72157f6296c66d5ea1fe031666973;hb=f304d0af52a7141f8395b0eea961292fa91104f0;hp=b96ecf3837bc452a1963f2114ff618cc04937140;hpb=4b1b1b8a2070793e7f6467f2005d6fbd1ae63065;p=surf.git

diff --git a/surf.c b/surf.c
index b96ecf3..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))
@@ -149,6 +150,19 @@ cleanup(void) {
 	g_free(stylefile);
 }
 
+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;
@@ -254,7 +268,7 @@ void
 download(Client *c, const Arg *arg) {
 	char *uri;
 	WebKitNetworkRequest *r;
-	WebKitDownload       *dl;
+	WebKitDownload *dl;
 
 	if(arg->v)
 		uri = (char *)arg->v;
@@ -420,18 +434,17 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 
 void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
-	if(c->download)
-		stop(c, NULL);
 	switch(webkit_web_view_get_load_status (c->view)) {
 	case WEBKIT_LOAD_COMMITTED:
-		setatom(c, uriprop, geturi(c));
+	if(c->download)
+		stop(c, NULL);
+	setatom(c, uriprop, geturi(c));
 		break;
 	case WEBKIT_LOAD_FINISHED:
 		c->progress = 0;
 		update(c);
 		break;
-	case WEBKIT_LOAD_PROVISIONAL:
-	case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+	default:
 		break;
 	}
 }
@@ -470,6 +483,7 @@ newclient(void) {
 	int i;
 	Client *c;
 	WebKitWebSettings *settings;
+	WebKitWebFrame *frame;
 	GdkGeometry hints = { 1, 1 };
 	char *uri, *ua;
 
@@ -556,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;
@@ -568,6 +584,8 @@ newclient(void) {
 	g_free(uri);
 	setatom(c, findprop, "");
 	setatom(c, uriprop, "");
+	if(!NOBACKGROUND)
+		webkit_web_view_set_transparent(c->view, TRUE);
 
 	c->download = NULL;
 	c->title = NULL;
@@ -703,15 +721,21 @@ 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);
-	if(c->expires == NULL) {
+	if(c->expires == NULL && sessiontime) {
 		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
 		soup_cookie_set_expires(c, e);
 	}
 	soup_cookie_jar_add_cookie(j, c);
 	g_object_unref(j);
+	flock(lock, LOCK_UN);
+	close(lock);
 }
 
 void
@@ -852,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