adding cmd-switches for turning of images/plugins/scripts

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index cbd47a1..8a36d21 100644 (file)
--- 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);
@@ -89,7 +90,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);
@@ -503,7 +504,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 +536,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 +555,16 @@ newclient(void) {
        return c;
 }
 
-void func(const char *name, const char *value, void *dummy) {
-printf("%s = %s\n", name, value);
-}
-
+static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+       SoupMessageHeaders *h = msg->request_headers;
 
-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");
 }
 
 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,6 +574,15 @@ newwindow(Client *c, const Arg *arg) {
                snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
                cmd[i++] = tmp;
        }
+       if(!script) {
+               cmd[i++] = "-s";
+       }
+       if(!plugin) {
+               cmd[i++] = "-p";
+       }
+       if(!loadimage) {
+               cmd[i++] = "-l";
+       }
        if(showxid) {
                cmd[i++] = "-x";
        }
@@ -695,15 +699,18 @@ 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);
+
 
        /* proxy */
        if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
@@ -797,7 +804,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
@@ -832,23 +839,34 @@ int main(int argc, char *argv[]) {
 
        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];