XFree86 3.9Ab - xterm patch #58 - 1998/1/3 - T.Dickey This patch does the following: + implement logic to permit xterm to work with proportional fonts. Thomas Wolff requested this (but it isn't exactly what he's asking for - that's a more involved task). I chose to do this by rendering the characters on a fixed pitch, because it would not be useful for existing applications to display varying numbers of characters on each line. Except that this forces the display to be wider, it works reasonably well. A couple of special cases (reverse + colorBD, for example) do not display with proper colors, since the inter-character gaps are painted with the background. + added a version number to the program (several people have requested this). + make the -version and -help options interpreted before the program attempts to open the display. + minor reorganization of the man-page (ordered the options, resources and translations alphabetically - and eliminated some duplication). + corrected a misspelled filename in Makefile.in, and added a lint rule. + updated the configure script to correct behavior when it cannot find imake, as well as to fix the IRIX+gcc build (conflict with /usr/include). + regenerated the configure script with a newer patch to autoconf that fixes a problem with environment space vs the configure --help message. -------------------------------------------------------------------------------- Makefile.in | 18 + aclocal.m4 | 54 ++++- charproc.c | 42 +++- configure | 517 +++++++++++++++++++++++++++------------------------ configure.in | 2 main.c | 44 +++- os2main.c | 37 ++- ptyx.h | 3 screen.c | 8 util.c | 56 ++++- xterm-58/version.h | 7 xterm.h | 2 xterm.man | 467 ++++++++++++++++++++++------------------------ 13 files changed, 728 insertions, 529 deletions -------------------------------------------------------------------------------- Index: Makefile.in --- xterm-57+/Makefile.in Mon Dec 29 12:22:34 1997 +++ xterm-58/Makefile.in Sat Jan 3 08:25:35 1998 @@ -12,13 +12,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ + IMAKE_CFLAGS = @IMAKE_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ -CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) $(IMAKE_CFLAGS) -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ +CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H $(X_CFLAGS) $(IMAKE_CFLAGS) +CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) +LIBS = @LIBS@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -33,8 +35,6 @@ SHELL = /bin/sh RM = rm -f -CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H $(X_CFLAGS) - LDFLAGS = INSTALL_DIRS = $(bindir) $(libdir) $(mandir) @@ -54,7 +54,7 @@ SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) HDRS = VTparse.h data.h error.h main.h menu.h proto.h \ - ptyx.h xterm.h $(EXTRAHDR) + ptyx.h version.h xterm.h $(EXTRAHDR) PROGRAMS = xterm resize all: $(PROGRAMS) @@ -101,6 +101,10 @@ realclean: distclean -$(RM) tags TAGS + +lint: + lint $(CPPFLAGS) $(SRCS1) + lint $(CPPFLAGS) $(SRCS2) tags: ctags $(SRCS) $(HDRS) Index: aclocal.m4 --- xterm-57+/aclocal.m4 Mon Dec 29 12:22:34 1997 +++ xterm-58/aclocal.m4 Sat Jan 3 10:20:40 1998 @@ -3,7 +3,7 @@ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 1997 by Thomas E. Dickey +dnl Copyright 1997,1998 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -375,7 +375,7 @@ AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl Use imake to obtain compiler flags. We could, in principal, write tests to +dnl Use imake to obtain compiler flags. We could, in principle, write tests to dnl get these, but if imake is properly configured there is no point in doing dnl this. AC_DEFUN([CF_IMAKE_CFLAGS], @@ -419,14 +419,15 @@ esac done if test -z "$cf_config" ; then - AC_ERROR(Could not find imake config-directory) - fi - cf_imake_opts="$cf_imake_opts -I$cf_config" - if ( $IMAKE -v $cf_imake_opts 2>&AC_FD_CC) - then - CF_VERBOSE(Using $IMAKE $cf_config) + AC_WARN(Could not find imake config-directory) else - AC_ERROR(Cannot run $IMAKE) + cf_imake_opts="$cf_imake_opts -I$cf_config" + if ( $IMAKE -v $cf_imake_opts 2>&AC_FD_CC) + then + CF_VERBOSE(Using $IMAKE $cf_config) + else + AC_WARN(Cannot run $IMAKE) + fi fi fi @@ -436,6 +437,41 @@ cd .. rm -rf conftestdir + + # We use $(ALLDEFINES) rather than $(STD_DEFINES) because the former + # declares XTFUNCPROTO there. However, some vendors (e.g., SGI) have + # modified it to support site.cf, adding a kludge for the /usr/include + # directory. Try to filter that out, otherwise gcc won't find its + # headers. + if test -n "$GCC" ; then + if test -n "$IMAKE_CFLAGS" ; then + cf_nostdinc="" + cf_std_incl="" + cf_cpp_opts="" + for cf_opt in $IMAKE_CFLAGS + do + case "$cf_opt" in + -nostdinc) #(vi + cf_nostdinc="$cf_opt" + ;; + -I/usr/include) #(vi + cf_std_incl="$cf_opt" + ;; + *) #(vi + cf_cpp_opts="$cf_cpp_opts $cf_opt" + ;; + esac + done + if test -z "$cf_nostdinc" ; then + IMAKE_CFLAGS="$cf_cpp_opts $cf_std_incl" + elif test -z "$cf_std_incl" ; then + IMAKE_CFLAGS="$cf_cpp_opts $cf_nostdinc" + else + CF_VERBOSE(suppressed \"$cf_nostdinc\" and \"$cf_std_incl\") + IMAKE_CFLAGS="$cf_cpp_opts" + fi + fi + fi fi AC_SUBST(IMAKE_CFLAGS) ])dnl Index: charproc.c --- xterm-57+/charproc.c Mon Dec 29 12:22:34 1997 +++ xterm-58/charproc.c Fri Jan 2 20:27:14 1998 @@ -866,8 +866,11 @@ XSetForeground(screen->display, NormalGC(screen), fg); XSetBackground(screen->display, ReverseGC(screen), fg); - XSetForeground(screen->display, NormalBoldGC(screen), fg); - XSetBackground(screen->display, ReverseBoldGC(screen), fg); + + if (NormalGC(screen) != NormalBoldGC(screen)) { + XSetForeground(screen->display, NormalBoldGC(screen), fg); + XSetBackground(screen->display, ReverseBoldGC(screen), fg); + } } void SGR_Background(color) @@ -886,8 +889,11 @@ XSetBackground(screen->display, NormalGC(screen), bg); XSetForeground(screen->display, ReverseGC(screen), bg); - XSetBackground(screen->display, NormalBoldGC(screen), bg); - XSetForeground(screen->display, ReverseBoldGC(screen), bg); + + if (NormalGC(screen) != NormalBoldGC(screen)) { + XSetBackground(screen->display, NormalBoldGC(screen), bg); + XSetForeground(screen->display, ReverseBoldGC(screen), bg); + } } /* Invoked after updating bold/underline flags, computes the extended color @@ -4246,6 +4252,7 @@ } TRACE(("%s @%d, calling drawXtermText\n", __FILE__, __LINE__)) + drawXtermText(screen, flags, currentGC, x = CurCursorX(screen, screen->cur_row, screen->cur_col), y = CursorY(screen, screen->cur_row), @@ -4810,6 +4817,7 @@ GC new_reverseGC = NULL, new_reverseboldGC = NULL; Pixel new_normal, new_revers; char *tmpname = NULL; + Boolean proportional = False; if (!nfontname) return 0; @@ -4831,6 +4839,14 @@ if (bfs->ascent + bfs->descent == 0 || bfs->max_bounds.width == 0) goto bad; /* can't use a 0-sized font */ + if (nfs->min_bounds.width != nfs->max_bounds.width + || bfs->min_bounds.width != bfs->max_bounds.width + || nfs->min_bounds.width != bfs->min_bounds.width + || nfs->max_bounds.width != bfs->max_bounds.width) { + TRACE(("Proportional font!\n")) + proportional = True; + } + mask = (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCFunction); @@ -4891,6 +4907,7 @@ screen->fnt_norm = nfs; screen->fnt_bold = bfs; + screen->fnt_prop = proportional; screen->enbolden = (nfs == bfs); set_menu_font (False); @@ -4984,6 +5001,7 @@ Pixel fg = screen->foreground; Pixel bg = term->core.background_pixel; GC new_cursorGC = NULL; + GC new_cursorFillGC = NULL; GC new_reversecursorGC = NULL; GC new_cursoroutlineGC = NULL; @@ -5027,6 +5045,10 @@ xgcv.background = cc; new_cursorGC = XCreateGC (screen->display, TextWindow(screen), mask, &xgcv); + xgcv.foreground = cc; + xgcv.background = fg; + new_cursorFillGC = XCreateGC (screen->display, TextWindow(screen), mask, &xgcv); + if (screen->always_highlight) { new_reversecursorGC = (GC) 0; new_cursoroutlineGC = (GC) 0; @@ -5045,10 +5067,15 @@ /* we have a colored cursor */ xgcv.font = screen->fnt_norm->fid; mask = (GCForeground | GCBackground | GCFont); + xgcv.foreground = fg; xgcv.background = cc; new_cursorGC = XtGetGC ((Widget) term, mask, &xgcv); + xgcv.foreground = cc; + xgcv.background = fg; + new_cursorFillGC = XtGetGC ((Widget) term, mask, &xgcv); + if (screen->always_highlight) { new_reversecursorGC = (GC) 0; new_cursoroutlineGC = (GC) 0; @@ -5067,6 +5094,8 @@ { if (screen->cursorGC) XFreeGC (screen->display, screen->cursorGC); + if (screen->fillCursorGC) + XFreeGC (screen->display, screen->fillCursorGC); if (screen->reversecursorGC) XFreeGC (screen->display, screen->reversecursorGC); if (screen->cursoroutlineGC) @@ -5077,13 +5106,16 @@ { if (screen->cursorGC) XtReleaseGC ((Widget)term, screen->cursorGC); + if (screen->fillCursorGC) + XtReleaseGC ((Widget)term, screen->fillCursorGC); if (screen->reversecursorGC) XtReleaseGC ((Widget)term, screen->reversecursorGC); if (screen->cursoroutlineGC) XtReleaseGC ((Widget)term, screen->cursoroutlineGC); } - screen->cursorGC = new_cursorGC; + screen->cursorGC = new_cursorGC; + screen->fillCursorGC = new_cursorFillGC; screen->reversecursorGC = new_reversecursorGC; screen->cursoroutlineGC = new_cursoroutlineGC; } Index: configure --- xterm-57+/configure Mon Dec 29 12:22:34 1997 +++ xterm-58/configure Sat Jan 3 10:19:54 1998 @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.970309 +# Generated automatically using autoconf version 2.12.971230 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -11,50 +11,6 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_help="$ac_help - --with-x use the X Window System" -ac_help="$ac_help - --with-Xaw3d link with Xaw 3d library" -ac_help="$ac_help - --with-neXtaw link with neXT Athena library" -ac_help="$ac_help - --disable-imake disable use of imake for definitions (default: on)" -ac_help="$ac_help - --with-terminal-id[=V] set default decTerminalID (default: vt100)" -ac_help="$ac_help - --with-terminal-type=T set default \$TERM (default: xterm)" -ac_help="$ac_help - --disable-active-icon disable X11R6.3 active-icon feature (default: on)" -ac_help="$ac_help - --disable-ansi-color disable ANSI color (default: on)" -ac_help="$ac_help - --disable-16-color disable 16-color support (default: on)" -ac_help="$ac_help - --disable-bold-color disable PC-style mapping of bold colors (default: on)" -ac_help="$ac_help - --disable-color-mode disable default colorMode resource (default: on)" -ac_help="$ac_help - --disable-doublechars disable support for double-size chars (default: on)" -ac_help="$ac_help - --disable-input-method disable input-method (default: on)" -ac_help="$ac_help - --disable-i18n disable internationalization (default: on)" -ac_help="$ac_help - --enable-logging enable logging (default: off)" -ac_help="$ac_help - --disable-rightbar disable right-scrollbar support (default: on)" -ac_help="$ac_help - --disable-tek4014 disable tek4014 emulation (default: on)" -ac_help="$ac_help - --disable-vt52 disable VT52 emulation (default: on)" -ac_help="$ac_help - --enable-trace test: set to enable debugging traces (default: off)" -ac_help="$ac_help - --disable-echo test: display \"compiling\" commands (default: on)" -ac_help="$ac_help - --enable-xmc-glitch test: enable xmc magic-cookie emulation (default: off)" -ac_help="$ac_help - --enable-warnings test: turn on GCC compiler warnings (default: off)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -224,9 +180,33 @@ --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi +cat <&6 -echo "configure:595: checking host system type" >&5 +echo "configure:575: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -642,7 +622,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:646: checking for $ac_word" >&5 +echo "configure:626: 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 @@ -671,7 +651,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:675: checking for $ac_word" >&5 +echo "configure:655: 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 @@ -719,7 +699,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:703: 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. @@ -729,11 +709,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:717: \"$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 @@ -753,12 +733,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:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:737: 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:762: checking whether we are using GNU C" >&5 +echo "configure:742: 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 @@ -767,7 +747,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:771: \"$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:751: \"$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 @@ -782,7 +762,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:786: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:766: 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 @@ -810,7 +790,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:814: checking how to run the C preprocessor" >&5 +echo "configure:794: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -825,13 +805,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:835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -842,13 +822,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:852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -872,13 +852,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:876: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:856: 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 @@ -896,7 +876,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -928,7 +908,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:932: checking for a BSD compatible install" >&5 +echo "configure:912: 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 @@ -980,9 +960,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:984: checking for AIX" >&5 +echo "configure:964: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1008: checking for POSIXized ISC" >&5 +echo "configure:988: 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 @@ -1026,17 +1006,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1030: checking for minix/config.h" >&5 +echo "configure:1010: 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:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1078,12 +1058,12 @@ ### checks for typedefs echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1082: checking for ANSI C header files" >&5 +echo "configure:1062: 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 @@ -1091,7 +1071,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1108,7 +1088,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 @@ -1126,7 +1106,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 @@ -1147,7 +1127,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1158,7 +1138,7 @@ exit (0); } EOF -if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1182,12 +1162,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1186: checking for size_t" >&5 +echo "configure:1166: 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 @@ -1215,12 +1195,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1219: checking for time_t" >&5 +echo "configure:1199: 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 @@ -1256,12 +1236,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1260: checking for $ac_func" >&5 +echo "configure:1240: 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:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1312,7 +1292,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:1316: checking if bcopy does overlapping moves" >&5 +echo "configure:1296: 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 @@ -1321,7 +1301,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:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1368,7 +1348,7 @@ echo $ac_n "checking for workable tgetent function""... $ac_c" 1>&6 -echo "configure:1372: checking for workable tgetent function" >&5 +echo "configure:1352: 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 @@ -1384,7 +1364,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:1382: \"$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 @@ -1419,14 +1399,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:1410: \"$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 @@ -1452,17 +1432,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1456: checking for $ac_hdr" >&5 +echo "configure:1436: 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:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1500,13 +1480,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1504: checking for declaration of fd_set" >&5 +echo "configure:1484: 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 < @@ -1514,7 +1494,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1522,7 +1502,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1531,7 +1511,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1556,12 +1536,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1560: checking for working const" >&5 +echo "configure:1540: 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:1594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1632,7 +1612,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1636: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1616: 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 @@ -1650,7 +1630,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1700,7 +1680,8 @@ # 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:1704: checking for X" >&5 +echo "configure:1684: checking for X" >&5 + # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1762,12 +1743,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:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1836,14 +1817,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:1828: \"$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. @@ -1943,7 +1924,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:1947: checking for open in -lc_s" >&5 +echo "configure:1928: 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 @@ -1951,7 +1932,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:1947: \"$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 @@ -1979,7 +1960,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:1983: checking for gethostname in -lbsd" >&5 +echo "configure:1964: 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 @@ -1987,7 +1968,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:1983: \"$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 @@ -2015,7 +1996,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:2019: checking for gethostname in -lnsl_s" >&5 +echo "configure:2000: 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 @@ -2023,7 +2004,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:2019: \"$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 @@ -2051,7 +2032,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:2055: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2036: 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 @@ -2059,7 +2040,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:2055: \"$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 @@ -2087,7 +2068,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:2091: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2072: 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 @@ -2095,7 +2076,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:2091: \"$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 @@ -2147,7 +2128,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2151: checking for socket in -lsocket" >&5 +echo "configure:2132: 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 @@ -2155,7 +2136,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:2151: \"$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 @@ -2194,7 +2175,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2198: checking for gethostname in -lnsl" >&5 +echo "configure:2179: 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 @@ -2202,7 +2183,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:2198: \"$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 @@ -2264,17 +2245,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:2268: checking whether -R must be followed by a space" >&5 +echo "configure:2249: 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:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2290,14 +2271,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:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2329,7 +2310,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:2333: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2314: 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 @@ -2337,7 +2318,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:2333: \"$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 @@ -2370,7 +2351,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:2374: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2355: 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 @@ -2378,7 +2359,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:2374: \"$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 @@ -2418,12 +2399,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:2422: checking for gethostbyname" >&5 +echo "configure:2403: 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:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2467,7 +2448,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2471: checking for gethostbyname in -lnsl" >&5 +echo "configure:2452: 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 @@ -2475,7 +2456,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:2471: \"$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 @@ -2516,12 +2497,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:2520: checking for connect" >&5 +echo "configure:2501: 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:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2565,7 +2546,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2569: checking for connect in -lsocket" >&5 +echo "configure:2550: 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 @@ -2573,7 +2554,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:2569: \"$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 @@ -2608,12 +2589,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:2612: checking for remove" >&5 +echo "configure:2593: 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:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2657,7 +2638,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2661: checking for remove in -lposix" >&5 +echo "configure:2642: 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 @@ -2665,7 +2646,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:2661: \"$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 @@ -2700,12 +2681,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2704: checking for shmat" >&5 +echo "configure:2685: 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:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2749,7 +2730,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2753: checking for shmat in -lipc" >&5 +echo "configure:2734: 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 @@ -2757,7 +2738,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:2753: \"$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 @@ -2801,7 +2782,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:2805: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2786: 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 @@ -2809,7 +2790,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:2805: \"$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 @@ -2847,7 +2828,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2851: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2832: 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 @@ -2855,7 +2836,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:2851: \"$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 @@ -2887,7 +2868,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2891: checking for XtAppInitialize in -lXt" >&5 +echo "configure:2872: 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 @@ -2895,7 +2876,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:2891: \"$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 @@ -2951,17 +2932,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2955: checking for $ac_hdr" >&5 +echo "configure:2936: 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:2965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2991,6 +2972,7 @@ cf_x_athena=${cf_x_athena-Xaw} + # Check whether --with-Xaw3d or --without-Xaw3d was given. if test "${with_Xaw3d+set}" = set; then withval="$with_Xaw3d" @@ -2998,6 +2980,7 @@ fi + # Check whether --with-neXtaw or --without-neXtaw was given. if test "${with_neXtaw+set}" = set; then withval="$with_neXtaw" @@ -3009,17 +2992,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3013: checking for $ac_hdr" >&5 +echo "configure:2996: 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:3023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3047,7 +3030,7 @@ echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3051: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3034: 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 @@ -3055,7 +3038,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:3053: \"$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 @@ -3093,7 +3076,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3097: checking for XmuClientWindow in -lXmu_s" >&5 +echo "configure:3080: 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 @@ -3101,7 +3084,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:3099: \"$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 @@ -3143,7 +3126,7 @@ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3147: checking for XextCreateExtension in -lXext" >&5 +echo "configure:3130: 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 @@ -3151,7 +3134,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:3149: \"$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 @@ -3184,7 +3167,7 @@ echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 -echo "configure:3188: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +echo "configure:3171: 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 @@ -3192,7 +3175,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:3190: \"$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 @@ -3223,7 +3206,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:3227: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +echo "configure:3210: 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 @@ -3231,7 +3214,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:3229: \"$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 @@ -3277,7 +3260,8 @@ LIBS="$LIBS $X_EXTRA_LIBS" echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3281: checking if we should use imake to help" >&5 +echo "configure:3264: 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 enableval="$enable_imake" @@ -3301,7 +3285,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:3305: checking for $ac_word" >&5 +echo "configure:3289: 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 @@ -3371,15 +3355,16 @@ esac done if test -z "$cf_config" ; then - { echo "configure: error: Could not find imake config-directory" 1>&2; exit 1; } - fi - cf_imake_opts="$cf_imake_opts -I$cf_config" - if ( $IMAKE -v $cf_imake_opts 2>&5) - then - test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 - + echo "configure: warning: Could not find imake config-directory" 1>&2 else - { echo "configure: error: Cannot run $IMAKE" 1>&2; exit 1; } + cf_imake_opts="$cf_imake_opts -I$cf_config" + if ( $IMAKE -v $cf_imake_opts 2>&5) + then + test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 + + else + echo "configure: warning: Cannot run $IMAKE" 1>&2 + fi fi fi @@ -3389,6 +3374,42 @@ cd .. rm -rf conftestdir + + # We use $(ALLDEFINES) rather than $(STD_DEFINES) because the former + # declares XTFUNCPROTO there. However, some vendors (e.g., SGI) have + # modified it to support site.cf, adding a kludge for the /usr/include + # directory. Try to filter that out, otherwise gcc won't find its + # headers. + if test -n "$GCC" ; then + if test -n "$IMAKE_CFLAGS" ; then + cf_nostdinc="" + cf_std_incl="" + cf_cpp_opts="" + for cf_opt in $IMAKE_CFLAGS + do + case "$cf_opt" in + -nostdinc) #(vi + cf_nostdinc="$cf_opt" + ;; + -I/usr/include) #(vi + cf_std_incl="$cf_opt" + ;; + *) #(vi + cf_cpp_opts="$cf_cpp_opts $cf_opt" + ;; + esac + done + if test -z "$cf_nostdinc" ; then + IMAKE_CFLAGS="$cf_cpp_opts $cf_std_incl" + elif test -z "$cf_std_incl" ; then + IMAKE_CFLAGS="$cf_cpp_opts $cf_nostdinc" + else + test -n "$verbose" && echo " suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6 + + IMAKE_CFLAGS="$cf_cpp_opts" + fi + fi + fi fi @@ -3396,7 +3417,8 @@ echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3400: checking for default terminal-id" >&5 +echo "configure:3421: 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 withval="$with_terminal_id" @@ -3416,7 +3438,8 @@ echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6 -echo "configure:3420: checking for default terminal-type" >&5 +echo "configure:3442: 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 withval="$with_terminal_type" @@ -3433,7 +3456,8 @@ ### checks for optional features echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:3437: checking if you want active-icons" >&5 +echo "configure:3460: 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 enableval="$enable_active_icon" @@ -3458,7 +3482,8 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3462: checking if you want ANSI color" >&5 +echo "configure:3486: 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 enableval="$enable_ansi_color" @@ -3481,7 +3506,8 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3485: checking if you want 16 colors like aixterm" >&5 +echo "configure:3510: 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 enableval="$enable_16_color" @@ -3504,7 +3530,8 @@ echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:3508: checking if you want bold colors mapped like IBM PC" >&5 +echo "configure:3534: 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 enableval="$enable_bold_color" @@ -3527,7 +3554,8 @@ echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:3531: checking if you want color-mode enabled by default" >&5 +echo "configure:3558: 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 enableval="$enable_color_mode" @@ -3550,7 +3578,8 @@ echo $ac_n "checking for doublesize characters""... $ac_c" 1>&6 -echo "configure:3554: checking for doublesize characters" >&5 +echo "configure:3582: checking for doublesize characters" >&5 + # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then enableval="$enable_doublechars" @@ -3573,7 +3602,8 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3577: checking if you want support for input-method" >&5 +echo "configure:3606: 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 enableval="$enable_input_method" @@ -3598,7 +3628,8 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3602: checking if you want support for internationalization" >&5 +echo "configure:3632: checking if you want support for internationalization" >&5 + # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then enableval="$enable_i18n" @@ -3623,7 +3654,8 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:3627: checking if you want support for logging" >&5 +echo "configure:3658: checking if you want support for logging" >&5 + # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then enableval="$enable_logging" @@ -3648,7 +3680,8 @@ fi echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 -echo "configure:3652: checking if you want support for right-scrollbar" >&5 +echo "configure:3684: 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 enableval="$enable_rightbar" @@ -3673,7 +3706,8 @@ fi echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6 -echo "configure:3677: checking if you want support for tek4014" >&5 +echo "configure:3710: checking if you want support for tek4014" >&5 + # Check whether --enable-tek4014 or --disable-tek4014 was given. if test "${enable_tek4014+set}" = set; then enableval="$enable_tek4014" @@ -3696,13 +3730,14 @@ EOF else - EXTRAHDRS="$EXTRAHDRS TekParse.h" + EXTRAHDRS="$EXTRAHDRS Tekparse.h" EXTRASRCS="$EXTRASRCS TekPrsTbl.c Tekproc.c" EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:3706: checking if you want VT52 emulation" >&5 +echo "configure:3740: checking if you want VT52 emulation" >&5 + # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then enableval="$enable_vt52" @@ -3726,7 +3761,8 @@ # development/testing aids echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:3730: checking if you want debugging traces" >&5 +echo "configure:3765: checking if you want debugging traces" >&5 + # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -3754,7 +3790,8 @@ echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3758: checking if you want to see long compiling messages" >&5 +echo "configure:3794: 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 enableval="$enable_echo" @@ -3793,7 +3830,8 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:3797: checking if you want magic cookie emulation" >&5 +echo "configure:3834: 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 enableval="$enable_xmc_glitch" @@ -3821,7 +3859,8 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3825: checking if you want to turn on gcc warnings" >&5 +echo "configure:3863: 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 enableval="$enable_warnings" @@ -3860,9 +3899,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:3864: checking for gcc __attribute__ directives" >&5 +echo "configure:3903: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3943: \"$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 @@ -3917,11 +3956,11 @@ if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:3925: checking for gcc warning options" >&5 +echo "configure:3964: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3939,7 +3978,7 @@ Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3982: \"$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" @@ -4049,7 +4088,7 @@ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12.970309" + echo "$CONFIG_STATUS generated by autoconf version 2.12.971230" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -4255,6 +4294,7 @@ EOF + # Transform confdefs.h into a sed script conftest.vals that substitutes # the proper values into config.h.in to produce config.h. And first: # Protect against being on the right side of a sed subst in config.status. @@ -4300,6 +4340,7 @@ done rm -f conftest.vals + cat >> $CONFIG_STATUS <<\EOF rm -f conftest.frag conftest.h echo "/* $ac_file. Generated automatically by configure. */" > conftest.h @@ -4322,9 +4363,11 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +# Extra commands, if any exit 0 EOF Index: configure.in --- xterm-57+/configure.in Mon Dec 29 12:22:34 1997 +++ xterm-58/configure.in Fri Jan 2 20:27:14 1998 @@ -210,7 +210,7 @@ if test $enable_tek4014 = no ; then AC_DEFINE(OPT_TEK4014,0) else - EXTRAHDRS="$EXTRAHDRS TekParse.h" + EXTRAHDRS="$EXTRAHDRS Tekparse.h" EXTRASRCS="$EXTRASRCS TekPrsTbl.c Tekproc.c" EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" fi Index: main.c --- xterm-57+/main.c Mon Dec 29 12:22:34 1997 +++ xterm-58/main.c Sat Jan 3 09:55:44 1998 @@ -73,6 +73,7 @@ #include #endif +#include "version.h" #include "ptyx.h" #include #include @@ -490,6 +491,7 @@ extern int tgetent PROTO((char *ptr, char *name)); +static SIGNAL_T reapchild PROTO((int n)); static char *base_name PROTO((char *name)); static int pty_search PROTO((int *pty)); static int remove_termcap_entry PROTO((char *buf, char *str)); @@ -499,9 +501,9 @@ static void HsSysError PROTO((int pf, int error)); static void KeyboardMapping PROTO_XT_ACTIONS_ARGS; static void Syntax PROTO((char *badOption)); +static void Version PROTO((void)); static void get_terminal PROTO((void)); static void resize PROTO((TScreen *s, char *oldtc, char *newtc)); -static SIGNAL_T reapchild PROTO((int n)); static Bool added_utmp_entry = False; @@ -873,6 +875,7 @@ char *opt; char *desc; } options[] = { +{ "-version", "print the version number" }, { "-help", "print out this message" }, { "-display displayname", "X server to contact" }, { "-geometry geom", "size (in characters) and position" }, @@ -960,12 +963,11 @@ { NULL, NULL }}; static char *message[] = { -"Fonts must be fixed width and, if both normal and bold are specified, must", +"Fonts should be fixed width and, if both normal and bold are specified, should", "have the same size. If only a normal font is specified, it will be used for", "both normal and bold text (by doing overstriking). The -e option, if given,", -"must be appear at the end of the command line, otherwise the user's default", -"shell will be started. Options that start with a plus sign (+) restore the", -"default.", +"must appear at the end of the command line, otherwise the user's default shell", +"will be started. Options that start with a plus sign (+) restore the default.", NULL}; static void Syntax (badOption) @@ -994,13 +996,19 @@ exit (1); } +static void Version () +{ + puts (XTERM_VERSION); + exit (0); +} + static void Help () { struct _options *opt; char **cpp; - fprintf (stderr, "usage:\n %s [-options ...] [-e command args]\n\n", - ProgramName); + fprintf (stderr, "%s usage:\n %s [-options ...] [-e command args]\n\n", + XTERM_VERSION, ProgramName); fprintf (stderr, "where options include:\n"); for (opt = options; opt->opt; opt++) { fprintf (stderr, " %-28s %s\n", opt->opt, opt->desc); @@ -1098,13 +1106,20 @@ register TScreen *screen; int mode; + /* Do these first, since we may not be able to open the display */ + ProgramName = argv[0]; + if (argc >= 1) { + if (!strncmp(argv[1], "-v", 2)) + Version(); + if (!strncmp(argv[1], "-h", 2)) + Help(); + } + /* This dumps core on HP-UX 9.05 with X11R5 */ #if OPT_I18N_SUPPORT XtSetLanguageProc (NULL, NULL, NULL); #endif - ProgramName = argv[0]; - #ifndef AMOEBA /* +2 in case longer tty name like /dev/ttyq255 */ ttydev = (char *) malloc (sizeof(TTYDEV) + 2); @@ -1378,11 +1393,13 @@ (int) ruid, strerror(errno)); #endif + XtSetErrorHandler(xt_error); toplevel = XtAppInitialize (&app_con, "XTerm", optionDescList, XtNumber(optionDescList), &argc, argv, fallback_resources, NULL, 0); + XtSetErrorHandler((XtErrorHandler)0); XtGetApplicationResources(toplevel, (XtPointer) &resource, application_resources, @@ -2284,8 +2301,10 @@ /* avoid double MapWindow requests */ XtSetMappedWhenManaged(XtParent(CURRENT_EMU(screen)), False ); + wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); + if (!TEK4014_ACTIVE(screen)) VTInit(); /* realize now so know window size for tty driver */ #if defined(TIOCCONS) || defined(SRIOCSREDIR) @@ -2550,12 +2569,13 @@ } /* use the same tty name that everyone else will use - ** (from ttyname) - */ + * (from ttyname) + */ if ((ptr = ttyname(tty)) != 0) { /* it may be bigger */ - ttydev = realloc (ttydev, (unsigned) (strlen(ptr) + 1)); + ttydev = realloc (ttydev, + (unsigned) (strlen(ptr) + 1)); (void) strcpy(ttydev, ptr); } #if defined(SYSV) && defined(i386) && !defined(SVR4) Index: os2main.c --- xterm-57+/os2main.c Mon Dec 29 12:22:34 1997 +++ xterm-58/os2main.c Sat Jan 3 09:53:03 1998 @@ -124,7 +124,9 @@ static void Help PROTO((void)); static void KeyboardMapping PROTO_XT_ACTIONS_ARGS; static void Syntax PROTO((char *badOption)); +static void Version PROTO((void)); static void get_terminal PROTO((void)); +static void my_error_handler PROTO((String message)); static void resize PROTO((TScreen *s, char *oldtc, char *newtc)); static SIGNAL_T reapchild PROTO((int n)); @@ -407,6 +409,7 @@ char *opt; char *desc; } options[] = { +{ "-version", "print the version number" }, { "-help", "print out this message" }, { "-display displayname", "X server to contact" }, { "-geometry geom", "size (in characters) and position" }, @@ -501,12 +504,11 @@ } */ static char *message[] = { -"Fonts must be fixed width and, if both normal and bold are specified, must", +"Fonts should be fixed width and, if both normal and bold are specified, should", "have the same size. If only a normal font is specified, it will be used for", "both normal and bold text (by doing overstriking). The -e option, if given,", -"must be appear at the end of the command line, otherwise the user's default", -"shell will be started. Options that start with a plus sign (+) restore the", -"default.", +"must appear at the end of the command line, otherwise the user's default shell", +"will be started. Options that start with a plus sign (+) restore the default.", NULL}; static void Syntax (badOption) @@ -535,13 +537,19 @@ exit (1); } +static void Version () +{ + puts (XTERM_VERSION); + exit (0); +} + static void Help () { struct _options *opt; char **cpp; - fprintf (stderr, "usage:\n %s [-options ...] [-e command args]\n\n", - ProgramName); + fprintf (stderr, "%s usage:\n %s [-options ...] [-e command args]\n\n", + XTERM_VERSION, ProgramName); fprintf (stderr, "where options include:\n"); for (opt = options; opt->opt; opt++) { fprintf (stderr, " %-28s %s\n", opt->opt, opt->desc); @@ -755,6 +763,15 @@ int mode; extern char **environ; + /* Do these first, since we may not be able to open the display */ + ProgramName = argv[0]; + if (argc >= 1) { + if (!strncmp(argv[1], "-v", 2)) + Version(); + if (!strncmp(argv[1], "-h", 2)) + Help(); + } + /* XXX: for some obscure reason EMX seems to lose the value of * the environ variable, don't understand why, so save it recently */ @@ -764,8 +781,6 @@ setlocale(LC_ALL, NULL); #endif - ProgramName = argv[0]; - /*debug opencons();*/ ttydev = (char *) malloc (PTMS_BUFSZ); @@ -805,6 +820,7 @@ XtNumber(optionDescList), &argc, argv, fallback_resources, NULL, 0); + XtSetErrorHandler((XtErrorHandler)0); XtGetApplicationResources(toplevel, (XtPointer) &resource, application_resources, @@ -1441,11 +1457,12 @@ * (from ttyname) */ #ifdef EMXNOTBOGUS - if (ptr = ttyname(tty)) { + if ((ptr = ttyname(tty)) != 0) + { /* it may be bigger */ ttydev = realloc (ttydev, (unsigned) (strlen(ptr) + 1)); - strcpy(ttydev, ptr); + (void) strcpy(ttydev, ptr); } #else ptr = ttydev; Index: ptyx.h --- xterm-57+/ptyx.h Mon Dec 29 12:22:34 1997 +++ xterm-58/ptyx.h Fri Jan 2 20:27:14 1998 @@ -535,6 +535,7 @@ int uid; /* user id of actual person */ int gid; /* group id of actual person */ GC cursorGC; /* normal cursor painting */ + GC fillCursorGC; /* special cursor painting */ GC reversecursorGC;/* reverse cursor painting */ GC cursoroutlineGC;/* for painting lines around */ Pixel foreground; /* foreground color */ @@ -597,7 +598,7 @@ Boolean printer_formfeed; /* print formfeed per function */ int printer_controlmode; /* 0=off, 1=auto, 2=controller */ - /* Terminal fonts must be of the same size and of fixed width */ + Boolean fnt_prop; /* true if proportional fonts */ XFontStruct *fnt_norm; /* normal font of terminal */ XFontStruct *fnt_bold; /* bold font of terminal */ #ifndef NO_ACTIVE_ICON Index: screen.c --- xterm-57+/screen.c Sat Dec 6 10:24:45 1997 +++ xterm-58/screen.c Fri Jan 2 20:27:14 1998 @@ -642,13 +642,11 @@ || (cb[col] != cs) #endif ) { - TRACE(("%s @%d, calling drawXtermText\n", __FILE__, __LINE__)) - drawXtermText(screen, flags, gc, x, y, + TRACE(("%s @%d, calling drawXtermText %d..%d\n", __FILE__, __LINE__, lastind, col)) + x = drawXtermText(screen, flags, gc, x, y, cs, &chars[lastind], col - lastind); - x += (col - lastind) * CurFontWidth(screen,row); - lastind = col; if (hilite && (col > hi_col)) @@ -671,7 +669,7 @@ chars[col] = ' '; } - TRACE(("%s @%d, calling drawXtermText\n", __FILE__, __LINE__)) + TRACE(("%s @%d, calling drawXtermText %d..%d\n", __FILE__, __LINE__, lastind, col)) drawXtermText(screen, flags, gc, x, y, cs, &chars[lastind], col - lastind); Index: util.c --- xterm-57+/util.c Mon Dec 29 12:22:34 1997 +++ xterm-58/util.c Fri Jan 2 20:27:14 1998 @@ -1043,9 +1043,9 @@ int both_x1 = Max(screen->copy_src_x, reply->x); int both_y1 = Max(screen->copy_src_y, reply->y); int both_x2 = Min(screen->copy_src_x+screen->copy_width, - reply->x+reply->width); + (unsigned)(reply->x+reply->width)); int both_y2 = Min(screen->copy_src_y+screen->copy_height, - reply->y+reply->height); + (unsigned)(reply->y+reply->height)); int value = 0; /* was anything copied affected? */ @@ -1329,7 +1329,7 @@ /* * Draws text with the specified combination of bold/underline */ -void +int drawXtermText(screen, flags, gc, x, y, chrset, text, len) register TScreen *screen; unsigned flags; @@ -1351,12 +1351,54 @@ temp[n++] = *text++; temp[n++] = ' '; } - drawXtermText(screen, flags, gc, x, y, 0, temp, n); - x += FontWidth(screen) * n; + x = drawXtermText(screen, flags, gc, x, y, 0, temp, n); free(temp); - return; + return x; } #endif + /* + * If we're asked to display a proportional font, do this with a fixed + * pitch. Yes, it's ugly. But we cannot distinguish the use of xterm + * as a dumb terminal vs its use as in fullscreen programs such as vi. + */ + if (screen->fnt_prop) { + int adj, width; + GC fillGC = gc; /* might be cursorGC */ + XFontStruct *fs = (flags & BOLD) + ? screen->fnt_bold + : screen->fnt_norm; + screen->fnt_prop = False; + +#define GC_PAIRS(a,b) \ + if (gc == a) fillGC = b; \ + if (gc == b) fillGC = a + + /* + * Fill the area where we'll write the characters, otherwise + * we'll get gaps between them. The cursor is a special case, + * because the XFillRectangle call only uses the foreground, + * while we've set the cursor color in the background. So we + * need a special GC for that. + */ + if (gc == screen->cursorGC + || gc == screen->reversecursorGC) + fillGC = screen->fillCursorGC; + GC_PAIRS(NormalGC(screen), ReverseGC(screen)); + GC_PAIRS(NormalBoldGC(screen), ReverseBoldGC(screen)); + + XFillRectangle (screen->display, TextWindow(screen), fillGC, + x, y, len * FontWidth(screen), FontHeight(screen)); + + while (len-- > 0) { + width = XTextWidth(fs, text, 1); + adj = (FontWidth(screen) - width) / 2; + (void)drawXtermText(screen, flags, gc, x + adj, y, chrset, text++, 1); + x += FontWidth(screen); + } + screen->fnt_prop = True; + return x; + } + TRACE(("drawtext%c[%4d,%4d] (%d) %d:%.*s\n", screen->cursor_state == OFF ? ' ' : '*', y, x, chrset, len, len, text)) @@ -1372,6 +1414,8 @@ XDrawLine(screen->display, TextWindow(screen), gc, x, y, x + len * FontWidth(screen), y); } + + return x + len * FontWidth(screen); } /* Index: version.h --- /dev/null Sun Jul 17 19:46:18 1994 +++ xterm-58/version.h Sat Jan 3 08:55:47 1998 @@ -0,0 +1,7 @@ +/* + * This is the string that's printed in response to "xterm -version", or + * embedded in "xterm -help". It is the version of XFree86 to which this + * version of xterm has been built. The number in parentheses is my patch + * number (T.Dickey). + */ +#define XTERM_VERSION "XFree86 3.9Ab(58)" Index: xterm.h --- xterm-57+/xterm.h Mon Dec 29 12:22:34 1997 +++ xterm-58/xterm.h Fri Jan 2 20:27:14 1998 @@ -211,6 +211,7 @@ extern GC updatedXtermGC PROTO((TScreen *screen, int flags, int fg_bg, Bool hilite)); extern int AddToRefresh PROTO((TScreen *screen)); extern int HandleExposure PROTO((TScreen *screen, XEvent *event)); +extern int drawXtermText PROTO((TScreen *screen, unsigned flags, GC gc, int x, int y, int chrset, Char *text, int len)); extern void ChangeColors PROTO((XtermWidget tw, ScrnColors *pNew)); extern void ClearRight PROTO((TScreen *screen, int n)); extern void ClearScreen PROTO((TScreen *screen)); @@ -225,7 +226,6 @@ extern void Scroll PROTO((TScreen *screen, int amount)); extern void do_erase_display PROTO((TScreen *screen, int param, int mode)); extern void do_erase_line PROTO((TScreen *screen, int param, int mode)); -extern void drawXtermText PROTO((TScreen *screen, unsigned flags, GC gc, int x, int y, int chrset, Char *text, int len)); extern void recolor_cursor PROTO((Cursor cursor, unsigned long fg, unsigned long bg)); extern void resetXtermGC PROTO((TScreen *screen, int flags, Bool hilite)); extern void scrolling_copy_area PROTO((TScreen *screen, int firstline, int nlines, int amount)); Index: xterm.man --- xterm-57+/xterm.man Sun Nov 16 13:09:00 1997 +++ xterm-58/xterm.man Sat Jan 3 09:41:23 1998 @@ -86,7 +86,7 @@ .B Tektronix menu; see below). The name of the file will be -``\fBCOPY\fIyyyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fR'', where +``\fBCOPY\fIyyyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fP'', where .IR yy , .IR MM , .IR dd , @@ -133,10 +133,18 @@ .RB ` + ' instead of a .RB ` \- ', -the option is restored to its default value): +the option is restored to its default value). +The \-version and \-help options are interpreted even if \fIxterm\fP cannot +open the display, and are useful for testing and configuration scripts: +.TP 8 +.B \-version +This causes \fIxterm\fP to print a version number to the standard output. .TP 8 .B \-help This causes \fIxterm\fP to print out a verbose message describing its options. +The message is written to the standard error. +.PP +The other options are used to control the appearance and behavior: .TP 8 .B \-132 Normally, the VT102 DECCOLM escape sequence that switches between 80 and @@ -235,10 +243,15 @@ bug mentioned above. .TP 8 .B "\-dc" -This option disables recognition of color-change escape sequences. +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. .TP 8 .B "\+dc" -This option enables recognition of color-change escape sequences. +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 .TP 8 .BI \-e " program \fP[ \fIarguments \fP.\|.\|. ]\fI" This option specifies the program (and its command line arguments) to be @@ -499,17 +512,20 @@ The following standard X Toolkit command line arguments are commonly used with \fIxterm\fP: .TP 8 -.B \-bg \fIcolor\fP -This option specifies the color to use for the background of the window. -The default is ``white.'' -.TP 8 .B \-bd \fIcolor\fP This option specifies the color to use for the border of the window. The default is ``black.'' .TP 8 +.B \-bg \fIcolor\fP +This option specifies the color to use for the background of the window. +The default is ``white.'' +.TP 8 .B \-bw \fInumber\fP This option specifies the width in pixels of the border surrounding the window. .TP 8 +.B \-display \fIdisplay\fP +This option specifies the X server to contact; see \fIX(1)\fP. +.TP 8 .B \-fg \fIcolor\fP This option specifies the color to use for displaying text. The default is ``black.'' @@ -518,46 +534,32 @@ This option specifies the font to be used for displaying normal text. The default is \fIfixed\fP. .TP 8 +.B \-geometry \fIgeometry\fP +This option specifies the preferred size and position of the VT102 window; +see \fIX(1)\fP. +.TP 8 +.B \-iconic +This option indicates that \fIxterm\fP should ask the window manager to +start it as an icon rather than as the normal window. +.TP 8 .B \-name \fIname\fP This option specifies the application name under which resources are to be obtained, rather than the default executable file name. \fIName\fP should not contain ``.'' or ``*'' characters. .TP 8 +.B \-rv +This option indicates that reverse video should be simulated by swapping +the foreground and background colors. +.TP 8 .B \-title \fIstring\fP This option specifies the window title string, which may be displayed by window managers if the user so chooses. The default title is the command line specified after the \fB\-e\fP option, if any, otherwise the application name. .TP 8 -.B \-rv -This option indicates that reverse video should be simulated by swapping -the foreground and background colors. -.TP 8 -.B \-geometry \fIgeometry\fP -This option specifies the preferred size and position of the VT102 window; -see \fIX(1)\fP. -.TP 8 -.B \-display \fIdisplay\fP -This option specifies the X server to contact; see \fIX(1)\fP. -.TP 8 .B \-xrm \fIresourcestring\fP This option specifies a resource string to be used. This is especially useful for setting resources that do not have separate command line options. -.TP 8 -.B \-iconic -This option indicates that \fIxterm\fP should ask the window manager to -start it as an icon rather than as the normal window. -.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. -.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 .SH RESOURCES The program understands all of the core X Toolkit resource names and classes as well as: @@ -570,6 +572,18 @@ .B "iconName (\fPclass\fB IconName)" Specifies the icon name. The default is the application name. .TP 8 +.B "sunFunctionKeys (\fPclass\fB SunFunctionKeys)" +Specifies whether or not Sun Function Key escape codes should be generated for +function keys instead of standard escape sequences. +.TP 8 +.B "sunKeyboard (\fPclass\fB SunKeyboard)" +Specifies whether or not Sun/PC keyboard layout should be assumed rather +than DEC VT220. +This causes the keypad `+' to be mapped to `,'. +and +CTRL-F1 to F13, CTRL-F2 to F14, etc. +.\".in -1in +.TP 8 .B "termName (\fPclass\fB TermName)" Specifies the terminal type name to be set in the TERM environment variable. .TP 8 @@ -595,18 +609,6 @@ Specifies whether or not \fIxterm\fP should try to record the user's terminal in \fI/etc/utmp\fP. .TP 8 -.B "sunFunctionKeys (\fPclass\fB SunFunctionKeys)" -Specifies whether or not Sun Function Key escape codes should be generated for -function keys instead of standard escape sequences. -.TP 8 -.B "sunKeyboard (\fPclass\fB SunKeyboard)" -Specifies whether or not Sun/PC keyboard layout should be assumed rather -than DEC VT220. -This causes the keypad `+' to be mapped to `,'. -and -CTRL-F1 to F13, CTRL-F2 to F14, etc. -.\".in -1in -.TP 8 .B "waitForMap (\fPclass\fB WaitForMap)" Specifies whether or not \fIxterm\fP should wait for the initial window map before starting the subprocess. The default is ``false.'' @@ -661,6 +663,10 @@ or delete character. The default (backspace) is ``true.'' .TP 8 +.B "background (\fPclass\fB Background)" +Specifies the color to use for the background of the window. The default is +``white.'' +.TP 8 .B "bellSuppressTime (\fPclass\fB BellSuppressTime)" Number of milliseconds after a bell command is sent during which additional bells will be suppressed. Default is 200. If set non-zero, @@ -771,6 +777,14 @@ .B "colorUL (\fPclass\fB Foreground)" This specifies the color to use to display underlined characters if the ``colorULMode'' resource is enabled. +.\" .TP 8 +.\" .B "cursorBlinkTime (\fPclass\fB CursorBlinkTime)" +.\" Specifies the cursor blink cycle-time +.\" (i.e., the time to turn the cursor on and off). +.\" The default is 0, which disables blinking. +.TP 8 +.B "cursorColor (\fPclass\fB Foreground)" +Specifies the color to use for the text cursor. The default is ``black.'' .TP 8 .B "decTerminalID (\fPclass\fB DecTerminalID)" Specifies the emulation level (100=VT100, 220=VT220, etc.), used to determine @@ -781,23 +795,10 @@ Specifies whether or not escape sequences to change colors assigned to different attributes are recognized. .TP 8 -.B "background (\fPclass\fB Background)" -Specifies the color to use for the background of the window. The default is -``white.'' -.TP 8 -.B "foreground (\fPclass\fB Foreground)" -Specifies the color to use for displaying text in the window. Setting the -class name instead of the instance name is an easy way to have everything -that would normally appear in the text color change color. The default -is ``black.'' -.\" .TP 8 -.\" .B "cursorBlinkTime (\fPclass\fB CursorBlinkTime)" -.\" Specifies the cursor blink cycle-time -.\" (i.e., the time to turn the cursor on and off). -.\" The default is 0, which disables blinking. -.TP 8 -.B "cursorColor (\fPclass\fB Foreground)" -Specifies the color to use for the text cursor. The default is ``black.'' +.B "eightBitControl (\fPclass\fB EightBitControl\fP)" +Specifies whether or not control sequences sent by the +terminal should be eight-bit characters or escape sequences. +The default is ``false.'' .TP 8 .B "eightBitInput (\fPclass\fB EightBitInput\fP)" If true, Meta characters input from the keyboard are presented as a @@ -810,11 +811,6 @@ Specifies whether or not eight-bit characters sent from the host should be accepted as is or stripped when printed. The default is ``true.'' .TP 8 -.B "eightBitControl (\fPclass\fB EightBitControl\fP)" -Specifies whether or not control sequences sent by the -terminal should be eight-bit characters or escape sequences. -The default is ``false.'' -.TP 8 .B "font (\fPclass\fB Font)" Specifies the name of the normal font. The default is ``fixed.'' .TP 8 @@ -836,6 +832,12 @@ .B "font6 (\fPclass\fB Font6)" Specifies the name of the sixth alternative font. .TP 8 +.B "foreground (\fPclass\fB Foreground)" +Specifies the color to use for displaying text in the window. Setting the +class name instead of the instance name is an easy way to have everything +that would normally appear in the text color change color. The default +is ``black.'' +.TP 8 .B "geometry (\fPclass\fB Geometry)" Specifies the preferred size and position of the VT102 window. .TP 8 @@ -853,16 +855,16 @@ ``true'' causes \fIxterm\fP to interpret ESC F as a request to move to the lower left corner of the screen. The default is ``false.'' .TP 8 -.B "iconBorderWidth (\fPclass\fB BorderWidth)" -Specifies the border width for the active icon window if this feature -is compiled into xterm. The default is 0 (no border). Not all window -managers will make the border visible. -.TP 8 .B "iconBorderColor (\fPclass\fB BorderColor)" Specifies the border color for the active icon window if this feature is compiled into xterm. Not all window managers will make the icon border visible. .TP 8 +.B "iconBorderWidth (\fPclass\fB BorderWidth)" +Specifies the border width for the active icon window if this feature +is compiled into xterm. The default is 0 (no border). Not all window +managers will make the border visible. +.TP 8 .B "iconFont (\fPclass\fB IconFont)" Specifies the font for the miniature active icon window, if this feature is compiled into xterm. The default is "nil2". @@ -933,10 +935,6 @@ page function. The default is ``false.'' .TP 8 -.B "dynamicColors (\fPclass\fB DynamicColors)" -Specifies whether or not dynamic modification of colors using the escape -sequence is allowed. -.TP 8 .B "resizeGravity (\fPclass\fB ResizeGravity)" Affects the behavior when the window is resized to be taller or shorter. \fBNorthWest\fP @@ -970,11 +968,6 @@ Specifies whether or not the scrollbar should be displayed. The default is ``false.'' .TP 8 -.B "scrollTtyOutput (\fPclass\fB ScrollCond)" -Specifies whether or not output to the terminal should automatically cause -the scrollbar to go to the bottom of the scrolling region. The default is -``true.'' -.TP 8 .B "scrollKey (\fPclass\fB ScrollCond)" Specifies whether or not pressing a key should automatically cause the scrollbar to go to the bottom of the scrolling region. The default is @@ -984,6 +977,11 @@ Specifies the number of lines that the \fIscroll-back\fP and \fIscroll-forw\fP actions should use as a default. The default value is 1. .TP 8 +.B "scrollTtyOutput (\fPclass\fB ScrollCond)" +Specifies whether or not output to the terminal should automatically cause +the scrollbar to go to the bottom of the scrolling region. The default is +``true.'' +.TP 8 .B "signalInhibit (\fPclass\fB SignalInhibit)" Specifies whether or not the entries in the ``Main Options'' menu for sending signals to \fIxterm\fP should be disallowed. The default is ``false.'' @@ -1031,34 +1029,34 @@ (class \fITek4014\fP): .\".in +1in .TP 8 -.B "width (\fPclass\fB Width)" -Specifies the width of the Tektronix window in pixels. -.TP 8 -.B "height (\fPclass\fB Height)" -Specifies the height of the Tektronix window in pixels. -.TP 8 -.B "fontLarge (\fPclass\fB Font)" -Specifies the large font to use in the Tektronix window. -.TP 8 .B "font2 (\fPclass\fB Font)" Specifies font number 2 to use in the Tektronix window. .TP 8 .B "font3 (\fPclass\fB Font)" Specifies font number 3 to use in the Tektronix window. .TP 8 +.B "fontLarge (\fPclass\fB Font)" +Specifies the large font to use in the Tektronix window. +.TP 8 .B "fontSmall (\fPclass\fB Font)" Specifies the small font to use in the Tektronix window. .TP 8 -.B "initialFont (\fPclass\fB InitialFont)" -Specifies which of the four Tektronix fonts to use initially. -Values are the same as for the \fIset-tek-text\fP action. -The default is ``large.'' -.TP 8 .B "ginTerminator (\fPclass\fB GinTerminator)" Specifies what character(s) should follow a GIN report or status report. The possibilities are ``none,'' which sends no terminating characters, ``CRonly,'' which sends CR, and ``CR&EOT,'' which sends both CR and EOT. The default is ``none.'' +.TP 8 +.B "height (\fPclass\fB Height)" +Specifies the height of the Tektronix window in pixels. +.TP 8 +.B "initialFont (\fPclass\fB InitialFont)" +Specifies which of the four Tektronix fonts to use initially. +Values are the same as for the \fIset-tek-text\fP action. +The default is ``large.'' +.TP 8 +.B "width (\fPclass\fB Width)" +Specifies the width of the Tektronix window in pixels. .\".in -1in .sp .PP @@ -1565,16 +1563,40 @@ actions are provided for using within the \fIvt100\fP or \fItek4014\fP \fBtranslations\fP resources: .TP 8 +.B "allow-send-events(\fIon/off/toggle\fP)" +This action set or toggles the \fBallowSendEvents\fP resource and is also +invoked by the \fBallowsends\fP entry in \fImainMenu\fP. +.TP +.TP 8 .B "bell([\fIpercent\fP])" This action rings the keyboard bell at the specified percentage above or below the base volume. .TP 8 +.B "clear-saved-lines()" +This action does \fBhard-reset()\fP (see above) and also clears the history +of lines saved off the top of the screen. +It is also invoked from the \fBclearsavedlines\fP entry in \fIvtMenu\fP. +.TP 8 .B "create-menu(\fIm/v/f/t\fP)" This action creates one of the menus used by \fIxterm\fP, if it has not been previously created. The parameter values are the menu names: \fImainMenu\fP, \fIvtMenu\fP, \fIfontMenu\fP, \fItekMenu\fP, respectively. .TP 8 +.B "dired-button()" +Handles a button event (other than press and release) +by echoing the event's position +(i.e., character line and column) in the following format: +.sp +.in +8 +^X ESC G +.in -8 +.TP 8 +.B "hard-reset()" +This action resets the scrolling region, tabs, window size, and cursor keys +and clears the screen. It is also invoked from the \fBhardreset\fP +entry in \fIvtMenu\fP. +.TP 8 .B "ignore()" This action ignores the event but checks for special pointer position escape sequences. @@ -1583,9 +1605,6 @@ This action inserts the character or string associated with the key that was pressed. .TP 8 -.B "insert-seven-bit()" -This action is a synonym for \fBinsert()\fP -.TP 8 .B "insert-eight-bit()" This action inserts an eight-bit (Meta) version of the character or string associated with the key that was pressed. @@ -1598,6 +1617,9 @@ \fIPRIMARY\fP, \fISECONDARY\fP, and \fICLIPBOARD\fP. Cut buffers are typically named \fICUT_BUFFER0\fP through \fICUT_BUFFER7\fP. .TP 8 +.B "insert-seven-bit()" +This action is a synonym for \fBinsert()\fP +.TP 8 .B "keymap(\fIname\fP)" This action dynamically defines a new translation table whose resource name is \fIname\fP with the suffix \fIKeymap\fP (case is significant). @@ -1608,82 +1630,52 @@ significant) include: \fImainMenu\fP, \fIvtMenu\fP, \fIfontMenu\fP, and \fItekMenu\fP. .TP 8 +.B "quit()" +This action sends a SIGHUP to the subprogram and exits. It is also invoked +by the \fBquit\fP entry in \fImainMenu\fP. +.TP 8 +.B "redraw()" +This action redraws the window and is also invoked by the +\fIredraw\fP entry in \fImainMenu\fP. +.TP 8 +.B "scroll-back(\fIcount\fP [,\fIunits\fP])" +This action scrolls the text window backward so that text that had previously +scrolled off the top of the screen is now visible. The \fIcount\fP argument +indicates the number of \fIunits\fP (which may be \fIpage\fP, \fIhalfpage\fP, +\fIpixel\fP, or \fIline\fP) by which to scroll. +.TP 8 +.B "scroll-forw(\fIcount\fP [,\fIunits\fP])" +This action scrolls is similar to \fBscroll-back\fP except that it scrolls +the other direction. +.TP 8 .B "secure()" This action toggles the \fISecure Keyboard\fP mode described in the section named \fBSECURITY\fP, and is invoked from the \fBsecurekbd\fP entry in \fImainMenu\fP. .TP 8 -.B "select-start()" -This action begins text selection at the current pointer location. See -the section on \fBPOINTER USAGE\fP for information on making selections. +.B "select-cursor-end(\fIdestname\fP [, ...])" +This action is similar to \fBselect-end\fP except that it should be used +with \fBselect-cursor-start\fP. .TP 8 -.B "select-extend()" -This action tracks the pointer and extends the selection. It -should only be bound to Motion events. +.B "select-cursor-start()" +This action is similar to \fBselect-start\fP except that it begins the +selection at the current text cursor position. .TP 8 .B "select-end(\fIdestname\fP [, ...])" This action puts the currently selected text into all of the selections or cutbuffers specified by \fIdestname\fP. .TP 8 +.B "select-extend()" +This action tracks the pointer and extends the selection. It +should only be bound to Motion events. +.TP 8 .B "select-set()" This action stores text that corresponds to the current selection, without affecting the selection mode. .TP 8 -.B "select-cursor-start()" -This action is similar to \fBselect-start\fP except that it begins the -selection at the current text cursor position. -.TP 8 -.B "select-cursor-end(\fIdestname\fP [, ...])" -This action is similar to \fBselect-end\fP except that it should be used -with \fBselect-cursor-start\fP. -.TP 8 -.B "set-vt-font(\fId/1/2/3/4/5/6/e/s\fP [,\fInormalfont\fP [, \fIboldfont\fP]])" -This action sets the font or fonts currently being used in the VT102 window. -The first argument is a single character that specifies the font to be -used: \fId\fP or \fID\fP indicate the default font (the font initially -used when -\fIxterm\fP was started), \fI1\fP through \fI6\fP indicate the fonts -specified by the \fIfont1\fP through \fIfont6\fP resources, \fIe\fP or \fIE\fP -indicate the normal and bold fonts that have been set through escape codes -(or specified as the second and third action arguments, respectively), and -\fIs\fP or \fIS\fP indicate the font selection (as made by programs such as -\fIxfontsel(1)\fP) indicated by the second action argument. -.TP 8 -.B "start-extend()" -This action is similar to \fBselect-start\fP except that the -selection is extended to the current pointer location. -.TP 8 -.B "start-cursor-extend()" -This action is similar to \fBselect-extend\fP except that the -selection is extended to the current text cursor position. -.TP 8 -.B "string(\fIstring\fP)" -This action inserts the specified text string as if it had been typed. -Quotation is necessary if the string contains whitespace or -non-alphanumeric characters. If the string argument begins with the -characters ``0x'', it is interpreted -as a hex character constant. -.TP 8 -.B "scroll-back(\fIcount\fP [,\fIunits\fP])" -This action scrolls the text window backward so that text that had previously -scrolled off the top of the screen is now visible. The \fIcount\fP argument -indicates the number of \fIunits\fP (which may be \fIpage\fP, \fIhalfpage\fP, -\fIpixel\fP, or \fIline\fP) by which to scroll. -.TP 8 -.B "scroll-forw(\fIcount\fP [,\fIunits\fP])" -This action scrolls is similar to \fBscroll-back\fP except that it scrolls -the other direction. -.TP 8 -.B "allow-send-events(\fIon/off/toggle\fP)" -This action set or toggles the \fBallowSendEvents\fP resource and is also -invoked by the \fBallowsends\fP entry in \fImainMenu\fP. -.TP -.B "set-logging()" -This action toggles the state of the logging option. -.TP 8 -.B "redraw()" -This action redraws the window and is also invoked by the -\fIredraw\fP entry in \fImainMenu\fP. +.B "select-start()" +This action begins text selection at the current pointer location. See +the section on \fBPOINTER USAGE\fP for information on making selections. .TP 8 .B "send-signal(\fIsigname\fP)" This action sends the signal named by \fIsigname\fP @@ -1704,33 +1696,12 @@ \fIquit\fP, \fIalrm\fP, \fIalarm\fP (same as \fIalrm\fP) and \fIkill\fP. .TP 8 -.B "quit()" -This action sends a SIGHUP to the subprogram and exits. It is also invoked -by the \fBquit\fP entry in \fImainMenu\fP. -.TP 8 -.B "set-scrollbar(\fIon/off/toggle\fP)" -This action toggles the \fBscrollbar\fP resource and is also invoked by -the \fBscrollbar\fP entry in \fIvtMenu\fP. -.TP 8 -.B "set-jumpscroll(\fIon/off/toggle\fP)" -This action toggles the \fBjumpscroll\fP resource and is also invoked by the -\fBjumpscroll\fP entry in \fIvtMenu\fP. -.TP 8 -.B "set-reverse-video(\fIon/off/toggle\fP)" -This action toggles the \fIreverseVideo\fP resource and is also invoked by -the \fBreversevideo\fP entry in \fIvtMenu\fP. -.TP 8 -.B "set-autowrap(\fIon/off/toggle\fP)" -This action toggles automatic wrapping of long lines and is also invoked by -the \fBautowrap\fP entry in \fIvtMenu\fP. -.TP 8 -.B "set-reversewrap(\fIon/off/toggle\fP)" -This action toggles the \fBreverseWrap\fP resource and is also invoked by -the \fBreversewrap\fP entry in \fIvtMenu\fP. +.B "set-allow132(\fIon/off/toggle\fP)" +This action toggles the \fBc132\fP resource and is also invoked from the +\fBallow132\fP entry in \fIvtMenu\fP. .TP 8 -.B "set-autolinefeed(\fIon/off/toggle\fP)" -This action toggles automatic insertion of linefeeds and is also invoked by -the \fBautolinefeed\fP entry in \fIvtMenu\fP. +.B "set-altscreen(\fIon/off/toggle\fP)" +This action toggles between the alternate and current screens. .TP 8 .B "set-appcursor(\fIon/off/toggle\fP)" This action toggles the handling Application Cursor Key mode @@ -1740,46 +1711,54 @@ This action toggles the handling of Application Keypad mode and is also invoked by the \fBappkeypad\fP entry in \fIvtMenu\fP. .TP 8 -.B "set-scroll-on-key(\fIon/off/toggle\fP)" -This action toggles the \fBscrollKey\fP resource and is also invoked from -the \fBscrollkey\fP entry in \fIvtMenu\fP. -.TP 8 -.B "set-scroll-on-tty-output(\fIon/off/toggle\fP)" -This action toggles the \fBscrollTtyOutput\fP resource and is also invoked -from the \fBscrollttyoutput\fP entry in \fIvtMenu\fP. +.B "set-autolinefeed(\fIon/off/toggle\fP)" +This action toggles automatic insertion of linefeeds and is also invoked by +the \fBautolinefeed\fP entry in \fIvtMenu\fP. .TP 8 -.B "set-allow132(\fIon/off/toggle\fP)" -This action toggles the \fBc132\fP resource and is also invoked from the -\fBallow132\fP entry in \fIvtMenu\fP. +.B "set-autowrap(\fIon/off/toggle\fP)" +This action toggles automatic wrapping of long lines and is also invoked by +the \fBautowrap\fP entry in \fIvtMenu\fP. .TP 8 .B "set-cursesemul(\fIon/off/toggle\fP)" This action toggles the \fBcurses\fP resource and is also invoked from the \fBcursesemul\fP entry in \fIvtMenu\fP. .TP 8 -.B "set-visual-bell(\fIon/off/toggle\fP)" -This action toggles the \fBvisualBell\fP resource and is also invoked -by the \fBvisualbell\fP entry in \fIvtMenu\fP. +.B "set-jumpscroll(\fIon/off/toggle\fP)" +This action toggles the \fBjumpscroll\fP resource and is also invoked by the +\fBjumpscroll\fP entry in \fIvtMenu\fP. +.TP 8 +.B "set-logging()" +This action toggles the state of the logging option. .TP 8 .B "set-marginbell(\fIon/off/toggle\fP)" This action toggles the \fBmarginBell\fP resource and is also invoked from the \fBmarginbell\fP entry in \fIvtMenu\fP. .TP 8 -.B "set-altscreen(\fIon/off/toggle\fP)" -This action toggles between the alternate and current screens. +.B "set-reverse-video(\fIon/off/toggle\fP)" +This action toggles the \fIreverseVideo\fP resource and is also invoked by +the \fBreversevideo\fP entry in \fIvtMenu\fP. .TP 8 -.B "soft-reset()" -This action resets the scrolling region and is also invoked from the -\fBsoftreset\fP entry in \fIvtMenu\fP. +.B "set-reversewrap(\fIon/off/toggle\fP)" +This action toggles the \fBreverseWrap\fP resource and is also invoked by +the \fBreversewrap\fP entry in \fIvtMenu\fP. .TP 8 -.B "hard-reset()" -This action resets the scrolling region, tabs, window size, and cursor keys -and clears the screen. It is also invoked from the \fBhardreset\fP -entry in \fIvtMenu\fP. +.B "set-scroll-on-key(\fIon/off/toggle\fP)" +This action toggles the \fBscrollKey\fP resource and is also invoked from +the \fBscrollkey\fP entry in \fIvtMenu\fP. .TP 8 -.B "clear-saved-lines()" -This action does \fBhard-reset()\fP (see above) and also clears the history -of lines saved off the top of the screen. -It is also invoked from the \fBclearsavedlines\fP entry in \fIvtMenu\fP. +.B "set-scroll-on-tty-output(\fIon/off/toggle\fP)" +This action toggles the \fBscrollTtyOutput\fP resource and is also invoked +from the \fBscrollttyoutput\fP entry in \fIvtMenu\fP. +.TP 8 +.B "set-scrollbar(\fIon/off/toggle\fP)" +This action toggles the \fBscrollbar\fP resource and is also invoked by +the \fBscrollbar\fP entry in \fIvtMenu\fP. +.TP 8 +.B "set-tek-text(\fIlarge/2/3/small\fP)" +This action sets font used in the Tektronix window to the value of the +resources \fBtektextlarge\fP, \fBtektext2\fP, \fBtektext3\fP, and +\fBtektextsmall\fP according to the argument. It is also by the entries +of the same names as the resources in \fItekMenu\fP. .TP 8 .B "set-terminal-type(\fItype\fP)" This action directs output to either the \fIvt\fP or \fItek\fP windows, @@ -1793,36 +1772,53 @@ in \fIvtMenu\fP and the \fBvtshow\fP and \fBtekhide\fP entries in \fItekMenu\fP. .TP 8 -.B "set-tek-text(\fIlarge/2/3/small\fP)" -This action sets font used in the Tektronix window to the value of the -resources \fBtektextlarge\fP, \fBtektext2\fP, \fBtektext3\fP, and -\fBtektextsmall\fP according to the argument. It is also by the entries -of the same names as the resources in \fItekMenu\fP. +.B "set-visual-bell(\fIon/off/toggle\fP)" +This action toggles the \fBvisualBell\fP resource and is also invoked +by the \fBvisualbell\fP entry in \fIvtMenu\fP. .TP 8 -.B "tek-page()" -This action clears the Tektronix window and is also invoked by the -\fBtekpage\fP entry in \fItekMenu\fP. +.B "set-vt-font(\fId/1/2/3/4/5/6/e/s\fP [,\fInormalfont\fP [, \fIboldfont\fP]])" +This action sets the font or fonts currently being used in the VT102 window. +The first argument is a single character that specifies the font to be +used: \fId\fP or \fID\fP indicate the default font (the font initially +used when +\fIxterm\fP was started), \fI1\fP through \fI6\fP indicate the fonts +specified by the \fIfont1\fP through \fIfont6\fP resources, \fIe\fP or \fIE\fP +indicate the normal and bold fonts that have been set through escape codes +(or specified as the second and third action arguments, respectively), and +\fIs\fP or \fIS\fP indicate the font selection (as made by programs such as +\fIxfontsel(1)\fP) indicated by the second action argument. .TP 8 -.B "tek-reset()" -This action resets the Tektronix window and is also invoked by the -\fItekreset\fP entry in \fItekMenu\fP. +.B "soft-reset()" +This action resets the scrolling region and is also invoked from the +\fBsoftreset\fP entry in \fIvtMenu\fP. +.TP 8 +.B "start-extend()" +This action is similar to \fBselect-start\fP except that the +selection is extended to the current pointer location. +.TP 8 +.B "start-cursor-extend()" +This action is similar to \fBselect-extend\fP except that the +selection is extended to the current text cursor position. +.TP 8 +.B "string(\fIstring\fP)" +This action inserts the specified text string as if it had been typed. +Quotation is necessary if the string contains whitespace or +non-alphanumeric characters. If the string argument begins with the +characters ``0x'', it is interpreted +as a hex character constant. .TP 8 .B "tek-copy()" This action copies the escape codes used to generate the current window contents to a file in the current directory beginning with the name COPY. It is also invoked from the \fItekcopy\fP entry in \fItekMenu\fP. .TP 8 -.B "visual-bell()" -This action flashes the window quickly. +.B "tek-page()" +This action clears the Tektronix window and is also invoked by the +\fBtekpage\fP entry in \fItekMenu\fP. .TP 8 -.B "dired-button()" -Handles a button event (other than press and release) -by echoing the event's position -(i.e., character line and column) in the following format: -.sp -.in +8 -^X ESC G -.in -8 +.B "tek-reset()" +This action resets the Tektronix window and is also invoked by the +\fItekreset\fP entry in \fItekMenu\fP. .TP 8 .B "vi-button()" Handles a button event (other than press and release) @@ -1843,6 +1839,9 @@ from the current line. The control sequence is omitted altogether if the button event is on the current line. +.TP 8 +.B "visual-bell()" +This action flashes the window quickly. .PP The Tektronix window also has the following action: .TP 8 @@ -1961,8 +1960,6 @@ Many of the options are not resettable after .I xterm starts. -.PP -Only fixed-width, character-cell fonts are supported. .PP This program still needs to be rewritten. It should be split into very modular sections, with the various emulators being completely separate