pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3690df
)
implementing user defined context menu
author
Enno Boland (tox)
<tox@s01.de>
Fri, 16 Oct 2009 13:35:11 +0000
(15:35 +0200)
committer
Enno Boland (tox)
<tox@s01.de>
Fri, 16 Oct 2009 13:35:11 +0000
(15:35 +0200)
config.def.h
patch
|
blob
|
history
surf.c
patch
|
blob
|
history
diff --git
a/config.def.h
b/config.def.h
index
a01f882
..
002c901
100644
(file)
--- a/
config.def.h
+++ b/
config.def.h
@@
-11,10
+11,10
@@
static Key keys[] = {
/* modifier keyval function arg Focus */
{ MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE }, Any },
{ MODKEY, GDK_r, reload, { .b = FALSE }, Any },
/* modifier keyval function arg Focus */
{ MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE }, Any },
{ MODKEY, GDK_r, reload, { .b = FALSE }, Any },
- { MODKEY, GDK_g, showur
l
, { 0 }, Any },
+ { MODKEY, GDK_g, showur
i
, { 0 }, Any },
{ MODKEY, GDK_slash, showsearch, { 0 }, Any },
{ 0, GDK_Escape, hidesearch, { 0 }, Any },
{ MODKEY, GDK_slash, showsearch, { 0 }, Any },
{ 0, GDK_Escape, hidesearch, { 0 }, Any },
- { 0, GDK_Escape, hideur
l
, { 0 }, Any },
+ { 0, GDK_Escape, hideur
i
, { 0 }, Any },
{ MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 }, Any },
{ MODKEY, GDK_p, clipboard, { .b = TRUE }, Browser },
{ MODKEY, GDK_y, clipboard, { .b = FALSE }, Browser },
{ MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 }, Any },
{ MODKEY, GDK_p, clipboard, { .b = TRUE }, Browser },
{ MODKEY, GDK_y, clipboard, { .b = FALSE }, Browser },
@@
-31,13
+31,15
@@
static Key keys[] = {
{ MODKEY|GDK_SHIFT_MASK,GDK_n, searchtext, { .b = FALSE }, Browser|SearchBar },
{ 0, GDK_Return, searchtext, { .b = TRUE }, SearchBar },
{ GDK_SHIFT_MASK, GDK_Return, searchtext, { .b = FALSE }, SearchBar },
{ MODKEY|GDK_SHIFT_MASK,GDK_n, searchtext, { .b = FALSE }, Browser|SearchBar },
{ 0, GDK_Return, searchtext, { .b = TRUE }, SearchBar },
{ GDK_SHIFT_MASK, GDK_Return, searchtext, { .b = FALSE }, SearchBar },
- { 0, GDK_Return, loaduri, { .v = NULL }, Ur
l
Bar },
- { 0, GDK_Return, hideur
l, { 0 }, Url
Bar },
+ { 0, GDK_Return, loaduri, { .v = NULL }, Ur
i
Bar },
+ { 0, GDK_Return, hideur
i, { 0 }, Uri
Bar },
};
};
-static Context context[] = {
- { "<===", navigate, { .i = -1 } }
- { "===>", navigate, { .i = -1 } }
- { "Stop", navigate, { .i = -1 } }
- { "Open", navigate, { .i = -1 } }
+static Item items[] = {
+ { "Open", loaduri, { .v = NULL } },
+ { "New Window", newwindow, { .v = NULL } },
+ { "Stop", stop, { 0 } },
+ { "<===", navigate, { .i = -1 } },
+ { "===>", navigate, { .i = +1 } },
+ { "suckless", newwindow, { .v = (char *)"http://suckless.org" } },
};
};
diff --git
a/surf.c
b/surf.c
index
b6b8c92
..
042bdf4
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-30,10
+30,10
@@
union Arg {
};
typedef struct Client {
};
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *ur
l
bar, *searchbar, *indicator;
+ GtkWidget *win, *scroll, *vbox, *ur
i
bar, *searchbar, *indicator;
WebKitWebView *view;
WebKitDownload *download;
WebKitWebView *view;
WebKitDownload *download;
- gchar *title;
+ gchar *title
, *linkhover
;
gint progress;
struct Client *next;
} Client;
gint progress;
struct Client *next;
} Client;
@@
-42,7
+42,7
@@
typedef struct {
char *label;
void (*func)(Client *c, const Arg *arg);
const Arg arg;
char *label;
void (*func)(Client *c, const Arg *arg);
const Arg arg;
-}
Context
;
+}
Item
;
typedef struct Cookie {
gchar *name;
typedef struct Cookie {
gchar *name;
@@
-55,7
+55,7
@@
typedef struct Cookie {
typedef enum {
Browser = 0x0001,
SearchBar = 0x0010,
typedef enum {
Browser = 0x0001,
SearchBar = 0x0010,
- Ur
l
Bar = 0x0100,
+ Ur
i
Bar = 0x0100,
Any = ~0,
} KeyFocus;
Any = ~0,
} KeyFocus;
@@
-68,7
+68,7
@@
typedef struct {
} Key;
static Display *dpy;
} Key;
static Display *dpy;
-static Atom ur
l
prop;
+static Atom ur
i
prop;
static SoupCookieJar *cookiejar;
static SoupSession *session;
static Client *clients = NULL;
static SoupCookieJar *cookiejar;
static SoupSession *session;
static Client *clients = NULL;
@@
-79,6
+79,7
@@
static gboolean ignore_once = FALSE;
static gchar winid[64];
static gchar *progname;
static gchar winid[64];
static gchar *progname;
+static const gchar *autouri(Client *c);
static gchar *buildpath(const gchar *path);
static void cleanup(void);
static void clipboard(Client *c, const Arg *arg);
static gchar *buildpath(const gchar *path);
static void cleanup(void);
static void clipboard(Client *c, const Arg *arg);
@@
-94,7
+95,8
@@
static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
static gchar *geturi(Client *c);
static void hidesearch(Client *c, const Arg *arg);
static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
static gchar *geturi(Client *c);
static void hidesearch(Client *c, const Arg *arg);
-static void hideurl(Client *c, const Arg *arg);
+static void hideuri(Client *c, const Arg *arg);
+static void itemclick(GtkMenuItem *mi, Client *c);
static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
static void linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c);
static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
static void linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c);
static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
@@
-104,7
+106,7
@@
static void navigate(Client *c, const Arg *arg);
static Client *newclient(void);
static void newwindow(Client *c, const Arg *arg);
static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static Client *newclient(void);
static void newwindow(Client *c, const Arg *arg);
static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void pasteur
l
(GtkClipboard *clipboard, const gchar *text, gpointer d);
+static void pasteur
i
(GtkClipboard *clipboard, const gchar *text, gpointer d);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static void print(Client *c, const Arg *arg);
static void proccookies(SoupMessage *m, Client *c);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static void print(Client *c, const Arg *arg);
static void proccookies(SoupMessage *m, Client *c);
@@
-121,7
+123,7
@@
static void scroll(Client *c, const Arg *arg);
static void searchtext(Client *c, const Arg *arg);
static void source(Client *c, const Arg *arg);
static void showsearch(Client *c, const Arg *arg);
static void searchtext(Client *c, const Arg *arg);
static void source(Client *c, const Arg *arg);
static void showsearch(Client *c, const Arg *arg);
-static void showur
l
(Client *c, const Arg *arg);
+static void showur
i
(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, Client *c);
static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, Client *c);
static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
@@
-134,6
+136,15
@@
static void zoom(Client *c, const Arg *arg);
/* configuration, allows nested code to access above variables */
#include "config.h"
/* configuration, allows nested code to access above variables */
#include "config.h"
+const gchar *
+autouri(Client *c) {
+ if(GTK_WIDGET_HAS_FOCUS(c->uribar))
+ return gtk_entry_get_text(GTK_ENTRY(c->uribar));
+ else if(c->linkhover)
+ return c->linkhover;
+ return NULL;
+}
+
gchar *
buildpath(const gchar *path) {
gchar *apath, *p;
gchar *
buildpath(const gchar *path) {
gchar *apath, *p;
@@
-170,15
+181,25
@@
clipboard(Client *c, const Arg *arg) {
gboolean paste = *(gboolean *)arg;
if(paste)
gboolean paste = *(gboolean *)arg;
if(paste)
- gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteur
l
, c);
+ gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteur
i
, c);
else
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
}
void
context(WebKitWebView *v, GtkMenu *m, Client *c) {
else
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
}
void
context(WebKitWebView *v, GtkMenu *m, Client *c) {
-
- //gtk_menu_shell_append ((GtkMenuShell *)(menu),(child))
+ int i;
+ GtkWidget *item;
+
+ gtk_widget_hide_all(GTK_WIDGET(m));
+ gtk_widget_show(GTK_WIDGET(m));
+ for(i = 0; i < LENGTH(items); i++) {
+ item = gtk_menu_item_new_with_label(items[i].label);
+ gtk_menu_shell_append(GTK_MENU_SHELL(m), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(itemclick), c);
+ gtk_widget_show(item);
+ }
}
gchar *
}
gchar *
@@
-199,7
+220,7
@@
destroyclient(Client *c) {
gtk_widget_destroy(GTK_WIDGET(c->view));
gtk_widget_destroy(c->scroll);
gtk_widget_destroy(GTK_WIDGET(c->view));
gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->ur
l
bar);
+ gtk_widget_destroy(c->ur
i
bar);
gtk_widget_destroy(c->searchbar);
gtk_widget_destroy(c->vbox);
gtk_widget_destroy(c->win);
gtk_widget_destroy(c->searchbar);
gtk_widget_destroy(c->vbox);
gtk_widget_destroy(c->win);
@@
-317,11
+338,22
@@
hidesearch(Client *c, const Arg *arg) {
}
void
}
void
-hideur
l
(Client *c, const Arg *arg) {
- gtk_widget_hide(c->ur
l
bar);
+hideur
i
(Client *c, const Arg *arg) {
+ gtk_widget_hide(c->ur
i
bar);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
}
gtk_widget_grab_focus(GTK_WIDGET(c->view));
}
+void
+itemclick(GtkMenuItem *mi, Client *c) {
+ int i;
+ const gchar *label;
+
+ label = gtk_menu_item_get_label(mi);
+ for(i = 0; i < LENGTH(items); i++)
+ if(!strcmp(items[i].label, label))
+ items[i].func(c, &(items[i].arg));
+}
+
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
guint i, focus;
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
guint i, focus;
@@
-331,8
+363,8
@@
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
return FALSE;
if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
focus = SearchBar;
return FALSE;
if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
focus = SearchBar;
- else if(GTK_WIDGET_HAS_FOCUS(c->ur
l
bar))
- focus = Ur
l
Bar;
+ else if(GTK_WIDGET_HAS_FOCUS(c->ur
i
bar))
+ focus = Ur
i
Bar;
else
focus = Browser;
updatewinid(c);
else
focus = Browser;
updatewinid(c);
@@
-351,9
+383,12
@@
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
void
linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) {
if(l)
void
linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) {
if(l)
- gtk_window_set_title(GTK_WINDOW(c->win), l);
- else
- update(c);
+ c->linkhover = copystr(&c->linkhover, l);
+ else if(c->linkhover) {
+ free(c->linkhover);
+ c->linkhover = NULL;
+ }
+ update(c);
}
void
}
void
@@
-362,7
+397,7
@@
loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
ignore_once = TRUE;
uri = geturi(c);
ignore_once = TRUE;
uri = geturi(c);
- XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), ur
l
prop,
+ XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), ur
i
prop,
XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
strlen(uri) + 1);
}
XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
strlen(uri) + 1);
}
@@
-377,8
+412,11
@@
void
loaduri(Client *c, const Arg *arg) {
gchar *u;
const gchar *uri = (gchar *)arg->v;
loaduri(Client *c, const Arg *arg) {
gchar *u;
const gchar *uri = (gchar *)arg->v;
+
+ if(!uri)
+ uri = autouri(c);
if(!uri)
if(!uri)
-
uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar))
;
+
return
;
u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
@@
-437,9
+475,9
@@
newclient(void) {
g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
- /* ur
l
bar */
- c->ur
l
bar = gtk_entry_new();
- gtk_entry_set_has_frame(GTK_ENTRY(c->ur
l
bar), FALSE);
+ /* ur
i
bar */
+ c->ur
i
bar = gtk_entry_new();
+ gtk_entry_set_has_frame(GTK_ENTRY(c->ur
i
bar), FALSE);
/* searchbar */
c->searchbar = gtk_entry_new();
/* searchbar */
c->searchbar = gtk_entry_new();
@@
-456,17
+494,17
@@
newclient(void) {
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->ur
l
bar);
+ gtk_container_add(GTK_CONTAINER(c->vbox), c->ur
i
bar);
gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->ur
l
bar, FALSE, FALSE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->ur
i
bar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_hide_all(c->searchbar);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_hide_all(c->searchbar);
- gtk_widget_hide_all(c->ur
l
bar);
+ gtk_widget_hide_all(c->ur
i
bar);
gtk_widget_show(c->vbox);
gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
gtk_widget_show(c->vbox);
gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
@@
-495,8
+533,8
@@
newclient(void) {
void
newwindow(Client *c, const Arg *arg) {
void
newwindow(Client *c, const Arg *arg) {
- guint i = 0
, urlindex
;
- const gchar *cmd[7];
+ guint i = 0;
+ const gchar *cmd[7]
, *uri
;
const Arg a = { .v = (void *)cmd };
gchar tmp[64];
const Arg a = { .v = (void *)cmd };
gchar tmp[64];
@@
-510,9
+548,9
@@
newwindow(Client *c, const Arg *arg) {
cmd[i++] = "-x";
}
cmd[i++] = "--";
cmd[i++] = "-x";
}
cmd[i++] = "--";
- ur
lindex = i
;
- if(
arg->v
)
- cmd[i++] =
(char *)arg->v
;
+ ur
i = arg->v ? (char *)arg->v : autouri(c)
;
+ if(
uri
)
+ cmd[i++] =
uri
;
cmd[i++] = NULL;
spawn(NULL, &a);
}
cmd[i++] = NULL;
spawn(NULL, &a);
}
@@
-524,7
+562,7
@@
createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
}
void
}
void
-pasteur
l
(GtkClipboard *clipboard, const gchar *text, gpointer d) {
+pasteur
i
(GtkClipboard *clipboard, const gchar *text, gpointer d) {
Arg arg = {.v = text };
if(text != NULL)
loaduri((Client *) d, &arg);
Arg arg = {.v = text };
if(text != NULL)
loaduri((Client *) d, &arg);
@@
-542,11
+580,11
@@
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
- if(ev->atom == ur
l
prop && ev->state == PropertyNewValue) {
+ if(ev->atom == ur
i
prop && ev->state == PropertyNewValue) {
if(ignore_once)
ignore_once = FALSE;
else {
if(ignore_once)
ignore_once = FALSE;
else {
- XGetWindowProperty(dpy, ev->window, ur
l
prop, 0L, BUFSIZ, False, XA_STRING,
+ XGetWindowProperty(dpy, ev->window, ur
i
prop, 0L, BUFSIZ, False, XA_STRING,
&adummy, &idummy, &ldummy, &ldummy, &buf);
arg.v = buf;
loaduri(c, &arg);
&adummy, &idummy, &ldummy, &ldummy, &buf);
arg.v = buf;
loaduri(c, &arg);
@@
-641,7
+679,7
@@
setup(void) {
dpy = GDK_DISPLAY();
session = webkit_get_default_session();
dpy = GDK_DISPLAY();
session = webkit_get_default_session();
- ur
lprop = XInternAtom(dpy, "_SURF_URL
", False);
+ ur
iprop = XInternAtom(dpy, "_SURF_uri
", False);
/* create dirs and files */
cookiefile = buildpath(cookiefile);
/* create dirs and files */
cookiefile = buildpath(cookiefile);
@@
-657,7
+695,7
@@
setup(void) {
void
showsearch(Client *c, const Arg *arg) {
void
showsearch(Client *c, const Arg *arg) {
- hideur
l
(c, NULL);
+ hideur
i
(c, NULL);
gtk_widget_show(c->searchbar);
gtk_widget_grab_focus(c->searchbar);
}
gtk_widget_show(c->searchbar);
gtk_widget_grab_focus(c->searchbar);
}
@@
-682,14
+720,14
@@
searchtext(Client *c, const Arg *arg) {
}
void
}
void
-showur
l
(Client *c, const Arg *arg) {
+showur
i
(Client *c, const Arg *arg) {
gchar *uri;
hidesearch(c, NULL);
uri = geturi(c);
gchar *uri;
hidesearch(c, NULL);
uri = geturi(c);
- gtk_entry_set_text(GTK_ENTRY(c->ur
l
bar), uri);
- gtk_widget_show(c->ur
l
bar);
- gtk_widget_grab_focus(c->ur
l
bar);
+ gtk_entry_set_text(GTK_ENTRY(c->ur
i
bar), uri);
+ gtk_widget_show(c->ur
i
bar);
+ gtk_widget_grab_focus(c->ur
i
bar);
}
void
}
void
@@
-723,7
+761,7
@@
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
gboolean
focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
hidesearch(c, NULL);
gboolean
focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
hidesearch(c, NULL);
- hideur
l
(c, NULL);
+ hideur
i
(c, NULL);
return FALSE;
}
return FALSE;
}
@@
-737,10
+775,12
@@
void
update(Client *c) {
gchar *t;
update(Client *c) {
gchar *t;
- if(c->progress == 100)
- t = g_strdup(c->title);
- else
+ if(c->progress != 100)
t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+ else if(c->linkhover)
+ t = g_strdup(c->linkhover);
+ else
+ t = g_strdup(c->title);
drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);