*
* To understand surf, start reading main().
*/
+
#include <signal.h>
#include <X11/X.h>
#include <X11/Xatom.h>
WebKitWebView *view;
WebKitWebInspector *inspector;
char *title, *linkhover;
- const char *uri, *needle;
+ const char *needle;
gint progress;
struct Client *next;
gboolean zoomed, fullscreen, isinspecting, sslfailed;
static gboolean showxid = FALSE;
static char winid[64];
static gboolean usingproxy = 0;
-static char togglestat[6];
+static char togglestat[7];
static char pagestat[3];
static void addaccelgroup(Client *c);
static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f,
WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
WebKitWebPolicyDecision *p, Client *c);
+static gboolean deletion_interface(WebKitWebView *view,
+ WebKitDOMHTMLElement *arg1, Client *c);
static 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 void geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
+ WebKitGeolocationPolicyDecision *d, Client *c);
static const char *getatom(Client *c, int a);
static void gettogglestat(Client *c);
static void getpagestat(Client *c);
static void titlechange(WebKitWebView *v, WebKitWebFrame *frame,
const char *title, Client *c);
static void toggle(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 update(Client *c);
+static void updatetitle(Client *c);
static void updatewinid(Client *c);
static void usage(void);
static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
g_object_get(result, "context", &context, NULL);
if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) {
- if(e->button == 2) {
+ if(e->button == 2 ||
+ (e->button == 1 && CLEANMASK(e->state) == CLEANMASK(MODKEY))) {
g_object_get(result, "link-uri", &arg.v, NULL);
newwindow(NULL, &arg, e->state & GDK_CONTROL_MASK);
return true;
return FALSE;
}
+static gboolean
+deletion_interface(WebKitWebView *view,
+ WebKitDOMHTMLElement *arg1, Client *c) {
+ return FALSE;
+}
+
static void
destroyclient(Client *c) {
Client *p;
c->fullscreen = !c->fullscreen;
}
+static void
+geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
+ WebKitGeolocationPolicyDecision *d, Client *c) {
+ if(allowgeolocation) {
+ webkit_geolocation_policy_allow(d);
+ } else {
+ webkit_geolocation_policy_deny(d);
+ }
+}
+
static const char *
getatom(Client *c, int a) {
static char buf[BUFSIZ];
free(c->linkhover);
c->linkhover = NULL;
}
- update(c);
+ updatetitle(c);
}
static void
break;
case WEBKIT_LOAD_FINISHED:
c->progress = 100;
- update(c);
+ updatetitle(c);
break;
default:
break;
}
/* prevents endless loop */
- if(c->uri && strcmp(u, c->uri) == 0) {
+ 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);
g_free(u);
- update(c);
+ updatetitle(c);
}
}
WebKitWebSettings *settings;
WebKitWebFrame *frame;
GdkGeometry hints = { 1, 1 };
+ GdkScreen *screen;
+ gdouble dpi;
char *uri, *ua;
if(!(c = calloc(1, sizeof(Client))))
g_signal_connect(G_OBJECT(c->view),
"hovering-over-link",
G_CALLBACK(linkhover), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "geolocation-policy-decision-requested",
+ G_CALLBACK(geopolicyrequested), c);
g_signal_connect(G_OBJECT(c->view),
"create-web-view",
G_CALLBACK(createwindow), c);
g_signal_connect(G_OBJECT(c->view),
"resource-request-starting",
G_CALLBACK(beforerequest), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "should-show-delete-interface-for-element",
+ G_CALLBACK(deletion_interface), c);
/* Scrolled Window */
c->scroll = gtk_scrolled_window_new(NULL, NULL);
g_object_set(G_OBJECT(settings), "default-font-size",
defaultfontsize, NULL);
+ /*
+ * 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(GTK_WIDGET(c->win)->window);
+ 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_INSPECTOR(
webkit_web_view_get_inspector(c->view));
c->isinspecting = false;
}
+ if(runinfullscreen) {
+ c->fullscreen = 0;
+ fullscreen(c, NULL);
+ }
+
g_free(uri);
setatom(c, AtomFind, "");
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
- const char *cmd[12], *uri;
+ const char *cmd[14], *uri;
const Arg a = { .v = (void *)cmd };
char tmp[64];
cmd[i++] = "-s";
if(showxid)
cmd[i++] = "-x";
+ cmd[i++] = "-c";
+ cmd[i++] = cookiefile;
cmd[i++] = "--";
uri = arg->v ? (char *)arg->v : c->linkhover;
if(uri)
static void
progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
c->progress = webkit_web_view_get_progress(c->view) * 100;
- update(c);
+ updatetitle(c);
}
static void
static void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
c->title = copystr(&c->title, t);
- update(c);
+ updatetitle(c);
}
static void
g_object_get(G_OBJECT(settings), name, &value, NULL);
g_object_set(G_OBJECT(settings), name, !value, NULL);
- reload(c,&a);
+ reload(c, &a);
}
static void
gtk_adjustment_set_value(a, v);
}
+static void
+togglegeolocation(Client *c, const Arg *arg) {
+ Arg a = { .b = FALSE };
+
+ allowgeolocation ^= 1;
+
+ reload(c, &a);
+}
+
static void
togglescrollbars(Client *c, const Arg *arg) {
GtkPolicyType vspolicy;
uri = uri[0] ? g_strdup("") : g_strconcat("file://", stylefile, NULL);
g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
- update(c);
+ updatetitle(c);
}
static void
&value, NULL);
togglestat[0] = value? 'C': 'c';
+ togglestat[1] = allowgeolocation? 'G': 'g';
+
g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
- togglestat[1] = value? 'I': 'i';
+ togglestat[2] = value? 'I': 'i';
g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
- togglestat[2] = value? 'S': 's';
+ togglestat[3] = value? 'S': 's';
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
- togglestat[3] = value? 'V': 'v';
+ togglestat[4] = value? 'V': 'v';
g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
- togglestat[4] = uri[0] ? 'M': 'm';
+ togglestat[5] = uri[0] ? 'M': 'm';
- togglestat[5] = '\0';
+ togglestat[6] = '\0';
}
static void
}
static void
-update(Client *c) {
+updatetitle(Client *c) {
char *t;
- gettogglestat(c);
- getpagestat(c);
+ 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);
+ 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);
+ } else {
+ t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
+ c->title);
+ }
+
+ gtk_window_set_title(GTK_WINDOW(c->win), t);
+ g_free(t);
} else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->title);
+ gtk_window_set_title(GTK_WINDOW(c->win), c->title);
}
-
- gtk_window_set_title(GTK_WINDOW(c->win), t);
- g_free(t);
}
static void
static void
usage(void) {
- die("usage: %s [-biknpsvx] [-c cookiefile] [-e xid] [-r scriptfile]"
- " [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
+ die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
+ " [-c cookiefile] [-e xid] [-r scriptfile]"
+ " [-t stylefile] [-u useragent] [-z zoomlevel]"
+ " [uri]\n", basename(argv0));
}
static void
case 'b':
enablescrollbars = 0;
break;
+ case 'B':
+ enablescrollbars = 1;
+ break;
case 'c':
cookiefile = EARGF(usage());
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;
+ case 'f':
+ runinfullscreen = 1;
+ break;
+ case 'F':
+ runinfullscreen = 0;
+ break;
+ case 'g':
+ allowgeolocation = 0;
+ break;
+ case 'G':
+ allowgeolocation = 1;
+ break;
case 'i':
loadimages = 0;
break;
+ case 'I':
+ loadimages = 1;
+ break;
case 'k':
+ kioskmode = 0;
+ break;
+ case 'K':
kioskmode = 1;
break;
case 'n':
enableinspector = 0;
break;
+ case 'N':
+ enableinspector = 1;
+ break;
case 'p':
enableplugins = 0;
break;
+ case 'P':
+ enableplugins = 1;
+ break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
enablescripts = 0;
break;
+ case 'S':
+ enablescripts = 1;
+ break;
case 't':
stylefile = EARGF(usage());
break;
case 'x':
showxid = TRUE;
break;
+ case 'z':
+ zoomlevel = strtof(EARGF(usage()), NULL);
+ break;
default:
usage();
} ARGEND;
