static char togglestat[6];
static char pagestat[3];
-static void add_accels(Client *c);
+static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
WebKitWebResource *r, WebKitNetworkRequest *req,
WebKitNetworkResponse *resp, gpointer d);
static void toggle(Client *c, const Arg *arg);
static void togglescrollbars(Client *c, const Arg *arg);
static void togglestyle(Client *c, const Arg *arg);
-static void update(Client *c);
+static void updatetitle(Client *c);
static void updatewinid(Client *c);
static void usage(void);
static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
#include "config.h"
static void
-add_accels(Client *c) {
+addaccelgroup(Client *c) {
int i;
GtkAccelGroup *group = gtk_accel_group_new();
+ GClosure *closure;
+
for(i = 0; i < LENGTH(keys); i++) {
- GClosure *closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
+ closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod,
0, closure);
}
free(c->linkhover);
c->linkhover = NULL;
}
- update(c);
+ updatetitle(c);
}
static void
break;
case WEBKIT_LOAD_FINISHED:
c->progress = 100;
- update(c);
+ updatetitle(c);
break;
default:
break;
c->progress = 0;
c->title = copystr(&c->title, u);
g_free(u);
- update(c);
+ updatetitle(c);
}
}
g_signal_connect(G_OBJECT(c->win),
"destroy",
G_CALLBACK(destroywin), c);
- if(!kioskmode) {
- add_accels(c);
- }
+
+ if(!kioskmode)
+ addaccelgroup(c);
/* Pane */
c->pane = gtk_vpaned_new();
static void
progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
c->progress = webkit_web_view_get_progress(c->view) * 100;
- update(c);
+ updatetitle(c);
}
static void
static void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
c->title = copystr(&c->title, t);
- update(c);
+ updatetitle(c);
}
static void
uri = uri[0] ? g_strdup("") : g_strconcat("file://", stylefile, NULL);
g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
- update(c);
+ updatetitle(c);
}
static void
}
static void
-update(Client *c) {
+updatetitle(Client *c) {
char *t;
- gettogglestat(c);
- getpagestat(c);
+ 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);
+ 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);
+ } else {
+ t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
+ c->title);
+ }
+
+ gtk_window_set_title(GTK_WINDOW(c->win), t);
+ g_free(t);
} else {
- t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->title);
+ gtk_window_set_title(GTK_WINDOW(c->win), c->title);
}
-
- gtk_window_set_title(GTK_WINDOW(c->win), t);
- g_free(t);
}
static void