# ------------------------------------------------------------------------------
# 256colres.pl | 2
# AAA_README_VMS.txt | 2
# INSTALL | 1
# VTPrsTbl.c | 2
# aclocal.m4 | 76 +++
# button.c | 2
# charproc.c | 84 +++-
# charsets.c | 2
# configure | 1068 ++++++++++++++++++++++++++++++++++++++++++---------
# configure.in | 8
# ctlseqs.ms | 7
# doublechr.c | 2
# fontutils.c | 4
# fontutils.h | 3
# input.c | 113 +++--
# main.c | 117 +----
# menu.c | 2
# menu.h | 2
# misc.c | 12
# os2main.c | 3
# print.c | 6
# ptydata.c | 2
# ptyx.h | 25 -
# resize.man | 2
# screen.c | 14
# scrollbar.c | 2
# tabs.c | 2
# terminfo | 2
# testxmc.c | 2
# trace.c | 6
# trace.h | 2
# unicode/README | 1
# util.c | 39 +
# version.h | 4
# xterm.h | 25 -
# xterm.log.html | 75 +++
# xterm.man | 30 +
# xtermcfg.hin | 6
# 38 files changed, 1377 insertions, 380 deletions
# ------------------------------------------------------------------------------
Index: 256colres.pl
--- xterm-133+/256colres.pl Sat Feb 12 06:47:41 2000
+++ xterm-134/256colres.pl Sun May 28 16:12:53 2000
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# Author: Thomas Dickey <dickey@clark.net>
+# Author: Thomas E. Dickey
# $XFree86: xc/programs/xterm/256colres.pl,v 1.2 2000/02/10 18:57:34 dawes Exp $
# Construct a header file defining default resources for the 256-color model
Index: AAA_README_VMS.txt
--- xterm-133+/AAA_README_VMS.txt Wed Feb 9 17:47:18 2000
+++ xterm-134/AAA_README_VMS.txt Sun May 28 16:11:25 2000
@@ -1,4 +1,4 @@
-http://www.clark.net/pub/dickey/xterm/xterm.html
+http://dickey.his.com/xterm/xterm.html
Downloaded 1.22 variant (current Linux version) on 18-JAN-2000.
Index: INSTALL
--- xterm-133+/INSTALL Sat Mar 4 04:36:01 2000
+++ xterm-134/INSTALL Sun May 28 16:31:10 2000
@@ -1,5 +1,5 @@
-- $XFree86: xc/programs/xterm/INSTALL,v 3.20 2000/03/03 20:02:27 dawes Exp $
--- Thomas E. Dickey <dickey@clark.net>
+-- Thomas E. Dickey
Xterm is normally built as part of the X Windows source tree, using
imake to generate a Makefile from Imakefile. You can also use the
Index: VTPrsTbl.c
--- xterm-133+/VTPrsTbl.c Thu Jan 27 21:01:34 2000
+++ xterm-134/VTPrsTbl.c Sun May 28 16:13:11 2000
@@ -5,7 +5,7 @@
/*
*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
Index: aclocal.m4
--- xterm-133+/aclocal.m4 Wed May 24 11:39:17 2000
+++ xterm-134/aclocal.m4 Sun May 28 21:35:01 2000
@@ -3,7 +3,7 @@
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+dnl Copyright 1997-2000 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -654,6 +654,29 @@
]
)dnl
dnl ---------------------------------------------------------------------------
+dnl Check for POSIX wait support
+AC_DEFUN([CF_POSIX_WAIT],
+[
+AC_REQUIRE([AC_HEADER_SYS_WAIT])
+AC_CACHE_CHECK(for POSIX wait functions,cf_cv_posix_wait,[
+AC_TRY_LINK([
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+],[
+ int stat_loc;
+ pid_t pid = waitpid(-1, &stat_loc, WNOHANG|WUNTRACED);
+ pid_t pid2 = wait(&stat_loc);
+],
+[cf_cv_posix_wait=yes],
+[cf_cv_posix_wait=no])
+])
+test "$cf_cv_posix_wait" = yes && AC_DEFINE(USE_POSIX_WAIT)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl On both Ultrix and CLIX, I find size_t defined in <stdio.h>
AC_DEFUN([CF_SIZE_T],
[
@@ -674,6 +697,54 @@
test $cf_cv_type_size_t = no && AC_DEFINE(size_t, unsigned)
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check if this is an SVR4 system. We need the definition for xterm
+AC_DEFUN([CF_SVR4],
+[
+AC_REQUIRE([AC_FUNC_GETLOADAVG])
+AC_CACHE_CHECK(if this is an SVR4 system, cf_cv_svr4,[
+AC_TRY_COMPILE([
+#include <elf.h>
+#include <sys/termio.h>
+],[
+#ifndef SVR4
+make an error
+#endif
+],
+[cf_cv_svr4=yes],
+[cf_cv_svr4=no])
+])
+test "$cf_cv_svr4" = yes && AC_DEFINE(SVR4)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl Check if this is a SYSV platform
+AC_DEFUN([CF_SYSV],
+[
+AC_CACHE_CHECK(if this platform has SYSV flavor,cf_cv_sysv,[
+AC_TRY_COMPILE([
+#include <curses.h>
+#include <term.h>
+#include <sys/termio.h>
+],[
+/* FIXME: need a test that excludes linux */
+#ifdef linux
+make an error
+#endif
+static struct termio d_tio;
+ d_tio.c_cc[VINTR] = 0;
+ d_tio.c_cc[VQUIT] = 0;
+ d_tio.c_cc[VERASE] = 0;
+ d_tio.c_cc[VKILL] = 0;
+ d_tio.c_cc[VEOF] = 0;
+ d_tio.c_cc[VEOL] = 0;
+ d_tio.c_cc[VMIN] = 0;
+ d_tio.c_cc[VTIME] = 0;
+],
+[cf_cv_sysv=yes],
+[cf_cv_sysv=no])
+])
+test "$cf_cv_sysv" = yes && AC_DEFINE(SYSV)
+])dn
+dnl ---------------------------------------------------------------------------
dnl Check if this is a SYSV flavor of UTMP
AC_DEFUN([CF_SYSV_UTMP],
[
@@ -708,8 +779,9 @@
if test "$cf_uid" != 0 ; then
cf_cv_tty_group_name=
cf_tty_name=`tty`
+test "$cf_tty_name" = "not a tty" && cf_tty_name=/dev/tty
test -z "$cf_tty_name" && cf_tty_name=/dev/tty
-if test -c $cf_tty_name
+if test -c "$cf_tty_name"
then
cf_option="-l -L"
Index: button.c
--- xterm-133+/button.c Sat Feb 12 06:47:41 2000
+++ xterm-134/button.c Sun May 28 16:18:33 2000
@@ -1,6 +1,6 @@
/* $TOG: button.c /main/76 1997/07/30 16:56:19 kaleb $ */
/*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
Index: charproc.c
--- xterm-133+/charproc.c Wed May 24 11:39:17 2000
+++ xterm-134/charproc.c Sun May 28 16:23:07 2000
@@ -5,7 +5,7 @@
/*
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
All Rights Reserved
@@ -435,6 +435,7 @@
Bres(XtNsignalInhibit, XtCSignalInhibit, misc.signalInhibit, FALSE),
#if OPT_NUM_LOCK
Bres(XtNnumLock, XtCNumLock, misc.real_NumLock, TRUE),
+Bres(XtNalwaysUseMods, XtCAlwaysUseMods, misc.alwaysUseMods, FALSE),
#endif
#if OPT_SHIFT_KEYS
Bres(XtNshiftKeys, XtCShiftKeys, misc.shift_keys, TRUE),
@@ -491,10 +492,12 @@
COLOR_RES(XtNcolorBD, screen.Acolors[COLOR_BD], DFT_COLOR(XtDefaultForeground)),
COLOR_RES(XtNcolorBL, screen.Acolors[COLOR_BL], DFT_COLOR(XtDefaultForeground)),
COLOR_RES(XtNcolorUL, screen.Acolors[COLOR_UL], DFT_COLOR(XtDefaultForeground)),
+COLOR_RES(XtNcolorRV, screen.Acolors[COLOR_RV], DFT_COLOR(XtDefaultForeground)),
Bres(XtNcolorMode, XtCColorMode, screen.colorMode, DFT_COLORMODE),
Bres(XtNcolorULMode, XtCColorMode, screen.colorULMode, FALSE),
Bres(XtNcolorBDMode, XtCColorMode, screen.colorBDMode, FALSE),
Bres(XtNcolorBLMode, XtCColorMode, screen.colorBLMode, FALSE),
+Bres(XtNcolorRVMode, XtCColorMode, screen.colorRVMode, FALSE),
Bres(XtNcolorAttrMode, XtCColorMode, screen.colorAttrMode, FALSE),
Bres(XtNboldColors, XtCColorMode, screen.boldColors, TRUE),
#endif /* OPT_ISO_COLORS */
@@ -685,6 +688,36 @@
SGR_Foreground(fg);
}
+/* Invoked after updating inverse flag, computes the extended color
+ * index to use for background. (See also 'extract_bg()').
+ */
+static void
+setExtendedBG(void)
+{
+ int bg = term->sgr_background;
+
+ if (term->screen.colorAttrMode
+ || (bg < 0)) {
+ if (term->screen.colorRVMode && (term->flags & INVERSE))
+ bg = COLOR_RV;
+ }
+
+ /* This implements the IBM PC-style convention of 8-colors, with one
+ * bit for bold, thus mapping the 0-7 codes to 8-15. It won't make
+ * much sense for 16-color applications, but we keep it to retain
+ * compatiblity with ANSI-color applications.
+ */
+#if OPT_PC_COLORS /* XXXJTL should be settable at runtime (resource or OSC?) */
+ if (term->screen.boldColors
+ && (bg >= 0)
+ && (bg < 8)
+ && (term->flags & BOLD))
+ bg |= 8;
+#endif
+
+ SGR_Background(bg);
+}
+
static void
reset_SGR_Foreground(void)
{
@@ -694,10 +727,17 @@
}
static void
+reset_SGR_Background(void)
+{
+ term->sgr_background = -1;
+ setExtendedBG();
+}
+
+static void
reset_SGR_Colors(void)
{
reset_SGR_Foreground();
- SGR_Background(-1);
+ reset_SGR_Background();
}
#endif /* OPT_ISO_COLORS */
@@ -1403,6 +1443,7 @@
break;
case 7:
term->flags |= INVERSE;
+ if_OPT_ISO_COLORS(screen,{setExtendedBG();})
break;
case 8:
term->flags |= INVISIBLE;
@@ -1421,6 +1462,7 @@
break;
case 27:
term->flags &= ~INVERSE;
+ if_OPT_ISO_COLORS(screen,{setExtendedBG();})
break;
case 28:
term->flags &= ~INVISIBLE;
@@ -1478,7 +1520,8 @@
case 46:
case 47:
if_OPT_ISO_COLORS(screen,{
- SGR_Background(param[row] - 40);
+ term->sgr_background = (param[row] - 40);
+ setExtendedBG();
})
break;
case 48:
@@ -1490,7 +1533,8 @@
row++;
if (row < nparam &&
param[row] < NUM_ANSI_COLORS) {
- SGR_Background(param[row]);
+ term->sgr_background = param[row];
+ setExtendedBG();
}
break;
default:
@@ -1502,7 +1546,7 @@
break;
case 49:
if_OPT_ISO_COLORS(screen,{
- SGR_Background(-1);
+ reset_SGR_Background();
})
break;
case 90:
@@ -1523,7 +1567,7 @@
#if !OPT_AIX_COLORS
if_OPT_ISO_COLORS(screen,{
reset_SGR_Foreground();
- SGR_Background(-1);
+ reset_SGR_Background();
})
break;
#endif
@@ -1535,7 +1579,8 @@
case 106:
case 107:
if_OPT_AIX_COLORS(screen,{
- SGR_Background(param[row] - 100 + 8);
+ term->sgr_background = (param[row] - 100 + 8);
+ setExtendedBG();
})
break;
}
@@ -4022,6 +4067,7 @@
wnew->screen.visualbell = request->screen.visualbell;
#if OPT_NUM_LOCK
wnew->misc.real_NumLock = request->misc.real_NumLock;
+ wnew->misc.alwaysUseMods = request->misc.alwaysUseMods;
wnew->misc.num_lock = 0;
wnew->misc.alt_left = 0;
wnew->misc.alt_right = 0;
@@ -4106,6 +4152,7 @@
wnew->screen.colorBLMode = request->screen.colorBLMode;
wnew->screen.colorMode = request->screen.colorMode;
wnew->screen.colorULMode = request->screen.colorULMode;
+ wnew->screen.colorRVMode = request->screen.colorRVMode;
for (i = 0, color_ok = False; i < MAXCOLORS; i++) {
wnew->screen.Acolors[i] = request->screen.Acolors[i];
@@ -4139,6 +4186,7 @@
wnew->num_ptrs = (OFF_COLOR+1);
#endif
wnew->sgr_foreground = -1;
+ wnew->sgr_background = -1;
wnew->sgr_extended = 0;
#endif /* OPT_ISO_COLORS */
@@ -4683,6 +4731,7 @@
int fg_bg = 0;
GC currentGC;
Boolean in_selection;
+ Boolean reversed;
Pixel fg_pix;
Pixel bg_pix;
Pixel tmp;
@@ -4738,7 +4787,7 @@
fg_bg = SCRN_BUF_COLOR(screen, screen->cursor_row)[screen->cursor_col];
})
fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags));
- bg_pix = getXtermBackground(flags,extract_bg(fg_bg));
+ bg_pix = getXtermBackground(flags,extract_bg(fg_bg,flags));
if (screen->cur_row > screen->endHRow ||
(screen->cur_row == screen->endHRow &&
@@ -4750,14 +4799,14 @@
else
in_selection = True;
+ reversed = ReverseOrHilite(screen, flags, in_selection);
+
/* This is like updatedXtermGC(), except that we have to worry about
* whether the window has focus, since in that case we want just an
* outline for the cursor.
*/
if(screen->select || screen->always_highlight) {
- if (( (flags & INVERSE) && !in_selection) ||
- (!(flags & INVERSE) && in_selection)){
- /* text is reverse video */
+ if (reversed) { /* text is reverse video */
if (screen->cursorGC) {
currentGC = screen->cursorGC;
} else {
@@ -4793,9 +4842,16 @@
}
XSetForeground(screen->display, currentGC, bg_pix);
} else { /* not selected */
- if (( (flags & INVERSE) && !in_selection) ||
- (!(flags & INVERSE) && in_selection)) {
- /* text is reverse video */
+ if (reversed) { /* text is reverse video */
+#if OPT_HIGHLIGHT_COLOR
+ if (hi_pix != screen->foreground
+ && hi_pix != fg_pix
+ && hi_pix != bg_pix
+ && hi_pix != term->dft_foreground) {
+ bg_pix = fg_pix;
+ fg_pix = hi_pix;
+ }
+#endif
currentGC = ReverseGC(screen);
XSetForeground(screen->display, currentGC, bg_pix);
XSetBackground(screen->display, currentGC, fg_pix);
Index: charsets.c
--- xterm-133+/charsets.c Wed Feb 9 17:47:18 2000
+++ xterm-134/charsets.c Sun May 28 16:16:27 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1998-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998-2000 by Thomas E. Dickey
All Rights Reserved
Index: configure
--- xterm-133+/configure Wed May 24 11:39:17 2000
+++ xterm-134/configure Sun May 28 21:35:04 2000
@@ -2403,8 +2403,9 @@
if test "$cf_uid" != 0 ; then
cf_cv_tty_group_name=
cf_tty_name=`tty`
+test "$cf_tty_name" = "not a tty" && cf_tty_name=/dev/tty
test -z "$cf_tty_name" && cf_tty_name=/dev/tty
-if test -c $cf_tty_name
+if test -c "$cf_tty_name"
then
cf_option="-l -L"
@@ -2446,7 +2447,7 @@
echo $ac_n "checking if we may use tty group""... $ac_c" 1>&6
-echo "configure:2450: checking if we may use tty group" >&5
+echo "configure:2451: checking if we may use tty group" >&5
if eval "test \"`echo '$''{'cf_cv_tty_group'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2455,7 +2456,7 @@
cf_cv_tty_group=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 2459 "configure"
+#line 2460 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -2480,7 +2481,7 @@
}
EOF
-if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_tty_group=yes
else
@@ -2505,7 +2506,7 @@
### checks for compiler characteristics
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2509: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2510: 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
@@ -2529,7 +2530,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 2533 "configure"
+#line 2534 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2545,7 +2546,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2572,12 +2573,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2576: checking for working const" >&5
+echo "configure:2577: 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 <<EOF
-#line 2581 "configure"
+#line 2582 "configure"
#include "confdefs.h"
int main() {
@@ -2626,7 +2627,7 @@
; return 0; }
EOF
-if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2650,12 +2651,12 @@
### checks for system services and user specified options
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2654: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2655: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2659 "configure"
+#line 2660 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2671,7 +2672,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2693,14 +2694,741 @@
+echo $ac_n "checking for POSIX wait functions""... $ac_c" 1>&6
+echo "configure:2699: checking for POSIX wait functions" >&5
+if eval "test \"`echo '$''{'cf_cv_posix_wait'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 2705 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+int main() {
+
+ int stat_loc;
+ pid_t pid = waitpid(-1, &stat_loc, WNOHANG|WUNTRACED);
+ pid_t pid2 = wait(&stat_loc);
+
+; return 0; }
+EOF
+if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_posix_wait=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_posix_wait=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_posix_wait" 1>&6
+test "$cf_cv_posix_wait" = yes && cat >> confdefs.h <<\EOF
+#define USE_POSIX_WAIT 1
+EOF
+
+
+
+echo $ac_n "checking if this platform has SYSV flavor""... $ac_c" 1>&6
+echo "configure:2744: checking if this platform has SYSV flavor" >&5
+if eval "test \"`echo '$''{'cf_cv_sysv'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 2750 "configure"
+#include "confdefs.h"
+
+#include <curses.h>
+#include <term.h>
+#include <sys/termio.h>
+
+int main() {
+
+/* FIXME: need a test that excludes linux */
+#ifdef linux
+make an error
+#endif
+static struct termio d_tio;
+ d_tio.c_cc[VINTR] = 0;
+ d_tio.c_cc[VQUIT] = 0;
+ d_tio.c_cc[VERASE] = 0;
+ d_tio.c_cc[VKILL] = 0;
+ d_tio.c_cc[VEOF] = 0;
+ d_tio.c_cc[VEOL] = 0;
+ d_tio.c_cc[VMIN] = 0;
+ d_tio.c_cc[VTIME] = 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_sysv=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_sysv=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_sysv" 1>&6
+test "$cf_cv_sysv" = yes && cat >> confdefs.h <<\EOF
+#define SYSV 1
+EOF
+
+
+ac_have_func=no # yes means we've found a way to get the load average.
+
+# Some systems with -lutil have (and need) -lkvm as well, some do not.
+# On Solaris, -lkvm requires nlist from -lelf, so check that first
+# to get the right answer into the cache.
+echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
+echo "configure:2800: checking for elf_begin in -lelf" >&5
+ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lelf $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2808 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char elf_begin();
+
+int main() {
+elf_begin()
+; return 0; }
+EOF
+if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lelf $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6
+echo "configure:2840: checking for kvm_open in -lkvm" >&5
+ac_lib_var=`echo kvm'_'kvm_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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lkvm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2848 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char kvm_open();
+
+int main() {
+kvm_open()
+; return 0; }
+EOF
+if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lkvm $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+# Check for the 4.4BSD definition of getloadavg.
+echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6
+echo "configure:2881: checking for getloadavg in -lutil" >&5
+ac_lib_var=`echo util'_'getloadavg | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2889 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getloadavg();
+
+int main() {
+getloadavg()
+; return 0; }
+EOF
+if { (eval echo configure:2900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+if test $ac_have_func = no; then
+ # There is a commonly available library for RS/6000 AIX.
+ # Since it is not a standard part of AIX, it might be installed locally.
+ ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS"
+ echo $ac_n "checking for getloadavg in -lgetloadavg""... $ac_c" 1>&6
+echo "configure:2926: checking for getloadavg in -lgetloadavg" >&5
+ac_lib_var=`echo getloadavg'_'getloadavg | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lgetloadavg $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2934 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getloadavg();
+
+int main() {
+getloadavg()
+; return 0; }
+EOF
+if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lgetloadavg $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+LIBS="$ac_getloadavg_LIBS"
+fi
+
+fi
+
+# Make sure it is really in the library, if we think we found it.
+for ac_func in getloadavg
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2972: 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 <<EOF
+#line 2977 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+fi
+done
+
+
+
+if test $ac_cv_func_getloadavg = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_GETLOADAVG 1
+EOF
+
+ ac_have_func=yes
+else
+ # Figure out what our getloadavg.c needs.
+ ac_have_func=no
+ ac_safe=`echo "sys/dg_sys_info.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/dg_sys_info.h""... $ac_c" 1>&6
+echo "configure:3038: checking for sys/dg_sys_info.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
+#line 3043 "configure"
+#include "confdefs.h"
+#include <sys/dg_sys_info.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_have_func=yes; cat >> confdefs.h <<\EOF
+#define DGUX 1
+EOF
+
+ echo $ac_n "checking for dg_sys_info in -ldgc""... $ac_c" 1>&6
+echo "configure:3069: checking for dg_sys_info in -ldgc" >&5
+ac_lib_var=`echo dgc'_'dg_sys_info | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldgc $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3077 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dg_sys_info();
+
+int main() {
+dg_sys_info()
+; return 0; }
+EOF
+if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo dgc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-ldgc $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+ # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
+ # uses stabs), but it is still SVR4. We cannot check for <elf.h> because
+ # Irix 4.0.5F has the header but not the library.
+ if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
+ ac_have_func=yes; cat >> confdefs.h <<\EOF
+#define SVR4 1
+EOF
+
+ fi
+
+ if test $ac_have_func = no; then
+ ac_safe=`echo "inq_stats/cpustats.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for inq_stats/cpustats.h""... $ac_c" 1>&6
+echo "configure:3133: checking for inq_stats/cpustats.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
+#line 3138 "configure"
+#include "confdefs.h"
+#include <inq_stats/cpustats.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_have_func=yes; cat >> confdefs.h <<\EOF
+#define UMAX 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define UMAX4_3 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ if test $ac_have_func = no; then
+ ac_safe=`echo "sys/cpustats.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/cpustats.h""... $ac_c" 1>&6
+echo "configure:3176: checking for sys/cpustats.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
+#line 3181 "configure"
+#include "confdefs.h"
+#include <sys/cpustats.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_have_func=yes; cat >> confdefs.h <<\EOF
+#define UMAX 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ if test $ac_have_func = no; then
+ for ac_hdr in mach/mach.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:3217: 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
+#line 3222 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+ fi
+
+ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
+echo "configure:3257: checking for nlist.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
+#line 3262 "configure"
+#include "confdefs.h"
+#include <nlist.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define NLIST_STRUCT 1
+EOF
+
+ echo $ac_n "checking for n_un in struct nlist""... $ac_c" 1>&6
+echo "configure:3288: checking for n_un in struct nlist" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_nlist_n_un'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3293 "configure"
+#include "confdefs.h"
+#include <nlist.h>
+int main() {
+struct nlist n; n.n_un.n_name = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_struct_nlist_n_un=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_struct_nlist_n_un=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_nlist_n_un" 1>&6
+ if test $ac_cv_struct_nlist_n_un = yes; then
+ cat >> confdefs.h <<\EOF
+#define NLIST_NAME_UNION 1
+EOF
+
+ fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+fi # Do not have getloadavg in system libraries.
+
+# Some definitions of getloadavg require that the program be installed setgid.
+echo $ac_n "checking whether getloadavg requires setgid""... $ac_c" 1>&6
+echo "configure:3327: checking whether getloadavg requires setgid" >&5
+if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3332 "configure"
+#include "confdefs.h"
+#include "$srcdir/getloadavg.c"
+#ifdef LDAV_PRIVILEGED
+Yowza Am I SETGID yet
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "Yowza Am I SETGID yet" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_func_getloadavg_setgid=yes
+else
+ rm -rf conftest*
+ ac_cv_func_getloadavg_setgid=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_func_getloadavg_setgid" 1>&6
+if test $ac_cv_func_getloadavg_setgid = yes; then
+ NEED_SETGID=true; cat >> confdefs.h <<\EOF
+#define GETLOADAVG_PRIVILEGED 1
+EOF
+
+else
+ NEED_SETGID=false
+fi
+
+if test $ac_cv_func_getloadavg_setgid = yes; then
+ echo $ac_n "checking group of /dev/kmem""... $ac_c" 1>&6
+echo "configure:3363: checking group of /dev/kmem" >&5
+if eval "test \"`echo '$''{'ac_cv_group_kmem'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # On Solaris, /dev/kmem is a symlink. Get info on the real file.
+ ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
+ # If we got an error (system does not support symlinks), try without -L.
+ test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
+ ac_cv_group_kmem=`echo $ac_ls_output \
+ | sed -ne 's/[ ][ ]*/ /g;
+ s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/;
+ / /s/.* //;p;'`
+
+fi
+
+echo "$ac_t""$ac_cv_group_kmem" 1>&6
+ KMEM_GROUP=$ac_cv_group_kmem
+fi
+
+
+
+echo $ac_n "checking if this is an SVR4 system""... $ac_c" 1>&6
+echo "configure:3385: checking if this is an SVR4 system" >&5
+if eval "test \"`echo '$''{'cf_cv_svr4'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 3391 "configure"
+#include "confdefs.h"
+
+#include <elf.h>
+#include <sys/termio.h>
+
+int main() {
+
+#ifndef SVR4
+make an error
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_svr4=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_svr4=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_svr4" 1>&6
+test "$cf_cv_svr4" = yes && cat >> confdefs.h <<\EOF
+#define SVR4 1
+EOF
+
+
+
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:2698: checking if we must define _GNU_SOURCE" >&5
+echo "configure:3426: checking if we must define _GNU_SOURCE" >&5
if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
+#line 3432 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2710,7 +3438,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2720,7 +3448,7 @@
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 2724 "configure"
+#line 3452 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2730,7 +3458,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2755,7 +3483,7 @@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2759: checking for X" >&5
+echo "configure:3487: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2818,12 +3546,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2822 "configure"
+#line 3550 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2892,14 +3620,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2896 "configure"
+#line 3624 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2999,7 +3727,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:3003: checking for open in -lc_s" >&5
+echo "configure:3731: 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
@@ -3007,7 +3735,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3011 "configure"
+#line 3739 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3018,7 +3746,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3035,7 +3763,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:3039: checking for gethostname in -lbsd" >&5
+echo "configure:3767: 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
@@ -3043,7 +3771,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
+#line 3775 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3054,7 +3782,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3071,7 +3799,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:3075: checking for gethostname in -lnsl_s" >&5
+echo "configure:3803: 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
@@ -3079,7 +3807,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3083 "configure"
+#line 3811 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3090,7 +3818,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3107,7 +3835,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:3111: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:3839: 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
@@ -3115,7 +3843,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3119 "configure"
+#line 3847 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3126,7 +3854,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3143,7 +3871,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:3147: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3875: 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
@@ -3151,7 +3879,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3155 "configure"
+#line 3883 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3162,7 +3890,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3203,7 +3931,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3207: checking for socket in -lsocket" >&5
+echo "configure:3935: 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
@@ -3211,7 +3939,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3215 "configure"
+#line 3943 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3222,7 +3950,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3250,7 +3978,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3254: checking for gethostname in -lnsl" >&5
+echo "configure:3982: 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
@@ -3258,7 +3986,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3262 "configure"
+#line 3990 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3269,7 +3997,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3320,17 +4048,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:3324: checking whether -R must be followed by a space" >&5
+echo "configure:4052: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3327 "configure"
+#line 4055 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3346,14 +4074,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3350 "configure"
+#line 4078 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3385,7 +4113,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:3389: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4117: 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
@@ -3393,7 +4121,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
+#line 4125 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3404,7 +4132,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3426,7 +4154,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:3430: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4158: 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
@@ -3434,7 +4162,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3438 "configure"
+#line 4166 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3445,7 +4173,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3474,12 +4202,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:3478: checking for gethostbyname" >&5
+echo "configure:4206: 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 <<EOF
-#line 3483 "configure"
+#line 4211 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3502,7 +4230,7 @@
; return 0; }
EOF
-if { (eval echo configure:3506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3523,7 +4251,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3527: checking for gethostbyname in -lnsl" >&5
+echo "configure:4255: 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
@@ -3531,7 +4259,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3535 "configure"
+#line 4263 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3542,7 +4270,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3572,12 +4300,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:3576: checking for connect" >&5
+echo "configure:4304: 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 <<EOF
-#line 3581 "configure"
+#line 4309 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3600,7 +4328,7 @@
; return 0; }
EOF
-if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -3621,7 +4349,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3625: checking for connect in -lsocket" >&5
+echo "configure:4353: 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
@@ -3629,7 +4357,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3633 "configure"
+#line 4361 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3640,7 +4368,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3664,12 +4392,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:3668: checking for remove" >&5
+echo "configure:4396: 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 <<EOF
-#line 3673 "configure"
+#line 4401 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3692,7 +4420,7 @@
; return 0; }
EOF
-if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -3713,7 +4441,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3717: checking for remove in -lposix" >&5
+echo "configure:4445: 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
@@ -3721,7 +4449,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3725 "configure"
+#line 4453 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3732,7 +4460,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3756,12 +4484,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3760: checking for shmat" >&5
+echo "configure:4488: 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 <<EOF
-#line 3765 "configure"
+#line 4493 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3784,7 +4512,7 @@
; return 0; }
EOF
-if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3805,7 +4533,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3809: checking for shmat in -lipc" >&5
+echo "configure:4537: 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
@@ -3813,7 +4541,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3817 "configure"
+#line 4545 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3824,7 +4552,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3857,7 +4585,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:3861: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4589: 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
@@ -3865,7 +4593,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3869 "configure"
+#line 4597 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3876,7 +4604,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3903,7 +4631,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3907: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4635: 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
@@ -3911,7 +4639,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3915 "configure"
+#line 4643 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3922,7 +4650,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3943,7 +4671,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3947: checking for XtAppInitialize in -lXt" >&5
+echo "configure:4675: 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
@@ -3951,7 +4679,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3955 "configure"
+#line 4683 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3962,7 +4690,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4013,22 +4741,23 @@
for ac_hdr in \
X11/DECkeysym.h \
+ X11/Sunkeysym.h \
X11/Xpoll.h \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4022: checking for $ac_hdr" >&5
+echo "configure:4751: 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
-#line 4027 "configure"
+#line 4756 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4076,7 +4805,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4080: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4809: 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
@@ -4084,7 +4813,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4088 "configure"
+#line 4817 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4095,7 +4824,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4131,13 +4860,13 @@
if test $cf_path != default ; then
CFLAGS="-I$cf_path/include $cf_save"
echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:4135: checking for $cf_test in $cf_path" >&5
+echo "configure:4864: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:4138: checking for $cf_test" >&5
+echo "configure:4867: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4141 "configure"
+#line 4870 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -4146,7 +4875,7 @@
; return 0; }
EOF
-if { (eval echo configure:4150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -4172,21 +4901,21 @@
if test $cf_path != default ; then
LIBS="-L$cf_path/lib $cf_lib $LIBS"
echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:4176: checking for $cf_lib in $cf_path" >&5
+echo "configure:4905: checking for $cf_lib in $cf_path" >&5
else
LIBS="$cf_lib $LIBS"
echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:4180: checking for $cf_test in $cf_lib" >&5
+echo "configure:4909: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4183 "configure"
+#line 4912 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -4224,13 +4953,13 @@
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:4228: checking for declaration of fd_set" >&5
+echo "configure:4957: 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
echo "trying sys/types alone" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
+#line 4963 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4238,7 +4967,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -4247,7 +4976,7 @@
rm -rf conftest*
echo "trying X11/Xpoll.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4251 "configure"
+#line 4980 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -4257,7 +4986,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -4266,7 +4995,7 @@
rm -rf conftest*
echo "trying sys/select.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4270 "configure"
+#line 4999 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4275,7 +5004,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -4301,13 +5030,13 @@
echo $ac_n "checking for IRIX 6.5 baud-rate redefinitions""... $ac_c" 1>&6
-echo "configure:4305: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "configure:5034: checking for IRIX 6.5 baud-rate redefinitions" >&5
if eval "test \"`echo '$''{'cf_cv_termio_c_ispeed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4311 "configure"
+#line 5040 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4320,7 +5049,7 @@
; return 0; }
EOF
-if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_termio_c_ispeed=yes
@@ -4350,12 +5079,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4354: checking for $ac_func" >&5
+echo "configure:5083: 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 <<EOF
-#line 4359 "configure"
+#line 5088 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4378,7 +5107,7 @@
; return 0; }
EOF
-if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4400,7 +5129,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4404: checking for openpty in -lutil" >&5
+echo "configure:5133: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4408,7 +5137,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4412 "configure"
+#line 5141 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4419,7 +5148,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4453,7 +5182,7 @@
# Extract the first word of "xterm", so it can be a program name with args.
set dummy xterm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4457: checking for $ac_word" >&5
+echo "configure:5186: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4491,12 +5220,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4495: checking for $ac_func" >&5
+echo "configure:5224: 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 <<EOF
-#line 4500 "configure"
+#line 5229 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4519,7 +5248,7 @@
; return 0; }
EOF
-if { (eval echo configure:4523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4545,7 +5274,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4549: checking if we should use imake to help" >&5
+echo "configure:5278: 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
@@ -4570,7 +5299,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:4574: checking for $ac_word" >&5
+echo "configure:5303: 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
@@ -4709,7 +5438,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4713: checking for default terminal-id" >&5
+echo "configure:5442: 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
@@ -4730,7 +5459,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4734: checking for default terminal-type" >&5
+echo "configure:5463: 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
@@ -4747,7 +5476,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4751: checking for private terminfo-directory" >&5
+echo "configure:5480: checking for private terminfo-directory" >&5
# Check whether --with-own-terminfo or --without-own-terminfo was given.
if test "${with_own_terminfo+set}" = set; then
@@ -4786,7 +5515,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4790: checking if you want active-icons" >&5
+echo "configure:5519: 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
@@ -4812,7 +5541,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4816: checking if you want ANSI color" >&5
+echo "configure:5545: 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
@@ -4838,7 +5567,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4842: checking if you want 16 colors like aixterm" >&5
+echo "configure:5571: 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
@@ -4862,7 +5591,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4866: checking if you want 256 colors" >&5
+echo "configure:5595: checking if you want 256 colors" >&5
# Check whether --enable-256-color or --disable-256-color was given.
if test "${enable_256_color+set}" = set; then
@@ -4889,7 +5618,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4893: checking if you want 88 colors" >&5
+echo "configure:5622: checking if you want 88 colors" >&5
# Check whether --enable-88-color or --disable-88-color was given.
if test "${enable_88_color+set}" = set; then
@@ -4920,7 +5649,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4924: checking if you want blinking cursor" >&5
+echo "configure:5653: checking if you want blinking cursor" >&5
# Check whether --enable-blink-cursor or --disable-blink-cursor was given.
if test "${enable_blink_cursor+set}" = set; then
@@ -4946,7 +5675,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4950: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:5679: 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
@@ -4970,7 +5699,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4974: checking if you want color-mode enabled by default" >&5
+echo "configure:5703: 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
@@ -4996,7 +5725,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:5000: checking if you want support for color highlighting" >&5
+echo "configure:5729: checking if you want support for color highlighting" >&5
# Check whether --enable-highlighting or --disable-highlighting was given.
if test "${enable_highlighting+set}" = set; then
@@ -5020,7 +5749,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:5024: checking if you want support for doublesize characters" >&5
+echo "configure:5753: checking if you want support for doublesize characters" >&5
# Check whether --enable-doublechars or --disable-doublechars was given.
if test "${enable_doublechars+set}" = set; then
@@ -5044,7 +5773,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:5048: checking if you want fallback-support for box characters" >&5
+echo "configure:5777: checking if you want fallback-support for box characters" >&5
# Check whether --enable-boxchars or --disable-boxchars was given.
if test "${enable_boxchars+set}" = set; then
@@ -5068,7 +5797,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:5072: checking if you want support for HP-style function keys" >&5
+echo "configure:5801: checking if you want support for HP-style function keys" >&5
# Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
if test "${enable_hp_fkeys+set}" = set; then
@@ -5094,7 +5823,7 @@
fi
echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6
-echo "configure:5098: checking if you want support for SCO-style function keys" >&5
+echo "configure:5827: checking if you want support for SCO-style function keys" >&5
# Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
if test "${enable_sco_fkeys+set}" = set; then
@@ -5120,7 +5849,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:5124: checking if you want support for internationalization" >&5
+echo "configure:5853: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -5146,7 +5875,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:5150: checking if you want support for initial-erase setup" >&5
+echo "configure:5879: checking if you want support for initial-erase setup" >&5
# Check whether --enable-initial-erase or --disable-initial-erase was given.
if test "${enable_initial_erase+set}" = set; then
@@ -5172,7 +5901,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:5176: checking if you want support for input-method" >&5
+echo "configure:5905: 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
@@ -5192,13 +5921,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:5196: checking if X libraries support input-method" >&5
+echo "configure:5925: checking if X libraries support input-method" >&5
if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5202 "configure"
+#line 5931 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -5225,7 +5954,7 @@
; return 0; }
EOF
-if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -5248,7 +5977,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:5252: checking if you want support for logging" >&5
+echo "configure:5981: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -5272,7 +6001,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:5276: checking if you want to allow logging via a pipe" >&5
+echo "configure:6005: checking if you want to allow logging via a pipe" >&5
# Check whether --enable-logfile-exec or --disable-logfile-exec was given.
if test "${enable_logfile_exec+set}" = set; then
@@ -5299,7 +6028,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:5303: checking if you want support for iconify/maximize translations" >&5
+echo "configure:6032: checking if you want support for iconify/maximize translations" >&5
# Check whether --enable-maximize or --disable-maximize was given.
if test "${enable_maximize+set}" = set; then
@@ -5323,7 +6052,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5327: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:6056: checking if you want NumLock to override keyboard tables" >&5
# Check whether --enable-num-lock or --disable-num-lock was given.
if test "${enable_num_lock+set}" = set; then
@@ -5347,7 +6076,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5351: checking if you want support for right-scrollbar" >&5
+echo "configure:6080: 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
@@ -5373,7 +6102,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5377: checking if you want check for redundant name-change" >&5
+echo "configure:6106: checking if you want check for redundant name-change" >&5
# Check whether --enable-samename or --disable-samename was given.
if test "${enable_samename+set}" = set; then
@@ -5397,7 +6126,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5401: checking if you want support for tek4014" >&5
+echo "configure:6130: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -5427,7 +6156,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5431: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:6160: checking if you want pulldown menus with a toolbar" >&5
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
@@ -5451,7 +6180,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5455: checking if you want VT52 emulation" >&5
+echo "configure:6184: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -5475,7 +6204,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5479: checking if you want wide-character support" >&5
+echo "configure:6208: checking if you want wide-character support" >&5
# Check whether --enable-wide-chars or --disable-wide-chars was given.
if test "${enable_wide_chars+set}" = set; then
@@ -5504,7 +6233,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5508: checking if you want DECterm Locator support" >&5
+echo "configure:6237: checking if you want DECterm Locator support" >&5
# Check whether --enable-dec-locator or --disable-dec-locator was given.
if test "${enable_dec_locator+set}" = set; then
@@ -5530,7 +6259,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5534: checking if you want -ziconbeep option" >&5
+echo "configure:6263: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -5555,7 +6284,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5559: checking if you want debugging traces" >&5
+echo "configure:6288: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -5584,7 +6313,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5588: checking if you want to see long compiling messages" >&5
+echo "configure:6317: 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
@@ -5624,7 +6353,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5628: checking if you want magic cookie emulation" >&5
+echo "configure:6357: 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
@@ -5653,7 +6382,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5657: checking if you want to turn on gcc warnings" >&5
+echo "configure:6386: 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
@@ -5693,9 +6422,9 @@
if test -n "$GCC"
then
echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:5697: checking for $CC __attribute__ directives" >&5
+echo "configure:6426: checking for $CC __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 5699 "configure"
+#line 6428 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -5733,7 +6462,7 @@
EOF
;;
esac
- if { (eval echo configure:5737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:6466: \"$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
@@ -5750,11 +6479,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 5754 "configure"
+#line 6483 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for $CC warning options" 1>&6
-echo "configure:5758: checking for $CC warning options" >&5
+echo "configure:6487: checking for $CC warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5772,7 +6501,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:6505: \"$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"
@@ -5945,6 +6674,9 @@
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@LIBOBJS@%$LIBOBJS%g
+s%@NEED_SETGID@%$NEED_SETGID%g
+s%@KMEM_GROUP@%$KMEM_GROUP%g
s%@X_CFLAGS@%$X_CFLAGS%g
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
Index: configure.in
--- xterm-133+/configure.in Wed May 24 11:39:17 2000
+++ xterm-134/configure.in Sun May 28 19:56:03 2000
@@ -3,7 +3,7 @@
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+dnl Copyright 1997-2000 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -88,8 +88,9 @@
### checks for system services and user specified options
-AC_HEADER_SYS_WAIT
-
+CF_POSIX_WAIT
+CF_SYSV
+CF_SVR4
CF_GNU_SOURCE
CF_X_TOOLKIT
@@ -107,6 +108,7 @@
AC_CHECK_HEADERS( \
X11/DECkeysym.h \
+ X11/Sunkeysym.h \
X11/Xpoll.h \
)
Index: ctlseqs.ms
--- xterm-133+/ctlseqs.ms Sat Mar 4 04:36:01 2000
+++ xterm-134/ctlseqs.ms Sun May 28 21:48:50 2000
@@ -4,7 +4,7 @@
.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.36 2000/03/03 20:02:05 dawes Exp $
.\"
.\"
-.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey
.\"
.\" All Rights Reserved
.\"
@@ -64,7 +64,7 @@
.\" Originally written by Edward Moy, University of California,
.\" Berkeley, edmoy@violet.berkeley.edu, for the X.V10R4 xterm.
.\" The X Consortium staff has since updated it for X11.
-.\" Updated by Thomas Dickey <dickey@clark.net> for XFree86 3.2.
+.\" Updated by Thomas E. Dickey for XFree86 3.2 - XFree86 4.0
.\"
.\" Run this file through troff and use the -ms macro package.
.\"
@@ -1234,6 +1234,9 @@
.TE
For example, shift-F5 would be sent as
\*(Cs\*1\*5\*;\*2\*(c~
+
+If the \fBalwaysUseMods\fP resource is set, the Meta modifier also is
+recognized, making parameters 9 through 16.
.SH
VT220-Style Function Keys
.LP
Index: doublechr.c
--- xterm-133+/doublechr.c Wed Feb 9 17:47:18 2000
+++ xterm-134/doublechr.c Sun May 28 16:16:47 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
Index: fontutils.c
--- xterm-133+/fontutils.c Sat Mar 4 04:36:01 2000
+++ xterm-134/fontutils.c Sun May 28 16:29:28 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1998-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998-2000 by Thomas E. Dickey
All Rights Reserved
@@ -757,7 +757,7 @@
return True;
}
#endif
- CI_GET_CHAR_INFO_1D (font, ch, tmp, pc);
+ CI_GET_CHAR_INFO_1D (font, E2A(ch), tmp, pc);
}
#if OPT_WIDE_CHARS
else {
Index: fontutils.h
--- xterm-133+/fontutils.h Mon Sep 27 16:12:18 1999
+++ xterm-134/fontutils.h Sun May 28 16:16:00 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1998 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998,1999 by Thomas E. Dickey
All Rights Reserved
@@ -47,7 +47,6 @@
extern void xtermSaveFontInfo (TScreen *screen, XFontStruct *font);
extern void xtermSetCursorBox (TScreen *screen);
extern void xtermUpdateFontInfo (TScreen *screen, Bool doresize);
-
#if OPT_DEC_CHRSET
extern char *xtermSpecialFont(unsigned atts, unsigned chrset);
Index: input.c
--- xterm-133+/input.c Wed May 24 11:39:17 2000
+++ xterm-134/input.c Sun May 28 16:23:20 2000
@@ -4,7 +4,7 @@
*/
/*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -69,6 +69,10 @@
#include <X11/DECkeysym.h>
#endif
+#ifdef HAVE_X11_SUNKEYSYM_H
+#include <X11/Sunkeysym.h>
+#endif
+
#include <X11/Xutil.h>
#include <X11/StringDefs.h>
#include <ctype.h>
@@ -302,7 +306,7 @@
if (term->keyboard.type == keyboardIsLegacy)
result = (screen->delete_is_del != False);
- TRACE(("xtermDeleteIsDEL(%d/%d) = %d\n",
+ TRACE(("xtermDeleteIsDEL(%d/%d) = %d\n",
term->keyboard.type,
screen->delete_is_del,
result));
@@ -456,24 +460,42 @@
&& screen->ansi_level != 0
#endif
) {
-#define ModifierParm(ctl,normal) \
- modify_parm = (event->state & ControlMask) ? ctl : normal
+/*
+* Modifier codes:
+* None 1
+* Shift 2 = 1(None)+1(Shift)
+* Alt 3 = 1(None)+2(Alt)
+* Alt+Shift 4 = 1(None)+1(Shift)+2(Alt)
+* Ctrl 5 = 1(None)+4(Ctrl)
+* Ctrl+Shift 6 = 1(None)+1(Shift)+4(Ctrl)
+* Ctrl+Alt 7 = 1(None)+2(Alt)+4(Ctrl)
+* Ctrl+Alt+Shift 8 = 1(None)+1(Shift)+2(Alt)+4(Ctrl)
+*/
+#define UNMOD 1
+#define SHIFT 1
+#define ALT 2
+#define CTRL 4
+#define META 8
+ modify_parm = UNMOD;
+ if (event->state & ShiftMask) {
+ modify_parm += SHIFT;
+ }
+ if (event->state & ControlMask) {
+ modify_parm += CTRL;
+ }
#if OPT_NUM_LOCK
- if (term->misc.real_NumLock
+ if ((term->misc.alwaysUseMods
+ || term->misc.real_NumLock)
&& ((event->state & term->misc.alt_left) != 0
|| (event->state & term->misc.alt_right)) != 0) {
- if (event->state & ShiftMask) {
- ModifierParm(8, 4);
- } else {
- ModifierParm(7, 3);
- }
- } else
-#endif
- if (event->state & ShiftMask) {
- ModifierParm(6, 2);
- } else {
- ModifierParm(5, 1);
+ modify_parm += ALT;
+ }
+ if (term->misc.alwaysUseMods
+ && ((event->state & term->misc.meta_left) != 0
+ || (event->state & term->misc.meta_right)) != 0) {
+ modify_parm += META;
}
+#endif
TRACE(("...ModifierParm %d\n", modify_parm));
}
@@ -567,6 +589,10 @@
} else if (IsFunctionKey(keysym)
|| IsMiscFunctionKey(keysym)
|| IsEditFunctionKey(keysym)
+#ifdef SunXK_F36
+ || keysym == SunXK_F36
+ || keysym == SunXK_F37
+#endif
|| (keysym == XK_Delete
&& ((modify_parm > 1)
|| !xtermDeleteIsDEL()))) {
@@ -743,6 +769,10 @@
case XK_F18: return(32);
case XK_F19: return(33);
case XK_F20: return(34);
+#ifdef SunXK_F36
+ case SunXK_F36: return(57);
+ case SunXK_F37: return(58);
+#endif
case XK_Find : return(1);
case XK_Insert: return(2);
@@ -902,6 +932,10 @@
case XK_R13: return(220); /* kf43=kend */
case XK_R14: return(221); /* kf44 */
case XK_R15: return(222); /* kf45 */
+#ifdef SunXK_F36
+ case SunXK_F36: return(234);
+ case SunXK_F37: return(235);
+#endif
case XK_Find : return(1);
case XK_Insert: return(2); /* kich1 */
@@ -1019,29 +1053,32 @@
}
}
- /*
- * If the Alt modifier is used in translations, we would rather not
- * use it to modify function-keys when NumLock is active.
- */
- if ((term->misc.alt_left != 0
- || term->misc.alt_right != 0)
- && (TranslationsUseKeyword(toplevel, "alt")
- || TranslationsUseKeyword((Widget)term, "alt"))) {
- TRACE(("ALT is used as a modifier in translations (ignore mask)\n"));
- term->misc.alt_left = 0;
- term->misc.alt_right = 0;
- }
+ /* Don't disable any mods if "alwaysUseMods" is true. */
+ if (!term->misc.alwaysUseMods) {
+ /*
+ * If the Alt modifier is used in translations, we would rather not
+ * use it to modify function-keys when NumLock is active.
+ */
+ if ((term->misc.alt_left != 0
+ || term->misc.alt_right != 0)
+ && (TranslationsUseKeyword(toplevel, "alt")
+ || TranslationsUseKeyword((Widget)term, "alt"))) {
+ TRACE(("ALT is used as a modifier in translations (ignore mask)\n"));
+ term->misc.alt_left = 0;
+ term->misc.alt_right = 0;
+ }
- /*
- * If the Meta modifier is used in translations, we would rather not
- * use it to modify function-keys.
- */
- if ((term->misc.meta_left != 0
- || term->misc.meta_right != 0)
- && (TranslationsUseKeyword(toplevel, "meta")
- || TranslationsUseKeyword((Widget)term, "meta"))) {
- TRACE(("META is used as a modifier in translations\n"));
- term->misc.meta_trans = True;
+ /*
+ * If the Meta modifier is used in translations, we would rather not
+ * use it to modify function-keys.
+ */
+ if ((term->misc.meta_left != 0
+ || term->misc.meta_right != 0)
+ && (TranslationsUseKeyword(toplevel, "meta")
+ || TranslationsUseKeyword((Widget)term, "meta"))) {
+ TRACE(("META is used as a modifier in translations\n"));
+ term->misc.meta_trans = True;
+ }
}
XFreeModifiermap(keymap);
Index: main.c
--- xterm-133+/main.c Wed May 24 11:39:17 2000
+++ xterm-134/main.c Sun May 28 19:48:16 2000
@@ -101,7 +101,6 @@
#include <module/name.h>
#define USE_TERMIOS
-#define USE_POSIX_WAIT
#define NILCAP ((capability *)NULL)
#endif
@@ -316,13 +315,8 @@
#include <sys/resource.h>
#endif
-#ifdef SCO
-#define USE_POSIX_WAIT
-#endif /* SCO */
-
#ifdef __hpux
#define HAS_BSD_GROUPS
-#define USE_POSIX_WAIT
#include <sys/ptyio.h>
#endif /* __hpux */
@@ -344,7 +338,6 @@
#ifdef __QNX__
#undef TIOCSLTC /* <sgtty.h> conflicts with <termios.h> */
#undef TIOCLSET
-#define USE_POSIX_WAIT
#ifndef __QNXNTO__
#define ttyslot() 1
#else
@@ -378,12 +371,7 @@
#endif /* } !SYSV */
-#ifdef _POSIX_SOURCE
-#define USE_POSIX_WAIT
-#endif
-
#ifdef SVR4
-#define USE_POSIX_WAIT
#define HAS_SAVED_IDS_AND_SETEUID
#endif
@@ -403,7 +391,6 @@
#endif
#if defined(BSD) && (BSD >= 199103)
-#define USE_POSIX_WAIT
#define WTMP
#define HAS_SAVED_IDS_AND_SETEUID
#endif
@@ -579,7 +566,11 @@
/* choose a nice default value for speed - if we make it too low, users who
* mistakenly use $TERM set to vt100 will get padding delays
*/
+#ifdef B38400 /* everyone should define this */
#define VAL_LINE_SPEED B38400
+#else /* ...but xterm's used this for a long time */
+#define VAL_LINE_SPEED B9600
+#endif
/* allow use of system default characters if defined and reasonable */
#ifndef CBRK
@@ -966,6 +957,8 @@
{"-leftbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "off"},
{"-rightbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "on"},
#endif
+{"-rvc", "*colorRVMode", XrmoptionNoArg, (caddr_t) "off"},
+{"+rvc", "*colorRVMode", XrmoptionNoArg, (caddr_t) "on"},
{"-sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "on"},
{"+sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "off"},
{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"},
@@ -1092,6 +1085,7 @@
{ "-rightbar", "force scrollbar right (default left)" },
{ "-leftbar", "force scrollbar left" },
#endif
+{ "-/+rvc", "turn off/on display of reverse as color" },
{ "-/+sf", "turn on/off Sun Function Key escape codes" },
{ "-/+si", "turn on/off scroll-on-tty-output inhibit" },
{ "-/+sk", "turn on/off scroll-on-keypress" },
@@ -1148,6 +1142,26 @@
"will be started. Options that start with a plus sign (+) restore the default.",
NULL};
+static Boolean get_termcap(char *name, char *buffer, char *resized)
+{
+ register TScreen *screen = &term->screen;
+
+ *buffer = 0; /* initialize, in case we're using terminfo's tgetent */
+
+ if (name != 0) {
+ if (tgetent (buffer, name) == 1
+ && *buffer) {
+ if (!TEK4014_ACTIVE(screen)) {
+ resize (screen, buffer, resized);
+ }
+ return True;
+ } else {
+ *buffer = 0;
+ }
+ }
+ return False;
+}
+
static int abbrev (char *tst, char *cmp)
{
size_t len = strlen(tst);
@@ -2584,16 +2598,7 @@
* the program to proceed (but not to set $TERMCAP) if the termcap
* entry is not found.
*/
- *ptr = 0; /* initialize, in case we're using terminfo's tgetent */
- TermName = NULL;
- if (resource.term_name) {
- TermName = resource.term_name;
- if (tgetent (ptr, resource.term_name) == 1) {
- if (*ptr)
- if (!TEK4014_ACTIVE(screen))
- resize (screen, termcap, newtc);
- }
- }
+ get_termcap(TermName = resource.term_name, ptr, newtc);
/*
* This block is invoked only if there was no terminal name specified
@@ -2602,12 +2607,9 @@
if (!TermName) {
TermName = *envnew;
while (*envnew != NULL) {
- if(tgetent(ptr, *envnew) == 1) {
- TermName = *envnew;
- if (*ptr)
- if(!TEK4014_ACTIVE(screen))
- resize(screen, termcap, newtc);
- break;
+ if (get_termcap(*envnew, ptr, newtc)) {
+ TermName = *envnew;
+ break;
}
envnew++;
}
@@ -3948,25 +3950,13 @@
ptr = termcap;
}
- *ptr = 0;
- TermName = NULL;
- if (resource.term_name) {
- TermName = resource.term_name;
- if (tgetent (ptr, resource.term_name) == 1) {
- if (*ptr)
- if (!TEK4014_ACTIVE(screen))
- resize (screen, termcap, newtc);
- }
- }
+ get_termcap(TermName = resource.term_name, ptr, newtc);
if (!TermName) {
TermName = *envnew;
while (*envnew != NULL) {
- if(tgetent(ptr, *envnew) == 1) {
+ if (get_termcap(*envnew, ptr, newtc)) {
TermName = *envnew;
- if (*ptr)
- if(!TEK4014_ACTIVE(screen))
- resize(screen, termcap, newtc);
break;
}
envnew++;
@@ -4455,7 +4445,7 @@
if (*s == '^') {
s++;
- c = ((*s == '?') ? 0177 : CONTROL(*s));
+ c = ((*s == '?') ? A2E(0177) : CONTROL(*s));
if (*s == '-') {
c = -1;
errno = 0;
@@ -4573,45 +4563,6 @@
c = x;
__etoa_l(&c,1);
return c;
-}
-
-char CONTROL(char c)
-{
- /* this table was built through trial & error */
- static char ebcdic_control_chars[256]={
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00 - 07 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 08 - 0f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 10 - 17 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 18 - 1f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 20 - 27 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 28 - 2f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 30 - 37 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 38 - 3f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 40 - 47 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 48 - 4f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 50 - 57 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 58 - 5f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, /* 60 - 67 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, /* 68 - 6f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 70 - 77 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 78 - 7f */
- 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, /* 80 - 87 */
- 0x16, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 88 - 8f */
- 0x00, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, /* 90 - 97 */
- 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 98 - 9f */
- 0x00, 0x00, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, /* a0 - a7 */
- 0x19, 0x3f, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, /* a8 - af */
- 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b0 - b7 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, /* b8 - bf */
- 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, /* c0 - c7 */
- 0x16, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c8 - cf */
- 0x00, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, /* d0 - d7 */
- 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d8 - df */
- 0x1c, 0x00, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, /* e0 - e7 */
- 0x19, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* e8 - ef */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* f0 - f7 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; /* f8 - ff */
- return ebcdic_control_chars[CharOf(c)];
}
#endif
Index: menu.c
--- xterm-133+/menu.c Fri Apr 7 02:44:10 2000
+++ xterm-134/menu.c Sun May 28 16:19:55 2000
@@ -2,7 +2,7 @@
/* $XFree86: xc/programs/xterm/menu.c,v 3.33 2000/03/31 20:13:45 dawes Exp $ */
/*
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
All Rights Reserved
Index: menu.h
--- xterm-133+/menu.h Fri Apr 7 02:44:10 2000
+++ xterm-134/menu.h Sun May 28 16:20:10 2000
@@ -2,7 +2,7 @@
/* $XFree86: xc/programs/xterm/menu.h,v 3.22 2000/03/31 20:13:46 dawes Exp $ */
/*
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
All Rights Reserved
Index: misc.c
--- xterm-133+/misc.c Wed May 24 11:39:17 2000
+++ xterm-134/misc.c Sun May 28 16:22:06 2000
@@ -5,7 +5,7 @@
/*
*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -76,6 +76,9 @@
#include <X11/Xmu/Error.h>
#include <X11/Xmu/SysUtil.h>
#include <X11/Xmu/WinUtil.h>
+#if HAVE_X11_SUNKEYSYM_H
+#include <X11/Sunkeysym.h>
+#endif
#ifdef X_NOT_STDC_ENV
extern time_t time ();
@@ -818,11 +821,10 @@
/*
* Doublecheck that the user really owns the file that we've opened before
- * we do any damage.
+ * we do any damage, and that it is not world-writable.
*/
if (fstat(fd, &sb) < 0
|| (int) sb.st_uid != uid
- || (int) sb.st_gid != gid
|| (sb.st_mode & 022) != 0) {
fprintf(stderr, "%s: you do not own %s\n", xterm_name, path);
close(fd);
@@ -1346,7 +1348,11 @@
}
}
+#ifdef SunXK_F36
+#define MAX_UDK 37
+#else
#define MAX_UDK 35
+#endif
static struct {
char *str;
int len;
Index: os2main.c
--- xterm-133+/os2main.c Wed May 24 11:39:17 2000
+++ xterm-134/os2main.c Sat May 27 12:29:31 2000
@@ -392,6 +392,8 @@
{"-leftbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "off"},
{"-rightbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "on"},
#endif
+{"-rvc", "*colorRVMode", XrmoptionNoArg, (caddr_t) "off"},
+{"+rvc", "*colorRVMode", XrmoptionNoArg, (caddr_t) "on"},
{"-sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "on"},
{"+sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "off"},
{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"},
@@ -514,6 +516,7 @@
{ "-rightbar", "force scrollbar right (default left)" },
{ "-leftbar", "force scrollbar left" },
#endif
+{ "-/+rvc", "turn off/on display of reverse as color" },
{ "-/+sf", "turn on/off Sun Function Key escape codes" },
{ "-/+si", "turn on/off scroll-on-tty-output inhibit" },
{ "-/+sk", "turn on/off scroll-on-keypress" },
Index: print.c
--- xterm-133+/print.c Wed Feb 9 17:47:18 2000
+++ xterm-134/print.c Sun May 28 16:22:21 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
@@ -166,7 +166,7 @@
? extract_fg((fbf[col]<<8)|(fbb[col]), a[col])
: -1;
bg = (a[col] & BG_COLOR)
- ? extract_bg((fbf[col]<<8)|(fbb[col]))
+ ? extract_bg((fbf[col]<<8)|(fbb[col]), a[col])
: -1;
}
})
@@ -176,7 +176,7 @@
? extract_fg(fb[col], a[col])
: -1;
bg = (a[col] & BG_COLOR)
- ? extract_bg(fb[col])
+ ? extract_bg(fb[col], a[col])
: -1;
}
})
Index: ptydata.c
--- xterm-133+/ptydata.c Wed Feb 9 17:47:18 2000
+++ xterm-134/ptydata.c Sun May 28 16:17:24 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
All Rights Reserved
Index: ptyx.h
--- xterm-133+/ptyx.h Wed May 24 11:39:17 2000
+++ xterm-134/ptyx.h Sun May 28 16:28:54 2000
@@ -4,7 +4,7 @@
*/
/*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -238,7 +238,7 @@
#endif
/* constants used for utf8 mode */
-#define UCS_REPL 0xfffd
+#define UCS_REPL 0xfffd
#define UCS_LIMIT 0x80000000U /* both limit and flag for non-UCS */
#define TERMCAP_SIZE 1500 /* 1023 is standard; 'screen' exceeds */
@@ -555,16 +555,27 @@
#define COLOR_BD (NUM_ANSI_COLORS) /* BOLD */
#define COLOR_UL (NUM_ANSI_COLORS+1) /* UNDERLINE */
#define COLOR_BL (NUM_ANSI_COLORS+2) /* BLINK */
-#define MAXCOLORS (NUM_ANSI_COLORS+3)
+#define COLOR_RV (NUM_ANSI_COLORS+3) /* REVERSE */
+#define MAXCOLORS (NUM_ANSI_COLORS+4)
#ifndef DFT_COLORMODE
#define DFT_COLORMODE TRUE /* default colorMode resource */
#endif
+#define ReverseOrHilite(screen,flags,hilite) \
+ (( screen->colorRVMode && hilite ) || \
+ ( !screen->colorRVMode && \
+ (( (flags & INVERSE) && !hilite) || \
+ (!(flags & INVERSE) && hilite)) ))
+
#else /* !OPT_ISO_COLORS */
#define if_OPT_ISO_COLORS(screen, code) /* nothing */
#define TERM_COLOR_FLAGS 0
+#define ReverseOrHilite(screen,flags,hilite) \
+ (( (flags & INVERSE) && !hilite) || \
+ (!(flags & INVERSE) && hilite))
+
#endif /* OPT_ISO_COLORS */
#if OPT_AIX_COLORS
@@ -641,13 +652,13 @@
#if OPT_EBCDIC
extern int E2A(int);
extern int A2E(int);
-extern char CONTROL(char);
#else
#define E2A(a) (a)
#define A2E(a) (a)
-#define CONTROL(a) ((a)&037)
#endif
+#define CONTROL(a) (A2E(E2A(a)&037))
+
/***====================================================================***/
#if OPT_TEK4014
@@ -841,6 +852,7 @@
int cur_foreground; /* current foreground color */
int cur_background; /* current background color */
int sgr_foreground; /* current SGR foreground color */
+ int sgr_background; /* current SGR background color */
Boolean sgr_extended; /* SGR set with extended codes? */
#endif
} SavedCursor;
@@ -902,6 +914,7 @@
Boolean colorULMode; /* use color for underline? */
Boolean colorBDMode; /* use color for bold? */
Boolean colorBLMode; /* use color for blink? */
+ Boolean colorRVMode; /* use color for reverse? */
Boolean colorAttrMode; /* prefer colorUL/BD to SGR */
#endif
#if OPT_HIGHLIGHT_COLOR
@@ -1219,6 +1232,7 @@
#endif
#if OPT_NUM_LOCK
Boolean real_NumLock; /* true if we treat NumLock key specially */
+ Boolean alwaysUseMods; /* true if we always want f-key modifiers */
unsigned long num_lock; /* modifier for Num_Lock */
unsigned long alt_left; /* modifier for Alt_L */
unsigned long alt_right; /* modifier for Alt_R */
@@ -1271,6 +1285,7 @@
Pixel dft_background; /* default background color */
#if OPT_ISO_COLORS
int sgr_foreground; /* current SGR foreground color */
+ int sgr_background; /* current SGR background color */
Boolean sgr_extended; /* SGR set with extended codes? */
#endif
#if OPT_ISO_COLORS || OPT_DEC_CHRSET || OPT_WIDE_CHARS
Index: resize.man
--- xterm-133+/resize.man Sun Apr 5 23:48:23 1998
+++ xterm-134/resize.man Sun May 28 16:12:22 2000
@@ -1,6 +1,6 @@
.\" $XConsortium: resize.man /main/12 1996/12/09 17:10:48 kaleb $
.\" $XFree86: xc/programs/xterm/resize.man,v 1.4 1998/04/05 02:29:20 dawes Exp $
-.\" updated by Thomas Dickey <dickey@clark.net> for XFree86, Februrary 1998.
+.\" updated by Thomas E. Dickey for XFree86, Februrary 1998.
.TH RESIZE 1 "Release 6.3" "X Version 11"
.SH NAME
resize \- set TERMCAP and terminal settings to current xterm window size
Index: screen.c
--- xterm-133+/screen.c Sat Mar 4 04:36:01 2000
+++ xterm-134/screen.c Sun May 28 16:22:35 2000
@@ -3,7 +3,7 @@
*/
/*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -784,13 +784,13 @@
/* this combines them, then splits them again. but
extract_fg does more, so seems reasonable */
fg = extract_fg(fg_bg, flags);
- bg = extract_bg(fg_bg);
+ bg = extract_bg(fg_bg, flags);
})
if_OPT_ISO_TRADITIONAL_COLORS(screen,{
fb = SCRN_BUF_COLOR(screen, lastind + topline);
fg_bg = fb[col];
fg = extract_fg(fg_bg, flags);
- bg = extract_bg(fg_bg);
+ bg = extract_bg(fg_bg, flags);
})
gc = updatedXtermGC(screen, flags, fg_bg, hilite);
gc_changes |= (flags & (FG_COLOR|BG_COLOR));
@@ -804,10 +804,10 @@
#if OPT_ISO_COLORS
#if OPT_EXT_COLORS
|| ((flags & FG_COLOR) && (extract_fg((fbf[col]<<8)|fbb[col],attrs[col]) != fg))
- || ((flags & BG_COLOR) && (extract_bg((fbf[col]<<8)|fbb[col]) != bg))
+ || ((flags & BG_COLOR) && (extract_bg((fbf[col]<<8)|fbb[col],attrs[col]) != bg))
#else
|| ((flags & FG_COLOR) && (extract_fg(fb[col],attrs[col]) != fg))
- || ((flags & BG_COLOR) && (extract_bg(fb[col]) != bg))
+ || ((flags & BG_COLOR) && (extract_bg(fb[col],attrs[col]) != bg))
#endif
#endif
#if OPT_DEC_CHRSET
@@ -835,12 +835,12 @@
if_OPT_EXT_COLORS(screen,{
fg_bg = (fbf[col]<<8) | fbb[col];
fg = extract_fg(fg_bg, flags);
- bg = extract_bg(fg_bg);
+ bg = extract_bg(fg_bg, flags);
})
if_OPT_ISO_TRADITIONAL_COLORS(screen,{
fg_bg = fb[col];
fg = extract_fg(fg_bg, flags);
- bg = extract_bg(fg_bg);
+ bg = extract_bg(fg_bg, flags);
})
if_OPT_DEC_CHRSET({
cs = cb[col];
Index: scrollbar.c
--- xterm-133+/scrollbar.c Wed May 24 11:39:17 2000
+++ xterm-134/scrollbar.c Sun May 28 16:20:26 2000
@@ -4,7 +4,7 @@
*/
/*
- * Copyright 2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 2000 by Thomas E. Dickey
*
* All Rights Reserved
*
Index: tabs.c
--- xterm-133+/tabs.c Wed Feb 9 17:47:18 2000
+++ xterm-134/tabs.c Sun May 28 16:17:40 2000
@@ -4,7 +4,7 @@
*/
/*
- * Copyright 2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 2000 by Thomas E. Dickey
*
* All Rights Reserved
*
Index: terminfo
--- xterm-133+/terminfo Wed Mar 1 02:22:43 2000
+++ xterm-134/terminfo Sun May 28 16:31:20 2000
@@ -2,7 +2,7 @@
# $XFree86: xc/programs/xterm/terminfo,v 3.39 2000/02/29 03:09:29 dawes Exp $
#
# XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color)
-# - Thomas E. Dickey <dickey@clark.net>
+# - Thomas E. Dickey
#
# Special Capabilities:
# --------------------
Index: testxmc.c
--- xterm-133+/testxmc.c Wed Feb 9 17:47:18 2000
+++ xterm-134/testxmc.c Sun May 28 16:17:57 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
Index: trace.c
--- xterm-133+/trace.c Sun Jan 30 20:11:46 2000
+++ xterm-134/trace.c Sun May 28 16:29:14 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
@@ -112,7 +112,7 @@
sprintf(dst, "\\u+%04X", value);
else
#endif
- if (value < 32 || (value > 127 && value < 160))
+ if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160))
sprintf(dst, "\\%03o", value);
else
sprintf(dst, "%c", value);
@@ -141,7 +141,7 @@
sprintf(dst, "\\u+%04X", value);
else
#endif
- if (value < 32 || (value > 127 && value < 160))
+ if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160))
sprintf(dst, "\\%03o", value);
else
sprintf(dst, "%c", value);
Index: trace.h
--- xterm-133+/trace.h Wed Feb 9 17:47:18 2000
+++ xterm-134/trace.h Sun May 28 16:18:13 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
Index: unicode/README
--- xterm-133+/unicode/README Sun Jun 13 17:55:49 1999
+++ xterm-134/unicode/README Sun May 28 16:30:59 2000
@@ -1,5 +1,5 @@
-- $XFree86: xc/programs/xterm/unicode/README,v 1.1 1999/06/12 15:37:23 dawes Exp $
--- Thomas Dickey <dickey@clark.net>
+-- Thomas E. Dickey
These are some scripts and datafiles used for generating tables used in the
experimental UTF-8 implementation in xterm.
Index: util.c
--- xterm-133+/util.c Fri Apr 7 02:44:10 2000
+++ xterm-134/util.c Sun May 28 16:23:48 2000
@@ -4,7 +4,7 @@
*/
/*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -1668,14 +1668,13 @@
Bool hilite)
{
Pixel fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags));
- Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg));
+ Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg,flags));
#if OPT_HIGHLIGHT_COLOR
Pixel hi_pix = screen->highlightcolor;
#endif
GC gc;
- if ( (!hilite && (flags & INVERSE) != 0)
- || (hilite && (flags & INVERSE) == 0) ) {
+ if (ReverseOrHilite(screen, flags, hilite)) {
if (flags & (BOLD|BLINK))
gc = ReverseBoldGC(screen);
else
@@ -1719,8 +1718,7 @@
Pixel bg_pix = getXtermBackground(flags,term->cur_background);
GC gc;
- if ( (!hilite && (flags & INVERSE) != 0)
- || (hilite && (flags & INVERSE) == 0) ) {
+ if (ReverseOrHilite(screen, flags, hilite)) {
if (flags & (BOLD|BLINK))
gc = ReverseBoldGC(screen);
else
@@ -1750,16 +1748,10 @@
unsigned color,
unsigned flags)
{
- int fg;
-
-#if OPT_EXT_COLORS
- fg = (int) ((color >> 8) & 0xff);
-#else
- fg = (int) ((color >> 4) & 0xf);
-#endif
+ int fg = (int)ExtractForeground(color);
if (term->screen.colorAttrMode
- || (fg == extract_bg(color))) {
+ || (fg == (int)ExtractBackground(color))) {
if (term->screen.colorULMode && (flags & UNDERLINE))
fg = COLOR_UL;
if (term->screen.colorBDMode && (flags & BOLD))
@@ -1768,6 +1760,25 @@
fg = COLOR_BL;
}
return fg;
+}
+
+/*
+ * Extract the background-color index from a one-byte color pair.
+ * If we've got INVERSE color-mode active, that will be used.
+ */
+int
+extract_bg (
+ unsigned color,
+ unsigned flags)
+{
+ int bg = (int)ExtractBackground(color);
+
+ if (term->screen.colorAttrMode
+ || (bg == (int)ExtractForeground(color))) {
+ if (term->screen.colorRVMode && (flags & INVERSE))
+ bg = COLOR_RV;
+ }
+ return bg;
}
/*
Index: version.h
--- xterm-133+/version.h Wed May 24 11:39:17 2000
+++ xterm-134/version.h Sun May 28 17:39:34 2000
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 133
-#define XFREE86_VERSION "XFree86 4.0a"
+#define XTERM_PATCH 134
+#define XFREE86_VERSION "XFree86 4.0b"
Index: xterm.h
--- xterm-133+/xterm.h Wed May 24 11:39:17 2000
+++ xterm-134/xterm.h Sun May 28 19:49:13 2000
@@ -2,7 +2,7 @@
/************************************************************
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
All Rights Reserved
@@ -57,6 +57,10 @@
#define HAVE_X11_DECKEYSYM_H 1
#endif
+#ifndef HAVE_X11_SUNKEYSYM_H
+#define HAVE_X11_SUNKEYSYM_H 1
+#endif
+
#ifndef DFT_TERMTYPE
#define DFT_TERMTYPE "xterm"
#endif
@@ -115,6 +119,10 @@
#define USE_LASTLOG
#endif
+#if defined(AMOEBA) || defined(SCO) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__QNX__) || defined(__hpux) || (defined(BSD) && (BSD >= 199103))
+#define USE_POSIX_WAIT
+#endif
+
#if defined(AIXV3) || defined(CRAY) || defined(SCO) || defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__MVS__) || defined(__hpux) || defined(__osf__) || defined(linux) || defined(macII)
#define USE_SYSV_UTMP
#endif
@@ -245,6 +253,8 @@
#define XtNcolorMode "colorMode"
#define XtNcolorUL "colorUL"
#define XtNcolorULMode "colorULMode"
+#define XtNcolorRV "colorRV"
+#define XtNcolorRVMode "colorRVMode"
#define XtNctrlFKeys "ctrlFKeys"
#define XtNcurses "curses"
#define XtNcursorBlink "cursorBlink"
@@ -278,6 +288,7 @@
#define XtNmultiScroll "multiScroll"
#define XtNnMarginBell "nMarginBell"
#define XtNnumLock "numLock"
+#define XtNalwaysUseMods "alwaysUseMods"
#define XtNoldXtermFKeys "oldXtermFKeys"
#define XtNpointerColor "pointerColor"
#define XtNpointerColorBackground "pointerColorBackground"
@@ -359,6 +370,7 @@
#define XtCMultiClickTime "MultiClickTime"
#define XtCMultiScroll "MultiScroll"
#define XtCNumLock "NumLock"
+#define XtCAlwaysUseMods "AlwaysUseMods"
#define XtCOldXtermFKeys "OldXtermFKeys"
#define XtCPrintAttributes "PrintAttributes"
#define XtCPrinterAutoClose "PrinterAutoClose"
@@ -704,10 +716,11 @@
extern Pixel getXtermBackground (int flags, int color);
extern Pixel getXtermForeground (int flags, int color);
extern int extract_fg (unsigned color, unsigned flags);
+extern int extract_bg (unsigned color, unsigned flags);
extern unsigned makeColorPair (int fg, int bg);
extern void ClearCurBackground (TScreen *screen, int top, int left, unsigned height, unsigned width);
-#define xtermColorPair() makeColorPair(term->sgr_foreground, term->cur_background)
+#define xtermColorPair() makeColorPair(term->sgr_foreground, term->sgr_background)
#define getXtermForeground(flags, color) \
(((flags) & FG_COLOR) && ((color) >= 0) \
@@ -729,9 +742,11 @@
#endif
#if OPT_EXT_COLORS
-#define extract_bg(color) ((int)((color) & 0xff))
+#define ExtractForeground(color) ((color >> 8) & 0xff)
+#define ExtractBackground(color) (color & 0xff)
#else
-#define extract_bg(color) ((int)((color) & 0xf))
+#define ExtractForeground(color) ((color >> 4) & 0xf)
+#define ExtractBackground(color) (color & 0xf)
#endif
#else /* !OPT_ISO_COLORS */
@@ -741,7 +756,7 @@
left, top, width, height, FALSE)
#define extract_fg(color, flags) term->cur_foreground
-#define extract_bg(color) term->cur_background
+#define extract_bg(color, flags) term->cur_background
/* FIXME: Reverse-Video? */
#define getXtermBackground(flags, color) term->core.background_pixel
Index: xterm.log.html
--- xterm-133+/xterm.log.html Wed May 24 11:39:17 2000
+++ xterm-134/xterm.log.html Sun May 28 20:50:02 2000
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<!--
*****************************************************************************
- * Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey (dickey@clark.net) *
+ * Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -25,11 +25,12 @@
<HTML>
<HEAD>
<TITLE>XTERM - Change Log</TITLE>
-<LINK REV=MADE HREF="mailto:dickey@clark.net">
+<LINK REV=MADE HREF="mailto:dickey@herndon4.his.com">
</HEAD>
<BODY>
<HR>
-Copyright 1997,1998,1999,2000 by Thomas E. Dickey
+Copyright 1997,1998,1999,2000 by <A
+HREF="mailto:dickey@herndon4.his.com">Thomas E. Dickey</A>
<HR>
<H1>Contents</H1>
This file contains a list of the changes that I have made for XFree86 xterm,
@@ -41,6 +42,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A>
<LI><A HREF="#xterm_133">Patch #133 - 2000/5/2 - XFree86 4.0a</A>
<LI><A HREF="#xterm_132">Patch #132 - 2000/4/11 - XFree86 4.0a</A>
<LI><A HREF="#xterm_131">Patch #131 - 2000/3/3 - XFree86 3.9.18b</A>
@@ -176,6 +178,73 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A></H1>
+<ul>
+ <li>update URL's and mailing addresses, moved to http://dickey.his.com
+ and dickey@herndon4.his.com
+
+ <li>correct missing quotes in CF_TTY_GROUP configure script macro in
+ case the script is run in batch mode.
+
+ <li>modify ownership-check of log file to ignore the group ownership.
+ Otherwise xterm cannot create logfiles in directories with set-gid
+ permissions.
+
+ <li>simplify the logic that reads termcap data.
+
+ <li>add fallback definition for B9600 in case line speed definition
+ for 38400 is missing (report by Jack J Woehr <jwoehr@ibm.net>,
+ for OpenBSD 2.6).
+
+ <li>fix: Set highlightColor, and select a region containing the text
+ cursor. If the window loses focus, the cursor becomes hollow, with
+ the region inside the cursor being background/foreground, unlike the
+ rest of the selection, which is foreground/highlight
+ (patch by Ross Paterson <ross@soi.city.ac.uk>).
+
+ <li>add configure script tests to define SVR4, SYSV and USE_POSIX_WAIT,
+ which enables xterm to compile on Solaris 7 and SCO Openserver
+ without imake, though there are still a few features for the latter
+ which require <code>sco</code> to be predefined.
+
+ <li>patches from Steve Wall:
+ <ul>
+ <li>add support for two Sun-specific function keys. These keys are
+ labeled F11 and F12 on Sun Type 5 keyboards, but return SunXK_F36 and
+ SunXK_F37. Support will only be compiled in if the header file
+ <X11/Sunkeysym.h> exists and contains the appropriate symbol
+ definitions. The keycodes for the DEC keycodes were arbitrary unused
+ codes, but the ones for the Sun keycodes are what cmdtool and
+ shelltool actually send.
+
+ <li>add <code>colorRV</code> and <code>colorRVMode</code> resources to allow specifying a
+ color to use for reverse video, similar to the existing UL, BD, and BL
+ modes.
+
+ <li>add <code>alwaysUseMods</code> resource, to override check if
+ <code>alt</code> or <code>meta</code> modifiers are used in
+ <code>translations</code> resource. Revamped the code to calculate
+ the modifier value, and included Meta if alwaysUseMods is TRUE, using
+ values 9-16.
+ </ul>
+
+ <li>patches from Paul Gilmartin for os390:
+ <ul>
+ <li>regularize the definition of CONTROL() and remove an
+ acknowledged "trial and error" table.
+
+ <li>translate "^?" into A2E(0177) which is the EBCDIC "DEL"
+ rather than plain 0177 which is the EBCDIC quotation mark.
+
+ <li>modify <code>xtermMissingChar()</code> so that EBCDIC codes 128-159
+ are not rendered as blanks by X server running on Solaris, which sees
+ those as control characters.
+
+ <li>make debugging traces (configure --enable-trace)
+ work properly with EBCDIC.
+ </ul>
+</ul>
<H1><A NAME="xterm_133">Patch #133 - 2000/5/2 - XFree86 4.0a</A></H1>
<ul>
Index: xterm.man
--- xterm-133+/xterm.man Wed May 24 11:39:17 2000
+++ xterm-134/xterm.man Sun May 28 21:45:57 2000
@@ -2,7 +2,7 @@
.\" $XFree86: xc/programs/xterm/xterm.man,v 3.60 2000/05/18 00:33:22 dawes Exp $
.\"
.\"
-.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey
.\"
.\" All Rights Reserved
.\"
@@ -57,7 +57,7 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
-.\" updated by Thomas Dickey <dickey@clark.net> for XFree86, July 1996.
+.\" updated by Thomas E. Dickey for XFree86, July 1996.
.TH XTERM 1 "Release 6.3" "X Version 11"
.SH NAME
xterm \- terminal emulator for X
@@ -454,6 +454,12 @@
.B \-rightbar
Force scrollbar to the right side of VT100 screen.
.TP 8
+.B "\-rvc"
+This option disables the display of characters with reverse attribute as color.
+.TP 8
+.B "\+rvc"
+This option enables the display of characters with reverse attribute as color.
+.TP 8
.B \-rw
This option indicates that reverse-wraparound should be allowed. This allows
the cursor to back up from the leftmost column of one line to the rightmost
@@ -881,6 +887,11 @@
text cursor. By default, a hollow text cursor is displayed whenever the
pointer moves out of the window or the window loses the input focus.
.TP 8
+.B "alwaysUseMods (\fPclass\fB AlwaysUseMods)"
+Override the \fBnumLock\fP resource, telling xterm to use the Alt and Meta
+modifiers as to construct parameters for function key sequences even if
+those modifiers appear in the translations resource.
+.TP 8
.B "appcursorDefault (\fPclass\fB AppcursorDefault)"
If ``true,'' the cursor keys are initially in application mode.
The default is ``false.''
@@ -969,8 +980,8 @@
The default is ``false.''
.TP 8
.B "colorAttrMode (\fPclass\fB ColorMode)"
-Specifies whether ``colorBD'', ``colorBL'' and ``colorUL''
-should override ANSI colors.
+Specifies whether ``colorBD'', ``colorBL'', ``colorUL'', and
+``colorRV'' should override ANSI colors.
If not, these are displayed only when no ANSI colors
have been set for the corresponding position.
The default is ``false.''
@@ -990,6 +1001,11 @@
color.
Note that setting ``colorMode'' off disables all colors, including this.
.TP 8
+.B "colorRVMode (\fPclass\fB ColorMode)"
+Specifies whether characters with the reverse attribute should be displayed in
+color.
+Note that setting ``colorMode'' off disables all colors, including this.
+.TP 8
.B "colorULMode (\fPclass\fB ColorMode)"
Specifies whether characters with the underline attribute should be displayed
in color or as underlined characters. Note that setting ``colorMode'' off
@@ -1049,6 +1065,10 @@
This specifies the color to use to display blink characters if
the ``colorBLMode'' resource is enabled.
.TP 8
+.B "colorRV (\fPclass\fB Foreground)"
+This specifies the color to use to display reverse characters if
+the ``colorRVMode'' resource is enabled.
+.TP 8
.B "colorUL (\fPclass\fB Foreground)"
This specifies the color to use to display underlined characters if
the ``colorULMode'' resource is enabled.
@@ -2519,7 +2539,7 @@
\fIXterm Control Sequences\fP
(this is the file ctlseqs.ms).
.sp
-http://www.clark.net/pub/dickey/xterm/xterm.html
+http://dickey.his.com/xterm/xterm.html
.SH BUGS
.PP
Large pastes do not work on some systems. This is not a bug in
Index: xtermcfg.hin
--- xterm-133+/xtermcfg.hin Wed May 24 11:39:17 2000
+++ xterm-134/xtermcfg.hin Sun May 28 19:44:53 2000
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
All Rights Reserved
@@ -55,6 +55,7 @@
#undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */
#undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */
#undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.h) */
+#undef HAVE_X11_SUNKEYSYM_H /* AC_CHECK_HEADERS(X11/Sunkeysym.h) */
#undef HAVE_X11_XPOLL_H /* AC_CHECK_HEADERS(X11/Xpoll.h) */
#undef HAVE_XKBSTDBELL /* AC_CHECK_FUNCS(XkbStdBell) */
#undef NO_ACTIVE_ICON /* CF_ARG_DISABLE(active-icon) */
@@ -84,10 +85,13 @@
#undef OPT_ZICONBEEP /* CF_ARG_DISABLE(ziconbeep) */
#undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */
#undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */
+#undef SVR4 /* CF_SVR4, imake */
+#undef SYSV /* CF_SYSV, imake */
#undef TTY_GROUP_NAME /* CF_TTY_GROUP */
#undef USE_LASTLOG /* CF_LASTLOG */
#undef USE_MY_MEMMOVE /* CF_FUNC_MEMMOVE */
#undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */
+#undef USE_POSIX_WAIT /* CF_POSIX_WAIT */
#undef USE_SYSV_UTMP /* CF_UTMP */
#undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */
#undef USE_TERMCAP /* CF_FUNC_TGETENT */