diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | dillo2rc (renamed from dillorc2) | 167 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/prefs.c | 35 |
5 files changed, 112 insertions, 102 deletions
@@ -45,7 +45,7 @@ dillo-fltk2 - Added a workaround for a CCC reentrancy segfault. - Bound FltkMultiLineTextResource to the html parser (TEXTAREA). - Added code to ignore the first <P> after <LI>. - - Added a http_referer preference. See details in dillorc2. + - Added a http_referer preference. See details in dillo2rc. - Added a text placeholder: "[IMG]" for img_off mode. - Fixed a SEGFAULT bug in http.c (handling of web->url). - Fixed handling of #anchors with repush, and other operations. @@ -68,8 +68,8 @@ dillo-fltk2 - Added code for the image menu and hooked it to dw2 signals. - Hooked the page and link menus. - Added a image-loading toggle button to the UI. - - Enabled hiding widgets of the control panel from dillorc2. - - Added a save-directory preference (save_dir in dillorc2). + - Enabled hiding widgets of the control panel from dillo2rc. + - Added a save-directory preference (save_dir in dillo2rc). - Fixed page-popup-menu to use the stack's top URL instead of base_url. - Added the "static" qualifier where missing. - Bound "Copy link location". diff --git a/Makefile.am b/Makefile.am index ab2a5455..a740cac1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = doc dlib dpip src dpid dpi -EXTRA_DIST = ChangeLog.old dillorc2 install-dpi-local README-port +EXTRA_DIST = ChangeLog.old dillo2rc install-dpi-local README-port -sysconf_DATA = dillorc2 +sysconf_DATA = dillo2rc @@ -1,20 +1,22 @@ -# dillorc +# dillo2rc # Sample dillo initialization file. +# # Lines that start with a '#' are comments. - +# "#option=..." shows the built-in default. +# "# option=..." is an additional example. +# "option=..." overrides the built-in value. #------------------------------------------------------------------------- # FIRST SECTION :) #------------------------------------------------------------------------- # Set the desired initial browser size -#geometry=820x650 -#geometry=650x545+0+20 -geometry=780x580 +# geometry=650x545+0+20 +#geometry=780x580 -# Uncomment if you want to have text-only browsing from the start. +# Change this if you want to have text-only browsing from the start. # (there's a toggle button near the bug meter to change this on-the-fly) -#load_images=NO +#load_images=YES # Set your default directory for download/save operations #save_dir=/tmp @@ -27,31 +29,35 @@ geometry=780x580 # - some fonts may slow down rendering. # - try to tune a fontname/font_factor combination. # Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...} -#vw_fontname="new century schoolbook" -#vw_fontname="helvetica" -#vw_fontname="times" -#vw_fontname="Bitstream vera Serif" -#vw_fontname="arial" -vw_fontname="DejaVu Sans" +# vw_fontname="new century schoolbook" +# vw_fontname="helvetica" +# vw_fontname="times" +# vw_fontname="Bitstream vera Serif" +# vw_fontname="arial" +#vw_fontname="DejaVu Sans" # Fontname for fixed width rendering (mainly text quoted with <pre>) -#fw_fontname=courier -#fw_fontname="Bitstream Vera Sans Mono" -#fw_fontname="Andale Mono" -fw_fontname="DejaVu Sans Mono" +# fw_fontname=courier +# fw_fontname="Bitstream Vera Sans Mono" +# fw_fontname="Andale Mono" +#fw_fontname="DejaVu Sans Mono" -# All fontsizes are scaled by this value (default is 1.0) +# All fontsizes are scaled by this value +# font_factor=1.5 #font_factor=1.2 -#font_factor=1.5 # Show tooltip popup for images? # Note: We use the "title" attribute and not "alt". # More info at: http://bugzilla.mozilla.org/show_bug.cgi?id=25537 -show_tooltip=YES +# *** NOT HOOKED UP YET *** +# +#show_tooltip=YES # Set this to YES if you want to limit the word wrap width to the viewport # width (may be useful for iPAQ) -limit_text_width=NO +# *** NOT HOOKED UP YET *** +# +#limit_text_width=NO #------------------------------------------------------------------------- @@ -61,7 +67,7 @@ limit_text_width=NO # If you prefer more accurate HTML bug diagnosis over better rendering # (page authors and webmasters) set the following to "NO". # -w3c_plus_heuristics=YES +#w3c_plus_heuristics=YES #------------------------------------------------------------------------- @@ -69,39 +75,44 @@ w3c_plus_heuristics=YES #------------------------------------------------------------------------- # Set the start page. -# Uncomment if you want to override the default start page. -#start_page="about:blank" -#start_page="file:/home/jcid/custom_page.html" +# start_page="about:blank" +# start_page="http://www.dillo.org" +# start_page="file:/home/jcid/custom_page.html" +#start_page="about:splash" # Set the home location -#home="http://dillo.cipsga.org.br/" -home="file:/home/jcid/HomePage/Home.html" +# home="file:/home/jcid/HomePage/Home.html" +#home="http://www.dillo.org/" # Set search url to use with "s <keywords>". # %s is replaced with keywords separated by '+'. -#search_url="http://search.lycos.com/default.asp?query=%s" -#search_url="http://www.alltheweb.com/search?cat=web&query=%s" -search_url="http://www.google.com/search?q=%s" +# search_url="http://search.lycos.com/default.asp?query=%s" +# search_url="http://www.alltheweb.com/search?cat=web&query=%s" +#search_url="http://www.google.com/search?q=%s" # Set the proxy information for http. # WARNING: dillo uses wget for ftp and https. To use a proxy for those # protocols, you will need to configure wget. -#http_proxy=http://localhost:8080/ +# http_proxy="http://localhost:8080/" +#(by default, no proxy is used) -# if you need to provide a user/password pair for the proxy, +# If you need to provide a user/password pair for the proxy, # set the proxy user name here and Dillo will ask for the password later. -#http_proxyuser="joe" +# http_proxyuser="joe" +#(by default, no proxy is used) # Set the domains to access without proxy -#no_proxy = ".hola.com .mynet.cl .hi.de" +# no_proxy = ".hola.com .mynet.cl .hi.de" +#(by default, no proxy is used) # Set the HTTP Referer (sic) header. -# Note that there is no option to use the actual referring page because it -# would endanger your privacy. +# Note that there is no option to reveal the page that you came from because it +# would endanger your privacy. 'host' and 'path' allow you to pretend that the +# link you followed was on the same site that you're going to. # none : Don't send any Referer header at all. # host : Send the requested URI's hostname. # path : Send the requested URI's host and path. -http_referer=host +#http_referer=host #------------------------------------------------------------------------- @@ -113,29 +124,28 @@ http_referer=host # Set the background color # bg_color=gray # bg_color=0xd6d6c0 -bg_color=0xdcd1ba +#bg_color=0xdcd1ba # Set the text color -text_color=black +#text_color=black # Set the link color -link_color=blue +#link_color=blue -# If your eyes don't suffer with white backgrounds, or you need -# high contrast to see sharply, uncomment next line. -allow_white_bg=NO +# If your eyes suffer with white backgrounds, change this. +#allow_white_bg=YES # Use the same colors with all documents? -#force_my_colors=YES +#force_my_colors=NO -# When set to YES, visited links always have a characteristic color, -# independent of the author's setting. -contrast_visited_color=YES +# When set to YES, the page author's visited link color may be overridden +# to allow better contrast with text/links/background +#contrast_visited_color=YES # Colors for widgets inside forms. # YES = toolkit's default colors, NO = use page's text and background color. # ("NO" looks less traditional but more stylish). -standard_widget_colors=NO +#standard_widget_colors=NO #------------------------------------------------------------------------- @@ -147,39 +157,40 @@ standard_widget_colors=NO # small : very nice! (it's "medium" without icon titles) # medium : nice! # large : Traditional -#panel_size=tiny -panel_size=small -#panel_size=medium +# panel_size=tiny +# panel_size=small +# panel_size=medium #panel_size=large -small_icons=NO + +#small_icons=NO # Here you can choose to hide some widgets of the dillo panel... -#show_back=NO -#show_forw=NO -#show_home=NO -#show_reload=NO -#show_save=NO -#show_stop=NO -#show_bookmarks=NO -show_menubar=YES -#show_clear_url=NO -#show_url=NO -#show_search=NO -#show_progress_box=NO - -# Start dillo windows with a hidden panel? -fullwindow_start=NO - -# When filling forms, our default behaviour is to submit on enterpress, +#show_back=YES +#show_forw=YES +#show_home=YES +#show_reload=YES +#show_save=YES +#show_stop=YES +#show_bookmarks=YES +#show_menubar=YES +#show_clear_url=YES +#show_url=YES +#show_search=YES +#show_progress_box=YES + +# Start dillo with the panels hidden? +#fullwindow_start=NO + +# When filling out forms, our default behaviour is to submit on enterpress, # but only when there's a single text entry (to avoid incomplete submits). -# OTOH, if you have to fill the same form lots of times, you may find +# OTOH, if you have to fill out the same form repeatedly, you may find it # useful to keep away from the mouse by forcing enter to submit. -enterpress_forces_submit=NO +#enterpress_forces_submit=NO # Some forms lack a submit button, and dillo can generate a custom one # internally. Unfortunately there's no guarantee for it to work. :( # (my experience is that forms that lack a submit rely on Javascript) -generate_submit=NO +#generate_submit=NO #------------------------------------------------------------------------- # DEBUG MESSAGES SECTION @@ -187,9 +198,9 @@ generate_submit=NO # Soon we should add the "show_debug_messages=NO" option... -# Generic messsages (mainly for debugging specific parts) -# Uncomment the following line to disable them. -#show_msg=NO +# Generic messages (mainly for debugging specific parts) +# Change this to disable them. +#show_msg=YES #------------------------------------------------------------------------- @@ -197,9 +208,9 @@ generate_submit=NO #------------------------------------------------------------------------- # Accepted by the W3C validator but "strongly discouraged" by the SPEC. -# (As "TAB character inside <PRE>"). -#show_extra_warnings=YES +# (Such as "TAB character inside <PRE>"). +#show_extra_warnings=NO # ----------------------------------------------------------------------- -# dillorc ends here. +# dillo2rc ends here. diff --git a/src/Makefile.am b/src/Makefile.am index 8c04bfbb..c037a699 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc2"' @LIBJPEG_CPPFLAGS@ +AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillo2rc"' @LIBJPEG_CPPFLAGS@ AM_CFLAGS = -I../../dw-testbed @LIBPNG_CFLAGS@ AM_CXXFLAGS = -I../../dw-testbed @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@ diff --git a/src/prefs.c b/src/prefs.c index e820ed75..3c04a621 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -31,25 +31,24 @@ #include "misc.h" #include "msg.h" -#define RCNAME "dillorc2" +#define RCNAME "dillo2rc" #define DILLO_START_PAGE "about:splash" #define DILLO_HOME "http://www.dillo.org/" -#define D_GEOMETRY_DEFAULT_WIDTH 640 -#define D_GEOMETRY_DEFAULT_HEIGHT 550 +#define D_GEOMETRY_DEFAULT_WIDTH 780 +#define D_GEOMETRY_DEFAULT_HEIGHT 580 #define D_GEOMETRY_DEFAULT_XPOS -9999 #define D_GEOMETRY_DEFAULT_YPOS -9999 -#define D_VW_FONTNAME "helvetica" -#define D_FW_FONTNAME "courier" +#define D_VW_FONTNAME "DejaVu Sans" +#define D_FW_FONTNAME "DejaVu Sans Mono" #define D_SEARCH_URL "http://www.google.com/search?q=%s" #define D_SAVE_DIR "/tmp/" -#define DW_COLOR_DEFAULT_GREY 0xd6d6d6 -#define DW_COLOR_DEFAULT_BLACK 0x000000 -#define DW_COLOR_DEFAULT_BLUE 0x0000ff -#define DW_COLOR_DEFAULT_PURPLE 0x800080 -#define DW_COLOR_DEFAULT_BGND 0xd6d6c0 +#define DW_COLOR_DEFAULT_BGND 0xdcd1ba +#define DW_COLOR_DEFAULT_TEXT 0x000000 +#define DW_COLOR_DEFAULT_LINK 0x0000ff +#define DW_COLOR_DEFAULT_VLINK 0x800080 /*----------------------------------------------------------------------------- * Global Data @@ -404,22 +403,22 @@ void a_Prefs_init(void) prefs.http_proxyuser = NULL; prefs.http_referer = dStrdup("host"); prefs.no_proxy = NULL; - prefs.link_color = DW_COLOR_DEFAULT_BLUE; - prefs.visited_color = DW_COLOR_DEFAULT_PURPLE; + prefs.link_color = DW_COLOR_DEFAULT_LINK; + prefs.visited_color = DW_COLOR_DEFAULT_VLINK; prefs.bg_color = DW_COLOR_DEFAULT_BGND; - prefs.text_color = DW_COLOR_DEFAULT_BLACK; + prefs.text_color = DW_COLOR_DEFAULT_TEXT; prefs.start_page = a_Url_new(DILLO_START_PAGE, NULL, 0, 0, 0); prefs.home = a_Url_new(DILLO_HOME, NULL, 0, 0, 0); prefs.allow_white_bg = TRUE; prefs.force_my_colors = FALSE; - prefs.contrast_visited_color = FALSE; - prefs.standard_widget_colors = TRUE; - prefs.show_tooltip = FALSE; - prefs.panel_size = P_tiny; + prefs.contrast_visited_color = TRUE; + prefs.standard_widget_colors = FALSE; + prefs.show_tooltip = TRUE; + prefs.panel_size = P_large; prefs.small_icons = FALSE; prefs.limit_text_width = FALSE; prefs.w3c_plus_heuristics = TRUE; - prefs.font_factor = 1.0; + prefs.font_factor = 1.2; prefs.show_back=TRUE; prefs.show_forw=TRUE; prefs.show_home=TRUE; |