From 3dbf6289649b59c533987dc2c8add62a9e078007 Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Sat, 15 May 2010 15:47:47 +0200 Subject: changing sessiontime to 3600 --- config.def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h index 1110acc..932b88a 100644 --- a/config.def.h +++ b/config.def.h @@ -6,7 +6,7 @@ static char *stylefile = ".surf/style.css"; static char *scriptfile = ".surf/script.js"; static char *cookiefile = ".surf/cookies.txt"; static char *dldir = ".surf/dl/"; -static time_t sessiontime = 0; +static time_t sessiontime = 3600; #define NOBACKGROUND 0 #define SETPROP(p) { .v = (char *[]){ "/bin/sh", "-c", \ -- cgit v1.2.3 From 5878067225ac2f2a66522f3a1d4458c31390fad4 Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Tue, 18 May 2010 14:20:24 +0200 Subject: AtomHiLight is set correctly for links. --- surf.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/surf.c b/surf.c index 1a1aae4..5e6d777 100644 --- a/surf.c +++ b/surf.c @@ -85,6 +85,7 @@ 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); static void loaduri(Client *c, const Arg *arg); +static void mousemove(GtkWidget *w, GdkEventMotion *e, Client *c); static void navigate(Client *c, const Arg *arg); static Client *newclient(void); static void newwindow(Client *c, const Arg *arg); @@ -395,6 +396,21 @@ loaduri(Client *c, const Arg *arg) { } } +void +mousemove(GtkWidget *w, GdkEventMotion *e, Client *c) { + int result; + GdkEventButton coord; + WebKitHitTestResult *hit; + + coord.x = e->x; + coord.y = e->y; + hit = webkit_web_view_get_hit_test_result(c->view, &coord); + g_object_get(hit, "context", &result, NULL); + if(result & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE && !c->linkhover) { + puts("Picture"); + } +} + void navigate(Client *c, const Arg *arg) { int steps = *(int *)arg; @@ -454,6 +470,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), "motion-notify-event", G_CALLBACK(mousemove), c); /* Indicator */ c->indicator = gtk_drawing_area_new(); @@ -495,6 +512,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); @@ -744,12 +762,14 @@ void update(Client *c) { char *t; - if(c->progress != 100) + if(c->progress != 100) { t = g_strdup_printf("[%i%%] %s", c->progress, c->title); + } else if(c->linkhover) 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); -- cgit v1.2.3 From 7fcf7450925295022a94611f5d9d07694e93ec9e Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Mon, 24 May 2010 21:23:28 +0200 Subject: enabling spatial-navigation --- surf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/surf.c b/surf.c index 5e6d777..9821ce1 100644 --- a/surf.c +++ b/surf.c @@ -508,6 +508,7 @@ newclient(void) { g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL); g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL); g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL); + g_object_set(G_OBJECT(settings), "enable-spatial-navigation", true, NULL); g_free(uri); setatom(c, AtomFind, ""); -- cgit v1.2.3 From aadcd5b3f0afadfffecfa19f56512c33e136b7ab Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Mon, 24 May 2010 21:23:39 +0200 Subject: implementing downloading. --- config.def.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h index 6d2c6cb..e1d4d86 100644 --- a/config.def.h +++ b/config.def.h @@ -8,13 +8,21 @@ static char *cookiefile = ".surf/cookies.txt"; static time_t sessiontime = 3600; #define NOBACKGROUND 0 -#define SETPROP(p, q) { .v = (char *[]){ "/bin/sh", "-c", \ +#define SETPROP(p, q) { \ + .v = (char *[]){ "sh", "-c", \ "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 | tr -d '\\''`\";" \ + "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 } }, -- cgit v1.2.3 From 532205d7e7ec7d0d245efa70c265ccc6557869ae Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Mon, 24 May 2010 21:35:20 +0200 Subject: removing spatial navigation. --- surf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/surf.c b/surf.c index 9821ce1..5e6d777 100644 --- a/surf.c +++ b/surf.c @@ -508,7 +508,6 @@ newclient(void) { g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL); g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL); g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL); - g_object_set(G_OBJECT(settings), "enable-spatial-navigation", true, NULL); g_free(uri); setatom(c, AtomFind, ""); -- cgit v1.2.3