LYNX-DEV ac lynx2.7.1ac-0.76b.patch77

[T.E.Dickey]

This one's short, so I'll post the whole thing (I just checked it in ad ac #77)

I also investigated, but did not change

        + complaint by Heikki Kantola about default value for --with-cfg-file
          (that's "correct" as-is, since the user could have set the
          --exec-prefix rather than --prefix option).  It's only "correct",
          since Lynx really shouldn't (according to the filesystem police ;-)
          be putting its configuration file under /usr/local/lib, but
          /usr/local/etc instead.  (The two are governed by different prefixes
          in the autoconf scheme).

        + request by Hynek Med to test for gcc -pipe option (I timed it and
          found no difference in build time).

--------------------------------------------------------------------------------
 CHANGES.configure |    9 +++++++++
 configure         |    2 +-
 configure.in      |    2 +-
 makefile.in       |    4 ++--
 src/GridText.c    |    6 +++---
 src/LYCurses.c    |    2 +-
 src/LYStrings.c   |    4 +++-
 7 files changed, 20 insertions, 9 deletions
--------------------------------------------------------------------------------
Index: CHANGES.configure
--- lynx2.7.1ac-0.76+/CHANGES.configure Mon Oct  6 00:08:00 1997
+++ lynx2.7.1ac-0.76b/CHANGES.configure Wed Oct  8 06:01:56 1997
@@ -1,3 +1,12 @@
+97-10-08
+--------
+* add logic to implement mouse button 2 "previous document" for
+  ncurses configuration. - TD
+* add dependencies on 'lynx' to top-level 'all' and 'install' rules
+  in makefile.in - TD
+* add osf4.0 to special case compiler options using -g3 in place of
+  -O -g, for Heikki Kantola <address@hidden>. - TD
+* correct some of the uninitialized-variable warnings. - TD
 97-09-19
 --------
 * minor ifdef/declaration fixes required to build on IRIX 6.2,
Index: configure
--- lynx2.7.1ac-0.76+/configure Wed Sep 17 19:34:13 1997
+++ lynx2.7.1ac-0.76b/configure Wed Oct  8 05:55:02 1997
@@ -1141,7 +1141,7 @@
 echo "$ac_t""$with_debug" 1>&6
 if test "$with_debug" = "yes" ; then
        case $host_os in
-       ultrix*)
+       ultrix*|osf4.*)
                
 CFLAGS=`echo ${CFLAGS} | sed -e 's/-O[1-9]\? //' -e 's/-O[1-9]\?$//'`
 
Index: configure.in
--- lynx2.7.1ac-0.76+/configure.in      Wed Sep 17 19:34:13 1997
+++ lynx2.7.1ac-0.76b/configure.in      Wed Oct  8 05:54:48 1997
@@ -47,7 +47,7 @@
 AC_MSG_RESULT($with_debug)
 if test "$with_debug" = "yes" ; then
        case $host_os in
-       ultrix*)
+       ultrix*|osf4.*)
                CF_STRIP_O_OPT(CFLAGS)
                if test -z "$GCC" ; then
                        CFLAGS="$CFLAGS -g3"
Index: makefile.in
--- lynx2.7.1ac-0.76+/makefile.in       Wed Sep 17 19:34:13 1997
+++ lynx2.7.1ac-0.76b/makefile.in       Tue Oct  7 19:49:02 1997
@@ -159,7 +159,7 @@
 # for installation of local execution links, please see the file userdefs.h
 #
 # TESTED: Linux FreeBSD SunOS Solaris IRIX CLIX HP-UX AIX SCO
-all:
+all lynx:
        cd WWW/Library/unix && $(MAKE) CC="$(CC)" \
                LYFLAGS="$(SITE_LYDEFS)"
        cd src && $(MAKE) all CC="$(CC)" \
@@ -229,7 +229,7 @@
 compress: tar
        cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar
 
-install: all
+install: lynx
        -mv -f $(bindir)/lynx $(bindir)/lynx.old
        -mv -f $(libdir)/lynx.cfg $(libdir)/lynx.oldcfg
        $(installbin) lynx $(bindir)/lynx
Index: src/GridText.c
--- lynx2.7.1ac-0.76+/src/GridText.c    Mon Oct  6 00:08:00 1997
+++ lynx2.7.1ac-0.76b/src/GridText.c    Tue Oct  7 19:44:26 1997
@@ -6495,14 +6495,14 @@
     char *MultipartContentType = NULL;
     int target_cs = -1;
     CONST char *target_csname = NULL;
-    char *name_used;
+    char *name_used = NULL;
 #ifdef EXP_CHARTRANS
     BOOL form_has_8bit = NO, form_has_special = NO;
     BOOL field_has_8bit = NO, field_has_special = NO;
     BOOL name_has_8bit = NO, name_has_special = NO;
     BOOL success;
     BOOL had_chartrans_warning = NO;
-    char *val_used;
+    char *val_used = NULL;
     char *copied_val_used = NULL;
     char *copied_name_used = NULL;
 #endif
@@ -7109,7 +7109,7 @@
                       (form_ptr->type == F_TEXT_SUBMIT_TYPE ||
                        (form_ptr->value && *form_ptr->value != '\0' &&
                         !strcmp(form_ptr->value, link_value)))) {
-                       int cdisp_name_startpos;
+                       int cdisp_name_startpos = 0;
                        if (first_one) {
                            if (Boundary) {
                                sprintf(&query[strlen(query)],
Index: src/LYCurses.c
--- lynx2.7.1ac-0.76+/src/LYCurses.c    Thu Sep 18 21:14:00 1997
+++ lynx2.7.1ac-0.76b/src/LYCurses.c    Tue Oct  7 21:00:59 1997
@@ -766,7 +766,7 @@
       button 1 is clicked */
 #ifndef _WINDOWS
    if (state)
-     mousemask(BUTTON1_CLICKED, NULL);
+     mousemask(BUTTON1_CLICKED | BUTTON2_CLICKED, NULL);
    else
      mousemask(0, NULL);
 #else
Index: src/LYStrings.c
--- lynx2.7.1ac-0.76+/src/LYStrings.c   Thu Sep 18 21:14:00 1997
+++ lynx2.7.1ac-0.76b/src/LYStrings.c   Tue Oct  7 20:56:00 1997
@@ -261,7 +261,7 @@
 }
 #endif
 
-#ifdef USE_SLANG_MOUSE
+#if defined(USE_SLANG_MOUSE) || defined(NCURSES_MOUSE_VERSION)
 PRIVATE int map_function_to_key ARGS1(char, keysym)
 {
    int i;
@@ -585,6 +585,8 @@
           err=getmouse(&event);
           if (event.bstate & BUTTON1_CLICKED) {
             c = set_clicked_link(event.x, event.y);
+          } else if (event.bstate & BUTTON2_CLICKED) {
+            c = map_function_to_key (LYK_PREV_DOC);
           }
 #else /* pdcurses version */
               int left,right;

-- 
Thomas E. Dickey
address@hidden
http://www.clark.net/pub/dickey
;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;