WebKitWebView *view;
WebKitWebInspector *inspector;
char *title, *linkhover;
- const char *uri, *needle;
+ const char *needle;
gint progress;
struct Client *next;
gboolean zoomed, fullscreen, isinspecting, sslfailed;
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;
: g_strdup_printf("http://%s", uri);
}
+ setatom(c, AtomUri, uri);
+
/* 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);
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(
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 'f':
runinfullscreen = 1;
break;
+ case 'F':
+ runinfullscreen = 0;
+ break;
case 'g':
allowgeolocation = 0;
break;
case 'x':
showxid = TRUE;
break;
+ case 'z':
+ zoomlevel = strtof(EARGF(usage()), NULL);
+ break;
default:
usage();
} ARGEND;