static Display *dpy;
static Atom uriprop, findprop;
-static SoupSession *session;
static Client *clients = NULL;
static GdkNativeWindow embed = 0;
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);
static void navigate(Client *c, const Arg *arg);
static Client *newclient(void);
static void newwindow(Client *c, const Arg *arg);
+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);
void
navigate(Client *c, const Arg *arg) {
- gint steps = *(gint *)arg;
+ int steps = *(int *)arg;
webkit_web_view_go_back_or_forward(c->view, steps);
}
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, "");
return c;
}
+static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+ SoupMessageHeaders *h = msg->request_headers;
+
+ 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];
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";
}
void
progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
- c->progress = webkit_web_view_get_progress(c->view);;
+ c->progress = webkit_web_view_get_progress(c->view) * 100;
update(c);
}
void
setup(void) {
- SoupSession *s;
char *proxy;
char *new_proxy;
SoupURI *puri;
+ SoupSession *s;
/* clean up any zombies immediately */
sigchld(0);
g_thread_init(NULL);
dpy = GDK_DISPLAY();
- session = webkit_get_default_session();
+ s = webkit_get_default_session();
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, "")) {
new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
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
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];