Adding Nibbles patch

Add NOBACKGROUND config.def.h option
 - requires body {background-color} in style.css
 - fixes white background when loading pages

.hgtags

@@ -1 +1,7 @@
 d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
+9c8ebcf54061112b5979742b403de26fc94007ff 0.1
+3ef997607115303fe93873b592d152f0ec186f77 0.1.1
+bffb0c3c23410ac7f260d167f4b9771497fc1127 0.1.2
+a5db79d487c85615be2ecf30815c6b4977e88000 0.2
+46d516fd216731adf91740496e6823c1be4f6199 0.3

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,33 +1,40 @@
 /* modifier 0 means no modifier */
-static gchar *progress       = "#FF0000";
+static char *useragent      = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
-static gchar *progress_trust = "#00FF00";
+static char *progress       = "#FF0000";
-static gchar *background     = "#000000";
+static char *progress_trust = "#00FF00";
+static char *stylefile      = ".surf/style.css";
+static char *scriptfile     = ".surf/script.js";
+static char *cookiefile     = ".surf/cookies.txt";
+static time_t sessiontime   = 0;
+#define NOBACKGROUND 0
+
+#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
+	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+	p, q, winid, NULL } }
+#define DOWNLOAD(d) { \
+	.v = (char *[]){ "/bin/sh", "-c", \
+	"xterm -e \"wget --load-cookies ~/.surf/cookies.txt '$0';\"", \
+	d, NULL } }
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE },  ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE }, ALWAYS },
+    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY,               GDK_g,      showurl,    { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
-    { MODKEY,               GDK_slash,  showsearch, { 0 },          ALWAYS },
+    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { 0,                    GDK_Escape, hidesearch, { 0 },          ALWAYS },
+    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
-    { 0,                    GDK_Escape, hideurl,    { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, BROWSER },
+    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  },    BROWSER },
+    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 },    BROWSER },
+    { 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-    { 0,                    GDK_Escape, stop,       { 0 },          BROWSER },
+    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY,               GDK_o,      source,     { 0 },          BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
-    { MODKEY,               GDK_n,      searchtext, { .b = TRUE },  BROWSER|SEARCHBAR },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      searchtext, { .b = FALSE }, BROWSER|SEARCHBAR },
-    { 0,                    GDK_Return, searchtext, { .b = TRUE },  SEARCHBAR },
-    { GDK_SHIFT_MASK,       GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR },
-    { 0,                    GDK_Return, loaduri,    { .v = NULL },  URLBAR },
-    { 0,                    GDK_Return, hideurl,    { 0 },          URLBAR },
 };
-

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.1
+VERSION = 0.4
 
 # Customize below to fit your system
 
@@ -17,10 +17,8 @@ LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Werror -O0 ${INCS} ${CPPFLAGS}
+LDFLAGS = -g ${LIBS}
-#LDFLAGS = -s ${LIBS}
-LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

surf.1

@@ -3,7 +3,12 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
-.RB [ \-ehvx ]
+.RB [-e\ xid]
+.RB [-i]
+.RB [-p]
+.RB [-s]
+.RB [-v]
+.RB [-x]
 .RB "URI"
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
@@ -12,12 +17,17 @@ which makes it possible to embed it in another application. Furthermore,
 one can point surf to another URI by setting its XProperties.
 .SH OPTIONS
 .TP
-.B \-e
+.B \-e xid
-Prints xid to standard output and waits until an application reparents the
+Reparents to window specified by xid.
-window.
 .TP
-.B \-h
+.B \-i
-Prints usage information to standard output, then exits.
+Disable Images
+.TP
+.B \-p
+Disable Plugins
+.TP
+.B \-s
+Disable Javascript
 .TP
 .B \-v
 Prints version information to standard output, then exits.
@@ -26,6 +36,8 @@ Prints version information to standard output, then exits.
 Prints xid to standard output. This can be used to script the browser by using
 .BR xprop(1).
 .SH USAGE
+.B Escape
+Stops loading current page or stops download.
 .TP
 .B Ctrl\-h
 Walks back the history.
@@ -33,15 +45,39 @@ Walks back the history.
 .B Ctrl\-l
 Walks forward the history.
 .TP
+.B Ctrl\-k
+Scrolls page upwards.
+.TP
+.B Ctrl\-j
+Scrolls page downwards.
+.TP
+.B Ctrl\-Shift\-k
+Zooms page in.
+.TP
+.B Ctrl\-Shift\-j
+Zooms page out
+.TP
+.B Ctrl\-Shift\-i
+Resets Zoom
+.TP
 .B Ctrl\-/
 Opens the search-bar.
 .TP
+.B Ctrl\-n
+Go to next search result.
+.TP
+.B Ctrl\-Shift\-n
+Go to previous search result.
+.TP
 .B Ctrl\-g
 Opens the URL-bar.
 .TP
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP
+.B Ctrl\-Shift\-p
+Calls Printpage Dialog.
+.TP
 .B Ctrl\-r
 Reloads the website.
 .TP
@@ -50,6 +86,9 @@ Reloads the website without using cache.
 .TP
 .B Ctrl\-y
 Copies current URI to primary selection.
+.TP
+.B Ctrl\-o
+show the sourcecode of the current page.
 .SH SEE ALSO
 .BR dmenu(1)
 .BR xprop(1)