This patch introduces ctrl-shift-h to open a dmenu with the recent
navigation history of the respective surf instance.
---
Heyho,
This is _not_ an alternative history patch. It emulates the list you get in
chrome when right-clicking the back navigation button. I missed this from surf
and finally implemented it. I don't know, if such a feature is wanted in
mainline or if it is better suited for the patches section on the website. Let
me know what you think.
The g_strconcat part probably can be simplified, ideas are welcome.
--Markus
config.def.h | 11 +++++++++++
surf.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 1eb9566..a275628 100644
--- a/config.def.h
+++ b/config.def.h
@@ -43,6 +43,16 @@ static Bool allowgeolocation = TRUE;
} \
}
+#define SELNAV { \
+ .v = (char *[]){ "/bin/sh", "-c", \
+ "prop=\"`xprop -id $0 _SURF_HIST" \
+ " | sed -e 's/^.[^\"]*\"//' -e 's/\"$//' -e 's/\\\\\\n/\\n/g'" \
+ " | dmenu -i -l 10`\"" \
+ " && xprop -id $0 -f _SURF_NAV 8s -set _SURF_NAV \"$prop\"", \
+ winid, NULL \
+ } \
+}
+
/* DOWNLOAD(URI, referer) */
#define DOWNLOAD(d, r) { \
.v = (char *[]){ "/bin/sh", "-c", \
@@ -97,6 +107,7 @@ static Key keys[] = {
{ MODKEY, GDK_l, navigate, { .i = +1 } },
{ MODKEY, GDK_h, navigate, { .i = -1 } },
+ { MODKEY|GDK_SHIFT_MASK,GDK_h, selhist, SELNAV },
{ MODKEY, GDK_j, scroll_v, { .i = +1 } },
{ MODKEY, GDK_k, scroll_v, { .i = -1 } },
diff --git a/surf.c b/surf.c
index 02656ec..5b44724 100644
--- a/surf.c
+++ b/surf.c
@@ -34,7 +34,7 @@ char *argv0;
#define COOKIEJAR_TYPE (cookiejar_get_type ())
#define COOKIEJAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
COOKIEJAR_TYPE, CookieJar))
-enum { AtomFind, AtomGo, AtomUri, AtomLast };
+enum { AtomFind, AtomGo, AtomUri, AtomHist, AtomNav, AtomLast };
enum {
ClkDoc = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
ClkLink = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
@@ -174,6 +174,8 @@ static void loadstatuschange(WebKitWebView *view,
GParamSpec *pspec,
Client *c);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
+static void selhist(Client *c, const Arg *arg);
+static void navhist(Client *c, const Arg *arg);
static Client *newclient(void);
static void newwindow(Client *c, const Arg *arg, gboolean noembed);
static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
@@ -785,6 +787,59 @@ navigate(Client *c, const Arg *arg) {
webkit_web_view_go_back_or_forward(c->view, steps);
}
+static void
+selhist(Client *c, const Arg *arg) {
+ WebKitWebBackForwardList *lst;
+ WebKitWebHistoryItem *cur;
+ gint i;
+ gchar *out;
+ gchar *tmp;
+ gchar *line;
+
+ out = g_strdup("");
+
+ if(!(lst = webkit_web_view_get_back_forward_list(c->view)))
+ return;
+
+ for(i = webkit_web_back_forward_list_get_back_length(lst); i > 0; i--) {
+ if(!(cur = webkit_web_back_forward_list_get_nth_item(lst, -i)))
+ break;
+ line = g_strdup_printf("%d: %s\n", -i,
+
webkit_web_history_item_get_original_uri(cur));
+ tmp = g_strconcat(out, line, NULL);
+ g_free(out);
+ out = tmp;
+ }
+
+ if((cur = webkit_web_back_forward_list_get_nth_item(lst, 0))) {
+ line = g_strdup_printf("%d: %s", 0,
+
webkit_web_history_item_get_original_uri(cur));
+ tmp = g_strconcat(out, line, NULL);
+ g_free(out);
+ out = tmp;
+ }
+
+ for(i = 1; i <= webkit_web_back_forward_list_get_forward_length(lst);
i++) {
+ if(!(cur = webkit_web_back_forward_list_get_nth_item(lst, i)))
+ break;
+ line = g_strdup_printf("\n%d: %s", i,
+
webkit_web_history_item_get_original_uri(cur));
+ tmp = g_strconcat(out, line, NULL);
+ g_free(out);
+ out = tmp;
+ }
+
+ setatom(c, AtomHist, out);
+ g_free(out);
+ spawn(c, arg);
+}
+
+static void
+navhist(Client *c, const Arg *arg) {
+ Arg a = { .i = atoi(arg->v) };
+ navigate(c, &a);
+}
+
static Client *
newclient(void) {
Client *c;
@@ -986,6 +1041,7 @@ newclient(void) {
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
+ setatom(c, AtomHist, "");
if(hidebackground)
webkit_web_view_set_transparent(c->view, TRUE);
@@ -1125,6 +1181,9 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
loaduri(c, &arg);
return GDK_FILTER_REMOVE;
+ } else if(ev->atom == atoms[AtomNav]) {
+ arg.v = getatom(c, AtomNav);
+ navhist(c, &arg);
}
}
}
@@ -1219,6 +1278,8 @@ setup(void) {
atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+ atoms[AtomHist] = XInternAtom(dpy, "_SURF_HIST", False);
+ atoms[AtomNav] = XInternAtom(dpy, "_SURF_NAV", False);
/* dirs and files */
cookiefile = buildpath(cookiefile);
--
2.4.9
