[hackers] [surf] Adding Nibbles patch || Enno Boland (tox)

changeset: 216:ac8e058003ed
tag: tip
user: Enno Boland (tox) <tox_AT_s01.de>
date: Fri May 28 13:20:17 2010 +0200
files: config.def.h surf.c
description:
Adding Nibbles patch

diff -r 0d80b4349484 -r ac8e058003ed config.def.h
--- a/config.def.h Wed May 26 15:34:09 2010 +0200
+++ b/config.def.h Fri May 28 13:20:17 2010 +0200
@@ -12,15 +12,13 @@
         "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) { \
+#define DOWNLOAD(d) { \
         .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 } }
+ "xterm -e \"wget --load-cookies ~/.surf/cookies.txt '$0';\"", \
+ d, 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 -r 0d80b4349484 -r ac8e058003ed surf.c
--- a/surf.c Wed May 26 15:34:09 2010 +0200
+++ b/surf.c Fri May 28 13:20:17 2010 +0200
@@ -23,7 +23,7 @@
 #define LENGTH(x) (sizeof x / sizeof x[0])
 #define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK))
 
-enum { AtomFind, AtomGo, AtomUri, AtomHiLight, AtomLast };
+enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
 typedef union Arg Arg;
 union Arg {
@@ -188,10 +188,7 @@
 gboolean
 decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c) {
         if(!webkit_web_view_can_show_mime_type(v, m)) {
- webkit_web_policy_decision_ignore(p);
- webkit_web_view_load_html_string(c->view,
- "Can't display content.",
- webkit_network_request_get_uri(r));
+ webkit_web_policy_decision_download(p);
                 return TRUE;
         }
         return FALSE;
@@ -334,7 +331,7 @@
         Arg arg;
 
         updatewinid(c);
- arg = (Arg)DOWNLOAD("_SURF_HILIGHT");
+ arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
         spawn(c, &arg);
         return FALSE;
 }
@@ -503,11 +500,12 @@
         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, "");
         setatom(c, AtomUri, "about:blank");
- setatom(c, AtomHiLight, "about:blank");
         if(NOBACKGROUND)
                 webkit_web_view_set_transparent(c->view, TRUE);
 
@@ -688,7 +686,6 @@
         atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
         atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
         atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
- atoms[AtomHiLight] = XInternAtom(dpy, "_SURF_HILIGHT", False);
 
         /* dirs and files */
         cookiefile = buildpath(cookiefile);
@@ -763,7 +760,6 @@
                 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);
Received on Fri May 28 2010 - 11:19:42 UTC