From: Enno Boland (Gottox) <gottox@s01.de>
Date: Mon, 8 Jun 2009 07:27:40 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=2d9716907da6c5ae1c494958b25b2b7969adf28a;hp=-c;p=surf.git

merge
---

2d9716907da6c5ae1c494958b25b2b7969adf28a
diff --combined surf.c
index f820249,74a2d55..3e912d5
--- a/surf.c
+++ b/surf.c
@@@ -14,20 -14,19 +14,21 @@@
  #include <stdlib.h>
  #include <stdio.h>
  #include <webkit/webkit.h>
 +#include <glib/gstdio.h>
  
  #define LENGTH(x) (sizeof x / sizeof x[0])
  
  Display *dpy;
  Atom urlprop;
  typedef struct Client {
 -	GtkWidget *win, *scroll, *vbox, *urlbar, *urllist, *searchbar;
 +	GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
  	WebKitWebView *view;
 +	WebKitDownload * dl;
  	gchar *title;
  	gint progress;
  	struct Client *next;
  } Client;
+ SoupCookieJar *cookiejar;
  Client *clients = NULL;
  gboolean embed = FALSE;
  gboolean showxid = FALSE;
@@@ -82,6 -81,7 +83,6 @@@ destroyclient(Client *c) 
  	gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
  	gtk_widget_destroy(c->scroll);
  	gtk_widget_destroy(c->urlbar);
 -	gtk_widget_destroy(c->urllist);
  	gtk_widget_destroy(c->searchbar);
  	gtk_widget_destroy(c->vbox);
  	gtk_widget_destroy(c->win);
@@@ -114,9 -114,8 +115,9 @@@ download(WebKitWebView *view, WebKitDow
  	gchar *uri, *filename;
  
  	home = g_get_home_dir();
 -	filename = g_build_filename(home, "Desktop",
 +	filename = g_build_filename(home, ".surf", "dl", 
  			webkit_download_get_suggested_filename(o), NULL);
 +	g_mkdir(g_path_get_dirname(filename), 0755);
  	uri = g_strconcat("file://", filename, NULL);
  	webkit_download_set_destination_uri(o, uri);
  	g_free(filename);
@@@ -185,7 -184,7 +186,7 @@@ keypress(GtkWidget* w, GdkEventKey *ev
  			return FALSE;
  		}
  	}
- 	if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
+         else if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
  		switch(ev->keyval) {
  		case GDK_r:
  		case GDK_R:
@@@ -210,6 -209,16 +211,16 @@@
  			return TRUE;
  		}
  	}
+         else {
+                 switch(ev->keyval) {
+                 case GDK_k:
+                         webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, -1);
+                         return TRUE;
+                 case GDK_j:
+                         webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, 1);
+                         return TRUE;
+                 }
+         }
  	return FALSE;
  }
  
@@@ -246,13 -255,11 +257,13 @@@ loadfile(const Client *c, const gchar *
  	if(strcmp(f, "-") == 0) {
  		chan = g_io_channel_unix_new(STDIN_FILENO);
  		if (chan) {
 -			while(g_io_channel_read_line(chan, &line, NULL, NULL, &e) == G_IO_STATUS_NORMAL) {
 +			while(g_io_channel_read_line(chan, &line, NULL, NULL,
 +						&e) == G_IO_STATUS_NORMAL) {
  				g_string_append(code, line);
  				g_free(line);
  			}
 -			webkit_web_view_load_html_string(c->view, code->str, NULL);
 +			webkit_web_view_load_html_string(c->view, code->str,
 +					"file://.");
  			g_io_channel_shutdown(chan, FALSE, NULL);
  		}
  	}
@@@ -260,7 -267,7 +271,7 @@@
  		g_string_prepend(uri, "file://");
  		loaduri(c, uri->str);
  	}
- 	
+ 
  }
  
  void
@@@ -344,6 -351,7 +355,6 @@@ newclient(void) 
  
  WebKitWebView *
  newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d) {
 -	/* TODO */
  	Client *c = newclient();
  	return c->view;
  }
@@@ -367,7 -375,7 +378,7 @@@ processx(GdkXEvent *e, GdkEvent *event
  	if(((XEvent *)e)->type == PropertyNotify) {
  		ev = &((XEvent *)e)->xproperty;
  		if(ignore_once == FALSE && ev->atom == urlprop && ev->state == PropertyNewValue) {
- 			XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING, 
+ 			XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
  				&adummy, &idummy, &ldummy, &ldummy, &buf);
  			loaduri(c, (gchar *)buf);
  			XFree(buf);
@@@ -422,8 -430,10 +433,10 @@@ updatetitle(Client *c) 
  
  int main(int argc, char *argv[]) {
  	gchar *uri = NULL, *file = NULL;
+         SoupSession *s;
  	Client *c;
  	int o;
+         const gchar *home, *filename;
  
  	gtk_init(NULL, NULL);
  	if (!g_thread_supported())
@@@ -465,6 -475,14 +478,14 @@@
  		goto argerr;
  	if(!clients)
  		newclient();
+ 
+         /* cookie persistance */
+         s = webkit_get_default_session();
+         home = g_get_home_dir();
+         filename = g_build_filename(home, ".surf-cookies", NULL);
+         cookiejar = soup_cookie_jar_text_new(filename, FALSE);
+         soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+ 
  	gtk_main();
  	cleanup();
  	return EXIT_SUCCESS;