X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=57d4033812f586957f70188eb48952a076a07b94;hb=25155222c843f28a90a5e77876c24d10c51a1e7b;hp=caf5391796a3c59e23d2006c85a76fc281664fec;hpb=05bf05e4a2f0f928106438fb4f4d9fffbb9f7283;p=surf.git diff --git a/surf.c b/surf.c index caf5391..57d4033 100644 --- a/surf.c +++ b/surf.c @@ -23,7 +23,7 @@ Atom urlprop; typedef struct Client { GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar; WebKitWebView *view; - WebKitDownload * dl; + WebKitDownload *download; gchar *title; gint progress; struct Client *next; @@ -37,21 +37,20 @@ extern char *optarg; extern int optind; static void cleanup(void); -static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f, - WebKitNetworkRequest *r, WebKitWebNavigationAction *n, - WebKitWebPolicyDecision *p, gpointer d); static void destroyclient(Client *c); static void destroywin(GtkWidget* w, gpointer d); static void die(char *str); -static gboolean download(WebKitWebView *view, WebKitDownload *o, gpointer d); +static void download(WebKitDownload *o, GParamSpec *pspec, gpointer d); +static gboolean initdownload(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 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 void loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d); +static void loadfile(Client *c, const gchar *f); +static void loaduri(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); @@ -59,8 +58,9 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer dat static void setup(void); static void showsearch(Client *c); static void showurl(Client *c); +static void stop(Client *c); static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d); -static void updatetitle(Client *c); +static void updatetitle(Client *c, const gchar *title); void cleanup(void) { @@ -68,14 +68,6 @@ cleanup(void) { destroyclient(clients); } -gboolean -decidewindow(WebKitWebView *view, WebKitWebFrame *f, - WebKitNetworkRequest *r, WebKitWebNavigationAction *n, - WebKitWebPolicyDecision *p, gpointer d) { - /* TODO */ - return TRUE; -} - void destroyclient(Client *c) { Client *p; @@ -108,21 +100,47 @@ void die(char *str) { exit(EXIT_FAILURE); } +void +download(WebKitDownload *o, GParamSpec *pspec, gpointer d) { + Client *c = (Client *) d; + 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); + } + else { + stop(c); + } + updatetitle(c, NULL); +} + gboolean -download(WebKitWebView *view, WebKitDownload *o, gpointer d) { - /* TODO */ - const gchar *home; - gchar *uri, *filename; +initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d) { + Client *c = (Client *) d; + const gchar *home, *filename; + gchar *uri, *path; + GString *html = g_string_new(""); + stop(c); + c->download = o; 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); + 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); - webkit_download_start(o); + html = g_string_append(html, "Downloading "); + html = g_string_append(html, filename); + html = g_string_append(html, "..."); + webkit_web_view_load_html_string(c->view, html->str, + 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); + updatetitle(c, filename); return TRUE; } @@ -167,7 +185,6 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) { return TRUE; case GDK_Left: case GDK_Right: - case GDK_r: return FALSE; } } @@ -182,7 +199,6 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) { return TRUE; case GDK_Left: case GDK_Right: - case GDK_r: return FALSE; } } @@ -203,6 +219,14 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) { case GDK_slash: showsearch(c); return TRUE; + case GDK_n: + case GDK_N: + 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: webkit_web_view_go_back(c->view); return TRUE; @@ -211,6 +235,13 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) { return TRUE; } } + else { + switch(ev->keyval) { + case GDK_Escape: + stop(c); + return TRUE; + } + } return FALSE; } @@ -221,7 +252,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) { if(l) gtk_window_set_title(GTK_WINDOW(c->win), l); else - updatetitle(c); + updatetitle(c, NULL); } void @@ -237,7 +268,16 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) { } void -loadfile(const Client *c, const gchar *f) { +loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d) { + Client *c = (Client *)d; + gchar *uri; + + if(c->download) + stop(c); +} + +void +loadfile(Client *c, const gchar *f) { GIOChannel *chan = NULL; GError *e = NULL; GString *code = g_string_new(""); @@ -261,15 +301,17 @@ loadfile(const Client *c, const gchar *f) { g_string_prepend(uri, "file://"); loaduri(c, uri->str); } - + updatetitle(c, uri->str); } void -loaduri(const Client *c, const gchar *uri) { +loaduri(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); + c->progress = 0; + updatetitle(c, u->str); g_string_free(u, TRUE); } @@ -289,6 +331,7 @@ newclient(void) { 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); + c->download = NULL; /* VBox */ c->vbox = gtk_vbox_new(FALSE, 0); @@ -303,10 +346,10 @@ newclient(void) { 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), "create-web-view", G_CALLBACK(newwindow), c); - g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c); - g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c); + g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c); /* urlbar */ c->urlbar = gtk_entry_new(); @@ -316,6 +359,8 @@ newclient(void) { c->searchbar = gtk_entry_new(); gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE); + /* downloadbar */ + /* Arranging */ gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view)); gtk_container_add(GTK_CONTAINER(c->win), c->vbox); @@ -354,7 +399,7 @@ progresschange(WebKitWebView* view, gint p, gpointer d) { Client *c = (Client *)d; c->progress = p; - updatetitle(c); + updatetitle(c, NULL); } GdkFilterReturn @@ -401,19 +446,31 @@ showurl(Client *c) { gtk_widget_grab_focus(c->urlbar); } +void +stop(Client *c) { + 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, gpointer d) { Client *c = (Client *)d; - if(c->title) - g_free(c->title); - c->title = g_strdup(t); - updatetitle(c); + updatetitle(c, t); } void -updatetitle(Client *c) { +updatetitle(Client *c, const char *title) { char t[512]; + + if(title) { + if(c->title) + g_free(c->title); + c->title = g_strdup(title); + } if(c->progress == 100) snprintf(t, LENGTH(t), "%s", c->title); else @@ -446,14 +503,12 @@ int main(int argc, char *argv[]) { 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"); @@ -469,10 +524,16 @@ int main(int argc, char *argv[]) { 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(); - home = g_get_home_dir(); - filename = g_build_filename(home, ".surf-cookies", NULL); + 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));