*
* To understand surf, start reading main().
*/
-#include <signal.h>
-#include <X11/X.h>
-#include <X11/Xatom.h>
-#include <gtk/gtkx.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
+#include <sys/file.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <unistd.h>
+#include <glib.h>
+#include <libgen.h>
#include <limits.h>
-#include <stdlib.h>
+#include <pwd.h>
+#include <regex.h>
+#include <signal.h>
+#include <stdarg.h>
#include <stdio.h>
-#include <webkit2/webkit2.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
+#include <gcr/gcr.h>
#include <JavaScriptCore/JavaScript.h>
-#include <sys/file.h>
-#include <libgen.h>
-#include <stdarg.h>
-#include <regex.h>
-#include <pwd.h>
-#include <string.h>
+#include <webkit2/webkit2.h>
+#include <X11/X.h>
+#include <X11/Xatom.h>
#include "arg.h"
-char *argv0;
-
#define LENGTH(x) (sizeof(x) / sizeof(x[0]))
#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK))
+#define SETB(p, s) [p] = { { .b = s }, }
+#define SETI(p, s) [p] = { { .i = s }, }
+#define SETV(p, s) [p] = { { .v = s }, }
+#define SETF(p, s) [p] = { { .f = s }, }
+#define FSETB(p, s) [p] = { { .b = s }, 1 }
+#define FSETI(p, s) [p] = { { .i = s }, 1 }
+#define FSETV(p, s) [p] = { { .v = s }, 1 }
+#define FSETF(p, s) [p] = { { .f = s }, 1 }
+#define CSETB(p, s) [p] = (Parameter){ { .b = s }, 1 }
+#define CSETI(p, s) [p] = (Parameter){ { .i = s }, 1 }
+#define CSETV(p, s) [p] = (Parameter){ { .v = s }, 1 }
+#define CSETF(p, s) [p] = (Parameter){ { .f = s }, 1 }
enum { AtomFind, AtomGo, AtomUri, AtomLast };
OnAny = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
};
-typedef union Arg Arg;
-union Arg {
- gboolean b;
- gint i;
+typedef enum {
+ AcceleratedCanvas,
+ CaretBrowsing,
+ Certificate,
+ CookiePolicies,
+ DiskCache,
+ DNSPrefetch,
+ FontSize,
+ FrameFlattening,
+ Geolocation,
+ HideBackground,
+ Inspector,
+ JavaScript,
+ KioskMode,
+ LoadImages,
+ MediaManualPlay,
+ Plugins,
+ PreferredLanguages,
+ RunInFullscreen,
+ ScrollBars,
+ ShowIndicators,
+ SiteQuirks,
+ SpellChecking,
+ SpellLanguages,
+ StrictTLS,
+ Style,
+ ZoomLevel,
+ ParameterLast,
+} ParamName;
+
+typedef union {
+ int b;
+ int i;
+ float f;
const void *v;
-};
+} Arg;
+
+typedef struct {
+ Arg val;
+ int force;
+} Parameter;
typedef struct Client {
GtkWidget *win;
- Window xid;
WebKitWebView *view;
WebKitWebInspector *inspector;
+ WebKitFindController *finder;
WebKitHitTestResult *mousepos;
- GTlsCertificateFlags tlsflags;
- const char *title, *targeturi;
+ GTlsCertificate *cert, *failedcert;
+ GTlsCertificateFlags tlserr;
+ Window xid;
+ int progress, fullscreen, https, insecure, errorpage;
+ const char *title, *overtitle, *targeturi;
const char *needle;
- gint progress;
struct Client *next;
- gboolean zoomed, fullscreen, isinspecting;
} Client;
typedef struct {
guint mod;
guint keyval;
- void (*func)(Client *c, const Arg *arg);
+ void (*func)(Client *c, const Arg *a);
const Arg arg;
} Key;
} Button;
typedef struct {
- char *regex;
- char *style;
+ const char *uri;
+ Parameter config[ParameterLast];
regex_t re;
-} SiteStyle;
+} UriParameters;
-static Display *dpy;
-static Atom atoms[AtomLast];
-static Client *clients = NULL;
-static Window embed = 0;
-static gboolean showxid = FALSE;
-static char winid[64];
-static char togglestat[9];
-static char pagestat[3];
-static GTlsDatabase *tlsdb;
-static int cookiepolicy;
-static char *stylefile = NULL;
+typedef struct {
+ char *regex;
+ char *file;
+ regex_t re;
+} SiteSpecific;
-static void addaccelgroup(Client *c);
-static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
- WebKitWebResource *r, WebKitNetworkRequest *req,
- WebKitNetworkResponse *resp, Client *c);
+/* Surf */
+static void usage(void);
+static void die(const char *errstr, ...);
+static void setup(void);
+static void sigchld(int unused);
+static void sighup(int unused);
static char *buildfile(const char *path);
static char *buildpath(const char *path);
-static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
-static void cleanup(void);
-static void clipboard(Client *c, const Arg *arg);
-
+static const char *getuserhomedir(const char *user);
+static const char *getcurrentuserhomedir(void);
+static Client *newclient(Client *c);
+static void loaduri(Client *c, const Arg *a);
+static const char *geturi(Client *c);
+static void setatom(Client *c, int a, const char *v);
+static const char *getatom(Client *c, int a);
+static void updatetitle(Client *c);
+static void gettogglestats(Client *c);
+static void getpagestats(Client *c);
static WebKitCookieAcceptPolicy cookiepolicy_get(void);
static char cookiepolicy_set(const WebKitCookieAcceptPolicy p);
+static void seturiparameters(Client *c, const char *uri);
+static void setparameter(Client *c, int refresh, ParamName p, const Arg *a);
+static const char *getcert(const char *uri);
+static void setcert(Client *c, const char *file);
+static const char *getstyle(const char *uri);
+static void setstyle(Client *c, const char *file);
+static void runscript(Client *c);
+static void evalscript(Client *c, const char *jsstr, ...);
+static void updatewinid(Client *c);
+static void handleplumb(Client *c, const char *uri);
+static void newwindow(Client *c, const Arg *a, int noembed);
+static void spawn(Client *c, const Arg *a);
+static void destroyclient(Client *c);
+static void cleanup(void);
-static char *copystr(char **str, const char *src);
+/* GTK/WebKit */
+static WebKitWebView *newview(Client *c, WebKitWebView *rv);
+static void initwebextensions(WebKitWebContext *wc, Client *c);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
- Client *c);
+ Client *c);
+static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
+ gpointer d);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
+static void showview(WebKitWebView *v, Client *c);
+static GtkWidget *createwindow(Client *c);
+static gboolean loadfailedtls(WebKitWebView *v, gchar *uri,
+ GTlsCertificate *cert,
+ GTlsCertificateFlags err, Client *c);
+static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
+static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
+static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
+static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
+ guint modifiers, Client *c);
+static gboolean permissionrequested(WebKitWebView *v,
+ WebKitPermissionRequest *r, Client *c);
static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
- WebKitPolicyDecisionType dt, Client *c);
+ 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 gboolean deletion_interface(WebKitWebView *view,
- WebKitDOMHTMLElement *arg1, Client *c);
-static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, Client *c);
-static void die(const char *errstr, ...);
-static void eval(Client *c, const Arg *arg);
-static void find(Client *c, const Arg *arg);
-static void fullscreen(Client *c, const Arg *arg);
-static gboolean permissionrequested(WebKitWebView *v,
- WebKitPermissionRequest *r, Client *c);
-static const char *getatom(Client *c, int a);
-static void gettogglestat(Client *c);
-static void getpagestat(Client *c);
-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 insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
+ Client *c);
static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
- Client *c);
+ Client *c);
static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
static void download(Client *c, WebKitURIResponse *r);
+static void closeview(WebKitWebView *v, Client *c);
+static void destroywin(GtkWidget* w, Client *c);
-static void inspector(Client *c, const Arg *arg);
-static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v,
- Client *c);
-static gboolean inspector_show(WebKitWebInspector *i, Client *c);
-static gboolean inspector_close(WebKitWebInspector *i, Client *c);
-static void inspector_finished(WebKitWebInspector *i, Client *c);
-
-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 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);
-static WebKitWebView *newview(Client *c, WebKitWebView *rv);
-static void showview(WebKitWebView *v, Client *c);
-static void newwindow(Client *c, const Arg *arg, gboolean noembed);
+/* Hotkeys */
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 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);
-static void scroll_h(Client *c, const Arg *arg);
-static void scroll_v(Client *c, const Arg *arg);
-static void scroll(GtkAdjustment *a, const Arg *arg);
-static void setatom(Client *c, int a, const char *v);
-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 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);
-static void togglegeolocation(Client *c, const Arg *arg);
-static void togglescrollbars(Client *c, const Arg *arg);
-static void togglestyle(Client *c, const Arg *arg);
-static void updatetitle(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);
+static void reload(Client *c, const Arg *a);
+static void print(Client *c, const Arg *a);
+static void showcert(Client *c, const Arg *a);
+static void clipboard(Client *c, const Arg *a);
+static void zoom(Client *c, const Arg *a);
+static void scroll(Client *c, const Arg *a);
+static void navigate(Client *c, const Arg *a);
+static void stop(Client *c, const Arg *a);
+static void toggle(Client *c, const Arg *a);
+static void togglefullscreen(Client *c, const Arg *a);
+static void togglecookiepolicy(Client *c, const Arg *a);
+static void toggleinspector(Client *c, const Arg *a);
+static void find(Client *c, const Arg *a);
+
+/* Buttons */
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
+static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
+
+static char winid[64];
+static char togglestats[12];
+static char pagestats[2];
+static Atom atoms[AtomLast];
+static Window embed;
+static int showxid;
+static int cookiepolicy;
+static Display *dpy;
+static Client *clients;
+static GdkDevice *gdkkb;
+static char *stylefile;
+static const char *useragent;
+static Parameter *curconfig;
+char *argv0;
/* configuration, allows nested code to access above variables */
#include "config.h"
void
-addaccelgroup(Client *c)
+usage(void)
{
- int i;
- GtkAccelGroup *group = gtk_accel_group_new();
- GClosure *closure;
+ die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvwxX] [-a cookiepolicies ] "
+ "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
+ "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+}
- for (i = 0; i < LENGTH(keys); i++) {
- closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
- gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0,
- closure);
- }
- gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
+void
+die(const char *errstr, ...)
+{
+ va_list ap;
+
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+ exit(1);
}
void
-beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
- WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
- Client *c)
+setup(void)
{
- const gchar *uri = webkit_network_request_get_uri(req);
- int i, isascii = 1;
+ GdkDisplay *gdpy;
+ int i, j;
- if (g_str_has_suffix(uri, "/favicon.ico"))
- webkit_network_request_set_uri(req, "about:blank");
+ /* clean up any zombies immediately */
+ sigchld(0);
+ if (signal(SIGHUP, sighup) == SIG_ERR)
+ die("Can't install SIGHUP handler");
- 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 (!(dpy = XOpenDisplay(NULL)))
+ die("Can't open default display");
+
+ /* atoms */
+ atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+ atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+ atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+
+ gtk_init(NULL, NULL);
+
+ gdpy = gdk_display_get_default();
+
+ curconfig = defconfig;
+
+ /* dirs and files */
+ cookiefile = buildfile(cookiefile);
+ scriptfile = buildfile(scriptfile);
+ cachedir = buildpath(cachedir);
+ certdir = buildpath(certdir);
+
+ gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
+
+ for (i = 0; i < LENGTH(certs); ++i) {
+ if (!regcomp(&(certs[i].re), certs[i].regex, REG_EXTENDED)) {
+ certs[i].file = g_strconcat(certdir, "/", certs[i].file,
+ NULL);
+ } else {
+ fprintf(stderr, "Could not compile regex: %s\n",
+ certs[i].regex);
+ certs[i].regex = NULL;
+ }
+ }
+
+ if (!stylefile) {
+ styledir = buildpath(styledir);
+ for (i = 0; i < LENGTH(styles); ++i) {
+ if (!regcomp(&(styles[i].re), styles[i].regex,
+ REG_EXTENDED)) {
+ styles[i].file = g_strconcat(styledir, "/",
+ styles[i].file, NULL);
+ } else {
+ fprintf(stderr, "Could not compile regex: %s\n",
+ styles[i].regex);
+ styles[i].regex = NULL;
+ }
+ }
+ g_free(styledir);
+ } else {
+ stylefile = buildfile(stylefile);
+ }
+
+ for (i = 0; i < LENGTH(uriparams); ++i) {
+ if (!regcomp(&(uriparams[i].re), uriparams[i].uri,
+ REG_EXTENDED)) {
+ /* copy default parameters if they are not already set
+ * or if they are forced */
+ for (j = 0; j < ParameterLast; ++j) {
+ if (!uriparams[i].config[j].force ||
+ defconfig[j].force)
+ uriparams[i].config[j] = defconfig[j];
}
+ } else {
+ fprintf(stderr, "Could not compile regex: %s\n",
+ uriparams[i].uri);
+ uriparams[i].uri = NULL;
}
- if (isascii)
- handleplumb(c, w, uri);
}
}
+void
+sigchld(int unused)
+{
+ if (signal(SIGCHLD, sigchld) == SIG_ERR)
+ die("Can't install SIGCHLD handler");
+ while (waitpid(-1, NULL, WNOHANG) > 0)
+ ;
+}
+
+void
+sighup(int unused)
+{
+ Arg a = { .b = 0 };
+ Client *c;
+
+ for (c = clients; c; c = c->next)
+ reload(c, &a);
+}
+
char *
buildfile(const char *path)
{
return fpath;
}
+static const char*
+getuserhomedir(const char *user)
+{
+ struct passwd *pw = getpwnam(user);
+
+ if (!pw)
+ die("Can't get user %s login information.\n", user);
+
+ return pw->pw_dir;
+}
+
+static const char*
+getcurrentuserhomedir(void)
+{
+ const char *homedir;
+ const char *user;
+ struct passwd *pw;
+
+ homedir = getenv("HOME");
+ if (homedir)
+ return homedir;
+
+ user = getenv("USER");
+ if (user)
+ return getuserhomedir(user);
+
+ pw = getpwuid(getuid());
+ if (!pw)
+ die("Can't get current user home directory\n");
+
+ return pw->pw_dir;
+}
+
char *
buildpath(const char *path)
{
- struct passwd *pw;
char *apath, *name, *p, *fpath;
+ const char *homedir;
if (path[0] == '~') {
if (path[1] == '/' || path[1] == '\0') {
p = (char *)&path[1];
- pw = getpwuid(getuid());
+ homedir = getcurrentuserhomedir();
} else {
if ((p = strchr(path, '/')))
name = g_strndup(&path[1], --p - path);
else
name = g_strdup(&path[1]);
- if (!(pw = getpwnam(name))) {
- die("Can't get user %s home directory: %s.\n",
- name, path);
- }
+ homedir = getuserhomedir(name);
g_free(name);
}
- apath = g_build_filename(pw->pw_dir, p, NULL);
+ apath = g_build_filename(homedir, p, NULL);
} else {
apath = g_strdup(path);
}
return fpath;
}
-gboolean
-buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
+Client *
+newclient(Client *rc)
{
- WebKitHitTestResultContext element;
- GdkEventButton *eb = (GdkEventButton*)e;
- int i;
+ Client *c;
- element = webkit_hit_test_result_get_context(c->mousepos);
+ if (!(c = calloc(1, sizeof(Client))))
+ die("Cannot malloc!\n");
- 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;
- }
- }
+ c->next = clients;
+ clients = c;
- return FALSE;
+ c->progress = 100;
+ c->view = newview(c, rc ? rc->view : NULL);
+
+ return c;
}
void
-cleanup(void)
+loaduri(Client *c, const Arg *a)
{
- while (clients)
- destroyclient(clients);
- g_free(cookiefile);
- g_free(scriptfile);
- g_free(stylefile);
- g_free(cachedir);
-}
+ struct stat st;
+ char *url, *path;
+ const char *uri = a->v;
-WebKitCookieAcceptPolicy
-cookiepolicy_get(void)
-{
- switch (cookiepolicies[cookiepolicy]) {
- case 'a':
- return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
- case '@':
- return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
- case 'A':
- default:
- break;
+ if (g_strcmp0(uri, "") == 0)
+ return;
+
+ if (g_str_has_prefix(uri, "http://") ||
+ g_str_has_prefix(uri, "https://") ||
+ g_str_has_prefix(uri, "file://") ||
+ g_str_has_prefix(uri, "about:")) {
+ url = g_strdup(uri);
+ } else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
+ url = g_strdup_printf("file://%s", path);
+ free(path);
+ } else {
+ url = g_strdup_printf("http://%s", uri);
}
- return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
-}
+ setatom(c, AtomUri, url);
-char
-cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
-{
- switch (ep) {
- case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
- return 'a';
- case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
- return '@';
- case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
- default:
- break;
+ if (strcmp(url, geturi(c)) == 0) {
+ reload(c, a);
+ } else {
+ webkit_web_view_load_uri(c->view, url);
+ updatetitle(c);
}
- return 'A';
+ g_free(url);
}
-void
-evalscript(JSContextRef js, char *script, char* scriptname)
+const char *
+geturi(Client *c)
{
- JSStringRef jsscript, jsscriptname;
- JSValueRef exception = NULL;
+ const char *uri;
- jsscript = JSStringCreateWithUTF8CString(script);
- jsscriptname = JSStringCreateWithUTF8CString(scriptname);
- JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js),
- jsscriptname, 0, &exception);
- JSStringRelease(jsscript);
- JSStringRelease(jsscriptname);
+ if (!(uri = webkit_web_view_get_uri(c->view)))
+ uri = "about:blank";
+ return uri;
}
void
-runscript(WebKitWebFrame *frame)
+setatom(Client *c, int a, const char *v)
{
- char *script;
- GError *error;
-
- if (g_file_get_contents(scriptfile, &script, NULL, &error)) {
- evalscript(webkit_web_frame_get_global_context(frame), script,
- scriptfile);
- }
-}
-
-void
-clipboard(Client *c, const Arg *arg)
-{
- gboolean paste = *(gboolean *)arg;
-
- if (paste) {
- gtk_clipboard_request_text(gtk_clipboard_get(
- GDK_SELECTION_PRIMARY),
- pasteuri, c);
- } else {
- gtk_clipboard_set_text(gtk_clipboard_get(
- GDK_SELECTION_PRIMARY), c->linkhover
- ? c->linkhover : geturi(c), -1);
- }
-}
-
-char *
-copystr(char **str, const char *src)
-{
- char *tmp;
- tmp = g_strdup(src);
-
- if (str && *str) {
- g_free(*str);
- *str = tmp;
- }
- return tmp;
-}
-
-GtkWidget *
-createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
-{
- 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
-decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
- WebKitPolicyDecisionType dt, Client *c)
-{
- 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 TRUE;
+ XSync(dpy, False);
+ XChangeProperty(dpy, c->xid,
+ atoms[a], XA_STRING, 8, PropModeReplace,
+ (unsigned char *)v, strlen(v) + 1);
}
-void
-decidenavigation(WebKitPolicyDecision *d, Client *c)
+const char *
+getatom(Client *c, int a)
{
- WebKitNavigationAction *a;
+ static char buf[BUFSIZ];
+ Atom adummy;
+ int idummy;
+ unsigned long ldummy;
+ unsigned char *p = NULL;
- a = webkit_navigation_policy_decision_get_navigation_action(
- WEBKIT_NAVIGATION_POLICY_DECISION(d));
+ XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING,
+ &adummy, &idummy, &ldummy, &ldummy, &p);
+ if (p)
+ strncpy(buf, (char *)p, LENGTH(buf) - 1);
+ else
+ buf[0] = '\0';
+ XFree(p);
- 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;
- }
+ return buf;
}
void
-decidenewwindow(WebKitPolicyDecision *d, Client *c)
+updatetitle(Client *c)
{
- WebKitNavigationAction *a;
- Arg arg;
-
- 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;
- }
+ char *title;
+ const char *name = c->overtitle ? c->overtitle :
+ c->title ? c->title : "";
- webkit_policy_decision_ignore(d);
-}
+ if (curconfig[ShowIndicators].val.b) {
+ gettogglestats(c);
+ getpagestats(c);
-void
-decideresource(WebKitPolicyDecision *d, Client *c)
-{
- WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
- WebKitURIResponse *res;
+ if (c->progress != 100)
+ title = g_strdup_printf("[%i%%] %s:%s | %s",
+ c->progress, togglestats, pagestats, name);
+ else
+ title = g_strdup_printf("%s:%s | %s",
+ togglestats, pagestats, name);
- if (webkit_response_policy_decision_is_mime_type_supported(r)) {
- webkit_policy_decision_use(d);
+ gtk_window_set_title(GTK_WINDOW(c->win), title);
+ g_free(title);
} else {
-res = webkit_response_policy_decision_get_response(r);
- webkit_policy_decision_ignore(d);
- download(c, res);
+ gtk_window_set_title(GTK_WINDOW(c->win), name);
}
}
-gboolean
-deletion_interface(WebKitWebView *view, WebKitDOMHTMLElement *arg1, Client *c)
-{
- return FALSE;
+void
+gettogglestats(Client *c)
+{
+ togglestats[0] = cookiepolicy_set(cookiepolicy_get());
+ togglestats[1] = curconfig[CaretBrowsing].val.b ? 'C' : 'c';
+ togglestats[2] = curconfig[Geolocation].val.b ? 'G' : 'g';
+ togglestats[3] = curconfig[DiskCache].val.b ? 'D' : 'd';
+ togglestats[4] = curconfig[LoadImages].val.b ? 'I' : 'i';
+ togglestats[5] = curconfig[JavaScript].val.b ? 'S' : 's';
+ togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v';
+ togglestats[7] = curconfig[Style].val.b ? 'M' : 'm';
+ togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
+ togglestats[9] = curconfig[Certificate].val.b ? 'X' : 'x';
+ togglestats[10] = curconfig[StrictTLS].val.b ? 'T' : 't';
+ togglestats[11] = '\0';
}
void
-destroyclient(Client *c)
+getpagestats(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);
- gtk_widget_destroy(c->win);
-
- for (p = clients; p && p->next != c; p = p->next)
- ;
- if (p)
- p->next = c->next;
+ if (c->https)
+ pagestats[0] = (c->tlserr || c->insecure) ? 'U' : 'T';
else
- clients = c->next;
- free(c);
- if (clients == NULL)
- gtk_main_quit();
+ pagestats[0] = '-';
+ pagestats[1] = '\0';
}
-void
-destroywin(GtkWidget* w, Client *c)
+WebKitCookieAcceptPolicy
+cookiepolicy_get(void)
{
- destroyclient(c);
+ switch (((char *)curconfig[CookiePolicies].val.v)[cookiepolicy]) {
+ case 'a':
+ return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
+ case '@':
+ return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+ default: /* fallthrough */
+ case 'A':
+ return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+ }
}
-void
-die(const char *errstr, ...)
+char
+cookiepolicy_set(const WebKitCookieAcceptPolicy p)
{
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
+ switch (p) {
+ case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
+ return 'a';
+ case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
+ return '@';
+ default: /* fallthrough */
+ case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
+ return 'A';
+ }
}
void
-find(Client *c, const Arg *arg)
+seturiparameters(Client *c, const char *uri)
{
- const char *s;
+ int i;
- s = getatom(c, AtomFind);
- gboolean forward = *(gboolean *)arg;
- webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+ for (i = 0; i < LENGTH(uriparams); ++i) {
+ if (uriparams[i].uri &&
+ !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
+ curconfig = uriparams[i].config;
+ break;
+ }
+ }
+
+ for (i = 0; i < ParameterLast; ++i)
+ setparameter(c, 0, i, &curconfig[i].val);
}
void
-fullscreen(Client *c, const Arg *arg)
+setparameter(Client *c, int refresh, ParamName p, const Arg *a)
{
- if (c->fullscreen)
- gtk_window_unfullscreen(GTK_WINDOW(c->win));
- else
- gtk_window_fullscreen(GTK_WINDOW(c->win));
- c->fullscreen = !c->fullscreen;
-}
+ GdkRGBA bgcolor = { 0 };
+ WebKitSettings *s = webkit_web_view_get_settings(c->view);
-gboolean
-permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
-{
- if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
- if (allowgeolocation)
- webkit_permission_request_allow(r);
+ switch (p) {
+ case AcceleratedCanvas:
+ webkit_settings_set_enable_accelerated_2d_canvas(s, a->b);
+ break;
+ case CaretBrowsing:
+ webkit_settings_set_enable_caret_browsing(s, a->b);
+ refresh = 0;
+ break;
+ case Certificate:
+ if (a->b)
+ setcert(c, geturi(c));
+ return; /* do not update */
+ case CookiePolicies:
+ webkit_cookie_manager_set_accept_policy(
+ webkit_web_context_get_cookie_manager(
+ webkit_web_view_get_context(c->view)),
+ cookiepolicy_get());
+ refresh = 0;
+ break;
+ case DiskCache:
+ webkit_web_context_set_cache_model(
+ webkit_web_view_get_context(c->view), a->b ?
+ WEBKIT_CACHE_MODEL_WEB_BROWSER :
+ WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+ return; /* do not update */
+ case DNSPrefetch:
+ webkit_settings_set_enable_dns_prefetching(s, a->b);
+ return; /* do not update */
+ case FontSize:
+ webkit_settings_set_default_font_size(s, a->i);
+ return; /* do not update */
+ case FrameFlattening:
+ webkit_settings_set_enable_frame_flattening(s, a->b);
+ break;
+ case Geolocation:
+ refresh = 0;
+ break;
+ case HideBackground:
+ if (a->b)
+ webkit_web_view_set_background_color(c->view, &bgcolor);
+ return; /* do not update */
+ case Inspector:
+ webkit_settings_set_enable_developer_extras(s, a->b);
+ return; /* do not update */
+ case JavaScript:
+ webkit_settings_set_enable_javascript(s, a->b);
+ break;
+ case KioskMode:
+ return; /* do nothing */
+ case LoadImages:
+ webkit_settings_set_auto_load_images(s, a->b);
+ break;
+ case MediaManualPlay:
+ webkit_settings_set_media_playback_requires_user_gesture(s, a->b);
+ break;
+ case Plugins:
+ webkit_settings_set_enable_plugins(s, a->b);
+ break;
+ case PreferredLanguages:
+ return; /* do nothing */
+ case RunInFullscreen:
+ return; /* do nothing */
+ case ScrollBars:
+ /* Disabled until we write some WebKitWebExtension for
+ * manipulating the DOM directly.
+ enablescrollbars = !enablescrollbars;
+ evalscript(c, "document.documentElement.style.overflow = '%s'",
+ enablescrollbars ? "auto" : "hidden");
+ */
+ return; /* do not update */
+ case ShowIndicators:
+ break;
+ case SiteQuirks:
+ webkit_settings_set_enable_site_specific_quirks(s, a->b);
+ break;
+ case SpellChecking:
+ webkit_web_context_set_spell_checking_enabled(
+ webkit_web_view_get_context(c->view), a->b);
+ return; /* do not update */
+ case SpellLanguages:
+ return; /* do nothing */
+ case StrictTLS:
+ webkit_web_context_set_tls_errors_policy(
+ webkit_web_view_get_context(c->view), a->b ?
+ WEBKIT_TLS_ERRORS_POLICY_FAIL :
+ WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+ break;
+ case Style:
+ if (a->b)
+ setstyle(c, getstyle(geturi(c)));
else
- webkit_permission_request_deny(r);
- return TRUE;
+ webkit_user_content_manager_remove_all_style_sheets(
+ webkit_web_view_get_user_content_manager(c->view));
+ refresh = 0;
+ break;
+ case ZoomLevel:
+ webkit_web_view_set_zoom_level(c->view, a->f);
+ return; /* do not update */
+ default:
+ return; /* do nothing */
}
- return FALSE;
+ updatetitle(c);
+ if (refresh)
+ reload(c, a);
}
const char *
-getatom(Client *c, int a)
-{
- static char buf[BUFSIZ];
- Atom adummy;
- int idummy;
- unsigned long ldummy;
- unsigned char *p = NULL;
-
- XGetWindowProperty(dpy, c->xid,
- atoms[a], 0L, BUFSIZ, False, XA_STRING,
- &adummy, &idummy, &ldummy, &ldummy, &p);
- if (p)
- strncpy(buf, (char *)p, LENGTH(buf)-1);
- else
- buf[0] = '\0';
- XFree(p);
-
- return buf;
-}
-
-char *
-geturi(Client *c)
-{
- char *uri;
-
- if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
- uri = "about:blank";
- return uri;
-}
-
-const gchar *
-getstyle(const char *uri)
+getcert(const char *uri)
{
int i;
- if (stylefile != NULL)
- return stylefile;
-
- for (i = 0; i < LENGTH(styles); i++) {
- if (styles[i].regex && !regexec(&(styles[i].re), uri, 0,
- NULL, 0))
- return styles[i].style;
+ for (i = 0; i < LENGTH(certs); ++i) {
+ if (certs[i].regex &&
+ !regexec(&(certs[i].re), uri, 0, NULL, 0))
+ return certs[i].file;
}
- return "";
+ return NULL;
}
void
-setstyle(Client *c, const char *style)
+setcert(Client *c, const char *uri)
{
- WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+ const char *file = getcert(uri);
+ char *host;
+ GTlsCertificate *cert;
- g_object_set(G_OBJECT(settings), "user-stylesheet-uri", style, NULL);
-}
+ if (!file)
+ return;
-void
-handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
-{
- Arg arg;
+ if (!(cert = g_tls_certificate_new_from_file(file, NULL))) {
+ fprintf(stderr, "Could not read certificate file: %s\n", file);
+ return;
+ }
- webkit_web_view_stop_loading(w);
- arg = (Arg)PLUMB((char *)uri);
- spawn(c, &arg);
-}
+ if ((uri = strstr(uri, "https://"))) {
+ uri += sizeof("https://") - 1;
+ host = g_strndup(uri, strchr(uri, '/') - uri);
+ webkit_web_context_allow_tls_certificate_for_host(
+ webkit_web_view_get_context(c->view), cert, host);
+ g_free(host);
+ }
-void
-downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
-{
- g_signal_connect(G_OBJECT(d), "notify::response",
- G_CALLBACK(responsereceived), c);
-}
+ g_object_unref(cert);
-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)
+const char *
+getstyle(const char *uri)
{
- Arg a;
+ int i;
- a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
- spawn(c, &a);
-}
+ if (stylefile)
+ return stylefile;
-void
-inspector(Client *c, const Arg *arg)
-{
- if (enableinspector) {
- if (c->isinspecting)
- webkit_web_inspector_close(c->inspector);
- else
- webkit_web_inspector_show(c->inspector);
+ for (i = 0; i < LENGTH(styles); ++i) {
+ if (styles[i].regex &&
+ !regexec(&(styles[i].re), uri, 0, NULL, 0))
+ return styles[i].file;
}
-}
-
-WebKitWebView *
-inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c)
-{
- return WEBKIT_WEB_VIEW(webkit_web_view_new());
-}
-
-gboolean
-inspector_show(WebKitWebInspector *i, Client *c)
-{
- WebKitWebView *w;
-
- if (c->isinspecting)
- return false;
- w = webkit_web_inspector_get_web_view(i);
- gtk_paned_pack2(GTK_PANED(c->pane), GTK_WIDGET(w), TRUE, TRUE);
- gtk_widget_show(GTK_WIDGET(w));
- c->isinspecting = true;
-
- return true;
+ return "";
}
-gboolean
-inspector_close(WebKitWebInspector *i, Client *c)
+void
+setstyle(Client *c, const char *file)
{
- GtkWidget *w;
+ gchar *style;
- if (!c->isinspecting)
- return false;
+ if (!g_file_get_contents(file, &style, NULL, NULL)) {
+ fprintf(stderr, "Could not read style file: %s\n", file);
+ return;
+ }
- w = GTK_WIDGET(webkit_web_inspector_get_web_view(i));
- gtk_widget_hide(w);
- gtk_widget_destroy(w);
- c->isinspecting = false;
+ webkit_user_content_manager_add_style_sheet(
+ webkit_web_view_get_user_content_manager(c->view),
+ webkit_user_style_sheet_new(style,
+ WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+ WEBKIT_USER_STYLE_LEVEL_USER,
+ NULL, NULL));
- return true;
+ g_free(style);
}
void
-inspector_finished(WebKitWebInspector *i, Client *c)
-{
- g_free(c->inspector);
-}
-
-gboolean
-keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
- Client *c)
+runscript(Client *c)
{
- guint i;
- gboolean processed = FALSE;
+ gchar *script;
+ gsize l;
- mods = CLEANMASK(mods);
- key = gdk_keyval_to_lower(key);
- updatewinid(c);
- for (i = 0; i < LENGTH(keys); i++) {
- if (key == keys[i].keyval
- && mods == keys[i].mod
- && keys[i].func) {
- keys[i].func(c, &(keys[i].arg));
- processed = TRUE;
- }
- }
-
- return processed;
+ if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+ evalscript(c, script);
+ g_free(script);
}
void
-mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
- Client *c)
+evalscript(Client *c, const char *jsstr, ...)
{
- WebKitHitTestResultContext hc;
-
- /* Keep the hit test to know where is the pointer on the next click */
- c->mousepos = h;
+ va_list ap;
+ gchar *script;
- hc = webkit_hit_test_result_get_context(h);
+ va_start(ap, jsstr);
+ script = g_strdup_vprintf(jsstr, ap);
+ va_end(ap);
- if (hc & OnLink)
- c->targeturi = webkit_hit_test_result_get_link_uri(h);
- else if (hc & OnImg)
- c->targeturi = webkit_hit_test_result_get_image_uri(h);
- else if (hc & OnMedia)
- c->targeturi = webkit_hit_test_result_get_media_uri(h);
- else
- c->targeturi = NULL;
- updatetitle(c);
+ webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+ g_free(script);
}
void
-loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+updatewinid(Client *c)
{
- 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:
- 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(geturi(c)));
- break;
- case WEBKIT_LOAD_FINISHED:
- /* 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);
+ snprintf(winid, LENGTH(winid), "%lu", c->xid);
}
void
-loaduri(Client *c, const Arg *arg)
+handleplumb(Client *c, const char *uri)
{
- char *u = NULL, *rp;
- const char *uri = (char *)arg->v;
- Arg a = { .b = FALSE };
- struct stat st;
-
- if (strcmp(uri, "") == 0)
- return;
-
- /* In case it's a file path. */
- if (stat(uri, &st) == 0) {
- rp = realpath(uri, NULL);
- u = g_strdup_printf("file://%s", rp);
- free(rp);
- } else {
- u = g_strrstr(uri, "://") ? g_strdup(uri)
- : g_strdup_printf("http://%s", uri);
- }
+ Arg a = (Arg)PLUMB(uri);
+ spawn(c, &a);
+}
- setatom(c, AtomUri, uri);
+void
+newwindow(Client *c, const Arg *a, int noembed)
+{
+ int i = 0;
+ char tmp[64];
+ const char *cmd[29], *uri;
+ const Arg arg = { .v = cmd };
- /* prevents endless loop */
- if (strcmp(u, geturi(c)) == 0) {
- reload(c, &a);
- } else {
- webkit_web_view_load_uri(c->view, u);
- c->progress = 0;
- c->title = copystr(&c->title, u);
- updatetitle(c);
+ cmd[i++] = argv0;
+ cmd[i++] = "-a";
+ cmd[i++] = curconfig[CookiePolicies].val.v;
+ cmd[i++] = curconfig[ScrollBars].val.b ? "-B" : "-b";
+ if (cookiefile && g_strcmp0(cookiefile, "")) {
+ cmd[i++] = "-c";
+ cmd[i++] = cookiefile;
+ }
+ if (stylefile && g_strcmp0(stylefile, "")) {
+ cmd[i++] = "-C";
+ cmd[i++] = stylefile;
+ }
+ cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
+ if (embed && !noembed) {
+ cmd[i++] = "-e";
+ snprintf(tmp, LENGTH(tmp), "%lu", embed);
+ cmd[i++] = tmp;
+ }
+ cmd[i++] = curconfig[RunInFullscreen].val.b ? "-F" : "-f" ;
+ cmd[i++] = curconfig[Geolocation].val.b ? "-G" : "-g" ;
+ cmd[i++] = curconfig[LoadImages].val.b ? "-I" : "-i" ;
+ cmd[i++] = curconfig[KioskMode].val.b ? "-K" : "-k" ;
+ cmd[i++] = curconfig[Style].val.b ? "-M" : "-m" ;
+ cmd[i++] = curconfig[Inspector].val.b ? "-N" : "-n" ;
+ cmd[i++] = curconfig[Plugins].val.b ? "-P" : "-p" ;
+ if (scriptfile && g_strcmp0(scriptfile, "")) {
+ cmd[i++] = "-r";
+ cmd[i++] = scriptfile;
}
- g_free(u);
+ cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
+ cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
+ if (fulluseragent && g_strcmp0(fulluseragent, "")) {
+ cmd[i++] = "-u";
+ cmd[i++] = fulluseragent;
+ }
+ if (showxid)
+ cmd[i++] = "-w";
+ cmd[i++] = curconfig[Certificate].val.b ? "-X" : "-x" ;
+ /* do not keep zoom level */
+ cmd[i++] = "--";
+ if ((uri = a->v))
+ cmd[i++] = uri;
+ cmd[i] = NULL;
+
+ spawn(c, &arg);
}
void
-navigate(Client *c, const Arg *arg)
+spawn(Client *c, const Arg *a)
{
- int steps = *(int *)arg;
- webkit_web_view_go_back_or_forward(c->view, steps);
+ if (fork() == 0) {
+ if (dpy)
+ close(ConnectionNumber(dpy));
+ setsid();
+ execvp(((char **)a->v)[0], (char **)a->v);
+ fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]);
+ perror(" failed");
+ exit(1);
+ }
}
-Client *
-newclient(Client *rc)
+void
+destroyclient(Client *c)
{
- Client *c;
- gdouble dpi;
-
- if (!(c = calloc(1, sizeof(Client))))
- die("Cannot malloc!\n");
-
- c->title = NULL;
- c->progress = 100;
+ Client *p;
- c->next = clients;
- clients = c;
+ webkit_web_view_stop_loading(c->view);
+ /* Not needed, has already been called
+ gtk_widget_destroy(c->win);
+ */
- c->view = newview(c, rc ? rc->view : NULL);
- c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+ for (p = clients; p && p->next != c; p = p->next)
+ ;
+ if (p)
+ p->next = c->next;
+ else
+ clients = c->next;
+ free(c);
+}
- return c;
+void
+cleanup(void)
+{
+ while (clients)
+ destroyclient(clients);
+ g_free(cookiefile);
+ g_free(scriptfile);
+ g_free(stylefile);
+ g_free(cachedir);
+ XCloseDisplay(dpy);
}
WebKitWebView *
WebKitSettings *settings;
WebKitUserContentManager *contentmanager;
WebKitWebContext *context;
- char *ua;
/* Webview */
if (rv) {
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 */
+ "auto-load-images", curconfig[LoadImages].val.b,
+ "default-font-size", curconfig[FontSize].val.i,
+ "enable-caret-browsing", curconfig[CaretBrowsing].val.b,
+ "enable-developer-extras", curconfig[Inspector].val.b,
+ "enable-dns-prefetching", curconfig[DNSPrefetch].val.b,
+ "enable-frame-flattening", curconfig[FrameFlattening].val.b,
+ "enable-html5-database", curconfig[DiskCache].val.b,
+ "enable-html5-local-storage", curconfig[DiskCache].val.b,
+ "enable-javascript", curconfig[JavaScript].val.b,
+ "enable-plugins", curconfig[Plugins].val.b,
+ "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b,
+ "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
+ "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
+ NULL);
+/* For more interesting settings, have a look at
+ * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
+
+ if (strcmp(fulluseragent, "")) {
+ webkit_settings_set_user_agent(settings, fulluseragent);
+ } else if (surfuseragent) {
+ webkit_settings_set_user_agent_with_application_details(
+ settings, "Surf", VERSION);
+ }
+ useragent = webkit_settings_get_user_agent(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));
+ 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 */
+ /* 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);
+ /* TLS */
+ webkit_web_context_set_tls_errors_policy(context,
+ curconfig[StrictTLS].val.b ? 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);
+ webkit_web_context_set_cache_model(context,
+ curconfig[DiskCache].val.b ? 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_cookie_manager_set_accept_policy(
webkit_web_context_get_cookie_manager(context),
cookiepolicy_get());
+ /* languages */
+ webkit_web_context_set_preferred_languages(context,
+ curconfig[PreferredLanguages].val.v);
+ webkit_web_context_set_spell_checking_languages(context,
+ curconfig[SpellLanguages].val.v);
+ webkit_web_context_set_spell_checking_enabled(context,
+ curconfig[SpellChecking].val.b);
g_signal_connect(G_OBJECT(context), "download-started",
- G_CALLBACK(downloadstarted), c);
+ G_CALLBACK(downloadstarted), c);
+ g_signal_connect(G_OBJECT(context), "initialize-web-extensions",
+ G_CALLBACK(initwebextensions), c);
v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
"settings", settings,
NULL);
}
- g_signal_connect(G_OBJECT(v),
- "notify::title",
+ g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress",
+ G_CALLBACK(progresschanged), c);
+ g_signal_connect(G_OBJECT(v), "notify::title",
G_CALLBACK(titlechanged), c);
- g_signal_connect(G_OBJECT(v),
- "mouse-target-changed",
+ g_signal_connect(G_OBJECT(v), "button-release-event",
+ G_CALLBACK(buttonreleased), c);
+ g_signal_connect(G_OBJECT(v), "close",
+ G_CALLBACK(closeview), c);
+ g_signal_connect(G_OBJECT(v), "create",
+ G_CALLBACK(createview), c);
+ g_signal_connect(G_OBJECT(v), "decide-policy",
+ G_CALLBACK(decidepolicy), c);
+ g_signal_connect(G_OBJECT(v), "insecure-content-detected",
+ G_CALLBACK(insecurecontent), c);
+ g_signal_connect(G_OBJECT(v), "load-failed-with-tls-errors",
+ G_CALLBACK(loadfailedtls), c);
+ g_signal_connect(G_OBJECT(v), "load-changed",
+ G_CALLBACK(loadchanged), c);
+ g_signal_connect(G_OBJECT(v), "mouse-target-changed",
G_CALLBACK(mousetargetchanged), c);
- g_signal_connect(G_OBJECT(v),
- "permission-request",
+ g_signal_connect(G_OBJECT(v), "permission-request",
G_CALLBACK(permissionrequested), c);
- g_signal_connect(G_OBJECT(v),
- "create",
- G_CALLBACK(createview), c);
g_signal_connect(G_OBJECT(v), "ready-to-show",
G_CALLBACK(showview), c);
- g_signal_connect(G_OBJECT(v),
- "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),
- "load-changed",
- G_CALLBACK(loadchanged), c);
- g_signal_connect(G_OBJECT(v),
- "notify::estimated-load-progress",
- G_CALLBACK(progresschanged), c);
- g_signal_connect(G_OBJECT(v),
- "button-release-event",
- G_CALLBACK(buttonreleased), 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);
return v;
}
+void
+initwebextensions(WebKitWebContext *wc, Client *c)
+{
+ webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
+}
+
+GtkWidget *
+createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
+{
+ 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;
+ 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;
+ }
+
+ return GTK_WIDGET(n->view);
+}
+
+gboolean
+buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
+{
+ WebKitHitTestResultContext element;
+ int i;
+
+ element = webkit_hit_test_result_get_context(c->mousepos);
+
+ for (i = 0; i < LENGTH(buttons); ++i) {
+ if (element & buttons[i].target &&
+ e->button.button == buttons[i].button &&
+ CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) &&
+ buttons[i].func) {
+ buttons[i].func(c, &buttons[i].arg, c->mousepos);
+ return buttons[i].stopevent;
+ }
+ }
+
+ return FALSE;
+}
+
+GdkFilterReturn
+processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+{
+ Client *c = (Client *)d;
+ XPropertyEvent *ev;
+ Arg a;
+
+ if (((XEvent *)e)->type == PropertyNotify) {
+ ev = &((XEvent *)e)->xproperty;
+ if (ev->state == PropertyNewValue) {
+ if (ev->atom == atoms[AtomFind]) {
+ find(c, NULL);
+
+ return GDK_FILTER_REMOVE;
+ } else if (ev->atom == atoms[AtomGo]) {
+ a.v = getatom(c, AtomGo);
+ loaduri(c, &a);
+
+ return GDK_FILTER_REMOVE;
+ }
+ }
+ }
+ return GDK_FILTER_CONTINUE;
+}
+
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
+{
+ int i;
+
+ switch (e->type) {
+ case GDK_ENTER_NOTIFY:
+ c->overtitle = c->targeturi;
+ updatetitle(c);
+ break;
+ case GDK_KEY_PRESS:
+ if (!curconfig[KioskMode].val.b) {
+ for (i = 0; i < LENGTH(keys); ++i) {
+ if (gdk_keyval_to_lower(e->key.keyval) ==
+ keys[i].keyval &&
+ CLEANMASK(e->key.state) == keys[i].mod &&
+ keys[i].func) {
+ updatewinid(c);
+ keys[i].func(c, &(keys[i].arg));
+ return TRUE;
+ }
+ }
+ }
+ case GDK_LEAVE_NOTIFY:
+ c->overtitle = NULL;
+ updatetitle(c);
+ break;
+ case GDK_WINDOW_STATE:
+ if (e->window_state.changed_mask ==
+ GDK_WINDOW_STATE_FULLSCREEN)
+ c->fullscreen = e->window_state.new_window_state &
+ GDK_WINDOW_STATE_FULLSCREEN;
+ break;
+ default:
+ break;
+ }
+
+ return FALSE;
+}
+
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");
+ c->finder = webkit_web_view_get_find_controller(c->view);
+ c->inspector = webkit_web_view_get_inspector(c->view);
- /* 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));
+ c->win = createwindow(c);
- /* Setup */
+ gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
+ gtk_widget_show_all(c->win);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
- gtk_widget_show(GTK_WIDGET(c->view));
- gtk_widget_show(c->win);
+
gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
c->xid = gdk_x11_window_get_xid(gwin);
- gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
- GDK_HINT_MIN_SIZE);
- gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
- gdk_window_add_filter(gwin, processx, c);
+ updatewinid(c);
+ if (showxid) {
+ gdk_display_sync(gtk_widget_get_display(c->win));
+ puts(winid);
+ }
+
+ if (curconfig[HideBackground].val.b)
+ webkit_web_view_set_background_color(c->view, &bgcolor);
- runscript(frame);
+ if (!curconfig[KioskMode].val.b) {
+ gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
+ gdk_window_add_filter(gwin, processx, c);
+ }
- /* This might conflict with _zoomto96dpi_. */
- if (zoomlevel != 1.0)
- webkit_web_view_set_zoom_level(c->view, zoomlevel);
+ if (curconfig[RunInFullscreen].val.b)
+ togglefullscreen(c, NULL);
- if (runinfullscreen)
- fullscreen(c, NULL);
+ if (curconfig[ZoomLevel].val.f != 1.0)
+ webkit_web_view_set_zoom_level(c->view,
+ curconfig[ZoomLevel].val.f);
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
- if (hidebackground)
- webkit_web_view_set_background_color(c->view, &bgcolor);
+}
- if (showxid) {
- gdk_display_sync(gtk_widget_get_display(c->win));
- printf("%lu\n", c->xid);
- fflush(NULL);
- if (fclose(stdout) != 0) {
- die("Error closing stdout");
- }
+GtkWidget *
+createwindow(Client *c)
+{
+ char *wmstr;
+ GtkWidget *w;
+
+ if (embed) {
+ w = gtk_plug_new(embed);
+ } else {
+ w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+ wmstr = g_path_get_basename(argv0);
+ gtk_window_set_wmclass(GTK_WINDOW(w), wmstr, "Surf");
+ g_free(wmstr);
+
+ wmstr = g_strdup_printf("%s[%lu]", "Surf",
+ webkit_web_view_get_page_id(c->view));
+ gtk_window_set_role(GTK_WINDOW(w), wmstr);
+ g_free(wmstr);
+
+ gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
}
+
+ g_signal_connect(G_OBJECT(w), "destroy",
+ G_CALLBACK(destroywin), c);
+ g_signal_connect(G_OBJECT(w), "enter-notify-event",
+ G_CALLBACK(winevent), c);
+ g_signal_connect(G_OBJECT(w), "key-press-event",
+ G_CALLBACK(winevent), c);
+ g_signal_connect(G_OBJECT(w), "leave-notify-event",
+ G_CALLBACK(winevent), c);
+ g_signal_connect(G_OBJECT(w), "window-state-event",
+ G_CALLBACK(winevent), c);
+
+ return w;
+}
+
+gboolean
+loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
+ GTlsCertificateFlags err, Client *c)
+{
+ GString *errmsg = g_string_new(NULL);
+ gchar *html, *pem;
+
+ c->failedcert = g_object_ref(cert);
+ c->tlserr = err;
+ c->errorpage = 1;
+
+ if (err & G_TLS_CERTIFICATE_UNKNOWN_CA)
+ g_string_append(errmsg,
+ "The signing certificate authority is not known.<br>");
+ if (err & G_TLS_CERTIFICATE_BAD_IDENTITY)
+ g_string_append(errmsg,
+ "The certificate does not match the expected identity "
+ "of the site that it was retrieved from.<br>");
+ if (err & G_TLS_CERTIFICATE_NOT_ACTIVATED)
+ g_string_append(errmsg,
+ "The certificate's activation time "
+ "is still in the future.<br>");
+ if (err & G_TLS_CERTIFICATE_EXPIRED)
+ g_string_append(errmsg, "The certificate has expired.<br>");
+ if (err & G_TLS_CERTIFICATE_REVOKED)
+ g_string_append(errmsg,
+ "The certificate has been revoked according to "
+ "the GTlsConnection's certificate revocation list.<br>");
+ if (err & G_TLS_CERTIFICATE_INSECURE)
+ g_string_append(errmsg,
+ "The certificate's algorithm is considered insecure.<br>");
+ if (err & G_TLS_CERTIFICATE_GENERIC_ERROR)
+ g_string_append(errmsg,
+ "Some error occurred validating the certificate.<br>");
+
+ g_object_get(cert, "certificate-pem", &pem, NULL);
+ html = g_strdup_printf("<p>Could not validate TLS for “%s”<br>%s</p>"
+ "<p>You can inspect the following certificate "
+ "with Ctrl-t (default keybinding).</p>"
+ "<p><pre>%s</pre></p>", uri, errmsg->str, pem);
+ g_free(pem);
+ g_string_free(errmsg, TRUE);
+
+ webkit_web_view_load_alternate_html(c->view, html, uri, NULL);
+ g_free(html);
+
+ return TRUE;
}
void
-newwindow(Client *c, const Arg *arg, gboolean noembed)
+loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
{
- guint i = 0;
- const char *cmd[18], *uri;
- const Arg a = { .v = (void *)cmd };
- char tmp[64];
+ const char *title = geturi(c);
- cmd[i++] = argv0;
- cmd[i++] = "-a";
- cmd[i++] = cookiepolicies;
- if (!enablescrollbars)
- cmd[i++] = "-b";
- if (embed && !noembed) {
- cmd[i++] = "-e";
- snprintf(tmp, LENGTH(tmp), "%u", (int)embed);
- cmd[i++] = tmp;
+ switch (e) {
+ case WEBKIT_LOAD_STARTED:
+ curconfig = defconfig;
+ setatom(c, AtomUri, title);
+ c->title = title;
+ c->https = c->insecure = 0;
+ seturiparameters(c, geturi(c));
+ if (c->errorpage)
+ c->errorpage = 0;
+ else
+ g_clear_object(&c->failedcert);
+ break;
+ case WEBKIT_LOAD_REDIRECTED:
+ setatom(c, AtomUri, title);
+ c->title = title;
+ seturiparameters(c, geturi(c));
+ break;
+ case WEBKIT_LOAD_COMMITTED:
+ c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
+ &c->tlserr);
+ break;
+ case WEBKIT_LOAD_FINISHED:
+ /* Disabled until we write some WebKitWebExtension for
+ * manipulating the DOM directly.
+ evalscript(c, "document.documentElement.style.overflow = '%s'",
+ enablescrollbars ? "auto" : "hidden");
+ */
+ runscript(c);
+ break;
}
- if (!allowgeolocation)
- cmd[i++] = "-g";
- if (!loadimages)
- cmd[i++] = "-i";
- if (kioskmode)
- cmd[i++] = "-k";
- if (!enableplugins)
- cmd[i++] = "-p";
- if (!enablescripts)
- cmd[i++] = "-s";
- if (showxid)
- cmd[i++] = "-x";
- if (enablediskcache)
- cmd[i++] = "-D";
- cmd[i++] = "-c";
- cmd[i++] = cookiefile;
- cmd[i++] = "--";
- uri = arg->v ? (char *)arg->v : c->linkhover;
- if (uri)
- cmd[i++] = uri;
- cmd[i++] = NULL;
- spawn(NULL, &a);
+ updatetitle(c);
}
void
-pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
{
- Arg arg = {.v = text };
- if (text != NULL)
- loaduri((Client *) d, &arg);
+ c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+ 100;
+ updatetitle(c);
}
void
-print(Client *c, const Arg *arg)
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
{
- webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+ c->title = webkit_web_view_get_title(c->view);
+ updatetitle(c);
}
-GdkFilterReturn
-processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+void
+mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
+ Client *c)
{
- Client *c = (Client *)d;
- XPropertyEvent *ev;
- Arg arg;
+ WebKitHitTestResultContext hc = webkit_hit_test_result_get_context(h);
- if (((XEvent *)e)->type == PropertyNotify) {
- ev = &((XEvent *)e)->xproperty;
- if (ev->state == PropertyNewValue) {
- if (ev->atom == atoms[AtomFind]) {
- arg.b = TRUE;
- find(c, &arg);
-
- return GDK_FILTER_REMOVE;
- } else if (ev->atom == atoms[AtomGo]) {
- arg.v = getatom(c, AtomGo);
- loaduri(c, &arg);
+ /* Keep the hit test to know where is the pointer on the next click */
+ c->mousepos = h;
- return GDK_FILTER_REMOVE;
- }
- }
- }
- return GDK_FILTER_CONTINUE;
-}
+ if (hc & OnLink)
+ c->targeturi = webkit_hit_test_result_get_link_uri(h);
+ else if (hc & OnImg)
+ c->targeturi = webkit_hit_test_result_get_image_uri(h);
+ else if (hc & OnMedia)
+ c->targeturi = webkit_hit_test_result_get_media_uri(h);
+ else
+ c->targeturi = NULL;
-void
-progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
-{
- c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
- 100;
+ c->overtitle = c->targeturi;
updatetitle(c);
}
-void
-linkopen(Client *c, const Arg *arg)
+gboolean
+permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
{
- newwindow(NULL, arg, 1);
-}
+ if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
+ if (curconfig[Geolocation].val.b)
+ webkit_permission_request_allow(r);
+ else
+ webkit_permission_request_deny(r);
+ return TRUE;
+ }
-void
-linkopenembed(Client *c, const Arg *arg)
-{
- newwindow(NULL, arg, 0);
+ return FALSE;
}
-void
-reload(Client *c, const Arg *arg)
+gboolean
+decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
+ WebKitPolicyDecisionType dt, Client *c)
{
- gboolean nocache = *(gboolean *)arg;
- if (nocache)
- webkit_web_view_reload_bypass_cache(c->view);
- else
- webkit_web_view_reload(c->view);
+ 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 TRUE;
}
void
-scroll_h(Client *c, const Arg *arg)
+decidenavigation(WebKitPolicyDecision *d, Client *c)
{
- scroll(gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), arg);
-}
+ WebKitNavigationAction *a =
+ webkit_navigation_policy_decision_get_navigation_action(
+ WEBKIT_NAVIGATION_POLICY_DECISION(d));
-void
-scroll_v(Client *c, const Arg *arg)
-{
- scroll(gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), arg);
+ 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: /* fallthrough */
+ 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
-scroll(GtkAdjustment *a, const Arg *arg)
+decidenewwindow(WebKitPolicyDecision *d, Client *c)
{
- gdouble v;
+ Arg arg;
+ WebKitNavigationAction *a =
+ webkit_navigation_policy_decision_get_navigation_action(
+ WEBKIT_NAVIGATION_POLICY_DECISION(d));
+
- v = gtk_adjustment_get_value(a);
- switch (arg->i) {
- case +10000:
- case -10000:
- v += gtk_adjustment_get_page_increment(a) * (arg->i / 10000);
+ 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 +20000:
- case -20000:
+ case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
default:
- v += gtk_adjustment_get_step_increment(a) * arg->i;
+ break;
}
- v = MAX(v, 0.0);
- v = MIN(v, gtk_adjustment_get_upper(a) -
- gtk_adjustment_get_page_size(a));
- gtk_adjustment_set_value(a, v);
-}
-
-void
-setatom(Client *c, int a, const char *v)
-{
- XSync(dpy, False);
- XChangeProperty(dpy, c->xid,
- atoms[a], XA_STRING, 8, PropModeReplace,
- (unsigned char *)v, strlen(v) + 1);
+ webkit_policy_decision_ignore(d);
}
void
-setup(void)
+decideresource(WebKitPolicyDecision *d, Client *c)
{
- int i;
- char *styledirfile, *stylepath;
- WebKitWebContext *context;
- GError *error = NULL;
-
- /* clean up any zombies immediately */
- sigchld(0);
- gtk_init(NULL, NULL);
-
- dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ int i, isascii = 1;
+ WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
+ WebKitURIResponse *res =
+ webkit_response_policy_decision_get_response(r);
+ const gchar *uri = webkit_uri_response_get_uri(res);
- /* atoms */
- atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
- atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
- atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+ if (g_str_has_suffix(uri, "/favicon.ico")) {
+ webkit_policy_decision_ignore(d);
+ return;
+ }
- /* dirs and files */
- cookiefile = buildfile(cookiefile);
- scriptfile = buildfile(scriptfile);
- cachedir = buildpath(cachedir);
- if (stylefile == NULL) {
- styledir = buildpath(styledir);
- for (i = 0; i < LENGTH(styles); i++) {
- if (regcomp(&(styles[i].re), styles[i].regex,
- REG_EXTENDED)) {
- fprintf(stderr,
- "Could not compile regex: %s\n",
- styles[i].regex);
- styles[i].regex = NULL;
+ 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;
}
- styledirfile = g_strconcat(styledir, "/",
- styles[i].style, NULL);
- stylepath = buildfile(styledirfile);
- styles[i].style = g_strconcat("file://", stylepath,
- NULL);
- g_free(styledirfile);
- g_free(stylepath);
}
- g_free(styledir);
+ if (isascii) {
+ handleplumb(c, uri);
+ webkit_policy_decision_ignore(d);
+ return;
+ }
+ }
+
+ if (webkit_response_policy_decision_is_mime_type_supported(r)) {
+ webkit_policy_decision_use(d);
} else {
- stylepath = buildfile(stylefile);
- stylefile = g_strconcat("file://", stylepath, NULL);
- g_free(stylepath);
+ webkit_policy_decision_ignore(d);
+ download(c, res);
}
}
void
-sigchld(int unused)
+insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
{
- if (signal(SIGCHLD, sigchld) == SIG_ERR)
- die("Can't install SIGCHLD handler");
- while (0 < waitpid(-1, NULL, WNOHANG));
+ c->insecure = 1;
}
void
-spawn(Client *c, const Arg *arg)
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
{
- if (fork() == 0) {
- if (dpy)
- close(ConnectionNumber(dpy));
- setsid();
- execvp(((char **)arg->v)[0], (char **)arg->v);
- fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
- perror(" failed");
- exit(0);
- }
+ g_signal_connect(G_OBJECT(d), "notify::response",
+ G_CALLBACK(responsereceived), c);
}
void
-eval(Client *c, const Arg *arg)
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
{
- WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
- evalscript(webkit_web_frame_get_global_context(frame),
- ((char **)arg->v)[0], "");
+ download(c, webkit_download_get_response(d));
+ webkit_download_cancel(d);
}
void
-stop(Client *c, const Arg *arg)
+download(Client *c, WebKitURIResponse *r)
{
- webkit_web_view_stop_loading(c->view);
+ Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+ spawn(c, &a);
}
void
-titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+closeview(WebKitWebView *v, Client *c)
{
- c->title = webkit_web_view_get_title(c->view);
- updatetitle(c);
+ gtk_widget_destroy(c->win);
}
void
-titlechangeleave(void *a, void *b, Client *c)
+destroywin(GtkWidget* w, Client *c)
{
- c->linkhover = NULL;
- updatetitle(c);
+ destroyclient(c);
+ if (!clients)
+ gtk_main_quit();
}
void
-toggle(Client *c, const Arg *arg)
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
{
- WebKitWebSettings *settings;
- char *name = (char *)arg->v;
- gboolean value;
- Arg a = { .b = FALSE };
-
- settings = webkit_web_view_get_settings(c->view);
- g_object_get(G_OBJECT(settings), name, &value, NULL);
- g_object_set(G_OBJECT(settings), name, !value, NULL);
-
- reload(c, &a);
+ Arg a = {.v = text };
+ if (text)
+ loaduri((Client *) d, &a);
}
void
-togglecookiepolicy(Client *c, const Arg *arg)
+reload(Client *c, const Arg *a)
{
- ++cookiepolicy;
- cookiepolicy %= strlen(cookiepolicies);
-
- webkit_cookie_manager_set_accept_policy(
- webkit_web_context_get_cookie_manager(
- webkit_web_view_get_context(c->view)),
- cookiepolicy_get());
-
- updatetitle(c);
- /* Do not reload. */
+ if (a->b)
+ webkit_web_view_reload_bypass_cache(c->view);
+ else
+ webkit_web_view_reload(c->view);
}
void
-togglegeolocation(Client *c, const Arg *arg)
+print(Client *c, const Arg *a)
{
- Arg a = { .b = FALSE };
-
- allowgeolocation ^= 1;
- reload(c, &a);
+ webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+ GTK_WINDOW(c->win));
}
void
-twitch(Client *c, const Arg *arg)
+showcert(Client *c, const Arg *a)
{
- GtkAdjustment *a;
- gdouble v;
+ GTlsCertificate *cert = c->failedcert ? c->failedcert : c->cert;
+ GcrCertificate *gcrt;
+ GByteArray *crt;
+ GtkWidget *win;
+ GcrCertificateWidget *wcert;
- a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(
- c->scroll));
+ if (!cert)
+ return;
- v = gtk_adjustment_get_value(a);
+ g_object_get(cert, "certificate", &crt, NULL);
+ gcrt = gcr_simple_certificate_new(crt->data, crt->len);
+ g_byte_array_unref(crt);
- v += arg->i;
+ win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ wcert = gcr_certificate_widget_new(gcrt);
+ g_object_unref(gcrt);
- v = MAX(v, 0.0);
- v = MIN(v, gtk_adjustment_get_upper(a) -
- gtk_adjustment_get_page_size(a));
- gtk_adjustment_set_value(a, v);
+ gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(wcert));
+ gtk_widget_show_all(win);
}
void
-togglescrollbars(Client *c, const Arg *arg)
+clipboard(Client *c, const Arg *a)
{
- GtkPolicyType vspolicy;
- Arg a;
-
- gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL,
- &vspolicy);
-
- if (vspolicy == GTK_POLICY_AUTOMATIC) {
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
- GTK_POLICY_NEVER,
- GTK_POLICY_NEVER);
- } else {
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- a.i = +1;
- twitch(c, &a);
- a.i = -1;
- twitch(c, &a);
+ if (a->b) { /* load clipboard uri */
+ gtk_clipboard_request_text(gtk_clipboard_get(
+ GDK_SELECTION_PRIMARY),
+ pasteuri, c);
+ } else { /* copy uri */
+ gtk_clipboard_set_text(gtk_clipboard_get(
+ GDK_SELECTION_PRIMARY), c->targeturi
+ ? c->targeturi : geturi(c), -1);
}
}
void
-togglestyle(Client *c, const Arg *arg)
-{
- enablestyle = !enablestyle;
- setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
+zoom(Client *c, const Arg *a)
+{
+ if (a->i > 0)
+ webkit_web_view_set_zoom_level(c->view,
+ curconfig[ZoomLevel].val.f + 0.1);
+ else if (a->i < 0)
+ webkit_web_view_set_zoom_level(c->view,
+ curconfig[ZoomLevel].val.f - 0.1);
+ else
+ webkit_web_view_set_zoom_level(c->view, 1.0);
- updatetitle(c);
+ curconfig[ZoomLevel].val.f = webkit_web_view_get_zoom_level(c->view);
}
void
-gettogglestat(Client *c)
+scroll(Client *c, const Arg *a)
{
- gboolean value;
- int p = 0;
- WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+ GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
- togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
+ gdk_event_set_device(ev, gdkkb);
+ ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
+ ev->key.state = GDK_CONTROL_MASK;
+ ev->key.time = GDK_CURRENT_TIME;
- g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value,
- NULL);
- togglestat[p++] = value? 'C': 'c';
+ switch (a->i) {
+ case 'd':
+ ev->key.keyval = GDK_KEY_Down;
+ break;
+ case 'D':
+ ev->key.keyval = GDK_KEY_Page_Down;
+ break;
+ case 'l':
+ ev->key.keyval = GDK_KEY_Left;
+ break;
+ case 'r':
+ ev->key.keyval = GDK_KEY_Right;
+ break;
+ case 'U':
+ ev->key.keyval = GDK_KEY_Page_Up;
+ break;
+ case 'u':
+ ev->key.keyval = GDK_KEY_Up;
+ break;
+ }
- togglestat[p++] = allowgeolocation? 'G': 'g';
+ gdk_event_put(ev);
+}
- togglestat[p++] = enablediskcache? 'D': 'd';
+void
+navigate(Client *c, const Arg *a)
+{
+ if (a->i < 0)
+ webkit_web_view_go_back(c->view);
+ else if (a->i > 0)
+ webkit_web_view_go_forward(c->view);
+}
- g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
- togglestat[p++] = value? 'I': 'i';
+void
+stop(Client *c, const Arg *a)
+{
+ webkit_web_view_stop_loading(c->view);
+}
- g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
- togglestat[p++] = value? 'S': 's';
+void
+toggle(Client *c, const Arg *a)
+{
+ curconfig[a->i].val.b ^= 1;
+ setparameter(c, 1, (ParamName)a->i, &curconfig[a->i].val);
+}
- g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
- togglestat[p++] = value? 'V': 'v';
+void
+togglefullscreen(Client *c, const Arg *a)
+{
+ /* toggling value is handled in winevent() */
+ if (c->fullscreen)
+ gtk_window_unfullscreen(GTK_WINDOW(c->win));
+ else
+ gtk_window_fullscreen(GTK_WINDOW(c->win));
+}
- togglestat[p++] = enablestyle ? 'M': 'm';
+void
+togglecookiepolicy(Client *c, const Arg *a)
+{
+ ++cookiepolicy;
+ cookiepolicy %= strlen(curconfig[CookiePolicies].val.v);
- togglestat[p] = '\0';
+ setparameter(c, 0, CookiePolicies, NULL);
}
void
-getpagestat(Client *c)
+toggleinspector(Client *c, const Arg *a)
{
- const char *uri = geturi(c);
-
- pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
- c->tlsflags > 0 ? 'U' : 'T';
- pagestat[1] = '\0';
+ if (webkit_web_inspector_is_attached(c->inspector))
+ webkit_web_inspector_close(c->inspector);
+ else if (curconfig[Inspector].val.b)
+ webkit_web_inspector_show(c->inspector);
}
void
-updatetitle(Client *c)
+find(Client *c, const Arg *a)
{
- char *t;
+ const char *s, *f;
- if (showindicators) {
- gettogglestat(c);
- getpagestat(c);
+ if (a && a->i) {
+ if (a->i > 0)
+ webkit_find_controller_search_next(c->finder);
+ else
+ webkit_find_controller_search_previous(c->finder);
+ } else {
+ s = getatom(c, AtomFind);
+ f = webkit_find_controller_get_search_text(c->finder);
- if (c->linkhover) {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
- c->linkhover);
- } else if (c->progress != 100) {
- t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
- togglestat, pagestat,
- c->title == NULL ? "" : c->title);
- } else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
- c->title == NULL ? "" : c->title);
- }
+ if (g_strcmp0(f, s) == 0) /* reset search */
+ webkit_find_controller_search(c->finder, "", findopts,
+ G_MAXUINT);
- gtk_window_set_title(GTK_WINDOW(c->win), t);
- g_free(t);
- } else {
- gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
- "" : c->title);
+ webkit_find_controller_search(c->finder, s, findopts,
+ G_MAXUINT);
+
+ if (strcmp(s, "") == 0)
+ webkit_find_controller_search_finish(c->finder);
}
}
void
-updatewinid(Client *c)
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
{
- snprintf(winid, LENGTH(winid), "%lu", c->xid);
+ navigate(c, a);
}
void
-usage(void)
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
{
- die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
- "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+ Arg arg;
+
+ arg.v = webkit_hit_test_result_get_link_uri(h);
+ newwindow(c, &arg, a->b);
}
void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
- JSObjectRef win, Client *c)
+clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
{
- runscript(frame);
-}
+ Arg arg;
-void
-zoom(Client *c, const Arg *arg)
-{
- c->zoomed = TRUE;
- if (arg->i < 0) {
- /* zoom out */
- webkit_web_view_zoom_out(c->view);
- } else if (arg->i > 0) {
- /* zoom in */
- webkit_web_view_zoom_in(c->view);
- } else {
- /* reset */
- c->zoomed = FALSE;
- webkit_web_view_set_zoom_level(c->view, 1.0);
- }
+ arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
+ spawn(c, &arg);
}
int
/* command line args */
ARGBEGIN {
case 'a':
- cookiepolicies = EARGF(usage());
+ defconfig CSETV(CookiePolicies, EARGF(usage()));
break;
case 'b':
- enablescrollbars = 0;
+ defconfig CSETB(ScrollBars, 0);
break;
case 'B':
- enablescrollbars = 1;
+ defconfig CSETB(ScrollBars, 1);
break;
case 'c':
cookiefile = EARGF(usage());
break;
+ case 'C':
+ stylefile = EARGF(usage());
+ break;
case 'd':
- enablediskcache = 0;
+ defconfig CSETB(DiskCache, 0);
break;
case 'D':
- enablediskcache = 1;
+ defconfig CSETB(DiskCache, 1);
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'f':
- runinfullscreen = 0;
+ defconfig CSETB(RunInFullscreen, 0);
break;
case 'F':
- runinfullscreen = 1;
+ defconfig CSETB(RunInFullscreen, 1);
break;
case 'g':
- allowgeolocation = 0;
+ defconfig CSETB(Geolocation, 0);
break;
case 'G':
- allowgeolocation = 1;
+ defconfig CSETB(Geolocation, 1);
break;
case 'i':
- loadimages = 0;
+ defconfig CSETB(LoadImages, 0);
break;
case 'I':
- loadimages = 1;
+ defconfig CSETB(LoadImages, 1);
break;
case 'k':
- kioskmode = 0;
+ defconfig CSETB(KioskMode, 0);
break;
case 'K':
- kioskmode = 1;
+ defconfig CSETB(KioskMode, 1);
break;
case 'm':
- enablestyle = 0;
+ defconfig CSETB(Style, 0);
break;
case 'M':
- enablestyle = 1;
+ defconfig CSETB(Style, 1);
break;
case 'n':
- enableinspector = 0;
+ defconfig CSETB(Inspector, 0);
break;
case 'N':
- enableinspector = 1;
+ defconfig CSETB(Inspector, 1);
break;
case 'p':
- enableplugins = 0;
+ defconfig CSETB(Plugins, 0);
break;
case 'P':
- enableplugins = 1;
+ defconfig CSETB(Plugins, 1);
break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
- enablescripts = 0;
+ defconfig CSETB(JavaScript, 0);
break;
case 'S':
- enablescripts = 1;
+ defconfig CSETB(JavaScript, 1);
break;
case 't':
- stylefile = EARGF(usage());
+ defconfig CSETB(StrictTLS, 0);
+ break;
+ case 'T':
+ defconfig CSETB(StrictTLS, 1);
break;
case 'u':
- useragent = EARGF(usage());
+ fulluseragent = EARGF(usage());
break;
case 'v':
- die("surf-"VERSION", ©2009-2015 surf engineers, "
+ die("surf-"VERSION", ©2009-2017 surf engineers, "
"see LICENSE for details\n");
+ case 'w':
+ showxid = 1;
+ break;
case 'x':
- showxid = TRUE;
+ defconfig CSETB(Certificate, 0);
+ break;
+ case 'X':
+ defconfig CSETB(Certificate, 1);
break;
case 'z':
- zoomlevel = strtof(EARGF(usage()), NULL);
+ defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
break;
default:
usage();
} ARGEND;
if (argc > 0)
arg.v = argv[0];
+ else
+ arg.v = "about:blank";
setup();
c = newclient(NULL);
showview(NULL, c);
- if (arg.v)
- loaduri(clients, &arg);
- else
- updatetitle(c);
+
+ loaduri(c, &arg);
+ updatetitle(c);
gtk_main();
cleanup();
- return EXIT_SUCCESS;
+ return 0;
}
-