reformating

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 0d05732..6c386fa 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -62,8 +62,6 @@ typedef struct {
 
 static Display *dpy;
 static Atom uriprop;
-static SoupCookieJar *cookiejar;
-static SoupSession *session;
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
@@ -103,10 +101,11 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
 static void progresschange(WebKitWebView *v, gint p, Client *c);
 static void reload(Client *c, const Arg *arg);
+static void request(SoupSession *s, SoupMessage *m, gpointer p);
 static void sigchld(int unused);
+static void setcookie(SoupMessage *m, gpointer p);
 static void setup(void);
 static void spawn(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 static void scroll(Client *c, const Arg *arg);
 static void searchtext(Client *c, const Arg *arg);
 static void source(Client *c, const Arg *arg);
@@ -167,11 +166,15 @@ cleanup(void) {
 void
 clipboard(Client *c, const Arg *arg) {
        gboolean paste = *(gboolean *)arg;
+       const char *uri;
 
        if(paste)
                gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c);
-       else
-               gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
+       else {
+               if(!(uri = autouri(c)))
+                       uri = geturi(c);
+               gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), uri, -1);
+       }
 }
 
 void
@@ -186,8 +189,6 @@ context(WebKitWebView *v, GtkMenu *m, Client *c) {
                if(parent)
                        gtk_container_remove(parent, c->items[i]);
                gtk_menu_shell_append(GTK_MENU_SHELL(m), c->items[i]);
-               g_signal_connect(G_OBJECT(c->items[i]), "activate",
-                               G_CALLBACK(itemclick), c);
                gtk_widget_show(c->items[i]);
        }
 }
@@ -452,9 +453,11 @@ newclient(void) {
                die("Cannot malloc!\n");
 
        /* contextmenu */
-       for(i = 0; i < LENGTH(items); i++)
+       for(i = 0; i < LENGTH(items); i++) {
                c->items[i] = gtk_menu_item_new_with_label(items[i].label);
-
+               g_signal_connect(G_OBJECT(c->items[i]), "activate",
+                               G_CALLBACK(itemclick), c);
+       }
 
        /* VBox */
        c->vbox = gtk_vbox_new(FALSE, 0);
@@ -566,7 +569,7 @@ createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
 
 void
 pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
-       Arg arg = {.v = text };
+       Arg arg = { .v = text };
        if(text != NULL)
                loaduri((Client *) d, &arg);
 }
@@ -632,6 +635,42 @@ scroll(Client *c, const Arg *arg) {
        gtk_adjustment_set_value(a, v);
 }
 
+void
+request(SoupSession *s, SoupMessage *m, gpointer p) {
+       SoupCookieJar *cookies;
+       SoupMessageHeaders *h;
+       char *cookiestr;
+
+       soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
+                       G_CALLBACK(setcookie), NULL);
+       h = m->request_headers;
+       cookies = soup_cookie_jar_text_new(cookiefile, TRUE);
+       cookiestr = soup_cookie_jar_get_cookies(cookies, soup_message_get_uri(m), FALSE);
+       if(cookiestr)
+               soup_message_headers_append(h, "Cookie", cookiestr);
+       g_object_unref(cookies);
+}
+
+void
+setcookie(SoupMessage *m, gpointer p) {
+       SoupCookieJar *cookies;
+       SoupCookie *c;
+       SoupDate *e;
+       GSList *l;
+
+       cookies = soup_cookie_jar_text_new(cookiefile, FALSE);
+       for (l = soup_cookies_from_response(m); l; l = l->next){
+               c = (SoupCookie *)l->data;
+               if(c && c->expires == NULL) {
+                       e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+                       c = soup_cookie_copy(c);
+                       soup_cookie_set_expires(c, e);
+               }
+               soup_cookie_jar_add_cookie(cookies, c);
+       }
+       g_slist_free(l);
+       g_object_unref(cookies);
+}
 void
 sigchld(int unused) {
        if(signal(SIGCHLD, sigchld) == SIG_ERR)
@@ -650,8 +689,7 @@ setup(void) {
                g_thread_init(NULL);
 
        dpy = GDK_DISPLAY();
-       session = webkit_get_default_session();
-       uriprop = XInternAtom(dpy, "_SURF_uri", False);
+       uriprop = XInternAtom(dpy, "_SURF_URI", False);
 
        /* create dirs and files */
        cookiefile = buildpath(cookiefile);
@@ -661,8 +699,7 @@ setup(void) {
 
        /* cookie persistance */
        s = webkit_get_default_session();
-       cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
-       soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+       g_signal_connect_after(s, "request-queued", G_CALLBACK(request), NULL);
 }
 
 void
@@ -718,7 +755,7 @@ spawn(Client *c, const Arg *arg) {
                        close(ConnectionNumber(dpy));
                setsid();
                execvp(((char **)arg->v)[0], (char **)arg->v);
-               fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+               fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
                perror(" failed");
                exit(0);
        }