snapshot of project "lynx", label v2-8-8dev_9b

8 files changed, 63 insertions, 62 deletions

diff --git a/CHANGES b/CHANGES
index 1671b60a..21dba669 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.557 2011/10/06 22:15:28 tom Exp $
+-- $LynxId: CHANGES,v 1.558 2011/10/07 00:50:29 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2011-10-06 (2.8.8dev.10)
+* eliminate ON/OFF macros, using TRUE/FALSE both to work around breakage from
+  zlib 1.2.5.1 changes as well as because they were unnecessary (GenToo
+  #383113) -Nikos Chantziaras, TD
 * updated several configure script macros (TD):
   CF_ANSI_CC_CHECK, CF_CURSES_LIBS, CF_LD_RPATH_OPT, CF_NETLIBS,
   CF_XOPEN_SOURCE, CF_X_ATHENA_LIBS
diff --git a/src/GridText.c b/src/GridText.c
index 90cea936..9b711c99 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.215 2011/06/11 12:34:51 tom Exp $
+ * $LynxId: GridText.c,v 1.216 2011/10/07 00:38:52 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -124,8 +124,8 @@ const char *unchecked_box = "[ ]";
 const char *checked_radio = "(*)";
 const char *unchecked_radio = "( )";
 
-static BOOLEAN underline_on = OFF;
-static BOOLEAN bold_on = OFF;
+static BOOLEAN underline_on = FALSE;
+static BOOLEAN bold_on = FALSE;
 
 #ifdef USE_SOURCE_CACHE
 int LYCacheSource = SOURCE_CACHE_NONE;
@@ -2406,7 +2406,7 @@ static void display_page(HText *text,
 		/*
 		 * Bold the link after incrementing nlinks.
 		 */
-		LYhighlight(OFF, (nlinks - 1), target);
+		LYhighlight(FALSE, (nlinks - 1), target);
 
 		display_flag = TRUE;
 
@@ -4018,27 +4018,27 @@ void HText_appendCharacter(HText *text, int ch)
 	    if (ch == LY_UNDERLINE_START_CHAR) {
 		line->data[line->size++] = LY_UNDERLINE_START_CHAR;
 		line->data[line->size] = '\0';
-		underline_on = ON;
+		underline_on = TRUE;
 		if (!(dump_output_immediately && use_underscore))
 		    ctrl_chars_on_this_line++;
 		return;
 	    } else if (ch == LY_UNDERLINE_END_CHAR) {
 		line->data[line->size++] = LY_UNDERLINE_END_CHAR;
 		line->data[line->size] = '\0';
-		underline_on = OFF;
+		underline_on = FALSE;
 		if (!(dump_output_immediately && use_underscore))
 		    ctrl_chars_on_this_line++;
 		return;
 	    } else if (ch == LY_BOLD_START_CHAR) {
 		line->data[line->size++] = LY_BOLD_START_CHAR;
 		line->data[line->size] = '\0';
-		bold_on = ON;
+		bold_on = TRUE;
 		ctrl_chars_on_this_line++;
 		return;
 	    } else if (ch == LY_BOLD_END_CHAR) {
 		line->data[line->size++] = LY_BOLD_END_CHAR;
 		line->data[line->size] = '\0';
-		bold_on = OFF;
+		bold_on = FALSE;
 		ctrl_chars_on_this_line++;
 		return;
 	    } else if (ch == LY_SOFT_HYPHEN) {
@@ -14399,7 +14399,7 @@ void LYMoveToLink(int cur,
     HTLine *todr;
     int i, n = 0;
     int XP_draw_min = 0;
-    int flags = ((flag == ON) ? 1 : 0) | (inU ? 2 : 0);
+    int flags = ((flag == TRUE) ? 1 : 0) | (inU ? 2 : 0);
 
     /*
      * We need to protect changed form text fields preceding this
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 601fc0c9..2c73528c 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.160 2011/06/06 09:20:59 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.161 2011/10/07 00:39:43 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -2928,7 +2928,7 @@ void lynx_stop_link_color(int flag,
 			  int pending GCC_UNUSED)
 {
 #ifdef USE_COLOR_STYLE
-    LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_OFF);
+    LynxChangeStyle(flag == TRUE ? s_alink : s_a, ABS_OFF);
 #else
     if (flag) {
 	lynx_stop_reverse();
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 430410da..07c502cb 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLocal.c,v 1.114 2010/11/01 08:46:02 tom Exp $
+ * $LynxId: LYLocal.c,v 1.115 2011/10/07 00:41:24 tom Exp $
  *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
@@ -1597,7 +1597,7 @@ void tagflag(int flag,
     if (nlinks > 0) {
 	LYmove(links[cur].ly, 2);
 	lynx_stop_reverse();
-	if (flag == ON) {
+	if (flag == TRUE) {
 	    LYaddch('+');
 	} else {
 	    LYaddch(' ');
@@ -1630,7 +1630,7 @@ void showtags(HTList *t)
 	s = t;
 	while ((name = (char *) HTList_nextObject(s)) != NULL) {
 	    if (!strcmp(links[i].lname, name)) {
-		tagflag(ON, i);
+		tagflag(TRUE, i);
 		break;
 	    }
 	}
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 6ca1e8ee..5e0403c3 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.175 2011/06/05 20:38:08 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.176 2011/10/07 00:39:22 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -513,7 +513,7 @@ static BOOL set_curdoc_link(int nextlink)
 	&& nextlink >= 0
 	&& nextlink < nlinks) {
 	if (curdoc.link >= 0 && curdoc.link < nlinks) {
-	    LYhighlight(OFF, curdoc.link, prev_target);
+	    LYhighlight(FALSE, curdoc.link, prev_target);
 	    result = TRUE;
 	}
 	curdoc.link = nextlink;
@@ -548,7 +548,7 @@ static void goto_line(int nextline)
 static void set_curdoc_link_by_mouse(int nextlink)
 {
     if (set_curdoc_link(nextlink)) {
-	LYhighlight(ON, nextlink, prev_target);
+	LYhighlight(TRUE, nextlink, prev_target);
 	LYmsec_delay(20);
     }
 }
@@ -3574,7 +3574,7 @@ static void handle_LYK_MAIN_MENU(int *old_c,
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
 	    newdoc.internal_link = FALSE;
-	    LYhighlight(OFF, curdoc.link, prev_target);
+	    LYhighlight(FALSE, curdoc.link, prev_target);
 #ifdef DIRED_SUPPORT
 	    if (lynx_edit_mode) {
 		DIRED_UNCACHE_2;
@@ -3834,7 +3834,7 @@ static void handle_LYK_NEXT_LINK(int c,
 				 int real_c)
 {
     if (curdoc.link < nlinks - 1) {	/* next link */
-	LYhighlight(OFF, curdoc.link, prev_target);
+	LYhighlight(FALSE, curdoc.link, prev_target);
 #ifdef FASTTAB
 	/*
 	 * Move to different textarea if TAB in textarea.
@@ -4475,7 +4475,7 @@ static void handle_LYK_TAG_LINK(void)
 		    found = TRUE;
 		    HTList_removeObject(tagged, tagname);
 		    FREE(tagname);
-		    tagflag(OFF, curdoc.link);
+		    tagflag(FALSE, curdoc.link);
 		    break;
 		}
 	    }
@@ -4485,7 +4485,7 @@ static void handle_LYK_TAG_LINK(void)
 		tagname = NULL;
 		StrAllocCopy(tagname, links[curdoc.link].lname);
 		HTList_addObject(tagged, tagname);
-		tagflag(ON, curdoc.link);
+		tagflag(TRUE, curdoc.link);
 	    }
 	}
 	if (curdoc.link < nlinks - 1) {
@@ -6510,10 +6510,10 @@ int mainloop(void)
 	     * Highlight current link, unless it is an active text input field.
 	     */
 	    if (!curlink_is_editable) {
-		LYhighlight(ON, curdoc.link, prev_target);
+		LYhighlight(TRUE, curdoc.link, prev_target);
 #ifndef INACTIVE_INPUT_STYLE_VH
 	    } else if (!textinput_activated) {
-		LYhighlight(ON, curdoc.link, prev_target);
+		LYhighlight(TRUE, curdoc.link, prev_target);
 #endif
 	    }
 	}
diff --git a/src/LYSearch.c b/src/LYSearch.c
index a70103f2..b9755733 100644
--- a/src/LYSearch.c
+++ b/src/LYSearch.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYSearch.c,v 1.26 2010/09/25 11:20:40 tom Exp $
+ * $LynxId: LYSearch.c,v 1.27 2011/10/07 00:40:58 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAlert.h>
@@ -336,7 +336,7 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
 	    /*
 	     * Found in link, changed cur, we're done.
 	     */
-	    LYhighlight(OFF, oldcur, prev_target);
+	    LYhighlight(FALSE, oldcur, prev_target);
 	    return (TRUE);
 	}
     } else {
@@ -349,7 +349,7 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
 	    /*
 	     * Found in link, changed cur, we're done.
 	     */
-	    LYhighlight(OFF, oldcur, prev_target);
+	    LYhighlight(FALSE, oldcur, prev_target);
 	    return (TRUE);
 	}
 
@@ -369,7 +369,7 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
      */
     www_user_search((cur_doc->line + offset), cur_doc, prev_target, direction);
     if (cur_doc->link != oldcur) {
-	LYhighlight(OFF, oldcur, prev_target);
+	LYhighlight(FALSE, oldcur, prev_target);
 	return (TRUE);
     }
     return (BOOL) (www_search_result > 0);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 497e4ffa..38eb897e 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.213 2011/06/11 12:14:34 tom Exp $
+ * $LynxId: LYUtils.c,v 1.214 2011/10/07 00:40:40 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -553,7 +553,7 @@ static BOOL show_whereis_targets(int flag,
 		     * Start emphasis immediately if we are making the link
 		     * non-current.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != TRUE) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
@@ -571,7 +571,7 @@ static BOOL show_whereis_targets(int flag,
 		     * Start emphasis immediately if we are making the link
 		     * non-current.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != TRUE) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
@@ -585,7 +585,7 @@ static BOOL show_whereis_targets(int flag,
 		     * Start emphasis immediately if we are making the link
 		     * non-current.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != TRUE) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
@@ -625,7 +625,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -645,7 +645,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -661,7 +661,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -684,7 +684,7 @@ static BOOL show_whereis_targets(int flag,
 		    TargetEmphasisON = FALSE;
 		}
 		LYGetYX(y, offset);
-		if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen))
+		if (offset < (hoffset + (flag == TRUE ? (hLen - 1) : hLen))
 		/*
 		 * See if we have another hit that starts within the
 		 * hightext.  -FM
@@ -705,7 +705,7 @@ static BOOL show_whereis_targets(int flag,
 		 */
 		    && (HitOffset + offset) <
 		    (hoffset +
-		     (flag == ON ? (hLen - 1) : hLen))) {
+		     (flag == TRUE ? (hLen - 1) : hLen))) {
 		    /*
 		     * Set up the data and offset for the hit, and let the code
 		     * for within hightext hits handle it.  -FM
@@ -726,7 +726,7 @@ static BOOL show_whereis_targets(int flag,
 	     * hightext, we are done.  Otherwise, move there and start
 	     * restoring the emphasis.  -FM
 	     */
-	    if ((Offset - offset) <= (flag == ON ? (hLen - 1) : hLen)) {
+	    if ((Offset - offset) <= (flag == TRUE ? (hLen - 1) : hLen)) {
 		data = SKIP_GLYPHS(utf_flag, data, Offset - offset);
 		if (utf_flag) {
 		    LYrefresh();
@@ -751,7 +751,7 @@ static BOOL show_whereis_targets(int flag,
 		     * non-current, or we are making it current but this is not
 		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON ||
+		    if (flag != TRUE ||
 			(offset > hoffset && data[itmp + 1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
@@ -771,7 +771,7 @@ static BOOL show_whereis_targets(int flag,
 		     * non-current, or we are making it current but this is not
 		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON ||
+		    if (flag != TRUE ||
 			(offset > hoffset && data[itmp + 1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
@@ -787,7 +787,7 @@ static BOOL show_whereis_targets(int flag,
 		     * non-current, or we are making it current but this is not
 		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON ||
+		    if (flag != TRUE ||
 			(offset > hoffset && data[itmp + 1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
@@ -825,7 +825,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -845,7 +845,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -861,7 +861,7 @@ static BOOL show_whereis_targets(int flag,
 			 * character of hightext if we are making the link
 			 * current.  -FM
 			 */
-			if (flag == ON && data[(itmp + 1)] == '\0') {
+			if (flag == TRUE && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
@@ -884,7 +884,7 @@ static BOOL show_whereis_targets(int flag,
 		    TargetEmphasisON = FALSE;
 		}
 		LYGetYX(y, offset);
-		if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen))
+		if (offset < (hoffset + (flag == TRUE ? (hLen - 1) : hLen))
 		/*
 		 * See if we have another hit that starts within the
 		 * hightext.  -FM
@@ -904,7 +904,7 @@ static BOOL show_whereis_targets(int flag,
 		 * last character, we are done.  -FM
 		 */
 		    && (HitOffset + offset) <
-		    (hoffset + (flag == ON ? (hLen - 1) : hLen))) {
+		    (hoffset + (flag == TRUE ? (hLen - 1) : hLen))) {
 		    /*
 		     * If the target extends beyond our buffer, emphasize
 		     * everything in the hightext starting at this hit.
@@ -945,7 +945,7 @@ static BOOL show_whereis_targets(int flag,
 				 * last character of hightext if we are making
 				 * the link current.  -FM
 				 */
-				if (flag == ON && data[(itmp + 1)] == '\0') {
+				if (flag == TRUE && data[(itmp + 1)] == '\0') {
 				    LYstopTargetEmphasis();
 				    TargetEmphasisON = FALSE;
 				    LYGetYX(y, offset);
@@ -965,7 +965,7 @@ static BOOL show_whereis_targets(int flag,
 				 * last character of hightext if we are making
 				 * the link current.  -FM
 				 */
-				if (flag == ON && data[(itmp + 1)] == '\0') {
+				if (flag == TRUE && data[(itmp + 1)] == '\0') {
 				    LYstopTargetEmphasis();
 				    TargetEmphasisON = FALSE;
 				} else {
@@ -979,7 +979,7 @@ static BOOL show_whereis_targets(int flag,
 				 * last character of hightext if we are making
 				 * the link current.  -FM
 				 */
-				if (flag == ON && data[(itmp + 1)] == '\0') {
+				if (flag == TRUE && data[(itmp + 1)] == '\0') {
 				    LYstopTargetEmphasis();
 				    TargetEmphasisON = FALSE;
 				} else {
@@ -1025,7 +1025,7 @@ static int find_cached_style(int cur,
 	s = s_curedit;
 #endif
 
-    if (flag != ON) {
+    if (flag != TRUE) {
 	int x;
 
 	/*
@@ -1119,13 +1119,13 @@ void LYhighlight(int flag,
 	    NONNULL(target)));
 
 #if defined(TEXTFIELDS_MAY_NEED_ACTIVATION) && defined(INACTIVE_INPUT_STYLE_VH)
-    if (flag == OFF)
+    if (flag == FALSE)
 	textinput_redrawn = FALSE;
 #endif
 
     if (nlinks > 0) {
 #ifdef USE_COLOR_STYLE
-	if (flag == ON || links[cur].type == WWW_FORM_LINK_TYPE) {
+	if (flag == TRUE || links[cur].type == WWW_FORM_LINK_TYPE) {
 	    LYmove(LYP + title_adjust, LXP);
 	    LynxChangeStyle(find_cached_style(cur, flag), STACK_ON);
 	}
@@ -1134,7 +1134,7 @@ void LYhighlight(int flag,
 	    || LYGetHiliteStr(cur, 0) == NULL) {
 	    LYMoveToLink(cur, target, NULL,
 			 flag, links[cur].inUnderline, utf_flag);
-	    lynx_start_link_color(flag == ON, links[cur].inUnderline);
+	    lynx_start_link_color(flag == TRUE, links[cur].inUnderline);
 	} else {
 	    LYMoveToLink(cur, target, LYGetHiliteStr(cur, 0),
 			 flag, links[cur].inUnderline, utf_flag);
@@ -1162,7 +1162,7 @@ void LYhighlight(int flag,
 		LYaddch('_');
 
 #ifdef USE_COLOR_STYLE
-	} else if (flag == OFF) {
+	} else if (flag == FALSE) {
 	    hl2_drawn = TRUE;
 	    redraw_lines_of_link(cur);
 	    CTRACE2(TRACE_STYLE,
@@ -1196,17 +1196,17 @@ void LYhighlight(int flag,
 		int row = LYP + hi_count + title_adjust;
 
 		hi_offset = LYGetHilitePos(cur, hi_count);
-		lynx_stop_link_color(flag == ON, links[cur].inUnderline);
+		lynx_stop_link_color(flag == TRUE, links[cur].inUnderline);
 		LYmove(row, hi_offset);
 
 #ifdef USE_COLOR_STYLE
 		CTRACE2(TRACE_STYLE,
 			(tfp, "STYLE.highlight.line2: @(%d,%d), style=%d.\n",
 			 row, hi_offset,
-			 flag == ON ? s_alink : s_a));
-		LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_ON);
+			 flag == TRUE ? s_alink : s_a));
+		LynxChangeStyle(flag == TRUE ? s_alink : s_a, ABS_ON);
 #else
-		lynx_start_link_color(flag == ON, links[cur].inUnderline);
+		lynx_start_link_color(flag == TRUE, links[cur].inUnderline);
 #endif
 
 		for (i = 0; (tmp[0] = hi_string[i]) != '\0'
@@ -1225,7 +1225,7 @@ void LYhighlight(int flag,
 		    }
 		}
 	    }
-	    lynx_stop_link_color(flag == ON, links[cur].inUnderline);
+	    lynx_stop_link_color(flag == TRUE, links[cur].inUnderline);
 	}
 #ifdef SHOW_WHEREIS_TARGETS
 	for (hi_count = target1_drawn ? 1 : 0;
diff --git a/src/LYUtils.h b/src/LYUtils.h
index aabc8349..343410a6 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.88 2011/06/11 10:20:06 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.89 2011/10/07 00:36:40 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -522,8 +522,6 @@ extern "C" {
 /*
  *  Miscellaneous.
  */
-#define ON      1
-#define OFF     0
 #define STREQ(a,b)    (strcmp(a,b) == 0)
 #define STRNEQ(a,b,c) (StrNCmp(a,b,c) == 0)