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

diff --git a/surf.c b/surf.c
index 2431a8d..37135d8 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);
@@ -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,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;
@@ -344,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);
@@ -535,6 +562,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, "");
@@ -551,16 +581,24 @@ 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
 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];
 
@@ -570,9 +608,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)
@@ -659,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);
@@ -791,7 +839,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
@@ -820,29 +868,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];