static gboolean showxid = FALSE;
static char winid[64];
static char togglestat[9];
-static char pagestat[3];
+static char pagestats[2];
static GTlsDatabase *tlsdb;
static int cookiepolicy;
static char *stylefile = NULL;
WebKitPermissionRequest *r, Client *c);
static const char *getatom(Client *c, int a);
static void gettogglestat(Client *c);
-static void getpagestat(Client *c);
+static void getpagestats(Client *c);
static char *geturi(Client *c);
static const gchar *getstyle(const char *uri);
static void setstyle(Client *c, const char *stylefile);
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);
}
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
}
void
-getpagestat(Client *c)
+getpagestats(Client *c)
{
- const char *uri = geturi(c);
-
pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
c->tlsflags > 0 ? 'U' : 'T';
- pagestat[1] = '\0';
+ pagestats[1] = '\0';
}
void
if (showindicators) {
gettogglestat(c);
- getpagestat(c);
+ getpagestats(c);
if (c->linkhover) {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
+ t = g_strdup_printf("%s:%s | %s", togglestat, pagestats,
c->linkhover);
} else if (c->progress != 100) {
t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
- togglestat, pagestat,
+ togglestat, pagestats,
c->title == NULL ? "" : c->title);
} else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
+ t = g_strdup_printf("%s:%s | %s", togglestat, pagestats,
c->title == NULL ? "" : c->title);
}