merged, now has download bar, other misc fixes
[surf.git] / surf.c
diff --git a/surf.c b/surf.c
index 550eda1..3d6979a 100644 (file)
--- a/surf.c
+++ b/surf.c
+/* See LICENSE file for copyright and license details.
+ *
+ * To understand surf, start reading main().
+ */
+#include <X11/X.h>
+#include <X11/Xatom.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <webkit/webkit.h>
+#include <glib/gstdio.h>
 
 #define LENGTH(x) (sizeof x / sizeof x[0])
-/* Plan9-style Argument parsing */
-/* Vars: _c -> count; _b -> break; _a -> argument */
-#define ARG int _c, _b; char *_a; \
-       for(_c = 1; _c < argc && argv[_c][0] == '-' && argv[_c][1] && \
-                       (strcmp(argv[_c], "--") != 0); _c++) \
-               for(_a = &argv[_c][1], _b = 0; !_b && *_a; _a++ ) \
-                       switch(*_a)
-#define ARGVAL()       (!_b && _a[1] && (_b = 1) ? &_a[1] : _c + 1 == argc ? \
-               0 : argv[++_c])
-#define ARGCHR()       (*_a)
-#define ARGC()         _c
-
-GtkWidget *win;
-GtkWidget *browser;
-WebKitWebView *view;
-gchar *title;
-gint progress = 100;
+
+Display *dpy;
+Atom urlprop;
+typedef struct Client {
+       GtkWidget *win, *scroll, *vbox, *pbar, *urlbar, *searchbar;
+       WebKitWebView *view;
+       gchar *title;
+       gint progress;
+       struct Client *next;
+} Client;
+SoupCookieJar *cookiejar;
+Client *clients = NULL;
+GSList *downloads = NULL;
 gboolean embed = FALSE;
+gboolean showxid = FALSE;
+gboolean ignore_once = FALSE;
+extern char *optarg;
+extern int optind;
 
-static void setup(void);
 static void cleanup(void);
-static void updatetitle(void);
-static void windestroy(GtkWidget* w, gpointer d);
-static gboolean keypress(GtkWidget* w, GdkEventKey *ev);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
-static void progresschange(WebKitWebView *view, gint p, gpointer d);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
-static void loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
-static void loadfinish(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
+static void destroyclient(Client *c);
+static void destroywin(GtkWidget* w, gpointer d);
+static void die(char *str);
+static void downloadcb(WebKitDownload *o, GParamSpec *pspec, 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);
+static gboolean keypress(GtkWidget* w, GdkEventKey *ev, gpointer d);
 static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
-static gboolean newwindow(WebKitWebView *view, WebKitWebFrame *f,
-               WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
-               WebKitWebPolicyDecision *p, gpointer d);
-static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
-static void loaduri(gchar *uri);
-static void loadfile(gchar *f);
-static void setupstdin();
-static gboolean readstdin(GIOChannel *c, GIOCondition con);
-
-gboolean
-readstdin(GIOChannel *c, GIOCondition con) {
-       gchar *line, *p;
-       GIOStatus ret;
+static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
+static void loadfile(const Client *c, const gchar *f);
+static void loaduri(const Client *c, const gchar *uri);
+static Client *newclient();
+static WebKitWebView *newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d);
+static void progresschange(WebKitWebView *view, gint p, gpointer d);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+static void setup(void);
+static void showsearch(Client *c);
+static void showurl(Client *c);
+static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
+static void updatetitle(Client *c);
 
-       ret = g_io_channel_read_line(c, &line, NULL, NULL, NULL);
-       if(ret == G_IO_STATUS_ERROR || ret == G_IO_STATUS_EOF)
-               return FALSE;
-       for(p = line; *p && *p != '\n'; p++);
-       *p = '\0';
-       loaduri(line);
-       g_free(line);
-       return TRUE;
+void
+cleanup(void) {
+       while(clients)
+               destroyclient(clients);
+       g_slist_free(downloads);
 }
 
 void
-setupstdin() {
-       GIOChannel *c = NULL;
+destroyclient(Client *c) {
+       Client *p;
 
-       c = g_io_channel_unix_new(STDIN_FILENO);
-       if(c && !g_io_add_watch(c, G_IO_IN|G_IO_HUP, (GIOFunc) readstdin, NULL))
-                       g_error("Stdin: could not add watch\n");
+       gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
+       gtk_widget_destroy(c->scroll);
+       gtk_widget_destroy(c->urlbar);
+       gtk_widget_destroy(c->pbar);
+       gtk_widget_destroy(c->searchbar);
+       gtk_widget_destroy(c->vbox);
+       gtk_widget_destroy(c->win);
+       for(p = clients; p && p->next != c; p = p->next);
+       if(p)
+               p->next = c->next;
+       else
+               clients = c->next;
+       free(c);
+       if(clients == NULL)
+               gtk_main_quit();
 }
 
 void
-loadfile(gchar *f) {
-       GIOChannel *c = NULL;
-       GError *e = NULL;
-       GString *code = g_string_new("");
-       gchar *line;
+destroywin(GtkWidget* w, gpointer d) {
+       Client *c = (Client *)d;
 
-       /* cannot use fileno in c99 - workaround*/
-       if(strcmp(f, "-") == 0)
-               c = g_io_channel_unix_new(STDIN_FILENO);
-       else
-               c = g_io_channel_new_file(f, "r", NULL);
-       if (c) {
-               while(g_io_channel_read_line(c, &line, NULL, NULL, &e) == G_IO_STATUS_NORMAL) {
-                       g_string_append(code, line);
-                       g_free(line);
-               }
-               webkit_web_view_load_html_string(view, code->str, NULL);
-               g_io_channel_shutdown(c, FALSE, NULL);
-       }
+       destroyclient(c);
 }
 
-static void loaduri(gchar *uri) {
-       GString* u = g_string_new(uri);
-       if(g_strrstr(u->str, "://") == NULL)
-               g_string_prepend(u, "http://");
-       webkit_web_view_load_uri(view, u->str);
-       g_string_free(u, TRUE);
+void die(char *str) {
+       fputs(str, stderr);
+       exit(EXIT_FAILURE);
+}
+
+void
+downloadcb(WebKitDownload *o, GParamSpec *pspec, gpointer d) {
+       Client *c = (Client *) d;
+       GSList *i;
+       WebKitDownload *dl;
+       GString *text;
+       
+       text = g_string_new("");
+       for (i = downloads; i != NULL; i = i->next) {
+               dl = i->data;
+               if (webkit_download_get_status(dl) == WEBKIT_DOWNLOAD_STATUS_STARTED
+               || webkit_download_get_status(dl) == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+                       g_string_append_printf(text, "%s[%.0f%%] ",
+                       webkit_download_get_suggested_filename(dl),
+                       webkit_download_get_progress(dl)*100);
+               } else {
+                       downloads = g_slist_remove(downloads, dl);
+               }
+       }
+       if (downloads == NULL) {
+               gtk_label_set_text((GtkLabel *) c->pbar, "");
+               gtk_widget_hide(c->pbar);
+       } else {
+               gtk_label_set_text((GtkLabel *) c->pbar, text->str);
+       }
+       g_string_free(text, TRUE);
 }
 
 gboolean
-download(WebKitWebView *view, GObject *o, gpointer d) {
+download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
        /* TODO */
-       return FALSE;
+       Client *c = (Client *) d;
+       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);
+       uri = g_strconcat("file://", filename, NULL);
+       webkit_download_set_destination_uri(o, uri);
+       g_free(filename);
+       g_free(uri);
+       downloads = g_slist_append(downloads, o);
+       gtk_widget_show(c->pbar);
+       g_signal_connect(o, "notify::progress", G_CALLBACK(downloadcb), d);
+       g_signal_connect(o, "notify::status", G_CALLBACK(downloadcb), d);
+       webkit_download_start(o);
+       return TRUE;
+}
+
+gchar *
+geturi(Client *c) {
+       gchar *uri;
+
+       if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
+               uri = g_strdup("about:blank");
+       return uri;
+}
+
+void
+hidesearch(Client *c) {
+       gtk_widget_hide(c->searchbar);
+       gtk_widget_grab_focus(GTK_WIDGET(c->view));
+}
+
+void
+hideurl(Client *c) {
+       gtk_widget_hide(c->urlbar);
+       gtk_widget_grab_focus(GTK_WIDGET(c->view));
 }
 
 gboolean
-newwindow(WebKitWebView *view, WebKitWebFrame *f,
-               WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
-               WebKitWebPolicyDecision *p, gpointer d) {
-       /* TODO */
+keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
+       Client *c = (Client *)d;
+
+       if(ev->type != GDK_KEY_PRESS)
+               return FALSE;
+       if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
+               switch(ev->keyval) {
+               case GDK_Escape:
+                       hidesearch(c);
+                       return TRUE;
+               case GDK_Return:
+                       webkit_web_view_search_text(c->view,
+                                       gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
+                                       FALSE,
+                                       !(ev->state & GDK_SHIFT_MASK),
+                                       TRUE);
+                       return TRUE;
+               case GDK_Left:
+               case GDK_Right:
+               case GDK_r:
+                       return FALSE;
+               }
+       }
+       else if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) {
+               switch(ev->keyval) {
+               case GDK_Escape:
+                       hideurl(c);
+                       return TRUE;
+               case GDK_Return:
+                       loaduri(c, gtk_entry_get_text(GTK_ENTRY(c->urlbar)));
+                       hideurl(c);
+                       return TRUE;
+               case GDK_Left:
+               case GDK_Right:
+               case GDK_r:
+                       return FALSE;
+               }
+       }
+       if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
+               switch(ev->keyval) {
+               case GDK_r:
+               case GDK_R:
+                       if((ev->state & GDK_SHIFT_MASK))
+                                webkit_web_view_reload_bypass_cache(c->view);
+                       else
+                                webkit_web_view_reload(c->view);
+                       return TRUE;
+               case GDK_b:
+                       return TRUE;
+               case GDK_g:
+                       showurl(c);
+                       return TRUE;
+               case GDK_slash:
+                       showsearch(c);
+                       return TRUE;
+               case GDK_Left:
+                       webkit_web_view_go_back(c->view);
+                       return TRUE;
+               case GDK_Right:
+                       webkit_web_view_go_forward(c->view);
+                       return TRUE;
+               }
+       }
        return FALSE;
 }
+
 void
 linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
-       /* TODO */
-}
+       Client *c = (Client *)d;
 
-void
-loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
-       /* ??? TODO */
+       if(l)
+               gtk_window_set_title(GTK_WINDOW(c->win), l);
+       else
+               updatetitle(c);
 }
 
 void
 loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
-       /* ??? TODO */
+       Client *c = (Client *)d;
+       gchar *uri;
+
+       uri = geturi(c);
+       ignore_once = TRUE;
+       XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
+                       XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
+                       strlen(uri) + 1);
 }
 
 void
-loadfinish(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
-       /* ??? TODO */
+loadfile(const Client *c, const gchar *f) {
+       GIOChannel *chan = NULL;
+       GError *e = NULL;
+       GString *code = g_string_new("");
+       GString *uri = g_string_new(f);
+       gchar *line;
+
+       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) {
+                               g_string_append(code, line);
+                               g_free(line);
+                       }
+                       webkit_web_view_load_html_string(c->view, code->str,
+                                       "file://.");
+                       g_io_channel_shutdown(chan, FALSE, NULL);
+               }
+       }
+       else {
+               g_string_prepend(uri, "file://");
+               loaduri(c, uri->str);
+       }
+
 }
 
 void
-progresschange(WebKitWebView* view, gint p, gpointer d) {
-       progress = p;
-       updatetitle();
+loaduri(const Client *c, const gchar *uri) {
+       GString* u = g_string_new(uri);
+       if(g_strrstr(u->str, ":") == NULL)
+               g_string_prepend(u, "http://");
+       webkit_web_view_load_uri(c->view, u->str);
+       g_string_free(u, TRUE);
 }
 
-void
-updatetitle() {
-       char t[512];
-       snprintf(t, LENGTH(t), "%s [%i%%]", title, progress);
-       gtk_window_set_title(GTK_WINDOW(win), t);
+Client *
+newclient(void) {
+       Client *c;
+       if(!(c = calloc(1, sizeof(Client))))
+               die("Cannot malloc!\n");
+       /* Window */
+       if(embed) {
+               c->win = gtk_plug_new(0);
+       }
+       else {
+               c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+               gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf");
+       }
+       gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
+       g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
+       g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+
+       /* VBox */
+       c->vbox = gtk_vbox_new(FALSE, 0);
+
+       /* scrolled window */
+       c->scroll = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
+                       GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+
+       /* webview */
+       c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
+       g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
+       g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
+       g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
+       g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
+       g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
+       g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c);
+
+       /* urlbar */
+       c->urlbar = gtk_entry_new();
+       gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
+
+       /* searchbar */
+       c->searchbar = gtk_entry_new();
+       gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+
+       /* downloadbar */
+       c->pbar = gtk_label_new("");
+
+       /* Arranging */
+       gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
+       gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
+       gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
+       gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
+       gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
+       gtk_container_add(GTK_CONTAINER(c->vbox), c->pbar);
+
+       /* Setup */
+       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
+       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
+       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->pbar, FALSE, FALSE, 0, GTK_PACK_START);
+       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
+       gtk_widget_grab_focus(GTK_WIDGET(c->view));
+       gtk_widget_hide_all(c->searchbar);
+       gtk_widget_hide_all(c->urlbar);
+       gtk_widget_hide_all(c->pbar);
+       gtk_widget_show(c->vbox);
+       gtk_widget_show(c->scroll);
+       gtk_widget_show(GTK_WIDGET(c->view));
+       gtk_widget_show(c->win);
+       gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
+       gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
+       c->next = clients;
+       clients = c;
+       if(showxid)
+               printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+       return c;
 }
 
-void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
-       if(title)
-               g_free(title);
-       title = g_strdup(t);
-       updatetitle();
+WebKitWebView *
+newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d) {
+       Client *c = newclient();
+       return c->view;
 }
 
 void
-windestroy(GtkWidget* w, gpointer d) {
-       gtk_main_quit();
+progresschange(WebKitWebView* view, gint p, gpointer d) {
+       Client *c = (Client *)d;
+
+       c->progress = p;
+       updatetitle(c);
 }
 
-gboolean
-keypress(GtkWidget* w, GdkEventKey *ev) {
-       /* TODO */
-       return FALSE;
+GdkFilterReturn
+processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
+       XPropertyEvent *ev;
+       Client *c = (Client *)d;
+       Atom adummy;
+       int idummy;
+       unsigned long ldummy;
+       unsigned char *buf = NULL;
+       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,
+                               &adummy, &idummy, &ldummy, &ldummy, &buf);
+                       loaduri(c, (gchar *)buf);
+                       XFree(buf);
+                       return GDK_FILTER_REMOVE;
+               }
+       }
+       return GDK_FILTER_CONTINUE;
 }
 
 void setup(void) {
-       win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_default_size(GTK_WINDOW(win), 800, 600);
-       gtk_widget_set_name(win, "surf window");
-       browser = gtk_scrolled_window_new(NULL, NULL);
-       g_signal_connect (G_OBJECT(win), "destroy", G_CALLBACK(windestroy), NULL);
-       g_signal_connect (G_OBJECT(win), "key-press-event", G_CALLBACK(keypress), NULL);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(browser),
-                       GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-       view = WEBKIT_WEB_VIEW(webkit_web_view_new());
-       gtk_container_add(GTK_CONTAINER(browser), GTK_WIDGET(view));
+       dpy = GDK_DISPLAY();
+       urlprop = XInternAtom(dpy, "_SURF_URL", False);
+}
+
+void
+showsearch(Client *c) {
+       hideurl(c);
+       gtk_widget_show(c->searchbar);
+       gtk_widget_grab_focus(c->searchbar);
+}
+
+void
+showurl(Client *c) {
+       gchar *uri;
 
-       g_signal_connect(G_OBJECT(view), "title-changed", G_CALLBACK(titlechange), view);
-       g_signal_connect(G_OBJECT(view), "load-progress-changed", G_CALLBACK(progresschange), view);
-       g_signal_connect(G_OBJECT(view), "load-committed", G_CALLBACK(loadcommit), view);
-       g_signal_connect(G_OBJECT(view), "load-started", G_CALLBACK(loadstart), view);
-       g_signal_connect(G_OBJECT(view), "load-finished", G_CALLBACK(loadfinish), view);
-       g_signal_connect(G_OBJECT(view), "hovering-over-link", G_CALLBACK(linkhover), view);
-       g_signal_connect(G_OBJECT(view), "new-window-policy-decision-requested", G_CALLBACK(newwindow), view);
-       g_signal_connect(G_OBJECT(view), "download-requested", G_CALLBACK(download), view);
-       /* g_signal_connect(G_OBJECT(view), "create-web-view", G_CALLBACK(createwebview), view); */
+       hidesearch(c);
+       uri = geturi(c);
+       gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
+       gtk_widget_show(c->urlbar);
+       gtk_widget_grab_focus(c->urlbar);
+}
+
+void
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
+       Client *c = (Client *)d;
 
-       gtk_container_add(GTK_CONTAINER(win), browser);
-       gtk_widget_grab_focus(GTK_WIDGET(view));
-       gtk_widget_show_all(win);
+       if(c->title)
+               g_free(c->title);
+       c->title = g_strdup(t);
+       updatetitle(c);
 }
 
-void cleanup() {
+void
+updatetitle(Client *c) {
+       char t[512];
+       if(c->progress == 100)
+               snprintf(t, LENGTH(t), "%s", c->title);
+       else
+               snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress);
+       gtk_window_set_title(GTK_WINDOW(c->win), t);
 }
 
 int main(int argc, char *argv[]) {
        gchar *uri = NULL, *file = NULL;
+       SoupSession *s;
+       Client *c;
+       int o;
+       const gchar *home, *filename;
 
-       ARG {
-       case 'e':
-               embed = TRUE;
-               break;
-       case 'u':
-               if(!(uri = ARGVAL()))
-                       goto argerr;
-               break;
-       case 'f':
-               if(!(file = ARGVAL()))
-                       goto argerr;
-               break;
-       argerr:
-       default:
-               puts("surf - simple browser");
-               printf("usage: %s [-e] [-u uri] [-f file]", argv[0]);
-               return EXIT_FAILURE;
-       }
-       if(argc != ARGC())
-               goto argerr;
        gtk_init(NULL, NULL);
        if (!g_thread_supported())
                g_thread_init(NULL);
        setup();
-       if(uri)
-               loaduri(uri);
-       else if(file)
-               loadfile(file);
-       setupstdin();
-       updatetitle();
+       while((o = getopt(argc, argv, "vhxeu:f:")) != -1)
+               switch(o) {
+               case 'x':
+                       showxid = TRUE;
+                       break;
+               case 'e':
+                       showxid = TRUE;
+                       embed = TRUE;
+                       break;
+               case 'u':
+                       if(!(uri = optarg))
+                               goto argerr;
+                       c = newclient();
+                       loaduri(c, uri);
+                       updatetitle(c);
+                       break;
+               case 'f':
+                       if(!(file = optarg))
+                               goto argerr;
+                       c = newclient();
+                       loadfile(c, file);
+                       updatetitle(c);
+                       break;
+               case 'v':
+                       die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
+                       break;
+               argerr:
+               default:
+                       puts("surf - simple browser");
+                       die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
+                       return EXIT_FAILURE;
+               }
+       if(optind != argc)
+               goto argerr;
+       if(!clients)
+               newclient();
+
+       /* make dirs */
+       home = g_get_home_dir();
+       filename = g_build_filename(home, ".surf", NULL);
+       g_mkdir_with_parents(filename, 0711);
+       filename = g_build_filename(home, ".surf", "dl", NULL);
+       g_mkdir_with_parents(filename, 0755);
+
+       /* cookie persistance */
+       s = webkit_get_default_session();
+       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;