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);
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);
download(Client *c, const Arg *arg) {
char *uri;
WebKitNetworkRequest *r;
- WebKitDownload *dl;
+ WebKitDownload *dl;
if(arg->v)
uri = (char *)arg->v;
r = webkit_network_request_new(uri);
dl = webkit_download_new(r);
initdownload(c->view, dl, c);
+ webkit_download_start(c->download);
}
void
webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
}
+const char *
+getcookies(SoupURI *uri) {
+ 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 *
getatom(Client *c, Atom a) {
static char buf[BUFSIZ];
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;
+ char *uri;
+ WebKitWebBackForwardList *h;
+ WebKitWebHistoryItem *i;
- stop(c, NULL);
c->download = o;
filename = webkit_download_get_suggested_filename(o);
if(!strcmp("", filename))
uri = g_strconcat("file://", dldir, "/", filename, NULL);
webkit_download_set_destination_uri(c->download, uri);
c->progress = 0;
- g_free(uri);
- 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);
c->title = copystr(&c->title, filename);
update(c);
- g_free(html);
return TRUE;
}
loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
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;
}
}
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
snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
cmd[i++] = tmp;
}
- if(!script) {
+ if(!script)
cmd[i++] = "-s";
- }
- if(!plugin) {
+ if(!plugin)
cmd[i++] = "-p";
- }
- if(!loadimage) {
- cmd[i++] = "-l";
- }
- if(showxid) {
+ if(!loadimage)
+ cmd[i++] = "-i";
+ if(showxid)
cmd[i++] = "-x";
- }
cmd[i++] = "--";
uri = arg->v ? (char *)arg->v : c->linkhover;
if(uri)
gtk_adjustment_set_value(a, v);
}
+void
+setcookie(SoupCookie *c) {
+ SoupDate *e;
+ SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
+ c = soup_cookie_copy(c);
+ if(c->expires == NULL) {
+ 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
setatom(Client *c, Atom a, const char *v) {
XSync(dpy, False);
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) :
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
c->progress = (gint)(webkit_download_get_progress(c->download)*100);
}
+ else
+ stop(c, NULL);
update(c);
}
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
}
}
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[]) {
int i;
Arg arg;
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)
