X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=448c762604048312b2cab950dc5a2091c348562d;hb=e9c9715f52afd3b4e3d512aea9d021e7e1980f63;hp=66a60d019297840c0aaf3f18a090a6df7c637b44;hpb=1d93bfa9ce13c7c4581611b7441fe66680ab80c3;p=surf.git diff --git a/surf.c b/surf.c index 66a60d0..448c762 100644 --- a/surf.c +++ b/surf.c @@ -56,18 +56,15 @@ typedef struct { static Display *dpy; static Atom uriprop, findprop; -static SoupCookieJar *cookies; -static SoupSession *session; static Client *clients = NULL; static GdkNativeWindow embed = 0; static gboolean showxid = FALSE; -static Time lastxprop = 0; +static int ignorexprop = 0; static char winid[64]; static char *progname; -static gboolean lockcookie = FALSE; +static gboolean loadimage = 1, plugin = 1, script = 1; static char *buildpath(const char *path); -static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p); static void cleanup(void); static void clipboard(Client *c, const Arg *arg); static void context(WebKitWebView *v, GtkMenu *m, Client *c); @@ -83,26 +80,28 @@ static void drawindicator(Client *c); 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 linkhover(WebKitWebView *v, const char* t, const char* l, Client *c); -static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c); -static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c); +static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c); static void loaduri(Client *c, const Arg *arg); static void navigate(Client *c, const Arg *arg); static Client *newclient(void); static void newwindow(Client *c, const Arg *arg); +static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v); static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); static void print(Client *c, const Arg *arg); static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); -static void progresschange(WebKitWebView *v, gint p, Client *c); +static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c); static void reload(Client *c, const Arg *arg); -static void reloadcookies(); 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); @@ -140,27 +139,6 @@ buildpath(const char *path) { return apath; } -void -changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) { - SoupDate *e; - SoupCookieJar *jar; - - if(lockcookie) - return; - if(c && c->expires == NULL) { - e = soup_date_new_from_time_t(time(NULL) + sessiontime); - c = soup_cookie_copy(c); - soup_cookie_set_expires(c, e); - } - - jar = soup_cookie_jar_text_new(cookiefile, FALSE); - if(c) - soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c)); - else - soup_cookie_jar_delete_cookie(jar, oc); - g_object_unref(jar); -} - void cleanup(void) { while(clients) @@ -276,7 +254,7 @@ void download(Client *c, const Arg *arg) { char *uri; WebKitNetworkRequest *r; - WebKitDownload *dl; + WebKitDownload *dl; if(arg->v) uri = (char *)arg->v; @@ -285,6 +263,7 @@ download(Client *c, const Arg *arg) { r = webkit_network_request_new(uri); dl = webkit_download_new(r); initdownload(c->view, dl, c); + webkit_download_start(c->download); } void @@ -325,6 +304,15 @@ find(Client *c, const Arg *arg) { 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]; @@ -353,12 +341,26 @@ geturi(Client *c) { 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)) @@ -366,17 +368,14 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { 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 %s...", 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; } @@ -420,34 +419,48 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { } void -loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) { +loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { + switch(webkit_web_view_get_load_status (c->view)) { + case WEBKIT_LOAD_COMMITTED: + if(c->download) + stop(c, NULL); setatom(c, uriprop, geturi(c)); -} - -void -loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { - c->progress = 0; - update(c); - reloadcookies(); + break; + case WEBKIT_LOAD_FINISHED: + c->progress = 0; + update(c); + break; + default: + break; + } } void loaduri(Client *c, const Arg *arg) { char *u; const char *uri = (char *)arg->v; + Arg a = { .b = FALSE }; + if(strcmp(uri, "") == 0) + return; u = g_strrstr(uri, "://") ? g_strdup(uri) : g_strdup_printf("http://%s", uri); - webkit_web_view_load_uri(c->view, u); - c->progress = 0; - c->title = copystr(&c->title, u); - g_free(u); - update(c); + /* prevents endless loop */ + if(c->uri && strcmp(u, c->uri) == 0) { + reload(c, &a); + } + else { + webkit_web_view_load_uri(c->view, u); + c->progress = 0; + c->title = copystr(&c->title, u); + g_free(u); + update(c); + } } void navigate(Client *c, const Arg *arg) { - gint steps = *(gint *)arg; + int steps = *(int *)arg; webkit_web_view_go_back_or_forward(c->view, steps); } @@ -467,7 +480,19 @@ newclient(void) { } else { c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + /* TA: 20091214: Despite what the GNOME docs say, the ICCCM + * is always correct, so we should still call this function. + * But when doing so, we *must* differentiate between a + * WM_CLASS and a resource on the window. By convention, the + * window class (WM_CLASS) is capped, while the resource is in + * lowercase. Both these values come as a pair. + */ gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf"); + + /* TA: 20091214: And set the role here as well -- so that + * sessions can pick this up. + */ + gtk_window_set_role(GTK_WINDOW(c->win), "Surf"); } gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600); g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c); @@ -495,9 +520,6 @@ newclient(void) { /* 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), "create-web-view", G_CALLBACK(createwindow), c); g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c); @@ -505,6 +527,8 @@ newclient(void) { g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c); g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c); + g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c); + g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c); /* Indicator */ c->indicator = gtk_drawing_area_new(); @@ -537,6 +561,9 @@ newclient(void) { g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); uri = g_strconcat("file://", stylefile, NULL); g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL); + g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL); + g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL); + g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL); g_free(uri); setatom(c, findprop, ""); setatom(c, uriprop, ""); @@ -553,10 +580,23 @@ newclient(void) { return c; } +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 newwindow(Client *c, const Arg *arg) { guint i = 0; - const char *cmd[7], *uri; + const char *cmd[10], *uri; const Arg a = { .v = (void *)cmd }; char tmp[64]; @@ -566,9 +606,14 @@ newwindow(Client *c, const Arg *arg) { snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed); cmd[i++] = tmp; } - if(showxid) { + if(!script) + cmd[i++] = "-s"; + if(!plugin) + cmd[i++] = "-p"; + if(!loadimage) + cmd[i++] = "-i"; + if(showxid) cmd[i++] = "-x"; - } cmd[i++] = "--"; uri = arg->v ? (char *)arg->v : c->linkhover; if(uri) @@ -597,8 +642,9 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { if(((XEvent *)e)->type == PropertyNotify) { ev = &((XEvent *)e)->xproperty; - if((!lastxprop || lastxprop + 512 < ev->time) - && ev->state == PropertyNewValue) { + if(ignorexprop) + ignorexprop--; + else if(ev->state == PropertyNewValue) { if(ev->atom == uriprop) { arg.v = getatom(c, uriprop); loaduri(c, &arg); @@ -607,7 +653,6 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { arg.b = TRUE; find(c, &arg); } - lastxprop = ev->time; return GDK_FILTER_REMOVE; } } @@ -615,8 +660,8 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { } void -progresschange(WebKitWebView *v, gint p, Client *c) { - c->progress = p; +progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { + c->progress = webkit_web_view_get_progress(c->view) * 100; update(c); } @@ -629,23 +674,6 @@ reload(Client *c, const Arg *arg) { webkit_web_view_reload(c->view); } -void -reloadcookies() { - SoupCookieJar *jar; - GSList *l, *e; - - lockcookie = TRUE; - for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next) - soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data); - soup_cookies_free(l); - jar = soup_cookie_jar_text_new(cookiefile, TRUE); - for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next) - soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data); - g_slist_free(l); - lockcookie = FALSE; - g_object_unref(jar); -} - void resize(GtkWidget *w, GtkAllocation *a, Client *c) { double zoom; @@ -672,19 +700,34 @@ scroll(Client *c, const Arg *arg) { 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); + ignorexprop++; XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a, XA_STRING, 8, PropModeReplace, (unsigned char *)v, strlen(v) + 1); - XSync(dpy, False); } void setup(void) { - SoupSession *s; char *proxy; + char *new_proxy; SoupURI *puri; + SoupSession *s; /* clean up any zombies immediately */ sigchld(0); @@ -693,27 +736,32 @@ setup(void) { g_thread_init(NULL); dpy = GDK_DISPLAY(); - session = webkit_get_default_session(); + s = webkit_get_default_session(); uriprop = XInternAtom(dpy, "_SURF_URI", False); findprop = XInternAtom(dpy, "_SURF_FIND", False); - /* create dirs and files */ + /* dirs and files */ cookiefile = buildpath(cookiefile); dldir = buildpath(dldir); scriptfile = buildpath(scriptfile); stylefile = buildpath(stylefile); - /* cookie persistance */ + /* request handler */ s = webkit_get_default_session(); - cookies = soup_cookie_jar_new(); - soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies)); - g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL); + soup_session_remove_feature_by_type(s, soup_cookie_get_type()); + 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, "")) { - puri = soup_uri_new(proxy); + new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) : + g_strdup_printf("http://%s", proxy); + + puri = soup_uri_new(new_proxy); g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL); soup_uri_free(puri); + g_free(new_proxy); } - reloadcookies(); } void @@ -784,6 +832,8 @@ updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) { 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); } @@ -796,7 +846,7 @@ updatewinid(Client *c) { void usage(void) { fputs("surf - simple browser\n", stderr); - die("usage: surf [-e Window] [-x] [uri]\n"); + die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n"); } void @@ -825,29 +875,43 @@ zoom(Client *c, const Arg *arg) { } } -int main(int argc, char *argv[]) { +int +main(int argc, char *argv[]) { int i; Arg arg; progname = argv[0]; /* command line args */ - for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-'; i++) { - if(!strcmp(argv[i], "-x")) - showxid = TRUE; - else if(!strcmp(argv[i], "-e")) { + for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-' && + argv[i][1] != '\0' && argv[i][2] == '\0'; i++) { + if(!strcmp(argv[i], "--")) { + i++; + break; + } + switch(argv[i][1]) { + case 'e': if(++i < argc) embed = atoi(argv[i]); else usage(); - } - else if(!strcmp(argv[i], "--")) { - i++; break; - } - else if(!strcmp(argv[i], "-v")) + case 'i': + loadimage = 0; + break; + case 'p': + plugin = 0; + break; + case 's': + script = 0; + break; + case 'x': + showxid = TRUE; + break; + case 'v': die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); - else + default: usage(); + } } if(i < argc) arg.v = argv[i];