X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=ae1a9355164b113172604375c4bff3c1920ed0b3;hp=92aff4013a0e39edf5dee80b53373ed98052e4df;hb=25ba840e4d24735118949f38216628792f22d7f5;hpb=de3ed01386c8ec1d2e767760262b84163d44290f

diff --git a/surf.c b/surf.c
index 92aff40..ae1a935 100644
--- a/surf.c
+++ b/surf.c
@@ -21,7 +21,8 @@
 #include <sys/file.h>
 
 #define LENGTH(x)               (sizeof x / sizeof x[0])
-#define CLEANMASK(mask)         (mask & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK|GDK_MOD4_MASK|GDK_MOD5_MASK))
+#define COOKIEJAR_TYPE          (cookiejar_get_type ())
+#define COOKIEJAR(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar))
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
@@ -56,6 +57,17 @@ typedef struct {
 	const Arg arg;
 } Key;
 
+typedef struct {
+	SoupCookieJarText parent_instance;
+	int lock;
+} CookieJar;
+
+typedef struct {
+	SoupCookieJarTextClass parent_class;
+} CookieJarClass;
+
+G_DEFINE_TYPE(CookieJar, cookiejar, SOUP_TYPE_COOKIE_JAR_TEXT)
+
 static Display *dpy;
 static Atom atoms[AtomLast];
 static Client *clients = NULL;
@@ -69,6 +81,10 @@ static char *buildpath(const char *path);
 static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
+static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie);
+static void cookiejar_finalize(GObject *self);
+static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only);
+static void cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec);
 static char *copystr(char **str, const char *src);
 static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m,  WebKitWebPolicyDecision *p, Client *c);
@@ -80,9 +96,7 @@ static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
 static void find(Client *c, const Arg *arg);
 static const char *getatom(Client *c, int a);
-static const char *getcookies(SoupURI *uri);
 static char *geturi(Client *c);
-void gotheaders(SoupMessage *msg, gpointer user_data);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
@@ -91,7 +105,6 @@ static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
 static void newwindow(Client *c, const Arg *arg, gboolean noembed);
-static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c);
 static void popupactivate(GtkMenuItem *menu, Client *);
@@ -103,7 +116,6 @@ static void scroll_h(Client *c, const Arg *arg);
 static void scroll_v(Client *c, const Arg *arg);
 static void scroll(GtkAdjustment *a, const Arg *arg);
 static void setatom(Client *c, int a, const char *v);
-static void setcookie(SoupCookie *c);
 static void setup(void);
 static void sigchld(int unused);
 static void source(Client *c, const Arg *arg);
@@ -170,6 +182,49 @@ cleanup(void) {
 	g_free(stylefile);
 }
 
+static void
+cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie) {
+	flock(COOKIEJAR(self)->lock, LOCK_EX);
+	if(new_cookie && !new_cookie->expires && sessiontime)
+		soup_cookie_set_expires(new_cookie, soup_date_new_from_now(sessiontime));
+	SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, old_cookie, new_cookie);
+	flock(COOKIEJAR(self)->lock, LOCK_UN);
+}
+
+static void
+cookiejar_class_init(CookieJarClass *klass) {
+	SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed;
+	G_OBJECT_CLASS(klass)->get_property = G_OBJECT_CLASS(cookiejar_parent_class)->get_property;
+	G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property;
+	G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize;
+	g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename");
+}
+
+static void
+cookiejar_finalize(GObject *self) {
+	close(COOKIEJAR(self)->lock);
+	G_OBJECT_CLASS(cookiejar_parent_class)->finalize(self);
+}
+
+static void
+cookiejar_init(CookieJar *self) {
+	self->lock = open(cookiefile, 0);
+}
+
+static SoupCookieJar *
+cookiejar_new(const char *filename, gboolean read_only) {
+	return g_object_new(COOKIEJAR_TYPE,
+	                    SOUP_COOKIE_JAR_TEXT_FILENAME, filename,
+	                    SOUP_COOKIE_JAR_READ_ONLY, read_only, NULL);
+} 
+
+static void
+cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec) {
+	flock(COOKIEJAR(self)->lock, LOCK_SH);
+	G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id, value, pspec);
+	flock(COOKIEJAR(self)->lock, LOCK_UN);
+}
+
 void
 evalscript(JSContextRef js, char *script, char* scriptname) {
 	JSStringRef jsscript, jsscriptname;
@@ -286,11 +341,12 @@ drawindicator(Client *c) {
 	w = c->indicator;
 	width = c->progress * w->allocation.width / 100;
 	gc = gdk_gc_new(w->window);
-	if(strstr(uri, "https://") == uri)
+	if(strstr(uri, "https://") == uri) {
 		gdk_color_parse(c->sslfailed ?
 		                progress_untrust : progress_trust, &fg);
-	else
+	} else {
 		gdk_color_parse(progress, &fg);
+	}
 	gdk_gc_set_rgb_fg_color(gc, &fg);
 	gdk_draw_rectangle(w->window,
 			w->style->bg_gc[GTK_WIDGET_STATE(w)],
@@ -315,15 +371,6 @@ find(Client *c, const Arg *arg) {
 	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
 
-const char *
-getcookies(SoupURI *uri) {
-	const char *c;
-	SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, TRUE);
-	c = soup_cookie_jar_get_cookies(j, uri, TRUE);
-	g_object_unref(j);
-	return c;
-}
-
 const char *
 getatom(Client *c, int a) {
 	static char buf[BUFSIZ];
@@ -352,17 +399,6 @@ geturi(Client *c) {
 	return uri;
 }
 
-void
-gotheaders(SoupMessage *msg, gpointer v) {
-	GSList *l, *p;
-
-	for(p = l = soup_cookies_from_response(msg); p;
-		p = g_slist_next(p))  {
-		setcookie((SoupCookie *)p->data);
-	}
-	soup_cookies_free(l);
-}
-
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	Arg arg;
@@ -381,7 +417,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	updatewinid(c);
 	for(i = 0; i < LENGTH(keys); i++) {
 		if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
-				&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+				&& (ev->state & keys[i].mod) == keys[i].mod
 				&& keys[i].func) {
 			keys[i].func(c, &(keys[i].arg));
 			processed = TRUE;
@@ -519,7 +555,7 @@ newclient(void) {
 
 	/* Indicator */
 	c->indicator = gtk_drawing_area_new();
-	gtk_widget_set_size_request(c->indicator, 0, 2);
+	gtk_widget_set_size_request(c->indicator, 0, indicator_thickness);
 	g_signal_connect (G_OBJECT (c->indicator), "expose_event",
 			G_CALLBACK (exposeindicator), c);
 
@@ -534,7 +570,6 @@ newclient(void) {
 	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
 	gtk_widget_grab_focus(GTK_WIDGET(c->view));
 	gtk_widget_show(c->vbox);
-	gtk_widget_show(c->indicator);
 	gtk_widget_show(c->scroll);
 	gtk_widget_show(GTK_WIDGET(c->view));
 	gtk_widget_show(c->win);
@@ -576,19 +611,6 @@ newclient(void) {
 	return c;
 }
 
-void
-newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
-	SoupMessageHeaders *h = msg->request_headers;
-	SoupURI *uri;
-	const char *c;
-
-	soup_message_headers_remove(h, "Cookie");
-	uri = soup_message_get_uri(msg);
-	if((c = getcookies(uri)))
-		soup_message_headers_append(h, "Cookie", c);
-	g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL);
-}
-
 void
 newwindow(Client *c, const Arg *arg, gboolean noembed) {
 	guint i = 0;
@@ -743,25 +765,6 @@ scroll(GtkAdjustment *a, const Arg *arg) {
 	gtk_adjustment_set_value(a, v);
 }
 
-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 && 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
 setatom(Client *c, int a, const char *v) {
 	XSync(dpy, False);
@@ -784,7 +787,6 @@ setup(void) {
 		g_thread_init(NULL);
 
 	dpy = GDK_DISPLAY();
-	s = webkit_get_default_session();
 
 	/* atoms */
 	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
@@ -798,9 +800,9 @@ setup(void) {
 
 	/* request handler */
 	s = webkit_get_default_session();
-	soup_session_remove_feature_by_type(s, soup_cookie_get_type());
-	soup_session_remove_feature_by_type(s, soup_cookie_jar_get_type());
-	g_signal_connect_after(G_OBJECT(s), "request-started", G_CALLBACK(newrequest), NULL);
+
+	/* cookie jar */
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE)));
 
 	/* ssl */
 	g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
@@ -869,13 +871,16 @@ void
 update(Client *c) {
 	char *t;
 
-	if(c->linkhover)
+	if(c->linkhover) {
 		t = g_strdup(c->linkhover);
-        else if(c->progress != 100)
+	} else if(c->progress != 100) {
+		drawindicator(c);
+		gtk_widget_show(c->indicator);
 		t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
-	else
+	} else {
+		gtk_widget_hide_all(c->indicator);
 		t = g_strdup(c->title);
-	drawindicator(c);
+	}
 	gtk_window_set_title(GTK_WINDOW(c->win), t);
 	g_free(t);
 }