X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=surf.c;h=37135d80820c3d36635a78e7e3501a45d832a01d;hb=19aaa5a74b16fd6fafbfaf6081e4f89491f0f344;hp=bc73c7305cd23a74c95f8e23e4c2b033be180c1d;hpb=e2cae4d1f55738de53046a324289f5868ce5a502;p=surf.git

diff --git a/surf.c b/surf.c
index bc73c73..37135d8 100644
--- a/surf.c
+++ b/surf.c
@@ -80,7 +80,9 @@ 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, Atom 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 void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
@@ -99,6 +101,7 @@ static void reload(Client *c, const Arg *arg);
 static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void scroll(Client *c, const Arg *arg);
 static void setatom(Client *c, Atom 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);
@@ -300,6 +303,11 @@ find(Client *c, const Arg *arg) {
 	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
 
+const char *
+getcookies(SoupURI *uri) {
+	return NULL;
+}
+
 const char *
 getatom(Client *c, Atom a) {
 	static char buf[BUFSIZ];
@@ -328,10 +336,25 @@ geturi(Client *c) {
 	return uri;
 }
 
+void
+gotheaders(SoupMessage *msg, gpointer v) {
+	SoupURI *uri;
+	GSList *l, *p;
+
+	uri = soup_message_get_uri(msg);
+	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) {
 	const char *filename;
 	char *uri, *html;
+	WebKitWebBackForwardList *h;
+	WebKitWebHistoryItem *i;
 
 	stop(c, NULL);
 	c->download = o;
@@ -345,6 +368,9 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	html = g_strdup_printf("Download <b>%s</b>...", filename);
 	webkit_web_view_load_html_string(c->view, html,
 			webkit_download_get_uri(c->download));
+	h = webkit_web_view_get_back_forward_list(c->view);
+	i = webkit_web_history_item_new_with_data(webkit_download_get_uri(c->download), filename);
+	webkit_web_back_forward_list_add_item(h, i);
 	g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
 	g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
 	webkit_download_start(c->download);
@@ -555,10 +581,18 @@ newclient(void) {
 	return c;
 }
 
-static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+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
@@ -668,6 +702,11 @@ scroll(Client *c, const Arg *arg) {
 	gtk_adjustment_set_value(a, v);
 }
 
+void
+setcookie(SoupCookie *c) {
+
+}
+
 void
 setatom(Client *c, Atom a, const char *v) {
 	XSync(dpy, False);
@@ -829,7 +868,8 @@ zoom(Client *c, const Arg *arg) {
 	}
 }
 
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[]) {
 	int i;
 	Arg arg;