X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=d970f7f4f1315211d065e10f99c70f0cda55a905;hb=432f45a85213a78da207c63890ed7f85afff5478;hp=42bc393b600990835affa413a091676c03cffa3a;hpb=237e10058aaceca4660259d3948662a1e0b79cfb;p=surf.git

diff --git a/surf.c b/surf.c
index 42bc393..d970f7f 100644
--- a/surf.c
+++ b/surf.c
@@ -47,7 +47,7 @@ typedef struct Client {
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
 	char *title, *linkhover;
-	const char *uri, *needle;
+	const char *needle;
 	gint progress;
 	struct Client *next;
 	gboolean zoomed, fullscreen, isinspecting, sslfailed;
@@ -241,7 +241,8 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
 
 	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;
@@ -635,7 +636,7 @@ loaduri(Client *c, const Arg *arg) {
 	}
 
 	/* 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);
@@ -818,6 +819,9 @@ newclient(void) {
 			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(
@@ -1277,8 +1281,10 @@ updatewinid(Client *c) {
 
 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
@@ -1326,6 +1332,9 @@ main(int argc, char *argv[]) {
 	case 'f':
 		runinfullscreen = 1;
 		break;
+	case 'F':
+		runinfullscreen = 0;
+		break;
 	case 'g':
 		allowgeolocation = 0;
 		break;
@@ -1377,6 +1386,9 @@ main(int argc, char *argv[]) {
 	case 'x':
 		showxid = TRUE;
 		break;
+	case 'z':
+		zoomlevel = strtof(EARGF(usage()), NULL);
+		break;
 	default:
 		usage();
 	} ARGEND;