download(Client *c, const Arg *arg) {
char *uri;
WebKitNetworkRequest *r;
- WebKitDownload *dl;
+ WebKitDownload *dl;
if(arg->v)
uri = (char *)arg->v;
const char *
getcookies(SoupURI *uri) {
- return NULL;
+ const char *c;
+ SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, TRUE);
+ c = soup_cookie_jar_get_cookies(j, uri, TRUE);
+ g_object_unref(j);
+ return c;
}
const char *
void
loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
- if(c->download)
- stop(c, NULL);
switch(webkit_web_view_get_load_status (c->view)) {
case WEBKIT_LOAD_COMMITTED:
- setatom(c, uriprop, geturi(c));
+ if(c->download)
+ stop(c, NULL);
+ setatom(c, uriprop, geturi(c));
break;
case WEBKIT_LOAD_FINISHED:
c->progress = 0;
update(c);
break;
- case WEBKIT_LOAD_PROVISIONAL:
- case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+ default:
break;
}
}
g_free(uri);
setatom(c, findprop, "");
setatom(c, uriprop, "");
+ if(!NOBACKGROUND)
+ webkit_web_view_set_transparent(c->view, TRUE);
c->download = NULL;
c->title = NULL;
soup_message_headers_remove(h, "Cookie");
uri = soup_message_get_uri(msg);
- if((c = getcookies(uri))) {
+ if((c = getcookies(uri)))
soup_message_headers_append(h, "Cookie", c);
- }
g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL);
}
if(!plugin)
cmd[i++] = "-p";
if(!loadimage)
- cmd[i++] = "-l";
+ cmd[i++] = "-i";
if(showxid)
cmd[i++] = "-x";
cmd[i++] = "--";
void
setcookie(SoupCookie *c) {
-
+ SoupDate *e;
+ SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
+ c = soup_cookie_copy(c);
+ if(c->expires == NULL && sessiontime) {
+ e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+ soup_cookie_set_expires(c, e);
+ }
+ soup_cookie_jar_add_cookie(j, c);
+ g_object_unref(j);
}
void
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] [-i] [-p] [-s] [uri]\n");
+ die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n");
}
void
break;
}
switch(argv[i][1]) {
- case 'x':
- showxid = TRUE;
- break;
case 'e':
if(++i < argc)
embed = atoi(argv[i]);
case 's':
script = 0;
break;
+ case 'x':
+ showxid = TRUE;
+ break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
+ default:
+ usage();
}
}
if(i < argc)