next will be 0.1.2

.hgtags

@@ -1 +1,4 @@
 d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+9c8ebcf54061112b5979742b403de26fc94007ff 0.1
+3ef997607115303fe93873b592d152f0ec186f77 0.1.1

Makefile

@@ -35,7 +35,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p surf-${VERSION}
-	@cp -R LICENSE Makefile config.mk \
+	@cp -R LICENSE Makefile config.mk config.def.h README \
 		surf.1 ${SRC} surf-${VERSION}
 	@tar -cf surf-${VERSION}.tar surf-${VERSION}
 	@gzip surf-${VERSION}.tar

README

@@ -0,0 +1,25 @@
+surf - simple webkit-based browser
+==================================
+surf is a simple Web browser based on WebKit/GTK+.
+
+
+Requirements
+------------
+In order to build surf you need GTK+ and Webkit/GTK+ header files.
+
+
+Installation
+------------
+Edit config.mk to match your local setup (surf is installed into
+the /usr/local namespace by default).
+
+Afterwards enter the following command to build and install surf (if
+necessary as root):
+
+    make clean install
+
+
+Running surf
+------------
+run
+	surf [URL]

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.2
 
 # Customize below to fit your system
 

surf.c

@@ -16,7 +16,7 @@
 #include <webkit/webkit.h>
 #include <glib/gstdio.h>
 
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
 #define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
 Display *dpy;
@@ -64,9 +64,10 @@ SoupCookieJar *cookiejar;
 SoupSession *session;
 Client *clients = NULL;
 Cookie *cookies = NULL;
-gboolean embed = FALSE;
+GdkNativeWindow embed = 0;
 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,11 +373,14 @@ 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 */
 	if(embed) {
-		c->win = gtk_plug_new(0);
+		c->win = gtk_plug_new(embed);
 	}
 	else {
 		c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -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(workdir, "cookies", NULL);
-	filename = g_build_filename(home, ".surf", "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.txt", NULL);
+	cookiejar = soup_cookie_jar_text_new(name, FALSE);
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 }
 
 void
@@ -633,13 +663,13 @@ gboolean
 unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
 	hidesearch(c, NULL);
 	hideurl(c, NULL);
-	return TRUE;
+	return FALSE;
 }
 
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e] [-x] [uri]\n");
+	die("usage: surf [-e Window] [-x] [uri]\n");
 }
 
 void
@@ -667,24 +697,22 @@ zoom(Client *c, const Arg *arg) {
 }
 
 int main(int argc, char *argv[]) {
-	SoupSession *s;
 	Client *c;
-	gint o;
+	gint o, a;
-	const gchar *home, *filename;
 	Arg arg;
 
 	gtk_init(NULL, NULL);
 	if (!g_thread_supported())
 		g_thread_init(NULL);
-	setup();
+	while((o = getopt(argc, argv, "vhxe:")) != -1)
-	while((o = getopt(argc, argv, "vhxeu:f:")) != -1)
 		switch(o) {
 		case 'x':
 			showxid = TRUE;
 			break;
 		case 'e':
-			showxid = TRUE;
+			if(!(a = atoi(optarg)))
-			embed = TRUE;
+				usage();
+			embed = a;
 			break;
 		case 'v':
 			die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
@@ -703,19 +731,10 @@ int main(int argc, char *argv[]) {
 	}
 	else if(optind != argc)
 		usage();
+	setup();
 	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();