Adapt loaduri()

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index a06fe40..52d9cdd 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -162,8 +162,9 @@ static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
 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);
@@ -175,8 +176,7 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 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);
@@ -825,38 +825,35 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 }
 
 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
@@ -868,6 +865,12 @@ navigate(Client *c, const Arg *a)
                webkit_web_view_go_forward(c->view);
 }
 
+void
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+       navigate(c, a);
+}
+
 Client *
 newclient(Client *rc)
 {
@@ -1171,15 +1174,12 @@ progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
 }
 
 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