diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | dillorc | 3 | ||||
| -rw-r--r-- | src/html.cc | 5 | ||||
| -rw-r--r-- | src/prefs.c | 3 | ||||
| -rw-r--r-- | src/prefs.h | 1 |
5 files changed, 4 insertions, 9 deletions
@@ -66,6 +66,7 @@ dillo-2.1 - Add workaround for fltk bug #2062. - Reduce number of styleEngine::style0() calls. - Replace bg_color dillorc option. + - Remove text_color dillorc option. Patches: Johannes Hofmann +- Updated the GPL copyright note in the source files. Patch: Detlef Riekenberg @@ -144,9 +144,6 @@ # Here we can use the HTML color names or C syntax. -# Set the text color -#text_color=black - # Set the link color #link_color=blue diff --git a/src/html.cc b/src/html.cc index 4c2bdbf6..e3d9653b 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1701,8 +1701,9 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize) } if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "text"))) { - color = a_Html_color_parse(html, attrbuf, prefs.text_color); - props.set (CSS_PROPERTY_COLOR, CSS_TYPE_COLOR, color); + color = a_Html_color_parse(html, attrbuf, -1); + if (color != -1) + props.set (CSS_PROPERTY_COLOR, CSS_TYPE_COLOR, color); } if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "link"))) diff --git a/src/prefs.c b/src/prefs.c index e0b746ae..d8d68fca 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -43,7 +43,6 @@ #define D_SEARCH_URL "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s" #define D_SAVE_DIR "/tmp/" -#define DW_COLOR_DEFAULT_TEXT 0x000000 #define DW_COLOR_DEFAULT_LINK 0x0000ff #define DW_COLOR_DEFAULT_VLINK 0x800080 @@ -203,7 +202,6 @@ static int Prefs_parse_dillorc(void) { "show_url", &prefs.show_url, PREFS_BOOL }, { "small_icons", &prefs.small_icons, PREFS_BOOL }, { "start_page", &prefs.start_page, PREFS_URL }, - { "text_color", &prefs.text_color, PREFS_COLOR }, { "visited_color", &prefs.visited_color, PREFS_COLOR }, { "w3c_plus_heuristics", &prefs.w3c_plus_heuristics, PREFS_BOOL } }; @@ -313,7 +311,6 @@ void a_Prefs_init(void) prefs.show_url=TRUE; prefs.small_icons = FALSE; prefs.start_page = a_Url_new(DILLO_START_PAGE, NULL); - prefs.text_color = DW_COLOR_DEFAULT_TEXT; prefs.visited_color = DW_COLOR_DEFAULT_VLINK; prefs.w3c_plus_heuristics = TRUE; diff --git a/src/prefs.h b/src/prefs.h index bd11517a..e7b88f2b 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -31,7 +31,6 @@ struct _DilloPrefs { DilloUrl *home; int32_t link_color; int32_t visited_color; - int32_t text_color; bool_t allow_white_bg; bool_t force_my_colors; bool_t contrast_visited_color; |