Make surf set the URI atom right on manual URI entering.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 28d56d0..f0be24b 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -635,6 +635,8 @@ loaduri(Client *c, const Arg *arg) {
                        : g_strdup_printf("http://%s", uri);
        }
 
+       setatom(c, AtomUri, uri);
+
        /* prevents endless loop */
        if(strcmp(u, geturi(c)) == 0) {
                reload(c, &a);
@@ -819,6 +821,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(
@@ -1280,7 +1285,8 @@ static void
 usage(void) {
        die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
                " [-c cookiefile] [-e xid] [-r scriptfile]"
-               " [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
+               " [-t stylefile] [-u useragent] [-z zoomlevel]"
+               " [uri]\n", basename(argv0));
 }
 
 static void
@@ -1382,6 +1388,9 @@ main(int argc, char *argv[]) {
        case 'x':
                showxid = TRUE;
                break;
+       case 'z':
+               zoomlevel = strtof(EARGF(usage()), NULL);
+               break;
        default:
                usage();
        } ARGEND;