X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=1b3a8e09451f99542f3c85f95d59cdcfddb6f13b;hp=08245b698ec6980188a343694a371a96610875f9;hb=60f574e4b7e27b321443a38343056ba04287d8e2;hpb=421486db18ce2de31de71bf0372b6f5c049eb970 diff --git a/surf.c b/surf.c index 08245b6..1b3a8e0 100644 --- a/surf.c +++ b/surf.c @@ -57,7 +57,7 @@ typedef struct Client { Window xid; WebKitWebView *view; WebKitWebInspector *inspector; - char *title, *linkhover; + const char *title, *linkhover; const char *needle; gint progress; struct Client *next; @@ -155,7 +155,8 @@ 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 Client *newclient(Client *c); +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); @@ -178,7 +179,7 @@ static void setup(void); static void sigchld(int unused); static void spawn(Client *c, const Arg *arg); static void stop(Client *c, const Arg *arg); -static void titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c); +static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c); static void titlechangeleave(void *a, void *b, Client *c); static void toggle(Client *c, const Arg *arg); static void togglecookiepolicy(Client *c, const Arg *arg); @@ -333,6 +334,7 @@ cleanup(void) g_free(cookiefile); g_free(scriptfile); g_free(stylefile); + g_free(cachedir); } WebKitCookieAcceptPolicy @@ -775,12 +777,10 @@ navigate(Client *c, const Arg *arg) } Client * -newclient(void) +newclient(Client *rc) { Client *c; - WebKitWebSettings *settings; gdouble dpi; - char *ua; if (!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); @@ -788,94 +788,127 @@ newclient(void) c->title = NULL; c->progress = 100; + c->next = clients; + clients = c; + + c->view = newview(c, rc ? rc->view : NULL); + + return c; +} + +WebKitWebView * +newview(Client *c, WebKitWebView *rv) +{ + WebKitWebView *v; + WebKitSettings *settings; + WebKitUserContentManager *contentmanager; + WebKitWebContext *context; + char *ua; + /* Webview */ - c->view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + if (rv) { + v = WEBKIT_WEB_VIEW( + webkit_web_view_new_with_related_view(rv)); + } else { + settings = webkit_settings_new_with_settings( + "auto-load-images", loadimages, + "default-font-size", defaultfontsize, + "enable-caret-browsing", enablecaretbrowsing, + "enable-developer-extras", enableinspector, + "enable-dns-prefetching", enablednsprefetching, + "enable-frame-flattening", enableframeflattening, + "enable-html5-database", enablecache, + "enable-html5-local-storage", enablecache, + "enable-javascript", enablescripts, + "enable-plugins", enableplugins, + NULL); + if (!(ua = getenv("SURF_USERAGENT"))) + ua = useragent; + webkit_settings_set_user_agent(settings, ua); + /* Have a look at http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html + * for more interesting settings */ + + contentmanager = webkit_user_content_manager_new(); + + context = webkit_web_context_new_with_website_data_manager( + webkit_website_data_manager_new( + "base-cache-directory", cachedir, + "base-data-directory", cachedir, + NULL)); + + /* rendering process model, can be a shared unique one or one for each + * view */ + webkit_web_context_set_process_model(context, + WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); + /* ssl */ + webkit_web_context_set_tls_errors_policy(context, strictssl ? + WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); + /* disk cache */ + webkit_web_context_set_cache_model(context, enablecache ? + WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); + + /* Currently only works with text file to be compatible with curl */ + webkit_cookie_manager_set_persistent_storage( + webkit_web_context_get_cookie_manager(context), cookiefile, + WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); + /* cookie policy */ + webkit_cookie_manager_set_accept_policy( + webkit_web_context_get_cookie_manager(context), + cookiepolicy_get()); + + v = g_object_new(WEBKIT_TYPE_WEB_VIEW, + "settings", settings, + "user-content-manager", contentmanager, + "web-context", context, + NULL); + } - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "notify::title", - G_CALLBACK(titlechange), c); - g_signal_connect(G_OBJECT(c->view), + G_CALLBACK(titlechanged), c); + g_signal_connect(G_OBJECT(v), "hovering-over-link", G_CALLBACK(linkhover), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "geolocation-policy-decision-requested", G_CALLBACK(geopolicyrequested), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "create-web-view", G_CALLBACK(createwindow), c); g_signal_connect(G_OBJECT(v), "ready-to-show", G_CALLBACK(showview), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "mime-type-policy-decision-requested", G_CALLBACK(decidedownload), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "notify::load-status", G_CALLBACK(loadstatuschange), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "notify::progress", G_CALLBACK(progresschange), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "download-requested", G_CALLBACK(initdownload), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "button-release-event", G_CALLBACK(buttonrelease), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "context-menu", G_CALLBACK(contextmenu), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "resource-request-starting", G_CALLBACK(beforerequest), c); - g_signal_connect(G_OBJECT(c->view), + g_signal_connect(G_OBJECT(v), "should-show-delete-interface-for-element", G_CALLBACK(deletion_interface), c); - settings = webkit_web_view_get_settings(c->view); - if (!(ua = getenv("SURF_USERAGENT"))) - ua = useragent; - g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); - g_object_set(G_OBJECT(settings), - "auto-load-images", loadimages, NULL); - g_object_set(G_OBJECT(settings), - "enable-plugins", enableplugins, NULL); - g_object_set(G_OBJECT(settings), - "enable-scripts", enablescripts, NULL); - g_object_set(G_OBJECT(settings), - "enable-spatial-navigation", enablespatialbrowsing, NULL); - g_object_set(G_OBJECT(settings), - "enable-developer-extras", enableinspector, NULL); - g_object_set(G_OBJECT(settings), - "enable-default-context-menu", kioskmode ^ 1, NULL); - g_object_set(G_OBJECT(settings), - "default-font-size", defaultfontsize, NULL); - g_object_set(G_OBJECT(settings), - "resizable-text-areas", 1, NULL); - if (enablestyle) - setstyle(c, getstyle("about:blank")); - - if (enableinspector) { - c->inspector = webkit_web_view_get_inspector(c->view); - g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view", - G_CALLBACK(inspector_new), c); - g_signal_connect(G_OBJECT(c->inspector), "show-window", - G_CALLBACK(inspector_show), c); - g_signal_connect(G_OBJECT(c->inspector), "close-window", - G_CALLBACK(inspector_close), c); - g_signal_connect(G_OBJECT(c->inspector), "finished", - G_CALLBACK(inspector_finished), c); - c->isinspecting = false; - } - - c->next = clients; - clients = c; - - return c; + return v; } void @@ -1180,7 +1213,7 @@ setup(void) /* dirs and files */ cookiefile = buildfile(cookiefile); scriptfile = buildfile(scriptfile); - cachefolder = buildpath(cachefolder); + cachedir = buildpath(cachedir); if (stylefile == NULL) { styledir = buildpath(styledir); for (i = 0; i < LENGTH(styles); i++) { @@ -1205,29 +1238,6 @@ setup(void) stylefile = g_strconcat("file://", stylepath, NULL); g_free(stylepath); } - - /* cookie policy */ - webkit_cookie_manager_set_persistent_storage( - webkit_web_context_get_cookie_manager(context), cookiefile, - WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); - webkit_cookie_manager_set_accept_policy( - webkit_web_context_get_cookie_manager(context), - cookiepolicy_get()); - - /* rendering process model, can be a shared unique one or one for each - * view */ - webkit_web_context_set_process_model(context, - WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); - - /* disk cache */ - webkit_web_context_set_cache_model(context, enablecache ? - WEBKIT_CACHE_MODEL_WEB_BROWSER : - WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); - - /* ssl */ - webkit_web_context_set_tls_errors_policy(context, strictssl ? - WEBKIT_TLS_ERRORS_POLICY_FAIL : - WEBKIT_TLS_ERRORS_POLICY_IGNORE); } void @@ -1267,13 +1277,10 @@ stop(Client *c, const Arg *arg) } void -titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c) +titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c) { - const gchar *t = webkit_web_view_get_title(view); - if (t) { - c->title = copystr(&c->title, t); - updatetitle(c); - } + c->title = webkit_web_view_get_title(c->view); + updatetitle(c); } void @@ -1589,7 +1596,8 @@ main(int argc, char *argv[]) arg.v = argv[0]; setup(); - c = newclient(); + c = newclient(NULL); + showview(NULL, c); if (arg.v) loaduri(clients, &arg); else