next will be 0.1.2

.hgtags

@@ -1,3 +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.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.1.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,7 +64,7 @@ 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;
@@ -380,7 +380,7 @@ newclient(void) {
 		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);
@@ -601,7 +601,7 @@ setup(void) {
 
 	/* cookie persistance */
 	s = webkit_get_default_session();
-	name = g_build_filename(workdir, "cookies.jar", NULL);
+	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));
 }
@@ -663,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
@@ -698,21 +698,21 @@ zoom(Client *c, const Arg *arg) {
 
 int main(int argc, char *argv[]) {
 	Client *c;
-	gint o;
+	gint o, a;
 	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");
@@ -731,6 +731,7 @@ int main(int argc, char *argv[]) {
 	}
 	else if(optind != argc)
 		usage();
+	setup();
 	if(!clients)
 		newclient();