X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=cd01b8336784ddcfbd78177b7851723d8d975831;hb=92afa03d80ba077f7a5b1dc1bd44d82ab1d35b8f;hp=8b57a856995373e85ae926e40986caf16cbf240f;hpb=9a3c48389301917fb3e71c21fe87a074a0c2a164;p=surf.git

diff --git a/surf.c b/surf.c
index 8b57a85..cd01b83 100644
--- a/surf.c
+++ b/surf.c
@@ -62,7 +62,7 @@ typedef struct {
 
 static Display *dpy;
 static Atom uriprop;
-static SoupCookieJar *cookiejar;
+static SoupCookieJar *cookies;
 static SoupSession *session;
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
@@ -70,6 +70,7 @@ static gboolean showxid = FALSE;
 static gboolean ignore_once = FALSE;
 static char winid[64];
 static char *progname;
+static gboolean lockcookie = FALSE;
 
 static const char *autouri(Client *c);
 static char *buildpath(const char *path);
@@ -93,7 +94,6 @@ static void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
@@ -104,8 +104,9 @@ static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 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 reloadcookies();
 static void reload(Client *c, const Arg *arg);
-static void reloadcookie();
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void sigchld(int unused);
 static void setup(void);
 static void spawn(Client *c, const Arg *arg);
@@ -157,15 +158,24 @@ buildpath(const char *path) {
 }
 
 void
-changecookie(SoupCookieJar *jar, SoupCookie *oc, SoupCookie *c, gpointer p) {
+changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) {
 	SoupDate *e;
+	SoupCookieJar *jar;
 
+	if(lockcookie)
+		return;
 	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(cookiejar, c);
 	}
+	
+	jar = soup_cookie_jar_text_new(cookiefile, FALSE);
+	if(c)
+		soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c));
+	else
+		soup_cookie_jar_delete_cookie(jar, oc);
+	g_object_unref(jar);
 }
 
 void
@@ -407,16 +417,12 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), uriprop,
 			XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
 			strlen(uri) + 1);
-}
 
-void
-loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
+	reloadcookies();
 }
 
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
 	c->progress = 0;
 	update(c);
 }
@@ -465,6 +471,7 @@ newclient(void) {
 	gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
 	g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
 	g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+	g_signal_connect(G_OBJECT(c->win), "size-allocate", G_CALLBACK(resize), c);
 
 	if(!(c->items = calloc(1, sizeof(GtkWidget *) * LENGTH(items))))
 		die("Cannot malloc!\n");
@@ -476,7 +483,6 @@ newclient(void) {
 				G_CALLBACK(itemclick), c);
 	}
 
-
 	/* VBox */
 	c->vbox = gtk_vbox_new(FALSE, 0);
 
@@ -489,7 +495,6 @@ newclient(void) {
 	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 	g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
 	g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
-	g_signal_connect(G_OBJECT(c->view), "load-finished", G_CALLBACK(loadfinished), c);
 	g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
 	g_signal_connect(G_OBJECT(c->view), "load-started", G_CALLBACK(loadstart), c);
 	g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
@@ -642,14 +647,21 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-reloadcookie(void) {
-	SoupSession *s;
+reloadcookies() {
+	SoupCookieJar *jar;
+	GSList *l, *e;
 
-	/* This forces the cookie to be written to hdd */
-	s = webkit_get_default_session();
-	soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-} 
+	lockcookie = TRUE;
+	for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next)
+		soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data);
+	soup_cookies_free(l);
+	jar = soup_cookie_jar_text_new(cookiefile, TRUE);
+	for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next)
+		soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data);
+	g_slist_free(l);
+	lockcookie = FALSE;
+	g_object_unref(jar);
+}
 
 void
 scroll(Client *c, const Arg *arg) {
@@ -664,6 +676,19 @@ scroll(Client *c, const Arg *arg) {
 	gtk_adjustment_set_value(a, v);
 }
 
+void
+resize(GtkWidget *w, GtkAllocation *a, Client *c) {
+	double zoom;
+
+	zoom = webkit_web_view_get_zoom_level(c->view);
+	if(a->width * a->height < 300 * 300 && zoom != 0.2)
+		webkit_web_view_set_zoom_level(c->view, 0.2);
+	else if(zoom != 1.0)
+		webkit_web_view_set_zoom_level(c->view, 1.0);
+}
+
+
+
 void
 sigchld(int unused) {
 	if(signal(SIGCHLD, sigchld) == SIG_ERR)
@@ -693,9 +718,10 @@ 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(cookiejar, "changed", G_CALLBACK(changecookie), NULL);
+	cookies = soup_cookie_jar_new();
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
+	g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
+	reloadcookies();
 }
 
 void
@@ -751,7 +777,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);
 	}