lynx-dev [PATCH 2.8.4dev.10] style assignment tracing

[Ilya Zakharevich]

This patch provides better tracing of style choices.  Both when styles
are assigned into text-lines, and when lss directives are converted to
"numeric colors".

This also slightly expands the cache of colors to better accomodate
16-color terminals, and fixes a misprint in handling background-color
== maxcolor.

Enjoy,
Ilya

--- ./src/HTML.c~       Sun Jul 16 22:16:12 2000
+++ ./src/HTML.c        Fri Oct 20 01:34:28 2000
@@ -1100,6 +1100,7 @@ PRIVATE int HTML_start_element ARGS6(
        force_current_tag_style = FALSE;
     }
 
+    CTRACE((tfp, "CSS.elt:<%s>\n", HTML_dtd.tags[element_number].name));
 
     if (current_tag_style == -1) {
 #if !OPT_SCN
@@ -1129,6 +1130,8 @@ PRIVATE int HTML_start_element ARGS6(
        strtolower(myHash);
        hcode = hash_code(myHash);
 #endif
+       CTRACE((tfp, "STYLE.start_element: <%s>.<%s>, hcode=%d.\n",
+               HTML_dtd.tags[element_number].name, class_name, hcode));
        class_string[0] = '\0';
 
 #if !OPT_SCN
@@ -1158,10 +1161,7 @@ PRIVATE int HTML_start_element ARGS6(
 
        /* seems that this condition is always true - HV */
        if (displayStyles[element_number + STARTAT].color > -2) /* actually set 
*/
-       {
-           CTRACE((tfp, "CSSTRIM: start_element: top <%s>\n", 
HTML_dtd.tags[element_number].name));
            HText_characterStyle(me->text, hcode, 1);
-       }
     } else { /* (current_tag_style!=-1)         */
        if (class_name[0]) {
 #if !OPT_SCN
@@ -1179,6 +1179,8 @@ PRIVATE int HTML_start_element ARGS6(
            class_string[0] = '\0';
        }
        hcode = current_tag_style;
+       CTRACE((tfp, "STYLE.start_element: <%s>, hcode=%d.\n",
+               HTML_dtd.tags[element_number].name, hcode));
        HText_characterStyle(me->text, hcode , 1);
        current_tag_style = -1;
     }
@@ -1642,7 +1644,7 @@ PRIVATE int HTML_start_element ARGS6(
            {
                char *tmp = 0;
                HTSprintf0(&tmp, "link.%s.%s", value[HTML_LINK_CLASS], title);
-               CTRACE((tfp, "CSSTRIM:link=%s\n", tmp));
+               CTRACE((tfp, "STYLE.link: using style <%s>\n", tmp));
 
                HText_characterStyle(me->text, hash_code(tmp), 1);
                HTML_put_string(me, title);
@@ -5068,7 +5070,7 @@ PRIVATE int HTML_start_element ARGS6(
                 */
            }
 
-           CTRACE((tfp, "Ok, we're trying [%s]\n", NONNULL(I.type)));
+           CTRACE((tfp, "Ok, we're trying type=[%s]\n", NONNULL(I.type)));
 
            /*
             *  Check for an unclosed TEXTAREA.
@@ -5177,7 +5179,7 @@ PRIVATE int HTML_start_element ARGS6(
                }
                FREE(href);
            }
-           CTRACE((tfp, "2.Ok, we're trying [%s] (present=%p)\n", 
NONNULL(I.type), present));
+           CTRACE((tfp, "2.Ok, we're trying type=[%s] (present=%p)\n", 
NONNULL(I.type), present));
            /* text+file don't go in here */
            if ((UseALTasVALUE == TRUE) ||
                (present && present[HTML_INPUT_VALUE] &&
@@ -5202,7 +5204,7 @@ PRIVATE int HTML_start_element ARGS6(
                    HTMLSetCharacterHandling(current_char_set);
                }
 
-               CTRACE((tfp, "3.Ok, we're trying [%s]\n", NONNULL(I.type)));
+               CTRACE((tfp, "3.Ok, we're trying type=[%s]\n", 
NONNULL(I.type)));
                if (!I.type)
                    me->UsePlainSpace = TRUE;
                else if (!strcasecomp(I.type, "text") ||
@@ -5223,7 +5225,7 @@ PRIVATE int HTML_start_element ARGS6(
                if (me->UsePlainSpace && !me->HiddenValue) {
                    I.value_cs = current_char_set;
                }
-               CTRACE((tfp, "4.Ok, we're trying [%s]\n", NONNULL(I.type)));
+               CTRACE((tfp, "4.Ok, we're trying type=[%s]\n", 
NONNULL(I.type)));
                TRANSLATE_AND_UNESCAPE_ENTITIES6(
                    &I_value,
                    ATTR_CS_IN,
@@ -6098,7 +6100,7 @@ PRIVATE int HTML_start_element ARGS6(
 
     if (ReallyEmptyTagNum(element_number))
     {
-       CTRACE((tfp, "STYLE:begin_element:ending EMPTY element style\n"));
+       CTRACE((tfp, "STYLE.begin_element:ending \"EMPTY\" element style\n"));
 #if !defined(USE_HASH)
        HText_characterStyle(me->text, element_number+STARTAT, STACK_OFF);
 #else
@@ -7714,7 +7716,8 @@ End_Object:
 
        if (!ReallyEmptyTagNum(element_number))
        {
-           CTRACE((tfp, "STYLE:end_element: ending non-EMPTY style\n"));
+           CTRACE((tfp, "STYLE.end_element: ending non-\"EMPTY\" style 
<%s...>\n",
+                   HTML_dtd.tags[element_number].name));
 #if !defined(USE_HASH)
            HText_characterStyle(me->text, element_number+STARTAT, STACK_OFF);
 #else
--- ./src/LYReadCFG.c-pre       Sun Oct 15 04:21:00 2000
+++ ./src/LYReadCFG.c   Sun Oct 15 23:22:30 2000
@@ -383,16 +383,21 @@ PUBLIC int check_color ARGS2(
        if (!default_color_reset)
            the_default = DEFAULT_COLOR;
 #endif /* USE_DEFAULT_COLORS */
-       CTRACE((tfp, "=> %d\n", the_default));
+       CTRACE((tfp, "=> default %d\n", the_default));
        return the_default;
     }
     if (!strcasecomp(color, "nocolor"))
        return NO_COLOR;
 
     for (i = 0; i < 16; i++) {
-       if (!strcasecomp(color, Color_Strings[i]))
-           return ColorCode(i);
+       if (!strcasecomp(color, Color_Strings[i])) {
+           int c = ColorCode(i);
+
+           CTRACE((tfp, "=> %d\n", c));
+           return c;
+       }
     }
+    CTRACE((tfp, "=> ERR_COLOR\n"));
     return ERR_COLOR;
 }
 #endif /* USE_COLOR_STYLE || USE_COLOR_TABLE */
--- ./src/LYCurses.c-precolor   Sun Oct 15 19:36:58 2000
+++ ./src/LYCurses.c    Sun Oct 15 22:49:30 2000
@@ -297,7 +297,7 @@ PUBLIC void setStyle ARGS4(int,style,int
 PUBLIC void setHashStyle 
ARGS5(int,style,int,color,int,cattr,int,mono,char*,element)
 {
     bucket* ds = &hashStyles[style];
-    CTRACE((tfp, "CSS(SET): <%s> hash=%d, ca=%d, ma=%d\n", element, style, 
color, mono));
+    CTRACE((tfp, "CSS(SET): <%s> hash=%d, ca=%#x, ma=%#x\n", element, style, 
color, mono));
     ds->color = color;
     ds->cattr = cattr;
     ds->mono = mono;
--- ./src/LYStyle.c-precolor    Sun Oct 15 16:53:40 2000
+++ ./src/LYStyle.c     Fri Oct 20 01:20:06 2000
@@ -73,7 +73,7 @@ PUBLIC int    s_alink  = NOSTYLE, s_a     =
                s_whereis= NOSTYLE;
 
 /* start somewhere safe */
-#define MAX_COLOR 8
+#define MAX_COLOR 16
 PRIVATE int colorPairs = 0;
 PRIVATE unsigned char our_pairs[2][MAX_COLOR][MAX_COLOR];
 
@@ -143,7 +143,7 @@ PRIVATE void parse_attributes ARGS5(char
            cA = A_BOLD;
        if (fA >= COLORS)
            fA %= COLORS;
-       if (bA > COLORS)
+       if (bA >= COLORS)
            bA %= COLORS;
     } else {
        cA = A_BOLD;
@@ -515,7 +515,6 @@ PUBLIC void TrimColorClass ARGS3(
            *end='\0';
     }
     *phcode = hash_code(lookfrom && *lookfrom ? lookfrom : &tmp[1]);
-    CTRACE((tfp, "CSS:%s (trimmed %s)\n", NONNULL(styleclassname), tmp));
 }
 
 /* This function is designed as faster analog to TrimColorClass.
@@ -531,6 +530,7 @@ PUBLIC void FastTrimColorClass ARGS5 (
     char* tag_start = *pstylename_end;
     BOOLEAN found = FALSE;
 
+    CTRACE((tfp, "STYLE.fast-trim: [%s] from [%s]: ", tag_name, stylename));
     while (tag_start >= stylename)
     {
        for (; (tag_start >= stylename) && (*tag_start != ';') ; --tag_start)
@@ -545,6 +545,7 @@ PUBLIC void FastTrimColorClass ARGS5 (
        *tag_start = '\0';
        *pstylename_end = tag_start;
     }
+    CTRACE((tfp, found ? "success.\n" : "failed.\n"));
     *phcode = hash_code(tag_start+1);
 }
 

; To UNSUBSCRIBE: Send "unsubscribe lynx-dev" to address@hidden