diff options
| -rw-r--r-- | config.def.h | 6 | ||||
| -rw-r--r-- | surf.c | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/config.def.h b/config.def.h index aebf0eb..28e1474 100644 --- a/config.def.h +++ b/config.def.h @@ -12,9 +12,15 @@ static time_t sessiontime = 0; "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \ "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \ p, q, winid, NULL } } +#define DOWNLOAD(p) { \ + .v = (char *[]){ "/bin/sh", "-c", \ + "prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2`\";" \ + "xterm -e \"wget --load-cookies ~/.surf/cookies.txt $prop;\"", \ + p, winid, NULL } } #define MODKEY GDK_CONTROL_MASK static Key keys[] = { /* modifier keyval function arg Focus */ + { MODKEY, GDK_s, spawn, DOWNLOAD("_SURF_HILIGHT") }, { MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE } }, { MODKEY, GDK_r, reload, { .b = FALSE } }, { MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 } }, diff --git a/surf.c b/surf.c index 1a1aae4..360e0dc 100644 --- a/surf.c +++ b/surf.c @@ -81,6 +81,7 @@ static const char *getatom(Client *c, int a); static const char *getcookies(SoupURI *uri); static char *geturi(Client *c); void gotheaders(SoupMessage *msg, gpointer user_data); +static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c); static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c); static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c); @@ -329,6 +330,16 @@ gotheaders(SoupMessage *msg, gpointer v) { } gboolean +initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { + Arg arg; + + updatewinid(c); + cmd = (Arg)DOWNLOAD("_SURF_HILIGHT"); + spawn(c, &cmg); + return FALSE; +} + +gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { guint i; gboolean processed = FALSE; @@ -454,6 +465,7 @@ newclient(void) { g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c); g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c); + g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c); /* Indicator */ c->indicator = gtk_drawing_area_new(); @@ -495,6 +507,7 @@ newclient(void) { setatom(c, AtomFind, ""); setatom(c, AtomUri, "about:blank"); + setatom(c, AtomHiLight, "about:blank"); if(NOBACKGROUND) webkit_web_view_set_transparent(c->view, TRUE); @@ -750,6 +763,7 @@ update(Client *c) { t = g_strdup(c->linkhover); else t = g_strdup(c->title); + setatom(c, AtomHiLight, c->linkhover ? c->linkhover : geturi(c)); drawindicator(c); gtk_window_set_title(GTK_WINDOW(c->win), t); g_free(t); |