X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=1b3a8e09451f99542f3c85f95d59cdcfddb6f13b;hp=30c3f8544594d6d28c3222d69a5137484656c11f;hb=60f574e4b7e27b321443a38343056ba04287d8e2;hpb=42829cdad04c6191c6571d571cde051b16834e43 diff --git a/surf.c b/surf.c index 30c3f85..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,9 @@ 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); static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu, @@ -177,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); @@ -332,6 +334,7 @@ cleanup(void) g_free(cookiefile); g_free(scriptfile); g_free(stylefile); + g_free(cachedir); } WebKitCookieAcceptPolicy @@ -774,15 +777,10 @@ navigate(Client *c, const Arg *arg) } Client * -newclient(void) +newclient(Client *rc) { Client *c; - WebKitWebSettings *settings; - GdkGeometry hints = { 1, 1 }; - GdkScreen *screen; - GdkWindow *gwin; gdouble dpi; - char *ua; if (!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); @@ -790,83 +788,167 @@ newclient(void) c->title = NULL; c->progress = 100; - /* Window */ - if (embed) { - c->win = gtk_plug_new(embed); - } else { - c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + c->next = clients; + clients = c; - /* 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"); + c->view = newview(c, rc ? rc->view : NULL); - /* 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); - g_signal_connect(G_OBJECT(c->win), - "leave_notify_event", - G_CALLBACK(titlechangeleave), c); + return c; +} - if (!kioskmode) - addaccelgroup(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(c->view), + 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(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); + return v; +} + +void +showview(WebKitWebView *v, Client *c) +{ + GdkGeometry hints = { 1, 1 }; + GdkRGBA bgcolor = { 0 }; + GdkWindow *gwin; + + /* Window */ + if (embed) { + c->win = gtk_plug_new(embed); + } 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); + g_signal_connect(G_OBJECT(c->win), + "leave_notify_event", + G_CALLBACK(titlechangeleave), c); + + if (!kioskmode) + addaccelgroup(c); + /* Arranging */ gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view)); @@ -880,74 +962,20 @@ newclient(void) GDK_HINT_MIN_SIZE); gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); gdk_window_add_filter(gwin, processx, c); - webkit_web_view_set_full_content_zoom(c->view, TRUE); runscript(frame); - 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")); - - /* - * While stupid, CSS specifies that a pixel represents 1/96 of an inch. - * This ensures websites are not unusably small with a high DPI screen. - * It is equivalent to firefox's "layout.css.devPixelsPerPx" setting. - */ - if (zoomto96dpi) { - screen = gdk_window_get_screen(gwin); - dpi = gdk_screen_get_resolution(screen); - if (dpi != -1) { - g_object_set(G_OBJECT(settings), - "enforce-96-dpi", true, NULL); - webkit_web_view_set_zoom_level(c->view, dpi/96); - } - } /* This might conflict with _zoomto96dpi_. */ if (zoomlevel != 1.0) webkit_web_view_set_zoom_level(c->view, zoomlevel); - 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; - } - if (runinfullscreen) fullscreen(c, NULL); setatom(c, AtomFind, ""); setatom(c, AtomUri, "about:blank"); if (hidebackground) - webkit_web_view_set_transparent(c->view, TRUE); - - c->next = clients; - clients = c; + webkit_web_view_set_background_color(c->view, &bgcolor); if (showxid) { gdk_display_sync(gtk_widget_get_display(c->win)); @@ -957,8 +985,6 @@ newclient(void) die("Error closing stdout"); } } - - return c; } void @@ -1187,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++) { @@ -1212,24 +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()); - - /* 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 @@ -1269,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 @@ -1591,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