Adding Nibbles patch - surf - Surf web browser.
       
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit ca1c7f434bbf40a0ed65591910d81f13445c2db0
 (DIR) parent 8cc71f8216d0ca28a2c22306e7efc9e7ec587383
 (HTM) Author: Enno Boland (tox) <tox@s01.de>
       Date:   Fri, 28 May 2010 13:20:17 +0200
       
       Adding Nibbles patch
       Diffstat:
         config.def.h                        |       8 +++-----
         surf.c                              |      14 +++++---------
       
       2 files changed, 8 insertions(+), 14 deletions(-)
       ---
 (DIR) diff --git a/config.def.h b/config.def.h
       @@ -12,15 +12,13 @@ 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)       { \
       +#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 } },
 (DIR) diff --git a/surf.c b/surf.c
       @@ -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 };
        
        ttypedef union Arg Arg;
        union Arg {
       @@ -188,10 +188,7 @@ createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
        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 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
                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 @@ 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, "");
                setatom(c, AtomUri, "about:blank");
       -        setatom(c, AtomHiLight, "about:blank");
                if(NOBACKGROUND)
                        webkit_web_view_set_transparent(c->view, TRUE);
        
       @@ -688,7 +686,6 @@ setup(void) {
                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 @@ 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);