[hackers] [surf] adding cmd-switches for turning of images/plugins/scripts || Enno Boland (tox)

changeset: 180:7f6d515b86f9
tag: tip
user: Enno Boland (tox) <tox_AT_s01.de>
date: Wed Mar 24 19:11:01 2010 +0100
files: surf.c
description:
adding cmd-switches for turning of images/plugins/scripts

diff -r 7ae806176735 -r 7f6d515b86f9 surf.c
--- a/surf.c Wed Mar 24 18:17:19 2010 +0100
+++ b/surf.c Wed Mar 24 19:11:01 2010 +0100
@@ -62,6 +62,7 @@
 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);
@@ -535,6 +536,9 @@
         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, "");
@@ -560,7 +564,7 @@
 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,6 +574,15 @@
                 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";
         }
@@ -791,7 +804,7 @@
 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,23 +839,34 @@
 
         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();
+ break;
+ 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 if(!strcmp(argv[i], "--")) {
- i++;
- break;
- }
- else if(!strcmp(argv[i], "-v"))
- die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
- else
- usage();
         }
         if(i < argc)
                 arg.v = argv[i];
Received on Wed Mar 24 2010 - 18:09:37 UTC