Bumping up to 0.7 for release.

Signed-off-by: Christoph Lohmann <20h@r-36.net>

.hgtags

@@ -1,10 +0,0 @@
-d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
-d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
-9c8ebcf54061112b5979742b403de26fc94007ff 0.1
-3ef997607115303fe93873b592d152f0ec186f77 0.1.1
-bffb0c3c23410ac7f260d167f4b9771497fc1127 0.1.2
-a5db79d487c85615be2ecf30815c6b4977e88000 0.2
-46d516fd216731adf91740496e6823c1be4f6199 0.3
-ac8e058003ed2c0974529808752e5da7692fd7d8 0.4
-71388899ac09d21e6c93518cc57a28395034f63c 0.4.1
-f0cea0f2bfc6a32a0e352b6c69d781f1dbddbcda 0.5

FAQ.md

@@ -0,0 +1,10 @@
+# Frequently Asked Questions
+
+## Surf is starting up slowly. What might happen?
+
+The  first suspect for such a behaviour is the plugin handling. Run surf
+on the commandline and see if there are errors because of »nspluginwrap‐
+per«  or  failed RPCs to them. If that is true, go to ~/.mozilla/plugins
+and try removing stale links to plugins not on your system anymore. This
+will stop surf from trying to load them.
+

README

@@ -6,6 +6,7 @@ Requirements
 ------------
 In order to build surf you need GTK+ and Webkit/GTK+ header files.
 
+In order to use the functionality of the url-bar, also install dmenu[0].
 
 Installation
 ------------
@@ -26,7 +27,7 @@ See the manpage for further options.
 
 Running surf in tabbed
 ----------------------
-For running surf in tabbed[0] there is a script included in the distribution,
+For running surf in tabbed[1] there is a script included in the distribution,
 which is run like this:
 
 	surf-open.sh [URI]
@@ -34,5 +35,6 @@ which is run like this:
 Further invocations of the script will run surf with the specified URI in this
 instance of tabbed.
 
-[0] http://tools.suckless.org/tabbed
+[0] http://tools.suckless.org/dmenu
+[1] http://tools.suckless.org/tabbed
 

TODO.md

@@ -1,8 +1,7 @@
 # TODO
 
 * suckless adblocking
-* integrate the WebKitWebInspector API
+* replace twitch() with proper gtk calls to make scrollbars reappear
-* make scrollbars a switch and allow them to be disabled
 * replace webkit with something sane
 * add video player options
 	* play in plugin

config.def.h

@@ -1,48 +1,80 @@
 /* modifier 0 means no modifier */
 static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
-	"AppleWebKit/537.15 (KHTML, like Gecko) Chrome/24.0.1295.0 "
+                              "AppleWebKit/537.15 (KHTML, like Gecko) "
-	"Safari/537.15 Surf/"VERSION;
+                              "Chrome/24.0.1295.0 Safari/537.15 Surf/"VERSION;
-static char *progress       = "#0000FF";
-static char *progress_untrust = "#FF0000";
-static char *progress_trust = "#00FF00";
-static char *progress_proxy = "#FFFF00";
-static char *progress_proxy_trust = "#66FF00";
-static char *progress_proxy_untrust = "#FF6600";
-static char *stylefile      = "~/.surf/style.css";
 static char *scriptfile     = "~/.surf/script.js";
+static char *styledir       = "~/.surf/styles/";
+static char *cachefolder    = "~/.surf/cache/";
+
+static Bool kioskmode       = FALSE; /* Ignore shortcuts */
+static Bool showindicators  = TRUE;  /* Show indicators in window title */
+static Bool zoomto96dpi     = TRUE;  /* Zoom pages to always emulate 96dpi */
+static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */
+
+static guint defaultfontsize = 12;   /* Default font size */
+static gfloat zoomlevel = 1.0;       /* Default zoom level */
+
+/* Soup default features */
 static char *cookiefile     = "~/.surf/cookies.txt";
-static time_t sessiontime   = 3600;
+static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing,
+                                      * @: accept all except third party */
 static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
-static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
+static Bool strictssl       = FALSE; /* Refuse untrusted SSL connections */
-static int   indicator_thickness = 2;
+static time_t sessiontime   = 3600;
 
 /* Webkit default features */
+static Bool enablescrollbars      = TRUE;
 static Bool enablespatialbrowsing = TRUE;
-static Bool enableplugins = TRUE;
+static Bool enablediskcache       = TRUE;
-static Bool enablescripts = TRUE;
+static int diskcachebytes         = 5 * 1024 * 1024;
-static Bool enableinspector = TRUE;
+static Bool enableplugins         = TRUE;
-static Bool loadimages = TRUE;
+static Bool enablescripts         = TRUE;
-static Bool hidebackground  = FALSE;
+static Bool enableinspector       = TRUE;
+static Bool enablestyle           = TRUE;
+static Bool loadimages            = TRUE;
+static Bool hidebackground        = FALSE;
+static Bool allowgeolocation      = TRUE;
 
 #define SETPROP(p, q) { \
 	.v = (char *[]){ "/bin/sh", "-c", \
-		"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+	     "prop=\"`xprop -id $2 $0 " \
-		"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+	     "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \
-		p, q, winid, NULL \
+	     "| xargs -0 printf %b | dmenu`\" &&" \
+	     "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+	     p, q, winid, NULL \
 	} \
 }
 
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
 	.v = (char *[]){ "/bin/sh", "-c", \
-		"st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
+	     "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
-		" --referer '$2'" \
+	     " --referer '$2' -b $3 -c $3 '$0';" \
-		" -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
+	     " sleep 5;\"", \
-		" sleep 5;\"", \
+	     d, useragent, r, cookiefile, NULL \
-		d, useragent, r, NULL \
 	} \
 }
 
+/* PLUMB(URI) */
+/* This called when some URI which does not begin with "about:",
+ * "http://" or "https://" should be opened.
+ */
+#define PLUMB(u) {\
+	.v = (char *[]){ "/bin/sh", "-c", \
+	     "xdg-open \"$0\"", u, NULL \
+	} \
+}
+
+/* styles */
+/*
+ * The iteration will stop at the first match, beginning at the beginning of
+ * the list.
+ */
+static SiteStyle styles[] = {
+	/* regexp               file in $styledir */
+	{ ".*",                 "default.css" },
+};
+
 #define MODKEY GDK_CONTROL_MASK
 
 /* hotkeys */
@@ -51,45 +83,59 @@ static Bool hidebackground  = FALSE;
  * edit the CLEANMASK() macro.
  */
 static Key keys[] = {
-    /* modifier	            keyval      function    arg             Focus */
+	/* modifier             keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
+	{ MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
 
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
+	{ MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
+	{ MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
 
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
+	{ MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
-    { MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
+	{ MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
 
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
+	{ MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
+	{ MODKEY,               GDK_h,      navigate,   { .i = -1 } },
 
-    { MODKEY,               GDK_j,           scroll_v,   { .i = +1 } },
+	{ MODKEY,               GDK_j,      scroll_v,   { .i = +1 } },
-    { MODKEY,               GDK_k,           scroll_v,   { .i = -1 } },
+	{ MODKEY,               GDK_k,      scroll_v,   { .i = -1 } },
-    { MODKEY,               GDK_b,           scroll_v,   { .i = -10000 } },
+	{ MODKEY,               GDK_b,      scroll_v,   { .i = -10000 } },
-    { MODKEY,               GDK_space,       scroll_v,   { .i = +10000 } },
+	{ MODKEY,               GDK_space,  scroll_v,   { .i = +10000 } },
-    { MODKEY,               GDK_i,           scroll_h,   { .i = +1 } },
+	{ MODKEY,               GDK_i,      scroll_h,   { .i = +1 } },
-    { MODKEY,               GDK_u,           scroll_h,   { .i = -1 } },
+	{ MODKEY,               GDK_u,      scroll_h,   { .i = -1 } },
 
-    { 0,                    GDK_F11,    fullscreen, { 0 } },
+	{ 0,                    GDK_F11,    fullscreen, { 0 } },
-    { 0,                    GDK_Escape, stop,       { 0 } },
+	{ 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_o,      source,     { 0 } },
+	{ MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
 
-    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
+	{ MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-    { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
 
-    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
+	{ MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
 
-    { MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_a,      togglecookiepolicy, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_m,      togglestyle, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_b,      togglescrollbars, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK,GDK_g,      togglegeolocation, { 0 } },
 };
 
+/* button definitions */
+/* click can be ClkDoc, ClkLink, ClkImg, ClkMedia, ClkSel, ClkEdit, ClkAny */
+static Button buttons[] = {
+	/* click        event mask  button  function        argument */
+	{ ClkLink,      0,          2,      linkopenembed,  { 0 } },
+	{ ClkLink,      MODKEY,     2,      linkopen,       { 0 } },
+	{ ClkLink,      MODKEY,     1,      linkopen,       { 0 } },
+	{ ClkAny,       0,          8,      navigate,       { .i = -1 } },
+	{ ClkAny,       0,          9,      navigate,       { .i = +1 } },
+};

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.6
+VERSION = 0.7
 
 # Customize below to fit your system
 
@@ -18,7 +18,7 @@ INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -g ${LIBS}
 

surf-open.sh

@@ -21,12 +21,12 @@ then
 	runtabbed
 else
 	xid=$(cat "$xidfile")
-	xprop -id "$xid" 2>&1 >/dev/null
+	xprop -id "$xid" >/dev/null 2>&1
 	if [ $? -gt 0 ];
 	then
 		runtabbed
 	else
-		surf -e "$xid" "$uri" 2>&1 >/dev/null &
+		surf -e "$xid" "$uri" >/dev/null 2>&1 &
 	fi
 fi
 

surf.1

@@ -3,12 +3,14 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
-.RB [-ipnsvx]
+.RB [-bBdDfFgGiIkKmMnNpPsSvx]
+.RB [-a\ cookiepolicies]
 .RB [-c\ cookiefile]
 .RB [-e\ xid]
 .RB [-r\ scriptfile]
 .RB [-t\ stylefile]
 .RB [-u\ useragent]
+.RB [-z\ zoomlevel]
 .RB "URI"
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
@@ -17,38 +19,111 @@ 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 \-a cookiepolicies
+Define the order of
+.I cookie policies.
+The default is "Aa@" but could be
+redefined in the
+.I config.h,
+with "A" meaning to
+accept all cookies, "a" to deny all cookies and "@", which tells surf to
+accept no third party cookies.
+.TP
+.B \-b
+Disable Scrollbars
+.TP
+.B \-B
+Enable Scrollbars
+.TP
 .B \-c cookiefile 
-Specify the cookiefile to use.
+Specify the
+.I cookiefile
+to use.
+.TP
+.B \-d
+Disable the disk cache.
+.TP
+.B \-D
+Enable the disk cache.
 .TP
 .B \-e xid
-Reparents to window specified by xid.
+Reparents to window specified by
+.I xid.
+.TP
+.B \-f
+Start surf in windowed mode (not fullscreen).
+.TP
+.B \-F
+Start surf in fullscreen mode.
+.TP
+.B \-g
+Disable giving the geolocation to websites.
+.TP
+.B \-G
+Enable giving the geolocation to websites.
 .TP
 .B \-i
 Disable Images
 .TP
+.B \-I
+Enable Images
+.TP
+.B \-k
+Disable kiosk mode (disable key strokes and right click)
+.TP
+.B \-K
+Enable kiosk mode (disable key strokes and right click)
+.TP
+.B \-m
+Disable application of user style sheets.
+.TP
+.B \-M
+Enable application of user style sheets.
+.TP
 .B \-n
 Disable the Web Inspector (Developer Tools).
 .TP
+.B \-N
+Enable the Web Inspector (Developer Tools).
+.TP
 .B \-p
 Disable Plugins
 .TP
+.B \-P
+Enable Plugins
+.TP
 .B \-r scriptfile 
-Specify the user scriptfile.
+Specify the user
+.I scriptfile.
 .TP
 .B \-s
 Disable Javascript
 .TP
+.B \-S
+Enable Javascript
+.TP
 .B \-t stylefile
-Specify the user stylefile.
+Specify the user
+.I stylefile.
+This does disable the site-specific styles.
 .TP
 .B \-u useragent 
-Specify the useragent which surf should use.
+Specify the
+.I useragent
+which surf should use.
 .TP
 .B \-v
 Prints version information to standard output, then exits.
 .TP
 .B \-x
-Prints xid to standard output. This can be used to script the browser by using
+Prints xid to standard output. This can be used to script the browser in for
+example
+.BR xdotool(1).
+.TP
+.B \-z zoomlevel 
+Specify the
+.I zoomlevel
+which surf should use.
 .BR xprop(1).
 .SH USAGE
 .B Escape
@@ -87,13 +162,7 @@ Zooms page out
 .B Ctrl\-Shift\-q
 Resets Zoom
 .TP
-.B Ctrl\-h
+.B Ctrl\-f and Ctrl\-/
-Navigate back one step in history.
-.TP
-.B Ctrl\-l
-Navigate forward one step in history.
-.TP
-.B Ctrl\-f and Ctrl\-\\
 Opens the search-bar.
 .TP
 .B Ctrl\-n
@@ -103,14 +172,11 @@ Go to next search result.
 Go to previous search result.
 .TP
 .B Ctrl\-g
-Opens the URL-bar.
+Opens the URL-bar (requires dmenu installed).
 .TP
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP
-.B Esc
-Stop loading the page.
-.TP
 .B Ctrl\-Shift\-p
 Calls Printpage Dialog.
 .TP
@@ -118,7 +184,7 @@ Calls Printpage Dialog.
 Reloads the website.
 .TP
 .B Ctrl\-Shift\-r
-Reloads the website without using cache.
+Reloads the website without using the cache.
 .TP
 .B Ctrl\-y
 Copies current URI to primary selection.
@@ -126,29 +192,104 @@ Copies current URI to primary selection.
 .B Ctrl\-o
 Show the sourcecode of the current page.
 .TP
+.B Ctrl\-Shift\-a
+Toggle through the the
+.I cookie policies.
+This will not reload the page.
+.TP
+.B Ctrl\-Shift\-b
+Toggle scrollbars. This will reload the page.
+.TP
+.B Ctrl\-Shift\-c
+Toggle caret browsing. This will reload the page.
+.TP
+.B Ctrl\-Shift\-i
+Toggle auto-loading of images. This will reload the page.
+.TP
+.B Ctrl\-Shift\-m
+Toggle if the
+.I stylefile 
+file should be loaded. This will reload the page.
+.TP
 .B Ctrl\-Shift\-o
 Open the Web Inspector (Developer Tools) window for the current page.
 .TP
-.B Ctrl\-Shift\-c
-Toggle caret browsing.
-.TP
-.B Ctrl\-Shift\-i
-Toggle auto-loading of images.
-.TP
 .B Ctrl\-Shift\-s
-Toggle script execution.
+Toggle script execution. This will reload the page.
 .TP
 .B Ctrl\-Shift\-v
-Toggle the enabling of plugins on that surf instance.
+Toggle the enabling of plugins on that surf instance. This will reload the
+page.
 .TP
 .B F11
 Toggle fullscreen mode.
+.SH INDICATORS OF OPERATION
+Surf is showing indicators of operation in front of the site title.
+For all indicators, unless otherwise specified, a lower case letter means disabled and an upper case letter means enabled.
+.TP
+.B A
+all cookies accepted
+.TP
+.B a
+no cookies accepted
+.TP
+.B @
+all except third-party cookies accepted
+.TP
+.B c C
+caret browsing
+.TP
+.B g G
+geolocation
+.TP
+.B d D
+disk cache
+.TP
+.B i I
+images
+.TP
+.B s S
+scripts
+.TP
+.B v V
+plugins
+.TP
+.B m M
+styles
+.SH INDICATORS OF WEB PAGE
+The second part of the indicators specifies modes of the web page itself.
+.SS First character: encryption
+.TP
+.B -
+unencrypted
+.TP
+.B T
+encrypted (SSL)
+.TP
+.B U
+attempted encryption but failed
+.SS Second character: proxying
+.TP
+.B -
+no proxy
+.TP
+.B P
+using proxy
 .SH ENVIRONMENT
 .B SURF_USERAGENT
-If this variable is set upon startup, surf will use it as the useragent string
+If this variable is set upon startup, surf will use it as the
+.I useragent
+string
 .TP
 .B http_proxy
 If this variable is set and not empty upon startup, surf will use it as the http proxy
+.TP
+.B no_proxy
+If both http_proxy is set and no_proxy contain a
+.BR comma-separated
+list of domain extensions and both is not empty upon startup, proxy will
+.BR not
+be used for each of the elements in no_proxy.
 .SH PLUGINS
 For using plugins in surf, first determine your running architecture. Then get
 the appropriate plugin for that architecture and copy it to
@@ -164,6 +305,7 @@ will help you.
 .BR dmenu(1),
 .BR xprop(1),
 .BR tabbed(1),
-.BR nspluginwrapper(1)
+.BR nspluginwrapper(1),
+.BR xdotool(1)
 .SH BUGS
 Please report them!