#include <stdlib.h>
#include <stdio.h>
#include <webkit/webkit.h>
+#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
Display *dpy;
Atom urlprop;
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *urlbar, *urllist, *searchbar;
+ GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
WebKitWebView *view;
+ WebKitDownload * dl;
gchar *title;
gint progress;
struct Client *next;
} Client;
+SoupCookieJar *cookiejar;
Client *clients = NULL;
gboolean embed = FALSE;
gboolean showxid = FALSE;
static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, gpointer d);
static void die(char *str);
-static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
+static gboolean download(WebKitWebView *view, WebKitDownload *o, gpointer d);
static gchar *geturi(Client *c);
static void hidesearch(Client *c);
static void hideurl(Client *c);
gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
gtk_widget_destroy(c->scroll);
gtk_widget_destroy(c->urlbar);
- gtk_widget_destroy(c->urllist);
gtk_widget_destroy(c->searchbar);
gtk_widget_destroy(c->vbox);
gtk_widget_destroy(c->win);
}
gboolean
-download(WebKitWebView *view, GObject *o, gpointer d) {
+download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
/* TODO */
- return FALSE;
+ const gchar *home;
+ gchar *uri, *filename;
+
+ home = g_get_home_dir();
+ filename = g_build_filename(home, ".surf", "dl",
+ webkit_download_get_suggested_filename(o), NULL);
+ g_mkdir(g_path_get_dirname(filename), 0755);
+ uri = g_strconcat("file://", filename, NULL);
+ webkit_download_set_destination_uri(o, uri);
+ g_free(filename);
+ g_free(uri);
+ webkit_download_start(o);
+ return TRUE;
}
gchar *
if(strcmp(f, "-") == 0) {
chan = g_io_channel_unix_new(STDIN_FILENO);
if (chan) {
- while(g_io_channel_read_line(chan, &line, NULL, NULL, &e) == G_IO_STATUS_NORMAL) {
+ while(g_io_channel_read_line(chan, &line, NULL, NULL,
+ &e) == G_IO_STATUS_NORMAL) {
g_string_append(code, line);
g_free(line);
}
- webkit_web_view_load_html_string(c->view, code->str, NULL);
+ webkit_web_view_load_html_string(c->view, code->str,
+ "file://.");
g_io_channel_shutdown(chan, FALSE, NULL);
}
}
g_string_prepend(uri, "file://");
loaduri(c, uri->str);
}
-
+
}
void
WebKitWebView *
newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) {
- /* TODO */
Client *c = newclient();
return c->view;
}
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
if(ignore_once == FALSE && ev->atom == urlprop && ev->state == PropertyNewValue) {
- XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
+ XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
&adummy, &idummy, &ldummy, &ldummy, &buf);
loaduri(c, (gchar *)buf);
XFree(buf);
int main(int argc, char *argv[]) {
gchar *uri = NULL, *file = NULL;
+ SoupSession *s;
Client *c;
int o;
+ const gchar *home, *filename;
gtk_init(NULL, NULL);
if (!g_thread_supported())
goto argerr;
if(!clients)
newclient();
+
+ /* cookie persistance */
+ s = webkit_get_default_session();
+ home = g_get_home_dir();
+ filename = g_build_filename(home, ".surf-cookies", NULL);
+ cookiejar = soup_cookie_jar_text_new(filename, FALSE);
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+
gtk_main();
cleanup();
return EXIT_SUCCESS;