new config file is all disabled so only needs tinkering if one knows what

one really wants to do

1 files changed, 67 insertions, 50 deletions

diff --git a/xxxterm.conf b/xxxterm.conf
index 641131e..211004a 100644
--- a/xxxterm.conf
+++ b/xxxterm.conf
@@ -1,38 +1,38 @@
 # $xxxterm$
 
-home			= http://www.peereboom.us
-ctrl_click_focus	= 0
-append_next		= 1
-download_dir		= ~downloads
-cookies_enabled		= 1
-allow_volatile_cookies	= 0
-read_only_cookies	= 0
-enable_scripts		= 0
-enable_plugins		= 0
-default_font_size	= 12
-fancy_bar		= 1
-refresh_interval	= 1
-session_timeout		= 3600
-enable_cookie_whitelist = 1
+# NOTE: cookie_mode and js_mode MUST be the first entries in this file!
+
+# normal browser operation (default)
+# browser_mode		= normal
+
+# prevent tracking operation
+# browser_mode		= whitelist
+
+# home			= http://www.peereboom.us
+# ctrl_click_focus	= 0
+# append_next		= 1
+# download_dir		= ~downloads
+# default_font_size	= 12
+# fancy_bar		= 1
+# refresh_interval	= 10
 # ssl_ca_file		= /etc/ssl/cert.pem
-ssl_strict_certs	= 0
-enable_socket		= 0
-single_instance		= 0
-save_global_history	= 0
-show_tabs		= 1
-show_url		= 1
-show_statusbar		= 0
-session_autosave	= 0
-guess_search		= 0
-
-# note that cookies_enabled must be set to 1 for this to work
-save_rejected_cookies	= 0
+# ssl_strict_certs	= 0
+# enable_socket		= 0
+# single_instance	= 0
+# save_global_history	= 0
+# show_tabs		= 1
+# show_url		= 1
+# show_statusbar	= 0
+# session_autosave	= 0
+# guess_search		= 0
 
+#
 # resource_dir		= /usr/local/share/xxxterm/
 # icon_size		= 2
 # window_width		= 1024
 # window_height		= 768
 
+#
 # user_agent can bet set to just about anything
 # for a comprehensive list see: http://www.useragentstring.com/pages/All/
 #
@@ -40,56 +40,73 @@ save_rejected_cookies	= 0
 #user_agent		= Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; de-de) AppleWebKit/534.15+ (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4
 #user_agent		= Mozilla/5.0 (Windows; U; Windows NT 6.1; ru; rv:1.9.2.3) Gecko/20100401 Firefox/4.0 (.NET CLR 3.5.30729)
 
-# only useful if enable_scripts = 0
-enable_js_whitelist	= 1
-
-# cookie policy values: accept, reject, no3rdparty
-cookie_policy		= no3rdparty
-
+#
 # see http://www.xroxy.com/proxylist.php for a good list of open proxies
 # http_proxy		= http://127.0.0.1:80
 
+#
 # search engines
 # uncomment one of these lines for you favorite search engine
 #
-# scroogle
-search_string		= https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=%s
-#search_string		= http://www.scroogle.org/cgi-bin/nbbw.cgi?Gw=%s
-
+# scroogle (default)
+# search_string		= https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=%s
+# search_string		= http://www.scroogle.org/cgi-bin/nbbw.cgi?Gw=%s
 # google
 # search_string		= http://www.google.com/search?q=%s&&client=xxxterm
-
 # yahoo
 # search_string		= http://search.yahoo.com/search?p=%s
 
+#
 # alias support, %s is substituded with user input
 # alias,link+action
-alias = ports,http://openports.se/search.php?so=%s
+# alias = ports,http://openports.se/search.php?so=%s
 
+#
 # specific mime type for video
 # mime_type		= video/x-ms-wmv,mplayer
 # mime_type		= video/quicktime,mplayer
 
 # default mime type for video
-mime_type		= video/*,mplayer
+# mime_type		= video/*,mplayer
 
 # default mime type for audio
-mime_type		= audio/*,mplayer
+# mime_type		= audio/*,mplayer
 
 # pdf, note that xpdf can't load a URI directly
-mime_type		= application/pdf,kpdf
+# mime_type		= application/pdf,kpdf
 
 # word docs
-mime_type		= application/msword,soffice
+# mime_type		= application/msword,soffice
+
+#
+# advanced cookie and JS settings, don't touch unless you know what you are doing
+#
+# the settings for "browser_mode = whitelist" are as follows:
+# allow_volatile_cookies	= 0
+# cookie_policy			= no3rdparty
+# cookies_enabled		= 1
+# enable_cookie_whitelist	= 1
+# read_only_cookies		= 0
+# save_rejected_cookies		= 0
+# session_timeout		= 3600
+# enable_scripts		= 0
+# enable_js_whitelist		= 1
+#
+# the settings for "browser_mode = normal" are as follows
+# allow_volatile_cookies	= 0
+# cookie_policy			= allow
+# cookies_enabled		= 1
+# enable_cookie_whitelist	= 0
+# read_only_cookies		= 0
+# save_rejected_cookies		= 0
+# session_timeout		= 3600
+# enable_scripts		= 1
+# enable_js_whitelist		= 0
 
 # cookie white list
-# Example of valid entries are:
-#				*.moo.com
-#				.moo.com
-#				www.moo.com
-cookie_wl		= .conformal.com
-cookie_wl		= .peereboom.us
+# cookie_wl		= .conformal.com
+# cookie_wl		= .peereboom.us
 
 # javascript white list
-js_wl			= .conformal.com
-js_wl			= .peereboom.us
+# js_wl			= .conformal.com
+# js_wl			= .peereboom.us