X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=fe63fd4a642033a2bca0aeba789742372a962ca3;hb=1cbeab188d8769ae67dfa99a4191088ab42db415;hp=fa26a2af275268a04ad3336cc9729cf66de6e328;hpb=9d4953691d8e821237eed09cc687d560423908df;p=surf.git diff --git a/surf.c b/surf.c index fa26a2a..fe63fd4 100644 --- a/surf.c +++ b/surf.c @@ -56,7 +56,6 @@ typedef struct { static Display *dpy; static Atom uriprop, findprop; -static SoupCookieJar *cookies; static SoupSession *session; static Client *clients = NULL; static GdkNativeWindow embed = 0; @@ -64,14 +63,13 @@ static gboolean showxid = FALSE; static int ignorexprop = 0; static char winid[64]; static char *progname; -static gboolean lockcookie = FALSE; 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); static char *copystr(char **str, const char *src); +static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c); static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c); static void destroyclient(Client *c); @@ -80,39 +78,37 @@ static void die(char *str); static void download(Client *c, const Arg *arg); static void drawindicator(Client *c); static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); -static char *geturi(Client *c); +static void find(Client *c, const Arg *arg); static const char *getatom(Client *c, Atom a); +static char *geturi(Client *c); 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 WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); +static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c); static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); -static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); static void print(Client *c, const Arg *arg); -static void progresschange(WebKitWebView *v, gint p, Client *c); -static void reloadcookies(); +static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); +static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c); static void reload(Client *c, const Arg *arg); static void resize(GtkWidget *w, GtkAllocation *a, Client *c); -static void sigchld(int unused); +static void scroll(Client *c, const Arg *arg); static void setatom(Client *c, Atom a, const char *v); static void setup(void); -static void spawn(Client *c, const Arg *arg); -static void scroll(Client *c, const Arg *arg); -static void find(Client *c, const Arg *arg); +static void sigchld(int unused); static void source(Client *c, const Arg *arg); +static void spawn(Client *c, const Arg *arg); static void stop(Client *c, const Arg *arg); static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c); -static void usage(void); static void update(Client *c); static void updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c); static void updatewinid(Client *c); +static void usage(void); static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c); static void zoom(Client *c, const Arg *arg); @@ -140,27 +136,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) @@ -209,28 +184,10 @@ copystr(char **str, const char *src) { return tmp; } -void -destroyclient(Client *c) { - int i; - Client *p; - - gtk_widget_destroy(c->indicator); - gtk_widget_destroy(GTK_WIDGET(c->view)); - gtk_widget_destroy(c->scroll); - gtk_widget_destroy(c->vbox); - gtk_widget_destroy(c->win); - for(i = 0; i < LENGTH(items); i++) - gtk_widget_destroy(c->items[i]); - free(c->items); - - 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(); +WebKitWebView * +createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { + Client *n = newclient(); + return n->view; } gboolean @@ -255,6 +212,30 @@ decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, We return FALSE; } +void +destroyclient(Client *c) { + int i; + Client *p; + + gtk_widget_destroy(c->indicator); + gtk_widget_destroy(GTK_WIDGET(c->view)); + gtk_widget_destroy(c->scroll); + gtk_widget_destroy(c->vbox); + gtk_widget_destroy(c->win); + for(i = 0; i < LENGTH(items); i++) + gtk_widget_destroy(c->items[i]); + free(c->items); + + 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 destroywin(GtkWidget* w, Client *c) { destroyclient(c); @@ -266,6 +247,21 @@ die(char *str) { exit(EXIT_FAILURE); } +void +download(Client *c, const Arg *arg) { + char *uri; + WebKitNetworkRequest *r; + WebKitDownload *dl; + + if(arg->v) + uri = (char *)arg->v; + else + uri = c->linkhover ? c->linkhover : geturi(c); + r = webkit_network_request_new(uri); + dl = webkit_download_new(r); + initdownload(c->view, dl, c); +} + void drawindicator(Client *c) { gint width; @@ -296,18 +292,12 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) { } void -download(Client *c, const Arg *arg) { - char *uri; - WebKitNetworkRequest *r; - WebKitDownload *dl; +find(Client *c, const Arg *arg) { + const char *s; - if(arg->v) - uri = (char *)arg->v; - else - uri = c->linkhover ? c->linkhover : geturi(c); - r = webkit_network_request_new(uri); - dl = webkit_download_new(r); - initdownload(c->view, dl, c); + s = getatom(c, findprop); + gboolean forward = *(gboolean *)arg; + webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); } const char * @@ -329,6 +319,15 @@ getatom(Client *c, Atom a) { return buf; } +char * +geturi(Client *c) { + char *uri; + + if(!(uri = (char *)webkit_web_view_get_uri(c->view))) + uri = "about:blank"; + return uri; +} + gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { const char *filename; @@ -356,15 +355,6 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { return TRUE; } -char * -geturi(Client *c) { - char *uri; - - if(!(uri = (char *)webkit_web_view_get_uri(c->view))) - uri = "about:blank"; - return uri; -} - void itemclick(GtkMenuItem *mi, Client *c) { int i; @@ -405,34 +395,47 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { } void -loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) { - setatom(c, uriprop, geturi(c)); -} - -void -loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { - c->progress = 0; - update(c); - reloadcookies(); +loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { + switch(webkit_web_view_get_load_status (c->view)) { + case WEBKIT_LOAD_COMMITTED: + setatom(c, uriprop, geturi(c)); + break; + case WEBKIT_LOAD_FINISHED: + c->progress = 0; + update(c); + break; + case WEBKIT_LOAD_PROVISIONAL: + case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT: + 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); } @@ -442,7 +445,7 @@ newclient(void) { Client *c; WebKitWebSettings *settings; GdkGeometry hints = { 1, 1 }; - char *uri; + char *uri, *ua; if(!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); @@ -452,7 +455,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); @@ -480,9 +495,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); @@ -490,6 +502,9 @@ 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); + g_signal_connect(G_OBJECT(c->view), "resource-request-starting", G_CALLBACK(newrequest), c); /* Indicator */ c->indicator = gtk_drawing_area_new(); @@ -517,11 +532,14 @@ newclient(void) { gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c); webkit_web_view_set_full_content_zoom(c->view, TRUE); settings = webkit_web_view_get_settings(c->view); - g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL); + if(!(ua = getenv("SURF_USERAGENT"))) + ua = useragent; + 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_free(uri); setatom(c, findprop, ""); + setatom(c, uriprop, ""); c->download = NULL; c->title = NULL; @@ -535,6 +553,15 @@ newclient(void) { return c; } +static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) { + SoupMessage *msg = webkit_network_request_get_message(req); + SoupMessageHeaders *h; + if(!msg) + return; + h = msg->request_headers; + soup_message_headers_remove(h, "Cookies"); +} + void newwindow(Client *c, const Arg *arg) { guint i = 0; @@ -559,12 +586,6 @@ newwindow(Client *c, const Arg *arg) { spawn(NULL, &a); } -WebKitWebView * -createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { - Client *n = newclient(); - return n->view; -} - void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Arg arg = {.v = text }; @@ -572,6 +593,11 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { loaduri((Client *) d, &arg); } +void +print(Client *c, const Arg *arg) { + webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); +} + GdkFilterReturn processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Client *c = (Client *)d; @@ -598,13 +624,8 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { } void -print(Client *c, const Arg *arg) { - webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); -} - -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); } @@ -618,20 +639,16 @@ reload(Client *c, const Arg *arg) { } void -reloadcookies() { - SoupCookieJar *jar; - GSList *l, *e; +resize(GtkWidget *w, GtkAllocation *a, Client *c) { + double zoom; - 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); + if(c->zoomed) + return; + zoom = webkit_web_view_get_zoom_level(c->view); + if(a->width * a->height < 300 * 400 && zoom != 0.2) + webkit_web_view_set_zoom_level(c->view, 0.2); + else if(zoom != 1.0) + webkit_web_view_set_zoom_level(c->view, 1.0); } void @@ -647,26 +664,6 @@ scroll(Client *c, const Arg *arg) { gtk_adjustment_set_value(a, v); } -void -resize(GtkWidget *w, GtkAllocation *a, Client *c) { - double zoom; - - if(c->zoomed) - return; - zoom = webkit_web_view_get_zoom_level(c->view); - if(a->width * a->height < 300 * 400 && zoom != 0.2) - webkit_web_view_set_zoom_level(c->view, 0.2); - else if(zoom != 1.0) - webkit_web_view_set_zoom_level(c->view, 1.0); -} - -void -sigchld(int unused) { - if(signal(SIGCHLD, sigchld) == SIG_ERR) - die("Can't install SIGCHLD handler"); - while(0 < waitpid(-1, NULL, WNOHANG)); -} - void setatom(Client *c, Atom a, const char *v) { XSync(dpy, False); @@ -679,6 +676,9 @@ setatom(Client *c, Atom a, const char *v) { void setup(void) { SoupSession *s; + char *proxy; + char *new_proxy; + SoupURI *puri; /* clean up any zombies immediately */ sigchld(0); @@ -697,12 +697,23 @@ setup(void) { scriptfile = buildpath(scriptfile); stylefile = buildpath(stylefile); - /* cookie persistance */ - 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); - reloadcookies(); + /* proxy */ + if((proxy = getenv("http_proxy")) && strcmp(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); + } +} + +void +sigchld(int unused) { + if(signal(SIGCHLD, sigchld) == SIG_ERR) + die("Can't install SIGCHLD handler"); + while(0 < waitpid(-1, NULL, WNOHANG)); } void @@ -715,24 +726,6 @@ source(Client *c, const Arg *arg) { reload(c, &a); } -void -find(Client *c, const Arg *arg) { - const char *s; - - s = getatom(c, findprop); - gboolean forward = *(gboolean *)arg; - webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); -} - -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 spawn(Client *c, const Arg *arg) { if(fork() == 0) { @@ -747,15 +740,18 @@ spawn(Client *c, const Arg *arg) { } void -titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) { - c->title = copystr(&c->title, t); - update(c); +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 -usage(void) { - fputs("surf - simple browser\n", stderr); - die("usage: surf [-e Window] [-x] [uri]\n"); +titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) { + c->title = copystr(&c->title, t); + update(c); } void @@ -790,6 +786,12 @@ updatewinid(Client *c) { (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); } +void +usage(void) { + fputs("surf - simple browser\n", stderr); + die("usage: surf [-e Window] [-x] [uri]\n"); +} + void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) { JSStringRef jsscript;