static Window embed = 0;
static gboolean showxid = FALSE;
static char winid[64];
-static char togglestat[9];
-static char pagestat[3];
+static char togglestats[10];
+static char pagestats[2];
static GTlsDatabase *tlsdb;
static int cookiepolicy;
static char *stylefile = NULL;
static gboolean permissionrequested(WebKitWebView *v,
WebKitPermissionRequest *r, Client *c);
static const char *getatom(Client *c, int a);
-static void gettogglestat(Client *c);
-static void getpagestat(Client *c);
+static void gettogglestats(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
-gettogglestat(Client *c)
+gettogglestats(Client *c)
{
- gboolean value;
- int p = 0;
- WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
- togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
-
- g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value,
- NULL);
- togglestat[p++] = value? 'C': 'c';
-
- togglestat[p++] = allowgeolocation? 'G': 'g';
-
- togglestat[p++] = enablecache? 'D': 'd';
-
- g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
- togglestat[p++] = value? 'I': 'i';
-
- g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
- togglestat[p++] = value? 'S': 's';
-
- g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
- togglestat[p++] = value? 'V': 'v';
-
- togglestat[p++] = enablestyle ? 'M': 'm';
-
- togglestat[p] = '\0';
+ togglestats[0] = cookiepolicy_set(cookiepolicy_get());
+ togglestats[1] = enablecaretbrowsing ? 'C' : 'c';
+ togglestats[2] = allowgeolocation ? 'G' : 'g';
+ togglestats[3] = enablecache ? 'D' : 'd';
+ togglestats[4] = loadimages ? 'I' : 'i';
+ togglestats[5] = enablescripts ? 'S': 's';
+ togglestats[6] = enableplugins ? 'V' : 'v';
+ togglestats[7] = enablestyle ? 'M' : 'm';
+ togglestats[8] = enableframeflattening ? 'F' : 'f';
+ togglestats[9] = '\0';
}
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
updatetitle(Client *c)
{
- char *t;
+ char *title;
if (showindicators) {
- gettogglestat(c);
- getpagestat(c);
-
- if (c->linkhover) {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
- c->linkhover);
- } else if (c->progress != 100) {
- t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
- togglestat, pagestat,
- c->title == NULL ? "" : c->title);
+ gettogglestats(c);
+ getpagestats(c);
+
+ if (c->progress != 100) {
+ title = g_strdup_printf("[%i%%] %s:%s | %s",
+ c->progress, togglestats, pagestats,
+ c->targeturi ? c->targeturi : c->title);
} else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
- c->title == NULL ? "" : c->title);
+ title = g_strdup_printf("%s:%s | %s",
+ togglestats, pagestats,
+ c->targeturi ? c->targeturi : c->title);
}
- gtk_window_set_title(GTK_WINDOW(c->win), t);
- g_free(t);
+ gtk_window_set_title(GTK_WINDOW(c->win), title);
+ g_free(title);
} else {
- gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
- "" : c->title);
+ gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
+ c->title : "");
}
}