bugfix release

.hgtags

@@ -1 +1,3 @@
 d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+9c8ebcf54061112b5979742b403de26fc94007ff 0.1

config.def.h

@@ -1,7 +1,6 @@
 /* modifier 0 means no modifier */
 static gchar *progress       = "#FF0000";
 static gchar *progress_trust = "#00FF00";
-static gchar *background     = "#000000";
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.1
+VERSION = 0.1.1
 
 # Customize below to fit your system
 

surf.c

@@ -67,6 +67,7 @@ Cookie *cookies = NULL;
 gboolean embed = FALSE;
 gboolean showxid = FALSE;
 gboolean ignore_once = FALSE;
+gchar *workdir;
 extern char *optarg;
 extern gint optind;
 
@@ -219,14 +220,13 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
-	const gchar *home, *filename;
+	const gchar *filename;
 	gchar *uri, *path, *html;
 
 	stop(c, NULL);
 	c->download = o;
-	home = g_get_home_dir();
 	filename = webkit_download_get_suggested_filename(o);
-	path = g_build_filename(home, ".surf", "dl", 
+	path = g_build_filename(workdir, "dl", 
 			filename, NULL);
 	uri = g_strconcat("file://", path, NULL);
 	webkit_download_set_destination_uri(c->download, uri);
@@ -373,6 +373,9 @@ navigate(Client *c, const Arg *arg) {
 Client *
 newclient(void) {
 	Client *c;
+	WebKitWebSettings *settings;
+	gchar *filename;
+
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
 	/* Window */
@@ -448,6 +451,12 @@ 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);
+	settings = webkit_web_view_get_settings(c->view);
+	g_object_set (G_OBJECT(settings), "user-agent", "surf", NULL);
+	filename = g_build_filename(workdir, "style.css", NULL);
+	filename = g_strdup_printf("file://%s", filename);
+	g_object_set (G_OBJECT(settings), "user-stylesheet-uri", filename, NULL);
+
 	c->download = NULL;
 	c->title = NULL;
 	c->next = clients;
@@ -545,10 +554,9 @@ reload(Client *c, const Arg *arg) {
 
 void
 rereadcookies(void) {
-	const gchar *filename, *home;
+	const gchar *filename;
 
-	home = g_get_home_dir();
-	filename = g_build_filename(home, ".surf", "cookies", NULL);
+	filename = g_build_filename(workdir, "cookies", NULL);
 }
 
 void
@@ -571,9 +579,31 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) {
 
 void
 setup(void) {
+	const gchar *home, *name;
+	SoupSession *s;
+	FILE *tmp;
+
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
 	urlprop = XInternAtom(dpy, "_SURF_URL", False);
+
+
+	/* create dirs and files */
+	home = g_get_home_dir();
+	workdir = g_build_filename(home, ".surf", NULL);
+	g_mkdir_with_parents(workdir, 0755);
+	name = g_build_filename(workdir, "dl", NULL);
+	g_mkdir(name, 0755);
+	name = g_build_filename(workdir, "style.css", NULL);
+	if((tmp = g_fopen(name, "a")));
+		fclose(tmp);
+
+
+	/* cookie persistance */
+	s = webkit_get_default_session();
+	name = g_build_filename(workdir, "cookies.jar", NULL);
+	cookiejar = soup_cookie_jar_text_new(name, FALSE);
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 }
 
 void
@@ -667,10 +697,8 @@ zoom(Client *c, const Arg *arg) {
 }
 
 int main(int argc, char *argv[]) {
-	SoupSession *s;
 	Client *c;
 	gint o;
-	const gchar *home, *filename;
 	Arg arg;
 
 	gtk_init(NULL, NULL);
@@ -706,16 +734,6 @@ int main(int argc, char *argv[]) {
 	if(!clients)
 		newclient();
 
-	/* make dirs */
-	home = g_get_home_dir();
-	filename = g_build_filename(home, ".surf", "dl", NULL);
-	g_mkdir_with_parents(filename, 0755);
-
-	/* cookie persistance */
-	s = webkit_get_default_session();
-	filename = g_build_filename(home, ".surf", "cookies.jar", NULL);
-	cookiejar = soup_cookie_jar_text_new(filename, FALSE);
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 
 	gtk_main();
 	cleanup();