snapshot of project "lynx", label v2-8-6dev_13

8 files changed, 52 insertions, 21 deletions

diff --git a/CHANGES b/CHANGES
index fa2d127d..f40dd9b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2005-06-07 (2.8.6dev.13)
++ add a check in LYnormalColor() to ensure that the color value is really
+  a color, i.e., do not do anything for monochrome displays (reports by
+  OpenMacNews and Jens Schleusener) -TD
++ make -nomargins option apply to Options menu layout -TD
++ changes to LYwaddnstr() in dev.12 exposed a case from dev.6 where the title
+  string was not truncated to avoid wrapping (report by PG) -TD
++ changes to LYwaddnstr() in dev.12 allowed recursion in a case that was only
+  designed for iteration (report by OpenMacNews) -TD
+
 2005-06-02 (2.8.6dev.12)
 * add rw.po, vi.po from
     http://www.iro.umontreal.ca/translation/maint/lynx/
diff --git a/configure b/configure
index 6115ed5d..14013d26 100755
--- a/configure
+++ b/configure
@@ -1221,7 +1221,7 @@ fi;
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.12
+VERSION=2.8.6dev.13
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
diff --git a/configure.in b/configure.in
index a1145e21..22152be2 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6dev.12)
+AC_REVISION(2.8.6dev.13)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -37,7 +37,7 @@ AC_ARG_WITH(system-type,
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.12
+VERSION=2.8.6dev.13
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
diff --git a/lynx.cfg b/lynx.cfg
index 686c713a..a8a15ae3 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.6dev.12"
+#PRCS LYNX_VERSION "2.8.6dev.13"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Thu, 02 Jun 2005 15:36:59 -0700"
+#PRCS LYNX_DATE "Tue, 07 Jun 2005 03:45:24 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/src/GridText.c b/src/GridText.c
index 3e6e329b..e1d2c335 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1726,8 +1726,15 @@ static void display_title(HText *text)
 #endif /* USE_COLOR_STYLE */
 #ifdef WIDEC_CURSES
     i = limit - LYbarWidth - strlen(percent) - LYstrCells(title);
-    if (i <= 0)
+    if (i <= 0) {		/* title is truncated */
+	i = limit - LYbarWidth - strlen(percent) - 3;
+	if (i <= 0) {		/* no room at all */
+	    title[0] = '\0';
+	} else {
+	    strcpy(title + LYstrExtent2(title, i), "...");
+	}
 	i = 0;
+    }
     LYmove(0, i);
 #else
     i = (limit - 1) - strlen(percent) - strlen(title);
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 0cbee711..e608520b 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1773,6 +1773,7 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
 	int piece = (LYcolLimit - x0);
 
 	CTRACE((tfp, "LYwaddnstr wrapping src:%s, len:%d:%d\n", src, len, LYcolLimit));
+	LYwideLines = TRUE;	/* prevent recursion */
 	for (;;) {
 	    int y, x;
 
@@ -1787,6 +1788,7 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
 	    if ((start + piece) > (int) len)
 		piece = len - start;
 	}
+	LYwideLines = FALSE;
 	return;
     }
 #endif
@@ -2402,8 +2404,12 @@ void LYnormalColor(void)
 {
 #if defined(USE_COLOR_STYLE) && USE_CURSES_PADS
     if (LYwin != stdscr) {
-	wbkgd(LYwin, displayStyles[DSTYLE_NORMAL].color | ' ');
-	LYrefresh();
+	int color = displayStyles[DSTYLE_NORMAL].color;
+
+	if (color >= 0) {
+	    wbkgd(LYwin, color | ' ');
+	    LYrefresh();
+	}
     }
 #endif
 }
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 5eb8b67f..dd5b5c07 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -30,6 +30,9 @@ BOOLEAN term_options;
 #define TOP_LINK  "/"
 #define MBM_LINK  "//MBM_MENU"
 
+#define MARGIN_STR (no_margins ? "" : "&nbsp;&nbsp;")
+#define MARGIN_LEN (no_margins ?  0 : 2)
+
 static int LYChosenShowColor = SHOW_COLOR_UNKNOWN;	/* whether to show and save */
 
 static void terminate_options(int sig);
@@ -2401,6 +2404,9 @@ static const char *preferred_doc_char_string = RC_PREFERRED_CHARSET;
 static const char *preferred_doc_lang_string = RC_PREFERRED_LANGUAGE;
 static const char *user_agent_string = RC_USERAGENT;
 
+#define PutHeader(fp, Name) \
+	fprintf(fp, "\n%s<em>%s</em>\n", MARGIN_STR, Name);
+
 #define PutTextInput(fp, Name, Value, Size, disable) \
 	fprintf(fp,\
 	"<input size=%d type=\"text\" name=\"%s\" value=\"%s\" %s>\n",\
@@ -3261,7 +3267,8 @@ static void PutLabel(FILE *fp, const char *name,
     int want = LABEL_LEN;
     int need = LYstrExtent(name, have, want);
 
-    fprintf(fp, "&nbsp;&nbsp;%s", name);
+    fprintf(fp, "%s%s", MARGIN_STR, name);
+
     if (will_save_rc(value) && !no_option_save) {
 	while (need++ < want)
 	    fprintf(fp, "&nbsp;");
@@ -3361,7 +3368,9 @@ static int gen_options(char **newfile)
     BOOLEAN disable_all = FALSE;
     FILE *fp0;
     size_t cset_len = 0;
-    size_t text_len = LYscreenWidth() > 45 ? LYscreenWidth() - 38 : 7;	/* cf: PutLabel */
+    size_t text_len = ((LYcolLimit > 45)
+		       ? LYcolLimit - (LABEL_LEN + 2 + MARGIN_LEN)
+		       : 7);	/* cf: PutLabel */
 
     if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return (NOT_FOUND);
@@ -3434,7 +3443,7 @@ static int gen_options(char **newfile)
      */
     fprintf(fp0, "<pre>\n");
 
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("General Preferences"));
+    PutHeader(fp0, gettext("General Preferences"));
     /*****************************************************************/
 
     /* User Mode: SELECT */
@@ -3454,7 +3463,7 @@ static int gen_options(char **newfile)
     PutOptValues(fp0, case_sensitive, search_type_values);
     EndSelect(fp0);
 
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Security and Privacy"));
+    PutHeader(fp0, gettext("Security and Privacy"));
     /*****************************************************************/
 
     /* Cookies: SELECT */
@@ -3485,7 +3494,7 @@ static int gen_options(char **newfile)
     EndSelect(fp0);
 #endif
 
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Keyboard Input"));
+    PutHeader(fp0, gettext("Keyboard Input"));
     /*****************************************************************/
 
     /* Keypad Mode: SELECT */
@@ -3534,7 +3543,7 @@ static int gen_options(char **newfile)
     /*
      * Display and Character Set
      */
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Display and Character Set"));
+    PutHeader(fp0, gettext("Display and Character Set"));
     /*****************************************************************/
 
 #ifdef EXP_LOCALE_CHARSET
@@ -3615,7 +3624,7 @@ static int gen_options(char **newfile)
     /*
      * Document Appearance
      */
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Document Appearance"));
+    PutHeader(fp0, gettext("Document Appearance"));
     /*****************************************************************/
 
     /* Show Color: SELECT */
@@ -3699,8 +3708,7 @@ static int gen_options(char **newfile)
     /*
      * Headers Transferred to Remote Servers
      */
-    fprintf(fp0, "\n  <em>%s</em>\n",
-	    gettext("Headers Transferred to Remote Servers"));
+    PutHeader(fp0, gettext("Headers Transferred to Remote Servers"));
     /*****************************************************************/
 
     /* Mail Address: INPUT */
@@ -3745,7 +3753,7 @@ static int gen_options(char **newfile)
     /*
      * Listing and Accessing Files
      */
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Listing and Accessing Files"));
+    PutHeader(fp0, gettext("Listing and Accessing Files"));
     /*****************************************************************/
 
     /* FTP sort: SELECT */
@@ -3819,7 +3827,7 @@ static int gen_options(char **newfile)
     /*
      * Special Files and Screens
      */
-    fprintf(fp0, "\n  <em>%s</em>\n", gettext("Special Files and Screens"));
+    PutHeader(fp0, gettext("Special Files and Screens"));
     /*****************************************************************/
 
     /* Multi-Bookmark Mode: SELECT */
diff --git a/userdefs.h b/userdefs.h
index ba3e4657..4169fbea 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6dev.12"
+#define LYNX_VERSION "2.8.6dev.13"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Thu, 02 Jun 2005 15:36:59 -0700"
+#define LYNX_DATE "Tue, 07 Jun 2005 03:45:24 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */