X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=9a67c042bc413b124f4a930302781fe5b0a865fe;hb=03f0a3baf5a844dc44aa5c145f1dd5d12c56ad07;hp=e3b60d79f259d60dd7f3950ea2fb9b2aea5354cd;hpb=ad005db13f571dabb72fce448eb0d93f79acf97d;p=surf.git diff --git a/surf.c b/surf.c index e3b60d7..9a67c04 100644 --- a/surf.c +++ b/surf.c @@ -7,216 +7,366 @@ #include #include #include +#include #include #include +#include #include #include #include +#include #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 Display *dpy; Atom urlprop; +typedef union Arg Arg; +union Arg { + const gboolean b; + const int i; + const unsigned int ui; + const void *v; +} ; + typedef struct Client { - GtkWidget *win; - GtkWidget *browser; + GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator; WebKitWebView *view; + WebKitDownload *download; gchar *title; gint progress; struct Client *next; } Client; + +typedef struct Cookie { + char *name; + char *value; + char *domain; + char *path; + struct Cookie *next; +} Cookie; + +typedef enum { + BROWSER = 0x0001, + SEARCHBAR = 0x0010, + URLBAR = 0x0100, + ALWAYS = ~0, +} KeyFocus; + +typedef struct { + guint mod; + guint keyval; + void (*func)(Client *c, const Arg *arg); + const Arg arg; + KeyFocus focus; +} Key; + +SoupCookieJar *cookiejar; +SoupSession *session; Client *clients = NULL; +Cookie *cookies = NULL; gboolean embed = FALSE; gboolean showxid = FALSE; gboolean ignore_once = FALSE; +extern char *optarg; +extern int optind; -static Client *newclient(); -static void die(char *str); -static void setup(void); static void cleanup(void); -static void updatetitle(Client *c); -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 linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d); +static void proccookies(SoupMessage *m, Client *c); +static void clipboard(Client *c, const Arg *arg); static void destroyclient(Client *c); -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(const Client *c, const gchar *uri); -static void loadfile(const Client *c, const gchar *f); -GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data); +static void destroywin(GtkWidget* w, Client *c); +static void die(char *str); +static void download(WebKitDownload *o, GParamSpec *pspec, Client *c); +static void drawindicator(Client *c); +static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); +static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c); +static gchar *geturi(Client *c); +static void hidesearch(Client *c, const Arg *arg); +static void hideurl(Client *c, const Arg *arg); +static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c); +static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c); +static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c); +static void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c); +static void loadfile(Client *c, const gchar *f); +static void loaduri(Client *c, const Arg *arg); +static void navigate(Client *c, const Arg *arg); +static Client *newclient(); +static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); +static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d); +static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); +static void print(Client *c, const Arg *arg); +static void progresschange(WebKitWebView *view, gint p, Client *c); +static void request(SoupSession *s, SoupMessage *m, Client *c); +static void reload(Client *c, const Arg *arg); +static void rereadcookies(); +static void setcookie(char *name, char *val, char *dom, char *path, long exp); +static void setup(); +static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, + const gchar* title, Client *c); +static void searchtext(Client *c, const Arg *arg); +static void showsearch(Client *c, const Arg *arg); +static void showurl(Client *c, const Arg *arg); +static void stop(Client *c, const Arg *arg); +static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c); +static void usage(); +static void update(Client *c, const gchar *title); +static void zoom(Client *c, const Arg *arg); + +#include "config.h" void cleanup(void) { - + while(clients) + destroyclient(clients); } -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; - } - ignore_once = FALSE; +void +proccookies(SoupMessage *m, Client *c) { + GSList *l; + SoupCookie *co; + long t; + + rereadcookies(); + for (l = soup_cookies_from_response(m); l; l = l->next){ + co = (SoupCookie *)l->data; + t = co->expires ? soup_date_to_time_t(co->expires) : 0; + setcookie(co->name, co->value, co->domain, co->value, t); } - return GDK_FILTER_CONTINUE; + g_slist_free(l); } void -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; +clipboard(Client *c, const Arg *arg) { + gboolean paste = *(gboolean *)arg; + if(paste) + gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c); + else + gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1); +} - 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, NULL); - g_io_channel_shutdown(chan, FALSE, NULL); - } - } - else { - g_string_prepend(uri, "file://"); - loaduri(c, uri->str); - } - +void +destroyclient(Client *c) { + Client *p; + + gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new())); + gtk_widget_destroy(c->scroll); + gtk_widget_destroy(c->urlbar); + 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(); } -static void 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 +destroywin(GtkWidget* w, Client *c) { + destroyclient(c); } -gboolean -download(WebKitWebView *view, GObject *o, gpointer d) { - /* TODO */ - return FALSE; +void +die(char *str) { + fputs(str, stderr); + exit(EXIT_FAILURE); +} + +void +drawindicator(Client *c) { + GtkWidget *w; + gint width; + GdkGC *gc; + gchar *uri; + + + uri = geturi(c); + w = c->indicator; + width = c->progress * w->allocation.width / 100; + + gc = gdk_gc_new(w->window); + + if(strstr(uri, "https://") == uri) + gdk_gc_set_rgb_fg_color(gc, &progress_trust); + else + gdk_gc_set_rgb_fg_color(gc, &progress); + gdk_draw_rectangle(w->window, + w->style->bg_gc[GTK_WIDGET_STATE(w)], + TRUE, + 0, 0, w->allocation.width, w->allocation.height); + gdk_draw_rectangle(w->window, + gc, + TRUE, + 0, 0, width, w->allocation.height); + g_object_unref(gc);/*g_free(gc);*/ } gboolean -newwindow(WebKitWebView *view, WebKitWebFrame *f, - WebKitNetworkRequest *r, WebKitWebNavigationAction *n, - WebKitWebPolicyDecision *p, gpointer d) { - Client *c = newclient(); - webkit_web_view_load_request(c->view, r); +exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) { + drawindicator(c); return TRUE; } + void -linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) { - /* TODO */ +download(WebKitDownload *o, GParamSpec *pspec, Client *c) { + WebKitDownloadStatus status; + + status = webkit_download_get_status(c->download); + if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) { + c->progress = (int)(webkit_download_get_progress(c->download)*100); + } + update(c, NULL); } -void -loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) { - Client *c = (Client *)d; +gboolean +initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { + const gchar *home, *filename; + gchar *uri, *path, *html; + + stop(c, NULL); + c->download = o; + home = g_get_home_dir(); + filename = webkit_download_get_suggested_filename(o); + path = g_build_filename(home, ".surf", "dl", + filename, NULL); + uri = g_strconcat("file://", path, NULL); + webkit_download_set_destination_uri(c->download, uri); + c->progress = 0; + g_free(uri); + html = g_strdup_printf("Download %s...", filename); + webkit_web_view_load_html_string(c->view, html, + webkit_download_get_uri(c->download)); + g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c); + g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c); + webkit_download_start(c->download); + update(c, filename); + g_free(html); + return TRUE; +} + +gchar * +geturi(Client *c) { gchar *uri; - if(!(uri = (gchar *)webkit_web_view_get_uri(view))) - uri = "(null)"; - ignore_once = TRUE; - XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop, - XA_STRING, 8, PropModeReplace, (unsigned char *)uri, - strlen(uri) + 1); + if(!(uri = (gchar *)webkit_web_view_get_uri(c->view))) + uri = g_strdup("about:blank"); + return uri; } void -progresschange(WebKitWebView* view, gint p, gpointer d) { - Client *c = (Client *)d; - - c->progress = p; - updatetitle(c); +hidesearch(Client *c, const Arg *arg) { + gtk_widget_hide(c->searchbar); + gtk_widget_grab_focus(GTK_WIDGET(c->view)); } void -updatetitle(Client *c) { - char t[512]; - if(c->progress == 100) - snprintf(t, LENGTH(t), "%s", c->title); +hideurl(Client *c, const Arg *arg) { + gtk_widget_hide(c->urlbar); + gtk_widget_grab_focus(GTK_WIDGET(c->view)); +} + +gboolean +keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { + unsigned int i, focus; + gboolean processed = FALSE; + + if(ev->type != GDK_KEY_PRESS) + return FALSE; + if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) + focus = SEARCHBAR; + else if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) + focus = URLBAR; else - snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress); - gtk_window_set_title(GTK_WINDOW(c->win), t); + focus = BROWSER; + for(i = 0; i < LENGTH(keys); i++) { + if(focus & keys[i].focus && ev->keyval == keys[i].keyval && + (ev->state == keys[i].mod || ev->state & keys[i].mod) + && keys[i].func) { + keys[i].func(c, &(keys[i].arg)); + processed = TRUE; + } + } + return processed; } void -titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) { - Client *c = (Client *)d; - - if(c->title) - g_free(c->title); - c->title = g_strdup(t); - updatetitle(c); +linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) { + if(l) + gtk_window_set_title(GTK_WINDOW(c->win), l); + else + update(c, NULL); } void -windestroy(GtkWidget* w, gpointer d) { - Client *c = (Client *)d; +loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) { + gchar *uri; - destroyclient(c); + ignore_once = TRUE; + uri = geturi(c); + XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop, + XA_STRING, 8, PropModeReplace, (unsigned char *)uri, + strlen(uri) + 1); } void -destroyclient(Client *c) { - Client *p; - gtk_widget_destroy(c->win); - if(clients == c && c->next == NULL) - gtk_main_quit(); - for(p = clients; p && p->next != c; p = p->next); - if(p) - p->next = c->next; - else - clients = c->next; - free(c); +loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { + c->progress = 0; + update(c, NULL); } -gboolean -keypress(GtkWidget* w, GdkEventKey *ev) { - /* TODO */ - return FALSE; +void +loadfile(Client *c, const gchar *f) { + GIOChannel *chan = NULL; + GError *e = NULL; + GString *code; + gchar *line, *uri; + Arg arg; + + if(strcmp(f, "-") == 0) { + chan = g_io_channel_unix_new(STDIN_FILENO); + if (chan) { + code = g_string_new(""); + 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); + g_string_free(code, TRUE); + } + arg.v = uri = g_strdup("stdin"); + } + else { + arg.v = uri = g_strdup_printf("file://%s", f); + loaduri(c, &arg); + } + update(c, uri); + g_free(uri); } -void setup(void) { - dpy = GDK_DISPLAY(); - urlprop = XInternAtom(dpy, "_SURF_URL", False); +void +loaduri(Client *c, const Arg *arg) { + gchar *u; + const gchar *uri = (gchar *)arg->v; + if(!uri) + uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar)); + u = g_strrstr(uri, "://") ? g_strdup(uri) + : g_strdup_printf("http://%s", uri); + webkit_web_view_load_uri(c->view, u); + c->progress = 0; + update(c, u); + g_free(u); } -void die(char *str) { - fputs(str, stderr); - exit(EXIT_FAILURE); +void +navigate(Client *c, const Arg *arg) { + gint steps = *(gint *)arg; + webkit_web_view_go_back_or_forward(c->view, steps); } Client * @@ -224,6 +374,7 @@ newclient(void) { Client *c; if(!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); + /* Window */ if(embed) { c->win = gtk_plug_new(0); } @@ -232,73 +383,295 @@ newclient(void) { gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf"); } gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600); - c->browser = gtk_scrolled_window_new(NULL, NULL); - g_signal_connect (G_OBJECT(c->win), "destroy", G_CALLBACK(windestroy), c); - g_signal_connect (G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), NULL); + 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); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->browser), + /* 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); - c->view = WEBKIT_WEB_VIEW(webkit_web_view_new()); - gtk_container_add(GTK_CONTAINER(c->browser), GTK_WIDGET(c->view)); + /* 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), "load-started", G_CALLBACK(loadstart), c); g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c); - g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(newwindow), c); - g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c); - /* g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(createwebview), 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(initdownload), c); + g_signal_connect_after(session, "request-started", G_CALLBACK(request), 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); - gtk_container_add(GTK_CONTAINER(c->win), c->browser); + /* indicator */ + c->indicator = gtk_drawing_area_new(); + gtk_widget_set_size_request(c->indicator, 800, 2); + g_signal_connect (G_OBJECT (c->indicator), "expose_event", + G_CALLBACK (exposeindicator), c); + + /* downloadbar */ + + /* 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->indicator); + + /* 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->indicator, 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_show_all(c->win); - if(showxid) - printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); - c->next = clients; - clients = c; + gtk_widget_hide_all(c->searchbar); + gtk_widget_hide_all(c->urlbar); + gtk_widget_show(c->vbox); + gtk_widget_show(c->indicator); + 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); + webkit_web_view_set_full_content_zoom(c->view, TRUE); + c->download = NULL; + c->title = NULL; + c->next = clients; + clients = c; + if(showxid) + printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); return c; } +WebKitWebView * +newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { + Client *n = newclient(); + return n->view; +} + + +void +pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) { + Arg arg = {.v = text }; + if(text != NULL) + loaduri((Client *) d, &arg); +} + +GdkFilterReturn +processx(GdkXEvent *e, GdkEvent *event, gpointer d) { + Client *c = (Client *)d; + XPropertyEvent *ev; + Atom adummy; + int idummy; + unsigned long ldummy; + unsigned char *buf = NULL; + Arg arg; + + if(((XEvent *)e)->type == PropertyNotify) { + ev = &((XEvent *)e)->xproperty; + if(ev->atom == urlprop && ev->state == PropertyNewValue) { + if(ignore_once) + ignore_once = FALSE; + else { + XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING, + &adummy, &idummy, &ldummy, &ldummy, &buf); + arg.v = buf; + loaduri(c, &arg); + XFree(buf); + } + return GDK_FILTER_REMOVE; + } + } + return GDK_FILTER_CONTINUE; +} + +void +print(Client *c, const Arg *arg) { + webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); +} + +void +progresschange(WebKitWebView* view, gint p, Client *c) { + c->progress = p; + update(c, NULL); +} + +void +request(SoupSession *s, SoupMessage *m, Client *c) { + soup_message_add_header_handler(m, "got-headers", "Set-Cookie", + G_CALLBACK(proccookies), c); +} + +void +reload(Client *c, const Arg *arg) { + gboolean nocache = *(gboolean *)arg; + if(nocache) + webkit_web_view_reload_bypass_cache(c->view); + else + webkit_web_view_reload(c->view); +} + +void +rereadcookies() { + const gchar *filename, *home; + + home = g_get_home_dir(); + filename = g_build_filename(home, ".surf", "cookies", NULL); +} + +void +setcookie(char *name, char *val, char *dom, char *path, long exp) { + +} + +void +setup() { + dpy = GDK_DISPLAY(); + session = webkit_get_default_session(); + urlprop = XInternAtom(dpy, "_SURF_URL", False); +} + +void +showsearch(Client *c, const Arg *arg) { + hideurl(c, NULL); + gtk_widget_show(c->searchbar); + gtk_widget_grab_focus(c->searchbar); +} + +void +searchtext(Client *c, const Arg *arg) { + gboolean forward = *(gboolean *)arg; + webkit_web_view_search_text(c->view, + gtk_entry_get_text(GTK_ENTRY(c->searchbar)), + FALSE, + forward, + TRUE); +} + +void +showurl(Client *c, const Arg *arg) { + gchar *uri; + + hidesearch(c, NULL); + uri = geturi(c); + gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri); + gtk_widget_show(c->urlbar); + gtk_widget_grab_focus(c->urlbar); +} + +void +stop(Client *c, const Arg *arg) { + if(c->download) + webkit_download_cancel(c->download); + else + webkit_web_view_stop_loading(c->view); + c->download = NULL; +} + +void +titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) { + update(c, t); +} + +void +usage() { + fputs("surf - simple browser\n", stderr); + die("usage: surf [-e] [-x] [uri]\n"); +} + +void +update(Client *c, const char *title) { + gchar *t; + + if(title) { + if(c->title) + g_free(c->title); + c->title = g_strdup(title); + } + if(c->progress == 100) + t = g_strdup(c->title); + else + t = g_strdup_printf("%s [%i%%]", c->title, c->progress); + drawindicator(c); + gtk_window_set_title(GTK_WINDOW(c->win), t); + g_free(t); + +} + +void +zoom(Client *c, const Arg *arg) { + if(arg->i < 0) /* zoom out */ + webkit_web_view_zoom_out(c->view); + else if(arg->i > 0) /* zoom in */ + webkit_web_view_zoom_in(c->view); + else /* reset */ + webkit_web_view_set_zoom_level(c->view, 1.0); +} + int main(int argc, char *argv[]) { - gchar *uri = NULL, *file = NULL; + SoupSession *s; Client *c; + int o; + const gchar *home, *filename; + Arg arg; - ARG { - case 'x': - showxid = TRUE; - break; - case 'e': - showxid = TRUE; - 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(); - c = newclient(); - if(uri) - loaduri(c, uri); - else if(file) - loadfile(c, file); - updatetitle(c); + while((o = getopt(argc, argv, "vhxeu:f:")) != -1) + switch(o) { + case 'x': + showxid = TRUE; + break; + case 'e': + showxid = TRUE; + embed = TRUE; + break; + case 'v': + die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); + break; + default: + usage(); + } + if(optind + 1 == argc) { + c = newclient(); + arg.v = argv[optind]; + if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0) + loadfile(c, argv[optind]); + else + loaduri(c, &arg); + + } + else if(optind != argc) + usage(); + 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.jar", NULL); + cookiejar = soup_cookie_jar_text_new(filename, FALSE); + soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar)); + gtk_main(); cleanup(); return EXIT_SUCCESS;