# ------------------------------------------------------------------------------
# INSTALL | 5
# XTerm.ad | 1
# button.c | 344 +++++++++++++++++++++++++++++++++++---
# charproc.c | 97 ++++++++--
# configure | 491 ++++++++++++++++++++++++++++---------------------------
# configure.in | 8
# ctlseqs.ms | 13 -
# main.c | 7
# menu.c | 55 ++++++
# menu.h | 35 +++
# os2main.c | 7
# ptyx.h | 22 +-
# util.c | 20 +-
# version.h | 2
# xterm.h | 4
# xterm.log.html | 33 +++
# xterm.man | 73 +++++---
# xtermcfg.hin | 93 +++++-----
# 18 files changed, 931 insertions, 379 deletions
# ------------------------------------------------------------------------------
Index: INSTALL
--- xterm-106+/INSTALL Wed Jun 9 06:12:06 1999
+++ xterm-107/INSTALL Sat Jun 12 11:37:35 1999
@@ -54,6 +54,11 @@
Do not compile-in code for ANSI colors.
+ --disable-blink-cursor disable support for blinking cursor
+
+ Do not compile-in code that implements a blinking cursor. The blinking
+ cursor is enabled either by resource setting or by popup menu entry.
+
--disable-bold-color disable PC-style mapping of bold colors
Do not compile-in code that maps colors 8-15 to bold versions of
Index: XTerm.ad
--- xterm-106+/XTerm.ad Mon Mar 29 13:36:18 1999
+++ xterm-107/XTerm.ad Fri Jun 11 17:29:38 1999
@@ -50,6 +50,7 @@
*vtMenu*cursesemul*Label: Enable Curses Emulation
*vtMenu*visualbell*Label: Enable Visual Bell
*vtMenu*marginbell*Label: Enable Margin Bell
+*vtMenu*cursorblink*Label: Enable Blinking Cursor
*vtMenu*titeInhibit*Label: Enable Alternate Screen Switching
*vtMenu*activeicon*Label: Enable Active Icon
*vtMenu*softreset*Label: Do Soft Reset
Index: button.c
--- xterm-106+/button.c Sun Jun 6 16:55:05 1999
+++ xterm-107/button.c Sat Jun 12 14:01:00 1999
@@ -1,5 +1,34 @@
/* $TOG: button.c /main/76 1997/07/30 16:56:19 kaleb $ */
/*
+ * Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
+ *
+ * All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization.
+ *
+ *
* Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
*
* All Rights Reserved
@@ -330,25 +359,165 @@
do_select_end (w, event, params, num_params, True);
}
+#if OPT_WIDE_CHARS
+static Atom XA_UTF_8(Display *dpy)
+{
+ static AtomPtr p = NULL;
-
+ if(p == NULL)
+ p = XmuMakeAtom("UTF-8");
+ return XmuInternAtom(dpy, p);
+}
+#endif
struct _SelectionList {
String *params;
Cardinal count;
+ Bool utf8_failed; /* only used for UTF-8, but a nuisance to ifdef */
Time time;
};
+/* convert a UTF-8 string to Latin-1, replacing non Latin-1 characters
+ * by `#'. */
+
+#if OPT_WIDE_CHARS
+static XtPointer
+UTF8toLatin1(Char *s, int len, unsigned long *result)
+{
+ static Char *buffer;
+ static size_t used;
+
+ Char *p = s;
+ Char *q;
+
+ if (used == 0) {
+ buffer = XtMalloc(used = len);
+ } else if (len > (int) used) {
+ buffer = XtRealloc(buffer, used = len);
+ }
+ q = buffer;
+
+ while (p < s + len) {
+ if ((*p & 0x80) == 0) {
+ *q++ = *p++;
+ } else if ((*p & 0x3C) == 0 && p < s + len - 1) {
+ *q++ = (*p & 0x03) << 6 | (p[1] & 0x3F);
+ p += 2;
+ } else if ((*p & 0x20) == 0) {
+ *q++ = '#';
+ p += 2;
+ } else if ((*p & 0x10) == 0) {
+ *q++ = '#';
+ p += 3;
+ } else { /* this cannot currently happen */
+ *q++ = '#';
+ p++;
+ }
+ }
+ *result = q - buffer;
+ return (XtPointer)buffer;
+}
+
+/* Convert a Latin-1 string to UTF-8 */
+
+static int
+Latin1toUTF8(Char *t, Char *s, int len)
+{
+ Char *p = s;
+ Char *q = t;
+ while (p < s + len) {
+ if ((*p & 0x80) == 0) {
+ *q++ = *p++;
+ } else {
+ *q++ = 0xC0 | ((*p >> 6) & 0x3);
+ *q++ = 0x80 | (*p & 0x3F);
+ p++;
+ }
+ }
+ return q - t;
+}
+
+/* Eliminate all control characters from a UTF-8 string, doing
+ something reasonable with PS and LS */
+
+static int
+filterUTF8(Char *t, Char *s, int len)
+{
+ Char *p=s;
+ Char *q=t;
+ unsigned codepoint;
+ int size;
+
+ while (p < (s + len) && q < (t + len)) {
+ if ((*p & 0x80) == 0) {
+ codepoint = *p & 0x7F;
+ size = 1;
+ } else if ((*p & 0x20) == 0x20 && p < s + len - 1) {
+ codepoint = (p[0] & 0x1F) << 6 | (p[1] & 0x3F);
+ size = 2;
+ } else if ((*p & 0x10) == 0 && p < s + len - 2) {
+ codepoint = (s[0] & 0x0F) << 12
+ | (s[1] & 0x3F) << 6
+ | (s[2] & 0x3F);
+ size = 3;
+ } else if ((*p & 0x08) == 0 && p < s + len - 3) {
+ p += 4; /* eliminate surrogates */
+ continue;
+ } else if ((*p & 0x04) == 0 && p < s + len - 3) {
+ p += 5;
+ continue;
+ } else if ((*p & 0x02) == 0 && p < s + len - 3) {
+ p += 6;
+ continue;
+ } else { /* wrong UTF-8? */
+ p++;
+ continue;
+ }
+
+ if(codepoint == 0x2028) {
+ /* line separator -- replace by NL*/
+ p += size;
+ *q++ = 0x0A;
+ } else if (codepoint == 0x2029) {
+ /* paragraph separator -- replace by NL NL */
+ p += size;
+ *q++ = 0x0A;
+ if (q < t + len)
+ *q++ = 0x0A;
+ } else if (codepoint >= 0x202A && codepoint <= 0x202E) {
+ /* ignore Unicode control characters; surrogates have already
+ been eliminated */
+ p += size;
+ } else {
+ /* just copy the UTF-8 */
+ if (size--)
+ *q++ = *p++;
+ if (size--)
+ *q++ = *p++;
+ if (size--)
+ *q++ = *p++;
+ }
+ }
+ return q - t;
+}
+#endif /* OPT_WIDE_CHARS */
static void _GetSelection(
Widget w,
Time ev_time,
String *params, /* selections in precedence order */
- Cardinal num_params)
+ Cardinal num_params,
+ Bool utf8_failed GCC_UNUSED) /* already tried UTF-8 */
{
+ TScreen *screen;
Atom selection;
int cutbuffer;
+ if (!IsXtermWidget(w))
+ return;
+
+ screen = &((XtermWidget)w)->screen;
+
XmuInternStrings(XtDisplay(w), params, (Cardinal)1, &selection);
switch (selection) {
case XA_CUT_BUFFER0: cutbuffer = 0; break;
@@ -357,10 +526,12 @@
case XA_CUT_BUFFER3: cutbuffer = 3; break;
case XA_CUT_BUFFER4: cutbuffer = 4; break;
case XA_CUT_BUFFER5: cutbuffer = 5; break;
+
case XA_CUT_BUFFER6: cutbuffer = 6; break;
case XA_CUT_BUFFER7: cutbuffer = 7; break;
default: cutbuffer = -1;
}
+ TRACE(("Cutbuffer: %d, utf8_failed: %d\n", cutbuffer, utf8_failed))
if (cutbuffer >= 0) {
int inbytes;
unsigned long nbytes;
@@ -372,20 +543,55 @@
SelectionReceived(w, NULL, &selection, &type, (XtPointer)line,
&nbytes, &fmt8);
else if (num_params > 1)
- _GetSelection(w, ev_time, params+1, num_params-1);
+ _GetSelection(w, ev_time, params+1, num_params-1, False);
} else {
struct _SelectionList* list;
- if (--num_params) {
+#if OPT_WIDE_CHARS
+ if (!screen->wide_chars || utf8_failed) {
+ params++;
+ num_params--;
+ utf8_failed = False;
+ } else {
+ utf8_failed = True;
+ }
+#else
+ params++;
+ num_params--;
+#endif
+
+ if (num_params) {
list = XtNew(struct _SelectionList);
- list->params = params + 1;
- list->count = num_params; /* decremented above */
+ list->params = params;
+ list->count = num_params;
+#if OPT_WIDE_CHARS
+ list->utf8_failed = utf8_failed;
+#endif
list->time = ev_time;
} else list = NULL;
- XtGetSelectionValue(w, selection, XA_STRING, SelectionReceived,
- (XtPointer)list, ev_time);
+ XtGetSelectionValue(w, selection,
+#if OPT_WIDE_CHARS
+ (screen->wide_chars && utf8_failed) ?
+ XA_UTF_8(XtDisplay(w)) :
+#endif
+ XA_STRING,
+ SelectionReceived,
+ (XtPointer)list, ev_time);
}
}
+#if OPT_TRACE
+static void GettingSelection(char *tag, char *line, int len)
+{
+ char *cp;
+
+ Trace("Getting %s\n", tag);
+ for (cp = line; cp < line + len; cp++)
+ Trace("%c\n", *cp);
+}
+#else
+#define GettingSelection(tag,line,len) /* nothing */
+#endif
+
/* SelectionReceived: stuff received selection text into pty */
/* ARGSUSED */
@@ -401,28 +607,48 @@
int pty;
register Char *lag, *cp, *end;
Char *line = (Char*)value;
+ Char *buf;
+ int len;
+ TScreen *screen;
if (!IsXtermWidget(w))
return;
+ screen = &((XtermWidget)w)->screen;
pty = ((XtermWidget)w)->screen.respond; /* file descriptor of pty */
if (*type == 0 /*XT_CONVERT_FAIL*/ || *length == 0 || value == NULL) {
/* could not get this selection, so see if there are more to try */
struct _SelectionList* list = (struct _SelectionList*)client_data;
if (list != NULL) {
- _GetSelection(w, list->time, list->params, list->count);
+ _GetSelection(w, list->time,
+ list->params, list->count, list->utf8_failed);
XtFree((char *)client_data);
}
return;
}
+ buf = line;
+ len = *length;
+
+ if_OPT_WIDE_CHARS(screen,{
+ if (*type == XA_UTF_8(XtDisplay(w))) {
+ buf = (Char*)XtMalloc(*length);
+ GettingSelection("UTF-8", line, *length);
+ len = filterUTF8(buf, line, *length);
+ } else {
+ buf = XtMalloc(2* *length);
+ GettingSelection("Latin-1", line, *length);
+ len = Latin1toUTF8(buf, line, *length);
+ }
+ })
+
/* Write data to pty a line at a time. */
/* Doing this one line at a time may no longer be necessary
because v_write has been re-written. */
- end = &line[*length];
- lag = line;
- for (cp = line; cp != end; cp++)
+ end = &buf[len];
+ lag = buf;
+ for (cp = buf; cp != end; cp++)
{
if (*cp == '\n') {
*cp = '\r';
@@ -433,6 +659,9 @@
if (lag != end)
v_write(pty, lag, end - lag);
+ if_OPT_WIDE_CHARS(screen,{
+ XtFree(buf);
+ })
XtFree((char *)client_data);
XtFree((char *)value);
}
@@ -446,7 +675,7 @@
Cardinal *num_params)
{
if (SendMousePosition(w, event)) return;
- _GetSelection(w, event->xbutton.time, params, *num_params);
+ _GetSelection(w, event->xbutton.time, params, *num_params, False);
}
@@ -1297,10 +1526,10 @@
screen = &((XtermWidget)w)->screen;
- if (screen->selection_data == NULL) {
+ if (screen->selection_data == NULL)
return False; /* can this happen? */
- } else if (*target == XA_TARGETS(d)) {
+ if (*target == XA_TARGETS(d)) {
Atom* targetP;
Atom* std_targets;
unsigned long std_length;
@@ -1312,7 +1541,11 @@
*value = (XtPointer) targetP;
*targetP++ = XA_STRING;
*targetP++ = XA_TEXT(d);
- *targetP++ = XA_COMPOUND_TEXT(d);
+ *targetP = XA_COMPOUND_TEXT(d);
+ if_OPT_WIDE_CHARS(screen, {
+ *targetP = XA_UTF_8(d);
+ })
+ targetP++;
*targetP++ = XA_LENGTH(d);
*targetP++ = XA_LIST_LENGTH(d);
memcpy ( (char*)targetP, (char*)std_targets, sizeof(Atom)*std_length);
@@ -1322,27 +1555,74 @@
return True;
}
- if (*target == XA_STRING ||
- *target == XA_TEXT(d) ||
- *target == XA_COMPOUND_TEXT(d)) {
- if (*target == XA_COMPOUND_TEXT(d)) {
- XTextProperty textprop;
-
- *value = (XtPointer) screen->selection_data;
- if (XmbTextListToTextProperty (d, (char**)value, 1,
- XCompoundTextStyle, &textprop)
- < Success) return False;
- *value = (XtPointer) textprop.value;
- *length = textprop.nitems;
- *type = *target;
- } else {
+ if_OPT_WIDE_CHARS(screen,{
+ if (*target == XA_STRING) {
+ *value = UTF8toLatin1(screen->selection_data, screen->selection_length, length);
*type = XA_STRING;
+ *format = 8;
+ return True;
+ }
+ if (*target == XA_TEXT(d)) {
+ char *p;
+ /* walk the string, searching for non ISO 8859-1 characters */
+ for (p = screen->selection_data;
+ p < screen->selection_data+screen->selection_length;
+ p++) {
+ if ((*p & 0xC0) == 0xC0
+ && ((*p & 0x20) || (!(*p & 0x20) && (*p & 0x1C))))
+ break;
+ }
+ if (p < screen->selection_data + screen->selection_length) {
+ /* non ISO 8859-1 character found -- return UTF-8 */
+ *type = XA_UTF_8(d);
+ *value = screen->selection_data;
+ *length = screen->selection_length;
+ *format = 8;
+ } else {
+ /* none found -- return STRING */
+ *value = UTF8toLatin1(screen->selection_data, screen->selection_length, length);
+ *type = XA_STRING;
+ *format = 8;
+ }
+ return True;
+ }
+ if (*target == XA_UTF_8(d)) {
+ *type = XA_UTF_8(d);
*value = screen->selection_data;
*length = screen->selection_length;
+ *format = 8;
+ return True;
}
+ })
+
+ /* We covered the XA_TEXT and XA_STRING cases for wide_chars above */
+ if ((*target == XA_TEXT(d) || *target == XA_STRING)) {
+ *type = XA_STRING;
+ *value = screen->selection_data;
+ *length = screen->selection_length;
*format = 8;
return True;
}
+
+ if (*target == XA_COMPOUND_TEXT(d)
+#if OPT_WIDE_CHARS
+ && !screen->wide_chars
+#endif
+ ) {
+ XTextProperty textprop;
+
+ *value = (XtPointer) screen->selection_data;
+ if (XmbTextListToTextProperty (d, (char**)value, 1,
+ XCompoundTextStyle,
+ &textprop) < Success)
+ return False;
+ *value = (XtPointer) textprop.value;
+ *length = textprop.nitems;
+ *type = XA_COMPOUND_TEXT(d);
+ *format = 8;
+ return True;
+ }
+
if (*target == XA_LIST_LENGTH(d)) {
*value = XtMalloc(4);
if (sizeof(long) == 4)
@@ -1356,7 +1636,9 @@
*format = 32;
return True;
}
+
if (*target == XA_LENGTH(d)) {
+ /* This value is wrong if we have UTF-8 text */
*value = XtMalloc(4);
if (sizeof(long) == 4)
*(long*)*value = screen->selection_length;
@@ -1369,6 +1651,7 @@
*format = 32;
return True;
}
+
if (XmuConvertStandardSelection(w, screen->selection_time, selection,
target, type, (XPointer *)value,
length, format))
@@ -1376,7 +1659,6 @@
/* else */
return False;
-
}
Index: charproc.c
--- xterm-106+/charproc.c Sun Jun 6 16:55:05 1999
+++ xterm-107/charproc.c Fri Jun 11 20:40:47 1999
@@ -196,7 +196,9 @@
#define XtNcolorUL "colorUL"
#define XtNcolorULMode "colorULMode"
#define XtNcurses "curses"
-#define XtNcursorBlinkTime "cursorBlinkTime"
+#define XtNcursorBlink "cursorBlink"
+#define XtNcursorOnTime "cursorOnTime"
+#define XtNcursorOffTime "cursorOffTime"
#define XtNcursorColor "cursorColor"
#define XtNcutNewline "cutNewline"
#define XtNcutToBeginningOfLine "cutToBeginningOfLine"
@@ -272,7 +274,9 @@
#define XtCColorMode "ColorMode"
#define XtCColumn "Column"
#define XtCCurses "Curses"
-#define XtCCursorBlinkTime "CursorBlinkTime"
+#define XtCCursorBlink "CursorBlink"
+#define XtCCursorOnTime "CursorOnTime"
+#define XtCCursorOffTime "CursorOffTime"
#define XtCCutNewline "CutNewline"
#define XtCCutToBeginningOfLine "CutToBeginningOfLine"
#define XtCDecTerminalID "DecTerminalID"
@@ -373,7 +377,8 @@
static char * _Font_Selected_ = "yes"; /* string is arbitrary */
#if OPT_BLINK_CURS
-static int defaultBlinkTime = 0;
+static int defaultBlinkOnTime = 600;
+static int defaultBlinkOffTime = 300;
#endif
#if OPT_PRINT_COLORS
@@ -475,6 +480,9 @@
#ifdef ALLOWLOGGING
{ "set-logging", HandleLogging },
#endif
+#if OPT_BLINK_CURS
+ { "set-cursorblink", HandleCursorBlink },
+#endif
#if OPT_DEC_CHRSET
{ "set-font-doublesize", HandleFontDoublesize },
#endif
@@ -562,9 +570,15 @@
XtOffsetOf(XtermWidgetRec, screen.cursorcolor),
XtRString, "XtDefaultForeground"},
#if OPT_BLINK_CURS
-{XtNcursorBlinkTime, XtCCursorBlinkTime, XtRInt, sizeof(int),
+{XtNcursorBlink, XtCCursorBlink, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.cursor_blink),
- XtRInt, (XtPointer) &defaultBlinkTime},
+ XtRBoolean, (XtPointer) &defaultFALSE},
+{XtNcursorOnTime, XtCCursorOnTime, XtRInt, sizeof(int),
+ XtOffsetOf(XtermWidgetRec, screen.cursor_on),
+ XtRInt, (XtPointer) &defaultBlinkOnTime},
+{XtNcursorOffTime, XtCCursorOffTime, XtRInt, sizeof(int),
+ XtOffsetOf(XtermWidgetRec, screen.cursor_off),
+ XtRInt, (XtPointer) &defaultBlinkOffTime},
#endif
{XtNkeyboardDialect, XtCKeyboardDialect, XtRString, sizeof(String),
XtOffsetOf(XtermWidgetRec, screen.keyboard_dialect),
@@ -1153,7 +1167,7 @@
#endif
nextstate = parsestate[c];
- /*
+ /*
* Accumulate string for printable text. This may be 8/16-bit
* characters.
*/
@@ -2458,8 +2472,14 @@
in_put(void)
{
register TScreen *screen = &term->screen;
- register int i;
+ register int i, time_select;
static struct timeval select_timeout;
+#if OPT_BLINK_CURS
+#define TICK (1000/8)
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
+ int tick = MAX( 1, MIN( screen->cursor_on, screen->cursor_off) ) * TICK;
+#endif
for( ; ; ) {
if (eventMode == NORMAL
@@ -2502,6 +2522,8 @@
} else
FD_ZERO (&write_mask);
select_timeout.tv_sec = 0;
+ time_select = 0;
+
/*
* if there's either an XEvent or an XtTimeout pending, just take
* a quick peek, i.e. timeout from the select() immediately. If
@@ -2510,20 +2532,26 @@
* The blocking is optional, because it tends to increase the load
* on the host.
*/
- if (XtAppPending(app_con)
-#if OPT_BLINK_CURS
- || (screen->cursor_blink > 0
- && (screen->select || screen->always_highlight))
- || screen->cursor_state == BLINKED_OFF
-#endif
- )
+ if (XtAppPending(app_con)) {
select_timeout.tv_usec = 0;
- else
+ time_select = 1;
+ } else if (screen->awaitInput) {
select_timeout.tv_usec = 50000;
+ time_select = 1;
+#if OPT_BLINK_CURS
+ } else if ((screen->cursor_blink &&
+ ((screen->select&FOCUS) || screen->always_highlight)) ||
+ (screen->cursor_state == BLINKED_OFF)) {
+ select_timeout.tv_usec = tick;
+ while( select_timeout.tv_usec > 1000000 ) {
+ select_timeout.tv_usec -= 1000000;
+ select_timeout.tv_sec++;
+ }
+ time_select = 1;
+#endif
+ }
i = select(max_plus1, &select_mask, &write_mask, 0,
- (select_timeout.tv_usec == 0) || screen->awaitInput
- ? &select_timeout
- : 0);
+ time_select ? &select_timeout : 0);
if (i < 0) {
if (errno != EINTR)
SysError(ERROR_SELECT);
@@ -3571,6 +3599,22 @@
unparseputc(*s++, fd);
}
+#if OPT_BLINK_CURS
+void
+ToggleCursorBlink(register TScreen *screen)
+{
+ ShowCursor();
+ if (screen->cursor_blink) {
+ screen->cursor_blink = FALSE;
+ StopBlinking(screen);
+ } else {
+ screen->cursor_blink = TRUE;
+ StartBlinking(screen);
+ }
+ update_cursorblink();
+}
+#endif
+
void
ToggleAlternate(register TScreen *screen)
{
@@ -3926,6 +3970,8 @@
wnew->screen.cursorcolor = request->screen.cursorcolor;
#if OPT_BLINK_CURS
wnew->screen.cursor_blink = request->screen.cursor_blink;
+ wnew->screen.cursor_on = request->screen.cursor_on;
+ wnew->screen.cursor_off = request->screen.cursor_off;
#endif
wnew->screen.border = request->screen.border;
wnew->screen.jumpscroll = request->screen.jumpscroll;
@@ -4779,14 +4825,15 @@
static void
StartBlinking(TScreen *screen)
{
- if (screen->cursor_blink > 0
+ if (screen->cursor_blink
&& screen->cursor_timer == 0) {
- unsigned long half = screen->cursor_blink / 2;
- if (half == 0) /* wow! */
- half = 1; /* let's humor him anyway */
+ unsigned long interval = (screen->cursor_state == ON ?
+ screen->cursor_on : screen->cursor_off);
+ if (interval == 0) /* wow! */
+ interval = 1; /* let's humor him anyway */
screen->cursor_timer = XtAppAddTimeOut(
app_con,
- half,
+ interval,
BlinkCursor,
screen);
}
@@ -4795,7 +4842,7 @@
static void
StopBlinking(TScreen *screen)
{
- if (screen->cursor_blink > 0)
+ if (screen->cursor_timer)
XtRemoveTimeOut(screen->cursor_timer);
screen->cursor_timer = 0;
}
@@ -4806,7 +4853,7 @@
* logic simple.
*/
static void
-BlinkCursor(XtPointer closure, XtIntervalId* id)
+BlinkCursor(XtPointer closure, XtIntervalId* id GCC_UNUSED)
{
TScreen *screen = (TScreen *)closure;
Index: configure
--- xterm-106+/configure Wed Jun 9 07:02:29 1999
+++ xterm-107/configure Sat Jun 12 09:45:57 1999
@@ -193,11 +193,12 @@
--disable-active-icon disable X11R6.3 active-icon feature
--disable-ansi-color disable ANSI color
--disable-16-color disable 16-color support
+ --disable-blink-cursor disable support for blinking cursor
--disable-bold-color disable PC-style mapping of bold colors
--disable-color-mode disable default colorMode resource
- --disable-highlighting disable support for color highlighting
EOF
cat <<EOF
+ --disable-highlighting disable support for color highlighting
--disable-doublechars disable support for double-size chars
--disable-boxchars disable fallback-support for box chars
--enable-hp-fkeys enable support for HP-style function keys
@@ -209,9 +210,9 @@
--disable-maximize disable actions for iconify/deiconify/maximize/restore
--disable-num-lock disable NumLock keypad support
--disable-rightbar disable right-scrollbar support
- --disable-samename disable check for redundant name-change
EOF
cat <<EOF
+ --disable-samename disable check for redundant name-change
--disable-tek4014 disable tek4014 emulation
--disable-vt52 disable VT52 emulation
--enable-wide-chars enable wide-character support
@@ -587,7 +588,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:591: checking host system type" >&5
+echo "configure:592: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -638,7 +639,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:642: checking for $ac_word" >&5
+echo "configure:643: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -668,7 +669,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:672: checking for $ac_word" >&5
+echo "configure:673: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -719,7 +720,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:723: checking for $ac_word" >&5
+echo "configure:724: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -751,7 +752,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:756: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -762,12 +763,12 @@
cat > conftest.$ac_ext << EOF
-#line 766 "configure"
+#line 767 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -793,12 +794,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:802: checking whether we are using GNU C" >&5
+echo "configure:803: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -807,7 +808,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -826,7 +827,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:830: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:831: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -858,7 +859,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:862: checking how to run the C preprocessor" >&5
+echo "configure:863: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -873,13 +874,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 877 "configure"
+#line 878 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:884: \"$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
:
@@ -890,13 +891,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 894 "configure"
+#line 895 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:901: \"$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
:
@@ -907,13 +908,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 911 "configure"
+#line 912 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:918: \"$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
:
@@ -939,13 +940,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:943: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:944: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 949 "configure"
+#line 950 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -963,7 +964,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 967 "configure"
+#line 968 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -996,7 +997,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1000: checking for a BSD compatible install" >&5
+echo "configure:1001: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1051,9 +1052,9 @@
### checks for UNIX variants that set C preprocessor variables
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1055: checking for AIX" >&5
+echo "configure:1056: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1057 "configure"
+#line 1058 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1075,7 +1076,7 @@
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1079: checking for POSIXized ISC" >&5
+echo "configure:1080: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1097,17 +1098,17 @@
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1101: checking for minix/config.h" >&5
+echo "configure:1102: checking for minix/config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1106 "configure"
+#line 1107 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1112: \"$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*
@@ -1150,17 +1151,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1154: checking for $ac_hdr" >&5
+echo "configure:1155: 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 1159 "configure"
+#line 1160 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1165: \"$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*
@@ -1190,13 +1191,13 @@
### checks for typedefs
echo $ac_n "checking for size_t in <sys/types.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1194: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "configure:1195: checking for size_t in <sys/types.h> or <stdio.h>" >&5
if eval "test \"`echo '$''{'cf_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1200 "configure"
+#line 1201 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1209,7 +1210,7 @@
size_t x
; return 0; }
EOF
-if { (eval echo configure:1213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_size_t=yes
else
@@ -1229,12 +1230,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1233: checking for ANSI C header files" >&5
+echo "configure:1234: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1238 "configure"
+#line 1239 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1242,7 +1243,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1247: \"$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*
@@ -1259,7 +1260,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1263 "configure"
+#line 1264 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1277,7 +1278,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1281 "configure"
+#line 1282 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1298,7 +1299,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1303 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1309,7 +1310,7 @@
exit (0); }
EOF
-if { (eval echo configure:1313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1333,12 +1334,12 @@
fi
echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:1337: checking for time_t" >&5
+echo "configure:1338: checking for time_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1342 "configure"
+#line 1343 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1376,12 +1377,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1380: checking for $ac_func" >&5
+echo "configure:1381: 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 1385 "configure"
+#line 1386 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1404,7 +1405,7 @@
; return 0; }
EOF
-if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1409: \"$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
@@ -1430,12 +1431,12 @@
echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:1434: checking for memmove" >&5
+echo "configure:1435: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1439 "configure"
+#line 1440 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
@@ -1458,7 +1459,7 @@
; return 0; }
EOF
-if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
@@ -1477,12 +1478,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:1481: checking for bcopy" >&5
+echo "configure:1482: checking for bcopy" >&5
if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1486 "configure"
+#line 1487 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy(); below. */
@@ -1505,7 +1506,7 @@
; return 0; }
EOF
-if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_bcopy=yes"
else
@@ -1521,7 +1522,7 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:1525: checking if bcopy does overlapping moves" >&5
+echo "configure:1526: checking if bcopy does overlapping moves" >&5
if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1530,7 +1531,7 @@
cf_cv_good_bcopy=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 1534 "configure"
+#line 1535 "configure"
#include "confdefs.h"
int main() {
@@ -1543,7 +1544,7 @@
}
EOF
-if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_good_bcopy=yes
else
@@ -1581,7 +1582,7 @@
echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6
-echo "configure:1585: checking for full tgetent function" >&5
+echo "configure:1586: checking for full tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1596,7 +1597,7 @@
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
else
cat > conftest.$ac_ext <<EOF
-#line 1600 "configure"
+#line 1601 "configure"
#include "confdefs.h"
/* terminfo implementations ignore the buffer argument, making it useless for
@@ -1610,7 +1611,7 @@
tgetent(buffer, "vt100");
exit(buffer[0] == 0); }
EOF
-if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
if test -n "$cf_termlib" ; then
@@ -1645,17 +1646,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1649: checking for $ac_hdr" >&5
+echo "configure:1650: 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 1654 "configure"
+#line 1655 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1660: \"$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*
@@ -1688,7 +1689,7 @@
# validate values for the TERM environment variable given to
# child processes.
echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6
-echo "configure:1692: checking for partial tgetent function" >&5
+echo "configure:1693: checking for partial tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1697,14 +1698,14 @@
for cf_termlib in $cf_TERMLIB ; do
LIBS="$cf_save_LIBS -l$cf_termlib"
cat > conftest.$ac_ext <<EOF
-#line 1701 "configure"
+#line 1702 "configure"
#include "confdefs.h"
int main() {
tgetent(0, 0)
; return 0; }
EOF
-if { (eval echo configure:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -1727,17 +1728,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1731: checking for $ac_hdr" >&5
+echo "configure:1732: 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 1736 "configure"
+#line 1737 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1742: \"$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*
@@ -1777,13 +1778,13 @@
### checks for structures
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:1781: checking for declaration of fd_set" >&5
+echo "configure:1782: checking for declaration of fd_set" >&5
if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1788 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1791,7 +1792,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -1799,7 +1800,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 1803 "configure"
+#line 1804 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1808,7 +1809,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:1812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -1832,14 +1833,14 @@
echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:1836: checking if POSIX VDISABLE symbol should be used" >&5
+echo "configure:1837: checking if POSIX VDISABLE symbol should be used" >&5
if eval "test \"`echo '$''{'cf_cv_posix_vdisable'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 1843 "configure"
+#line 1844 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -1857,7 +1858,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:1861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_posix_vdisable=yes
else
@@ -1869,7 +1870,7 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 1873 "configure"
+#line 1874 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -1882,7 +1883,7 @@
int main() { exit(_POSIX_VDISABLE == -1); }
#endif
EOF
-if { (eval echo configure:1886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_posix_vdisable=yes
else
@@ -1908,13 +1909,13 @@
echo $ac_n "checking declaration of errno""... $ac_c" 1>&6
-echo "configure:1912: checking declaration of errno" >&5
+echo "configure:1913: checking declaration of errno" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1918 "configure"
+#line 1919 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
@@ -1927,7 +1928,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:1931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -1957,9 +1958,9 @@
EOF
echo $ac_n "checking existence of errno""... $ac_c" 1>&6
-echo "configure:1961: checking existence of errno" >&5
+echo "configure:1962: checking existence of errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 1963 "configure"
+#line 1964 "configure"
#include "confdefs.h"
#undef errno
@@ -1969,7 +1970,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'errno'=yes'
else
@@ -2000,12 +2001,12 @@
### checks for compiler characteristics
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2004: checking for working const" >&5
+echo "configure:2005: 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 2009 "configure"
+#line 2010 "configure"
#include "confdefs.h"
int main() {
@@ -2054,7 +2055,7 @@
; return 0; }
EOF
-if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2076,7 +2077,7 @@
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2080: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2081: 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
@@ -2100,7 +2101,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 2104 "configure"
+#line 2105 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2116,7 +2117,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2146,12 +2147,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:2150: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2151: 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 2155 "configure"
+#line 2156 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2167,7 +2168,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2193,7 +2194,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:2197: checking for X" >&5
+echo "configure:2198: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2256,12 +2257,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2260 "configure"
+#line 2261 "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:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2266: \"$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*
@@ -2330,14 +2331,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2335 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2342: \"$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.
@@ -2437,7 +2438,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:2441: checking for open in -lc_s" >&5
+echo "configure:2442: 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
@@ -2445,7 +2446,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2449 "configure"
+#line 2450 "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
@@ -2456,7 +2457,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2461: \"$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
@@ -2473,7 +2474,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:2477: checking for gethostname in -lbsd" >&5
+echo "configure:2478: 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
@@ -2481,7 +2482,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2485 "configure"
+#line 2486 "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
@@ -2492,7 +2493,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2497: \"$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
@@ -2509,7 +2510,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:2513: checking for gethostname in -lnsl_s" >&5
+echo "configure:2514: 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
@@ -2517,7 +2518,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2521 "configure"
+#line 2522 "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
@@ -2528,7 +2529,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2533: \"$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
@@ -2545,7 +2546,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:2549: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:2550: 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
@@ -2553,7 +2554,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2557 "configure"
+#line 2558 "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
@@ -2564,7 +2565,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2569: \"$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
@@ -2581,7 +2582,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:2585: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:2586: 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
@@ -2589,7 +2590,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2593 "configure"
+#line 2594 "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
@@ -2600,7 +2601,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:2604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2605: \"$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
@@ -2641,7 +2642,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2645: checking for socket in -lsocket" >&5
+echo "configure:2646: 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
@@ -2649,7 +2650,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2653 "configure"
+#line 2654 "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
@@ -2660,7 +2661,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:2664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2665: \"$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
@@ -2688,7 +2689,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:2692: checking for gethostname in -lnsl" >&5
+echo "configure:2693: 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
@@ -2696,7 +2697,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2700 "configure"
+#line 2701 "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
@@ -2707,7 +2708,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2712: \"$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
@@ -2758,17 +2759,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:2762: checking whether -R must be followed by a space" >&5
+echo "configure:2763: 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 2765 "configure"
+#line 2766 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -2784,14 +2785,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2788 "configure"
+#line 2789 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -2823,7 +2824,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:2827: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2828: 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
@@ -2831,7 +2832,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2835 "configure"
+#line 2836 "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
@@ -2842,7 +2843,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2847: \"$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
@@ -2864,7 +2865,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:2868: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2869: 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
@@ -2872,7 +2873,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2877 "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
@@ -2883,7 +2884,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2888: \"$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
@@ -2912,12 +2913,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:2916: checking for gethostbyname" >&5
+echo "configure:2917: 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 2921 "configure"
+#line 2922 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2940,7 +2941,7 @@
; return 0; }
EOF
-if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+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_func_gethostbyname=yes"
else
@@ -2961,7 +2962,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2965: checking for gethostbyname in -lnsl" >&5
+echo "configure:2966: 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
@@ -2969,7 +2970,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2973 "configure"
+#line 2974 "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
@@ -2980,7 +2981,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2985: \"$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
@@ -3010,12 +3011,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:3014: checking for connect" >&5
+echo "configure:3015: 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 3019 "configure"
+#line 3020 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3038,7 +3039,7 @@
; return 0; }
EOF
-if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3043: \"$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
@@ -3059,7 +3060,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3063: checking for connect in -lsocket" >&5
+echo "configure:3064: 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
@@ -3067,7 +3068,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3071 "configure"
+#line 3072 "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
@@ -3078,7 +3079,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3083: \"$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
@@ -3102,12 +3103,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:3106: checking for remove" >&5
+echo "configure:3107: 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 3111 "configure"
+#line 3112 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3130,7 +3131,7 @@
; return 0; }
EOF
-if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3135: \"$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
@@ -3151,7 +3152,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3155: checking for remove in -lposix" >&5
+echo "configure:3156: 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
@@ -3159,7 +3160,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3163 "configure"
+#line 3164 "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
@@ -3170,7 +3171,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3175: \"$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
@@ -3194,12 +3195,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3198: checking for shmat" >&5
+echo "configure:3199: 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 3203 "configure"
+#line 3204 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3222,7 +3223,7 @@
; 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:3227: \"$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
@@ -3243,7 +3244,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3247: checking for shmat in -lipc" >&5
+echo "configure:3248: 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
@@ -3251,7 +3252,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3255 "configure"
+#line 3256 "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
@@ -3262,7 +3263,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3267: \"$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
@@ -3295,7 +3296,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:3299: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3300: 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
@@ -3303,7 +3304,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3307 "configure"
+#line 3308 "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
@@ -3314,7 +3315,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3319: \"$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
@@ -3341,7 +3342,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3345: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3346: 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
@@ -3349,7 +3350,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3353 "configure"
+#line 3354 "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
@@ -3360,7 +3361,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3365: \"$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
@@ -3381,7 +3382,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3385: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3386: 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
@@ -3389,7 +3390,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3393 "configure"
+#line 3394 "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
@@ -3400,7 +3401,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3405: \"$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
@@ -3456,17 +3457,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3460: checking for $ac_hdr" >&5
+echo "configure:3461: 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 3465 "configure"
+#line 3466 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3471: \"$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*
@@ -3516,17 +3517,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3520: checking for $ac_hdr" >&5
+echo "configure:3521: 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 3525 "configure"
+#line 3526 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3531: \"$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*
@@ -3554,7 +3555,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3558: checking for XextCreateExtension in -lXext" >&5
+echo "configure:3559: 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
@@ -3562,7 +3563,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3566 "configure"
+#line 3567 "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
@@ -3573,7 +3574,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3578: \"$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
@@ -3595,7 +3596,7 @@
echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6
-echo "configure:3599: checking for XmuClientWindow in -lXmu" >&5
+echo "configure:3600: checking for XmuClientWindow in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3603,7 +3604,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXmu $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3607 "configure"
+#line 3608 "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
@@ -3614,7 +3615,7 @@
XmuClientWindow()
; return 0; }
EOF
-if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3619: \"$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
@@ -3641,7 +3642,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6
-echo "configure:3645: checking for XmuClientWindow in -lXmu_s" >&5
+echo "configure:3646: checking for XmuClientWindow in -lXmu_s" >&5
ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3649,7 +3650,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXmu_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3653 "configure"
+#line 3654 "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
@@ -3660,7 +3661,7 @@
XmuClientWindow()
; return 0; }
EOF
-if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3665: \"$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
@@ -3691,7 +3692,7 @@
echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6
-echo "configure:3695: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5
+echo "configure:3696: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5
ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3699,7 +3700,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$cf_x_athena $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
+#line 3704 "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
@@ -3710,7 +3711,7 @@
XawSimpleMenuAddGlobalActions()
; return 0; }
EOF
-if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3715: \"$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
@@ -3730,7 +3731,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6
-echo "configure:3734: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5
+echo "configure:3735: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5
ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3738,7 +3739,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3742 "configure"
+#line 3743 "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
@@ -3749,7 +3750,7 @@
XawSimpleMenuAddGlobalActions()
; return 0; }
EOF
-if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3754: \"$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
@@ -3790,12 +3791,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3794: checking for $ac_func" >&5
+echo "configure:3795: 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 3799 "configure"
+#line 3800 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3818,7 +3819,7 @@
; return 0; }
EOF
-if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3823: \"$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
@@ -3840,7 +3841,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:3844: checking for openpty in -lutil" >&5
+echo "configure:3845: 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
@@ -3848,7 +3849,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3852 "configure"
+#line 3853 "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
@@ -3859,7 +3860,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:3863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3864: \"$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
@@ -3894,7 +3895,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:3898: checking for $ac_word" >&5
+echo "configure:3899: 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
@@ -3928,7 +3929,7 @@
XTERM_MODE=755
echo $ac_n "checking for presumed installation-mode""... $ac_c" 1>&6
-echo "configure:3932: checking for presumed installation-mode" >&5
+echo "configure:3933: checking for presumed installation-mode" >&5
if test -f "$XTERM_PATH" ; then
ls -Ll $XTERM_PATH >conftest.out
read cf_mode cf_rest <conftest.out
@@ -3947,12 +3948,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3951: checking for $ac_func" >&5
+echo "configure:3952: 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 3956 "configure"
+#line 3957 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3975,7 +3976,7 @@
; return 0; }
EOF
-if { (eval echo configure:3979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3980: \"$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
@@ -4001,7 +4002,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4005: checking if we should use imake to help" >&5
+echo "configure:4006: 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
@@ -4026,7 +4027,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:4030: checking for $ac_word" >&5
+echo "configure:4031: 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
@@ -4165,7 +4166,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4169: checking for default terminal-id" >&5
+echo "configure:4170: 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
@@ -4186,7 +4187,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4190: checking for default terminal-type" >&5
+echo "configure:4191: 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
@@ -4203,7 +4204,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4207: checking for private terminfo-directory" >&5
+echo "configure:4208: 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
@@ -4234,7 +4235,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4238: checking if you want active-icons" >&5
+echo "configure:4239: 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
@@ -4260,7 +4261,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4264: checking if you want ANSI color" >&5
+echo "configure:4265: 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
@@ -4284,7 +4285,7 @@
echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4288: checking if you want 16 colors like aixterm" >&5
+echo "configure:4289: 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
@@ -4307,8 +4308,32 @@
EOF
+echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
+echo "configure:4313: 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
+ enableval="$enable_blink_cursor"
+ test "$enableval" != no && enableval=yes
+ if test "$enableval" != "yes" ; then
+ enable_blink_curs=no
+ else
+ enable_blink_curs=yes
+ fi
+else
+ enableval=yes
+ enable_blink_curs=yes
+
+fi
+
+echo "$ac_t""$enable_blink_curs" 1>&6
+test $enable_blink_curs = no && cat >> confdefs.h <<\EOF
+#define OPT_BLINK_CURS 0
+EOF
+
+
echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4312: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4337: 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
@@ -4332,7 +4357,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4336: checking if you want color-mode enabled by default" >&5
+echo "configure:4361: 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
@@ -4356,7 +4381,7 @@
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4360: checking if you want support for color highlighting" >&5
+echo "configure:4385: 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
@@ -4380,7 +4405,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4384: checking if you want support for doublesize characters" >&5
+echo "configure:4409: 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
@@ -4404,7 +4429,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4408: checking if you want fallback-support for box characters" >&5
+echo "configure:4433: 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
@@ -4428,7 +4453,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:4432: checking if you want support for HP-style function keys" >&5
+echo "configure:4457: 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
@@ -4454,7 +4479,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:4458: checking if you want support for internationalization" >&5
+echo "configure:4483: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -4480,7 +4505,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:4484: checking if you want support for initial-erase setup" >&5
+echo "configure:4509: 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
@@ -4506,7 +4531,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:4510: checking if you want support for input-method" >&5
+echo "configure:4535: 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
@@ -4532,7 +4557,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:4536: checking if you want support for logging" >&5
+echo "configure:4561: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -4556,7 +4581,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:4560: checking if you want to allow logging via a pipe" >&5
+echo "configure:4585: 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
@@ -4583,7 +4608,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:4587: checking if you want support for iconify/maximize translations" >&5
+echo "configure:4612: 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
@@ -4607,7 +4632,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:4611: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:4636: 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
@@ -4631,7 +4656,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:4635: checking if you want support for right-scrollbar" >&5
+echo "configure:4660: 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
@@ -4657,7 +4682,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:4661: checking if you want check for redundant name-change" >&5
+echo "configure:4686: 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
@@ -4681,7 +4706,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:4685: checking if you want support for tek4014" >&5
+echo "configure:4710: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -4711,7 +4736,7 @@
fi
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:4715: checking if you want VT52 emulation" >&5
+echo "configure:4740: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -4735,7 +4760,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:4739: checking if you want wide-character support" >&5
+echo "configure:4764: 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
@@ -4764,7 +4789,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:4768: checking if you want -ziconbeep option" >&5
+echo "configure:4793: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -4789,7 +4814,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:4793: checking if you want debugging traces" >&5
+echo "configure:4818: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -4818,7 +4843,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:4822: checking if you want to see long compiling messages" >&5
+echo "configure:4847: 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
@@ -4858,7 +4883,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:4862: checking if you want magic cookie emulation" >&5
+echo "configure:4887: 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
@@ -4887,7 +4912,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:4891: checking if you want to turn on gcc warnings" >&5
+echo "configure:4916: 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
@@ -4927,9 +4952,9 @@
if test -n "$GCC"
then
echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:4931: checking for gcc __attribute__ directives" >&5
+echo "configure:4956: checking for gcc __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 4933 "configure"
+#line 4958 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -4967,7 +4992,7 @@
EOF
;;
esac
- if { (eval echo configure:4971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4996: \"$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
@@ -4984,11 +5009,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 4988 "configure"
+#line 5013 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for gcc warning options" 1>&6
-echo "configure:4992: checking for gcc warning options" >&5
+echo "configure:5017: checking for gcc warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5006,7 +5031,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
Index: configure.in
--- xterm-106+/configure.in Wed Jun 9 06:10:34 1999
+++ xterm-107/configure.in Sat Jun 12 09:45:39 1999
@@ -191,6 +191,14 @@
AC_MSG_RESULT($enable_16_color)
test $enable_16_color = no && AC_DEFINE(OPT_AIX_COLORS,0)
+AC_MSG_CHECKING(if you want blinking cursor)
+CF_ARG_DISABLE(blink-cursor,
+ [ --disable-blink-cursor disable support for blinking cursor],
+ [enable_blink_curs=no],
+ [enable_blink_curs=yes])
+AC_MSG_RESULT($enable_blink_curs)
+test $enable_blink_curs = no && AC_DEFINE(OPT_BLINK_CURS,0)
+
AC_MSG_CHECKING(if you want bold colors mapped like IBM PC)
CF_ARG_DISABLE(bold-color,
[ --disable-bold-color disable PC-style mapping of bold colors],
Index: ctlseqs.ms
--- xterm-106+/ctlseqs.ms Mon May 3 21:18:34 1999
+++ xterm-107/ctlseqs.ms Fri Jun 11 17:28:52 1999
@@ -5,9 +5,9 @@
.\"
.\"
.\" Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
-.\"
+.\"
.\" All Rights Reserved
-.\"
+.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the
.\" "Software"), to deal in the Software without restriction, including
@@ -15,10 +15,10 @@
.\" distribute, sublicense, and/or sell copies of the Software, and to
.\" permit persons to whom the Software is furnished to do so, subject to
.\" the following conditions:
-.\"
+.\"
.\" The above copyright notice and this permission notice shall be included
.\" in all copies or substantial portions of the Software.
-.\"
+.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -26,12 +26,12 @@
.\" CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
.\" TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
.\" SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-.\"
+.\"
.\" Except as contained in this notice, the name(s) of the above copyright
.\" holders shall not be used in advertising or otherwise to promote the
.\" sale, use or other dealings in this Software without prior written
.\" authorization.
-.\"
+.\"
.\"
.\" Copyright 1991, 1994 X Consortium
.\"
@@ -575,6 +575,7 @@
\*(Ps = \*0 \(-> Erase Below (default)
\*(Ps = \*1 \(-> Erase Above
\*(Ps = \*2 \(-> Erase All
+ \*(Ps = \*3 \(-> Erase Saved Lines (xterm)
.
.IP \\*(Cs\\*?\\*(Ps\\*s\\*J
Erase in Display (DECSED)
Index: main.c
--- xterm-106+/main.c Sun May 16 15:55:44 1999
+++ xterm-107/main.c Fri Jun 11 17:28:26 1999
@@ -865,6 +865,10 @@
{"+ai", "*activeIcon", XrmoptionNoArg, (caddr_t) "on"},
#endif /* NO_ACTIVE_ICON */
{"-b", "*internalBorder",XrmoptionSepArg, (caddr_t) NULL},
+{"-bc", "*cursorBlink", XrmoptionNoArg, (caddr_t) "on"},
+{"+bc", "*cursorBlink", XrmoptionNoArg, (caddr_t) "off"},
+{"-bcf", "*cursorOffTime",XrmoptionSepArg, (caddr_t) NULL},
+{"-bcn", "*cursorOnTime",XrmoptionSepArg, (caddr_t) NULL},
{"-bdc", "*colorBDMode", XrmoptionNoArg, (caddr_t) "off"},
{"+bdc", "*colorBDMode", XrmoptionNoArg, (caddr_t) "on"},
{"-cb", "*cutToBeginningOfLine", XrmoptionNoArg, (caddr_t) "off"},
@@ -1001,6 +1005,9 @@
{ "-fi fontname", "icon font for active icon" },
#endif /* NO_ACTIVE_ICON */
{ "-b number", "internal border in pixels" },
+{ "-/+bc", "turn on/off text cursor blinking" },
+{ "-bcf milliseconds", "time text cursor is off when blinking"},
+{ "-bcn milliseconds", "time text cursor is on when blinking"},
{ "-/+bdc", "turn off/on display of bold as color"},
{ "-/+cb", "turn on/off cut-to-beginning-of-line inhibit" },
{ "-cc classrange", "specify additional character classes" },
Index: menu.c
--- xterm-106+/menu.c Mon Mar 29 13:36:18 1999
+++ xterm-107/menu.c Sat Jun 12 13:52:29 1999
@@ -2,6 +2,28 @@
/* $XFree86: xc/programs/xterm/menu.c,v 3.22 1999/03/28 15:33:19 dawes Exp $ */
/*
+Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
Copyright (c) 1989 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -89,6 +111,10 @@
static void do_activeicon PROTO_XT_CALLBACK_ARGS;
#endif /* NO_ACTIVE_ICON */
+#if OPT_BLINK_CURS
+static void do_cursorblink PROTO_XT_CALLBACK_ARGS;
+#endif
+
#if OPT_DEC_CHRSET
static void do_font_doublesize PROTO_XT_CALLBACK_ARGS;
#endif
@@ -178,6 +204,9 @@
{ "cursesemul", do_cursesemul, NULL },
{ "visualbell", do_visualbell, NULL },
{ "marginbell", do_marginbell, NULL },
+#if OPT_BLINK_CURS
+ { "cursorblink", do_cursorblink, NULL },
+#endif
{ "titeInhibit", do_titeInhibit, NULL },
#ifndef NO_ACTIVE_ICON
{ "activeicon", do_activeicon, NULL },
@@ -325,6 +354,7 @@
update_cursesemul();
update_visualbell();
update_marginbell();
+ update_cursorblink();
update_altscreen();
update_titeInhibit();
#ifndef NO_ACTIVE_ICON
@@ -883,6 +913,18 @@
}
#endif /* OPT_TEK4014 */
+#if OPT_BLINK_CURS
+/* ARGSUSED */
+static void do_cursorblink (
+ Widget gw GCC_UNUSED,
+ XtPointer closure GCC_UNUSED,
+ XtPointer data GCC_UNUSED)
+{
+ TScreen *screen = &term->screen;
+ ToggleCursorBlink(screen);
+}
+#endif
+
/* ARGSUSED */
static void do_altscreen (
Widget gw GCC_UNUSED,
@@ -1487,6 +1529,19 @@
handle_toggle (do_marginbell, (int) term->screen.marginbell,
params, *param_count, w, (XtPointer)0, (XtPointer)0);
}
+
+#if OPT_BLINK_CURS
+void HandleCursorBlink(
+ Widget w,
+ XEvent *event GCC_UNUSED,
+ String *params,
+ Cardinal *param_count)
+{
+ /* eventually want to see if sensitive or not */
+ handle_toggle (do_cursorblink, (int) term->screen.cursor_blink,
+ params, *param_count, w, (XtPointer)0, (XtPointer)0);
+}
+#endif
void HandleAltScreen(
Widget w,
Index: menu.h
--- xterm-106+/menu.h Mon Mar 29 13:36:18 1999
+++ xterm-107/menu.h Sat Jun 12 13:53:29 1999
@@ -2,6 +2,28 @@
/* $XFree86: xc/programs/xterm/menu.h,v 3.14 1999/03/28 15:33:20 dawes Exp $ */
/*
+Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
Copyright (c) 1989 X Consortium
Permission is hereby granted, free of charge, to any person obtaining
@@ -64,6 +86,7 @@
extern void HandleClearSavedLines PROTO_XT_ACTIONS_ARGS;
extern void HandleCreateMenu PROTO_XT_ACTIONS_ARGS;
extern void HandleCursesEmul PROTO_XT_ACTIONS_ARGS;
+extern void HandleCursorBlink PROTO_XT_ACTIONS_ARGS;
extern void HandleFontDoublesize PROTO_XT_ACTIONS_ARGS;
extern void HandleFontLoading PROTO_XT_ACTIONS_ARGS;
extern void HandleHardReset PROTO_XT_ACTIONS_ARGS;
@@ -156,6 +179,9 @@
vtMenu_cursesemul,
vtMenu_visualbell,
vtMenu_marginbell,
+#if OPT_BLINK_CURS
+ vtMenu_cursorblink,
+#endif
vtMenu_titeInhibit,
#ifndef NO_ACTIVE_ICON
vtMenu_activeicon,
@@ -368,6 +394,15 @@
update_menu_item (term->screen.vtMenu, \
vtMenuEntries[vtMenu_marginbell].widget, \
term->screen.marginbell)
+
+#if OPT_BLINK_CURS
+#define update_cursorblink() \
+ update_menu_item (term->screen.vtMenu, \
+ vtMenuEntries[vtMenu_cursorblink].widget, \
+ term->screen.cursor_blink)
+#else
+#define update_cursorblink() /* nothing */
+#endif
#define update_altscreen() \
update_menu_item (term->screen.vtMenu, \
Index: os2main.c
--- xterm-106+/os2main.c Mon May 3 21:18:34 1999
+++ xterm-107/os2main.c Fri Jun 11 17:26:32 1999
@@ -334,6 +334,10 @@
{"+ai", "*activeIcon", XrmoptionNoArg, (caddr_t) "on"},
#endif /* NO_ACTIVE_ICON */
{"-b", "*internalBorder",XrmoptionSepArg, (caddr_t) NULL},
+{"-bc", "*cursorBlink", XrmoptionNoArg, (caddr_t) "on"},
+{"+bc", "*cursorBlink", XrmoptionNoArg, (caddr_t) "off"},
+{"-bcf", "*cursorOffTime",XrmoptionSepArg, (caddr_t) NULL},
+{"-bcn", "*cursorOnTime",XrmoptionSepArg, (caddr_t) NULL},
{"-bdc", "*colorBDMode", XrmoptionNoArg, (caddr_t) "off"},
{"+bdc", "*colorBDMode", XrmoptionNoArg, (caddr_t) "on"},
{"-cb", "*cutToBeginningOfLine", XrmoptionNoArg, (caddr_t) "off"},
@@ -466,6 +470,9 @@
{ "-fi fontname", "icon font for active icon" },
#endif /* NO_ACTIVE_ICON */
{ "-b number", "internal border in pixels" },
+{ "-/+bc", "turn on/off text cursor blinking" },
+{ "-bcf milliseconds", "time text cursor is off when blinking"},
+{ "-bcn milliseconds", "time text cursor is on when blinking"}.
{ "-/+bdc", "turn off/on display of bold as color"},
{ "-/+cb", "turn on/off cut-to-beginning-of-line inhibit" },
{ "-cc classrange", "specify additional character classes" },
Index: ptyx.h
--- xterm-106+/ptyx.h Sun Jun 6 16:55:05 1999
+++ xterm-107/ptyx.h Fri Jun 11 17:26:06 1999
@@ -5,9 +5,9 @@
/*
* Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
- *
+ *
* All Rights Reserved
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -15,10 +15,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -26,13 +26,13 @@
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
* Except as contained in this notice, the name(s) of the above copyright
* holders shall not be used in advertising or otherwise to promote the
* sale, use or other dealings in this Software without prior written
* authorization.
- *
- *
+ *
+ *
* Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
*
* All Rights Reserved
@@ -339,7 +339,9 @@
#define OPT_AIX_COLORS 1 /* true if xterm is configured with AIX (16) colors */
#endif
-#define OPT_BLINK_CURS 0 /* FIXME: do this later (96/7/31) */
+#ifndef OPT_BLINK_CURS
+#define OPT_BLINK_CURS 1 /* true if xterm has blinking cursor capability */
+#endif
#ifndef OPT_BOX_CHARS
#define OPT_BOX_CHARS 1 /* true if xterm can simulate box-characters */
@@ -794,7 +796,9 @@
int cursor_state; /* ON, OFF, or BLINKED_OFF */
#if OPT_BLINK_CURS
- int cursor_blink; /* blink-rate (0=off) msecs */
+ Boolean cursor_blink; /* cursor blink enable */
+ int cursor_on; /* cursor on time (msecs) */
+ int cursor_off; /* cursor off time (msecs) */
XtIntervalId cursor_timer; /* timer-id for cursor-proc */
#endif
int cursor_set; /* requested state */
Index: util.c
--- xterm-106+/util.c Sun May 30 16:57:28 1999
+++ xterm-107/util.c Sat Jun 12 14:02:22 1999
@@ -5,9 +5,9 @@
/*
* Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
- *
+ *
* All Rights Reserved
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -15,10 +15,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -26,7 +26,7 @@
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
* Except as contained in this notice, the name(s) of the above copyright
* holders shall not be used in advertising or otherwise to promote the
* sale, use or other dealings in this Software without prior written
@@ -862,6 +862,12 @@
ClearAbove(screen);
break;
+ case 3:
+ /* xterm addition - erase saved lines. */
+ screen->savedlines = 0;
+ ScrollBarDrawThumb( screen->scrollWidget );
+ break;
+
case 2:
/*
* We use 'ClearScreen()' throughout the remainder of the
@@ -1455,9 +1461,11 @@
SAVE_FONT_INFO (screen);
} else { /* simulate double-sized characters */
+#if OPT_WIDE_CHARS
+ Char *wide = 0;
+#endif
unsigned need = 2 * len;
Char *temp = (Char *) malloc(need);
- Char *wide = 0;
int n = 0;
if_OPT_WIDE_CHARS(screen,{
wide = (Char *)malloc(need);
Index: version.h
--- xterm-106+/version.h Wed Jun 9 07:00:28 1999
+++ xterm-107/version.h Fri Jun 11 19:02:06 1999
@@ -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 106
+#define XTERM_PATCH 107
#define XFREE86_VERSION "XFree86 3.9Pq"
Index: xterm.h
--- xterm-106+/xterm.h Sun May 30 16:57:28 1999
+++ xterm-107/xterm.h Fri Jun 11 19:05:34 1999
@@ -198,6 +198,10 @@
extern void unparseputs (char *s, int fd);
extern void unparseseq (ANSI *ap, int fd);
+#if OPT_BLINK_CURS
+extern void ToggleCursorBlink(TScreen *screen);
+#endif
+
#if OPT_ISO_COLORS
extern void SGR_Background (int color);
extern void SGR_Foreground (int color);
Index: xterm.log.html
--- xterm-106+/xterm.log.html Wed Jun 9 06:51:42 1999
+++ xterm-107/xterm.log.html Sat Jun 12 13:36:27 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_107">Patch #107 - 1999/6/12 - XFree86 3.9Pq</A>
<LI><A HREF="#xterm_106">Patch #106 - 1999/6/9 - XFree86 3.9Pq</A>
<LI><A HREF="#xterm_105">Patch #105 - 1999/6/5 - XFree86 3.9Pp</A>
<LI><A HREF="#xterm_104">Patch #104 - 1999/5/30 - XFree86 3.9Pn</A>
@@ -149,6 +150,38 @@
<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_107">Patch #107 - 1999/6/12 - XFree86 3.9Pq</A></H1>
+<ul>
+ <li>Two changes from Stephen P Wall <steve_wall@redcom.com>.
+ From his description:
+ <blockquote>
+ The first change is simple - I added ESC[3J to erase the stored lines
+ above the screen. That's what the changes to util.c and ctlseqs.ms
+ are.
+ <p>
+ The second change is to get the blinking cursor working. I took out
+ the cursorBlinkTime resource, and put in cursorBlink (Boolean),
+ cursorOnTime (time cursor is on in msecs) and cursorOffTime, and added
+ a cursorblink item to the vtMenu to enable/disable it.
+ </blockquote>
+
+ <li>Integrated a patch from Juliusz Chroboczek <jec@dcs.ed.ac.uk>.
+ From his description:
+ <blockquote>
+ With this patch, selection conversion works properly:
+<pre>
+ ISO 8859-1 xterm -> ISO 8859-1 xterm (transferred as STRING);
+ ISO 8859-1 xterm -> UTF-8 xterm (transferred as STRING);
+ UTF-8 xterm -> ISO 8859-1 xterm (transferred as STRING);
+ UTF-8 xterm -> UTF-8 xterm (transferred as UTF-8).
+</pre>
+ It will not work properly if one xterm is in, say, ISO 8859-2.
+ Actually, for this case xterm breaks the ICCCM routinely (sending ISO
+ 8859-2 data as STRING), so I wouldn't worry too much about it. I have
+ not changed the behaviour in eight-bit mode in any way.
+ </blockquote>
+</ul>
<H1><A NAME="xterm_106">Patch #106 - 1999/6/9 - XFree86 3.9Pq</A></H1>
<ul>
Index: xterm.man
--- xterm-106+/xterm.man Sun Jun 6 16:55:05 1999
+++ xterm-107/xterm.man Sat Jun 12 21:12:09 1999
@@ -241,6 +241,20 @@
the outer edge of the characters and the window border) in pixels. The
default is 2.
.TP 8
+.B +bc
+turn off text cursor blinking.
+This overrides the \fBcursorBlink\fR resource.
+.TP 8
+.B \-bc
+turn on text cursor blinking.
+This overrides the \fBcursorBlink\fR resource.
+.TP 8
+.BI \-bcf " milliseconds"
+time text cursor is off when blinking
+.TP 8
+.BI \-bcn " milliseconds"
+time text cursor is on when blinking
+.TP 8
.B "\-bdc"
This option disables the display of characters with bold attribute as color
rather than bold.
@@ -339,7 +353,7 @@
Turn on the \fBptyInitialErase\fP resource, i.e.,
use the pseudo-terminal's sense of the stty erase value.
.TP 8
-.B +ie
+.B \+ie
Turn off the \fBptyInitialErase\fP resource, i.e.,
set the stty erase value using the \fBkD\fP string from the termcap entry as
a reference, if available.
@@ -347,7 +361,7 @@
.B \-im
Turn on the \fBuseInsertMode\fP resource.
.TP 8
-.B +im
+.B \+im
Turn off the \fBuseInsertMode\fP resource.
.TP 8
.B \-j
@@ -438,7 +452,7 @@
round trip to the server to find out the previous value. In practice
this should never be a problem.
.TP 8
-.B +samename
+.B \+samename
Always send title and icon name change requests.
.TP 8
.B \-sb
@@ -971,15 +985,24 @@
.B "colorUL (\fPclass\fB Foreground)"
This specifies the color to use to display underlined characters if
the ``colorULMode'' resource is enabled.
-.\" .TP 8
-.\" .B "cursorBlinkTime (\fPclass\fB CursorBlinkTime)"
-.\" Specifies the cursor blink cycle-time
-.\" (i.e., the time to turn the cursor on and off).
-.\" The default is 0, which disables blinking.
+.TP 8
+.B "cursorBlink (\fPclass\fB CursorBlink)"
+Specifies whether to make the cursor blink.
+The default is ``false.''
.TP 8
.B "cursorColor (\fPclass\fB Foreground)"
Specifies the color to use for the text cursor. The default is ``black.''
.TP 8
+.B "cursorOffTime (\fPclass\fB CursorOffTime)"
+Specifies the duration of the "off" part of the cursor blink cycle-time
+in milliseconds.
+The default is 300.
+.TP 8
+.B "cursorOnTime (\fPclass\fB CursorOnTime)"
+Specifies the duration of the "on" part of the cursor blink cycle-time,
+in milliseconds.
+The default is 600.
+.TP 8
.B "highlightColor (\fPclass\fB Foreground)"
Specifies the color to use for the background of selected or otherwise
highlighted text. If not specified, reverse video is used.
@@ -1007,7 +1030,8 @@
.TP 8
.B "eightBitOutput (\fPclass\fB EightBitOutput\fP)"
Specifies whether or not eight-bit characters sent from the host should be
-accepted as is or stripped when printed. The default is ``true.''
+accepted as is or stripped when printed. The default is ``true,''
+which means that they are accepted as is.
.TP 8
.B "font (\fPclass\fB Font)"
Specifies the name of the normal font. The default is ``fixed.''
@@ -1297,7 +1321,6 @@
.PP
The following resources are specified as part of the \fItek4014\fP widget
(class \fITek4014\fP):
-.\".in +1in
.TP 8
.B "font2 (\fPclass\fB Font)"
Specifies font number 2 to use in the Tektronix window.
@@ -1327,7 +1350,6 @@
.TP 8
.B "width (\fPclass\fB Width)"
Specifies the width of the Tektronix window in pixels.
-.\".in -1in
.sp
.PP
The resources that may be specified for the various menus are described in
@@ -1335,7 +1357,6 @@
of the entries in each of the menus are listed below.
.PP
The \fImainMenu\fP has the following entries:
-.\".in +1in
.TP 8
.B "securekbd (\fPclass\fB SmeBSB)"
This entry invokes the \fBsecure()\fP action.
@@ -1398,11 +1419,9 @@
.TP 8
.B "quit (\fPclass\fB SmeBSB)"
This entry invokes the \fBquit()\fP action.
-.\".in -1in
.sp
.PP
The \fIvtMenu\fP has the following entries:
-.\".in +1in
.TP 8
.B "scrollbar (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-scrollbar(toggle)\fP action.
@@ -1446,6 +1465,9 @@
.B "marginbell (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-marginbell(toggle)\fP action.
.TP 8
+.B "cursorblink (\fPclass\fB SmeBSB)"
+This entry invokes the \fBset-cursorblink(toggle)\fP action.
+.TP 8
.B "titeInhibit (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-titeInhibit(toggle)\fP action.
.TP 8
@@ -1453,7 +1475,7 @@
This entry toggles active icons on and off if this feature was
compiled into \fIxterm\fP. It is enabled only if \fIxterm\fP
was started with the command line option +ai or the \fBactiveIcon\fP
-resource set to ``True.''
+resource is set to ``True.''
.TP 8
.B "line1 (\fPclass\fB SmeLine)"
This is a separator.
@@ -1481,11 +1503,9 @@
.TP 8
.B "altscreen (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-altscreen(toggle)\fP action.
-.\".in -1in
.sp
.PP
The \fIfontMenu\fP has the following entries:
-.\".in +1in
.TP 8
.B "fontdefault (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-vt-font(d)\fP action.
@@ -1513,11 +1533,15 @@
.TP 8
.B "fontsel (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-vt-font(s)\fP action.
-.\".in -1in
+.TP 8
+.B "line1 (\fPclass\fB SmeLine)"
+This is a separator.
+.TP 8
+.B "font-doublesize (\fPclass\fB SmeBSB)"
+This entry invokes the \fBset-font-doublesize(s)\fP action.
.sp
.PP
The \fItekMenu\fP has the following entries:
-.\".in +1in
.TP 8
.B "tektextlarge (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-tek-text(l)\fP action.
@@ -1554,12 +1578,10 @@
.TP 8
.B "tekhide (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-visibility(tek,toggle)\fP action.
-.\".in -1in
.sp
.PP
The following resources are useful when specified for the Athena Scrollbar
widget:
-.\".in +1in
.TP 8
.B "thickness (\fPclass\fB Thickness)"
Specifies the width in pixels of the scrollbar.
@@ -1571,7 +1593,6 @@
Specifies the color to use for the foreground of the scrollbar. The ``thumb''
of the scrollbar is a simple checkerboard pattern alternating pixels for
foreground and background color.
-.\".in -1in
.SH "POINTER USAGE"
.PP
Once the VT102 window is created,
@@ -2053,6 +2074,14 @@
.B "set-autowrap(\fIon/off/toggle\fP)"
This action toggles automatic wrapping of long lines and is also invoked by
the \fBautowrap\fP entry in \fIvtMenu\fP.
+.TP 8
+.B "set-backarrow(\fIon/off/toggle\fP)"
+This action toggles the \fBbackarrowKey\fP resource and is also invoked from the
+\fBbackarrow key\fP entry in \fIvtMenu\fP.
+.TP 8
+.B "set-cursorblink(\fIon/off/toggle\fP)"
+This action toggles the \fBcursorBlink\fP resource and is also invoked from the
+\fBcursorblink\fP entry in \fIvtMenu\fP.
.TP 8
.B "set-cursesemul(\fIon/off/toggle\fP)"
This action toggles the \fBcurses\fP resource and is also invoked from the
Index: xtermcfg.hin
--- xterm-106+/xtermcfg.hin Sun May 30 16:57:28 1999
+++ xterm-107/xtermcfg.hin Sat Jun 12 09:42:14 1999
@@ -32,52 +32,53 @@
/* This is a template for <xtermcfg.h> */
-#undef ALLOWLOGFILEEXEC /* CF_ARG_ENABLE(enable-logfile-exec) */
-#undef ALLOWLOGGING /* CF_ARG_ENABLE(enable-logging) */
-#undef CC_HAS_PROTOS /* CF_ANSI_CC */
-#undef DECL_ERRNO /* CF_ERRNO */
-#undef DFT_COLORMODE /* AC_ARG_WITH(default-color-mode) */
-#undef DFT_DECID /* AC_ARG_WITH(default-terminal-id) */
-#undef DFT_TERMTYPE /* AC_ARG_WITH(default-term-type) */
-#undef HAVE_POSIX_VDISABLE /* CF_POSIX_VDISABLE */
-#undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */
-#undef HAVE_STRERROR /* AC_CHECK_FUNCS(strerror) */
-#undef HAVE_SYS_WAIT_H /* AC_HEADER_SYS_WAIT */
-#undef HAVE_TCGETATTR /* AC_CHECK_FUNCS(tcgetattr) */
-#undef HAVE_TERMCAP_H /* AC_CHECK_HEADERS(termcap.h) */
-#undef HAVE_TERMIOS_H /* AC_CHECK_HEADERS(termios.h) */
-#undef HAVE_UNISTD_H /* AC_CHECK_HEADERS(unistd.h) */
-#undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */
-#undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.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) */
-#undef OPT_AIX_COLORS /* CF_ARG_DISABLE(16-color) */
-#undef OPT_BOX_CHARS /* CF_ARG_DISABLE(boxchars) */
-#undef OPT_DEC_CHRSET /* CF_ARG_DISABLE(doublechars) */
-#undef OPT_HIGHLIGHT_COLOR /* CF_ARG_DISABLE(highlighting) */
-#undef OPT_HP_FUNC_KEYS /* CF_ARG_ENABLE(hp-fkeys) */
-#undef OPT_I18N_SUPPORT /* CF_ARG_DISABLE(i18n) */
-#undef OPT_INITIAL_ERASE /* CF_ARG_DISABLE(initial-erase) */
-#undef OPT_INPUT_METHOD /* CF_ARG_DISABLE(input-method) */
-#undef OPT_ISO_COLORS /* CF_ARG_DISABLE(ansi-color) */
-#undef OPT_MAXIMIZE /* CF_ARG_DISABLE(maximize) */
-#undef OPT_NUM_LOCK /* CF_ARG_DISABLE(num-lock) */
-#undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */
-#undef OPT_TEK4014 /* CF_ARG_DISABLE(tek4014) */
-#undef OPT_TRACE /* CF_ARG_ENABLE(trace) */
-#undef OPT_VT52_MODE /* CF_ARG_DISABLE(vt52) */
-#undef OPT_WIDE_CHARS /* CF_ARG_ENABLE(wide-chars) */
-#undef OPT_XMC_GLITCH /* CF_ARG_ENABLE(xmc-glitch) */
-#undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */
-#undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */
-#undef USE_MY_MEMMOVE /* CF_FUNC_MEMMOVE */
-#undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */
-#undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */
-#undef USE_TERMINFO /* CF_FUNC_TGETENT */
-#undef const /* AC_CONST */
-#undef size_t /* AC_TYPE_SIZE_T */
-#undef time_t /* AC_CHECK_TYPE(time_t, long) */
+#undef ALLOWLOGFILEEXEC /* CF_ARG_ENABLE(enable-logfile-exec) */
+#undef ALLOWLOGGING /* CF_ARG_ENABLE(enable-logging) */
+#undef CC_HAS_PROTOS /* CF_ANSI_CC */
+#undef DECL_ERRNO /* CF_ERRNO */
+#undef DFT_COLORMODE /* AC_ARG_WITH(default-color-mode) */
+#undef DFT_DECID /* AC_ARG_WITH(default-terminal-id) */
+#undef DFT_TERMTYPE /* AC_ARG_WITH(default-term-type) */
+#undef HAVE_POSIX_VDISABLE /* CF_POSIX_VDISABLE */
+#undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */
+#undef HAVE_STRERROR /* AC_CHECK_FUNCS(strerror) */
+#undef HAVE_SYS_WAIT_H /* AC_HEADER_SYS_WAIT */
+#undef HAVE_TCGETATTR /* AC_CHECK_FUNCS(tcgetattr) */
+#undef HAVE_TERMCAP_H /* AC_CHECK_HEADERS(termcap.h) */
+#undef HAVE_TERMIOS_H /* AC_CHECK_HEADERS(termios.h) */
+#undef HAVE_UNISTD_H /* AC_CHECK_HEADERS(unistd.h) */
+#undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */
+#undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.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) */
+#undef OPT_AIX_COLORS /* CF_ARG_DISABLE(16-color) */
+#undef OPT_BLINK_CURS /* CF_ARG_DISABLE(blink-cursor) */
+#undef OPT_BOX_CHARS /* CF_ARG_DISABLE(boxchars) */
+#undef OPT_DEC_CHRSET /* CF_ARG_DISABLE(doublechars) */
+#undef OPT_HIGHLIGHT_COLOR /* CF_ARG_DISABLE(highlighting) */
+#undef OPT_HP_FUNC_KEYS /* CF_ARG_ENABLE(hp-fkeys) */
+#undef OPT_I18N_SUPPORT /* CF_ARG_DISABLE(i18n) */
+#undef OPT_INITIAL_ERASE /* CF_ARG_DISABLE(initial-erase) */
+#undef OPT_INPUT_METHOD /* CF_ARG_DISABLE(input-method) */
+#undef OPT_ISO_COLORS /* CF_ARG_DISABLE(ansi-color) */
+#undef OPT_MAXIMIZE /* CF_ARG_DISABLE(maximize) */
+#undef OPT_NUM_LOCK /* CF_ARG_DISABLE(num-lock) */
+#undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */
+#undef OPT_TEK4014 /* CF_ARG_DISABLE(tek4014) */
+#undef OPT_TRACE /* CF_ARG_ENABLE(trace) */
+#undef OPT_VT52_MODE /* CF_ARG_DISABLE(vt52) */
+#undef OPT_WIDE_CHARS /* CF_ARG_ENABLE(wide-chars) */
+#undef OPT_XMC_GLITCH /* CF_ARG_ENABLE(xmc-glitch) */
+#undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */
+#undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */
+#undef USE_MY_MEMMOVE /* CF_FUNC_MEMMOVE */
+#undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */
+#undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */
+#undef USE_TERMINFO /* CF_FUNC_TGETENT */
+#undef const /* AC_CONST */
+#undef size_t /* AC_TYPE_SIZE_T */
+#undef time_t /* AC_CHECK_TYPE(time_t, long) */
#undef GCC_PRINTF
#undef GCC_UNUSED