changeset 984:636142442de2

remove text_color dillorc option To change the default text color add a line like body {color: yellow} to your ~/.dillo/style.css file.
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Fri, 06 Mar 2009 11:59:18 +0100
parents 783043a9ead8
children eee24b6ce034
files ChangeLog dillorc src/html.cc src/prefs.c src/prefs.h
diffstat 5 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 06 10:10:16 2009 +0100
+++ b/ChangeLog	Fri Mar 06 11:59:18 2009 +0100
@@ -66,6 +66,7 @@
  - 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
--- a/dillorc	Fri Mar 06 10:10:16 2009 +0100
+++ b/dillorc	Fri Mar 06 11:59:18 2009 +0100
@@ -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
 
--- a/src/html.cc	Fri Mar 06 10:10:16 2009 +0100
+++ b/src/html.cc	Fri Mar 06 11:59:18 2009 +0100
@@ -1701,8 +1701,9 @@
    }
 
    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")))
--- a/src/prefs.c	Fri Mar 06 10:10:16 2009 +0100
+++ b/src/prefs.c	Fri Mar 06 11:59:18 2009 +0100
@@ -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 @@
    { "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 @@
    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;
 
--- a/src/prefs.h	Fri Mar 06 10:10:16 2009 +0100
+++ b/src/prefs.h	Fri Mar 06 11:59:18 2009 +0100
@@ -31,7 +31,6 @@
    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;