OnAny = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
};
+enum {
+ CaretBrowsing,
+ FrameFlattening,
+ Geolocation,
+ JavaScript,
+ LoadImages,
+ Plugins,
+ ScrollBars,
+};
+
typedef union Arg Arg;
union Arg {
gboolean b;
Window xid;
WebKitWebView *view;
WebKitWebInspector *inspector;
+ WebKitFindController *finder;
WebKitHitTestResult *mousepos;
GTlsCertificateFlags tlsflags;
const char *title, *targeturi;
const char *needle;
gint progress;
struct Client *next;
- gboolean zoomed, fullscreen;
+ gboolean fullscreen;
} Client;
typedef struct {
static Window embed = 0;
static gboolean showxid = FALSE;
static char winid[64];
-static char togglestat[9];
-static char pagestat[3];
+static char togglestats[10];
+static char pagestats[2];
static GTlsDatabase *tlsdb;
static int cookiepolicy;
static char *stylefile = NULL;
+static const char *useragent;
static void addaccelgroup(Client *c);
static char *buildfile(const char *path);
static void die(const char *errstr, ...);
static void evalscript(Client *c, const char *jsstr, ...);
static void runscript(Client *c);
-static void find(Client *c, const Arg *arg);
+static void find(Client *c, const Arg *a);
static void togglefullscreen(Client *c, const Arg *a);
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 void gettogglestats(Client *c);
+static void getpagestats(Client *c);
static char *geturi(Client *c);
static const gchar *getstyle(const char *uri);
static void setstyle(Client *c, const char *stylefile);
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 loaduri(Client *c, const Arg *a);
static void navigate(Client *c, const Arg *a);
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
static Client *newclient(Client *c);
static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static void showview(WebKitWebView *v, Client *c);
gpointer d);
static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
-static void linkopen(Client *c, const Arg *arg);
-static void linkopenembed(Client *c, const Arg *arg);
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
static void reload(Client *c, const Arg *arg);
static void scroll_h(Client *c, const Arg *a);
static void scroll_v(Client *c, const Arg *a);
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 toggle(Client *c, const Arg *arg);
+static void toggle(Client *c, const Arg *a);
static void togglecookiepolicy(Client *c, const Arg *arg);
-static void togglegeolocation(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 zoom(Client *c, const Arg *arg);
+static void zoom(Client *c, const Arg *a);
/* configuration, allows nested code to access above variables */
#include "config.h"
}
void
-find(Client *c, const Arg *arg)
+find(Client *c, const Arg *a)
{
- const char *s;
+ const char *s, *f;
+
+ 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 (g_strcmp0(f, s) == 0) /* reset search */
+ webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT);
+
+ webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT);
- s = getatom(c, AtomFind);
- gboolean forward = *(gboolean *)arg;
- webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+ if (strcmp(s, "") == 0)
+ webkit_find_controller_search_finish(c->finder);
+ }
}
void
}
void
-loaduri(Client *c, const Arg *arg)
+loaduri(Client *c, const Arg *a)
{
- char *u = NULL, *rp;
- const char *uri = (char *)arg->v;
- Arg a = { .b = FALSE };
struct stat st;
+ char *url, *path;
+ const char *uri = (char *)a->v;
- if (strcmp(uri, "") == 0)
+ if (g_strcmp0(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);
+ if (g_strrstr(uri, "://") || 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 {
- u = g_strrstr(uri, "://") ? g_strdup(uri)
- : g_strdup_printf("http://%s", uri);
+ url = g_strdup_printf("http://%s", uri);
}
- setatom(c, AtomUri, uri);
+ setatom(c, AtomUri, url);
- /* prevents endless loop */
- if (strcmp(u, geturi(c)) == 0) {
- reload(c, &a);
+ if (strcmp(url, geturi(c)) == 0) {
+ reload(c, a);
} else {
- webkit_web_view_load_uri(c->view, u);
- c->progress = 0;
- c->title = copystr(&c->title, u);
+ webkit_web_view_load_uri(c->view, url);
+ c->title = geturi(c);
updatetitle(c);
}
- g_free(u);
+
+ g_free(url);
}
void
webkit_web_view_go_forward(c->view);
}
+void
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+ navigate(c, a);
+}
+
Client *
newclient(Client *rc)
{
WebKitSettings *settings;
WebKitUserContentManager *contentmanager;
WebKitWebContext *context;
- char *ua;
/* Webview */
if (rv) {
"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 */
+ 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(
if (enableinspector)
c->inspector = webkit_web_view_get_inspector(c->view);
+ c->finder = webkit_web_view_get_find_controller(c->view);
+
if (!kioskmode)
addaccelgroup(c);
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);
}
void
-newwindow(Client *c, const Arg *arg, gboolean noembed)
+newwindow(Client *c, const Arg *a, int noembed)
{
- guint i = 0;
- const char *cmd[18], *uri;
- const Arg a = { .v = (void *)cmd };
+ int i = 0;
char tmp[64];
+ const char *cmd[26], *uri;
+ const Arg arg = { .v = cmd };
cmd[i++] = argv0;
cmd[i++] = "-a";
cmd[i++] = cookiepolicies;
- if (!enablescrollbars)
- cmd[i++] = "-b";
+ cmd[i++] = enablescrollbars ? "-B" : "-b";
+ if (cookiefile && g_strcmp0(cookiefile, "")) {
+ cmd[i++] = "-c";
+ cmd[i++] = cookiefile;
+ }
+ cmd[i++] = enablecache ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
- snprintf(tmp, LENGTH(tmp), "%u", (int)embed);
+ snprintf(tmp, LENGTH(tmp), "%lu", embed);
cmd[i++] = tmp;
}
- 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";
+ cmd[i++] = runinfullscreen ? "-F" : "-f";
+ cmd[i++] = allowgeolocation ? "-G" : "-g";
+ cmd[i++] = loadimages ? "-I" : "-i";
+ cmd[i++] = kioskmode ? "-K" : "-k";
+ cmd[i++] = enablestyle ? "-M" : "-m";
+ cmd[i++] = enableinspector ? "-N" : "-n";
+ cmd[i++] = enableplugins ? "-P" : "-p";
+ if (scriptfile && g_strcmp0(scriptfile, "")) {
+ cmd[i++] = "-r";
+ cmd[i++] = scriptfile;
+ }
+ cmd[i++] = enablescripts ? "-S" : "-s";
+ if (stylefile && g_strcmp0(stylefile, "")) {
+ cmd[i++] = "-t";
+ cmd[i++] = stylefile;
+ }
+ if (fulluseragent && g_strcmp0(fulluseragent, "")) {
+ cmd[i++] = "-u";
+ cmd[i++] = fulluseragent;
+ }
if (showxid)
cmd[i++] = "-x";
- if (enablediskcache)
- cmd[i++] = "-D";
- cmd[i++] = "-c";
- cmd[i++] = cookiefile;
+ /* do not keep zoom level */
cmd[i++] = "--";
- uri = arg->v ? (char *)arg->v : c->linkhover;
- if (uri)
+ if ((uri = a->v))
cmd[i++] = uri;
- cmd[i++] = NULL;
- spawn(NULL, &a);
+ cmd[i] = NULL;
+
+ spawn(c, &arg);
}
GtkWidget *
ev = &((XEvent *)e)->xproperty;
if (ev->state == PropertyNewValue) {
if (ev->atom == atoms[AtomFind]) {
- arg.b = TRUE;
- find(c, &arg);
+ find(c, NULL);
return GDK_FILTER_REMOVE;
} else if (ev->atom == atoms[AtomGo]) {
}
void
-linkopen(Client *c, const Arg *arg)
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
{
- newwindow(NULL, arg, 1);
-}
+ Arg arg;
-void
-linkopenembed(Client *c, const Arg *arg)
-{
- newwindow(NULL, arg, 0);
+ arg.v = webkit_hit_test_result_get_link_uri(h);
+ newwindow(c, &arg, a->b);
}
void
}
void
-toggle(Client *c, const Arg *arg)
+toggle(Client *c, const Arg *a)
{
- WebKitWebSettings *settings;
- char *name = (char *)arg->v;
- gboolean value;
- Arg a = { .b = FALSE };
+ WebKitSettings *s;
- 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);
+ s = webkit_web_view_get_settings(c->view);
- reload(c, &a);
+ switch ((unsigned int)a->i) {
+ case CaretBrowsing:
+ enablecaretbrowsing = !enablecaretbrowsing;
+ webkit_settings_set_enable_caret_browsing(s,
+ enablecaretbrowsing);
+ updatetitle(c);
+ return; /* do not reload */
+ break;
+ case FrameFlattening:
+ enableframeflattening = !enableframeflattening;
+ webkit_settings_set_enable_frame_flattening(s,
+ enableframeflattening);
+ break;
+ case Geolocation:
+ allowgeolocation = !allowgeolocation;
+ break;
+ case JavaScript:
+ enablescripts = !enablescripts;
+ webkit_settings_set_enable_javascript(s, enablescripts);
+ break;
+ case LoadImages:
+ loadimages = !loadimages;
+ webkit_settings_set_auto_load_images(s, loadimages);
+ break;
+ case Plugins:
+ enableplugins = !enableplugins;
+ webkit_settings_set_enable_plugins(s, enableplugins);
+ break;
+ 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 reload */
+ break;
+ default:
+ break;
+ }
+ reload(c, a);
}
void
/* Do not reload. */
}
-void
-togglegeolocation(Client *c, const Arg *arg)
-{
- Arg a = { .b = FALSE };
-
- allowgeolocation ^= 1;
- reload(c, &a);
-}
-
void
togglestyle(Client *c, const Arg *arg)
{
}
void
-gettogglestat(Client *c)
+gettogglestats(Client *c)
{
- gboolean value;
- int p = 0;
- WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
- togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
-
- g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value,
- NULL);
- togglestat[p++] = value? 'C': 'c';
-
- togglestat[p++] = allowgeolocation? 'G': 'g';
-
- togglestat[p++] = enablediskcache? 'D': 'd';
-
- g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
- togglestat[p++] = value? 'I': 'i';
-
- g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
- togglestat[p++] = value? 'S': 's';
-
- g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
- togglestat[p++] = value? 'V': 'v';
-
- togglestat[p++] = enablestyle ? 'M': 'm';
-
- togglestat[p] = '\0';
+ togglestats[0] = cookiepolicy_set(cookiepolicy_get());
+ togglestats[1] = enablecaretbrowsing ? 'C' : 'c';
+ togglestats[2] = allowgeolocation ? 'G' : 'g';
+ togglestats[3] = enablecache ? 'D' : 'd';
+ togglestats[4] = loadimages ? 'I' : 'i';
+ togglestats[5] = enablescripts ? 'S': 's';
+ togglestats[6] = enableplugins ? 'V' : 'v';
+ togglestats[7] = enablestyle ? 'M' : 'm';
+ togglestats[8] = enableframeflattening ? 'F' : 'f';
+ togglestats[9] = '\0';
}
void
-getpagestat(Client *c)
+getpagestats(Client *c)
{
- const char *uri = geturi(c);
-
pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
c->tlsflags > 0 ? 'U' : 'T';
- pagestat[1] = '\0';
+ pagestats[1] = '\0';
}
void
updatetitle(Client *c)
{
- char *t;
+ char *title;
if (showindicators) {
- gettogglestat(c);
- getpagestat(c);
-
- 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);
+ gettogglestats(c);
+ getpagestats(c);
+
+ if (c->progress != 100) {
+ title = g_strdup_printf("[%i%%] %s:%s | %s",
+ c->progress, togglestats, pagestats,
+ c->targeturi ? c->targeturi : c->title);
} else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
- c->title == NULL ? "" : c->title);
+ title = g_strdup_printf("%s:%s | %s",
+ togglestats, pagestats,
+ c->targeturi ? c->targeturi : c->title);
}
- gtk_window_set_title(GTK_WINDOW(c->win), t);
- g_free(t);
+ gtk_window_set_title(GTK_WINDOW(c->win), title);
+ g_free(title);
} else {
- gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
- "" : c->title);
+ gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
+ c->title : "");
}
}
}
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;
+zoom(Client *c, const Arg *a)
+{
+ if (a->i > 0)
+ webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1);
+ else if (a->i < 0)
+ webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1);
+ else
webkit_web_view_set_zoom_level(c->view, 1.0);
- }
+
+ zoomlevel = webkit_web_view_get_zoom_level(c->view);
}
int
cookiefile = EARGF(usage());
break;
case 'd':
- enablediskcache = 0;
+ enablecache = 0;
break;
case 'D':
- enablediskcache = 1;
+ enablecache = 1;
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
