X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=6bf7989349e74bea03f203fc67b36b9b4d28d69e;hb=2e1fb873613b3917b97c954f0c085ea05016bdce;hp=c9a036a46bd58d22499bd8627948a9a5ecd4a8d9;hpb=92d7ba7ed8cf4cb7ffa839596fca58032e2c4dd3;p=surf.git diff --git a/surf.c b/surf.c index c9a036a..6bf7989 100644 --- a/surf.c +++ b/surf.c @@ -60,11 +60,12 @@ typedef struct Client { WebKitWebView *view; WebKitWebInspector *inspector; WebKitHitTestResult *mousepos; + GTlsCertificateFlags tlsflags; const char *title, *targeturi; const char *needle; gint progress; struct Client *next; - gboolean zoomed, fullscreen, isinspecting, sslfailed; + gboolean zoomed, fullscreen, isinspecting; } Client; typedef struct { @@ -75,11 +76,12 @@ typedef struct { } Key; typedef struct { - unsigned int click; + unsigned int target; unsigned int mask; guint button; - void (*func)(Client *c, const Arg *arg); + void (*func)(Client *c, const Arg *a, WebKitHitTestResult *h); const Arg arg; + unsigned int stopevent; } Button; typedef struct { @@ -101,12 +103,9 @@ static int cookiepolicy; static char *stylefile = NULL; static void addaccelgroup(Client *c); -static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, - WebKitWebResource *r, WebKitNetworkRequest *req, - WebKitNetworkResponse *resp, Client *c); static char *buildfile(const char *path); static char *buildpath(const char *path); -static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c); +static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c); static void cleanup(void); static void clipboard(Client *c, const Arg *arg); @@ -114,16 +113,14 @@ static WebKitCookieAcceptPolicy cookiepolicy_get(void); static char cookiepolicy_set(const WebKitCookieAcceptPolicy p); 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 gboolean deletion_interface(WebKitWebView *view, - WebKitDOMHTMLElement *arg1, Client *c); +static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, + Client *c); +static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, + WebKitPolicyDecisionType dt, Client *c); +static void decidenavigation(WebKitPolicyDecision *d, Client *c); +static void decidenewwindow(WebKitPolicyDecision *d, Client *c); +static void decideresource(WebKitPolicyDecision *d, Client *c); +static void closeview(WebKitWebView *v, Client *c); static void destroyclient(Client *c); static void destroywin(GtkWidget* w, Client *c); static void die(const char *errstr, ...); @@ -139,9 +136,12 @@ static char *geturi(Client *c); static const gchar *getstyle(const char *uri); static void setstyle(Client *c, const char *style); -static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri); +static void handleplumb(Client *c, const gchar *uri); -static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); +static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d, + Client *c); +static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c); +static void download(Client *c, WebKitURIResponse *r); static void inspector(Client *c, const Arg *arg); static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v, @@ -154,8 +154,7 @@ static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods, Client *c); static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, Client *c); -static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, - Client *c); +static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); static void loaduri(Client *c, const Arg *arg); static void navigate(Client *c, const Arg *arg); static Client *newclient(Client *c); @@ -163,14 +162,10 @@ static WebKitWebView *newview(Client *c, WebKitWebView *rv); static void showview(WebKitWebView *v, Client *c); static void newwindow(Client *c, const Arg *arg, gboolean noembed); static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); -static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu, - WebKitHitTestResult *target, gboolean keyboard, - Client *c); -static void menuactivate(GtkMenuItem *item, Client *c); static void print(Client *c, const Arg *arg); static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); -static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c); +static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c); static void linkopen(Client *c, const Arg *arg); static void linkopenembed(Client *c, const Arg *arg); static void reload(Client *c, const Arg *arg); @@ -214,35 +209,6 @@ addaccelgroup(Client *c) gtk_window_add_accel_group(GTK_WINDOW(c->win), group); } -void -beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, - WebKitNetworkRequest *req, WebKitNetworkResponse *resp, - Client *c) -{ - const gchar *uri = webkit_network_request_get_uri(req); - int i, isascii = 1; - - if (g_str_has_suffix(uri, "/favicon.ico")) - webkit_network_request_set_uri(req, "about:blank"); - - if (!g_str_has_prefix(uri, "http://") - && !g_str_has_prefix(uri, "https://") - && !g_str_has_prefix(uri, "about:") - && !g_str_has_prefix(uri, "file://") - && !g_str_has_prefix(uri, "data:") - && !g_str_has_prefix(uri, "blob:") - && strlen(uri) > 0) { - for (i = 0; i < strlen(uri); i++) { - if (!g_ascii_isprint(uri[i])) { - isascii = 0; - break; - } - } - if (isascii) - handleplumb(c, w, uri); - } -} - char * buildfile(const char *path) { @@ -306,27 +272,25 @@ buildpath(const char *path) } gboolean -buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) +buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c) { - WebKitHitTestResultContext context; - WebKitHitTestResult *result; - Arg arg; - unsigned int i; - - result = webkit_web_view_get_hit_test_result(web, e); - g_object_get(result, "context", &context, NULL); - g_object_get(result, "link-uri", &arg.v, NULL); - for (i = 0; i < LENGTH(buttons); i++) { - if (context & buttons[i].click - && e->button == buttons[i].button - && CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) - && buttons[i].func) { - buttons[i].func(c, buttons[i].click == ClkLink - && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); - return true; + WebKitHitTestResultContext element; + GdkEventButton *eb = (GdkEventButton*)e; + int i; + + element = webkit_hit_test_result_get_context(c->mousepos); + + for (i = 0; i < LENGTH(buttons); ++i) { + if (element & buttons[i].target && + eb->button == buttons[i].button && + CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) && + buttons[i].func) { + buttons[i].func(c, &buttons[i].arg, c->mousepos); + return buttons[i].stopevent; } } - return false; + + return FALSE; } void @@ -427,45 +391,159 @@ copystr(char **str, const char *src) return tmp; } -WebKitWebView * -createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) +GtkWidget * +createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) { - Client *n = newclient(); - return n->view; + Client *n; + + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + /* + * popup windows of type “other” are almost always triggered + * by user gesture, so inverse the logic here + */ +/* instead of this, compare destination uri to mouse-over uri for validating window */ + if (webkit_navigation_action_is_user_gesture(a)) { + return NULL; + break; + } + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: + n = newclient(c); + break; + default: + return NULL; + break; + } + + return GTK_WIDGET(n->view); } gboolean -decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, - gchar *m, WebKitWebPolicyDecision *p, Client *c) +decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, + WebKitPolicyDecisionType dt, Client *c) { - if (!webkit_web_view_can_show_mime_type(v, m)) { - webkit_web_policy_decision_download(p); - return TRUE; + switch (dt) { + case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: + decidenavigation(d, c); + break; + case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION: + decidenewwindow(d, c); + break; + case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: + decideresource(d, c); + break; + default: + webkit_policy_decision_ignore(d); + break; } - return FALSE; + return TRUE; } -gboolean -decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, - WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, - Client *c) +void +decidenavigation(WebKitPolicyDecision *d, Client *c) { + WebKitNavigationAction *a; + + a = webkit_navigation_policy_decision_get_navigation_action( + WEBKIT_NAVIGATION_POLICY_DECISION(d)); + + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + default: + /* Do not navigate to links with a "_blank" target (popup) */ + if (webkit_navigation_policy_decision_get_frame_name( + WEBKIT_NAVIGATION_POLICY_DECISION(d))) { + webkit_policy_decision_ignore(d); + } else { + /* Filter out navigation to different domain ? */ + /* get action→urirequest, copy and load in new window+view + * on Ctrl+Click ? */ + webkit_policy_decision_use(d); + } + break; + } +} + +void +decidenewwindow(WebKitPolicyDecision *d, Client *c) +{ + WebKitNavigationAction *a; Arg arg; - if (webkit_web_navigation_action_get_reason(n) - == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { - webkit_web_policy_decision_ignore(p); - arg.v = (void *)webkit_network_request_get_uri(r); - newwindow(NULL, &arg, 0); - return TRUE; + a = webkit_navigation_policy_decision_get_navigation_action( + WEBKIT_NAVIGATION_POLICY_DECISION(d)); + + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: + /* Filter domains here */ +/* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event. + * test for link clicked but no button ? */ + arg.v = webkit_uri_request_get_uri( + webkit_navigation_action_get_request(a)); + newwindow(c, &arg, 0); + break; + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + default: + break; } - return FALSE; + + webkit_policy_decision_ignore(d); } -gboolean -deletion_interface(WebKitWebView *view, WebKitDOMHTMLElement *arg1, Client *c) +void +decideresource(WebKitPolicyDecision *d, Client *c) { - return FALSE; + const gchar *uri; + int i, isascii = 1; + WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d); + WebKitURIResponse *res; + + res = webkit_response_policy_decision_get_response(r); + uri = webkit_uri_response_get_uri(res); + + if (g_str_has_suffix(uri, "/favicon.ico")) + webkit_uri_request_set_uri( + webkit_response_policy_decision_get_request(r), + "about:blank"); + + if (!g_str_has_prefix(uri, "http://") + && !g_str_has_prefix(uri, "https://") + && !g_str_has_prefix(uri, "about:") + && !g_str_has_prefix(uri, "file://") + && !g_str_has_prefix(uri, "data:") + && !g_str_has_prefix(uri, "blob:") + && strlen(uri) > 0) { + for (i = 0; i < strlen(uri); i++) { + if (!g_ascii_isprint(uri[i])) { + isascii = 0; + break; + } + } + if (isascii) { + handleplumb(c, uri); + webkit_policy_decision_ignore(d); + } + } + + if (webkit_response_policy_decision_is_mime_type_supported(r)) { + webkit_policy_decision_use(d); + } else { + webkit_policy_decision_ignore(d); + download(c, res); + } } void @@ -474,10 +552,9 @@ destroyclient(Client *c) Client *p; webkit_web_view_stop_loading(c->view); - gtk_widget_destroy(GTK_WIDGET(c->view)); - gtk_widget_destroy(c->scroll); - gtk_widget_destroy(c->vbox); + /* Not needed, has already been called gtk_widget_destroy(c->win); + */ for (p = clients; p && p->next != c; p = p->next) ; @@ -486,14 +563,20 @@ destroyclient(Client *c) else clients = c->next; free(c); - if (clients == NULL) - gtk_main_quit(); +} + +void +closeview(WebKitWebView *v, Client *c) +{ + gtk_widget_destroy(c->win); } void destroywin(GtkWidget* w, Client *c) { destroyclient(c); + if (clients == NULL) + gtk_main_quit(); } void @@ -598,24 +681,35 @@ setstyle(Client *c, const char *style) } void -handleplumb(Client *c, WebKitWebView *w, const gchar *uri) +handleplumb(Client *c, const gchar *uri) { Arg arg; - webkit_web_view_stop_loading(w); - arg = (Arg)PLUMB((char *)uri); + arg = (Arg)PLUMB(uri); spawn(c, &arg); } -gboolean -initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) +void +downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c) { - Arg arg; + g_signal_connect(G_OBJECT(d), "notify::response", + G_CALLBACK(responsereceived), c); +} - updatewinid(c); - arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c)); - spawn(c, &arg); - return FALSE; +void +responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c) +{ + download(c, webkit_download_get_response(d)); + webkit_download_cancel(d); +} + +void +download(Client *c, WebKitURIResponse *r) +{ + Arg a; + + a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c)); + spawn(c, &a); } void @@ -718,37 +812,34 @@ mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, } void -loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) +loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) { - WebKitWebFrame *frame; - WebKitWebDataSource *src; - WebKitNetworkRequest *request; - SoupMessage *msg; - char *uri; - - switch (webkit_web_view_get_load_status (c->view)) { + switch (e) { + case WEBKIT_LOAD_STARTED: + c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + break; + case WEBKIT_LOAD_REDIRECTED: + setatom(c, AtomUri, geturi(c)); + break; case WEBKIT_LOAD_COMMITTED: - uri = geturi(c); - if (strstr(uri, "https://") == uri) { - frame = webkit_web_view_get_main_frame(c->view); - src = webkit_web_frame_get_data_source(frame); - request = webkit_web_data_source_get_request(src); - msg = webkit_network_request_get_message(request); - c->sslfailed = !(soup_message_get_flags(msg) - & SOUP_MESSAGE_CERTIFICATE_TRUSTED); - } - setatom(c, AtomUri, uri); + if (!webkit_web_view_get_tls_info(c->view, NULL, &(c->tlsflags))) + c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + + setatom(c, AtomUri, geturi(c)); if (enablestyle) - setstyle(c, getstyle(uri)); + setstyle(c, getstyle(geturi(c))); break; case WEBKIT_LOAD_FINISHED: - c->progress = 100; - updatetitle(c); - break; - default: + /* Disabled until we write some WebKitWebExtension for + * manipulating the DOM directly. + evalscript(c, "document.documentElement.style.overflow = '%s'", + enablescrollbars ? "auto" : "hidden"); + */ + runscript(c); break; } + updatetitle(c); } void @@ -809,6 +900,7 @@ newclient(Client *rc) clients = c; c->view = newview(c, rc ? rc->view : NULL); + c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; return c; } @@ -873,6 +965,9 @@ newview(Client *c, WebKitWebView *rv) webkit_web_context_get_cookie_manager(context), cookiepolicy_get()); + g_signal_connect(G_OBJECT(context), "download-started", + G_CALLBACK(downloadstarted), c); + v = g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "user-content-manager", contentmanager, @@ -890,40 +985,27 @@ newview(Client *c, WebKitWebView *rv) "permission-request", G_CALLBACK(permissionrequested), c); g_signal_connect(G_OBJECT(v), - "create-web-view", - G_CALLBACK(createwindow), c); + "create", + G_CALLBACK(createview), c); g_signal_connect(G_OBJECT(v), "ready-to-show", G_CALLBACK(showview), c); g_signal_connect(G_OBJECT(v), - "new-window-policy-decision-requested", - G_CALLBACK(decidewindow), c); - g_signal_connect(G_OBJECT(v), - "mime-type-policy-decision-requested", - G_CALLBACK(decidedownload), c); + "decide-policy", + G_CALLBACK(decidepolicy), c); g_signal_connect(G_OBJECT(v), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); g_signal_connect(G_OBJECT(v), - "notify::load-status", - G_CALLBACK(loadstatuschange), c); + "load-changed", + G_CALLBACK(loadchanged), c); g_signal_connect(G_OBJECT(v), - "notify::progress", - G_CALLBACK(progresschange), c); - g_signal_connect(G_OBJECT(v), - "download-requested", - G_CALLBACK(initdownload), c); + "notify::estimated-load-progress", + G_CALLBACK(progresschanged), c); g_signal_connect(G_OBJECT(v), "button-release-event", - G_CALLBACK(buttonrelease), c); - g_signal_connect(G_OBJECT(v), - "context-menu", - G_CALLBACK(contextmenu), c); - g_signal_connect(G_OBJECT(v), - "resource-request-starting", - G_CALLBACK(beforerequest), c); - g_signal_connect(G_OBJECT(v), - "should-show-delete-interface-for-element", - G_CALLBACK(deletion_interface), c); + G_CALLBACK(buttonreleased), c); + g_signal_connect(G_OBJECT(v), "close", + G_CALLBACK(closeview), c); return v; } @@ -1046,53 +1128,6 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) spawn(NULL, &a); } -gboolean -contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target, - gboolean keyboard, Client *c) -{ - GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu))); - - for (GList *l = items; l; l = l->next) - g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c); - - g_list_free(items); - return FALSE; -} - -void -menuactivate(GtkMenuItem *item, Client *c) -{ - /* - * context-menu-action-2000 open link - * context-menu-action-1 open link in window - * context-menu-action-2 download linked file - * context-menu-action-3 copy link location - * context-menu-action-7 copy image address - * context-menu-action-13 reload - * context-menu-action-10 back - * context-menu-action-11 forward - * context-menu-action-12 stop - */ - - const gchar *name, *uri; - GtkClipboard *prisel, *clpbrd; - - name = gtk_actionable_get_action_name(GTK_ACTIONABLE(item)); - if (name == NULL) - return; - - if (!g_strcmp0(name, "context-menu-action-3")) { - prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text(prisel, c->linkhover, -1); - } else if (!g_strcmp0(name, "context-menu-action-7")) { - prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY); - clpbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); - uri = gtk_clipboard_wait_for_text(clpbrd); - if (uri) - gtk_clipboard_set_text(prisel, uri, -1); - } -} - void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { @@ -1134,9 +1169,10 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) } void -progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) +progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c) { - c->progress = webkit_web_view_get_progress(c->view) * 100; + c->progress = webkit_web_view_get_estimated_load_progress(c->view) * + 100; updatetitle(c); } @@ -1434,11 +1470,8 @@ getpagestat(Client *c) { const char *uri = geturi(c); - if (strstr(uri, "https://") == uri) - pagestat[0] = c->sslfailed ? 'U' : 'T'; - else - pagestat[0] = '-'; - + pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' : + c->tlsflags > 0 ? 'U' : 'T'; pagestat[1] = '\0'; }