X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=b3b4f91732bd99b98b095b4a8f2cd1e279b76e07;hb=3434ccc16a9a033c17efffb2e83964bb29096ab9;hp=cbd47a1f623e3bf69ec0176e253fa3ea2b0e2b6b;hpb=b2a970d04dda3984074f7823d62ccaf2e038228e;p=surf.git

diff --git a/surf.c b/surf.c
index cbd47a1..b3b4f91 100644
--- a/surf.c
+++ b/surf.c
@@ -62,6 +62,7 @@ static gboolean showxid = FALSE;
 static int ignorexprop = 0;
 static char winid[64];
 static char *progname;
+static gboolean loadimage = 1, plugin = 1, script = 1;
 
 static char *buildpath(const char *path);
 static void cleanup(void);
@@ -79,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);
@@ -89,7 +92,7 @@ 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);
-static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c);
+static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
@@ -98,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);
@@ -299,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];
@@ -327,6 +336,19 @@ 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;
@@ -503,7 +525,6 @@ newclient(void) {
 	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 	g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c);
 	g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c);
-	g_signal_connect(G_OBJECT(c->view), "resource-request-starting", G_CALLBACK(newrequest), c);
 
 	/* Indicator */
 	c->indicator = gtk_drawing_area_new();
@@ -536,6 +557,9 @@ newclient(void) {
 	g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
 	uri = g_strconcat("file://", stylefile, NULL);
 	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+	g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL);
+	g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL);
+	g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL);
 	g_free(uri);
 	setatom(c, findprop, "");
 	setatom(c, uriprop, "");
@@ -552,24 +576,23 @@ newclient(void) {
 	return c;
 }
 
-void func(const char *name, const char *value, void *dummy) {
-printf("%s = %s\n", name, value);
-}
-
+void
+newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+	SoupMessageHeaders *h = msg->request_headers;
+	SoupURI *uri;
+	const char *c;
 
-static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) {
-	SoupMessage *msg = webkit_network_request_get_message(req);
-	SoupMessageHeaders *h;
-	if(!msg)
-		return;
-	h = msg->request_headers;
-	soup_message_headers_foreach(h, func, NULL);
+	soup_message_headers_remove(h, "Cookie");
+	uri = soup_message_get_uri(msg);
+	if((c = getcookies(uri))) {
+		soup_message_headers_append(h, "Cookie", c);
+	}
 }
 
 void
 newwindow(Client *c, const Arg *arg) {
 	guint i = 0;
-	const char *cmd[7], *uri;
+	const char *cmd[10], *uri;
 	const Arg a = { .v = (void *)cmd };
 	char tmp[64];
 
@@ -579,9 +602,14 @@ newwindow(Client *c, const Arg *arg) {
 		snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
 		cmd[i++] = tmp;
 	}
-	if(showxid) {
+	if(!script)
+		cmd[i++] = "-s";
+	if(!plugin)
+		cmd[i++] = "-p";
+	if(!loadimage)
+		cmd[i++] = "-l";
+	if(showxid)
 		cmd[i++] = "-x";
-	}
 	cmd[i++] = "--";
 	uri = arg->v ? (char *)arg->v : c->linkhover;
 	if(uri)
@@ -668,6 +696,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);
@@ -695,15 +728,19 @@ setup(void) {
 	uriprop = XInternAtom(dpy, "_SURF_URI", False);
 	findprop = XInternAtom(dpy, "_SURF_FIND", False);
 
-	/* create dirs and files */
+	/* dirs and files */
 	cookiefile = buildpath(cookiefile);
 	dldir = buildpath(dldir);
 	scriptfile = buildpath(scriptfile);
 	stylefile = buildpath(stylefile);
 
+	/* 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);
+	g_signal_connect_after(G_OBJECT(s), "got-headers", G_CALLBACK(gotheaders), NULL);
+
 
 	/* proxy */
 	if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
@@ -797,7 +834,7 @@ updatewinid(Client *c) {
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [uri]\n");
+	die("usage: surf [-e Window] [-x] [-i] [-p] [-s] [uri]\n");
 }
 
 void
@@ -826,29 +863,41 @@ zoom(Client *c, const Arg *arg) {
 	}
 }
 
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[]) {
 	int i;
 	Arg arg;
 
 	progname = argv[0];
 	/* command line args */
-	for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-'; i++) {
-		if(!strcmp(argv[i], "-x"))
+	for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-' &&
+			argv[i][1] != '\0' && argv[i][2] == '\0'; i++) {
+		if(!strcmp(argv[i], "--")) {
+			i++;
+			break;
+		}
+		switch(argv[i][1]) {
+		case 'x':
 			showxid = TRUE;
-		else if(!strcmp(argv[i], "-e")) {
+			break;
+		case 'e':
 			if(++i < argc)
 				embed = atoi(argv[i]);
 			else
 				usage();
-		}
-		else if(!strcmp(argv[i], "--")) {
-			i++;
 			break;
-		}
-		else if(!strcmp(argv[i], "-v"))
+		case 'i':
+			loadimage = 0;
+			break;
+		case 'p':
+			plugin = 0;
+			break;
+		case 's':
+			script = 0;
+			break;
+		case 'v':
 			die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
-		else
-			usage();
+		}
 	}
 	if(i < argc)
 		arg.v = argv[i];