XFree86 3.9Ac - xterm patch #62 - 1998/1/23 - T.Dickey This is a patch mostly by Bjorn Helgaas (I added the os2main.c change, and a little of the documentation). From Bjorn's description: + If you use the "-hc " option or set the "highlightColor" resource, text is highlighted by changing only the background color, rather than using reverse video. I find this easier to read, especially when selecting multi-colored text, and it is similar to the way netscape shows selections. + Most of the code changes are under "#if OPT_HIGHLIGHT_COLOR". The principal exception is in screen.c, where I added a couple calls to resetXtermGC(). This seems like it could be a bug even without the color highlighting changes (though I don't pretend to understand all the logic). (Note that ctlseqs.ms is under xc/docs/specs/xterm). -------------------------------------------------------------------------------- charproc.c | 12 + configure | 389 ++++++++++++++++++++++++++++++--------------------------- configure.in | 8 + ctlseqs.ms | 3 main.c | 8 + os2main.c | 8 + ptyx.h | 12 + screen.c | 2 util.c | 19 ++ version.h | 2 xterm.man | 23 ++- xtermcfg.hin | 1 12 files changed, 291 insertions, 196 deletions -------------------------------------------------------------------------------- Index: charproc.c --- xterm-61+/charproc.c Sat Jan 17 14:16:52 1998 +++ xterm-62/charproc.c Tue Jan 20 05:31:04 1998 @@ -261,6 +261,9 @@ #define XtNcolorAttrMode "colorAttrMode" #define XtNboldColors "boldColors" #define XtNdynamicColors "dynamicColors" +#if OPT_HIGHLIGHT_COLOR +#define XtNhighlightColor "highlightColor" +#endif /* OPT_HIGHLIGHT_COLOR */ #define XtNunderLine "underLine" #define XtNdecTerminalID "decTerminalID" @@ -776,6 +779,11 @@ {XtNdynamicColors, XtCDynamicColors, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, misc.dynamicColors), XtRBoolean, (XtPointer) &defaultTRUE}, +#if OPT_HIGHLIGHT_COLOR +{XtNhighlightColor, XtCForeground, XtRPixel, sizeof(Pixel), + XtOffsetOf(XtermWidgetRec, screen.highlightcolor), + XtRString, "XtDefaultForeground"}, +#endif /* OPT_HIGHLIGHT_COLOR */ {XtNunderLine, XtCUnderLine, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, screen.underline), XtRBoolean, (XtPointer) &defaultTRUE}, @@ -3694,6 +3702,10 @@ new->num_ptrs = new->screen.colorMode ? 3 : 2; new->sgr_foreground = -1; #endif /* OPT_ISO_COLORS */ + +#if OPT_HIGHLIGHT_COLOR + new->screen.highlightcolor = request->screen.highlightcolor; +#endif #if OPT_DEC_CHRSET new->num_ptrs = 5; Index: configure --- xterm-61+/configure Sun Jan 11 11:57:36 1998 +++ xterm-62/configure Tue Jan 20 06:24:31 1998 @@ -193,10 +193,11 @@ --disable-16-color disable 16-color support (default: on) --disable-bold-color disable PC-style mapping of bold colors (default: on) --disable-color-mode disable default colorMode resource (default: on) + --disable-highlighting disable support for color highlighting (default: on) --disable-doublechars disable support for double-size chars (default: on) - --disable-input-method disable input-method (default: on) EOF cat <&6 -echo "configure:575: checking host system type" >&5 +echo "configure:576: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -622,7 +623,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:626: checking for $ac_word" >&5 +echo "configure:627: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -651,7 +652,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:655: checking for $ac_word" >&5 +echo "configure:656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -699,7 +700,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:703: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -709,11 +710,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -733,12 +734,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:737: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:742: checking whether we are using GNU C" >&5 +echo "configure:743: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +748,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -762,7 +763,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:766: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:767: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -790,7 +791,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:794: checking how to run the C preprocessor" >&5 +echo "configure:795: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -805,13 +806,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -822,13 +823,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -852,13 +853,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:856: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:857: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -876,7 +877,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -908,7 +909,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:912: checking for a BSD compatible install" >&5 +echo "configure:913: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -960,9 +961,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:964: checking for AIX" >&5 +echo "configure:965: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:988: checking for POSIXized ISC" >&5 +echo "configure:989: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1006,17 +1007,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1010: checking for minix/config.h" >&5 +echo "configure:1011: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1058,12 +1059,12 @@ ### checks for typedefs echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1062: checking for ANSI C header files" >&5 +echo "configure:1063: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1071,7 +1072,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1088,7 +1089,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1106,7 +1107,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1127,7 +1128,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1138,7 +1139,7 @@ exit (0); } EOF -if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1162,12 +1163,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1166: checking for size_t" >&5 +echo "configure:1167: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1195,12 +1196,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1199: checking for time_t" >&5 +echo "configure:1200: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1236,12 +1237,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1240: checking for $ac_func" >&5 +echo "configure:1241: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1292,7 +1293,7 @@ if test ".$ac_cv_func_memmove" != .yes ; then if test ".$ac_cv_func_bcopy" = ".yes" ; then echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:1296: checking if bcopy does overlapping moves" >&5 +echo "configure:1297: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1301,7 +1302,7 @@ cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1348,7 +1349,7 @@ echo $ac_n "checking for workable tgetent function""... $ac_c" 1>&6 -echo "configure:1352: checking for workable tgetent function" >&5 +echo "configure:1353: checking for workable tgetent function" >&5 if eval "test \"`echo '$''{'cf_cv_func_tgetent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1364,7 +1365,7 @@ cf_cv_func_tgetent=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "yes, there is a termcap/tgetent present" 1>&5 cf_cv_func_tgetent=yes @@ -1399,14 +1400,14 @@ for cf_termlib in $cf_TERMLIB do cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "there is a terminfo/tgetent present" 1>&5 cf_cv_func_tgetent=$cf_termlib @@ -1432,17 +1433,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1436: checking for $ac_hdr" >&5 +echo "configure:1437: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1480,13 +1481,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1484: checking for declaration of fd_set" >&5 +echo "configure:1485: checking for declaration of fd_set" >&5 if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1494,7 +1495,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1502,7 +1503,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1511,7 +1512,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1536,12 +1537,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1540: checking for working const" >&5 +echo "configure:1541: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1612,7 +1613,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1616: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1617: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1630,7 +1631,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1680,7 +1681,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1684: checking for X" >&5 +echo "configure:1685: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -1743,12 +1744,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1817,14 +1818,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1924,7 +1925,7 @@ # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:1928: checking for open in -lc_s" >&5 +echo "configure:1929: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1932,7 +1933,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1960,7 +1961,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:1964: checking for gethostname in -lbsd" >&5 +echo "configure:1965: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1968,7 +1969,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1996,7 +1997,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:2000: checking for gethostname in -lnsl_s" >&5 +echo "configure:2001: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2004,7 +2005,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2032,7 +2033,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:2036: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2037: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2040,7 +2041,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2068,7 +2069,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:2072: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2073: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2076,7 +2077,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2128,7 +2129,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2132: checking for socket in -lsocket" >&5 +echo "configure:2133: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2136,7 +2137,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2175,7 +2176,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2179: checking for gethostname in -lnsl" >&5 +echo "configure:2180: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2183,7 +2184,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2245,17 +2246,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2249: checking whether -R must be followed by a space" >&5 +echo "configure:2250: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2271,14 +2272,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2310,7 +2311,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2314: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2315: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2318,7 +2319,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2351,7 +2352,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2355: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2356: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2359,7 +2360,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2399,12 +2400,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2403: checking for gethostbyname" >&5 +echo "configure:2404: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2448,7 +2449,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2452: checking for gethostbyname in -lnsl" >&5 +echo "configure:2453: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2456,7 +2457,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2497,12 +2498,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2501: checking for connect" >&5 +echo "configure:2502: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2546,7 +2547,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2550: checking for connect in -lsocket" >&5 +echo "configure:2551: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2554,7 +2555,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2589,12 +2590,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2593: checking for remove" >&5 +echo "configure:2594: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2638,7 +2639,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2642: checking for remove in -lposix" >&5 +echo "configure:2643: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2646,7 +2647,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2681,12 +2682,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2685: checking for shmat" >&5 +echo "configure:2686: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2730,7 +2731,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2734: checking for shmat in -lipc" >&5 +echo "configure:2735: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2738,7 +2739,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2782,7 +2783,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2786: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2787: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2790,7 +2791,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2828,7 +2829,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2832: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2833: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2836,7 +2837,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2868,7 +2869,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2872: checking for XtAppInitialize in -lXt" >&5 +echo "configure:2873: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2876,7 +2877,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2932,17 +2933,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2936: checking for $ac_hdr" >&5 +echo "configure:2937: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2992,17 +2993,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2996: checking for $ac_hdr" >&5 +echo "configure:2997: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3030,7 +3031,7 @@ echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3034: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3035: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3038,7 +3039,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3076,7 +3077,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3080: checking for XmuClientWindow in -lXmu_s" >&5 +echo "configure:3081: checking for XmuClientWindow in -lXmu_s" >&5 ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3084,7 +3085,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3126,7 +3127,7 @@ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3130: checking for XextCreateExtension in -lXext" >&5 +echo "configure:3131: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3134,7 +3135,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3167,7 +3168,7 @@ echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 -echo "configure:3171: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +echo "configure:3172: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3175,7 +3176,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$cf_x_athena $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3206,7 +3207,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6 -echo "configure:3210: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +echo "configure:3211: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3214,7 +3215,7 @@ ac_save_LIBS="$LIBS" LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3264,12 +3265,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3268: checking for $ac_func" >&5 +echo "configure:3269: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3318,7 +3319,7 @@ echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3322: checking if we should use imake to help" >&5 +echo "configure:3323: checking if we should use imake to help" >&5 # Check whether --enable-imake or --disable-imake was given. if test "${enable_imake+set}" = set; then @@ -3343,7 +3344,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3347: checking for $ac_word" >&5 +echo "configure:3348: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3475,7 +3476,7 @@ echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3479: checking for default terminal-id" >&5 +echo "configure:3480: checking for default terminal-id" >&5 # Check whether --with-terminal-id or --without-terminal-id was given. if test "${with_terminal_id+set}" = set; then @@ -3496,7 +3497,7 @@ echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6 -echo "configure:3500: checking for default terminal-type" >&5 +echo "configure:3501: checking for default terminal-type" >&5 # Check whether --with-terminal-type or --without-terminal-type was given. if test "${with_terminal_type+set}" = set; then @@ -3514,7 +3515,7 @@ ### checks for optional features echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:3518: checking if you want active-icons" >&5 +echo "configure:3519: checking if you want active-icons" >&5 # Check whether --enable-active-icon or --disable-active-icon was given. if test "${enable_active_icon+set}" = set; then @@ -3540,7 +3541,7 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3544: checking if you want ANSI color" >&5 +echo "configure:3545: checking if you want ANSI color" >&5 # Check whether --enable-ansi-color or --disable-ansi-color was given. if test "${enable_ansi_color+set}" = set; then @@ -3564,7 +3565,7 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3568: checking if you want 16 colors like aixterm" >&5 +echo "configure:3569: checking if you want 16 colors like aixterm" >&5 # Check whether --enable-16-color or --disable-16-color was given. if test "${enable_16_color+set}" = set; then @@ -3588,7 +3589,7 @@ echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:3592: checking if you want bold colors mapped like IBM PC" >&5 +echo "configure:3593: checking if you want bold colors mapped like IBM PC" >&5 # Check whether --enable-bold-color or --disable-bold-color was given. if test "${enable_bold_color+set}" = set; then @@ -3612,7 +3613,7 @@ echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:3616: checking if you want color-mode enabled by default" >&5 +echo "configure:3617: checking if you want color-mode enabled by default" >&5 # Check whether --enable-color-mode or --disable-color-mode was given. if test "${enable_color_mode+set}" = set; then @@ -3635,8 +3636,32 @@ EOF +echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6 +echo "configure:3641: checking if you want support for color highlighting" >&5 + +# Check whether --enable-highlighting or --disable-highlighting was given. +if test "${enable_highlighting+set}" = set; then + enableval="$enable_highlighting" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + default_highlight=no + else + default_highlight=yes + fi +else + enableval=yes + default_highlight=yes + +fi + +echo "$ac_t""$default_highlight" 1>&6 +test $default_highlight = no && cat >> confdefs.h <<\EOF +#define OPT_HIGHLIGHT_COLOR 0 +EOF + + echo $ac_n "checking for doublesize characters""... $ac_c" 1>&6 -echo "configure:3640: checking for doublesize characters" >&5 +echo "configure:3665: checking for doublesize characters" >&5 # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then @@ -3660,7 +3685,7 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3664: checking if you want support for input-method" >&5 +echo "configure:3689: checking if you want support for input-method" >&5 # Check whether --enable-input-method or --disable-input-method was given. if test "${enable_input_method+set}" = set; then @@ -3686,7 +3711,7 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3690: checking if you want support for internationalization" >&5 +echo "configure:3715: checking if you want support for internationalization" >&5 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then @@ -3712,7 +3737,7 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:3716: checking if you want support for logging" >&5 +echo "configure:3741: checking if you want support for logging" >&5 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then @@ -3738,7 +3763,7 @@ fi echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 -echo "configure:3742: checking if you want support for right-scrollbar" >&5 +echo "configure:3767: checking if you want support for right-scrollbar" >&5 # Check whether --enable-rightbar or --disable-rightbar was given. if test "${enable_rightbar+set}" = set; then @@ -3764,7 +3789,7 @@ fi echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6 -echo "configure:3768: checking if you want support for tek4014" >&5 +echo "configure:3793: checking if you want support for tek4014" >&5 # Check whether --enable-tek4014 or --disable-tek4014 was given. if test "${enable_tek4014+set}" = set; then @@ -3794,7 +3819,7 @@ fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:3798: checking if you want VT52 emulation" >&5 +echo "configure:3823: checking if you want VT52 emulation" >&5 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then @@ -3819,7 +3844,7 @@ # development/testing aids echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:3823: checking if you want debugging traces" >&5 +echo "configure:3848: checking if you want debugging traces" >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then @@ -3848,7 +3873,7 @@ echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3852: checking if you want to see long compiling messages" >&5 +echo "configure:3877: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -3888,7 +3913,7 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:3892: checking if you want magic cookie emulation" >&5 +echo "configure:3917: checking if you want magic cookie emulation" >&5 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. if test "${enable_xmc_glitch+set}" = set; then @@ -3917,7 +3942,7 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3921: checking if you want to turn on gcc warnings" >&5 +echo "configure:3946: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -3957,9 +3982,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:3961: checking for gcc __attribute__ directives" >&5 +echo "configure:3986: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h # else @@ -4014,11 +4039,11 @@ if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:4022: checking for gcc warning options" >&5 +echo "configure:4047: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -4036,7 +4061,7 @@ Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" Index: configure.in --- xterm-61+/configure.in Sun Jan 11 11:57:36 1998 +++ xterm-62/configure.in Tue Jan 20 05:31:04 1998 @@ -157,6 +157,14 @@ AC_MSG_RESULT($default_colormode) test $default_colormode = no && AC_DEFINE(DFT_COLORMODE,FALSE) +AC_MSG_CHECKING(if you want support for color highlighting) +CF_ARG_DISABLE(highlighting, + [ --disable-highlighting disable support for color highlighting], + [default_highlight=no], + [default_highlight=yes]) +AC_MSG_RESULT($default_highlight) +test $default_highlight = no && AC_DEFINE(OPT_HIGHLIGHT_COLOR,0) + AC_MSG_CHECKING(for doublesize characters) CF_ARG_DISABLE(doublechars, [ --disable-doublechars disable support for double-size chars], Index: ctlseqs.ms --- xterm-61+/ctlseqs.ms Sun Oct 26 16:05:57 1997 +++ xterm-62/ctlseqs.ms Thu Jan 22 21:01:49 1998 @@ -833,13 +833,14 @@ \*(Ps = \*1 \(-> Change Icon Name to \*(Pt \*(Ps = \*2 \(-> Change Window Title to \*(Pt \*(Ps = \*1\*0 \(-> Change color names starting with text foreground to \*(Pt (a -list of one or more color names, separated by semicolon, up to color6). +list of one or more color names, separated by semicolon, up to seven). \*(Ps = \*1\*1 \(-> Change colors starting with text background to \*(Pt \*(Ps = \*1\*2 \(-> Change colors starting with text cursor to \*(Pt \*(Ps = \*1\*3 \(-> Change colors starting with mouse foreground to \*(Pt \*(Ps = \*1\*4 \(-> Change colors starting with mouse background to \*(Pt \*(Ps = \*1\*5 \(-> Change colors starting with Tek foreground to \*(Pt \*(Ps = \*1\*6 \(-> Change colors starting with Tek background to \*(Pt + \*(Ps = \*1\*7 \(-> Change colors starting with highlight to \*(Pt \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt (normally disabled by a compile-time option) \*(Ps = \*5\*0 \(-> Set Font to \*(Pt Index: main.c --- xterm-61+/main.c Sun Jan 11 11:57:36 1998 +++ xterm-62/main.c Tue Jan 20 05:31:04 1998 @@ -806,6 +806,9 @@ #ifndef NO_ACTIVE_ICON {"-fi", "*iconFont", XrmoptionSepArg, (caddr_t) NULL}, #endif /* NO_ACTIVE_ICON */ +#if OPT_HIGHLIGHT_COLOR +{"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, +#endif {"-j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "on"}, {"+j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "off"}, /* parse logging options anyway for compatibility */ @@ -905,6 +908,9 @@ { "-/+cu", "turn on/off curses emulation" }, { "-/+dc", "turn off/on dynamic color selection" }, { "-fb fontname", "bold text font" }, +#if OPT_HIGHLIGHT_COLOR +{ "-hc", "selection background color" }, +#endif { "-/+im", "use insert mode for TERMCAP" }, { "-/+j", "turn on/off jump scroll" }, #ifdef ALLOWLOGGING @@ -1111,7 +1117,7 @@ if (argc > 1) { if (!strncmp(argv[1], "-v", 2)) Version(); - if (!strncmp(argv[1], "-h", 2)) + if (!strncmp(argv[1], "-h", 2) && strncmp(argv[1], "-hc", 2)) Help(); } Index: os2main.c --- xterm-61+/os2main.c Sun Jan 11 11:57:36 1998 +++ xterm-62/os2main.c Thu Jan 22 20:54:08 1998 @@ -340,6 +340,9 @@ #ifndef NO_ACTIVE_ICON {"-fi", "*iconFont", XrmoptionSepArg, (caddr_t) NULL}, #endif /* NO_ACTIVE_ICON */ +#if OPT_HIGHLIGHT_COLOR +{"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, +#endif {"-j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "on"}, {"+j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "off"}, /* parse logging options anyway for compatibility */ @@ -439,6 +442,9 @@ { "-/+cu", "turn on/off curses emulation" }, { "-/+dc", "turn off/on dynamic color selection" }, { "-fb fontname", "bold text font" }, +#if OPT_HIGHLIGHT_COLOR +{ "-hc", "selection background color" }, +#endif { "-/+im", "use insert mode for TERMCAP" }, { "-/+j", "turn on/off jump scroll" }, #ifdef ALLOWLOGGING @@ -768,7 +774,7 @@ if (argc > 1) { if (!strncmp(argv[1], "-v", 2)) Version(); - if (!strncmp(argv[1], "-h", 2)) + if (!strncmp(argv[1], "-h", 2) && strncmp(argv[1], "-hc", 2)) Help(); } Index: ptyx.h --- xterm-61+/ptyx.h Sun Jan 11 11:57:36 1998 +++ xterm-62/ptyx.h Thu Jan 22 20:54:55 1998 @@ -260,7 +260,8 @@ #define MOUSE_BG 4 #define TEK_FG 5 #define TEK_BG 6 -#define NCOLORS 7 +#define HIGHLIGHT_BG 7 +#define NCOLORS 8 #define COLOR_DEFINED(s,w) ((s)->which&(1<<(w))) #define COLOR_VALUE(s,w) ((s)->colors[w]) @@ -322,7 +323,11 @@ #endif #ifndef OPT_PC_COLORS -#define OPT_PC_COLORS 1 /* true if xterm is supports PC-style (bold) colors */ +#define OPT_PC_COLORS 1 /* true if xterm supports PC-style (bold) colors */ +#endif + +#ifndef OPT_HIGHLIGHT_COLOR +#define OPT_HIGHLIGHT_COLOR 1 /* true if xterm supports color highlighting */ #endif #ifndef OPT_SUNPC_KBD @@ -562,6 +567,9 @@ Boolean colorBDMode; /* use color for bold? */ Boolean colorBLMode; /* use color for blink? */ Boolean colorAttrMode; /* prefer colorUL/BD to SGR */ +#endif +#if OPT_HIGHLIGHT_COLOR + Pixel highlightcolor; /* Highlight background color */ #endif #if OPT_DEC_CHRSET Char chrset; /* character-set index & code */ Index: screen.c --- xterm-61+/screen.c Sun Jan 11 11:57:36 1998 +++ xterm-62/screen.c Tue Jan 20 05:31:04 1998 @@ -686,6 +686,7 @@ x = drawXtermText(screen, flags, gc, x, y, cs, &chars[lastind], col - lastind); + resetXtermGC(screen, flags, hilite); lastind = col; @@ -713,6 +714,7 @@ drawXtermText(screen, flags, gc, x, y, cs, &chars[lastind], col - lastind); + resetXtermGC(screen, flags, hilite); } /* Index: util.c --- xterm-61+/util.c Sun Jan 11 11:57:36 1998 +++ xterm-62/util.c Tue Jan 20 05:31:04 1998 @@ -1134,6 +1134,9 @@ SET_COLOR_VALUE(pColors,TEXT_CURSOR, screen->cursorcolor); SET_COLOR_VALUE(pColors,MOUSE_FG, screen->mousecolor); SET_COLOR_VALUE(pColors,MOUSE_BG, screen->mousecolorback); +#if OPT_HIGHLIGHT_COLOR + SET_COLOR_VALUE(pColors,HIGHLIGHT_BG, screen->highlightcolor); +#endif #if OPT_TEK4014 SET_COLOR_VALUE(pColors,TEK_FG, screen->Tforeground); SET_COLOR_VALUE(pColors,TEK_BG, screen->Tbackground); @@ -1196,6 +1199,13 @@ screen->mousecolor, screen->mousecolorback); XDefineCursor(screen->display, TextWindow(screen), screen->pointer_cursor); + +#if OPT_HIGHLIGHT_COLOR + if (COLOR_DEFINED(pNew,HIGHLIGHT_BG)) { + screen->highlightcolor= COLOR_VALUE(pNew,HIGHLIGHT_BG); + } +#endif + #if OPT_TEK4014 if(tek) XDefineCursor(screen->display, tek, screen->arrow); @@ -1432,6 +1442,9 @@ { Pixel fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags)); Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg)); +#if OPT_HIGHLIGHT_COLOR + Pixel hi_pix = screen->highlightcolor; +#endif GC gc; if ( (!hilite && (flags & INVERSE) != 0) @@ -1441,9 +1454,13 @@ else gc = ReverseGC(screen); +#if OPT_HIGHLIGHT_COLOR + XSetForeground(screen->display, gc, hi_pix ? fg_pix : bg_pix); + XSetBackground(screen->display, gc, hi_pix ? hi_pix : fg_pix); +#else XSetForeground(screen->display, gc, bg_pix); XSetBackground(screen->display, gc, fg_pix); - +#endif } else { if (flags & (BOLD|BLINK)) gc = NormalBoldGC(screen); Index: version.h --- xterm-61+/version.h Sat Jan 17 14:03:44 1998 +++ xterm-62/version.h Thu Jan 22 20:49:16 1998 @@ -6,4 +6,4 @@ * version of xterm has been built. The number in parentheses is my patch * number (T.Dickey). */ -#define XTERM_VERSION "XFree86 3.9Ac(61)" +#define XTERM_VERSION "XFree86 3.9Ac(62)" Index: xterm.man --- xterm-61+/xterm.man Sun Jan 11 11:57:36 1998 +++ xterm-62/xterm.man Thu Jan 22 21:04:37 1998 @@ -243,15 +243,15 @@ bug mentioned above. .TP 8 .B "\-dc" -This option disables the escape sequence to change the vt100 foreground -and background colors, the text cursor color, the mouse cursor foreground -and background colors and the Tektronix emulator foreground and background -colors. +This option disables the escape sequence to change dynamic colors: +the vt100 foreground and background colors, +the text cursor color, +the mouse cursor foreground and background colors, +the Tektronix emulator foreground and background colors, +and highlight color. .TP 8 .B "\+dc" -This option enables the escape sequence to change the vt100 foreground -and background colors, the text cursor color, the mouse cursor foreground -and background colors and the Tektronix emulator foreground and background +This option enables the escape sequence to change dynamic colors. .TP 8 .BI \-e " program \fP[ \fIarguments \fP.\|.\|. ]\fI" This option specifies the program (and its command line arguments) to be @@ -271,6 +271,11 @@ This option sets the font for active icons if that feature was compiled in to xterm. .TP 8 +.BI \-hc " color" +This option specifies the color to use for the background of +selected or otherwise highlighted text. If not specified, +reverse video is used. +.TP 8 .B \-im Turn on the \fBuseInsertMode\fP resource. .TP 8 @@ -795,6 +800,10 @@ .TP 8 .B "cursorColor (\fPclass\fB Foreground)" Specifies the color to use for the text cursor. The default is ``black.'' +.TP 8 +.B "highlightColor (\fPclass\fB Foreground)" +Specifies the color to use for the background of selected or otherwise +highlighted text. If not specified, reverse video is used. .TP 8 .B "decTerminalID (\fPclass\fB DecTerminalID)" Specifies the emulation level (100=VT100, 220=VT220, etc.), used to determine Index: xtermcfg.hin --- xterm-61+/xtermcfg.hin Sun Jan 11 11:57:36 1998 +++ xterm-62/xtermcfg.hin Tue Jan 20 05:31:04 1998 @@ -47,6 +47,7 @@ #undef OPT_INPUT_METHOD /* CF_ARG_DISABLE(input-method) */ #undef OPT_ISO_COLORS /* CF_ARG_DISABLE(ansi-color) */ #undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */ +#undef OPT_HIGHLIGHT_COLOR /* CF_ARG_DISABLE(highlighting) */ #undef OPT_TEK4014 /* CF_ARG_DISABLE(tek4014) */ #undef OPT_TRACE /* CF_ARG_ENABLE(trace) */ #undef OPT_VT52_MODE /* CF_ARG_DISABLE(vt52) */