Add a referer argument to the DOWNLOAD macro. Some sites need this. Thanks

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index dcd0ad0..3e2e2b0 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -79,8 +79,7 @@ static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
 static char winid[64];
 static gboolean loadimage = 1, plugin = 1, script = 1, using_proxy = 0;
-static char togglestat[6];
-static gboolean insertmode = FALSE;
+static char togglestat[5];
 
 static char *buildpath(const char *path);
 static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl);
@@ -103,7 +102,6 @@ static void find(Client *c, const Arg *arg);
 static const char *getatom(Client *c, int a);
 static char *geturi(Client *c);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-static void insert(Client *c, const Arg *arg);
 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);
@@ -432,52 +430,23 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        Arg arg;
 
        updatewinid(c);
-       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
+       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
        spawn(c, &arg);
        return FALSE;
 }
 
-void
-insert(Client *c, const Arg *arg) {
-       insertmode = TRUE;
-       update(clients);
-}
-
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-       guint i, state;
+       guint i;
        gboolean processed = FALSE;
 
-       /* turn off insert mode */
-       if(insertmode && (ev->keyval == GDK_Escape)) {
-               insertmode = FALSE;
-               update(c);
-               return TRUE;
-       }
-
-       if(insertmode && (((ev->state & MODKEY) != MODKEY) || !MODKEY)) {
-               return FALSE;
-       }
-
-       if(ev->keyval == GDK_Escape) {
-               webkit_web_view_set_highlight_text_matches(c->view, FALSE);
-               return TRUE;
-       }
-
        updatewinid(c);
        for(i = 0; i < LENGTH(keys); i++) {
-               if(!insertmode && (MODKEY & keys[i].mod)) {
-                       state = ev->state | MODKEY;
-               } else {
-                       state = ev->state;
-               }
-
                if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+                               && (ev->state & keys[i].mod) == keys[i].mod
                                && keys[i].func) {
-                       if(state == keys[i].mod) {
-                               keys[i].func(c, &(keys[i].arg));
-                               processed = TRUE;
-                       }
+                       keys[i].func(c, &(keys[i].arg));
+                       processed = TRUE;
                }
        }
 
@@ -563,12 +532,13 @@ newclient(void) {
 
        if(!(c = calloc(1, sizeof(Client))))
                die("Cannot malloc!\n");
+
        /* Window */
        if(embed) {
                c->win = gtk_plug_new(embed);
-       }
-       else {
+       } else {
                c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
                /* TA:  20091214:  Despite what the GNOME docs say, the ICCCM
                 * is always correct, so we should still call this function.
                 * But when doing so, we *must* differentiate between a
@@ -633,6 +603,7 @@ newclient(void) {
        gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
        gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
        webkit_web_view_set_full_content_zoom(c->view, TRUE);
+
        frame = webkit_web_view_get_main_frame(c->view);
        runscript(frame);
        settings = webkit_web_view_get_settings(c->view);
@@ -644,13 +615,13 @@ 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", SPATIAL_BROWSING, NULL);
+       g_object_set(G_OBJECT(settings), "enable-spatial-navigation", spatialbrowsing, NULL);
 
        g_free(uri);
 
        setatom(c, AtomFind, "");
        setatom(c, AtomUri, "about:blank");
-       if(HIDE_BACKGROUND)
+       if(hidebackground)
                webkit_web_view_set_transparent(c->view, TRUE);
 
        c->title = NULL;
@@ -953,9 +924,6 @@ gettogglestat(Client *c){
        g_object_get(G_OBJECT(settings), "enable-caret-browsing",
                        &value, NULL);
        togglestat[3] = value?'C':'c';
-
-       togglestat[4] = insertmode? '+' : '-';
-       togglestat[5] = '\0';
 }