diff --git a/app/xterm/256colres.h b/app/xterm/256colres.h index a84acd588..4b98391e6 100644 --- a/app/xterm/256colres.h +++ b/app/xterm/256colres.h @@ -1,7 +1,7 @@ /* * This header file was generated by ./256colres.pl */ -/* $XFree86: xc/programs/xterm/256colres.h,v 1.5 2002/10/05 17:57:11 dickey Exp $ */ +/* $XTermId: 256colres.h,v 1.11 2007/06/12 00:44:23 tom Exp $ */ #ifndef included_256colres_h #define included_256colres_h diff --git a/app/xterm/256colres.pl b/app/xterm/256colres.pl index a6b995e48..a943af5d1 100644 --- a/app/xterm/256colres.pl +++ b/app/xterm/256colres.pl @@ -1,5 +1,6 @@ #! /usr/bin/perl # Author: Thomas E. Dickey +# $XTermId: 256colres.pl,v 1.15 2007/06/08 23:58:37 tom Exp $ # $XFree86: xc/programs/xterm/256colres.pl,v 1.8 2002/10/05 17:57:11 dickey Exp $ # Construct a header file defining default resources for the 256-color model @@ -9,11 +10,17 @@ # reproduction of the standard ANSI colors, but possibly more # pleasing shades +use strict; + +our ( $line1, $line2, $line3 ); +our ( $red, $green, $blue, $gray ); +our ( $level, $code, @steps ); + print <fix_cflags.sed <<'CF_EOF' s/\\//g +s/[[ ]][[ ]]*/ /g s/"//g -s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\([[ ]][[ ]]*[[^- ]][[^ ]]*\)*\)/\1='\\"\2\\"'/g -s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\)[[ ]]/\1='\\"\2\\"' /g -s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\)$/\1='\\"\2\\"'/g -s/^IMAKE[[ ]]*/IMAKE_CFLAGS="/ +:pack +s/\(=[[^ ]][[^ ]]*\) \([[^-]]\)/\1 \2/g +t pack +s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\'0-9 ]][[^ ]]*\)/\1='\\"\2\\"'/g +s/^IMAKE[[ ]]/IMAKE_CFLAGS="/ +s/ / /g s/$/"/ CF_EOF @@ -2194,7 +2197,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PATH version: 7 updated: 2006/08/03 15:20:08 +dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35 dnl ------------ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just dnl defaulting to yes/no. @@ -2208,7 +2211,9 @@ dnl AC_DEFUN([CF_WITH_PATH], [AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl +if ifelse($5,,true,[test -n "$5"]) ; then CF_PATH_SYNTAX(withval) +fi $3="$withval" AC_SUBST($3)dnl ])dnl diff --git a/app/xterm/button.c b/app/xterm/button.c index 8fe65e35d..2ff5fd6fc 100644 --- a/app/xterm/button.c +++ b/app/xterm/button.c @@ -1,4 +1,4 @@ -/* $XTermId: button.c,v 1.272 2007/03/19 23:42:48 tom Exp $ */ +/* $XTermId: button.c,v 1.277 2007/07/22 20:37:11 tom Exp $ */ /* * Copyright 1999-2006,2007 by Thomas E. Dickey @@ -51,7 +51,6 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/button.c,v 3.88 2006/06/19 00:36:50 dickey Exp $ */ /* button.c Handles button events in the terminal emulator. @@ -1039,8 +1038,8 @@ struct _SelectionList { Time time; }; -static int -DECtoASCII(int ch) +static unsigned +DECtoASCII(unsigned ch) { if (ch < 32) { ch = "###########+++++##-##++++|######"[ch]; @@ -1087,7 +1086,7 @@ UTF8toLatin1(Char * s, unsigned len, unsigned long *result) if (eqv == value) eqv = '#'; *q++ = eqv; - if (iswide(value)) + if (iswide((wchar_t) value)) *q++ = ' '; } } @@ -1611,7 +1610,8 @@ SelectionReceived(Widget w, GettingSelection(dpy, *type, line, *length); #if OPT_WIDE_CHARS - if (*type == XA_UTF8_STRING(dpy)) { + if (*type == XA_UTF8_STRING(dpy) && + !(screen->wide_chars || screen->c1_printable)) { rc = Xutf8TextPropertyToTextList(dpy, &text_prop, &text_list, &text_list_count); if (text_list != NULL && text_list_count != 0) { @@ -2612,17 +2612,23 @@ do_select_regex(TScreen * screen, CELL * startc, CELL * endc) } } if (best_col >= 0) { + int best_nxt = best_col + best_len; columnToCell(screen, firstRow, best_col, startc); - columnToCell(screen, firstRow, best_col + best_len, endc); + columnToCell(screen, firstRow, best_nxt, endc); TRACE(("search::%s\n", search)); TRACE(("indexed:%d..%d -> %d..%d\n", - best_col, best_col + best_len, + best_col, best_nxt, indexed[best_col], - indexed[best_col + best_len])); - TRACE(("matched:%.*s\n", - indexed[best_col + best_len] + 1 - + indexed[best_nxt])); + TRACE(("matched:%d:%s\n", + indexed[best_nxt] + 1 - indexed[best_col], - search + indexed[best_col])); + visibleChars(PAIRED_CHARS((Char *) (search + + indexed[best_col]), + 0), + (unsigned) (indexed[best_nxt] + + 1 - + indexed[best_col])))); } free(search); } @@ -2990,7 +2996,9 @@ SaltTextAway(XtermWidget xw, } *lp = '\0'; /* make sure we have end marked */ - TRACE(("Salted TEXT:%d:%.*s\n", lp - line, lp - line, line)); + TRACE(("Salted TEXT:%d:%s\n", lp - line, + visibleChars(PAIRED_CHARS(line, 0), (unsigned) (lp - line)))); + screen->selection_length = (lp - line); _OwnSelection(xw, params, num_params); } @@ -3492,7 +3500,7 @@ SaveText(TScreen * screen, are in memory attached to the HIDDEN_CHAR */ if_OPT_WIDE_CHARS(screen, { if (screen->utf8_mode != uFalse) { - int ch; + unsigned ch; int off; for (off = OFF_FINAL; off < MAX_PTRS; off += 2) { if ((ch = XTERM_CELLC(row, i, off)) == 0) @@ -3507,7 +3515,7 @@ SaveText(TScreen * screen, if (screen->utf8_mode != uFalse) { lp = convertToUTF8(lp, (c != 0) ? c : ' '); if_OPT_WIDE_CHARS(screen, { - int ch; + unsigned ch; int off; for (off = OFF_FINAL; off < MAX_PTRS; off += 2) { if ((ch = XTERM_CELLC(row, i, off)) == 0) diff --git a/app/xterm/cachedGCs.c b/app/xterm/cachedGCs.c index ca699fb83..720b88485 100644 --- a/app/xterm/cachedGCs.c +++ b/app/xterm/cachedGCs.c @@ -1,4 +1,4 @@ -/* $XTermId: cachedGCs.c,v 1.35 2007/03/21 23:21:50 tom Exp $ */ +/* $XTermId: cachedGCs.c,v 1.38 2007/06/09 00:08:39 tom Exp $ */ /************************************************************ @@ -245,26 +245,36 @@ tracePixel(XtermWidget xw, Pixel value) #endif /* OPT_TRACE > 1 */ #endif /* OPT_TRACE */ +static CgsCache * +allocCache(void **cache_pointer) +{ + if (*cache_pointer == 0) { + *cache_pointer = TypeCallocN(CgsCache, gcMAX); + TRACE(("allocCache %p\n", cache_pointer)); + } + return *((CgsCache **) cache_pointer); +} + /* - * FIXME: move the cache into XtermWidget + * Returns the appropriate cache pointer. */ static CgsCache * -myCache(XtermWidget xw GCC_UNUSED, VTwin * cgsWin GCC_UNUSED, CgsEnum cgsId) +myCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId) { - static CgsCache *main_cache; - CgsCache *my_cache; CgsCache *result = 0; - if (main_cache == 0) - main_cache = (CgsCache *) calloc(gcMAX, sizeof(CgsCache)); - my_cache = main_cache; if ((int) cgsId >= 0 && cgsId < gcMAX) { -#ifndef NO_ACTIVE_ICON - static CgsCache icon_cache[gcMAX]; +#ifdef NO_ACTIVE_ICON + (void) xw; + (void) cgsWin; +#else if (cgsWin == &(xw->screen.iconVwin)) - my_cache = icon_cache; + result = allocCache(&(xw->screen.icon_cgs_cache)); + else #endif - result = my_cache + cgsId; + result = allocCache(&(xw->screen.main_cgs_cache)); + + result += cgsId; if (result->data == 0) { result->data = result->list; } @@ -803,3 +813,14 @@ freeCgs(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId) } return 0; } + +#ifdef NO_LEAKS +void +noleaks_cachedCgs(XtermWidget xw) +{ +#ifndef NO_ACTIVE_ICON + free(xw->screen.icon_cgs_cache); +#endif + free(xw->screen.main_cgs_cache); +} +#endif diff --git a/app/xterm/charclass.c b/app/xterm/charclass.c index 33e27562a..b8fd75959 100644 --- a/app/xterm/charclass.c +++ b/app/xterm/charclass.c @@ -1,4 +1,4 @@ -/* $XTermId: charclass.c,v 1.14 2006/02/13 01:14:58 tom Exp $ */ +/* $XTermId: charclass.c,v 1.18 2007/07/15 16:18:41 tom Exp $ */ /* * Compact and efficient reimplementation of the @@ -6,21 +6,22 @@ * * Markus Kuhn -- mkuhn@acm.org -- 2000-07-03 * - * Xterm allows users to select entire words with a double-click on - * the left mouse button. Opinions might differ on what type of - * characters are part of separate words, therefore xterm allows users - * to configure a class code for each 8-bit character. Words are - * maximum length sequences of neighboring characters with identical - * class code. Extending this mechanism to Unicode naively would - * create an at least 2^16 entries (128 kB) long class code table. - * Instead, we transform the character class table into a list - * of intervals, that will be accessed via a linear search. - * Changes made to the table by the user will be appended. A special - * class code -1 (default) marks characters who have their code number - * as the class code. We could alternatively use a sorted table of - * non-overlapping intervals that can be accessed via binary search, - * but merging in new intervals is significantly more hassle and - * not worth the effort here. + * Xterm allows users to select entire words with a double-click on the left + * mouse button. Opinions might differ on what type of characters are part of + * separate words, therefore xterm allows users to configure a class code for + * each 8-bit character. Words are maximum length sequences of neighboring + * characters with identical class code. Extending this mechanism to Unicode + * naively would create an at least 2^16 entries (128 kB) long class code + * table. + * + * Instead, we transform the character class table into a list of intervals, + * that will be accessed via a linear search. Changes made to the table by the + * user will be appended. A special class code IDENT (default) marks + * characters who have their code number as the class code. + * + * We could alternatively use a sorted table of non-overlapping intervals that + * can be accessed via binary search, but merging in new intervals is + * significantly more hassle and not worth the effort here. */ /* $XFree86: xc/programs/xterm/charclass.c,v 1.7 2006/02/13 01:14:58 dickey Exp $ */ @@ -65,6 +66,13 @@ SetCharacterClassRange(int low, int high, int value) return 0; } +enum { + IDENT = -1, + ALNUM = 48, + CNTRL = 1, + BLANK = 32, +} Classes; + void init_classtab(void) { @@ -78,48 +86,48 @@ init_classtab(void) classtab[0].last = 0; /* old xterm default classes */ - SetCharacterClassRange(0, 0, 32); - SetCharacterClassRange(1, 31, 1); - SetCharacterClassRange('\t', '\t', 32); - SetCharacterClassRange('0', '9', 48); - SetCharacterClassRange('A', 'Z', 48); - SetCharacterClassRange('_', '_', 48); - SetCharacterClassRange('a', 'z', 48); - SetCharacterClassRange(127, 159, 1); - SetCharacterClassRange(160, 191, -1); - SetCharacterClassRange(192, 255, 48); - SetCharacterClassRange(215, 215, 216); - SetCharacterClassRange(247, 247, 248); + SetCharacterClassRange(0, 0, BLANK); + SetCharacterClassRange(1, 31, CNTRL); + SetCharacterClassRange('\t', '\t', BLANK); + SetCharacterClassRange('0', '9', ALNUM); + SetCharacterClassRange('A', 'Z', ALNUM); + SetCharacterClassRange('_', '_', ALNUM); + SetCharacterClassRange('a', 'z', ALNUM); + SetCharacterClassRange(127, 159, CNTRL); + SetCharacterClassRange(160, 191, IDENT); + SetCharacterClassRange(192, 255, ALNUM); + SetCharacterClassRange(215, 215, IDENT); + SetCharacterClassRange(247, 247, IDENT); /* added Unicode classes */ - SetCharacterClassRange(0x0100, 0xffdf, 48); /* mostly characters */ - SetCharacterClassRange(0x037e, 0x037e, -1); /* Greek question mark */ - SetCharacterClassRange(0x0387, 0x0387, -1); /* Greek ano teleia */ - SetCharacterClassRange(0x055a, 0x055f, -1); /* Armenian punctuation */ - SetCharacterClassRange(0x0589, 0x0589, -1); /* Armenian full stop */ - SetCharacterClassRange(0x0700, 0x070d, -1); /* Syriac punctuation */ - SetCharacterClassRange(0x104a, 0x104f, -1); /* Myanmar punctuation */ - SetCharacterClassRange(0x10fb, 0x10fb, -1); /* Georgian punctuation */ - SetCharacterClassRange(0x1361, 0x1368, -1); /* Ethiopic punctuation */ - SetCharacterClassRange(0x166d, 0x166e, -1); /* Canadian Syl. punctuation */ - SetCharacterClassRange(0x17d4, 0x17dc, -1); /* Khmer punctuation */ - SetCharacterClassRange(0x1800, 0x180a, -1); /* Mongolian punctuation */ - SetCharacterClassRange(0x2000, 0x200a, 32); /* spaces */ - SetCharacterClassRange(0x200b, 0x27ff, -1); /* punctuation and symbols */ + SetCharacterClassRange(0x0100, 0xffdf, ALNUM); /* mostly characters */ + SetCharacterClassRange(0x037e, 0x037e, IDENT); /* Greek question mark */ + SetCharacterClassRange(0x0387, 0x0387, IDENT); /* Greek ano teleia */ + SetCharacterClassRange(0x055a, 0x055f, IDENT); /* Armenian punctuation */ + SetCharacterClassRange(0x0589, 0x0589, IDENT); /* Armenian full stop */ + SetCharacterClassRange(0x0700, 0x070d, IDENT); /* Syriac punctuation */ + SetCharacterClassRange(0x104a, 0x104f, IDENT); /* Myanmar punctuation */ + SetCharacterClassRange(0x10fb, 0x10fb, IDENT); /* Georgian punctuation */ + SetCharacterClassRange(0x1361, 0x1368, IDENT); /* Ethiopic punctuation */ + SetCharacterClassRange(0x166d, 0x166e, IDENT); /* Canadian Syl. punctuation */ + SetCharacterClassRange(0x17d4, 0x17dc, IDENT); /* Khmer punctuation */ + SetCharacterClassRange(0x1800, 0x180a, IDENT); /* Mongolian punctuation */ + SetCharacterClassRange(0x2000, 0x200a, BLANK); /* spaces */ + SetCharacterClassRange(0x200b, 0x27ff, IDENT); /* punctuation and symbols */ SetCharacterClassRange(0x2070, 0x207f, 0x2070); /* superscript */ SetCharacterClassRange(0x2080, 0x208f, 0x2080); /* subscript */ - SetCharacterClassRange(0x3000, 0x3000, 32); /* ideographic space */ - SetCharacterClassRange(0x3001, 0x3020, -1); /* ideographic punctuation */ + SetCharacterClassRange(0x3000, 0x3000, BLANK); /* ideographic space */ + SetCharacterClassRange(0x3001, 0x3020, IDENT); /* ideographic punctuation */ SetCharacterClassRange(0x3040, 0x309f, 0x3040); /* Hiragana */ SetCharacterClassRange(0x30a0, 0x30ff, 0x30a0); /* Katakana */ SetCharacterClassRange(0x3300, 0x9fff, 0x4e00); /* CJK Ideographs */ SetCharacterClassRange(0xac00, 0xd7a3, 0xac00); /* Hangul Syllables */ SetCharacterClassRange(0xf900, 0xfaff, 0x4e00); /* CJK Ideographs */ - SetCharacterClassRange(0xfe30, 0xfe6b, -1); /* punctuation forms */ - SetCharacterClassRange(0xff00, 0xff0f, -1); /* half/fullwidth ASCII */ - SetCharacterClassRange(0xff1a, 0xff20, -1); /* half/fullwidth ASCII */ - SetCharacterClassRange(0xff3b, 0xff40, -1); /* half/fullwidth ASCII */ - SetCharacterClassRange(0xff5b, 0xff64, -1); /* half/fullwidth ASCII */ + SetCharacterClassRange(0xfe30, 0xfe6b, IDENT); /* punctuation forms */ + SetCharacterClassRange(0xff00, 0xff0f, IDENT); /* half/fullwidth ASCII */ + SetCharacterClassRange(0xff1a, 0xff20, IDENT); /* half/fullwidth ASCII */ + SetCharacterClassRange(0xff3b, 0xff40, IDENT); /* half/fullwidth ASCII */ + SetCharacterClassRange(0xff5b, 0xff64, IDENT); /* half/fullwidth ASCII */ return; } @@ -127,7 +135,7 @@ init_classtab(void) int CharacterClass(int c) { - int i, cclass = -1; + int i, cclass = IDENT; for (i = classtab[0].first; i <= classtab[0].last; i++) if (classtab[i].first <= c && classtab[i].last >= c) diff --git a/app/xterm/charproc.c b/app/xterm/charproc.c index 1fba22bc1..4c3da0569 100644 --- a/app/xterm/charproc.c +++ b/app/xterm/charproc.c @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.784 2007/03/20 23:59:25 tom Exp $ */ +/* $XTermId: charproc.c,v 1.810 2007/07/17 21:09:48 tom Exp $ */ /* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */ @@ -133,12 +133,6 @@ in this Software without prior written authorization from The Open Group. #include #include -#if OPT_ZICONBEEP || OPT_TOOLBAR -#define HANDLE_STRUCT_NOTIFY 1 -#else -#define HANDLE_STRUCT_NOTIFY 0 -#endif - static IChar doinput(void); static int set_character_class(char *s); static void FromAlternate(XtermWidget /* xw */ ); @@ -146,9 +140,6 @@ static void RequestResize(XtermWidget termw, int rows, int cols, Bool text); static void SwitchBufs(XtermWidget xw); static void ToAlternate(XtermWidget /* xw */ ); static void VTallocbuf(void); -static void WriteText(XtermWidget xw, - PAIRED_CHARS(Char * str, Char * str2), - Cardinal len); static void ansi_modes(XtermWidget termw, void (*func) (unsigned *p, unsigned mask)); static void bitclr(unsigned *p, unsigned mask); @@ -399,6 +390,7 @@ static XtActionsRec actionsList[] = { static XtResource resources[] = { Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False), + Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True), Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True), Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False), Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False), @@ -550,6 +542,7 @@ static XtResource resources[] = #if OPT_HIGHLIGHT_COLOR Tres(XtNhighlightColor, XtCHighlightColor, HIGHLIGHT_BG, XtDefaultForeground), Tres(XtNhighlightTextColor, XtCHighlightTextColor, HIGHLIGHT_FG, XtDefaultBackground), + Bres(XtNhighlightReverse, XtCHighlightReverse, screen.hilite_reverse, True), #endif /* OPT_HIGHLIGHT_COLOR */ #if OPT_INPUT_METHOD @@ -656,6 +649,8 @@ static XtResource resources[] = Bres(XtNvt100Graphics, XtCVT100Graphics, screen.vt100_graphics, True), Bres(XtNwideChars, XtCWideChars, screen.wide_chars, False), Ires(XtNcombiningChars, XtCCombiningChars, screen.max_combining, 2), + Ires(XtNmkSamplePass, XtCMkSamplePass, misc.mk_samplepass, 256), + Ires(XtNmkSampleSize, XtCMkSampleSize, misc.mk_samplesize, 1024), Ires(XtNutf8, XtCUtf8, screen.utf8_mode, uDefault), Sres(XtNwideBoldFont, XtCWideBoldFont, misc.default_font.f_wb, DEFWIDEBOLDFONT), Sres(XtNwideFont, XtCWideFont, misc.default_font.f_w, DEFWIDEFONT), @@ -814,6 +809,11 @@ xtermAddInput(Widget w) XtAppAddActions(app_con, input_actions, XtNumber(input_actions)); #endif XtAugmentTranslations(w, XtParseTranslationTable(defaultTranslations)); + +#if OPT_EXTRA_PASTE + if (term && term->keyboard.extra_translations) + XtOverrideTranslations((Widget) term, XtParseTranslationTable(term->keyboard.extra_translations)); +#endif } #if OPT_ISO_COLORS @@ -1214,7 +1214,7 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState *sp) } #endif - /* substitute combined character with precomposed character + /* substitute combined character with precomposed character * only if it does not change the width of the base character */ if (precomposed != -1 && my_wcwidth(precomposed) == my_wcwidth(prev)) { @@ -1527,7 +1527,8 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState *sp) xtermIndex(xw, 1); if (xw->flags & LINEFEED) CarriageReturn(screen); - do_xevents(); + else + do_xevents(); break; case CASE_CBT: @@ -2488,7 +2489,6 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState *sp) TRACE(("CASE_NEL\n")); xtermIndex(xw, 1); CarriageReturn(screen); - do_xevents(); sp->parsestate = sp->groundtable; break; @@ -3266,13 +3266,8 @@ in_put(XtermWidget xw) #endif #if OPT_SESSION_MGT } else if (resource.sessionMgt) { - /* - * When session management is enabled, we should not block since - * session related events can arrive any time. - */ - select_timeout.tv_sec = 1; - select_timeout.tv_usec = 0; - time_select = 1; + if (ice_fd >= 0) + FD_SET(ice_fd, &select_mask); #endif } if (need_cleanup) @@ -3337,6 +3332,18 @@ PreeditPosition(TScreen * screen) } #endif +static void +WrapLine(XtermWidget xw) +{ + TScreen *screen = &(xw->screen); + + /* mark that we had to wrap this line */ + ScrnSetFlag(screen, screen->cur_row, LINEWRAPPED); + xtermAutoPrint('\n'); + xtermIndex(xw, 1); + set_cur_col(screen, 0); +} + /* * process a string of characters according to the character set indicated * by charset. worry about end of line conditions (wraparound if selected). @@ -3387,15 +3394,13 @@ dotext(XtermWidget xw, int last_chomp = 0; chars_chomped = 0; - if (screen->do_wrap && (xw->flags & WRAPAROUND)) { - /* mark that we had to wrap this line */ - ScrnSetWrapped(screen, screen->cur_row); - xtermAutoPrint('\n'); - xtermIndex(xw, 1); - set_cur_col(screen, 0); + if (screen->do_wrap) { screen->do_wrap = 0; - width_available = MaxCols(screen) - screen->cur_col; - next_col = screen->cur_col; + if ((xw->flags & WRAPAROUND)) { + WrapLine(xw); + width_available = MaxCols(screen) - screen->cur_col; + next_col = screen->cur_col; + } } while (width_here <= width_available && chars_chomped < (len - offset)) { @@ -3409,10 +3414,13 @@ dotext(XtermWidget xw, } if (width_here > width_available) { + if (last_chomp > MaxCols(screen)) + break; /* give up - it is too big */ chars_chomped--; width_here -= last_chomp; - if (chars_chomped > 0 || (xw->flags & WRAPAROUND)) + if (chars_chomped > 0) { need_wrap = 1; + } } else if (width_here == width_available) { need_wrap = 1; } else if (chars_chomped != (len - offset)) { @@ -3438,8 +3446,9 @@ dotext(XtermWidget xw, lobyte = (Char *) XtRealloc((char *) lobyte, limit); hibyte = (Char *) XtRealloc((char *) hibyte, limit); } - for (j = offset; j < offset + chars_chomped; j++) { - k = j - offset; + for (j = offset, k = 0; j < offset + chars_chomped; j++) { + if (buf[j] == HIDDEN_CHAR) + continue; lobyte[k] = buf[j]; if (buf[j] > 255) { hibyte[k] = (buf[j] >> 8); @@ -3447,11 +3456,12 @@ dotext(XtermWidget xw, } else { hibyte[k] = 0; } + ++k; } WriteText(xw, PAIRED_CHARS(lobyte, (both ? hibyte : 0)), - chars_chomped); + k); #ifdef NO_LEAKS if (limit != 0) { limit = 0; @@ -3471,16 +3481,13 @@ dotext(XtermWidget xw, last_col = CurMaxCol(screen, screen->cur_row); this_col = last_col - screen->cur_col + 1; if (this_col <= 1) { - if (screen->do_wrap && (xw->flags & WRAPAROUND)) { - /* mark that we had to wrap this line */ - ScrnSetWrapped(screen, screen->cur_row); - xtermAutoPrint('\n'); - xtermIndex(xw, 1); - set_cur_col(screen, 0); + if (screen->do_wrap) { screen->do_wrap = 0; - this_col = last_col + 1; - } else - this_col = 1; + if ((xw->flags & WRAPAROUND)) { + WrapLine(xw); + } + } + this_col = 1; } if (offset + this_col > len) { this_col = len - offset; @@ -3492,9 +3499,9 @@ dotext(XtermWidget xw, (unsigned) this_col); /* - * the call to WriteText updates screen->cur_col. - * If screen->cur_col != next_col, we must have - * hit the right margin, so set the do_wrap flag. + * The call to WriteText updates screen->cur_col. + * If screen->cur_col is less than next_col, we must have + * hit the right margin - so set the do_wrap flag. */ screen->do_wrap = (screen->cur_col < next_col); } @@ -3502,19 +3509,6 @@ dotext(XtermWidget xw, #endif /* OPT_WIDE_CHARS */ } -#if HANDLE_STRUCT_NOTIFY -/* Flag icon name with "*** " on window output when iconified. - * I'd like to do something like reverse video, but I don't - * know how to tell this to window managers in general. - * - * mapstate can be IsUnmapped, !IsUnmapped, or -1; - * -1 means no change; the other two are set by event handlers - * and indicate a new mapstate. !IsMapped is done in the handler. - * we worry about IsUnmapped when output occurs. -IAN! - */ -static int mapstate = -1; -#endif /* HANDLE_STRUCT_NOTIFY */ - #if OPT_WIDE_CHARS unsigned visual_width(PAIRED_CHARS(Char * str, Char * str2), Cardinal len) @@ -3540,122 +3534,6 @@ visual_width(PAIRED_CHARS(Char * str, Char * str2), Cardinal len) } #endif -/* - * write a string str of length len onto the screen at - * the current cursor position. update cursor position. - */ -static void -WriteText(XtermWidget xw, PAIRED_CHARS(Char * str, Char * str2), Cardinal len) -{ - TScreen *screen = &(xw->screen); - ScrnPtr PAIRED_CHARS(temp_str = 0, temp_str2 = 0); - unsigned test; - unsigned flags = xw->flags; - unsigned fg_bg = makeColorPair(xw->cur_foreground, xw->cur_background); - unsigned cells = visual_width(PAIRED_CHARS(str, str2), len); - GC currentGC; - - TRACE(("WriteText (%2d,%2d) (%d) %3d:%s\n", - screen->cur_row, - screen->cur_col, - curXtermChrSet(xw, screen->cur_row), - len, visibleChars(PAIRED_CHARS(str, str2), len))); - - if (ScrnHaveSelection(screen) - && ScrnIsLineInSelection(screen, INX2ROW(screen, screen->cur_row))) { - ScrnDisownSelection(xw); - } - - if (INX2ROW(screen, screen->cur_row) <= screen->max_row) { - if (screen->cursor_state) - HideCursor(); - - if (flags & INSERT) { - InsertChar(xw, cells); - } - if (!AddToRefresh(screen)) { - - if (screen->scroll_amt) - FlushScroll(xw); - - if (flags & INVISIBLE) { - if (cells > len) { - str = temp_str = TypeMallocN(Char, cells); - if (str == 0) - return; - } - if_OPT_WIDE_CHARS(screen, { - if (cells > len) { - str2 = temp_str2 = TypeMallocN(Char, cells); - } - }); - len = cells; - - memset(str, ' ', len); - if_OPT_WIDE_CHARS(screen, { - if (str2 != 0) - memset(str2, 0, len); - }); - } - - TRACE(("WriteText calling drawXtermText (%d,%d)\n", - screen->cur_col, - screen->cur_row)); - - test = flags; - checkVeryBoldColors(test, xw->cur_foreground); - - /* make sure that the correct GC is current */ - currentGC = updatedXtermGC(xw, flags, fg_bg, False); - - drawXtermText(xw, test & DRAWX_MASK, currentGC, - CurCursorX(screen, screen->cur_row, screen->cur_col), - CursorY(screen, screen->cur_row), - curXtermChrSet(xw, screen->cur_row), - PAIRED_CHARS(str, str2), len, 0); - - resetXtermGC(xw, flags, False); - } - } - - ScreenWrite(xw, PAIRED_CHARS(str, str2), flags, fg_bg, len); - CursorForward(screen, (int) cells); -#if OPT_ZICONBEEP - /* Flag icon name with "***" on window output when iconified. - */ - if (resource.zIconBeep && mapstate == IsUnmapped && !screen->zIconBeep_flagged) { - static char *icon_name; - static Arg args[] = - { - {XtNiconName, (XtArgVal) & icon_name} - }; - - icon_name = NULL; - XtGetValues(toplevel, args, XtNumber(args)); - - if (icon_name != NULL) { - screen->zIconBeep_flagged = True; - ChangeIconName(icon_name); - } - if (resource.zIconBeep > 0) { -#if defined(HAVE_XKB_BELL_EXT) - XkbBell(XtDisplay(toplevel), VShellWindow, resource.zIconBeep, XkbBI_Info); -#else - XBell(XtDisplay(toplevel), resource.zIconBeep); -#endif - } - } - mapstate = -1; -#endif /* OPT_ZICONBEEP */ - if (temp_str != 0) - free(temp_str); - if_OPT_WIDE_CHARS(screen, { - if (temp_str2 != 0) - free(temp_str2); - }); - return; -} - #if HANDLE_STRUCT_NOTIFY /* Flag icon name with "***" on window output when iconified. */ @@ -5093,6 +4971,8 @@ VTInit(void) TScreen *screen = TScreenOf(term); Widget vtparent = SHELL_OF(term); + TRACE(("VTInit {{\n")); + XtRealizeWidget(vtparent); XtOverrideTranslations(vtparent, XtParseTranslationTable(xterm_trans)); (void) XSetWMProtocols(XtDisplay(vtparent), XtWindow(vtparent), @@ -5102,6 +4982,8 @@ VTInit(void) if (screen->allbuf == NULL) VTallocbuf(); + + TRACE(("...}} VTInit\n")); return (1); } @@ -5404,6 +5286,11 @@ VTInitialize(Widget wrequest, */ bzero((char *) &wnew->screen, sizeof(wnew->screen)); + /* DESCO Sys#67660 + * Zero out the entire "keyboard" component of "wnew" widget. + */ + bzero((char *) &wnew->keyboard, sizeof(wnew->keyboard)); + /* dummy values so that we don't try to Realize the parent shell with height * or width of 0, which is illegal in X. The real size is computed in the * xtermWidget's Realize proc, but the shell's Realize proc is called first, @@ -5569,10 +5456,12 @@ VTInitialize(Widget wrequest, init_Bres(screen.meta_sends_esc); init_Bres(screen.allowSendEvent0); + init_Bres(screen.allowTitleOp0); init_Bres(screen.allowWindowOp0); /* make a copy so that editres cannot change the resource after startup */ wnew->screen.allowSendEvents = wnew->screen.allowSendEvent0; + wnew->screen.allowTitleOps = wnew->screen.allowTitleOp0; wnew->screen.allowWindowOps = wnew->screen.allowWindowOp0; #ifndef NO_ACTIVE_ICON @@ -5751,6 +5640,7 @@ VTInitialize(Widget wrequest, #if OPT_HIGHLIGHT_COLOR init_Tres(HIGHLIGHT_BG); init_Tres(HIGHLIGHT_FG); + init_Bres(screen.hilite_reverse); #endif #if OPT_TEK4014 @@ -5794,6 +5684,7 @@ VTInitialize(Widget wrequest, } #endif + init_Ires(screen.utf8_inparse); init_Ires(screen.utf8_mode); init_Ires(screen.max_combining); @@ -5809,6 +5700,19 @@ VTInitialize(Widget wrequest, init_Bres(misc.mk_width); init_Bres(misc.cjk_width); + init_Ires(misc.mk_samplesize); + init_Ires(misc.mk_samplepass); + + if (wnew->misc.mk_samplesize > 0xffff) + wnew->misc.mk_samplesize = 0xffff; + if (wnew->misc.mk_samplesize < 0) + wnew->misc.mk_samplesize = 0; + + if (wnew->misc.mk_samplepass > wnew->misc.mk_samplesize) + wnew->misc.mk_samplepass = wnew->misc.mk_samplesize; + if (wnew->misc.mk_samplepass < 0) + wnew->misc.mk_samplepass = 0; + if (request->screen.utf8_mode) { TRACE(("setting wide_chars on\n")); wnew->screen.wide_chars = True; @@ -5834,7 +5738,9 @@ VTInitialize(Widget wrequest, decode_wcwidth((wnew->misc.cjk_width ? 2 : 0) + (wnew->misc.mk_width ? 1 : 0) - + 1); + + 1, + wnew->misc.mk_samplesize, + wnew->misc.mk_samplepass); #endif /* OPT_WIDE_CHARS */ init_Bres(screen.always_bold_mode); @@ -5964,6 +5870,19 @@ releaseWindowGCs(XtermWidget xw, VTwin * win) } } +#define TRACE_FREE_LEAK(name) \ + if (name) { \ + free(name); \ + name = 0; \ + TRACE(("freed " #name "\n")); \ + } + +#define FREE_LEAK(name) \ + if (name) { \ + free(name); \ + name = 0; \ + } + static void VTDestroy(Widget w GCC_UNUSED) { @@ -5977,33 +5896,13 @@ VTDestroy(Widget w GCC_UNUSED) if (screen->scrollWidget) XtDestroyWidget(screen->scrollWidget); - if (screen->save_ptr) { - free(screen->save_ptr); - TRACE(("freed screen->save_ptr\n")); - } - - if (screen->sbuf_address) { - free(screen->sbuf_address); - TRACE(("freed screen->sbuf_address\n")); - } - if (screen->allbuf) { - free(screen->allbuf); - TRACE(("freed screen->allbuf\n")); - } - - if (screen->abuf_address) { - free(screen->abuf_address); - TRACE(("freed screen->abuf_address\n")); - } - if (screen->altbuf) { - free(screen->altbuf); - TRACE(("freed screen->altbuf\n")); - } + TRACE_FREE_LEAK(screen->save_ptr); + TRACE_FREE_LEAK(screen->sbuf_address); + TRACE_FREE_LEAK(screen->allbuf); + TRACE_FREE_LEAK(screen->abuf_address); + TRACE_FREE_LEAK(screen->altbuf); #if OPT_WIDE_CHARS - if (screen->draw_buf) { - free(screen->draw_buf); - TRACE(("freed screen->draw_buf\n")); - } + TRACE_FREE_LEAK(screen->draw_buf); #endif #if OPT_INPUT_METHOD if (screen->xim) { @@ -6018,6 +5917,7 @@ VTDestroy(Widget w GCC_UNUSED) #endif xtermCloseFonts(xw, screen->fnts); + noleaks_cachedCgs(xw); #if 0 /* some strings may be owned by X libraries */ for (n = 0; n <= fontMenu_lastBuiltin; ++n) { @@ -6032,13 +5932,11 @@ VTDestroy(Widget w GCC_UNUSED) /* free local copies of resource strings */ for (n = 0; n < NCOLORS; ++n) { - if (screen->Tcolors[n].resource) - free(screen->Tcolors[n].resource); + FREE_LEAK(screen->Tcolors[n].resource); } #if OPT_SELECT_REGEX for (n = 0; n < NSELECTUNITS; ++n) { - if (screen->selectExpr[n]) - free(screen->selectExpr[n]); + FREE_LEAK(screen->selectExpr[n]); } #endif @@ -6046,6 +5944,10 @@ VTDestroy(Widget w GCC_UNUSED) XtFree((char *) (screen->selection_atoms)); XtFree((char *) (screen->selection_data)); + + TRACE_FREE_LEAK(xw->keyboard.extra_translations); + TRACE_FREE_LEAK(xw->keyboard.shell_translations); + TRACE_FREE_LEAK(xw->keyboard.xterm_translations); #endif /* defined(NO_LEAKS) */ } @@ -6304,6 +6206,12 @@ VTRealize(Widget w, #endif #if OPT_NUM_LOCK VTInitModifiers(xw); +#if OPT_EXTRA_PASTE + if (xw->keyboard.extra_translations) { + XtOverrideTranslations((Widget) xw, + XtParseTranslationTable(xw->keyboard.extra_translations)); + } +#endif #endif set_cursor_gcs(xw); @@ -6710,6 +6618,8 @@ ShowCursor(void) #if OPT_HIGHLIGHT_COLOR Pixel selbg_pix = T_COLOR(screen, HIGHLIGHT_BG); Pixel selfg_pix = T_COLOR(screen, HIGHLIGHT_FG); + Boolean use_selbg; + Boolean use_selfg; #endif #if OPT_WIDE_CHARS Char chi = 0; @@ -6811,6 +6721,10 @@ ShowCursor(void) * outline for the cursor. */ filled = (screen->select || screen->always_highlight); +#if OPT_HIGHLIGHT_COLOR + use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); + use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); +#endif if (filled) { if (reversed) { /* text is reverse video */ if (getCgsGC(xw, currentWin, gcVTcursNormal)) { @@ -6822,18 +6736,19 @@ ShowCursor(void) setGC(gcNorm); } } + EXCHANGE(fg_pix, bg_pix, tmp); #if OPT_HIGHLIGHT_COLOR - { - Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); - Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); - + if (screen->hilite_reverse) { + if (use_selbg && !use_selfg) + fg_pix = bg_pix; + if (use_selfg && !use_selbg) + bg_pix = fg_pix; if (use_selbg) - fg_pix = selbg_pix; + bg_pix = selbg_pix; if (use_selfg) - bg_pix = selfg_pix; + fg_pix = selfg_pix; } #endif - EXCHANGE(fg_pix, bg_pix, tmp); } else { /* normal video */ if (getCgsGC(xw, currentWin, gcVTcursReverse)) { setGC(gcVTcursReverse); @@ -6851,25 +6766,43 @@ ShowCursor(void) setCgsFore(xw, currentWin, currentCgs, bg_pix); } else { /* not selected */ if (reversed) { /* text is reverse video */ -#if OPT_HIGHLIGHT_COLOR - { - Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); - Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); - - if (use_selbg) - fg_pix = selbg_pix; - if (use_selfg) - bg_pix = selfg_pix; - } -#endif + EXCHANGE(fg_pix, bg_pix, tmp); setGC(gcNormReverse); - setCgsFore(xw, currentWin, currentCgs, bg_pix); - setCgsBack(xw, currentWin, currentCgs, fg_pix); } else { /* normal video */ setGC(gcNorm); - setCgsFore(xw, currentWin, currentCgs, fg_pix); - setCgsBack(xw, currentWin, currentCgs, bg_pix); } +#if OPT_HIGHLIGHT_COLOR + if (screen->hilite_reverse) { + if (in_selection && !reversed) { + ; /* really INVERSE ... */ + } else if (in_selection || reversed) { + if (use_selbg) { + if (use_selfg) { + bg_pix = fg_pix; + } else { + fg_pix = bg_pix; + } + } + if (use_selbg) { + bg_pix = selbg_pix; + } + if (use_selfg) { + fg_pix = selfg_pix; + } + } + } else { + if (in_selection) { + if (use_selbg) { + bg_pix = selbg_pix; + } + if (use_selfg) { + fg_pix = selfg_pix; + } + } + } +#endif + setCgsFore(xw, currentWin, currentCgs, fg_pix); + setCgsBack(xw, currentWin, currentCgs, bg_pix); } if (screen->cursor_busy == 0 @@ -6892,11 +6825,12 @@ ShowCursor(void) for (off = OFF_FINAL; off < MAX_PTRS; off += 2) { clo = SCREEN_PTR(screen, screen->cursorp.row, off + 0)[my_col]; chi = SCREEN_PTR(screen, screen->cursorp.row, off + 1)[my_col]; - if (clo || chi) - drawXtermText(xw, (flags & DRAWX_MASK) | NOBACKGROUND, - currentGC, x, y, - curXtermChrSet(xw, screen->cur_row), - PAIRED_CHARS(&clo, &chi), 1, iswide(base)); + if (!(clo || chi)) + break; + drawXtermText(xw, (flags & DRAWX_MASK) | NOBACKGROUND, + currentGC, x, y, + curXtermChrSet(xw, screen->cur_row), + PAIRED_CHARS(&clo, &chi), 1, iswide(base)); } }); #endif @@ -7009,11 +6943,12 @@ HideCursor(void) for (off = OFF_FINAL; off < MAX_PTRS; off += 2) { clo = SCREEN_PTR(screen, screen->cursorp.row, off + 0)[my_col]; chi = SCREEN_PTR(screen, screen->cursorp.row, off + 1)[my_col]; - if (clo || chi) - drawXtermText(xw, (flags & DRAWX_MASK) | NOBACKGROUND, - currentGC, x, y, - curXtermChrSet(xw, screen->cur_row), - PAIRED_CHARS(&clo, &chi), 1, iswide(base)); + if (!(clo || chi)) + break; + drawXtermText(xw, (flags & DRAWX_MASK) | NOBACKGROUND, + currentGC, x, y, + curXtermChrSet(xw, screen->cur_row), + PAIRED_CHARS(&clo, &chi), 1, iswide(base)); } }); #endif @@ -7483,17 +7418,28 @@ DoSetSelectedFont(Widget w, if (!IsXtermWidget(w) || *type != XA_STRING || *format != 8) { Bell(XkbBI_MinorError, 0); } else { + Boolean failed = False; XtermWidget xw = (XtermWidget) w; + int oldFont = xw->screen.menu_font_number; char *save = xw->screen.MenuFontName(fontMenu_fontsel); - char *val = (char *) value; + char *val; char *test = 0; char *used = 0; - int len = strlen(val); + unsigned len = *length; + unsigned tst; - if (len > (int) *length) { - len = (int) *length; + /* + * Some versions of X deliver null-terminated selections, some do not. + */ + for (tst = 0; tst < len; ++tst) { + if (((char *) value)[tst] == '\0') { + len = tst; + break; + } } - if (len > 0) { + + if (len > 0 && (val = malloc(len + 1)) != 0) { + memcpy(val, value, len); val[len] = '\0'; used = x_strtrim(val); TRACE(("DoSetSelectedFont(%s)\n", val)); @@ -7509,17 +7455,23 @@ DoSetSelectedFont(Widget w, xtermFontName(val), True, fontMenu_fontsel)) { - Bell(XkbBI_MinorError, 0); + failed = True; free(test); xw->screen.MenuFontName(fontMenu_fontsel) = save; - } else { - free(save); } } else { + failed = True; + } + if (failed) { + (void) xtermLoadFont(term, + xtermFontName(xw->screen.MenuFontName(oldFont)), + True, + oldFont); Bell(XkbBI_MinorError, 0); } if (used != val) free(used); + free(val); } } } diff --git a/app/xterm/config.guess b/app/xterm/config.guess index 1a695461e..951383e35 100644 --- a/app/xterm/config.guess +++ b/app/xterm/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-12-22' +timestamp='2007-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -791,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -1218,6 +1221,9 @@ EOF SX-8:SUPER-UX:*:*) echo sx8-nec-superux${UNAME_RELEASE} exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/app/xterm/config.sub b/app/xterm/config.sub index 4b8cc7b41..1761d8bdf 100644 --- a/app/xterm/config.sub +++ b/app/xterm/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-12-08' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -250,7 +250,7 @@ case $basic_machine in | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -475,8 +475,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -1222,7 +1226,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,6 +1421,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff --git a/app/xterm/configure b/app/xterm/configure index 01807e1f4..0b4c86c2e 100644 --- a/app/xterm/configure +++ b/app/xterm/configure @@ -684,6 +684,8 @@ Optional Packages: Compile/Install Options: --disable-full-tgetent disable check for full tgetent function --with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults) + --with-icondir=DIR directory in which to install icons (default: EPREFIX/share/pixmaps) + --disable-desktop disable install of xterm desktop files --with-reference=XXX program to use as permissions-reference --with-xterm-symlink=XXX make symbolic link to installed xterm --disable-setuid disable setuid in xterm, do not install setuid/setgid @@ -952,7 +954,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:955: loading site script $ac_site_file" >&5 + { echo "$as_me:957: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -963,7 +965,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:966: loading cache $cache_file" >&5 + { echo "$as_me:968: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -971,7 +973,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:974: creating cache $cache_file" >&5 + { echo "$as_me:976: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -987,21 +989,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:990: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:992: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:994: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:996: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1000: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1002: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1002: former value: $ac_old_val" >&5 + { echo "$as_me:1004: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1004: current value: $ac_new_val" >&5 + { echo "$as_me:1006: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1020,9 +1022,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1023: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1025: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1025: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1027: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1043,10 +1045,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1046: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1048: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1049: \$? = $ac_status" >&5 + echo "$as_me:1051: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1074,7 +1076,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1077: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1079: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1084,11 +1086,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1087: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1089: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1091: checking build system type" >&5 +echo "$as_me:1093: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1097,16 +1099,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1100: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1102: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1104: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1106: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1109: result: $ac_cv_build" >&5 +echo "$as_me:1111: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1114,7 +1116,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1117: checking host system type" >&5 + echo "$as_me:1119: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1123,12 +1125,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1126: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1128: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1131: result: $ac_cv_host" >&5 +echo "$as_me:1133: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1153,13 +1155,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1156: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1158: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1160: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1162: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1162: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1164: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1184,7 +1186,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1187: checking for $ac_word" >&5 +echo "$as_me:1189: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1199,7 +1201,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1202: found $ac_dir/$ac_word" >&5 +echo "$as_me:1204: found $ac_dir/$ac_word" >&5 break done @@ -1207,10 +1209,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1210: result: $CC" >&5 + echo "$as_me:1212: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1213: result: no" >&5 + echo "$as_me:1215: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1219,7 +1221,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1222: checking for $ac_word" >&5 +echo "$as_me:1224: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1234,7 +1236,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1237: found $ac_dir/$ac_word" >&5 +echo "$as_me:1239: found $ac_dir/$ac_word" >&5 break done @@ -1242,10 +1244,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1245: result: $ac_ct_CC" >&5 + echo "$as_me:1247: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1248: result: no" >&5 + echo "$as_me:1250: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1258,7 +1260,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1261: checking for $ac_word" >&5 +echo "$as_me:1263: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1273,7 +1275,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1276: found $ac_dir/$ac_word" >&5 +echo "$as_me:1278: found $ac_dir/$ac_word" >&5 break done @@ -1281,10 +1283,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1284: result: $CC" >&5 + echo "$as_me:1286: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1287: result: no" >&5 + echo "$as_me:1289: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1293,7 +1295,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1296: checking for $ac_word" >&5 +echo "$as_me:1298: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1308,7 +1310,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1311: found $ac_dir/$ac_word" >&5 +echo "$as_me:1313: found $ac_dir/$ac_word" >&5 break done @@ -1316,10 +1318,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1319: result: $ac_ct_CC" >&5 + echo "$as_me:1321: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1322: result: no" >&5 + echo "$as_me:1324: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1332,7 +1334,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1335: checking for $ac_word" >&5 +echo "$as_me:1337: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1352,7 +1354,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1355: found $ac_dir/$ac_word" >&5 +echo "$as_me:1357: found $ac_dir/$ac_word" >&5 break done @@ -1374,10 +1376,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1377: result: $CC" >&5 + echo "$as_me:1379: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1380: result: no" >&5 + echo "$as_me:1382: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1388,7 +1390,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1391: checking for $ac_word" >&5 +echo "$as_me:1393: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1403,7 +1405,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1406: found $ac_dir/$ac_word" >&5 +echo "$as_me:1408: found $ac_dir/$ac_word" >&5 break done @@ -1411,10 +1413,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1414: result: $CC" >&5 + echo "$as_me:1416: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1417: result: no" >&5 + echo "$as_me:1419: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1427,7 +1429,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1430: checking for $ac_word" >&5 +echo "$as_me:1432: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1442,7 +1444,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1445: found $ac_dir/$ac_word" >&5 +echo "$as_me:1447: found $ac_dir/$ac_word" >&5 break done @@ -1450,10 +1452,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1453: result: $ac_ct_CC" >&5 + echo "$as_me:1455: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1456: result: no" >&5 + echo "$as_me:1458: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1465,32 +1467,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1468: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1470: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1473:" \ +echo "$as_me:1475:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1476: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1478: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1479: \$? = $ac_status" >&5 + echo "$as_me:1481: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1481: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1483: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1484: \$? = $ac_status" >&5 + echo "$as_me:1486: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1486: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1488: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1489: \$? = $ac_status" >&5 + echo "$as_me:1491: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1493 "configure" +#line 1495 "configure" #include "confdefs.h" int @@ -1506,13 +1508,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1509: checking for C compiler default output" >&5 +echo "$as_me:1511: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1512: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1514: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1515: \$? = $ac_status" >&5 + echo "$as_me:1517: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1535,34 +1537,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1538: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1540: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1544: result: $ac_file" >&5 +echo "$as_me:1546: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1549: checking whether the C compiler works" >&5 +echo "$as_me:1551: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1555: \"$ac_try\"") >&5 + { (eval echo "$as_me:1557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1558: \$? = $ac_status" >&5 + echo "$as_me:1560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1565: error: cannot run C compiled programs. + { { echo "$as_me:1567: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1570,24 +1572,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1573: result: yes" >&5 +echo "$as_me:1575: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1580: checking whether we are cross compiling" >&5 +echo "$as_me:1582: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1582: result: $cross_compiling" >&5 +echo "$as_me:1584: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1585: checking for executable suffix" >&5 +echo "$as_me:1587: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1587: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1589: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 + echo "$as_me:1592: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1603,25 +1605,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1606: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1608: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1612: result: $ac_cv_exeext" >&5 +echo "$as_me:1614: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1618: checking for object suffix" >&5 +echo "$as_me:1620: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1624 "configure" +#line 1626 "configure" #include "confdefs.h" int @@ -1633,10 +1635,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1638: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1639: \$? = $ac_status" >&5 + echo "$as_me:1641: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1648,24 +1650,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1651: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1653: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1658: result: $ac_cv_objext" >&5 +echo "$as_me:1660: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1662: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1664: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1668 "configure" +#line 1670 "configure" #include "confdefs.h" int @@ -1680,16 +1682,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1685: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1686: \$? = $ac_status" >&5 + echo "$as_me:1688: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1689: \"$ac_try\"") >&5 + { (eval echo "$as_me:1691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1692: \$? = $ac_status" >&5 + echo "$as_me:1694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1701,19 +1703,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1704: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1706: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1710: checking whether $CC accepts -g" >&5 +echo "$as_me:1712: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1716 "configure" +#line 1718 "configure" #include "confdefs.h" int @@ -1725,16 +1727,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1731: \$? = $ac_status" >&5 + echo "$as_me:1733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1734: \"$ac_try\"") >&5 + { (eval echo "$as_me:1736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1737: \$? = $ac_status" >&5 + echo "$as_me:1739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1744,7 +1746,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1747: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1749: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1771,16 +1773,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1777: \$? = $ac_status" >&5 + echo "$as_me:1779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1780: \"$ac_try\"") >&5 + { (eval echo "$as_me:1782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1783: \$? = $ac_status" >&5 + echo "$as_me:1785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1792,7 +1794,7 @@ if { (eval echo "$as_me:1774: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1795 "configure" +#line 1797 "configure" #include "confdefs.h" #include $ac_declaration @@ -1805,16 +1807,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1808: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1811: \$? = $ac_status" >&5 + echo "$as_me:1813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1814: \"$ac_try\"") >&5 + { (eval echo "$as_me:1816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1817: \$? = $ac_status" >&5 + echo "$as_me:1819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1824,7 +1826,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1827 "configure" +#line 1829 "configure" #include "confdefs.h" $ac_declaration int @@ -1836,16 +1838,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1839: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1841: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1842: \$? = $ac_status" >&5 + echo "$as_me:1844: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1845: \"$ac_try\"") >&5 + { (eval echo "$as_me:1847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1848: \$? = $ac_status" >&5 + echo "$as_me:1850: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1879,7 +1881,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:1882: checking how to run the C preprocessor" >&5 +echo "$as_me:1884: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -1900,18 +1902,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 1903 "configure" +#line 1905 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1908: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1910: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:1914: \$? = $ac_status" >&5 + echo "$as_me:1916: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1934,17 +1936,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1937 "configure" +#line 1939 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:1941: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1943: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:1947: \$? = $ac_status" >&5 + echo "$as_me:1949: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1981,7 +1983,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1984: result: $CPP" >&5 +echo "$as_me:1986: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -1991,18 +1993,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 1994 "configure" +#line 1996 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1999: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2001: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2005: \$? = $ac_status" >&5 + echo "$as_me:2007: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2025,17 +2027,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2028 "configure" +#line 2030 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2032: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2034: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2038: \$? = $ac_status" >&5 + echo "$as_me:2040: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2063,7 +2065,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2066: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2068: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2076,14 +2078,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2079: checking whether $CC needs -traditional" >&5 + echo "$as_me:2081: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 2086 "configure" +#line 2088 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2098,7 +2100,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2101 "configure" +#line 2103 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2111,7 +2113,7 @@ rm -f conftest* fi fi -echo "$as_me:2114: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2116: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" @@ -2122,7 +2124,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2125: checking for $ac_word" >&5 +echo "$as_me:2127: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2137,7 +2139,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2140: found $ac_dir/$ac_word" >&5 +echo "$as_me:2142: found $ac_dir/$ac_word" >&5 break done @@ -2145,10 +2147,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2148: result: $AWK" >&5 + echo "$as_me:2150: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2151: result: no" >&5 + echo "$as_me:2153: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2167,7 +2169,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2170: checking for a BSD compatible install" >&5 +echo "$as_me:2172: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2216,7 +2218,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2219: result: $INSTALL" >&5 +echo "$as_me:2221: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2227,14 +2229,14 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2230: checking whether ln -s works" >&5 +echo "$as_me:2232: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2234: result: yes" >&5 + echo "$as_me:2236: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2237: result: no, using $LN_S" >&5 + echo "$as_me:2239: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi @@ -2255,7 +2257,7 @@ for ac_prog in tdlint lint alint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2258: checking for $ac_word" >&5 +echo "$as_me:2260: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2270,7 +2272,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2273: found $ac_dir/$ac_word" >&5 +echo "$as_me:2275: found $ac_dir/$ac_word" >&5 break done @@ -2278,10 +2280,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2281: result: $LINT" >&5 + echo "$as_me:2283: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2284: result: no" >&5 + echo "$as_me:2286: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2290,10 +2292,10 @@ done ### checks for UNIX variants that set C preprocessor variables -echo "$as_me:2293: checking for AIX" >&5 +echo "$as_me:2295: checking for AIX" >&5 echo $ECHO_N "checking for AIX... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 2296 "configure" +#line 2298 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2302,24 +2304,24 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - echo "$as_me:2305: result: yes" >&5 + echo "$as_me:2307: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF #define _ALL_SOURCE 1 EOF else - echo "$as_me:2312: result: no" >&5 + echo "$as_me:2314: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:2317: checking for POSIXized ISC" >&5 +echo "$as_me:2319: checking for POSIXized ISC" >&5 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then - echo "$as_me:2322: result: yes" >&5 + echo "$as_me:2324: result: yes" >&5 echo "${ECHO_T}yes" >&6 ISC=yes # If later tests want to check for ISC. @@ -2333,14 +2335,14 @@ EOF CC="$CC -Xp" fi else - echo "$as_me:2336: result: no" >&5 + echo "$as_me:2338: result: no" >&5 echo "${ECHO_T}no" >&6 ISC= fi ### checks for compiler characteristics -echo "$as_me:2343: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "$as_me:2345: checking for ${CC-cc} option to accept ANSI C" >&5 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 if test "${cf_cv_ansi_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2434,7 +2436,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 2437 "configure" +#line 2439 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2455,16 +2457,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2458: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2461: \$? = $ac_status" >&5 + echo "$as_me:2463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2464: \"$ac_try\"") >&5 + { (eval echo "$as_me:2466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2467: \$? = $ac_status" >&5 + echo "$as_me:2469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -2477,7 +2479,7 @@ CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2480: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:2482: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -2559,7 +2561,7 @@ EOF fi fi -echo "$as_me:2562: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2564: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2567,7 +2569,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2570 "configure" +#line 2572 "configure" #include "confdefs.h" #include #include @@ -2616,16 +2618,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2621: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2622: \$? = $ac_status" >&5 + echo "$as_me:2624: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2625: \"$ac_try\"") >&5 + { (eval echo "$as_me:2627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2628: \$? = $ac_status" >&5 + echo "$as_me:2630: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2642,21 +2644,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2645: result: none needed" >&5 + echo "$as_me:2647: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2648: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2650: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:2653: checking for an ANSI C-conforming const" >&5 +echo "$as_me:2655: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2659 "configure" +#line 2661 "configure" #include "confdefs.h" int @@ -2714,16 +2716,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2717: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2719: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2720: \$? = $ac_status" >&5 + echo "$as_me:2722: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2723: \"$ac_try\"") >&5 + { (eval echo "$as_me:2725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2726: \$? = $ac_status" >&5 + echo "$as_me:2728: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -2733,7 +2735,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2736: result: $ac_cv_c_const" >&5 +echo "$as_me:2738: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -2760,7 +2762,7 @@ test -n "$PROG_EXT" && cat >>confdefs.h <&5 +echo "$as_me:2765: checking if $CC -U and -D options work together" >&5 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 if test "${cf_cv_cc_u_d_options+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2769,7 +2771,7 @@ else cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" cat >conftest.$ac_ext <<_ACEOF -#line 2772 "configure" +#line 2774 "configure" #include "confdefs.h" int @@ -2788,16 +2790,16 @@ make a defined-error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2793: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2794: \$? = $ac_status" >&5 + echo "$as_me:2796: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2797: \"$ac_try\"") >&5 + { (eval echo "$as_me:2799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2800: \$? = $ac_status" >&5 + echo "$as_me:2802: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_u_d_options=yes @@ -2811,7 +2813,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2814: result: $cf_cv_cc_u_d_options" >&5 +echo "$as_me:2816: result: $cf_cv_cc_u_d_options" >&5 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 cf_XOPEN_SOURCE=500 @@ -2837,14 +2839,14 @@ irix[56].*) #(vi ;; linux*|gnu*|k*bsd*-gnu) #(vi -echo "$as_me:2840: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2842: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2847 "configure" +#line 2849 "configure" #include "confdefs.h" #include int @@ -2859,16 +2861,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2864: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2865: \$? = $ac_status" >&5 + echo "$as_me:2867: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2868: \"$ac_try\"") >&5 + { (eval echo "$as_me:2870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2871: \$? = $ac_status" >&5 + echo "$as_me:2873: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2877,7 +2879,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2880 "configure" +#line 2882 "configure" #include "confdefs.h" #include int @@ -2892,16 +2894,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2897: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2898: \$? = $ac_status" >&5 + echo "$as_me:2900: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2901: \"$ac_try\"") >&5 + { (eval echo "$as_me:2903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2904: \$? = $ac_status" >&5 + echo "$as_me:2906: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2916,7 +2918,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2919: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2921: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -2943,14 +2945,14 @@ solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) - echo "$as_me:2946: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:2948: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2953 "configure" +#line 2955 "configure" #include "confdefs.h" #include int @@ -2965,16 +2967,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2968: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2970: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2971: \$? = $ac_status" >&5 + echo "$as_me:2973: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2974: \"$ac_try\"") >&5 + { (eval echo "$as_me:2976: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2977: \$? = $ac_status" >&5 + echo "$as_me:2979: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2983,7 +2985,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2986 "configure" +#line 2988 "configure" #include "confdefs.h" #include int @@ -2998,16 +3000,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3001: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3003: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3004: \$? = $ac_status" >&5 + echo "$as_me:3006: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3007: \"$ac_try\"") >&5 + { (eval echo "$as_me:3009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3010: \$? = $ac_status" >&5 + echo "$as_me:3012: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3022,7 +3024,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3025: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3027: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3056,16 +3058,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` -echo "$as_me:3059: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3061: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "(line 3065) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 3067) testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3068 "configure" +#line 3070 "configure" #include "confdefs.h" #include int @@ -3080,16 +3082,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3083: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3085: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3086: \$? = $ac_status" >&5 + echo "$as_me:3088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3089: \"$ac_try\"") >&5 + { (eval echo "$as_me:3091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3092: \$? = $ac_status" >&5 + echo "$as_me:3094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3110,7 +3112,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3113 "configure" +#line 3115 "configure" #include "confdefs.h" #include int @@ -3125,16 +3127,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3128: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3130: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3131: \$? = $ac_status" >&5 + echo "$as_me:3133: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3134: \"$ac_try\"") >&5 + { (eval echo "$as_me:3136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3137: \$? = $ac_status" >&5 + echo "$as_me:3139: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3145,15 +3147,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "(line 3148) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 3150) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "(line 3153) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 3155) testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3156 "configure" +#line 3158 "configure" #include "confdefs.h" #include int @@ -3168,16 +3170,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3171: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3174: \$? = $ac_status" >&5 + echo "$as_me:3176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3177: \"$ac_try\"") >&5 + { (eval echo "$as_me:3179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3180: \$? = $ac_status" >&5 + echo "$as_me:3182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3193,7 +3195,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3196: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3198: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3210,14 +3212,14 @@ fi ;; esac -echo "$as_me:3213: checking if SIGWINCH is defined" >&5 +echo "$as_me:3215: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3220 "configure" +#line 3222 "configure" #include "confdefs.h" #include @@ -3232,23 +3234,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3235: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3238: \$? = $ac_status" >&5 + echo "$as_me:3240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3241: \"$ac_try\"") >&5 + { (eval echo "$as_me:3243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3244: \$? = $ac_status" >&5 + echo "$as_me:3246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 3251 "configure" +#line 3253 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3266,16 +3268,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3269: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3272: \$? = $ac_status" >&5 + echo "$as_me:3274: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3275: \"$ac_try\"") >&5 + { (eval echo "$as_me:3277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3278: \$? = $ac_status" >&5 + echo "$as_me:3280: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -3289,11 +3291,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3292: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:3294: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:3296: checking for actual SIGWINCH definition" >&5 +echo "$as_me:3298: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3304,7 +3306,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 3307 "configure" +#line 3309 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3326,16 +3328,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3332: \$? = $ac_status" >&5 + echo "$as_me:3334: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3335: \"$ac_try\"") >&5 + { (eval echo "$as_me:3337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3338: \$? = $ac_status" >&5 + echo "$as_me:3340: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -3349,7 +3351,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:3352: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:3354: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -3369,23 +3371,23 @@ wchar.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3372: checking for $ac_header" >&5 +echo "$as_me:3374: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3378 "configure" +#line 3380 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3382: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3384: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3388: \$? = $ac_status" >&5 + echo "$as_me:3390: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3404,7 +3406,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3407: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3409: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3419: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3423 "configure" +#line 3425 "configure" #include "confdefs.h" #include #include @@ -3436,16 +3438,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3442: \$? = $ac_status" >&5 + echo "$as_me:3444: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3445: \"$ac_try\"") >&5 + { (eval echo "$as_me:3447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3448: \$? = $ac_status" >&5 + echo "$as_me:3450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -3455,7 +3457,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3458: result: $ac_cv_header_time" >&5 +echo "$as_me:3460: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -3465,13 +3467,13 @@ EOF fi - echo "$as_me:3468: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:3470: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3474 "configure" +#line 3476 "configure" #include "confdefs.h" #include int @@ -3483,16 +3485,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3488: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3489: \$? = $ac_status" >&5 + echo "$as_me:3491: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3492: \"$ac_try\"") >&5 + { (eval echo "$as_me:3494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3495: \$? = $ac_status" >&5 + echo "$as_me:3497: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -3503,7 +3505,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3506: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:3508: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -3515,7 +3517,7 @@ EOF ### checks for typedefs -echo "$as_me:3518: checking for signal global datatype" >&5 +echo "$as_me:3520: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3527,7 +3529,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 3530 "configure" +#line 3532 "configure" #include "confdefs.h" #include @@ -3550,16 +3552,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3553: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3555: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3556: \$? = $ac_status" >&5 + echo "$as_me:3558: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3559: \"$ac_try\"") >&5 + { (eval echo "$as_me:3561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3562: \$? = $ac_status" >&5 + echo "$as_me:3564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -3573,20 +3575,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3576: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:3578: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h < or " >&5 +echo "$as_me:3584: checking for size_t in or " >&5 echo $ECHO_N "checking for size_t in or ... $ECHO_C" >&6 if test "${cf_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3589 "configure" +#line 3591 "configure" #include "confdefs.h" #include @@ -3604,16 +3606,16 @@ size_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3607: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3610: \$? = $ac_status" >&5 + echo "$as_me:3612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3613: \"$ac_try\"") >&5 + { (eval echo "$as_me:3615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3616: \$? = $ac_status" >&5 + echo "$as_me:3618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_size_t=yes else @@ -3625,19 +3627,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3628: result: $cf_cv_type_size_t" >&5 +echo "$as_me:3630: result: $cf_cv_type_size_t" >&5 echo "${ECHO_T}$cf_cv_type_size_t" >&6 test $cf_cv_type_size_t = no && cat >>confdefs.h <<\EOF #define size_t unsigned EOF -echo "$as_me:3634: checking for ANSI C header files" >&5 +echo "$as_me:3636: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3640 "configure" +#line 3642 "configure" #include "confdefs.h" #include #include @@ -3645,13 +3647,13 @@ else #include _ACEOF -if { (eval echo "$as_me:3648: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3650: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3654: \$? = $ac_status" >&5 + echo "$as_me:3656: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3673,7 +3675,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3676 "configure" +#line 3678 "configure" #include "confdefs.h" #include @@ -3691,7 +3693,7 @@ fi 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 <<_ACEOF -#line 3694 "configure" +#line 3696 "configure" #include "confdefs.h" #include @@ -3712,7 +3714,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 3715 "configure" +#line 3717 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -3738,15 +3740,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3744: \$? = $ac_status" >&5 + echo "$as_me:3746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3746: \"$ac_try\"") >&5 + { (eval echo "$as_me:3748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3749: \$? = $ac_status" >&5 + echo "$as_me:3751: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3759,7 +3761,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:3762: result: $ac_cv_header_stdc" >&5 +echo "$as_me:3764: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -3775,28 +3777,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3778: checking for $ac_header" >&5 +echo "$as_me:3780: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3784 "configure" +#line 3786 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3790: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3792: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3793: \$? = $ac_status" >&5 + echo "$as_me:3795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3796: \"$ac_try\"") >&5 + { (eval echo "$as_me:3798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3799: \$? = $ac_status" >&5 + echo "$as_me:3801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -3806,7 +3808,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3809: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3811: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3821: checking for time_t" >&5 echo $ECHO_N "checking for time_t... $ECHO_C" >&6 if test "${ac_cv_type_time_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3825 "configure" +#line 3827 "configure" #include "confdefs.h" $ac_includes_default int @@ -3837,16 +3839,16 @@ if (sizeof (time_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3840: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3843: \$? = $ac_status" >&5 + echo "$as_me:3845: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3846: \"$ac_try\"") >&5 + { (eval echo "$as_me:3848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3849: \$? = $ac_status" >&5 + echo "$as_me:3851: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_time_t=yes else @@ -3856,7 +3858,7 @@ ac_cv_type_time_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3859: result: $ac_cv_type_time_t" >&5 +echo "$as_me:3861: result: $ac_cv_type_time_t" >&5 echo "${ECHO_T}$ac_cv_type_time_t" >&6 if test $ac_cv_type_time_t = yes; then : @@ -3868,13 +3870,13 @@ EOF fi -echo "$as_me:3871: checking for mode_t" >&5 +echo "$as_me:3873: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3877 "configure" +#line 3879 "configure" #include "confdefs.h" $ac_includes_default int @@ -3889,16 +3891,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3892: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3894: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3895: \$? = $ac_status" >&5 + echo "$as_me:3897: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3898: \"$ac_try\"") >&5 + { (eval echo "$as_me:3900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3901: \$? = $ac_status" >&5 + echo "$as_me:3903: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else @@ -3908,7 +3910,7 @@ ac_cv_type_mode_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3911: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:3913: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test $ac_cv_type_mode_t = yes; then : @@ -3920,13 +3922,13 @@ EOF fi -echo "$as_me:3923: checking for pid_t" >&5 +echo "$as_me:3925: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3929 "configure" +#line 3931 "configure" #include "confdefs.h" $ac_includes_default int @@ -3941,16 +3943,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3944: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3946: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3947: \$? = $ac_status" >&5 + echo "$as_me:3949: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3950: \"$ac_try\"") >&5 + { (eval echo "$as_me:3952: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3953: \$? = $ac_status" >&5 + echo "$as_me:3955: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -3960,7 +3962,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3963: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:3965: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -3972,13 +3974,13 @@ EOF fi -echo "$as_me:3975: checking for uid_t in sys/types.h" >&5 +echo "$as_me:3977: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3981 "configure" +#line 3983 "configure" #include "confdefs.h" #include @@ -3992,7 +3994,7 @@ fi rm -f conftest* fi -echo "$as_me:3995: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:3997: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then @@ -4006,13 +4008,13 @@ EOF fi -echo "$as_me:4009: checking for off_t" >&5 +echo "$as_me:4011: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4015 "configure" +#line 4017 "configure" #include "confdefs.h" $ac_includes_default int @@ -4027,16 +4029,16 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4030: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4032: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4033: \$? = $ac_status" >&5 + echo "$as_me:4035: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4036: \"$ac_try\"") >&5 + { (eval echo "$as_me:4038: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4039: \$? = $ac_status" >&5 + echo "$as_me:4041: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -4046,7 +4048,7 @@ ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4049: result: $ac_cv_type_off_t" >&5 +echo "$as_me:4051: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : @@ -4075,13 +4077,13 @@ for ac_func in \ wcwidth do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4078: checking for $ac_func" >&5 +echo "$as_me:4080: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4084 "configure" +#line 4086 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4112,16 +4114,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4115: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4117: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4118: \$? = $ac_status" >&5 + echo "$as_me:4120: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4121: \"$ac_try\"") >&5 + { (eval echo "$as_me:4123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4124: \$? = $ac_status" >&5 + echo "$as_me:4126: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4131,7 +4133,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4134: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4136: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4146: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4150 "configure" +#line 4152 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -4178,16 +4180,16 @@ f = memmove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4181: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4183: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4184: \$? = $ac_status" >&5 + echo "$as_me:4186: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4187: \"$ac_try\"") >&5 + { (eval echo "$as_me:4189: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4190: \$? = $ac_status" >&5 + echo "$as_me:4192: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -4197,19 +4199,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4200: result: $ac_cv_func_memmove" >&5 +echo "$as_me:4202: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test $ac_cv_func_memmove = yes; then : else -echo "$as_me:4206: checking for bcopy" >&5 +echo "$as_me:4208: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4212 "configure" +#line 4214 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -4240,16 +4242,16 @@ f = bcopy; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4243: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4245: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4246: \$? = $ac_status" >&5 + echo "$as_me:4248: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4249: \"$ac_try\"") >&5 + { (eval echo "$as_me:4251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4252: \$? = $ac_status" >&5 + echo "$as_me:4254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -4259,11 +4261,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4262: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:4264: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test $ac_cv_func_bcopy = yes; then - echo "$as_me:4266: checking if bcopy does overlapping moves" >&5 + echo "$as_me:4268: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4273,7 +4275,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 4276 "configure" +#line 4278 "configure" #include "confdefs.h" int main() { @@ -4287,15 +4289,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4290: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4292: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4293: \$? = $ac_status" >&5 + echo "$as_me:4295: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4295: \"$ac_try\"") >&5 + { (eval echo "$as_me:4297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4298: \$? = $ac_status" >&5 + echo "$as_me:4300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -4308,7 +4310,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:4311: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:4313: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -4332,23 +4334,23 @@ fi for ac_header in lastlog.h paths.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4335: checking for $ac_header" >&5 +echo "$as_me:4337: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4341 "configure" +#line 4343 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4345: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4347: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4351: \$? = $ac_status" >&5 + echo "$as_me:4353: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4367,7 +4369,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4370: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4372: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4382: checking for lastlog path" >&5 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6 if test "${cf_cv_path_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4387 "configure" +#line 4389 "configure" #include "confdefs.h" #include @@ -4404,16 +4406,16 @@ char *path = _PATH_LASTLOG } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4407: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4410: \$? = $ac_status" >&5 + echo "$as_me:4412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4413: \"$ac_try\"") >&5 + { (eval echo "$as_me:4415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4416: \$? = $ac_status" >&5 + echo "$as_me:4418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -4428,13 +4430,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4431: result: $cf_cv_path_lastlog" >&5 +echo "$as_me:4433: result: $cf_cv_path_lastlog" >&5 echo "${ECHO_T}$cf_cv_path_lastlog" >&6 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF #define USE_LASTLOG 1 EOF -echo "$as_me:4437: checking for utmp implementation" >&5 +echo "$as_me:4439: checking for utmp implementation" >&5 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6 if test "${cf_cv_have_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4451,7 +4453,7 @@ cf_utmp_includes=" #endif " cat >conftest.$ac_ext <<_ACEOF -#line 4454 "configure" +#line 4456 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4465,16 +4467,16 @@ struct $cf_header x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4470: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4471: \$? = $ac_status" >&5 + echo "$as_me:4473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4474: \"$ac_try\"") >&5 + { (eval echo "$as_me:4476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4477: \$? = $ac_status" >&5 + echo "$as_me:4479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -4483,7 +4485,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 4486 "configure" +#line 4488 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4497,16 +4499,16 @@ struct $cf_header x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4502: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4503: \$? = $ac_status" >&5 + echo "$as_me:4505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4506: \"$ac_try\"") >&5 + { (eval echo "$as_me:4508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4509: \$? = $ac_status" >&5 + echo "$as_me:4511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -4521,7 +4523,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4524: result: $cf_cv_have_utmp" >&5 +echo "$as_me:4526: result: $cf_cv_have_utmp" >&5 echo "${ECHO_T}$cf_cv_have_utmp" >&6 if test $cf_cv_have_utmp != no ; then @@ -4534,14 +4536,14 @@ EOF EOF if test $cf_cv_have_utmp != no ; then -echo "$as_me:4537: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 +echo "$as_me:4539: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4544 "configure" +#line 4546 "configure" #include "confdefs.h" #include @@ -4555,16 +4557,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4558: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4560: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4561: \$? = $ac_status" >&5 + echo "$as_me:4563: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4564: \"$ac_try\"") >&5 + { (eval echo "$as_me:4566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4567: \$? = $ac_status" >&5 + echo "$as_me:4569: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_host=yes else @@ -4576,7 +4578,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4579: result: $cf_cv_have_utmp_ut_host" >&5 +echo "$as_me:4581: result: $cf_cv_have_utmp_ut_host" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF #define HAVE_UTMP_UT_HOST 1 @@ -4585,7 +4587,7 @@ EOF fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4588: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 +echo "$as_me:4590: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4602,7 +4604,7 @@ cf_utmp_includes=" " for cf_header in ut_name ut_user ; do cat >conftest.$ac_ext <<_ACEOF -#line 4605 "configure" +#line 4607 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4616,16 +4618,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4622: \$? = $ac_status" >&5 + echo "$as_me:4624: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4625: \"$ac_try\"") >&5 + { (eval echo "$as_me:4627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4628: \$? = $ac_status" >&5 + echo "$as_me:4630: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_name=$cf_header break @@ -4637,12 +4639,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4640: result: $cf_cv_have_utmp_ut_name" >&5 +echo "$as_me:4642: result: $cf_cv_have_utmp_ut_name" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 case $cf_cv_have_utmp_ut_name in #(vi no) #(vi - { { echo "$as_me:4645: error: Cannot find declaration for ut.ut_name" >&5 + { { echo "$as_me:4647: error: Cannot find declaration for ut.ut_name" >&5 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;} { (exit 1); exit 1; }; } ;; @@ -4656,7 +4658,7 @@ esac fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4659: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "$as_me:4661: checking for exit-status in $cf_cv_have_utmp" >&5 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4669,7 +4671,7 @@ for cf_result in \ ut_exit.ut_exit do cat >conftest.$ac_ext <<_ACEOF -#line 4672 "configure" +#line 4674 "configure" #include "confdefs.h" #include @@ -4683,16 +4685,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4686: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4689: \$? = $ac_status" >&5 + echo "$as_me:4691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4692: \"$ac_try\"") >&5 + { (eval echo "$as_me:4694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4695: \$? = $ac_status" >&5 + echo "$as_me:4697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -4705,7 +4707,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4708: result: $cf_cv_have_utmp_ut_xstatus" >&5 +echo "$as_me:4710: result: $cf_cv_have_utmp_ut_xstatus" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6 if test $cf_cv_have_utmp_ut_xstatus != no ; then cat >>confdefs.h <<\EOF @@ -4720,14 +4722,14 @@ fi fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4723: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 +echo "$as_me:4725: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4730 "configure" +#line 4732 "configure" #include "confdefs.h" #include @@ -4741,23 +4743,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4744: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4746: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4747: \$? = $ac_status" >&5 + echo "$as_me:4749: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4750: \"$ac_try\"") >&5 + { (eval echo "$as_me:4752: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4753: \$? = $ac_status" >&5 + echo "$as_me:4755: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 4760 "configure" +#line 4762 "configure" #include "confdefs.h" #include @@ -4771,16 +4773,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4777: \$? = $ac_status" >&5 + echo "$as_me:4779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4780: \"$ac_try\"") >&5 + { (eval echo "$as_me:4782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4783: \$? = $ac_status" >&5 + echo "$as_me:4785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=define else @@ -4794,7 +4796,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4797: result: $cf_cv_have_utmp_ut_xtime" >&5 +echo "$as_me:4799: result: $cf_cv_have_utmp_ut_xtime" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6 if test $cf_cv_have_utmp_ut_xtime != no ; then cat >>confdefs.h <<\EOF @@ -4811,14 +4813,14 @@ fi fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4814: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 +echo "$as_me:4816: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_session+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4821 "configure" +#line 4823 "configure" #include "confdefs.h" #include @@ -4832,16 +4834,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4835: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4838: \$? = $ac_status" >&5 + echo "$as_me:4840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4841: \"$ac_try\"") >&5 + { (eval echo "$as_me:4843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4844: \$? = $ac_status" >&5 + echo "$as_me:4846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_session=yes else @@ -4852,7 +4854,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4855: result: $cf_cv_have_utmp_ut_session" >&5 +echo "$as_me:4857: result: $cf_cv_have_utmp_ut_session" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6 if test $cf_cv_have_utmp_ut_session != no ; then cat >>confdefs.h <<\EOF @@ -4862,7 +4864,7 @@ EOF fi fi -echo "$as_me:4865: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "$as_me:4867: checking if $cf_cv_have_utmp is SYSV flavor" >&5 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6 if test "${cf_cv_sysv_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4870,7 +4872,7 @@ else test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat >conftest.$ac_ext <<_ACEOF -#line 4873 "configure" +#line 4875 "configure" #include "confdefs.h" #include @@ -4889,16 +4891,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4892: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4894: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4895: \$? = $ac_status" >&5 + echo "$as_me:4897: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4898: \"$ac_try\"") >&5 + { (eval echo "$as_me:4900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4901: \$? = $ac_status" >&5 + echo "$as_me:4903: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sysv_utmp=yes else @@ -4909,7 +4911,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4912: result: $cf_cv_sysv_utmp" >&5 +echo "$as_me:4914: result: $cf_cv_sysv_utmp" >&5 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF #define USE_SYSV_UTMP 1 @@ -4920,23 +4922,23 @@ fi for ac_header in lastlog.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4923: checking for $ac_header" >&5 +echo "$as_me:4925: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4929 "configure" +#line 4931 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4933: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4935: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4939: \$? = $ac_status" >&5 + echo "$as_me:4941: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4955,7 +4957,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4958: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4960: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4970: checking for struct lastlog" >&5 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 if test "${cf_cv_struct_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4976,7 +4978,7 @@ if test "$cross_compiling" = yes; then cf_cv_struct_lastlog=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 4979 "configure" +#line 4981 "configure" #include "confdefs.h" #include @@ -4990,15 +4992,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4993: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4995: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4996: \$? = $ac_status" >&5 + echo "$as_me:4998: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4998: \"$ac_try\"") >&5 + { (eval echo "$as_me:5000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5001: \$? = $ac_status" >&5 + echo "$as_me:5003: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_lastlog=yes @@ -5012,7 +5014,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5015: result: $cf_cv_struct_lastlog" >&5 +echo "$as_me:5017: result: $cf_cv_struct_lastlog" >&5 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6 test $cf_cv_struct_lastlog != no && cat >>confdefs.h <<\EOF @@ -5024,23 +5026,23 @@ sys/param.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5027: checking for $ac_header" >&5 +echo "$as_me:5029: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5033 "configure" +#line 5035 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5037: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5039: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5043: \$? = $ac_status" >&5 + echo "$as_me:5045: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5059,7 +5061,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5062: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5064: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5074: checking if POSIX saved-ids are supported" >&5 echo $ECHO_N "checking if POSIX saved-ids are supported... $ECHO_C" >&6 if test "${cf_cv_posix_saved_ids+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5079 "configure" +#line 5081 "configure" #include "confdefs.h" #include @@ -5104,16 +5106,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5110: \$? = $ac_status" >&5 + echo "$as_me:5112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5113: \"$ac_try\"") >&5 + { (eval echo "$as_me:5115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5116: \$? = $ac_status" >&5 + echo "$as_me:5118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_saved_ids=yes @@ -5125,7 +5127,7 @@ if test "$cross_compiling" = yes; then cf_cv_posix_saved_ids=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 5128 "configure" +#line 5130 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -5140,15 +5142,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5143: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5145: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5146: \$? = $ac_status" >&5 + echo "$as_me:5148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5148: \"$ac_try\"") >&5 + { (eval echo "$as_me:5150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5151: \$? = $ac_status" >&5 + echo "$as_me:5153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_saved_ids=yes else @@ -5164,7 +5166,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5167: result: $cf_cv_posix_saved_ids" >&5 +echo "$as_me:5169: result: $cf_cv_posix_saved_ids" >&5 echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6 test "$cf_cv_posix_saved_ids" = yes && cat >>confdefs.h <<\EOF @@ -5179,7 +5181,7 @@ cf_TERMVAR=vt100 test -n "$TERMCAP" && cf_TERMVAR="$TERM" test -z "$cf_TERMVAR" && cf_TERMVAR=vt100 -echo "$as_me:5182: checking if we want full tgetent function" >&5 +echo "$as_me:5184: checking if we want full tgetent function" >&5 echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6 # Check whether --enable-full-tgetent or --disable-full-tgetent was given. @@ -5196,7 +5198,7 @@ else cf_full_tgetent=yes fi; -echo "$as_me:5199: result: $cf_full_tgetent" >&5 +echo "$as_me:5201: result: $cf_full_tgetent" >&5 echo "${ECHO_T}$cf_full_tgetent" >&6 if test "$cf_full_tgetent" = yes ; then @@ -5205,7 +5207,7 @@ else cf_test_message="tgetent" fi -echo "$as_me:5208: checking for $cf_test_message function" >&5 +echo "$as_me:5210: checking for $cf_test_message function" >&5 echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6 if test "${cf_cv_lib_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5227,7 +5229,7 @@ for cf_termlib in '' $cf_TERMLIB ; do echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 else cat >conftest.$ac_ext <<_ACEOF -#line 5230 "configure" +#line 5232 "configure" #include "confdefs.h" /* terminfo implementations ignore the buffer argument, making it useless for @@ -5242,15 +5244,15 @@ int main() ${cf_cv_main_return:-return} ($cf_TERMTST); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5245: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5247: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5248: \$? = $ac_status" >&5 + echo "$as_me:5250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5250: \"$ac_try\"") >&5 + { (eval echo "$as_me:5252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5253: \$? = $ac_status" >&5 + echo "$as_me:5255: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 if test -n "$cf_termlib" ; then @@ -5271,7 +5273,7 @@ done LIBS="$cf_save_LIBS" fi -echo "$as_me:5274: result: $cf_cv_lib_tgetent" >&5 +echo "$as_me:5276: result: $cf_cv_lib_tgetent" >&5 echo "${ECHO_T}$cf_cv_lib_tgetent" >&6 # If we found a working tgetent(), set LIBS and check for termcap.h. @@ -5285,7 +5287,7 @@ if test "$cf_cv_lib_tgetent" != no ; then EOF cat >conftest.$ac_ext <<_ACEOF -#line 5288 "configure" +#line 5290 "configure" #include "confdefs.h" #include @@ -5301,16 +5303,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5307: \$? = $ac_status" >&5 + echo "$as_me:5309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5310: \"$ac_try\"") >&5 + { (eval echo "$as_me:5312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5313: \$? = $ac_status" >&5 + echo "$as_me:5315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define HAVE_TERMCAP_H 1 @@ -5327,7 +5329,7 @@ else # a crippled one. A crippled tgetent() is still useful to # validate values for the TERM environment variable given to # child processes. - echo "$as_me:5330: checking for partial tgetent function" >&5 + echo "$as_me:5332: checking for partial tgetent function" >&5 echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6 if test "${cf_cv_lib_part_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5337,7 +5339,7 @@ else for cf_termlib in $cf_TERMLIB ; do LIBS="$cf_save_LIBS -l$cf_termlib" cat >conftest.$ac_ext <<_ACEOF -#line 5340 "configure" +#line 5342 "configure" #include "confdefs.h" int @@ -5349,16 +5351,16 @@ tgetent(0, "$cf_TERMVAR") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5352: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5355: \$? = $ac_status" >&5 + echo "$as_me:5357: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5358: \"$ac_try\"") >&5 + { (eval echo "$as_me:5360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5361: \$? = $ac_status" >&5 + echo "$as_me:5363: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 cf_cv_lib_part_tgetent="-l$cf_termlib" @@ -5372,7 +5374,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:5375: result: $cf_cv_lib_part_tgetent" >&5 +echo "$as_me:5377: result: $cf_cv_lib_part_tgetent" >&5 echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6 if test "$cf_cv_lib_part_tgetent" != no ; then @@ -5381,23 +5383,23 @@ echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6 for ac_header in termcap.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5384: checking for $ac_header" >&5 +echo "$as_me:5386: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5390 "configure" +#line 5392 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5394: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5396: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5400: \$? = $ac_status" >&5 + echo "$as_me:5402: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5416,7 +5418,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5419: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5421: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5440: checking for directory to install resource files" >&5 echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6 # Check whether --with-app-defaults or --without-app-defaults was given. @@ -5444,7 +5446,8 @@ if test "${with_app_defaults+set}" = set; then else withval="${appsdir-'\$(exec_prefix)/lib/X11/app-defaults'}" -fi; +fi; if test -n "'\$(exec_prefix)/lib/X11/app-defaults'" ; then + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else @@ -5470,23 +5473,135 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5473: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:5476: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; esac +fi appsdir="$withval" -echo "$as_me:5481: result: $appsdir" >&5 +echo "$as_me:5485: result: $appsdir" >&5 echo "${ECHO_T}$appsdir" >&6 no_appsdir= test "$appsdir" = no && no_appsdir="#" +echo "$as_me:5491: checking for directory to install icons" >&5 +echo $ECHO_N "checking for directory to install icons... $ECHO_C" >&6 + +# Check whether --with-icondir or --without-icondir was given. +if test "${with_icondir+set}" = set; then + withval="$with_icondir" + +else + withval="${icondir-'\$(exec_prefix)/share/pixmaps'}" +fi; if test -n "'\$(exec_prefix)/share/pixmaps'" ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$withval" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; #(vi +.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:5527: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi +icondir="$withval" + +echo "$as_me:5536: result: $icondir" >&5 +echo "${ECHO_T}$icondir" >&6 + +no_icondir= +test "$icondir" = no && no_icondir="#" + +# Comment-out the install-desktop rule if the desktop-utils are not found. +echo "$as_me:5543: checking if you want to install desktop files" >&5 +echo $ECHO_N "checking if you want to install desktop files... $ECHO_C" >&6 + +# Check whether --enable-desktop or --disable-desktop was given. +if test "${enable_desktop+set}" = set; then + enableval="$enable_desktop" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_desktop=$enableval + else + enable_desktop=$enableval + fi +else + enableval=yes + enable_desktop=$enableval + +fi; +echo "$as_me:5560: result: $enable_desktop" >&5 +echo "${ECHO_T}$enable_desktop" >&6 + +desktop_utils= +if test "$enable_desktop" = yes ; then +# Extract the first word of "desktop-file-install", so it can be a program name with args. +set dummy desktop-file-install; ac_word=$2 +echo "$as_me:5567: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_desktop_utils+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$desktop_utils"; then + ac_cv_prog_desktop_utils="$desktop_utils" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_desktop_utils="yes" +echo "$as_me:5582: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_desktop_utils" && ac_cv_prog_desktop_utils="no" +fi +fi +desktop_utils=$ac_cv_prog_desktop_utils +if test -n "$desktop_utils"; then + echo "$as_me:5591: result: $desktop_utils" >&5 +echo "${ECHO_T}$desktop_utils" >&6 +else + echo "$as_me:5594: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi + +test "$desktop_utils" = yes && desktop_utils= || desktop_utils="#" + # inherit SINSTALL_OPTS from environment to allow packager to customize it. -echo "$as_me:5489: checking for install-permissions reference" >&5 +echo "$as_me:5604: checking for install-permissions reference" >&5 echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6 # Check whether --with-reference or --without-reference was given. @@ -5496,7 +5611,7 @@ if test "${with_reference+set}" = set; then else with_reference=xterm fi; -echo "$as_me:5499: result: $with_reference" >&5 +echo "$as_me:5614: result: $with_reference" >&5 echo "${ECHO_T}$with_reference" >&6 with_full_paths=yes @@ -5506,7 +5621,7 @@ for ac_prog in $XTERM_PATH $with_reference do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5509: checking for $ac_word" >&5 +echo "$as_me:5624: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XTERM_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5523,7 +5638,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_XTERM_PATH="$ac_dir/$ac_word" - echo "$as_me:5526: found $ac_dir/$ac_word" >&5 + echo "$as_me:5641: found $ac_dir/$ac_word" >&5 break fi done @@ -5534,10 +5649,10 @@ fi XTERM_PATH=$ac_cv_path_XTERM_PATH if test -n "$XTERM_PATH"; then - echo "$as_me:5537: result: $XTERM_PATH" >&5 + echo "$as_me:5652: result: $XTERM_PATH" >&5 echo "${ECHO_T}$XTERM_PATH" >&6 else - echo "$as_me:5540: result: no" >&5 + echo "$as_me:5655: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5605,7 +5720,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 5608) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 5723) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:5743: checking for symbolic link to create to $cf_name" >&5 echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6 # Check whether --with-xterm-symlink or --without-xterm-symlink was given. @@ -5635,7 +5750,7 @@ if test "${with_xterm_symlink+set}" = set; then else with_symlink=xterm fi; -echo "$as_me:5638: result: $with_symlink" >&5 +echo "$as_me:5753: result: $with_symlink" >&5 echo "${ECHO_T}$with_symlink" >&6 test "$with_symlink" = yes && with_symlink=xterm test -n "$with_symlink" && \ @@ -5644,7 +5759,7 @@ test -n "$with_symlink" && \ XTERM_SYMLINK="$with_symlink" fi -echo "$as_me:5647: checking if you want to disable setuid" >&5 +echo "$as_me:5762: checking if you want to disable setuid" >&5 echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6 # Check whether --enable-setuid or --disable-setuid was given. @@ -5661,10 +5776,10 @@ else disable_setuid=no fi; -echo "$as_me:5664: result: $disable_setuid" >&5 +echo "$as_me:5779: result: $disable_setuid" >&5 echo "${ECHO_T}$disable_setuid" >&6 -echo "$as_me:5667: checking if you want to disable setgid" >&5 +echo "$as_me:5782: checking if you want to disable setgid" >&5 echo $ECHO_N "checking if you want to disable setgid... $ECHO_C" >&6 # Check whether --enable-setgid or --disable-setgid was given. @@ -5681,10 +5796,10 @@ else disable_setgid=no fi; -echo "$as_me:5684: result: $disable_setuid" >&5 -echo "${ECHO_T}$disable_setuid" >&6 +echo "$as_me:5799: result: $disable_setgid" >&5 +echo "${ECHO_T}$disable_setgid" >&6 -echo "$as_me:5687: checking if you want to run xterm setuid to a given user" >&5 +echo "$as_me:5802: checking if you want to run xterm setuid to a given user" >&5 echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6 # Check whether --with-setuid or --without-setuid was given. @@ -5694,7 +5809,7 @@ if test "${with_setuid+set}" = set; then else use_given_setuid=no fi; -echo "$as_me:5697: result: $use_given_setuid" >&5 +echo "$as_me:5812: result: $use_given_setuid" >&5 echo "${ECHO_T}$use_given_setuid" >&6 if test "$use_given_setuid" != no ; then @@ -5706,7 +5821,7 @@ if test "$use_given_setuid" != no ; then SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid" fi -echo "$as_me:5709: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 +echo "$as_me:5824: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6 # Check whether --with-utmp-setgid or --without-utmp-setgid was given. @@ -5716,14 +5831,14 @@ if test "${with_utmp_setgid+set}" = set; then else use_utmp_setgid=no fi; -echo "$as_me:5719: result: $use_utmp_setgid" >&5 +echo "$as_me:5834: result: $use_utmp_setgid" >&5 echo "${ECHO_T}$use_utmp_setgid" >&6 if test "$use_utmp_setgid" != no ; then if test "$use_utmp_setgid" = yes ; then if test $cf_cv_have_utmp != no ; then -echo "$as_me:5726: checking for utmp/utmpx group" >&5 +echo "$as_me:5841: checking for utmp/utmpx group" >&5 echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6 if test "${cf_cv_utmp_group+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5765,10 +5880,10 @@ do done fi -echo "$as_me:5768: result: $cf_cv_utmp_group" >&5 +echo "$as_me:5883: result: $cf_cv_utmp_group" >&5 echo "${ECHO_T}$cf_cv_utmp_group" >&6 else - { { echo "$as_me:5771: error: cannot find utmp group" >&5 + { { echo "$as_me:5886: error: cannot find utmp group" >&5 echo "$as_me: error: cannot find utmp group" >&2;} { (exit 1); exit 1; }; } fi @@ -5777,7 +5892,7 @@ fi cf_cv_utmp_group=$use_utmp_setgid fi if test "$cf_cv_posix_saved_ids" != yes ; then - { { echo "$as_me:5780: error: Your system does not support POSIX saved-ids" >&5 + { { echo "$as_me:5895: error: Your system does not support POSIX saved-ids" >&5 echo "$as_me: error: Your system does not support POSIX saved-ids" >&2;} { (exit 1); exit 1; }; } fi @@ -5788,7 +5903,7 @@ EOF SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group" fi -echo "$as_me:5791: checking if you want to link with utempter" >&5 +echo "$as_me:5906: checking if you want to link with utempter" >&5 echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6 # Check whether --with-utempter or --without-utempter was given. @@ -5798,12 +5913,12 @@ if test "${with_utempter+set}" = set; then else use_utempter=no fi; -echo "$as_me:5801: result: $use_utempter" >&5 +echo "$as_me:5916: result: $use_utempter" >&5 echo "${ECHO_T}$use_utempter" >&6 if test "$use_utempter" = yes ; then -echo "$as_me:5806: checking if we can link with utempter library" >&5 +echo "$as_me:5921: checking if we can link with utempter library" >&5 echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6 if test "${cf_cv_have_utempter+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5812,7 +5927,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutempter $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5815 "configure" +#line 5930 "configure" #include "confdefs.h" #include @@ -5829,16 +5944,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5832: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5947: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5835: \$? = $ac_status" >&5 + echo "$as_me:5950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5838: \"$ac_try\"") >&5 + { (eval echo "$as_me:5953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5841: \$? = $ac_status" >&5 + echo "$as_me:5956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utempter=yes @@ -5852,7 +5967,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:5855: result: $cf_cv_have_utempter" >&5 +echo "$as_me:5970: result: $cf_cv_have_utempter" >&5 echo "${ECHO_T}$cf_cv_have_utempter" >&6 if test "$cf_cv_have_utempter" = yes ; then cat >>confdefs.h <<\EOF @@ -5862,19 +5977,31 @@ EOF LIBS="-lutempter $LIBS" fi - test "$cf_cv_have_utempter" = yes && disable_setuid=yes + test "$cf_cv_have_utempter" != yes && use_utempter=no +else + use_utempter=no +fi + +# Some configurations permit (or require) either setuid or setgid mode. +# Let the user decide. +if test "$use_utempter" = yes ; then + if test "${enable_setuid+set}" != set ; then + disable_setuid=yes + test -n "$verbose" && echo " No --disable-setuid option given, force to yes" 1>&6 + + fi fi ### checks for external data -echo "$as_me:5870: checking if external errno is declared" >&5 +echo "$as_me:5997: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5877 "configure" +#line 6004 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -5892,16 +6019,16 @@ long x = (long) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5895: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6022: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5898: \$? = $ac_status" >&5 + echo "$as_me:6025: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5901: \"$ac_try\"") >&5 + { (eval echo "$as_me:6028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5904: \$? = $ac_status" >&5 + echo "$as_me:6031: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -5912,7 +6039,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5915: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:6042: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -5927,14 +6054,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:5930: checking if external errno exists" >&5 +echo "$as_me:6057: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5937 "configure" +#line 6064 "configure" #include "confdefs.h" #undef errno @@ -5949,16 +6076,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5952: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5955: \$? = $ac_status" >&5 + echo "$as_me:6082: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5958: \"$ac_try\"") >&5 + { (eval echo "$as_me:6085: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5961: \$? = $ac_status" >&5 + echo "$as_me:6088: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -5969,7 +6096,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5972: result: $cf_cv_have_errno" >&5 +echo "$as_me:6099: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -5982,7 +6109,7 @@ EOF fi -echo "$as_me:5985: checking for explicit tty group name" >&5 +echo "$as_me:6112: checking for explicit tty group name" >&5 echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6 # Check whether --with-tty-group or --without-tty-group was given. @@ -5994,11 +6121,11 @@ else fi; test -z "$cf_tty_group" && cf_tty_group=auto... test "$cf_tty_group" = yes && cf_tty_group=auto... -echo "$as_me:5997: result: $cf_tty_group" >&5 +echo "$as_me:6124: result: $cf_tty_group" >&5 echo "${ECHO_T}$cf_tty_group" >&6 if test "$cf_tty_group" = "auto..." ; then -echo "$as_me:6001: checking for tty group name" >&5 +echo "$as_me:6128: checking for tty group name" >&5 echo $ECHO_N "checking for tty group name... $ECHO_C" >&6 if test "${cf_cv_tty_group_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6051,7 +6178,7 @@ esac fi fi -echo "$as_me:6054: result: $cf_cv_tty_group_name" >&5 +echo "$as_me:6181: result: $cf_cv_tty_group_name" >&5 echo "${ECHO_T}$cf_cv_tty_group_name" >&6 cf_tty_group="$cf_cv_tty_group_name" else @@ -6070,7 +6197,7 @@ EOF # does apply to the device. We cannot perform this test if we are in batch # mode, or if we are cross-compiling. -echo "$as_me:6073: checking if we may use the $cf_tty_group group" >&5 +echo "$as_me:6200: checking if we may use the $cf_tty_group group" >&5 echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6 if test "${cf_cv_tty_group+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6083,7 +6210,7 @@ if test "$cross_compiling" = yes; then cf_cv_tty_group=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 6086 "configure" +#line 6213 "configure" #include "confdefs.h" #include @@ -6109,15 +6236,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6112: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6239: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6115: \$? = $ac_status" >&5 + echo "$as_me:6242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6117: \"$ac_try\"") >&5 + { (eval echo "$as_me:6244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6120: \$? = $ac_status" >&5 + echo "$as_me:6247: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_tty_group=yes else @@ -6135,11 +6262,11 @@ else fi fi -echo "$as_me:6138: result: $cf_cv_tty_group" >&5 +echo "$as_me:6265: result: $cf_cv_tty_group" >&5 echo "${ECHO_T}$cf_cv_tty_group" >&6 if test $cf_cv_tty_group = no ; then - { echo "$as_me:6142: WARNING: Cannot use $cf_tty_group group" >&5 + { echo "$as_me:6269: WARNING: Cannot use $cf_tty_group group" >&5 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;} else cat >>confdefs.h <<\EOF @@ -6150,13 +6277,13 @@ fi ### checks for system services and user specified options -echo "$as_me:6153: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "$as_me:6280: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6159 "configure" +#line 6286 "configure" #include "confdefs.h" #include #include @@ -6178,16 +6305,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6181: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6308: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6184: \$? = $ac_status" >&5 + echo "$as_me:6311: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6187: \"$ac_try\"") >&5 + { (eval echo "$as_me:6314: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6190: \$? = $ac_status" >&5 + echo "$as_me:6317: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else @@ -6197,7 +6324,7 @@ ac_cv_header_sys_wait_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6200: result: $ac_cv_header_sys_wait_h" >&5 +echo "$as_me:6327: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then @@ -6207,14 +6334,14 @@ EOF fi -echo "$as_me:6210: checking for POSIX wait functions" >&5 +echo "$as_me:6337: checking for POSIX wait functions" >&5 echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6 if test "${cf_cv_posix_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6217 "configure" +#line 6344 "configure" #include "confdefs.h" #include @@ -6237,16 +6364,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6240: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6367: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6243: \$? = $ac_status" >&5 + echo "$as_me:6370: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6246: \"$ac_try\"") >&5 + { (eval echo "$as_me:6373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6249: \$? = $ac_status" >&5 + echo "$as_me:6376: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_wait=yes else @@ -6257,20 +6384,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6260: result: $cf_cv_posix_wait" >&5 +echo "$as_me:6387: result: $cf_cv_posix_wait" >&5 echo "${ECHO_T}$cf_cv_posix_wait" >&6 test "$cf_cv_posix_wait" = yes && cat >>confdefs.h <<\EOF #define USE_POSIX_WAIT 1 EOF -echo "$as_me:6266: checking if external sys_nerr is declared" >&5 +echo "$as_me:6393: checking if external sys_nerr is declared" >&5 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6273 "configure" +#line 6400 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -6288,16 +6415,16 @@ long x = (long) sys_nerr } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6291: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6418: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6294: \$? = $ac_status" >&5 + echo "$as_me:6421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6297: \"$ac_try\"") >&5 + { (eval echo "$as_me:6424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6300: \$? = $ac_status" >&5 + echo "$as_me:6427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else @@ -6308,7 +6435,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6311: result: $cf_cv_dcl_sys_nerr" >&5 +echo "$as_me:6438: result: $cf_cv_dcl_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 if test "$cf_cv_dcl_sys_nerr" = no ; then @@ -6323,14 +6450,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:6326: checking if external sys_nerr exists" >&5 +echo "$as_me:6453: checking if external sys_nerr exists" >&5 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6333 "configure" +#line 6460 "configure" #include "confdefs.h" #undef sys_nerr @@ -6345,16 +6472,16 @@ sys_nerr = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6348: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6351: \$? = $ac_status" >&5 + echo "$as_me:6478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6354: \"$ac_try\"") >&5 + { (eval echo "$as_me:6481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6357: \$? = $ac_status" >&5 + echo "$as_me:6484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else @@ -6365,7 +6492,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6368: result: $cf_cv_have_sys_nerr" >&5 +echo "$as_me:6495: result: $cf_cv_have_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 if test "$cf_cv_have_sys_nerr" = yes ; then @@ -6378,14 +6505,14 @@ EOF fi -echo "$as_me:6381: checking if external sys_errlist is declared" >&5 +echo "$as_me:6508: checking if external sys_errlist is declared" >&5 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6388 "configure" +#line 6515 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -6403,16 +6530,16 @@ long x = (long) sys_errlist } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6406: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6533: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6409: \$? = $ac_status" >&5 + echo "$as_me:6536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6412: \"$ac_try\"") >&5 + { (eval echo "$as_me:6539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6415: \$? = $ac_status" >&5 + echo "$as_me:6542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else @@ -6423,7 +6550,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6426: result: $cf_cv_dcl_sys_errlist" >&5 +echo "$as_me:6553: result: $cf_cv_dcl_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 if test "$cf_cv_dcl_sys_errlist" = no ; then @@ -6438,14 +6565,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:6441: checking if external sys_errlist exists" >&5 +echo "$as_me:6568: checking if external sys_errlist exists" >&5 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6448 "configure" +#line 6575 "configure" #include "confdefs.h" #undef sys_errlist @@ -6460,16 +6587,16 @@ sys_errlist = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6463: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6590: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6466: \$? = $ac_status" >&5 + echo "$as_me:6593: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6469: \"$ac_try\"") >&5 + { (eval echo "$as_me:6596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6472: \$? = $ac_status" >&5 + echo "$as_me:6599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else @@ -6480,7 +6607,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6483: result: $cf_cv_have_sys_errlist" >&5 +echo "$as_me:6610: result: $cf_cv_have_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 if test "$cf_cv_have_sys_errlist" = yes ; then @@ -6500,23 +6627,23 @@ X11/Intrinsic.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6503: checking for $ac_header" >&5 +echo "$as_me:6630: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6509 "configure" +#line 6636 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6513: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6640: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6519: \$? = $ac_status" >&5 + echo "$as_me:6646: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6535,7 +6662,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:6538: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6665: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:6675: checking if we should define SYSV" >&5 echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6 if test "${cf_cv_sysv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6555 "configure" +#line 6682 "configure" #include "confdefs.h" #undef SYSV @@ -6596,16 +6723,16 @@ sys_errlist[0] = ""; /* Cygwin mis-declares this */ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6599: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6602: \$? = $ac_status" >&5 + echo "$as_me:6729: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6605: \"$ac_try\"") >&5 + { (eval echo "$as_me:6732: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6608: \$? = $ac_status" >&5 + echo "$as_me:6735: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sysv=yes else @@ -6616,13 +6743,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6619: result: $cf_cv_sysv" >&5 +echo "$as_me:6746: result: $cf_cv_sysv" >&5 echo "${ECHO_T}$cf_cv_sysv" >&6 test "$cf_cv_sysv" = yes && cat >>confdefs.h <<\EOF #define SYSV 1 EOF -echo "$as_me:6625: checking for elf_begin in -lelf" >&5 +echo "$as_me:6752: checking for elf_begin in -lelf" >&5 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6630,7 +6757,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6633 "configure" +#line 6760 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6649,16 +6776,16 @@ elf_begin (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6779: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6655: \$? = $ac_status" >&5 + echo "$as_me:6782: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6658: \"$ac_try\"") >&5 + { (eval echo "$as_me:6785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6661: \$? = $ac_status" >&5 + echo "$as_me:6788: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_elf_elf_begin=yes else @@ -6669,18 +6796,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6672: result: $ac_cv_lib_elf_elf_begin" >&5 +echo "$as_me:6799: result: $ac_cv_lib_elf_elf_begin" >&5 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6 if test $ac_cv_lib_elf_elf_begin = yes; then -echo "$as_me:6676: checking if this is an SVR4 system" >&5 +echo "$as_me:6803: checking if this is an SVR4 system" >&5 echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6 if test "${cf_cv_svr4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6683 "configure" +#line 6810 "configure" #include "confdefs.h" #include @@ -6706,16 +6833,16 @@ static struct termio d_tio; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6709: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6712: \$? = $ac_status" >&5 + echo "$as_me:6839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6715: \"$ac_try\"") >&5 + { (eval echo "$as_me:6842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6718: \$? = $ac_status" >&5 + echo "$as_me:6845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_svr4=yes else @@ -6726,7 +6853,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6729: result: $cf_cv_svr4" >&5 +echo "$as_me:6856: result: $cf_cv_svr4" >&5 echo "${ECHO_T}$cf_cv_svr4" >&6 fi @@ -6735,7 +6862,7 @@ test "$cf_cv_svr4" = yes && cat >>confdefs.h <<\EOF #define SVR4 1 EOF -echo "$as_me:6738: checking for X" >&5 +echo "$as_me:6865: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -6832,17 +6959,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 6835 "configure" +#line 6962 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6839: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6966: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6845: \$? = $ac_status" >&5 + echo "$as_me:6972: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6875,7 +7002,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6878 "configure" +#line 7005 "configure" #include "confdefs.h" #include int @@ -6887,16 +7014,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6890: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7017: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6893: \$? = $ac_status" >&5 + echo "$as_me:7020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6896: \"$ac_try\"") >&5 + { (eval echo "$as_me:7023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6899: \$? = $ac_status" >&5 + echo "$as_me:7026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -6934,7 +7061,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:6937: result: $have_x" >&5 + echo "$as_me:7064: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -6944,7 +7071,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:6947: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:7074: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -6968,11 +7095,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:6971: checking whether -R must be followed by a space" >&5 + echo "$as_me:7098: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 6975 "configure" +#line 7102 "configure" #include "confdefs.h" int @@ -6984,16 +7111,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7114: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6990: \$? = $ac_status" >&5 + echo "$as_me:7117: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6993: \"$ac_try\"") >&5 + { (eval echo "$as_me:7120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6996: \$? = $ac_status" >&5 + echo "$as_me:7123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -7003,13 +7130,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:7006: result: no" >&5 + echo "$as_me:7133: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 7012 "configure" +#line 7139 "configure" #include "confdefs.h" int @@ -7021,16 +7148,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7024: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7027: \$? = $ac_status" >&5 + echo "$as_me:7154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7030: \"$ac_try\"") >&5 + { (eval echo "$as_me:7157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7033: \$? = $ac_status" >&5 + echo "$as_me:7160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -7040,11 +7167,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:7043: result: yes" >&5 + echo "$as_me:7170: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:7047: result: neither works" >&5 + echo "$as_me:7174: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -7064,7 +7191,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 7067 "configure" +#line 7194 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7083,22 +7210,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7086: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7213: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7089: \$? = $ac_status" >&5 + echo "$as_me:7216: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7092: \"$ac_try\"") >&5 + { (eval echo "$as_me:7219: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7095: \$? = $ac_status" >&5 + echo "$as_me:7222: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:7101: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:7228: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7106,7 +7233,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7109 "configure" +#line 7236 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7125,16 +7252,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7128: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7131: \$? = $ac_status" >&5 + echo "$as_me:7258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7134: \"$ac_try\"") >&5 + { (eval echo "$as_me:7261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7137: \$? = $ac_status" >&5 + echo "$as_me:7264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -7145,14 +7272,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7148: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:7275: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:7155: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:7282: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7160,7 +7287,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7163 "configure" +#line 7290 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7179,16 +7306,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7182: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7309: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7185: \$? = $ac_status" >&5 + echo "$as_me:7312: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7188: \"$ac_try\"") >&5 + { (eval echo "$as_me:7315: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7191: \$? = $ac_status" >&5 + echo "$as_me:7318: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -7199,7 +7326,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7202: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:7329: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -7218,13 +7345,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:7221: checking for gethostbyname" >&5 + echo "$as_me:7348: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7227 "configure" +#line 7354 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -7255,16 +7382,16 @@ f = gethostbyname; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7258: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7261: \$? = $ac_status" >&5 + echo "$as_me:7388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7264: \"$ac_try\"") >&5 + { (eval echo "$as_me:7391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7267: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -7274,11 +7401,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7277: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:7404: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:7281: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:7408: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7286,7 +7413,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7289 "configure" +#line 7416 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7305,16 +7432,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7308: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7435: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7311: \$? = $ac_status" >&5 + echo "$as_me:7438: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7314: \"$ac_try\"") >&5 + { (eval echo "$as_me:7441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7317: \$? = $ac_status" >&5 + echo "$as_me:7444: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -7325,14 +7452,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7328: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:7455: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:7335: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:7462: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7340,7 +7467,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7343 "configure" +#line 7470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7359,16 +7486,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7362: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7365: \$? = $ac_status" >&5 + echo "$as_me:7492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7368: \"$ac_try\"") >&5 + { (eval echo "$as_me:7495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7371: \$? = $ac_status" >&5 + echo "$as_me:7498: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -7379,7 +7506,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7382: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:7509: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -7395,13 +7522,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:7398: checking for connect" >&5 + echo "$as_me:7525: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7404 "configure" +#line 7531 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -7432,16 +7559,16 @@ f = connect; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7435: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7562: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7438: \$? = $ac_status" >&5 + echo "$as_me:7565: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7441: \"$ac_try\"") >&5 + { (eval echo "$as_me:7568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7444: \$? = $ac_status" >&5 + echo "$as_me:7571: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -7451,11 +7578,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7454: result: $ac_cv_func_connect" >&5 +echo "$as_me:7581: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:7458: checking for connect in -lsocket" >&5 + echo "$as_me:7585: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7463,7 +7590,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7466 "configure" +#line 7593 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7482,16 +7609,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7612: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7488: \$? = $ac_status" >&5 + echo "$as_me:7615: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7491: \"$ac_try\"") >&5 + { (eval echo "$as_me:7618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7494: \$? = $ac_status" >&5 + echo "$as_me:7621: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -7502,7 +7629,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7505: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:7632: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -7511,13 +7638,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:7514: checking for remove" >&5 + echo "$as_me:7641: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7520 "configure" +#line 7647 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -7548,16 +7675,16 @@ f = remove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7551: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7678: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7554: \$? = $ac_status" >&5 + echo "$as_me:7681: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7557: \"$ac_try\"") >&5 + { (eval echo "$as_me:7684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7560: \$? = $ac_status" >&5 + echo "$as_me:7687: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -7567,11 +7694,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7570: result: $ac_cv_func_remove" >&5 +echo "$as_me:7697: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:7574: checking for remove in -lposix" >&5 + echo "$as_me:7701: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7579,7 +7706,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7582 "configure" +#line 7709 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7598,16 +7725,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7601: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7728: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7604: \$? = $ac_status" >&5 + echo "$as_me:7731: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7607: \"$ac_try\"") >&5 + { (eval echo "$as_me:7734: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7610: \$? = $ac_status" >&5 + echo "$as_me:7737: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -7618,7 +7745,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7621: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:7748: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -7627,13 +7754,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:7630: checking for shmat" >&5 + echo "$as_me:7757: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7636 "configure" +#line 7763 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -7664,16 +7791,16 @@ f = shmat; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7670: \$? = $ac_status" >&5 + echo "$as_me:7797: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7673: \"$ac_try\"") >&5 + { (eval echo "$as_me:7800: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7676: \$? = $ac_status" >&5 + echo "$as_me:7803: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -7683,11 +7810,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7686: result: $ac_cv_func_shmat" >&5 +echo "$as_me:7813: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:7690: checking for shmat in -lipc" >&5 + echo "$as_me:7817: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7695,7 +7822,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7698 "configure" +#line 7825 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7714,16 +7841,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7717: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7844: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7720: \$? = $ac_status" >&5 + echo "$as_me:7847: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7723: \"$ac_try\"") >&5 + { (eval echo "$as_me:7850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7726: \$? = $ac_status" >&5 + echo "$as_me:7853: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -7734,7 +7861,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7737: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:7864: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -7752,7 +7879,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:7755: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:7882: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7760,7 +7887,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7763 "configure" +#line 7890 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7779,16 +7906,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7782: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7909: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7785: \$? = $ac_status" >&5 + echo "$as_me:7912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7788: \"$ac_try\"") >&5 + { (eval echo "$as_me:7915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7791: \$? = $ac_status" >&5 + echo "$as_me:7918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -7799,7 +7926,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7802: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:7929: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -7893,7 +8020,7 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 7896 "configure" +#line 8023 "configure" #include "confdefs.h" #include int @@ -7905,16 +8032,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7908: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7911: \$? = $ac_status" >&5 + echo "$as_me:8038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7914: \"$ac_try\"") >&5 + { (eval echo "$as_me:8041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7917: \$? = $ac_status" >&5 + echo "$as_me:8044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7931,13 +8058,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7934: checking for XOpenDisplay" >&5 +echo "$as_me:8061: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7940 "configure" +#line 8067 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -7968,16 +8095,16 @@ f = XOpenDisplay; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7971: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8098: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7974: \$? = $ac_status" >&5 + echo "$as_me:8101: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7977: \"$ac_try\"") >&5 + { (eval echo "$as_me:8104: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7980: \$? = $ac_status" >&5 + echo "$as_me:8107: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -7987,13 +8114,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7990: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:8117: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else -echo "$as_me:7996: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:8123: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8001,7 +8128,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8004 "configure" +#line 8131 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8020,16 +8147,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8150: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8026: \$? = $ac_status" >&5 + echo "$as_me:8153: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8029: \"$ac_try\"") >&5 + { (eval echo "$as_me:8156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8032: \$? = $ac_status" >&5 + echo "$as_me:8159: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -8040,7 +8167,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8043: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:8170: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then LIBS="-lX11 $LIBS" @@ -8048,13 +8175,13 @@ fi fi -echo "$as_me:8051: checking for XtAppInitialize" >&5 +echo "$as_me:8178: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8057 "configure" +#line 8184 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -8085,16 +8212,16 @@ f = XtAppInitialize; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8088: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8215: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8091: \$? = $ac_status" >&5 + echo "$as_me:8218: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8094: \"$ac_try\"") >&5 + { (eval echo "$as_me:8221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8097: \$? = $ac_status" >&5 + echo "$as_me:8224: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -8104,13 +8231,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8107: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:8234: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else -echo "$as_me:8113: checking for XtAppInitialize in -lXt" >&5 +echo "$as_me:8240: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8118,7 +8245,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8121 "configure" +#line 8248 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8137,16 +8264,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8143: \$? = $ac_status" >&5 + echo "$as_me:8270: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8146: \"$ac_try\"") >&5 + { (eval echo "$as_me:8273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8149: \$? = $ac_status" >&5 + echo "$as_me:8276: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -8157,7 +8284,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8160: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:8287: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then cat >>confdefs.h <<\EOF @@ -8171,7 +8298,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:8174: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:8301: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -8182,27 +8309,28 @@ fi for ac_header in \ X11/DECkeysym.h \ X11/Sunkeysym.h \ + X11/XF86keysym.h \ X11/Xpoll.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8189: checking for $ac_header" >&5 +echo "$as_me:8317: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8195 "configure" +#line 8323 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8199: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8327: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8205: \$? = $ac_status" >&5 + echo "$as_me:8333: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8221,7 +8349,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8224: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8352: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:8364: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -8244,14 +8372,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:8247: result: yes" >&5 + echo "$as_me:8375: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:8250: result: no" >&5 + echo "$as_me:8378: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:8254: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:8382: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -8262,14 +8390,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:8265: result: yes" >&5 + echo "$as_me:8393: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:8268: result: no" >&5 + echo "$as_me:8396: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:8272: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:8400: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -8280,14 +8408,14 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:8283: result: yes" >&5 + echo "$as_me:8411: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:8286: result: no" >&5 + echo "$as_me:8414: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:8290: checking for XextCreateExtension in -lXext" >&5 +echo "$as_me:8418: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8295,7 +8423,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8298 "configure" +#line 8426 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8314,16 +8442,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8320: \$? = $ac_status" >&5 + echo "$as_me:8448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8323: \"$ac_try\"") >&5 + { (eval echo "$as_me:8451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8326: \$? = $ac_status" >&5 + echo "$as_me:8454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -8334,7 +8462,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8337: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:8465: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then LIBS="-lXext $LIBS" @@ -8356,14 +8484,14 @@ do cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" - echo "$as_me:8359: checking for $cf_test in $cf_path" >&5 + echo "$as_me:8487: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:8362: checking for $cf_test" >&5 + echo "$as_me:8490: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 8366 "configure" +#line 8494 "configure" #include "confdefs.h" #include @@ -8377,16 +8505,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8383: \$? = $ac_status" >&5 + echo "$as_me:8511: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8386: \"$ac_try\"") >&5 + { (eval echo "$as_me:8514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8389: \$? = $ac_status" >&5 + echo "$as_me:8517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8395,7 +8523,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8398: result: $cf_result" >&5 + echo "$as_me:8526: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_include=$cf_path @@ -8407,7 +8535,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_include" ; then - { echo "$as_me:8410: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:8538: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_include" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" @@ -8432,15 +8560,15 @@ do cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo "$as_me:8435: checking for $cf_lib in $cf_path" >&5 + echo "$as_me:8563: checking for $cf_lib in $cf_path" >&5 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 else LIBS="$cf_lib $LIBS" - echo "$as_me:8439: checking for $cf_test in $cf_lib" >&5 + echo "$as_me:8567: checking for $cf_test in $cf_lib" >&5 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 8443 "configure" +#line 8571 "configure" #include "confdefs.h" int @@ -8452,16 +8580,16 @@ $cf_test() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8455: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8583: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8458: \$? = $ac_status" >&5 + echo "$as_me:8586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8461: \"$ac_try\"") >&5 + { (eval echo "$as_me:8589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8464: \$? = $ac_status" >&5 + echo "$as_me:8592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8470,7 +8598,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:8473: result: $cf_result" >&5 + echo "$as_me:8601: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" @@ -8482,7 +8610,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:8485: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:8613: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -8493,14 +8621,14 @@ cat >>confdefs.h <&5 +echo "$as_me:8624: checking for declaration of fd_set" >&5 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 if test "${cf_cv_type_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else echo "trying sys/types alone" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8503 "configure" +#line 8631 "configure" #include "confdefs.h" #include @@ -8513,16 +8641,16 @@ fd_set x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8644: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8519: \$? = $ac_status" >&5 + echo "$as_me:8647: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8522: \"$ac_try\"") >&5 + { (eval echo "$as_me:8650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8525: \$? = $ac_status" >&5 + echo "$as_me:8653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/types.h else @@ -8530,7 +8658,7 @@ else cat conftest.$ac_ext >&5 echo "trying X11/Xpoll.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8533 "configure" +#line 8661 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H @@ -8545,16 +8673,16 @@ fd_set x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8676: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8551: \$? = $ac_status" >&5 + echo "$as_me:8679: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8554: \"$ac_try\"") >&5 + { (eval echo "$as_me:8682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8557: \$? = $ac_status" >&5 + echo "$as_me:8685: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else @@ -8562,7 +8690,7 @@ else cat conftest.$ac_ext >&5 echo "trying sys/select.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8565 "configure" +#line 8693 "configure" #include "confdefs.h" #include @@ -8576,16 +8704,16 @@ fd_set x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8707: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8582: \$? = $ac_status" >&5 + echo "$as_me:8710: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8585: \"$ac_try\"") >&5 + { (eval echo "$as_me:8713: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8588: \$? = $ac_status" >&5 + echo "$as_me:8716: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/select.h else @@ -8599,7 +8727,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8602: result: $cf_cv_type_fd_set" >&5 +echo "$as_me:8730: result: $cf_cv_type_fd_set" >&5 echo "${ECHO_T}$cf_cv_type_fd_set" >&6 if test $cf_cv_type_fd_set = sys/select.h ; then cat >>confdefs.h <<\EOF @@ -8608,14 +8736,14 @@ EOF fi -echo "$as_me:8611: checking for IRIX 6.5 baud-rate redefinitions" >&5 +echo "$as_me:8739: checking for IRIX 6.5 baud-rate redefinitions" >&5 echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6 if test "${cf_cv_termio_c_ispeed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8618 "configure" +#line 8746 "configure" #include "confdefs.h" #include @@ -8633,16 +8761,16 @@ foo.c_ospeed = B9600; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8764: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8639: \$? = $ac_status" >&5 + echo "$as_me:8767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8642: \"$ac_try\"") >&5 + { (eval echo "$as_me:8770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8645: \$? = $ac_status" >&5 + echo "$as_me:8773: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termio_c_ispeed=yes @@ -8654,7 +8782,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8657: result: $cf_cv_termio_c_ispeed" >&5 +echo "$as_me:8785: result: $cf_cv_termio_c_ispeed" >&5 echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6 test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF #define HAVE_TERMIO_C_ISPEED 1 @@ -8667,7 +8795,7 @@ LIBS="$LIBS $X_EXTRA_LIBS" case $host_os in #(vi freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. -echo "$as_me:8670: checking for openpty in -lutil" >&5 +echo "$as_me:8798: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8675,7 +8803,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8678 "configure" +#line 8806 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8694,16 +8822,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8697: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8825: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8700: \$? = $ac_status" >&5 + echo "$as_me:8828: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8703: \"$ac_try\"") >&5 + { (eval echo "$as_me:8831: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8706: \$? = $ac_status" >&5 + echo "$as_me:8834: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -8714,7 +8842,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8717: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:8845: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test $ac_cv_lib_util_openpty = yes; then cat >>confdefs.h <&5 +echo "$as_me:8862: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8740 "configure" +#line 8868 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -8768,16 +8896,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8771: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8899: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8774: \$? = $ac_status" >&5 + echo "$as_me:8902: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8777: \"$ac_try\"") >&5 + { (eval echo "$as_me:8905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8780: \$? = $ac_status" >&5 + echo "$as_me:8908: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8787,7 +8915,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8790: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:8918: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:8927: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8804,7 +8932,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8807 "configure" +#line 8935 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8823,16 +8951,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8826: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8954: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8829: \$? = $ac_status" >&5 + echo "$as_me:8957: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8832: \"$ac_try\"") >&5 + { (eval echo "$as_me:8960: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8835: \$? = $ac_status" >&5 + echo "$as_me:8963: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -8843,7 +8971,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8846: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:8974: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test $ac_cv_lib_util_openpty = yes; then cat >>confdefs.h <&5 +echo "$as_me:8991: checking for XKB Bell extension" >&5 echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6 if test "${cf_cv_xkb_bell_ext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8870 "configure" +#line 8998 "configure" #include "confdefs.h" #include /* has the prototype */ @@ -8888,16 +9016,16 @@ int x = XkbBI_Info } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9019: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8894: \$? = $ac_status" >&5 + echo "$as_me:9022: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8897: \"$ac_try\"") >&5 + { (eval echo "$as_me:9025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8900: \$? = $ac_status" >&5 + echo "$as_me:9028: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xkb_bell_ext=yes else @@ -8908,7 +9036,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8911: result: $cf_cv_xkb_bell_ext" >&5 +echo "$as_me:9039: result: $cf_cv_xkb_bell_ext" >&5 echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6 test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF @@ -8918,13 +9046,13 @@ EOF for ac_func in Xutf8LookupString do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8921: checking for $ac_func" >&5 +echo "$as_me:9049: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8927 "configure" +#line 9055 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -8955,16 +9083,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8958: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8961: \$? = $ac_status" >&5 + echo "$as_me:9089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8964: \"$ac_try\"") >&5 + { (eval echo "$as_me:9092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8967: \$? = $ac_status" >&5 + echo "$as_me:9095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8974,7 +9102,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8977: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:9105: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:9121: checking if you want narrow prototypes for X libraries" >&5 echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6 case `$ac_config_guess` in #(vi @@ -9016,10 +9144,10 @@ else enable_narrowproto=$cf_default_narrowproto fi; -echo "$as_me:9019: result: $enable_narrowproto" >&5 +echo "$as_me:9147: result: $enable_narrowproto" >&5 echo "${ECHO_T}$enable_narrowproto" >&6 -echo "$as_me:9022: checking if we should use imake to help" >&5 +echo "$as_me:9150: checking if we should use imake to help" >&5 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6 # Check whether --enable-imake or --disable-imake was given. @@ -9036,7 +9164,7 @@ else enable_imake=yes fi; -echo "$as_me:9039: result: $enable_imake" >&5 +echo "$as_me:9167: result: $enable_imake" >&5 echo "${ECHO_T}$enable_imake" >&6 if test "$enable_imake" = yes ; then @@ -9045,7 +9173,7 @@ for ac_prog in xmkmf imake do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9048: checking for $ac_word" >&5 +echo "$as_me:9176: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_IMAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9062,7 +9190,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_IMAKE="$ac_dir/$ac_word" - echo "$as_me:9065: found $ac_dir/$ac_word" >&5 + echo "$as_me:9193: found $ac_dir/$ac_word" >&5 break fi done @@ -9073,10 +9201,10 @@ fi IMAKE=$ac_cv_path_IMAKE if test -n "$IMAKE"; then - echo "$as_me:9076: result: $IMAKE" >&5 + echo "$as_me:9204: result: $IMAKE" >&5 echo "${ECHO_T}$IMAKE" >&6 else - echo "$as_me:9079: result: no" >&5 + echo "$as_me:9207: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9107,11 +9235,14 @@ if mkdir conftestdir; then cat >fix_cflags.sed <<'CF_EOF' s/\\//g +s/[ ][ ]*/ /g s/"//g -s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\([ ][ ]*[^- ][^ ]*\)*\)/\1='\\"\2\\"'/g -s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\)[ ]/\1='\\"\2\\"' /g -s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\)$/\1='\\"\2\\"'/g -s/^IMAKE[ ]*/IMAKE_CFLAGS="/ +:pack +s/\(=[^ ][^ ]*\) \([^-]\)/\1 \2/g +t pack +s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\'0-9 ][^ ]*\)/\1='\\"\2\\"'/g +s/^IMAKE[ ]/IMAKE_CFLAGS="/ +s/ / /g s/$/"/ CF_EOF @@ -9149,7 +9280,7 @@ CF_EOF esac done if test -z "$cf_config" ; then - { echo "$as_me:9152: WARNING: Could not find imake config-directory" >&5 + { echo "$as_me:9283: WARNING: Could not find imake config-directory" >&5 echo "$as_me: WARNING: Could not find imake config-directory" >&2;} else cf_imake_opts="$cf_imake_opts -I$cf_config" @@ -9158,7 +9289,7 @@ echo "$as_me: WARNING: Could not find imake config-directory" >&2;} test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 else - { echo "$as_me:9161: WARNING: Cannot run $IMAKE" >&5 + { echo "$as_me:9292: WARNING: Cannot run $IMAKE" >&5 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} fi fi @@ -9414,7 +9545,7 @@ fi fi -echo "$as_me:9417: checking for default terminal-id" >&5 +echo "$as_me:9548: checking for default terminal-id" >&5 echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6 # Check whether --with-terminal-id or --without-terminal-id was given. @@ -9424,7 +9555,7 @@ if test "${with_terminal_id+set}" = set; then else default_termid=vt100 fi; -echo "$as_me:9427: result: $default_termid" >&5 +echo "$as_me:9558: result: $default_termid" >&5 echo "${ECHO_T}$default_termid" >&6 case $default_termid in vt*) default_termid=`echo $default_termid | sed -e 's/^..//'` @@ -9434,7 +9565,7 @@ cat >>confdefs.h <&5 +echo "$as_me:9568: checking for default terminal-type" >&5 echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6 # Check whether --with-terminal-type or --without-terminal-type was given. @@ -9444,13 +9575,13 @@ if test "${with_terminal_type+set}" = set; then else default_TERM=xterm fi; -echo "$as_me:9447: result: $default_TERM" >&5 +echo "$as_me:9578: result: $default_TERM" >&5 echo "${ECHO_T}$default_TERM" >&6 cat >>confdefs.h <&5 +echo "$as_me:9584: checking for private terminfo-directory" >&5 echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6 # Check whether --with-own-terminfo or --without-own-terminfo was given. @@ -9460,10 +9591,10 @@ if test "${with_own_terminfo+set}" = set; then else TERMINFO_DIR=${TERMINFO-none} fi; -echo "$as_me:9463: result: $TERMINFO_DIR" >&5 +echo "$as_me:9594: result: $TERMINFO_DIR" >&5 echo "${ECHO_T}$TERMINFO_DIR" >&6 if test "$TERMINFO_DIR" = yes ; then - { echo "$as_me:9466: WARNING: no value given" >&5 + { echo "$as_me:9597: WARNING: no value given" >&5 echo "$as_me: WARNING: no value given" >&2;} elif test "$TERMINFO_DIR" != none ; then if test -d $TERMINFO_DIR ; then @@ -9472,7 +9603,7 @@ elif test "$TERMINFO_DIR" != none ; then EOF else - { echo "$as_me:9475: WARNING: not a directory" >&5 + { echo "$as_me:9606: WARNING: not a directory" >&5 echo "$as_me: WARNING: not a directory" >&2;} fi elif test "$prefix" != NONE ; then @@ -9490,7 +9621,7 @@ fi ############################################################################### -echo "$as_me:9493: checking if you want active-icons" >&5 +echo "$as_me:9624: checking if you want active-icons" >&5 echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6 # Check whether --enable-active-icon or --disable-active-icon was given. @@ -9507,7 +9638,7 @@ else enable_active_icon=yes fi; -echo "$as_me:9510: result: $enable_active_icon" >&5 +echo "$as_me:9641: result: $enable_active_icon" >&5 echo "${ECHO_T}$enable_active_icon" >&6 if test "$enable_active_icon" = no ; then cat >>confdefs.h <<\EOF @@ -9516,7 +9647,7 @@ EOF fi -echo "$as_me:9519: checking if you want ANSI color" >&5 +echo "$as_me:9650: checking if you want ANSI color" >&5 echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6 # Check whether --enable-ansi-color or --disable-ansi-color was given. @@ -9533,7 +9664,7 @@ else enable_ansi_color=yes fi; -echo "$as_me:9536: result: $enable_ansi_color" >&5 +echo "$as_me:9667: result: $enable_ansi_color" >&5 echo "${ECHO_T}$enable_ansi_color" >&6 test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF #define OPT_ISO_COLORS 0 @@ -9541,7 +9672,7 @@ EOF if test "$enable_ansi_color" = yes ; then - echo "$as_me:9544: checking if you want 16 colors like aixterm" >&5 + echo "$as_me:9675: checking if you want 16 colors like aixterm" >&5 echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6 # Check whether --enable-16-color or --disable-16-color was given. @@ -9558,13 +9689,13 @@ else enable_16_color=yes fi; - echo "$as_me:9561: result: $enable_16_color" >&5 + echo "$as_me:9692: result: $enable_16_color" >&5 echo "${ECHO_T}$enable_16_color" >&6 test "$enable_16_color" = no && cat >>confdefs.h <<\EOF #define OPT_AIX_COLORS 0 EOF - echo "$as_me:9567: checking if you want 256 colors" >&5 + echo "$as_me:9698: checking if you want 256 colors" >&5 echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6 # Check whether --enable-256-color or --disable-256-color was given. @@ -9581,7 +9712,7 @@ else enable_256_color=no fi; - echo "$as_me:9584: result: $enable_256_color" >&5 + echo "$as_me:9715: result: $enable_256_color" >&5 echo "${ECHO_T}$enable_256_color" >&6 if test "$enable_256_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h" @@ -9591,7 +9722,7 @@ echo "${ECHO_T}$enable_256_color" >&6 EOF else - echo "$as_me:9594: checking if you want 88 colors" >&5 + echo "$as_me:9725: checking if you want 88 colors" >&5 echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6 # Check whether --enable-88-color or --disable-88-color was given. @@ -9608,7 +9739,7 @@ else enable_88_color=no fi; - echo "$as_me:9611: result: $enable_88_color" >&5 + echo "$as_me:9742: result: $enable_88_color" >&5 echo "${ECHO_T}$enable_88_color" >&6 if test "$enable_88_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h" @@ -9622,7 +9753,7 @@ EOF fi -echo "$as_me:9625: checking if you want blinking cursor" >&5 +echo "$as_me:9756: checking if you want blinking cursor" >&5 echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6 # Check whether --enable-blink-cursor or --disable-blink-cursor was given. @@ -9639,13 +9770,13 @@ else enable_blink_curs=yes fi; -echo "$as_me:9642: result: $enable_blink_curs" >&5 +echo "$as_me:9773: result: $enable_blink_curs" >&5 echo "${ECHO_T}$enable_blink_curs" >&6 test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF #define OPT_BLINK_CURS 0 EOF -echo "$as_me:9648: checking if you want to ignore Linux's broken palette-strings" >&5 +echo "$as_me:9779: checking if you want to ignore Linux's broken palette-strings" >&5 echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6 case $host_os in #(vi @@ -9669,7 +9800,7 @@ else enable_broken_osc=$enableval fi; -echo "$as_me:9672: result: $enable_broken_osc" >&5 +echo "$as_me:9803: result: $enable_broken_osc" >&5 echo "${ECHO_T}$enable_broken_osc" >&6 if test "$enable_broken_osc" = yes ; then cat >>confdefs.h <<\EOF @@ -9683,7 +9814,7 @@ EOF fi -echo "$as_me:9686: checking if you want to allow broken string-terminators" >&5 +echo "$as_me:9817: checking if you want to allow broken string-terminators" >&5 echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6 # Check whether --enable-broken-st or --disable-broken-st was given. @@ -9700,13 +9831,13 @@ else enable_broken_st=no fi; -echo "$as_me:9703: result: $enable_broken_st" >&5 +echo "$as_me:9834: result: $enable_broken_st" >&5 echo "${ECHO_T}$enable_broken_st" >&6 test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF #define OPT_BROKEN_ST 0 EOF -echo "$as_me:9709: checking if you want printable 128-159" >&5 +echo "$as_me:9840: checking if you want printable 128-159" >&5 echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6 # Check whether --enable-c1-print or --disable-c1-print was given. @@ -9723,7 +9854,7 @@ else enable_c1_print=yes fi; -echo "$as_me:9726: result: $enable_c1_print" >&5 +echo "$as_me:9857: result: $enable_c1_print" >&5 echo "${ECHO_T}$enable_c1_print" >&6 test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF #define OPT_C1_PRINT 0 @@ -9731,7 +9862,7 @@ EOF if test "$enable_ansi_color" = yes ; then - echo "$as_me:9734: checking if you want bold colors mapped like IBM PC" >&5 + echo "$as_me:9865: checking if you want bold colors mapped like IBM PC" >&5 echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6 # Check whether --enable-bold-color or --disable-bold-color was given. @@ -9748,13 +9879,13 @@ else enable_pc_color=yes fi; - echo "$as_me:9751: result: $enable_pc_color" >&5 + echo "$as_me:9882: result: $enable_pc_color" >&5 echo "${ECHO_T}$enable_pc_color" >&6 test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF #define OPT_PC_COLORS 0 EOF - echo "$as_me:9757: checking if you want separate color-classes" >&5 + echo "$as_me:9888: checking if you want separate color-classes" >&5 echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6 # Check whether --enable-color-class or --disable-color-class was given. @@ -9771,13 +9902,13 @@ else enable_color_class=yes fi; - echo "$as_me:9774: result: $enable_color_class" >&5 + echo "$as_me:9905: result: $enable_color_class" >&5 echo "${ECHO_T}$enable_color_class" >&6 test "$enable_color_class" = no && cat >>confdefs.h <<\EOF #define OPT_COLOR_CLASS FALSE EOF - echo "$as_me:9780: checking if you want color-mode enabled by default" >&5 + echo "$as_me:9911: checking if you want color-mode enabled by default" >&5 echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6 # Check whether --enable-color-mode or --disable-color-mode was given. @@ -9794,7 +9925,7 @@ else default_colormode=yes fi; - echo "$as_me:9797: result: $default_colormode" >&5 + echo "$as_me:9928: result: $default_colormode" >&5 echo "${ECHO_T}$default_colormode" >&6 test "$default_colormode" = no && cat >>confdefs.h <<\EOF #define DFT_COLORMODE FALSE @@ -9802,7 +9933,7 @@ EOF fi -echo "$as_me:9805: checking if you want support for color highlighting" >&5 +echo "$as_me:9936: checking if you want support for color highlighting" >&5 echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6 # Check whether --enable-highlighting or --disable-highlighting was given. @@ -9819,13 +9950,13 @@ else default_highlight=yes fi; -echo "$as_me:9822: result: $default_highlight" >&5 +echo "$as_me:9953: result: $default_highlight" >&5 echo "${ECHO_T}$default_highlight" >&6 test "$default_highlight" = no && cat >>confdefs.h <<\EOF #define OPT_HIGHLIGHT_COLOR 0 EOF -echo "$as_me:9828: checking if you want support for doublesize characters" >&5 +echo "$as_me:9959: checking if you want support for doublesize characters" >&5 echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6 # Check whether --enable-doublechars or --disable-doublechars was given. @@ -9842,13 +9973,13 @@ else enable_doublechars=yes fi; -echo "$as_me:9845: result: $enable_doublechars" >&5 +echo "$as_me:9976: result: $enable_doublechars" >&5 echo "${ECHO_T}$enable_doublechars" >&6 test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF #define OPT_DEC_CHRSET 0 EOF -echo "$as_me:9851: checking if you want fallback-support for box characters" >&5 +echo "$as_me:9982: checking if you want fallback-support for box characters" >&5 echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6 # Check whether --enable-boxchars or --disable-boxchars was given. @@ -9865,13 +9996,13 @@ else enable_boxchars=yes fi; -echo "$as_me:9868: result: $enable_boxchars" >&5 +echo "$as_me:9999: result: $enable_boxchars" >&5 echo "${ECHO_T}$enable_boxchars" >&6 test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF #define OPT_BOX_CHARS 0 EOF -echo "$as_me:9874: checking if you want to allow spawning new xterms" >&5 +echo "$as_me:10005: checking if you want to allow spawning new xterms" >&5 echo $ECHO_N "checking if you want to allow spawning new xterms... $ECHO_C" >&6 # Check whether --enable-exec-xterm or --disable-exec-xterm was given. @@ -9888,11 +10019,11 @@ else enable_exec_xterm=no fi; -echo "$as_me:9891: result: $enable_exec_xterm" >&5 +echo "$as_me:10022: result: $enable_exec_xterm" >&5 echo "${ECHO_T}$enable_exec_xterm" >&6 if test "$enable_exec_xterm" = yes ; then -echo "$as_me:9895: checking for proc tree with cwd-support" >&5 +echo "$as_me:10026: checking for proc tree with cwd-support" >&5 echo $ECHO_N "checking for proc tree with cwd-support... $ECHO_C" >&6 if test "${cf_cv_procfs_cwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9911,11 +10042,11 @@ do done fi -echo "$as_me:9914: result: $cf_cv_procfs_cwd" >&5 +echo "$as_me:10045: result: $cf_cv_procfs_cwd" >&5 echo "${ECHO_T}$cf_cv_procfs_cwd" >&6 if test "$cf_cv_procfs_cwd" = no ; then - { echo "$as_me:9918: WARNING: no suitable proc filesystem found" >&5 + { echo "$as_me:10049: WARNING: no suitable proc filesystem found" >&5 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;} else cat >>confdefs.h <&5 +echo "$as_me:10063: checking if you want to use FreeType library" >&5 echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6 # Check whether --enable-freetype or --disable-freetype was given. @@ -9946,7 +10077,7 @@ else enable_freetype=yes fi; -echo "$as_me:9949: result: $enable_freetype" >&5 +echo "$as_me:10080: result: $enable_freetype" >&5 echo "${ECHO_T}$enable_freetype" >&6 if test "$enable_freetype" = yes ; then @@ -9954,7 +10085,7 @@ cf_extra_freetype_libs= FREETYPE_CONFIG= FREETYPE_PARAMS= -echo "$as_me:9957: checking if you specified -D/-I options for FreeType" >&5 +echo "$as_me:10088: checking if you specified -D/-I options for FreeType" >&5 echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-cflags or --without-freetype-cflags was given. @@ -9964,10 +10095,10 @@ if test "${with_freetype_cflags+set}" = set; then else cf_cv_x_freetype_incs=no fi; -echo "$as_me:9967: result: $cf_cv_x_freetype_incs" >&5 +echo "$as_me:10098: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 -echo "$as_me:9970: checking if you specified -L/-l options for FreeType" >&5 +echo "$as_me:10101: checking if you specified -L/-l options for FreeType" >&5 echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-libs or --without-freetype-libs was given. @@ -9977,12 +10108,12 @@ if test "${with_freetype_libs+set}" = set; then else cf_cv_x_freetype_libs=no fi; -echo "$as_me:9980: result: $cf_cv_x_freetype_libs" >&5 +echo "$as_me:10111: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:9985: checking for $ac_word" >&5 +echo "$as_me:10116: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9999,7 +10130,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10002: found $ac_dir/$ac_word" >&5 + echo "$as_me:10133: found $ac_dir/$ac_word" >&5 break fi done @@ -10011,10 +10142,10 @@ fi FREETYPE_PKG_CONFIG=$ac_cv_path_FREETYPE_PKG_CONFIG if test -n "$FREETYPE_PKG_CONFIG"; then - echo "$as_me:10014: result: $FREETYPE_PKG_CONFIG" >&5 + echo "$as_me:10145: result: $FREETYPE_PKG_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_PKG_CONFIG" >&6 else - echo "$as_me:10017: result: no" >&5 + echo "$as_me:10148: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10024,7 +10155,7 @@ if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; t else # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 -echo "$as_me:10027: checking for $ac_word" >&5 +echo "$as_me:10158: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10041,7 +10172,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10044: found $ac_dir/$ac_word" >&5 + echo "$as_me:10175: found $ac_dir/$ac_word" >&5 break fi done @@ -10053,10 +10184,10 @@ fi FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG if test -n "$FREETYPE_XFT_CONFIG"; then - echo "$as_me:10056: result: $FREETYPE_XFT_CONFIG" >&5 + echo "$as_me:10187: result: $FREETYPE_XFT_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6 else - echo "$as_me:10059: result: no" >&5 + echo "$as_me:10190: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10066,7 +10197,7 @@ fi cf_extra_freetype_libs="-lXft" # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 -echo "$as_me:10069: checking for $ac_word" >&5 +echo "$as_me:10200: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10083,7 +10214,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10086: found $ac_dir/$ac_word" >&5 + echo "$as_me:10217: found $ac_dir/$ac_word" >&5 break fi done @@ -10095,10 +10226,10 @@ fi FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG if test -n "$FREETYPE_OLD_CONFIG"; then - echo "$as_me:10098: result: $FREETYPE_OLD_CONFIG" >&5 + echo "$as_me:10229: result: $FREETYPE_OLD_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6 else - echo "$as_me:10101: result: no" >&5 + echo "$as_me:10232: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10111,18 +10242,18 @@ fi if test -n "$FREETYPE_CONFIG" ; then if test "$cf_cv_x_freetype_incs" = no ; then -echo "$as_me:10114: checking for $FREETYPE_CONFIG cflags" >&5 +echo "$as_me:10245: checking for $FREETYPE_CONFIG cflags" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG cflags... $ECHO_C" >&6 cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" -echo "$as_me:10117: result: $cf_cv_x_freetype_incs" >&5 +echo "$as_me:10248: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 fi if test "$cf_cv_x_freetype_libs" = no ; then -echo "$as_me:10122: checking for $FREETYPE_CONFIG libs" >&5 +echo "$as_me:10253: checking for $FREETYPE_CONFIG libs" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG libs... $ECHO_C" >&6 cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" -echo "$as_me:10125: result: $cf_cv_x_freetype_libs" >&5 +echo "$as_me:10256: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 fi @@ -10136,7 +10267,7 @@ if test "$cf_cv_x_freetype_libs" = no ; then cf_cv_x_freetype_libs=-lXft fi -echo "$as_me:10139: checking if we can link with FreeType libraries" >&5 +echo "$as_me:10270: checking if we can link with FreeType libraries" >&5 echo $ECHO_N "checking if we can link with FreeType libraries... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -10146,7 +10277,7 @@ LIBS="$cf_cv_x_freetype_libs $LIBS" CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 10149 "configure" +#line 10280 "configure" #include "confdefs.h" #include @@ -10162,16 +10293,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10165: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10168: \$? = $ac_status" >&5 + echo "$as_me:10299: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10171: \"$ac_try\"") >&5 + { (eval echo "$as_me:10302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10174: \$? = $ac_status" >&5 + echo "$as_me:10305: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_found_freetype=yes else @@ -10180,7 +10311,7 @@ cat conftest.$ac_ext >&5 cf_cv_found_freetype=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:10183: result: $cf_cv_found_freetype" >&5 +echo "$as_me:10314: result: $cf_cv_found_freetype" >&5 echo "${ECHO_T}$cf_cv_found_freetype" >&6 LIBS="$cf_save_LIBS" @@ -10268,13 +10399,13 @@ for ac_func in \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10271: checking for $ac_func" >&5 +echo "$as_me:10402: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10277 "configure" +#line 10408 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -10305,16 +10436,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10308: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10311: \$? = $ac_status" >&5 + echo "$as_me:10442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10314: \"$ac_try\"") >&5 + { (eval echo "$as_me:10445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10317: \$? = $ac_status" >&5 + echo "$as_me:10448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -10324,7 +10455,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10327: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:10458: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + { echo "$as_me:10469: WARNING: No libraries found for FreeType" >&5 echo "$as_me: WARNING: No libraries found for FreeType" >&2;} CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi @@ -10346,7 +10477,7 @@ else CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi -echo "$as_me:10349: checking if you want support for HP-style function keys" >&5 +echo "$as_me:10480: checking if you want support for HP-style function keys" >&5 echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given. @@ -10363,7 +10494,7 @@ else enable_hp_fkeys=no fi; -echo "$as_me:10366: result: $enable_hp_fkeys" >&5 +echo "$as_me:10497: result: $enable_hp_fkeys" >&5 echo "${ECHO_T}$enable_hp_fkeys" >&6 if test "$enable_hp_fkeys" = yes ; then cat >>confdefs.h <<\EOF @@ -10372,7 +10503,7 @@ EOF fi -echo "$as_me:10375: checking if you want support for SCO-style function keys" >&5 +echo "$as_me:10506: checking if you want support for SCO-style function keys" >&5 echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given. @@ -10389,7 +10520,7 @@ else enable_sco_fkeys=no fi; -echo "$as_me:10392: result: $enable_sco_fkeys" >&5 +echo "$as_me:10523: result: $enable_sco_fkeys" >&5 echo "${ECHO_T}$enable_sco_fkeys" >&6 if test "$enable_sco_fkeys" = yes ; then cat >>confdefs.h <<\EOF @@ -10398,7 +10529,7 @@ EOF fi -echo "$as_me:10401: checking if you want support for Sun-style function keys" >&5 +echo "$as_me:10532: checking if you want support for Sun-style function keys" >&5 echo $ECHO_N "checking if you want support for Sun-style function keys... $ECHO_C" >&6 # Check whether --enable-sun-fkeys or --disable-sun-fkeys was given. @@ -10415,7 +10546,7 @@ else enable_sun_fkeys=yes fi; -echo "$as_me:10418: result: $enable_sun_fkeys" >&5 +echo "$as_me:10549: result: $enable_sun_fkeys" >&5 echo "${ECHO_T}$enable_sun_fkeys" >&6 if test "$enable_sun_fkeys" = no ; then cat >>confdefs.h <<\EOF @@ -10424,7 +10555,7 @@ EOF fi -echo "$as_me:10427: checking if you want support for internationalization" >&5 +echo "$as_me:10558: checking if you want support for internationalization" >&5 echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6 # Check whether --enable-i18n or --disable-i18n was given. @@ -10441,7 +10572,7 @@ else enable_i18n=yes fi; -echo "$as_me:10444: result: $enable_i18n" >&5 +echo "$as_me:10575: result: $enable_i18n" >&5 echo "${ECHO_T}$enable_i18n" >&6 if test "$enable_i18n" = no ; then cat >>confdefs.h <<\EOF @@ -10450,7 +10581,7 @@ EOF fi -echo "$as_me:10453: checking if you want support for initial-erase setup" >&5 +echo "$as_me:10584: checking if you want support for initial-erase setup" >&5 echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6 # Check whether --enable-initial-erase or --disable-initial-erase was given. @@ -10467,7 +10598,7 @@ else enable_ie=yes fi; -echo "$as_me:10470: result: $enable_ie" >&5 +echo "$as_me:10601: result: $enable_ie" >&5 echo "${ECHO_T}$enable_ie" >&6 if test "$enable_ie" = no ; then cat >>confdefs.h <<\EOF @@ -10476,7 +10607,7 @@ EOF fi -echo "$as_me:10479: checking if you want support for input-method" >&5 +echo "$as_me:10610: checking if you want support for input-method" >&5 echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6 # Check whether --enable-input-method or --disable-input-method was given. @@ -10493,17 +10624,17 @@ else enable_ximp=yes fi; -echo "$as_me:10496: result: $enable_ximp" >&5 +echo "$as_me:10627: result: $enable_ximp" >&5 echo "${ECHO_T}$enable_ximp" >&6 -echo "$as_me:10499: checking if X libraries support input-method" >&5 +echo "$as_me:10630: checking if X libraries support input-method" >&5 echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6 if test "${cf_cv_input_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10506 "configure" +#line 10637 "configure" #include "confdefs.h" #include @@ -10535,16 +10666,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10538: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10669: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10541: \$? = $ac_status" >&5 + echo "$as_me:10672: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10544: \"$ac_try\"") >&5 + { (eval echo "$as_me:10675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10547: \$? = $ac_status" >&5 + echo "$as_me:10678: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_input_method=yes else @@ -10554,7 +10685,7 @@ cf_cv_input_method=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10557: result: $cf_cv_input_method" >&5 +echo "$as_me:10688: result: $cf_cv_input_method" >&5 echo "${ECHO_T}$cf_cv_input_method" >&6 test "$cf_cv_input_method" = no && enable_ximp=no @@ -10565,7 +10696,7 @@ EOF fi -echo "$as_me:10568: checking if you want support for load-vt-fonts" >&5 +echo "$as_me:10699: checking if you want support for load-vt-fonts" >&5 echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6 # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given. @@ -10582,7 +10713,7 @@ else enable_load_vt_fonts=no fi; -echo "$as_me:10585: result: $enable_load_vt_fonts" >&5 +echo "$as_me:10716: result: $enable_load_vt_fonts" >&5 echo "${ECHO_T}$enable_load_vt_fonts" >&6 if test "$enable_load_vt_fonts" = yes ; then cat >>confdefs.h <<\EOF @@ -10591,7 +10722,7 @@ EOF fi -echo "$as_me:10594: checking if you want support for logging" >&5 +echo "$as_me:10725: checking if you want support for logging" >&5 echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6 # Check whether --enable-logging or --disable-logging was given. @@ -10608,14 +10739,14 @@ else enable_logging=no fi; -echo "$as_me:10611: result: $enable_logging" >&5 +echo "$as_me:10742: result: $enable_logging" >&5 echo "${ECHO_T}$enable_logging" >&6 if test "$enable_logging" = yes ; then cat >>confdefs.h <<\EOF #define ALLOWLOGGING 1 EOF - echo "$as_me:10618: checking if you want to allow logging via a pipe" >&5 + echo "$as_me:10749: checking if you want to allow logging via a pipe" >&5 echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6 # Check whether --enable-logfile-exec or --disable-logfile-exec was given. @@ -10632,7 +10763,7 @@ else enable_log_exec=no fi; - echo "$as_me:10635: result: $enable_log_exec" >&5 + echo "$as_me:10766: result: $enable_log_exec" >&5 echo "${ECHO_T}$enable_log_exec" >&6 if test "$enable_log_exec" = yes ; then cat >>confdefs.h <<\EOF @@ -10642,7 +10773,7 @@ EOF fi fi -echo "$as_me:10645: checking if you want support for iconify/maximize translations" >&5 +echo "$as_me:10776: checking if you want support for iconify/maximize translations" >&5 echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6 # Check whether --enable-maximize or --disable-maximize was given. @@ -10659,13 +10790,13 @@ else enable_maximize=yes fi; -echo "$as_me:10662: result: $enable_maximize" >&5 +echo "$as_me:10793: result: $enable_maximize" >&5 echo "${ECHO_T}$enable_maximize" >&6 test "$enable_maximize" = no && cat >>confdefs.h <<\EOF #define OPT_MAXIMIZE 0 EOF -echo "$as_me:10668: checking if you want NumLock to override keyboard tables" >&5 +echo "$as_me:10799: checking if you want NumLock to override keyboard tables" >&5 echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6 # Check whether --enable-num-lock or --disable-num-lock was given. @@ -10682,13 +10813,13 @@ else enable_numlock=yes fi; -echo "$as_me:10685: result: $enable_numlock" >&5 +echo "$as_me:10816: result: $enable_numlock" >&5 echo "${ECHO_T}$enable_numlock" >&6 test "$enable_numlock" = no && cat >>confdefs.h <<\EOF #define OPT_NUM_LOCK 0 EOF -echo "$as_me:10691: checking if you want support for get/set of base64 selection data" >&5 +echo "$as_me:10822: checking if you want support for get/set of base64 selection data" >&5 echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6 # Check whether --enable-paste64 or --disable-paste64 was given. @@ -10705,7 +10836,7 @@ else enable_paste64=no fi; -echo "$as_me:10708: result: $enable_paste64" >&5 +echo "$as_me:10839: result: $enable_paste64" >&5 echo "${ECHO_T}$enable_paste64" >&6 if test "$enable_paste64" = yes ; then cat >>confdefs.h <<\EOF @@ -10719,7 +10850,7 @@ EOF fi -echo "$as_me:10722: checking if you want support for pty-handshaking" >&5 +echo "$as_me:10853: checking if you want support for pty-handshaking" >&5 echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6 # Check whether --enable-pty-handshake or --disable-pty-handshake was given. @@ -10736,7 +10867,7 @@ else enable_pty_handshake=yes fi; -echo "$as_me:10739: result: $enable_pty_handshake" >&5 +echo "$as_me:10870: result: $enable_pty_handshake" >&5 echo "${ECHO_T}$enable_pty_handshake" >&6 if test "$enable_pty_handshake" = yes ; then cat >>confdefs.h <<\EOF @@ -10750,7 +10881,7 @@ EOF fi -echo "$as_me:10753: checking if you want support for mouse in readline applications" >&5 +echo "$as_me:10884: checking if you want support for mouse in readline applications" >&5 echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6 # Check whether --enable-readline-mouse or --disable-readline-mouse was given. @@ -10767,7 +10898,7 @@ else enable_readline_mouse=no fi; -echo "$as_me:10770: result: $enable_readline_mouse" >&5 +echo "$as_me:10901: result: $enable_readline_mouse" >&5 echo "${ECHO_T}$enable_readline_mouse" >&6 if test "$enable_readline_mouse" = yes ; then cat >>confdefs.h <<\EOF @@ -10776,7 +10907,7 @@ EOF fi -echo "$as_me:10779: checking if you want support for regular-expression selections" >&5 +echo "$as_me:10910: checking if you want support for regular-expression selections" >&5 echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6 # Check whether --enable-regex or --disable-regex was given. @@ -10793,11 +10924,11 @@ else enable_regex=yes fi; -echo "$as_me:10796: result: $enable_regex" >&5 +echo "$as_me:10927: result: $enable_regex" >&5 echo "${ECHO_T}$enable_regex" >&6 if test "$enable_regex" = yes ; then -echo "$as_me:10800: checking if you want to use PCRE for regular-expressions" >&5 +echo "$as_me:10931: checking if you want to use PCRE for regular-expressions" >&5 echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6 # Check whether --with-pcre or --without-pcre was given. @@ -10806,11 +10937,11 @@ if test "${with_pcre+set}" = set; then fi; test -z "$with_pcre" && with_pcre=no -echo "$as_me:10809: result: $with_pcre" >&5 +echo "$as_me:10940: result: $with_pcre" >&5 echo "${ECHO_T}$with_pcre" >&6 if test "$with_pcre" != no ; then - echo "$as_me:10813: checking for pcre_compile in -lpcre" >&5 + echo "$as_me:10944: checking for pcre_compile in -lpcre" >&5 echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10818,7 +10949,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10821 "configure" +#line 10952 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10837,16 +10968,16 @@ pcre_compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10840: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10971: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10843: \$? = $ac_status" >&5 + echo "$as_me:10974: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10846: \"$ac_try\"") >&5 + { (eval echo "$as_me:10977: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10849: \$? = $ac_status" >&5 + echo "$as_me:10980: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pcre_pcre_compile=yes else @@ -10857,26 +10988,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10860: result: $ac_cv_lib_pcre_pcre_compile" >&5 +echo "$as_me:10991: result: $ac_cv_lib_pcre_pcre_compile" >&5 echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 if test $ac_cv_lib_pcre_pcre_compile = yes; then - echo "$as_me:10863: checking for pcreposix.h" >&5 + echo "$as_me:10994: checking for pcreposix.h" >&5 echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 if test "${ac_cv_header_pcreposix_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10869 "configure" +#line 11000 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:10873: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11004: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10879: \$? = $ac_status" >&5 + echo "$as_me:11010: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10895,10 +11026,10 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10898: result: $ac_cv_header_pcreposix_h" >&5 +echo "$as_me:11029: result: $ac_cv_header_pcreposix_h" >&5 echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 if test $ac_cv_header_pcreposix_h = yes; then - echo "$as_me:10901: checking for pcreposix_regcomp in -lpcreposix" >&5 + echo "$as_me:11032: checking for pcreposix_regcomp in -lpcreposix" >&5 echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6 if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10906,7 +11037,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix "-lpcre" $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10909 "configure" +#line 11040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10925,16 +11056,16 @@ pcreposix_regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10928: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10931: \$? = $ac_status" >&5 + echo "$as_me:11062: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10934: \"$ac_try\"") >&5 + { (eval echo "$as_me:11065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10937: \$? = $ac_status" >&5 + echo "$as_me:11068: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pcreposix_pcreposix_regcomp=yes else @@ -10945,7 +11076,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10948: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 +echo "$as_me:11079: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6 if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then cat >>confdefs.h <<\EOF @@ -10958,19 +11089,19 @@ EOF LIBS="-lpcreposix -lpcre $LIBS" else - { { echo "$as_me:10961: error: Cannot find PCRE POSIX library" >&5 + { { echo "$as_me:11092: error: Cannot find PCRE POSIX library" >&5 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:10967: error: Cannot find PCRE POSIX header" >&5 + { { echo "$as_me:11098: error: Cannot find PCRE POSIX header" >&5 echo "$as_me: error: Cannot find PCRE POSIX header" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:10973: error: Cannot find PCRE library" >&5 + { { echo "$as_me:11104: error: Cannot find PCRE library" >&5 echo "$as_me: error: Cannot find PCRE library" >&2;} { (exit 1); exit 1; }; } fi @@ -10979,14 +11110,14 @@ fi if test "$with_pcre" = no ; then -echo "$as_me:10982: checking for regular-expression headers" >&5 +echo "$as_me:11113: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10989 "configure" +#line 11120 "configure" #include "confdefs.h" #include #include @@ -11004,16 +11135,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11138: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11010: \$? = $ac_status" >&5 + echo "$as_me:11141: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11013: \"$ac_try\"") >&5 + { (eval echo "$as_me:11144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11016: \$? = $ac_status" >&5 + echo "$as_me:11147: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regex.h" else @@ -11021,7 +11152,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 11024 "configure" +#line 11155 "configure" #include "confdefs.h" #include int @@ -11036,16 +11167,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11039: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11170: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11042: \$? = $ac_status" >&5 + echo "$as_me:11173: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11045: \"$ac_try\"") >&5 + { (eval echo "$as_me:11176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11048: \$? = $ac_status" >&5 + echo "$as_me:11179: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexp.h" else @@ -11055,7 +11186,7 @@ cat conftest.$ac_ext >&5 cf_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11058 "configure" +#line 11189 "configure" #include "confdefs.h" #include int @@ -11070,16 +11201,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11073: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11204: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11076: \$? = $ac_status" >&5 + echo "$as_me:11207: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11079: \"$ac_try\"") >&5 + { (eval echo "$as_me:11210: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11082: \$? = $ac_status" >&5 + echo "$as_me:11213: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexpr.h" else @@ -11095,7 +11226,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11098: result: $cf_cv_regex" >&5 +echo "$as_me:11229: result: $cf_cv_regex" >&5 echo "${ECHO_T}$cf_cv_regex" >&6 case $cf_cv_regex in regex.h) cat >>confdefs.h <<\EOF @@ -11113,7 +11244,7 @@ EOF esac if test "X$cf_cv_regex" != "Xregex.h" ; then - { { echo "$as_me:11116: error: Only POSIX or PCRE regular expressions are supported" >&5 + { { echo "$as_me:11247: error: Only POSIX or PCRE regular expressions are supported" >&5 echo "$as_me: error: Only POSIX or PCRE regular expressions are supported" >&2;} { (exit 1); exit 1; }; } fi @@ -11124,7 +11255,7 @@ EOF fi -echo "$as_me:11127: checking if you want support for right-scrollbar" >&5 +echo "$as_me:11258: checking if you want support for right-scrollbar" >&5 echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6 # Check whether --enable-rightbar or --disable-rightbar was given. @@ -11141,7 +11272,7 @@ else enable_rightbar=yes fi; -echo "$as_me:11144: result: $enable_rightbar" >&5 +echo "$as_me:11275: result: $enable_rightbar" >&5 echo "${ECHO_T}$enable_rightbar" >&6 if test "$enable_rightbar" = yes ; then cat >>confdefs.h <<\EOF @@ -11150,7 +11281,7 @@ EOF fi -echo "$as_me:11153: checking if you want check for redundant name-change" >&5 +echo "$as_me:11284: checking if you want check for redundant name-change" >&5 echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6 # Check whether --enable-samename or --disable-samename was given. @@ -11167,13 +11298,13 @@ else enable_samename=yes fi; -echo "$as_me:11170: result: $enable_samename" >&5 +echo "$as_me:11301: result: $enable_samename" >&5 echo "${ECHO_T}$enable_samename" >&6 test "$enable_samename" = no && cat >>confdefs.h <<\EOF #define OPT_SAME_NAME 0 EOF -echo "$as_me:11176: checking if you want support for session management" >&5 +echo "$as_me:11307: checking if you want support for session management" >&5 echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6 # Check whether --enable-session-mgt or --disable-session-mgt was given. @@ -11190,13 +11321,13 @@ else enable_session_mgt=yes fi; -echo "$as_me:11193: result: $enable_session_mgt" >&5 +echo "$as_me:11324: result: $enable_session_mgt" >&5 echo "${ECHO_T}$enable_session_mgt" >&6 test "$enable_session_mgt" = no && cat >>confdefs.h <<\EOF #define OPT_SESSION_MGT 0 EOF -echo "$as_me:11199: checking if you want to use termcap function-keys" >&5 +echo "$as_me:11330: checking if you want to use termcap function-keys" >&5 echo $ECHO_N "checking if you want to use termcap function-keys... $ECHO_C" >&6 # Check whether --enable-tcap-fkeys or --disable-tcap-fkeys was given. @@ -11213,13 +11344,13 @@ else enable_tcap_fkeys=no fi; -echo "$as_me:11216: result: $enable_tcap_fkeys" >&5 +echo "$as_me:11347: result: $enable_tcap_fkeys" >&5 echo "${ECHO_T}$enable_tcap_fkeys" >&6 test "$enable_tcap_fkeys" = yes && cat >>confdefs.h <<\EOF #define OPT_TCAP_FKEYS 1 EOF -echo "$as_me:11222: checking if you want to use termcap-query/report" >&5 +echo "$as_me:11353: checking if you want to use termcap-query/report" >&5 echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6 # Check whether --enable-tcap-query or --disable-tcap-query was given. @@ -11236,13 +11367,13 @@ else enable_tcap_query=no fi; -echo "$as_me:11239: result: $enable_tcap_query" >&5 +echo "$as_me:11370: result: $enable_tcap_query" >&5 echo "${ECHO_T}$enable_tcap_query" >&6 test "$enable_tcap_query" = yes && cat >>confdefs.h <<\EOF #define OPT_TCAP_QUERY 1 EOF -echo "$as_me:11245: checking if you want support for tek4014" >&5 +echo "$as_me:11376: checking if you want support for tek4014" >&5 echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6 # Check whether --enable-tek4014 or --disable-tek4014 was given. @@ -11259,7 +11390,7 @@ else enable_tek4014=yes fi; -echo "$as_me:11262: result: $enable_tek4014" >&5 +echo "$as_me:11393: result: $enable_tek4014" >&5 echo "${ECHO_T}$enable_tek4014" >&6 if test "$enable_tek4014" = no ; then cat >>confdefs.h <<\EOF @@ -11272,7 +11403,7 @@ else EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" fi -echo "$as_me:11275: checking if you want pulldown menus with a toolbar" >&5 +echo "$as_me:11406: checking if you want pulldown menus with a toolbar" >&5 echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6 # Check whether --enable-toolbar or --disable-toolbar was given. @@ -11289,7 +11420,7 @@ else enable_toolbar=no fi; -echo "$as_me:11292: result: $enable_toolbar" >&5 +echo "$as_me:11423: result: $enable_toolbar" >&5 echo "${ECHO_T}$enable_toolbar" >&6 if test "$enable_toolbar" = yes ; then cat >>confdefs.h <<\EOF @@ -11298,7 +11429,7 @@ EOF fi -echo "$as_me:11301: checking if you want VT52 emulation" >&5 +echo "$as_me:11432: checking if you want VT52 emulation" >&5 echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6 # Check whether --enable-vt52 or --disable-vt52 was given. @@ -11315,13 +11446,13 @@ else enable_vt52=yes fi; -echo "$as_me:11318: result: $enable_vt52" >&5 +echo "$as_me:11449: result: $enable_vt52" >&5 echo "${ECHO_T}$enable_vt52" >&6 test "$enable_vt52" = no && cat >>confdefs.h <<\EOF #define OPT_VT52_MODE 0 EOF -echo "$as_me:11324: checking if you want to use mini-luit/Latin9 built-in support" >&5 +echo "$as_me:11455: checking if you want to use mini-luit/Latin9 built-in support" >&5 echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6 # Check whether --enable-mini-luit or --disable-mini-luit was given. @@ -11338,7 +11469,7 @@ else enable_mini_luit=no fi; -echo "$as_me:11341: result: $enable_mini_luit" >&5 +echo "$as_me:11472: result: $enable_mini_luit" >&5 echo "${ECHO_T}$enable_mini_luit" >&6 if test "$enable_mini_luit" = yes ; then cat >>confdefs.h <<\EOF @@ -11347,7 +11478,7 @@ EOF fi -echo "$as_me:11350: checking if you want to use luit" >&5 +echo "$as_me:11481: checking if you want to use luit" >&5 echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6 # Check whether --enable-luit or --disable-luit was given. @@ -11364,7 +11495,7 @@ else enable_luit=$enable_mini_luit fi; -echo "$as_me:11367: result: $enable_luit" >&5 +echo "$as_me:11498: result: $enable_luit" >&5 echo "${ECHO_T}$enable_luit" >&6 if test "$enable_luit" = yes ; then cat >>confdefs.h <<\EOF @@ -11376,7 +11507,7 @@ for ac_prog in $LUIT luit do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:11379: checking for $ac_word" >&5 +echo "$as_me:11510: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LUIT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11393,7 +11524,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LUIT="$ac_dir/$ac_word" - echo "$as_me:11396: found $ac_dir/$ac_word" >&5 + echo "$as_me:11527: found $ac_dir/$ac_word" >&5 break fi done @@ -11404,10 +11535,10 @@ fi LUIT=$ac_cv_path_LUIT if test -n "$LUIT"; then - echo "$as_me:11407: result: $LUIT" >&5 + echo "$as_me:11538: result: $LUIT" >&5 echo "${ECHO_T}$LUIT" >&6 else - echo "$as_me:11410: result: no" >&5 + echo "$as_me:11541: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11475,7 +11606,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 11478) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 11609) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:11623: checking if you want wide-character support" >&5 echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6 # Check whether --enable-wide-chars or --disable-wide-chars was given. @@ -11506,7 +11637,7 @@ else enable_wchar=$enable_luit fi; -echo "$as_me:11509: result: $enable_wchar" >&5 +echo "$as_me:11640: result: $enable_wchar" >&5 echo "${ECHO_T}$enable_wchar" >&6 if test "$enable_wchar" = yes ; then cat >>confdefs.h <<\EOF @@ -11518,7 +11649,7 @@ EOF EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o" fi -echo "$as_me:11521: checking if you want dynamic-abbreviation support" >&5 +echo "$as_me:11652: checking if you want dynamic-abbreviation support" >&5 echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6 # Check whether --enable-dabbrev or --disable-dabbrev was given. @@ -11535,7 +11666,7 @@ else enable_dabbrev=no fi; -echo "$as_me:11538: result: $enable_dabbrev" >&5 +echo "$as_me:11669: result: $enable_dabbrev" >&5 echo "${ECHO_T}$enable_dabbrev" >&6 if test "$enable_dabbrev" = yes ; then cat >>confdefs.h <<\EOF @@ -11544,7 +11675,7 @@ EOF fi -echo "$as_me:11547: checking if you want DECterm Locator support" >&5 +echo "$as_me:11678: checking if you want DECterm Locator support" >&5 echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6 # Check whether --enable-dec-locator or --disable-dec-locator was given. @@ -11561,7 +11692,7 @@ else enable_dec_locator=no fi; -echo "$as_me:11564: result: $enable_dec_locator" >&5 +echo "$as_me:11695: result: $enable_dec_locator" >&5 echo "${ECHO_T}$enable_dec_locator" >&6 if test "$enable_dec_locator" = yes ; then cat >>confdefs.h <<\EOF @@ -11570,7 +11701,7 @@ EOF fi -echo "$as_me:11573: checking if you want VT420 rectangle support" >&5 +echo "$as_me:11704: checking if you want VT420 rectangle support" >&5 echo $ECHO_N "checking if you want VT420 rectangle support... $ECHO_C" >&6 # Check whether --enable-rectangles or --disable-rectangles was given. @@ -11587,7 +11718,7 @@ else enable_rectangles=no fi; -echo "$as_me:11590: result: $enable_rectangles" >&5 +echo "$as_me:11721: result: $enable_rectangles" >&5 echo "${ECHO_T}$enable_rectangles" >&6 if test "$enable_rectangles" = yes ; then cat >>confdefs.h <<\EOF @@ -11596,7 +11727,7 @@ EOF fi -echo "$as_me:11599: checking if you want -ziconbeep option" >&5 +echo "$as_me:11730: checking if you want -ziconbeep option" >&5 echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6 # Check whether --enable-ziconbeep or --disable-ziconbeep was given. @@ -11613,7 +11744,7 @@ else enable_ziconbeep=yes fi; -echo "$as_me:11616: result: $enable_ziconbeep" >&5 +echo "$as_me:11747: result: $enable_ziconbeep" >&5 echo "${ECHO_T}$enable_ziconbeep" >&6 test "$enable_ziconbeep" = no && cat >>confdefs.h <<\EOF #define OPT_ZICONBEEP 0 @@ -11621,7 +11752,7 @@ EOF ############################################################################### -echo "$as_me:11624: checking if you want debugging traces" >&5 +echo "$as_me:11755: checking if you want debugging traces" >&5 echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -11638,7 +11769,7 @@ else enable_trace=no fi; -echo "$as_me:11641: result: $enable_trace" >&5 +echo "$as_me:11772: result: $enable_trace" >&5 echo "${ECHO_T}$enable_trace" >&6 if test "$enable_trace" = yes ; then cat >>confdefs.h <<\EOF @@ -11649,7 +11780,7 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" fi -echo "$as_me:11652: checking if you want to test memory leaks" >&5 +echo "$as_me:11783: checking if you want to test memory leaks" >&5 echo $ECHO_N "checking if you want to test memory leaks... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -11666,7 +11797,7 @@ else disable_leaks=no fi; -echo "$as_me:11669: result: $disable_leaks" >&5 +echo "$as_me:11800: result: $disable_leaks" >&5 echo "${ECHO_T}$disable_leaks" >&6 if test "$disable_leaks" = yes ; then cat >>confdefs.h <<\EOF @@ -11675,7 +11806,7 @@ EOF fi -echo "$as_me:11678: checking if you want to see long compiling messages" >&5 +echo "$as_me:11809: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -11709,10 +11840,10 @@ else ECHO_CC='' fi; -echo "$as_me:11712: result: $enableval" >&5 +echo "$as_me:11843: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:11715: checking if you want magic cookie emulation" >&5 +echo "$as_me:11846: checking if you want magic cookie emulation" >&5 echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -11729,7 +11860,7 @@ else enable_xmc=no fi; -echo "$as_me:11732: result: $enable_xmc" >&5 +echo "$as_me:11863: result: $enable_xmc" >&5 echo "${ECHO_T}$enable_xmc" >&6 if test "$enable_xmc" = yes ; then cat >>confdefs.h <<\EOF @@ -11741,7 +11872,7 @@ EOF fi if test -n "$GCC" ; then -echo "$as_me:11744: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:11875: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -11758,7 +11889,7 @@ else with_warnings=no fi; -echo "$as_me:11761: result: $with_warnings" >&5 +echo "$as_me:11892: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = yes then @@ -11781,10 +11912,10 @@ cat > conftest.i <&5 + { echo "$as_me:11915: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:11956: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11828: \$? = $ac_status" >&5 + echo "$as_me:11959: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:11830: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:11961: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi @@ -11840,11 +11971,11 @@ fi GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:11843: checking version of $CC" >&5 + echo "$as_me:11974: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:11847: result: $GCC_VERSION" >&5 + echo "$as_me:11978: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -11853,12 +11984,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:11856: checking if this is really Intel C compiler" >&5 + echo "$as_me:11987: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 11861 "configure" +#line 11992 "configure" #include "confdefs.h" int @@ -11875,16 +12006,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12009: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11881: \$? = $ac_status" >&5 + echo "$as_me:12012: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11884: \"$ac_try\"") >&5 + { (eval echo "$as_me:12015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11887: \$? = $ac_status" >&5 + echo "$as_me:12018: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -11895,14 +12026,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:11898: result: $INTEL_COMPILER" >&5 + echo "$as_me:12029: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:12054: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" - for cf_opt in \ + for cf_opt in \ wd1419 \ wd1682 \ wd1683 \ @@ -11937,12 +12068,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:11940: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12071: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11943: \$? = $ac_status" >&5 + echo "$as_me:12074: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:11945: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12076: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -11951,7 +12082,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:11954: checking for $CC warning options..." >&5 + { echo "$as_me:12085: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -11968,15 +12099,15 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST + Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:11974: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12105: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11977: \$? = $ac_status" >&5 + echo "$as_me:12108: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:11979: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12110: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -12117,7 +12248,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:12120: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:12251: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -12290,7 +12421,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:12293: error: ambiguous option: $1 + { { echo "$as_me:12424: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -12309,7 +12440,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:12312: error: unrecognized option: $1 + -*) { { echo "$as_me:12443: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -12346,7 +12477,7 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;; - *) { { echo "$as_me:12349: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:12480: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -12453,6 +12584,10 @@ s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t s,@PROG_EXT@,$PROG_EXT,;t t s,@appsdir@,$appsdir,;t t s,@no_appsdir@,$no_appsdir,;t t +s,@icondir@,$icondir,;t t +s,@no_icondir@,$no_icondir,;t t +s,@desktop_utils@,$desktop_utils,;t t +s,@DESKTOP_FLAGS@,$DESKTOP_FLAGS,;t t s,@XTERM_PATH@,$XTERM_PATH,;t t s,@XTERM_SYMLINK@,$XTERM_SYMLINK,;t t s,@SINSTALL_OPTS@,$SINSTALL_OPTS,;t t @@ -12598,7 +12733,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:12601: creating $ac_file" >&5 + { echo "$as_me:12736: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -12616,7 +12751,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12619: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:12754: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12629,7 +12764,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12632: error: cannot find input file: $f" >&5 + { { echo "$as_me:12767: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -12695,7 +12830,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:12698: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:12833: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -12706,7 +12841,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12709: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:12844: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12719,7 +12854,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12722: error: cannot find input file: $f" >&5 + { { echo "$as_me:12857: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -12837,7 +12972,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:12840: $ac_file is unchanged" >&5 + { echo "$as_me:12975: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/app/xterm/configure.in b/app/xterm/configure.in index 2a82aa089..3cb9db0ea 100644 --- a/app/xterm/configure.in +++ b/app/xterm/configure.in @@ -1,4 +1,4 @@ -dnl $XTermId: configure.in,v 1.226 2007/03/18 23:37:06 tom Exp $ +dnl $XTermId: configure.in,v 1.236 2007/07/22 18:51:36 tom Exp $ dnl dnl $XFree86: xc/programs/xterm/configure.in,v 3.77 2006/06/19 00:36:51 dickey Exp $ dnl @@ -121,6 +121,34 @@ no_appsdir= test "$appsdir" = no && no_appsdir="#" AC_SUBST(no_appsdir) +AC_MSG_CHECKING(for directory to install icons) +CF_WITH_PATH(icondir, + [ --with-icondir=DIR directory in which to install icons], + [icondir],[EPREFIX/share/pixmaps], + ['\$(exec_prefix)/share/pixmaps']) +AC_MSG_RESULT($icondir) +AC_SUBST(icondir) + +no_icondir= +test "$icondir" = no && no_icondir="#" +AC_SUBST(no_icondir) + +# Comment-out the install-desktop rule if the desktop-utils are not found. +AC_MSG_CHECKING(if you want to install desktop files) +CF_ARG_OPTION(desktop, + [ --disable-desktop disable install of xterm desktop files], + [enable_desktop=$enableval], + [enable_desktop=$enableval],yes) +AC_MSG_RESULT($enable_desktop) + +desktop_utils= +if test "$enable_desktop" = yes ; then +AC_CHECK_PROG(desktop_utils,desktop-file-install,yes,no) +fi + +test "$desktop_utils" = yes && desktop_utils= || desktop_utils="#" +AC_SUBST(DESKTOP_FLAGS) + # inherit SINSTALL_OPTS from environment to allow packager to customize it. AC_MSG_CHECKING(for install-permissions reference) @@ -168,7 +196,7 @@ CF_ARG_DISABLE(setgid, [disable_setgid=yes], [disable_setgid=no], no) -AC_MSG_RESULT($disable_setuid) +AC_MSG_RESULT($disable_setgid) AC_MSG_CHECKING(if you want to run xterm setuid to a given user) AC_ARG_WITH(setuid, @@ -217,7 +245,18 @@ AC_MSG_RESULT($use_utempter) if test "$use_utempter" = yes ; then CF_UTEMPTER - test "$cf_cv_have_utempter" = yes && disable_setuid=yes + test "$cf_cv_have_utempter" != yes && use_utempter=no +else + use_utempter=no +fi + +# Some configurations permit (or require) either setuid or setgid mode. +# Let the user decide. +if test "$use_utempter" = yes ; then + if test "${enable_setuid+set}" != set ; then + disable_setuid=yes + CF_VERBOSE([No --disable-setuid option given, force to yes]) + fi fi ### checks for external data @@ -234,6 +273,7 @@ CF_X_TOOLKIT AC_CHECK_HEADERS( \ X11/DECkeysym.h \ X11/Sunkeysym.h \ + X11/XF86keysym.h \ X11/Xpoll.h \ ) @@ -852,7 +892,7 @@ AC_MSG_RESULT($with_warnings) if test "$with_warnings" = yes then CF_GCC_ATTRIBUTES - CF_GCC_WARNINGS + CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum) fi fi diff --git a/app/xterm/cursor.c b/app/xterm/cursor.c index 6694fe3eb..9e863d270 100644 --- a/app/xterm/cursor.c +++ b/app/xterm/cursor.c @@ -1,9 +1,9 @@ -/* $XTermId: cursor.c,v 1.42 2006/07/23 20:23:52 tom Exp $ */ +/* $XTermId: cursor.c,v 1.43 2007/07/07 12:14:51 tom Exp $ */ /* $XFree86: xc/programs/xterm/cursor.c,v 3.20 2006/02/13 01:14:58 dickey Exp $ */ /* - * Copyright 2002-2005,2006 by Thomas E. Dickey + * Copyright 2002-2006,2007 by Thomas E. Dickey * * All Rights Reserved * @@ -114,8 +114,10 @@ CursorBack(XtermWidget xw, int n) } set_cur_row(screen, i / j); set_cur_col(screen, i % j); - } else + do_xevents(); + } else { set_cur_col(screen, 0); + } } screen->do_wrap = 0; } @@ -235,6 +237,7 @@ CarriageReturn(TScreen * screen) { set_cur_col(screen, 0); screen->do_wrap = 0; + do_xevents(); } /* diff --git a/app/xterm/data.c b/app/xterm/data.c index b226bb8fa..e929fb082 100644 --- a/app/xterm/data.c +++ b/app/xterm/data.c @@ -1,4 +1,4 @@ -/* $XTermId: data.c,v 1.84 2007/01/18 23:38:49 tom Exp $ */ +/* $XTermId: data.c,v 1.86 2007/07/17 21:09:41 tom Exp $ */ /* $XFree86: xc/programs/xterm/data.c,v 3.34 2006/02/13 01:14:58 dickey Exp $ */ @@ -104,3 +104,11 @@ PtySelect X_mask; PtySelect pty_mask; char *ptydev; char *ttydev; + +#if HANDLE_STRUCT_NOTIFY +int mapstate = -1; +#endif /* HANDLE_STRUCT_NOTIFY */ + +#if OPT_SESSION_MGT +int ice_fd = -1; +#endif diff --git a/app/xterm/fontutils.c b/app/xterm/fontutils.c index 7657da7ca..d03dbaba8 100644 --- a/app/xterm/fontutils.c +++ b/app/xterm/fontutils.c @@ -1,8 +1,4 @@ -/* $XTermId: fontutils.c,v 1.246 2007/03/22 00:20:06 tom Exp $ */ - -/* - * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ - */ +/* $XTermId: fontutils.c,v 1.251 2007/08/05 00:11:55 tom Exp $ */ /************************************************************ @@ -850,7 +846,6 @@ xtermLoadFont(XtermWidget xw, fnts[fWBold] = xtermCloseFont(xw, fnts[fWBold]); } if (fnts[fWBold] == 0) { - free(myfonts.f_wb); myfonts.f_wb = myfonts.f_w; fnts[fWBold] = fnts[fWide]; TRACE(("...cannot load wide-bold, use wide %s\n", NonNull(myfonts.f_w))); @@ -1349,16 +1344,16 @@ xtermOpenXft(Display * dpy, XftPattern * pat, const char *tag GCC_UNUSED) * Don't make a dependency on the math library for a single function. * (Newton Raphson). */ -static float -mySquareRoot(float value) +static double +mySquareRoot(double value) { - float result = 0.0; + double result = 0.0; if (value > 0.0) { int n; - float older = value; + double older = value; for (n = 0; n < 10; ++n) { - float delta = (older * older - value) / (2.0 * older); - float newer = older - delta; + double delta = (older * older - value) / (2.0 * older); + double newer = older - delta; older = newer; result = newer; if (delta > -0.001 && delta < 0.001) @@ -1477,7 +1472,7 @@ xtermComputeFontInfo(XtermWidget xw, if (fontnum == fontMenu_default) { face_size = 14.0; } else { - float ratio; + double ratio; int num = screen->menu_font_sizes[fontnum]; int den = screen->menu_font_sizes[0]; @@ -1517,26 +1512,42 @@ xtermComputeFontInfo(XtermWidget xw, xw->misc.face_size[fontnum] = face_size; } + /* + * By observation (there is no documentation), XftPatternBuild is + * cumulative. Build the bold- and italic-patterns on top of the + * normal pattern. + */ +#define NormXftPattern \ + XFT_FAMILY, XftTypeString, "mono", \ + XFT_SIZE, XftTypeDouble, face_size, \ + XFT_SPACING, XftTypeInteger, XFT_MONO + +#define BoldXftPattern(norm) \ + XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, \ + XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width + +#define ItalXftPattern(norm) \ + XFT_SLANT, XftTypeInteger, XFT_SLANT_ITALIC, \ + XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width + if ((pat = XftNameParse(xw->misc.face_name)) != 0) { XftPatternBuild(pat, - XFT_FAMILY, XftTypeString, "mono", - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, + NormXftPattern, (void *) 0); norm = xtermOpenXft(dpy, pat, "normal"); if (norm != 0) { XftPatternBuild(pat, - XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, - XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width, + BoldXftPattern(norm), (void *) 0); bold = xtermOpenXft(dpy, pat, "bold"); #if OPT_ISO_COLORS - if (screen->italicULMode) { + if (screen->italicULMode + && (pat = XftNameParse(xw->misc.face_name)) != 0) { XftPatternBuild(pat, - XFT_SLANT, XftTypeInteger, XFT_SLANT_ITALIC, - XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width, + NormXftPattern, + ItalXftPattern(norm), (void *) 0); ital = xtermOpenXft(dpy, pat, "italic"); } @@ -1574,33 +1585,31 @@ xtermComputeFontInfo(XtermWidget xw, face_name, char_width)); +#define WideXftPattern \ + XFT_FAMILY, XftTypeString, "mono", \ + XFT_SIZE, XftTypeDouble, face_size, \ + XFT_SPACING, XftTypeInteger, XFT_MONO + if ((pat = XftNameParse(face_name)) != 0) { XftPatternBuild(pat, - XFT_FAMILY, XftTypeString, "mono", - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, + WideXftPattern, XFT_CHAR_WIDTH, XftTypeInteger, char_width, (void *) 0); wnorm = xtermOpenXft(dpy, pat, "wide"); if (wnorm != 0) { XftPatternBuild(pat, - XFT_FAMILY, XftTypeString, face_name, - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - XFT_CHAR_WIDTH, XftTypeInteger, char_width, - XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, + WideXftPattern, + BoldXftPattern(wnorm), (void *) 0); wbold = xtermOpenXft(dpy, pat, "wide-bold"); #if OPT_ISO_COLORS - if (screen->italicULMode) { + if (screen->italicULMode + && (pat = XftNameParse(face_name)) != 0) { XftPatternBuild(pat, - XFT_FAMILY, XftTypeString, face_name, - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - XFT_CHAR_WIDTH, XftTypeInteger, char_width, - XFT_SLANT, XftTypeInteger, XFT_SLANT_ITALIC, + WideXftPattern, + ItalXftPattern(wnorm), (void *) 0); wital = xtermOpenXft(dpy, pat, "wide-italic"); } @@ -2535,6 +2544,8 @@ SetVTFont(XtermWidget xw, FindFontSelection(xw, myfonts.f_n, False); return; } else { + int oldFont = screen->menu_font_number; + #define USE_CACHED(field, name) \ if (myfonts.field == 0) { \ myfonts.field = screen->menu_font_names[which][name]; \ @@ -2553,6 +2564,10 @@ SetVTFont(XtermWidget xw, &myfonts, doresize, which)) { return; + } else { + xtermLoadFont(xw, + xtermFontName(screen->MenuFontName(oldFont)), + doresize, oldFont); } } } diff --git a/app/xterm/gen-pc-fkeys.pl b/app/xterm/gen-pc-fkeys.pl index c7ba80268..7279c53c3 100644 --- a/app/xterm/gen-pc-fkeys.pl +++ b/app/xterm/gen-pc-fkeys.pl @@ -1,98 +1,320 @@ #! /usr/bin/perl -w # Author: Thomas E. Dickey -# $XTermId: gen-pc-fkeys.pl,v 1.5 2005/04/03 16:58:29 tom Exp $ -# $XFree86: xc/programs/xterm/gen-pc-fkeys.pl,v 1.2 2005/03/29 04:00:32 tsi Exp $ +# $XTermId: gen-pc-fkeys.pl,v 1.16 2007/06/10 23:36:09 tom Exp $ # # Construct a list of function-key definitions corresponding to xterm's # Sun/PC keyboard. This uses infocmp to obtain the strings to modify (and # verify). use strict; -my(@old_keys); -my($min_fkeys,$max_fkeys,$max_modifier,$modify_opt,$terminfo); +my($max_modifier, $terminfo); +my(@old_fkeys, $opt_fkeys, $min_fkeys, $max_fkeys); +my(%old_ckeys, $opt_ckeys, $min_ckeys, $max_ckeys); +my(%old_ekeys, $opt_ekeys, $min_ekeys, $max_ekeys); + +my(@ckey_names); +@ckey_names = ( + 'kcud1', 'kcub1', 'kcuf1', 'kcuu1', # 1 = no modifiers + 'kDN', 'kLFT', 'kRIT', 'kUP', # 2 = shift + # repeat the second row with the modifier code appended to each name + 'kDN3', 'kLFT3', 'kRIT3', 'kUP3', # 3 = alt + 'kDN4', 'kLFT4', 'kRIT4', 'kUP4', # 4 = shift + alt + 'kDN5', 'kLFT5', 'kRIT5', 'kUP5', # 5 = control + 'kDN6', 'kLFT6', 'kRIT6', 'kUP6', # 6 = shift + control + 'kDN7', 'kLFT7', 'kRIT7', 'kUP7', # 7 = alt + control + ); +my(@ckey_known); +@ckey_known = ( + 'kind', 'kLFT', 'kRIT', 'kri', # 2 = shift (standard) + ); + +my(@ekey_names); +@ekey_names = ( + # 'khome', 'kend', 'knp', 'kpp', 'kdch1', 'kich1', # 1 = no modifiers + # 'kHOM', 'kEND', 'kNXT', 'kPRV', 'kDC', 'kIC', # 2 = shift + 'khome', 'kend', # 1 = no modifiers + 'kHOM', 'kEND', # 2 = shift +); +my %ekey_names; $min_fkeys=12; # the number of "real" function keys on your keyboard $max_fkeys=64; # the number of function-keys terminfo can support $max_modifier=8; # modifier 1 + (1=shift, 2=alt, 4=control 8=meta) -$modify_opt=2; # xterm's modifyCursorKeys resource + +$min_ckeys=4; # the number of "real" cursor keys on your keyboard +$max_ckeys=($min_ckeys * $max_modifier); + +$min_ekeys=2; # the number of "real" editing keys on your keyboard +$max_ekeys=($min_ekeys * $max_modifier); + +$opt_ckeys=2; # xterm's modifyCursorKeys resource +$opt_ekeys=2; # xterm's modifyCursorKeys resource +$opt_fkeys=2; # xterm's modifyFunctionKeys resource $terminfo="xterm-new"; # the terminfo entry to use -my($cur_modifier, $cur_fkey); - # apply the given modifier to the terminfo string, return the result -sub modify_it { +sub modify_fkey($$$) { my $code = $_[0]; my $text = $_[1]; - if ($code != 1) { + my $opts = $_[2]; + if (not defined($text)) { + $text = ""; + } elsif ($code != 1) { + $text =~ s/\\EO/\\E\[/ if ($opts >= 1); + my $piece = substr $text, 0, length ($text) - 1; my $final = substr $text, length ($text) - 1; my $check = substr $piece, length ($piece) - 1; if ($check =~ /[0-9]/) { $code = ";" . $code; + } elsif ( $check =~ /\[/ and $opts >= 2) { + $code = "1;" . $code; + } + if ( $opts >= 3 ) { + $code = ">" . $code; } $text = $piece . $code . $final; + $text =~ s/([\d;]+)>/>$1/; } return $text; } -# compute the next modifier value +# compute the next modifier value - +# Cycling through the modifiers is not just like counting. Users prefer +# pressing one modifier (even if using Emacs). So first we cycle through +# the individual modifiers, then for completeness two, three, etc. sub next_modifier { my $code = $_[0]; my $mask = $code - 1; if ($mask == 0) { - $mask = 1; + $mask = 1; # shift } elsif ($mask == 1) { - $mask = 4; + $mask = 4; # control } elsif ($mask == 2) { - $mask = 3; # FIXME + $mask = 3; # shift+alt } elsif ($mask == 4) { - $mask = 5; + $mask = 5; # shift+control } elsif ($mask == 5) { - $mask = 2; + $mask = 2; # alt } # printf ("# next_modifier(%d) = %d\n", $code, $mask + 1); return $mask + 1; } -# Read the terminfo entry's list of function keys $old_keys[]. -# We could handle $old_keys[0], but choose to start numbering from 1. -sub readterm() { - my($key,$n,$str); - my(@list) = `infocmp -1 $terminfo`; +sub make_ekey_names() { + my ($j, $k); + my $min = $min_ekeys * 2; + my $max = $max_ekeys - 1; + + # printf "# make_ekey_names\n"; + for $j ($min..$max) { + $k = substr($j / $min_ekeys, 0, 1); + $ekey_names[$j] = $ekey_names[$min_ekeys + ($j % $min_ekeys)] . $k; + # printf "# make %d:%s\n", $j, $ekey_names[$j]; + } + for $j (0..$#ekey_names) { + # printf "# %d:%s\n", $j, $ekey_names[$j]; + $ekey_names{$ekey_names[$j]} = $j; + } +} + +# Read the terminfo entry's list of function keys $old_fkeys[]. +# We could handle $old_fkeys[0], but choose to start numbering from 1. +sub readterm($) { + my $term = $_[0]; + my($key, $n, $str); + my(@list) = `infocmp -1 $term`; + for $n (0..$#list) { chop $list[$n]; $list[$n] =~ s/^[[:space:]]//; + + $key = $list[$n]; + $key =~ s/=.*//; + + $str = $list[$n]; + $str =~ s/^[^=]+=//; + $str =~ s/,$//; + if ( $list[$n] =~ /^kf[[:digit:]]+=/ ) { - $key = $list[$n]; $key =~ s/^kf//; - $key =~ s/=.*//; - $str = $list[$n]; - $str =~ s/^kf[[:digit:]]+=//; - $str =~ s/,[[:space:]]*$//; - # printf "$n:%s(%d)(%s)\n", $list[$n], $key, $str; - $old_keys[$key] = $str; + # printf "# $n:%s(%d)(%s)\n", $list[$n], $key, $str; + $old_fkeys[$key] = $str; + } elsif ( $key =~ /^kc[[:alpha:]]+1/ + or $key =~ /^k(LFT|RIT|UP|DN)\d?/) { + # printf "# $n:%s(%d)(%s)\n", $list[$n], $key, $str; + $old_ckeys{$key} = $str; + } elsif ( defined $ekey_names{$key} ) { + # printf "# $n:%s(%s)(%s)\n", $list[$n], $key, $str; + $old_ekeys{$key} = $str; } } - # printf ("last index:%d\n", $#old_keys); + # printf ("last index:%d\n", $#old_fkeys); } -readterm(); +# read the whole terminfo to ensure we get the non-modified stuff, then read +# the part that contains modifiers. +sub read_part($) { + my $part = $_[0]; -# Cycling through the modifiers is not just like counting. Users prefer -# pressing one modifier (even if using Emacs). So first we cycle through -# the individual modifiers, then for completeness two, three, etc. -printf "xterm+pcfkeys|fragment for PC-style keys, \n"; -for ($cur_fkey = 1, $cur_modifier = 1; $cur_fkey < $max_fkeys; ++$cur_fkey) { - my $index = (($cur_fkey - 1) % $min_fkeys); - if ($index == 0 && $cur_fkey != 1) { - $cur_modifier = next_modifier($cur_modifier); + %old_ckeys = (); + @old_fkeys = (); + readterm($terminfo); + readterm($part); +} + +sub nameof_ckeys($) { + my $opts = $_[0]; + my $optname = "xterm+pcc" . ($opts >= 0 ? $opts : "n"); + return $optname; +} + +sub generate_ckeys($) { + my $opts = $_[0]; + my($modifier, $cur_ckey, $index); + + printf "%s|fragment with modifyCursorKeys:%s,\n", + nameof_ckeys($opts), $opts; + + # show the standard cursor definitions + $modifier = 1; + for ($index = 0; $index < $min_ckeys; ++$index) { + $cur_ckey = $index + ($modifier * $min_ckeys); + my $name = $ckey_known[$index]; + my $input = $old_ckeys{$ckey_names[$index]}; + my $result = modify_fkey($modifier + 1, $input, $opts); + printf "\t%s=%s,\n", $name, $result; + if (defined $old_ckeys{$name}) { + if ($old_ckeys{$name} ne $result) { + printf "# found %s=%s\n", $name, $old_ckeys{$name}; + } + } } - my $input = $old_keys[$index + 1]; - my $result = modify_it($cur_modifier,$input); - printf "\tkf%d=%s, \n", $cur_fkey, $result; - if (defined $old_keys[$cur_fkey]) { - if ($old_keys[$cur_fkey] ne $result) { - printf "# diff %s\n", $old_keys[$cur_fkey]; + + # show the extended cursor definitions + for ($index = 0; $index < $min_ckeys; ++$index) { + for ($modifier = 1; $modifier < $max_modifier; ++$modifier) { + $cur_ckey = $index + ($modifier * $min_ckeys); + if (defined $ckey_names[$cur_ckey] and + $ckey_names[$cur_ckey] ne "kLFT" and + $ckey_names[$cur_ckey] ne "kRIT" ) { + my $name = $ckey_names[$cur_ckey]; + my $input = $old_ckeys{$ckey_names[$index]}; + my $result = modify_fkey($modifier + 1, $input, $opts); + printf "\t%s=%s,\n", $name, $result; + if (defined $old_ckeys{$name}) { + if ($old_ckeys{$name} ne $result) { + printf "# found %s=%s\n", $name, $old_ckeys{$name}; + } + } + } } } } + +sub nameof_ekeys($) { + my $opts = $_[0]; + my $optname = "xterm+pce" . ($opts >= 0 ? $opts : "n"); + return $optname; +} + +sub generate_ekeys($) { + my $opts = $_[0]; + my($modifier, $cur_ekey, $index); + + printf "%s|fragment with modifyCursorKeys:%s,\n", + nameof_ekeys($opts), $opts; + + for ($index = 0; $index < $min_ekeys; ++$index) { + for ($modifier = 1; $modifier < $max_modifier; ++$modifier) { + $cur_ekey = $index + ($modifier * $min_ekeys); + if (defined $ekey_names[$cur_ekey] ) { + my $name = $ekey_names[$cur_ekey]; + my $input = $old_ekeys{$ekey_names[$index]}; + my $result = modify_fkey($modifier + 1, $input, $opts); + printf "\t%s=%s,\n", $name, $result; + if (defined $old_ekeys{$name}) { + if ($old_ekeys{$name} ne $result) { + printf "# found %s=%s\n", $name, $old_ekeys{$name}; + } + } + } + } + } +} + +sub nameof_fkeys($) { + my $opts = $_[0]; + my $optname = "xterm+pcf" . ($opts >= 0 ? $opts : "n"); + return $optname; +} + +sub generate_fkeys($) { + my $opts = $_[0]; + my($modifier, $cur_fkey); + + printf "%s|fragment with modifyFunctionKeys:%s and ctrlFKeys:10,\n", + nameof_fkeys($opts), $opts; + + for ($cur_fkey = 1, $modifier = 1; $cur_fkey < $max_fkeys; ++$cur_fkey) { + my $index = (($cur_fkey - 1) % $min_fkeys); + if ($index == 0 && $cur_fkey != 1) { + $modifier = next_modifier($modifier); + } + if (defined $old_fkeys[$index + 1]) { + my $input = $old_fkeys[$index + 1]; + my $result = modify_fkey($modifier, $input, $opts); + printf "\tkf%d=%s,\n", $cur_fkey, $result; + if (defined $old_fkeys[$cur_fkey]) { + if ($old_fkeys[$cur_fkey] ne $result) { + printf "# found kf%d=%s\n", $cur_fkey, $old_fkeys[$cur_fkey]; + } + } + } + } +} + +sub show_default() { + readterm($terminfo); + + printf "xterm+pcfkeys|fragment for PC-style keys,\n"; + printf "\tuse=%s,\n", nameof_ckeys($opt_ckeys); + printf "\tuse=%s,\n", nameof_ekeys($opt_ekeys); + printf "\tuse=%s,\n", nameof_fkeys($opt_fkeys); + + generate_ckeys($opt_ckeys); + generate_ekeys($opt_ekeys); + generate_fkeys($opt_fkeys); +} + +sub show_nondefault() +{ + my $opts; + + for ($opts = 0; $opts <= 3; ++$opts) { + if ($opts != $opt_ckeys) { + read_part(nameof_ckeys($opts)); + generate_ckeys($opts); + } + } + + for ($opts = 0; $opts <= 3; ++$opts) { + if ($opts != $opt_ekeys) { + read_part(nameof_ekeys($opts)); + generate_ekeys($opts); + } + } + + for ($opts = 0; $opts <= 3; ++$opts) { + if ($opts != $opt_fkeys) { + read_part(nameof_fkeys($opts)); + generate_fkeys($opts); + } + } +} + +make_ekey_names(); + +printf "# gen-pc-fkeys.pl\n"; +show_default(); +show_nondefault(); diff --git a/app/xterm/icons/xterm-color_32x32.xcf b/app/xterm/icons/xterm-color_32x32.xcf new file mode 100644 index 000000000..f13ef5d18 Binary files /dev/null and b/app/xterm/icons/xterm-color_32x32.xcf differ diff --git a/app/xterm/icons/xterm-color_32x32.xpm b/app/xterm/icons/xterm-color_32x32.xpm new file mode 100644 index 000000000..7824f6c99 --- /dev/null +++ b/app/xterm/icons/xterm-color_32x32.xpm @@ -0,0 +1,46 @@ +/* XPM */ +static char * xterm_color_32x32_xpm[] = { +"32 32 11 1", +" c None", +". c #555500", +"+ c #000000", +"@ c #FFFFFF", +"# c #FF0000", +"$ c #980000", +"% c #FF5E00", +"& c #49FF00", +"* c #2FA300", +"= c #60B7FF", +"- c #3A709B", +"................................", +".....+++++++++++++++++++++++....", +"....+@@+++++++++++++++++++@@++..", +"....+@+++++++++++++++++++++@+@+.", +"....+++++++++++++++++++++++++@@+", +"....+++#$+$#+++++++++++++++++@@+", +"....++++$#$++++++++++++++++++@@+", +"....++++$#+++++++++++++++++++@@+", +"....++++$#$++++++++++++++++++@@+", +"....+++#$+$#+++++++++++++++++@@+", +"....+++++++++++++++++++++++++@@+", +"....+++++++++++++++++++++++++@@+", +"....+++++++++++++++++++++++++@@+", +"....+++@@@@+%%%+&&&*+=++=++++@@+", +"....+++++@++%+++&+&*+=-==++++@@+", +"....+++++@++%%%+&&&*+==-=++++@@+", +"....+++++@++%+++&+&++=++=++++@@+", +"....+++++@++%%%+&+*&+=++=++++@@+", +"....+++++++++++++++++++++++++@+.", +"....+++++++++++++++++++++++++@+.", +"....+@+++++++++++++++++++++@++..", +"....+@@+++++++++++++++++++@@+...", +".....+++++++++++++++++++++++....", +"................................", +".....++++++++++++++++++++++++...", +"....+@@@@@@@@@@@@@@@@@@@@@@@+...", +"...+@@@@@@@@@@@@@@@@@@@@@@@+....", +"...+@@++@@++@++@@++@@+@@++@+....", +"..+@++@@++@@+@@++@@++@++@@@+....", +"..+@@@@@@@@@@@@@@@@@@@@@@@+.+...", +".+@@@@@@@@@@@@@@@@@@@@@@@+......", +".++++++++++++++++++++++++++....."}; diff --git a/app/xterm/icons/xterm-color_48x48.xcf b/app/xterm/icons/xterm-color_48x48.xcf new file mode 100644 index 000000000..574d9f286 Binary files /dev/null and b/app/xterm/icons/xterm-color_48x48.xcf differ diff --git a/app/xterm/icons/xterm-color_48x48.xpm b/app/xterm/icons/xterm-color_48x48.xpm new file mode 100644 index 000000000..126e454ec --- /dev/null +++ b/app/xterm/icons/xterm-color_48x48.xpm @@ -0,0 +1,61 @@ +/* XPM */ +static char * xterm_color_48x48_xpm[] = { +"48 48 10 1", +" c None", +". c #555500", +"+ c #000000", +"@ c #FFFFFF", +"# c #FF0000", +"$ c #070700", +"% c #0B0B00", +"& c #FF8400", +"* c #49FF00", +"= c #60B7FF", +"................................................", +"......++++++++++++++++++++++++++++++++++........", +".....+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@++......", +".....+@@@++++++++++++++++++++++++++++@@@+@+.....", +".....+@@++++++++++++++++++++++++++++++@@+@@+....", +".....+@++++++++++++++++++++++++++++++++@+@@@+...", +".....+@++###++++###++++++++++++++++++++@+@@@@+..", +".....+@+++##++++##+++++++++++++++++++++@+@@@@+..", +".....+@++++##++##++++++++++++++++++++++@+@@@@+..", +".....+@++++##++##++++++++++++++++++++++@+@@@@+..", +".....+@+++++####+++++++++++++++++++++++@+@@@@+..", +".....+@+++++####+++++++++++++++++++++++@+@@@@+..", +".....+@++++++##++++++++++++++++++++++++@+@@@@+..", +".....+@+++++####+++++++++++++++++++++++@+@@@@+..", +".....+@+++++####+++++++++++++++++++++++@+@@@@+..", +".....+@++++##++##++++++++++++++++++++++@+@@@@+..", +".....+@++++##++##++++++++++++++++++++++@+@@@@+..", +".....+@+++##++++##+++++++++++++++++++++@+@@@@+..", +".....+@++###++++###++++++++++++++++++++@+@@@@+..", +".....+@++++++++++++++++++++++++++++++++@+@@@@+..", +".....+@$+++++++++++++++++++++++++++++++@+@@@@+..", +".....+@%@@@@@@@+&&&&&++****+++==+++==++@+@@@@+..", +".....+@++++@++++&++++++*+++*++==+++==++@+@@@@+..", +".....+@++++@++++&++++++*+++*++=+=+=+=++@+@@@@+..", +".....+@++++@++++&&&&+++****+++=+=+=+=++@+@@@@+..", +".....+@++++@++++&++++++*+*++++=++=++=++@+@@@+...", +".....+@++++@++++&++++++*++*+++=++=++=++@+@@@+...", +".....+@++++@++++&&&&&++*+++*++=+++++=++@+@@+....", +".....+@++++++++++++++++++++++++++++++++@+@@+....", +".....+@++++++++++++++++++++++++++++++++@+@+.....", +".....+@@++++++++++++++++++++++++++++++@@+@+.....", +".....+@@@++++++++++++++++++++++++++++@@@++......", +".....+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@++......", +"......++++++++++++++++++++++++++++++++++........", +"................................................", +"................................................", +"......++++++++++++++++++++++++++++++++++++......", +".....+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@++......", +".....+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@@++......", +"....+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+@+......", +"....+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@@+@+......", +"...+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+@@+......", +"...+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@+@@+@@+......", +"..+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+@@+.......", +"..+@++@++++++++++++++++++++++++++@++@+@+........", +".+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+@+.........", +".+++++++++++++++++++++++++++++++++++++..........", +"................................................"}; diff --git a/app/xterm/icons/xterm_32x32.xcf b/app/xterm/icons/xterm_32x32.xcf new file mode 100644 index 000000000..7a5a5a7a1 Binary files /dev/null and b/app/xterm/icons/xterm_32x32.xcf differ diff --git a/app/xterm/icons/xterm_32x32.xpm b/app/xterm/icons/xterm_32x32.xpm new file mode 100644 index 000000000..361093699 --- /dev/null +++ b/app/xterm/icons/xterm_32x32.xpm @@ -0,0 +1,95 @@ +/* XPM */ +static char * xterm_32x32_xpm[] = { +"32 32 60 1", +" c None", +". c #FFFFFF", +"+ c #000000", +"@ c #EFEFEF", +"# c #FEFEFE", +"$ c #FBFBFB", +"% c #F3F3F3", +"& c #ADADAD", +"* c #909090", +"= c #737373", +"- c #D2D2D2", +"; c #646464", +"> c #9A9A9A", +", c #8D8D8D", +"' c #D3D3D3", +") c #0E0E0E", +"! c #F6F6F6", +"~ c #5E5E5E", +"{ c #B1B1B1", +"] c #777777", +"^ c #949494", +"/ c #757575", +"( c #C4C4C4", +"_ c #E7E7E7", +": c #F1F1F1", +"< c #F8F8F8", +"[ c #EEEEEE", +"} c #F0F0F0", +"| c #FAFAFA", +"1 c #7B7B7B", +"2 c #3D3D3D", +"3 c #868686", +"4 c #4F4F4F", +"5 c #ABABAB", +"6 c #545454", +"7 c #5B5B5B", +"8 c #AFAFAF", +"9 c #292929", +"0 c #181818", +"a c #C7C7C7", +"b c #CFCFCF", +"c c #7F7F7F", +"d c #A3A3A3", +"e c #4D4D4D", +"f c #6A6A6A", +"g c #A1A1A1", +"h c #8E8E8E", +"i c #696969", +"j c #474747", +"k c #5A5A5A", +"l c #959595", +"m c #767676", +"n c #8B8B8B", +"o c #BCBCBC", +"p c #BFBFBF", +"q c #D7D7D7", +"r c #404040", +"s c #636363", +"t c #989898", +"u c #8A8A8A", +"................................", +".....+++++++++++++++++++++++....", +"....+..+++++++++++++++++++..++..", +"....+.+...................+.+.+.", +"....++.@#.$%................+..+", +"....++.&*.=-................+..+", +"....++..;>,.................+..+", +"....++..')!.................+..+", +"....++.#~{].................+..+", +"....++.^{./(................+..+", +"....++......................+..+", +"....++......................+..+", +"....++.____:___<_[..<}..[|..+..+", +"....++.1;21341156]7.89$:0a..+..+", +"....++..bc.8^__8d.e.8fghia..+..+", +"....++..bc.84115jkl.887mna..+..+", +"....++..bc.8d..8dof.88pqna..+..+", +"....++..bc.8rss5d.tu88..na..+...", +"....++......................+.+.", +"....++......................+.+.", +"....+.+...................+.++..", +"....+..+++++++++++++++++++..+...", +".....+++++++++++++++++++++++....", +"................................", +".....++++++++++++++++++++++++...", +"....+.......................+...", +"...+.......................+....", +"...+..++..++.++..++..+..++.+....", +"....++..++..+..++..++.++........", +"..+.......................+.+...", +".+.......................+......", +".++++++++++++++++++++++++++....."}; diff --git a/app/xterm/icons/xterm_48x48.xcf b/app/xterm/icons/xterm_48x48.xcf new file mode 100644 index 000000000..a4dc88efd Binary files /dev/null and b/app/xterm/icons/xterm_48x48.xcf differ diff --git a/app/xterm/icons/xterm_48x48.xpm b/app/xterm/icons/xterm_48x48.xpm new file mode 100644 index 000000000..44fb8109a --- /dev/null +++ b/app/xterm/icons/xterm_48x48.xpm @@ -0,0 +1,53 @@ +/* XPM */ +static char * xterm_48x48_xpm[] = { +"48 48 2 1", +" c #000000", +". c #FFFFFF", +"................................................", +"...... ........", +"..... .................................. ......", +"..... ... ... . .....", +"..... .. ............................ .. .. ....", +"..... . .............................. . ... ...", +"..... . . .... ................... . .... ..", +"..... . .. .... .................... . .... ..", +"..... . ... .. ..................... . .... ..", +"..... . ... .. ..................... . .... ..", +"..... . .... ...................... . .... ..", +"..... . .... ...................... . .... ..", +"..... . ..... ....................... . .... ..", +"..... . .... ...................... . .... ..", +"..... . .... ...................... . .... ..", +"..... . ... .. ..................... . .... ..", +"..... . ... .. ..................... . .... ..", +"..... . .. .... .................... . .... ..", +"..... . . .... ................... . .... ..", +"..... . .............................. . .... ..", +"..... . .............................. . .... ..", +"..... . . . .. ... ... . . .... ..", +"..... . ... .... ...... ... .. ... . . .... ..", +"..... . ... .... ...... ... .. . . . . . .... ..", +"..... . ... .... ... ... . . . . . .... ..", +"..... . ... .... ...... . .... .. .. . . ... ...", +"..... . ... .... ...... .. ... .. .. . . ... ...", +"..... . ... .... .. ... .. ..... . . .. ....", +"..... . .............................. . .. ....", +"..... . .............................. . . .....", +"..... .. ............................ .. . .....", +"..... ... ... ......", +"..... .................................. ......", +"...... ........", +"................................................", +"................................................", +"...... ......", +"..... .................................. ......", +"..... . . . . . . . . . . . . . . . . .. ......", +".... .................................. . ......", +".... . . . . . . . . . . . . . . . . .. . ......", +"... .................................. .. ......", +"... . . . . . . . . . . . . . . . . .. .. ......", +".. .................................. .. .......", +".. . . . . . ........", +". .................................. . .........", +". ..........", +"................................................"}; diff --git a/app/xterm/input.c b/app/xterm/input.c index 75a67753f..9adae7875 100644 --- a/app/xterm/input.c +++ b/app/xterm/input.c @@ -1,6 +1,4 @@ -/* $XTermId: input.c,v 1.283 2007/03/19 23:58:54 tom Exp $ */ - -/* $XFree86: xc/programs/xterm/input.c,v 3.76 2006/06/19 00:36:51 dickey Exp $ */ +/* $XTermId: input.c,v 1.291 2007/07/22 20:34:04 tom Exp $ */ /* * Copyright 1999-2006,2007 by Thomas E. Dickey @@ -72,6 +70,10 @@ #include #endif +#if HAVE_X11_XF86KEYSYM_H +#include +#endif + #include #include @@ -107,6 +109,7 @@ && (keysym == XK_BackSpace)) #define MAP(from, to) case from: result = to; break +#define Masked(value,mask) ((value) & (unsigned) (~(mask))) #define KEYSYM_FMT "0x%04lX" /* simplify matching */ @@ -348,7 +351,7 @@ allowModifierParm(XtermWidget xw, KEY_DATA * kd) #define MODIFIER_NAME(parm, name) (((parm - UNMOD) & name) ? " "#name : "") static short -computeModifierParm(XtermWidget xw, int state) +computeModifierParm(XtermWidget xw, unsigned state) { short modify_parm = UNMOD; @@ -383,9 +386,12 @@ computeModifierParm(XtermWidget xw, int state) return modify_parm; } +#define computeMaskedModifier(xw, state, mask) \ + computeModifierParm(xw, Masked(state, mask)) + #if OPT_NUM_LOCK static unsigned -filterAltMeta(unsigned result, unsigned mask, Boolean enable, KEY_DATA * kd) +filterAltMeta(unsigned result, unsigned mask, Bool enable, KEY_DATA * kd) { if ((result & mask) != 0) { /* @@ -445,7 +451,7 @@ allowedCharModifiers(XtermWidget xw, unsigned state, KEY_DATA * kd) */ if (xw->keyboard.modify_now.other_keys <= 1) { if (IsControlInput(kd) - && (result & ~ControlMask) == 0) { + && Masked(result, ControlMask) == 0) { /* These keys are already associated with the control-key */ if (xw->keyboard.modify_now.other_keys == 0) { result &= ~ControlMask; @@ -454,7 +460,7 @@ allowedCharModifiers(XtermWidget xw, unsigned state, KEY_DATA * kd) ; } else if (IsControlAlias(kd)) { /* Things like "^_" work here... */ - if ((result & ~(ControlMask | ShiftMask)) == 0) { + if (Masked(result, (ControlMask | ShiftMask)) == 0) { result = 0; } } else if (!IsControlOutput(kd) && !IsPredefinedKey(kd->keysym)) { @@ -530,7 +536,7 @@ ModifyOtherKeys(XtermWidget xw, break; #ifdef XK_ISO_Left_Tab case XK_ISO_Left_Tab: - if (computeModifierParm(xw, state & ~ShiftMask) > 1) + if (computeMaskedModifier(xw, state, ShiftMask) > 1) result = True; break; #endif @@ -548,8 +554,7 @@ ModifyOtherKeys(XtermWidget xw, } else if (IsControlAlias(kd)) { if (state == ShiftMask) result = False; - else if (computeModifierParm(xw, - (state & ~ControlMask)) + else if (computeMaskedModifier(xw, state, ControlMask) > 1) { result = True; } @@ -563,7 +568,7 @@ ModifyOtherKeys(XtermWidget xw, switch (kd->keysym) { case XK_BackSpace: /* strip ControlMask as per IsBackarrowToggle() */ - if (computeModifierParm(xw, state & ~ControlMask) > 1) + if (computeMaskedModifier(xw, state, ControlMask) > 1) result = True; break; case XK_Delete: @@ -571,7 +576,7 @@ ModifyOtherKeys(XtermWidget xw, break; #ifdef XK_ISO_Left_Tab case XK_ISO_Left_Tab: - if (computeModifierParm(xw, state & ~ShiftMask) > 1) + if (computeMaskedModifier(xw, state, ShiftMask) > 1) result = True; break; #endif @@ -584,7 +589,7 @@ ModifyOtherKeys(XtermWidget xw, result = True; } else if (state == ShiftMask) { result = (kd->keysym == ' ' || kd->keysym == XK_Return); - } else if (computeModifierParm(xw, state & ~ShiftMask) > 1) { + } else if (computeMaskedModifier(xw, state, ShiftMask) > 1) { result = True; } break; @@ -837,7 +842,10 @@ Input(XtermWidget xw, ", %d:'%s'%s" FMT_MODIFIER_NAMES "%s%s%s%s%s%s\n", kd.keysym, kd.nbytes, - visibleChars(PAIRED_CHARS((Char *) kd.strbuf, 0), kd.nbytes), + visibleChars(PAIRED_CHARS((Char *) kd.strbuf, 0), + ((kd.nbytes > 0) + ? (unsigned) kd.nbytes + : 0)), ARG_MODIFIER_NAMES(evt_state), eightbit ? " 8bit" : " 7bit", IsKeypadKey(kd.keysym) ? " KeypadKey" : "", @@ -1024,7 +1032,7 @@ Input(XtermWidget xw, break; case keyboardIsTermcap: #if OPT_TCAP_FKEYS - if (xtermcapString(xw, kd.keysym, evt_state)) + if (xtermcapString(xw, (int) kd.keysym, evt_state)) return; #endif break; @@ -1093,7 +1101,7 @@ Input(XtermWidget xw, reply.a_final = 'Z'; #if OPT_MOD_FKEYS if (keyboard->modify_now.other_keys > 1 - && computeModifierParm(xw, evt_state & ~ShiftMask) > 1) + && computeMaskedModifier(xw, evt_state, ShiftMask) > 1) modifyOtherKey(&reply, '\t', modify_parm); #endif } else @@ -1624,17 +1632,73 @@ sunfuncvalue(ANSI * reply, KEY_DATA * kd) } #if OPT_NUM_LOCK +#define isName(c) ((c) == '_' || isalnum(CharOf(c))) + /* - * Note that this can only retrieve translations that are given as resource - * values; the default translations in charproc.c for example are not - * retrievable by any interface to X. + * Strip unneeded whitespace from a translations resource, lowercasing and + * returning a malloc'd copy of the result. + */ +static char * +stripTranslations(const char *s) +{ + char *dst = 0; + + if (s != 0) { + dst = malloc(strlen(s) + 1); + + if (dst != 0) { + int state = 0; + int ch = 0; + int prv = 0; + char *d = dst; + + TRACE(("stripping:\n%s\n", s)); + while (*s != '\0') { + ch = *s++; + if (ch == '\n') { + if (d != dst) + *d++ = ch; + state = 0; + } else if (strchr(":!#", ch) != 0) { + while (d != dst && isspace(CharOf(d[-1]))) + --d; + state = -1; + } else if (state >= 0) { + if (isspace(CharOf(ch))) { + if (state == 0 || strchr("<>~ \t", prv)) + continue; + } else if (strchr("<>~", ch)) { + while (d != dst && isspace(CharOf(d[-1]))) + --d; + } + *d++ = char2lower(ch); + ++state; + } + prv = ch; + } + *d = '\0'; + TRACE(("...result:\n%s\n", dst)); + } + } + return dst; +} + +/* + * Make a simple check to see if a given translations keyword appears in + * xterm's translations resource. It does not attempt to parse the strings, + * just makes a case-independent check and ensures that the ends of the match + * are on token-boundaries. + * + * That this can only retrieve translations that are given as resource values; + * the default translations in charproc.c for example are not retrievable by + * any interface to X. * * Also: We can retrieve only the most-specified translation resource. For * example, if the resource file specifies both "*translations" and * "XTerm*translations", we see only the latter. */ static Bool -TranslationsUseKeyword(Widget w, const char *keyword) +TranslationsUseKeyword(Widget w, char **cache, const char *keyword) { static String data; static XtResource key_resources[] = @@ -1643,49 +1707,95 @@ TranslationsUseKeyword(Widget w, const char *keyword) sizeof(data), 0, XtRString, (XtPointer) NULL} }; Bool result = False; + char *copy; + char *test; - XtGetSubresources(w, - (XtPointer) &data, - "vt100", - "VT100", - key_resources, - XtNumber(key_resources), - NULL, - (Cardinal) 0); + if ((test = stripTranslations(keyword)) != 0) { + if (*cache == 0) { + XtGetSubresources(w, + (XtPointer) &data, + "vt100", + "VT100", + key_resources, + XtNumber(key_resources), + NULL, + (Cardinal) 0); + if (data != 0 && (copy = stripTranslations(data)) != 0) { + *cache = copy; + } + } - if (data != 0) { - char *p = data; - int state = 0; - int now = ' ', prv; - TRACE(("TranslationsUseKeyword(%p):%s\n", w, p)); - while (*p != 0) { - prv = now; - now = char2lower(*p++); - if (now == ':' - || now == '!') { - state = -1; - } else if (now == '\n') { - state = 0; - } else if (state >= 0) { - if (isgraph(now) - && now == keyword[state]) { - if ((state != 0 - || !isalnum(prv)) - && ((keyword[++state] == 0) - && !isalnum(CharOf(*p)))) { - result = True; - break; - } - } else { + if (*cache != 0) { + char *p = *cache; + int state = 0; + int now = ' ', prv; + + while (*p != 0) { + prv = now; + now = *p++; + if (now == ':' + || now == '!') { + state = -1; + } else if (now == '\n') { state = 0; + } else if (state >= 0) { + if (now == test[state]) { + if ((state != 0 + || !isName(prv)) + && ((test[++state] == 0) + && !isName(*p))) { + result = True; + break; + } + } else { + state = 0; + } } } } + free(test); } TRACE(("TranslationsUseKeyword(%p, %s) = %d\n", w, keyword, result)); return result; } +static Bool +xtermHasTranslation(XtermWidget xw, const char *keyword) +{ + return (TranslationsUseKeyword(SHELL_OF(xw), + &(xw->keyboard.shell_translations), + keyword) + || TranslationsUseKeyword((Widget) xw, + &(xw->keyboard.xterm_translations), + keyword)); +} + +#if OPT_EXTRA_PASTE +static void +addTranslation(XtermWidget xw, char *fromString, char *toString) +{ + unsigned have = (xw->keyboard.extra_translations + ? strlen(xw->keyboard.extra_translations) + : 0); + unsigned need = (((have != 0) ? (have + 4) : 0) + + strlen(fromString) + + strlen(toString) + + 6); + + if (!xtermHasTranslation(xw, fromString)) { + if ((xw->keyboard.extra_translations + = realloc(xw->keyboard.extra_translations, need)) != 0) { + TRACE(("adding %s: %s\n", fromString, toString)); + if (have) + strcat(xw->keyboard.extra_translations, " \\n\\"); + sprintf(xw->keyboard.extra_translations, "%s: %s", + fromString, toString); + TRACE(("...{%s}\n", xw->keyboard.extra_translations)); + } + } +} +#endif + #define SaveMask(name) xw->misc.name |= mask;\ TRACE(("SaveMask(%s) %#lx (%#lx is%s modifier)\n", \ #name, \ @@ -1702,9 +1812,10 @@ TranslationsUseKeyword(Widget w, const char *keyword) void VTInitModifiers(XtermWidget xw) { - int i, j, k; Display *dpy = XtDisplay(xw); XModifierKeymap *keymap = XGetModifierMapping(dpy); + int i, j, k, l; + KeySym keysym; unsigned long mask; int min_keycode, max_keycode, keysyms_per_keycode = 0; @@ -1722,17 +1833,45 @@ VTInitModifiers(XtermWidget xw) &keysyms_per_keycode); if (theMap != 0) { + +#if OPT_EXTRA_PASTE + /* + * Assume that if we can find the paste keysym in the X keyboard + * mapping that the server allows the corresponding translations + * resource. + */ + int limit = (max_keycode - min_keycode) * keysyms_per_keycode; + for (i = 0; i < limit; ++i) { +#ifdef XF86XK_Paste + if (theMap[i] == XF86XK_Paste) { + TRACE(("keyboard has XF86XK_Paste\n")); + addTranslation(xw, + " XF86Paste", + "insert-selection(SELECT, CUT_BUFFER0)"); + } +#endif +#ifdef SunXK_Paste + if (theMap[i] == SunXK_Paste) { + TRACE(("keyboard has SunXK_Paste\n")); + addTranslation(xw, + " SunPaste", + "insert-selection(SELECT, CUT_BUFFER0)"); + } +#endif + } +#endif /* OPT_EXTRA_PASTE */ + for (i = k = 0, mask = 1; i < 8; i++, mask <<= 1) { for (j = 0; j < keymap->max_keypermod; j++) { - KeyCode code = keymap->modifiermap[k]; - if (code != 0) { - KeySym keysym; - int l = 0; - do { - keysym = XKeycodeToKeysym(dpy, code, l); - l++; - } while (!keysym && l < keysyms_per_keycode); - if (keysym == XK_Num_Lock) { + KeyCode code = keymap->modifiermap[k++]; + if (code == 0) + continue; + + for (l = 0; l < keysyms_per_keycode; ++l) { + keysym = XKeycodeToKeysym(dpy, code, l); + if (keysym == NoSymbol) { + ; + } else if (keysym == XK_Num_Lock) { SaveMask(num_lock); } else if (keysym == XK_Alt_L || keysym == XK_Alt_R) { SaveMask(alt_mods); @@ -1757,7 +1896,6 @@ VTInitModifiers(XtermWidget xw) SaveMask(other_mods); } } - k++; } } XFree(theMap); @@ -1770,8 +1908,7 @@ VTInitModifiers(XtermWidget xw) * use it to modify function-keys when NumLock is active. */ if ((xw->misc.alt_mods != 0) - && (TranslationsUseKeyword(toplevel, "alt") - || TranslationsUseKeyword((Widget) xw, "alt"))) { + && xtermHasTranslation(xw, "alt")) { TRACE(("ALT is used as a modifier in translations (ignore mask)\n")); xw->misc.alt_mods = 0; } @@ -1781,8 +1918,7 @@ VTInitModifiers(XtermWidget xw) * use it to modify function-keys. */ if ((xw->misc.meta_mods != 0) - && (TranslationsUseKeyword(toplevel, "meta") - || TranslationsUseKeyword((Widget) xw, "meta"))) { + && xtermHasTranslation(xw, "meta")) { TRACE(("META is used as a modifier in translations\n")); xw->misc.meta_mods = 0; } diff --git a/app/xterm/keysym2ucs.c b/app/xterm/keysym2ucs.c index b96d9624b..69cf1619d 100644 --- a/app/xterm/keysym2ucs.c +++ b/app/xterm/keysym2ucs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xterm/keysym2ucs.c,v 1.5 2001/06/18 19:09:26 dickey Exp $ +/* $XTermId: keysym2ucs.c,v 1.15 2007/06/13 00:16:56 tom Exp $ * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. * @@ -286,6 +286,7 @@ static struct codepair { { 0x06aa, 0x045a }, /* Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */ { 0x06ab, 0x045b }, /* Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */ { 0x06ac, 0x045c }, /* Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */ + { 0x06ad, 0x0491 }, /* Ukrainian_ghe_with_upturn ґ CYRILLIC SMALL LETTER GHE WITH UPTURN */ { 0x06ae, 0x045e }, /* Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */ { 0x06af, 0x045f }, /* Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */ { 0x06b0, 0x2116 }, /* numerosign № NUMERO SIGN */ @@ -301,6 +302,7 @@ static struct codepair { { 0x06ba, 0x040a }, /* Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */ { 0x06bb, 0x040b }, /* Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */ { 0x06bc, 0x040c }, /* Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */ + { 0x06bd, 0x0490 }, /* Ukrainian_GHE_WITH_UPTURN Ґ CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ { 0x06be, 0x040e }, /* Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */ { 0x06bf, 0x040f }, /* Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */ { 0x06c0, 0x044e }, /* Cyrillic_yu ю CYRILLIC SMALL LETTER YU */ @@ -438,22 +440,22 @@ static struct codepair { { 0x07f7, 0x03c7 }, /* Greek_chi χ GREEK SMALL LETTER CHI */ { 0x07f8, 0x03c8 }, /* Greek_psi ψ GREEK SMALL LETTER PSI */ { 0x07f9, 0x03c9 }, /* Greek_omega ω GREEK SMALL LETTER OMEGA */ - { 0x08a1, 0x23b7 }, /* leftradical ⎷ ??? */ + { 0x08a1, 0x23b7 }, /* leftradical ⎷ RADICAL SYMBOL BOTTOM */ { 0x08a2, 0x250c }, /* topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ { 0x08a3, 0x2500 }, /* horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */ { 0x08a4, 0x2320 }, /* topintegral ⌠ TOP HALF INTEGRAL */ { 0x08a5, 0x2321 }, /* botintegral ⌡ BOTTOM HALF INTEGRAL */ { 0x08a6, 0x2502 }, /* vertconnector │ BOX DRAWINGS LIGHT VERTICAL */ - { 0x08a7, 0x23a1 }, /* topleftsqbracket ⎡ ??? */ - { 0x08a8, 0x23a3 }, /* botleftsqbracket ⎣ ??? */ - { 0x08a9, 0x23a4 }, /* toprightsqbracket ⎤ ??? */ - { 0x08aa, 0x23a6 }, /* botrightsqbracket ⎦ ??? */ - { 0x08ab, 0x239b }, /* topleftparens ⎛ ??? */ - { 0x08ac, 0x239d }, /* botleftparens ⎝ ??? */ - { 0x08ad, 0x239e }, /* toprightparens ⎞ ??? */ - { 0x08ae, 0x23a0 }, /* botrightparens ⎠ ??? */ - { 0x08af, 0x23a8 }, /* leftmiddlecurlybrace ⎨ ??? */ - { 0x08b0, 0x23ac }, /* rightmiddlecurlybrace ⎬ ??? */ + { 0x08a7, 0x23a1 }, /* topleftsqbracket ⎡ LEFT SQUARE BRACKET UPPER CORNER */ + { 0x08a8, 0x23a3 }, /* botleftsqbracket ⎣ LEFT SQUARE BRACKET LOWER CORNER */ + { 0x08a9, 0x23a4 }, /* toprightsqbracket ⎤ RIGHT SQUARE BRACKET UPPER CORNER */ + { 0x08aa, 0x23a6 }, /* botrightsqbracket ⎦ RIGHT SQUARE BRACKET LOWER CORNER */ + { 0x08ab, 0x239b }, /* topleftparens ⎛ LEFT PARENTHESIS UPPER HOOK */ + { 0x08ac, 0x239d }, /* botleftparens ⎝ LEFT PARENTHESIS LOWER HOOK */ + { 0x08ad, 0x239e }, /* toprightparens ⎞ RIGHT PARENTHESIS UPPER HOOK */ + { 0x08ae, 0x23a0 }, /* botrightparens ⎠ RIGHT PARENTHESIS LOWER HOOK */ + { 0x08af, 0x23a8 }, /* leftmiddlecurlybrace ⎨ LEFT CURLY BRACKET MIDDLE PIECE */ + { 0x08b0, 0x23ac }, /* rightmiddlecurlybrace ⎬ RIGHT CURLY BRACKET MIDDLE PIECE */ /* 0x08b1 topleftsummation ? ??? */ /* 0x08b2 botleftsummation ? ??? */ /* 0x08b3 topvertsummationconnector ? ??? */ @@ -487,7 +489,7 @@ static struct codepair { { 0x08fc, 0x2191 }, /* uparrow ↑ UPWARDS ARROW */ { 0x08fd, 0x2192 }, /* rightarrow → RIGHTWARDS ARROW */ { 0x08fe, 0x2193 }, /* downarrow ↓ DOWNWARDS ARROW */ -/* 0x09df blank ? ??? */ + { 0x09df, 0x2422 }, /* blank ␢ BLANK SYMBOL */ { 0x09e0, 0x25c6 }, /* soliddiamond ◆ BLACK DIAMOND */ { 0x09e1, 0x2592 }, /* checkerboard ▒ MEDIUM SHADE */ { 0x09e2, 0x2409 }, /* ht ␉ SYMBOL FOR HORIZONTAL TABULATION */ @@ -501,11 +503,11 @@ static struct codepair { { 0x09ec, 0x250c }, /* upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ { 0x09ed, 0x2514 }, /* lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */ { 0x09ee, 0x253c }, /* crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ - { 0x09ef, 0x23ba }, /* horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */ - { 0x09f0, 0x23bb }, /* horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */ + { 0x09ef, 0x23ba }, /* horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 */ + { 0x09f0, 0x23bb }, /* horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 */ { 0x09f1, 0x2500 }, /* horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */ - { 0x09f2, 0x23bc }, /* horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */ - { 0x09f3, 0x23bd }, /* horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */ + { 0x09f2, 0x23bc }, /* horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 */ + { 0x09f3, 0x23bd }, /* horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 */ { 0x09f4, 0x251c }, /* leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ { 0x09f5, 0x2524 }, /* rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */ { 0x09f6, 0x2534 }, /* bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */ @@ -521,7 +523,7 @@ static struct codepair { { 0x0aa8, 0x200a }, /* hairspace   HAIR SPACE */ { 0x0aa9, 0x2014 }, /* emdash — EM DASH */ { 0x0aaa, 0x2013 }, /* endash – EN DASH */ -/* 0x0aac signifblank ? ??? */ + { 0x0aac, 0x2423 }, /* signifblank ␣ OPEN BOX */ { 0x0aae, 0x2026 }, /* ellipsis … HORIZONTAL ELLIPSIS */ { 0x0aaf, 0x2025 }, /* doubbaselinedot ‥ TWO DOT LEADER */ { 0x0ab0, 0x2153 }, /* onethird ⅓ VULGAR FRACTION ONE THIRD */ @@ -535,7 +537,7 @@ static struct codepair { { 0x0ab8, 0x2105 }, /* careof ℅ CARE OF */ { 0x0abb, 0x2012 }, /* figdash ‒ FIGURE DASH */ { 0x0abc, 0x2329 }, /* leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */ -/* 0x0abd decimalpoint ? ??? */ + { 0x0abd, 0x002e }, /* decimalpoint . FULL STOP */ { 0x0abe, 0x232a }, /* rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */ /* 0x0abf marker ? ??? */ { 0x0ac3, 0x215b }, /* oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */ @@ -699,7 +701,7 @@ static struct codepair { { 0x0dd8, 0x0e38 }, /* Thai_sarau ุ THAI CHARACTER SARA U */ { 0x0dd9, 0x0e39 }, /* Thai_sarauu ู THAI CHARACTER SARA UU */ { 0x0dda, 0x0e3a }, /* Thai_phinthu ฺ THAI CHARACTER PHINTHU */ -/* 0x0dde Thai_maihanakat_maitho ? ??? */ + { 0x0dde, 0x0e3e }, /* Thai_maihanakat_maitho ฾ ??? */ { 0x0ddf, 0x0e3f }, /* Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */ { 0x0de0, 0x0e40 }, /* Thai_sarae เ THAI CHARACTER SARA E */ { 0x0de1, 0x0e41 }, /* Thai_saraae แ THAI CHARACTER SARA AE */ @@ -820,6 +822,18 @@ static struct codepair { { 0x13bc, 0x0152 }, /* OE Œ LATIN CAPITAL LIGATURE OE */ { 0x13bd, 0x0153 }, /* oe œ LATIN SMALL LIGATURE OE */ { 0x13be, 0x0178 }, /* Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */ + { 0x20a0, 0x20a0 }, /* EcuSign ₠ EURO-CURRENCY SIGN */ + { 0x20a1, 0x20a1 }, /* ColonSign ₡ COLON SIGN */ + { 0x20a2, 0x20a2 }, /* CruzeiroSign ₢ CRUZEIRO SIGN */ + { 0x20a3, 0x20a3 }, /* FFrancSign ₣ FRENCH FRANC SIGN */ + { 0x20a4, 0x20a4 }, /* LiraSign ₤ LIRA SIGN */ + { 0x20a5, 0x20a5 }, /* MillSign ₥ MILL SIGN */ + { 0x20a6, 0x20a6 }, /* NairaSign ₦ NAIRA SIGN */ + { 0x20a7, 0x20a7 }, /* PesetaSign ₧ PESETA SIGN */ + { 0x20a8, 0x20a8 }, /* RupeeSign ₨ RUPEE SIGN */ + { 0x20a9, 0x20a9 }, /* WonSign ₩ WON SIGN */ + { 0x20aa, 0x20aa }, /* NewSheqelSign ₪ NEW SHEQEL SIGN */ + { 0x20ab, 0x20ab }, /* DongSign ₫ DONG SIGN */ { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */ }; diff --git a/app/xterm/main.h b/app/xterm/main.h index a4ef1fe5f..cf3cf388b 100644 --- a/app/xterm/main.h +++ b/app/xterm/main.h @@ -1,8 +1,36 @@ -/* $XTermId: main.h,v 1.33 2006/11/23 01:17:09 tom Exp $ */ +/* $XTermId: main.h,v 1.35 2007/07/22 17:13:32 tom Exp $ */ /* $XFree86: xc/programs/xterm/main.h,v 3.15 2006/02/13 01:14:59 dickey Exp $ */ /* + * Copyright 2000-2006,2007 by Thomas E. Dickey + * + * 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 @@ -91,6 +119,14 @@ #define DEF_INITIAL_ERASE False #endif +#ifndef DEF_PTY_STTY_SIZE +#if defined(linux) || defined(__APPLE__) +#define DEF_PTY_STTY_SIZE False +#else +#define DEF_PTY_STTY_SIZE True +#endif +#endif + #ifndef PROJECTROOT #define PROJECTROOT "/usr/X11R6" #endif diff --git a/app/xterm/menu.c b/app/xterm/menu.c index 73b11fe86..30c21151f 100644 --- a/app/xterm/menu.c +++ b/app/xterm/menu.c @@ -1,4 +1,4 @@ -/* $XTermId: menu.c,v 1.232 2007/03/18 23:05:54 tom Exp $ */ +/* $XTermId: menu.c,v 1.237 2007/07/22 20:34:04 tom Exp $ */ /* @@ -46,7 +46,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xterm/menu.c,v 3.68 2006/04/10 00:34:36 dickey Exp $ */ #include #include @@ -412,7 +411,7 @@ static MenuList tek_shell[NUM_POPUP_MENUS]; #endif static String -setMenuLocale(Boolean before, String substitute) +setMenuLocale(Bool before, String substitute) { String result; @@ -657,7 +656,7 @@ domenu(Widget w, update_selectToClipboard(); update_visualbell(); update_poponbell(); - update_marginbell(); + update_bellIsUrgent(); update_cursorblink(); update_altscreen(); update_titeInhibit(); @@ -728,12 +727,13 @@ domenu(Widget w, #if OPT_TEK4014 case tekMenu: - if (created) { + if (created && tekWidget) { set_tekfont_menu_item(tekWidget->screen.cur.fontsize, True); update_vtshow(); } break; #endif + case noMenu: default: break; } @@ -1119,7 +1119,7 @@ do_quit(Widget gw GCC_UNUSED, XtPointer closure GCC_UNUSED, XtPointer data GCC_UNUSED) { - Cleanup(0); + Cleanup(SIGHUP); } /* diff --git a/app/xterm/minstall.sh b/app/xterm/minstall.sh index 158f41c55..89e17da51 100644 --- a/app/xterm/minstall.sh +++ b/app/xterm/minstall.sh @@ -1,8 +1,8 @@ #!/bin/sh -# $XFree86: xc/programs/xterm/minstall.sh,v 1.5 2006/04/10 00:34:37 dickey Exp $ +# $XTermId: minstall.sh,v 1.12 2007/08/12 15:29:02 tom Exp $ # # Install manpages, substituting a reasonable section value since XFree86 4.x -# doesn't use constants... +# and derived imakes do not use constants... # # Parameters: # $1 = program to invoke as "install" @@ -11,18 +11,32 @@ # $4 = app-defaults directory # +# override locale... +LANG=C; export LANG +LANGUAGE=C; export LANGUAGE +LC_ALL=C; export LC_ALL +LC_CTYPE=C; export LC_CTYPE + +# get parameters MINSTALL="$1" OLD_FILE="$2" END_FILE="$3" APPS_DIR="$4" -suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'` +suffix=`echo "$END_FILE" | sed -e 's%^.*\.%%'` NEW_FILE=temp$$ +MY_MANSECT=$suffix + +# "X" is usually in the miscellaneous section, along with "undocumented". +# Use that to guess an appropriate section. +X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'` +test -z "$X_MANSECT" && X_MANSECT=$suffix + sed -e 's%__vendorversion__%"X Window System"%' \ -e s%__apploaddir__%$APPS_DIR% \ - -e s%__mansuffix__%$suffix%g \ - -e s%__miscmansuffix__%$suffix%g \ + -e s%__mansuffix__%$MY_MANSECT%g \ + -e s%__miscmansuffix__%$X_MANSECT%g \ $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" diff --git a/app/xterm/misc.c b/app/xterm/misc.c index 240402773..041192e32 100644 --- a/app/xterm/misc.c +++ b/app/xterm/misc.c @@ -1,6 +1,4 @@ -/* $XTermId: misc.c,v 1.359 2007/03/21 22:13:32 tom Exp $ */ - -/* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */ +/* $XTermId: misc.c,v 1.370 2007/07/22 20:34:04 tom Exp $ */ /* * @@ -67,6 +65,7 @@ #include #include +#include #include #include @@ -125,7 +124,7 @@ static char * Readlink(const char *filename) { char *buf = NULL; - int size = 100; + unsigned size = 100; int n; for (;;) { @@ -138,7 +137,7 @@ Readlink(const char *filename) return NULL; } - if (n < size) { + if ((unsigned) n < size) { return buf; } @@ -246,7 +245,7 @@ DoSpecialLeaveNotify(XtermWidget xw, XEnterWindowEvent * ev) #endif static void -setXUrgency(TScreen * screen, Boolean enable) +setXUrgency(TScreen * screen, Bool enable) { if (screen->bellIsUrgent) { XWMHints *h = XGetWMHints(screen->display, VShellWindow); @@ -497,23 +496,19 @@ HandleSpawnTerminal(Widget w GCC_UNUSED, || setgid(screen->gid) == -1) { fprintf(stderr, "Cannot reset uid/gid\n"); } else { - if (nparams != 0) { - int myargc = *nparams + 1; - char **myargv = TypeMallocN(char *, myargc + 1); - if (myargv != 0) { - int n = 0; - myargv[n++] = child_exe; - while (n <= myargc) { - myargv[n] = params[n - 1]; - ++n; - } - myargv[n] = 0; - execv(child_exe, myargv); - } - } else { - execl(child_exe, child_exe, NULL); + int myargc = *nparams + 1; + char **myargv = TypeMallocN(char *, myargc + 1); + int n = 0; + + myargv[n++] = child_exe; + + while (n < myargc) { + myargv[n++] = *params++; } + myargv[n] = 0; + execv(child_exe, myargv); + /* If we get here, we've failed */ fprintf(stderr, "exec of '%s': %s\n", child_exe, SysErrorMsg(errno)); } @@ -1435,7 +1430,7 @@ StartLog(TScreen * screen) close(ConnectionNumber(screen->display)); close(screen->respond); - if ((((cp = getenv("SHELL")) == NULL || *cp == 0) + if ((((cp = x_getenv("SHELL")) == NULL) && ((pw = getpwuid(screen->uid)) == NULL || *(cp = pw->pw_shell) == 0)) || (shell = CastMallocN(char, strlen(cp))) == 0) { @@ -1874,13 +1869,11 @@ xtermIsPrintable(TScreen * screen, Char ** bufp, Char * last) #if OPT_WIDE_CHARS if (xtermEnvUTF8() && screen->utf8_title) { PtyData data; - Boolean controls = True; if (decodeUtf8(fakePtyData(&data, cp, last))) { if (data.utf_data != UCS_REPL && (data.utf_data >= 128 || ansi_table[data.utf_data] == CASE_PRINT)) { - controls = False; next += (data.utf_size - 1); result = True; } else { @@ -2140,7 +2133,7 @@ do_osc(XtermWidget xw, Char * oscbuf, unsigned len GCC_UNUSED, int final) { TScreen *screen = &(xw->screen); int mode; - Char *cp, *c2; + Char *cp; int state = 0; char *buf = 0; @@ -2178,7 +2171,6 @@ do_osc(XtermWidget xw, Char * oscbuf, unsigned len GCC_UNUSED, int final) state = 3; /* FALLTHRU */ default: - c2 = cp; if (!xtermIsPrintable(screen, &cp, oscbuf + len)) { switch (mode) { case 0: @@ -2792,7 +2784,8 @@ ChangeGroup(String attribute, char *value) TRACE(("ChangeGroup(attribute=%s, value=%s)\n", attribute, name)); - (void) screen; + if (!screen->allowTitleOps) + return; /* * Ignore titles that are too long to be plausible requests. @@ -2803,7 +2796,7 @@ ChangeGroup(String attribute, char *value) for (cp = c1; *cp != 0; ++cp) { Char *c2 = cp; if (!xtermIsPrintable(screen, &cp, c1 + limit)) { - memset(c2, '?', cp + 1 - c2); + memset(c2, '?', (unsigned) (cp + 1 - c2)); } } @@ -3017,90 +3010,91 @@ Panic(char *s GCC_UNUSED, int a GCC_UNUSED) #endif /* DEBUG */ } -char * -SysErrorMsg(int n) +const char * +SysErrorMsg(int code) { static char unknown[] = "unknown error"; - char *s = strerror(n); + char *s = strerror(code); return s ? s : unknown; } -void -SysError(int i) +const char * +SysReasonMsg(int code) { - static const char *table[] = - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - ,"main: ioctl() failed on FIONBIO" /* 11 */ - ,"main: ioctl() failed on F_GETFL" /* 12 */ - ,"main: ioctl() failed on F_SETFL" /* 13 */ - ,"spawn: open() failed on /dev/tty" /* 14 */ - ,"spawn: ioctl() failed on TIOCGETP" /* 15 */ - ,0 - ,"spawn: ptsname() failed" /* 17 */ - ,"spawn: open() failed on ptsname" /* 18 */ - ,"spawn: ioctl() failed on I_PUSH/\"ptem\"" /* 19 */ - ,"spawn: ioctl() failed on I_PUSH/\"consem\"" /* 20 */ - ,"spawn: ioctl() failed on I_PUSH/\"ldterm\"" /* 21 */ - ,"spawn: ioctl() failed on I_PUSH/\"ttcompat\"" /* 22 */ - ,"spawn: ioctl() failed on TIOCSETP" /* 23 */ - ,"spawn: ioctl() failed on TIOCSETC" /* 24 */ - ,"spawn: ioctl() failed on TIOCSETD" /* 25 */ - ,"spawn: ioctl() failed on TIOCSLTC" /* 26 */ - ,"spawn: ioctl() failed on TIOCLSET" /* 27 */ - ,"spawn: initgroups() failed" /* 28 */ - ,"spawn: fork() failed" /* 29 */ - ,"spawn: exec() failed" /* 30 */ - ,0 - ,"get_pty: not enough ptys" /* 32 */ - ,0 - ,"waiting for initial map" /* 34 */ - ,"spawn: setuid() failed" /* 35 */ - ,"spawn: can't initialize window" /* 36 */ - ,0, 0, 0, 0, 0, 0, 0, 0, 0 - ,"spawn: ioctl() failed on TIOCKSET" /* 46 */ - ,"spawn: ioctl() failed on TIOCKSETC" /* 47 */ - ,"spawn: realloc of ttydev failed" /* 48 */ - ,"luit: command-line malloc failed" /* 49 */ - ,"in_put: select() failed" /* 50 */ - ,0, 0, 0 - ,"VTInit: can't initialize window" /* 54 */ - ,0, 0 - ,"HandleKeymapChange: malloc failed" /* 57 */ - ,0, 0 - ,"Tinput: select() failed" /* 60 */ - ,0, 0, 0 - ,"TekInit: can't initialize window" /* 64 */ - ,0, 0, 0, 0, 0, 0 - ,"SaltTextAway: malloc() failed" /* 71 */ - ,0, 0, 0, 0, 0, 0, 0, 0 - ,"StartLog: exec() failed" /* 80 */ - ,0, 0 - ,"xerror: XError event" /* 83 */ - ,"xioerror: X I/O error" /* 84 */ - ,0, 0, 0, 0, 0 - ,"Alloc: calloc() failed on base" /* 90 */ - ,"Alloc: calloc() failed on rows" /* 91 */ - ,"ScreenResize: realloc() failed on alt base" /* 92 */ - ,0, 0, 0 - ,"ScreenResize: malloc() or realloc() failed" /* 96 */ - ,0, 0, 0, 0, 0 - ,"ScrnPointers: malloc/realloc() failed" /* 102 */ - ,0, 0, 0, 0, 0, 0, 0 - ,"ScrollBarOn: realloc() failed on base" /* 110 */ - ,"ScrollBarOn: realloc() failed on rows" /* 111 */ - ,0, 0, 0, 0, 0, 0, 0, 0, 0 - ,"my_memmove: malloc/realloc failed" /* 121 */ + /* *INDENT-OFF* */ + static const struct { + int code; + const char *name; + } table[] = { + { ERROR_FIONBIO, "main: ioctl() failed on FIONBIO" }, + { ERROR_F_GETFL, "main: ioctl() failed on F_GETFL" }, + { ERROR_F_SETFL, "main: ioctl() failed on F_SETFL", }, + { ERROR_OPDEVTTY, "spawn: open() failed on /dev/tty", }, + { ERROR_TIOCGETP, "spawn: ioctl() failed on TIOCGETP", }, + { ERROR_PTSNAME, "spawn: ptsname() failed", }, + { ERROR_OPPTSNAME, "spawn: open() failed on ptsname", }, + { ERROR_PTEM, "spawn: ioctl() failed on I_PUSH/\"ptem\"" }, + { ERROR_CONSEM, "spawn: ioctl() failed on I_PUSH/\"consem\"" }, + { ERROR_LDTERM, "spawn: ioctl() failed on I_PUSH/\"ldterm\"" }, + { ERROR_TTCOMPAT, "spawn: ioctl() failed on I_PUSH/\"ttcompat\"" }, + { ERROR_TIOCSETP, "spawn: ioctl() failed on TIOCSETP" }, + { ERROR_TIOCSETC, "spawn: ioctl() failed on TIOCSETC" }, + { ERROR_TIOCSETD, "spawn: ioctl() failed on TIOCSETD" }, + { ERROR_TIOCSLTC, "spawn: ioctl() failed on TIOCSLTC" }, + { ERROR_TIOCLSET, "spawn: ioctl() failed on TIOCLSET" }, + { ERROR_INIGROUPS, "spawn: initgroups() failed" }, + { ERROR_FORK, "spawn: fork() failed" }, + { ERROR_EXEC, "spawn: exec() failed" }, + { ERROR_PTYS, "get_pty: not enough ptys" }, + { ERROR_PTY_EXEC, "waiting for initial map" }, + { ERROR_SETUID, "spawn: setuid() failed" }, + { ERROR_INIT, "spawn: can't initialize window" }, + { ERROR_TIOCKSET, "spawn: ioctl() failed on TIOCKSET" }, + { ERROR_TIOCKSETC, "spawn: ioctl() failed on TIOCKSETC" }, + { ERROR_SPREALLOC, "spawn: realloc of ttydev failed" }, + { ERROR_LUMALLOC, "luit: command-line malloc failed" }, + { ERROR_SELECT, "in_put: select() failed" }, + { ERROR_VINIT, "VTInit: can't initialize window" }, + { ERROR_KMMALLOC1, "HandleKeymapChange: malloc failed" }, + { ERROR_TSELECT, "Tinput: select() failed" }, + { ERROR_TINIT, "TekInit: can't initialize window" }, + { ERROR_BMALLOC2, "SaltTextAway: malloc() failed" }, + { ERROR_LOGEXEC, "StartLog: exec() failed" }, + { ERROR_XERROR, "xerror: XError event" }, + { ERROR_XIOERROR, "xioerror: X I/O error" }, + { ERROR_SCALLOC, "Alloc: calloc() failed on base" }, + { ERROR_SCALLOC2, "Alloc: calloc() failed on rows" }, + { ERROR_SREALLOC, "ScreenResize: realloc() failed on alt base" }, + { ERROR_RESIZE, "ScreenResize: malloc() or realloc() failed" }, + { ERROR_SAVE_PTR, "ScrnPointers: malloc/realloc() failed" }, + { ERROR_SBRALLOC, "ScrollBarOn: realloc() failed on base" }, + { ERROR_SBRALLOC2, "ScrollBarOn: realloc() failed on rows" }, + { ERROR_MMALLOC, "my_memmove: malloc/realloc failed" }, }; - int oerrno; + /* *INDENT-ON* */ - oerrno = errno; - fprintf(stderr, "%s: Error %d, errno %d: ", xterm_name, i, oerrno); - fprintf(stderr, "%s\n", SysErrorMsg(oerrno)); - if ((Cardinal) i < XtNumber(table) && table[i] != 0) { - fprintf(stderr, "Reason: %s\n", table[i]); + Cardinal n; + const char *result = "?"; + + for (n = 0; n < XtNumber(table); ++n) { + if (code == table[n].code) { + result = table[n].name; + break; + } } - Cleanup(i); + return result; +} + +void +SysError(int code) +{ + int oerrno = errno; + + fprintf(stderr, "%s: Error %d, errno %d: ", xterm_name, code, oerrno); + fprintf(stderr, "%s\n", SysErrorMsg(oerrno)); + fprintf(stderr, "Reason: %s\n", SysReasonMsg(code)); + + Cleanup(code); } /* @@ -3160,7 +3154,7 @@ xtermFindShell(char *leaf, Bool warning) TRACE(("xtermFindShell(%s)\n", leaf)); if (*result != '\0' && strchr("+/-", *result) == 0) { /* find it in $PATH */ - if ((s = getenv("PATH")) != 0) { + if ((s = x_getenv("PATH")) != 0) { if ((tmp = TypeMallocN(char, strlen(leaf) + strlen(s) + 1)) != 0) { Bool found = False; while (*s != '\0') { @@ -3203,6 +3197,26 @@ xtermFindShell(char *leaf, Bool warning) } #endif /* VMS */ +#define ENV_HUNK(n) ((((n) + 1) | 31) + 1) + +/* + * copy the environment before Setenv'ing. + */ +void +xtermCopyEnv(char **oldenv) +{ + unsigned size; + char **newenv; + + for (size = 0; oldenv[size] != NULL; size++) { + ; + } + + newenv = TypeCallocN(char *, ENV_HUNK(size)); + memmove(newenv, oldenv, size * sizeof(char *)); + environ = newenv; +} + /* * sets the value of var to be arg in the Unix 4.2 BSD environment env. * Var should end with '=' (bindings are of the form "var=value"). @@ -3214,28 +3228,48 @@ void xtermSetenv(char *var, char *value) { if (value != 0) { + char *test; int envindex = 0; size_t len = strlen(var); + int found = -1; - TRACE(("xtermSetenv(var=%s, value=%s)\n", var, value)); + TRACE(("xtermSetenv(%s=%s)\n", var, value)); - while (environ[envindex] != NULL) { - if (strncmp(environ[envindex], var, len) == 0) { - /* found it */ - environ[envindex] = CastMallocN(char, len + strlen(value)); - strcpy(environ[envindex], var); - strcat(environ[envindex], value); - return; + while ((test = environ[envindex]) != NULL) { + if (strncmp(test, var, len) == 0 && test[len] == '=') { + found = envindex; + break; } envindex++; } - TRACE(("...expanding env to %d\n", envindex + 1)); + if (found < 0) { + unsigned need = ENV_HUNK(envindex + 1); + unsigned have = ENV_HUNK(envindex); - environ[envindex] = CastMallocN(char, len + strlen(value)); - (void) strcpy(environ[envindex], var); - strcat(environ[envindex], value); - environ[++envindex] = NULL; + if (need > have) { + char **newenv; + newenv = TypeMallocN(char *, need); + if (newenv == 0) { + fprintf(stderr, "Cannot increase environment\n"); + return; + } + memmove(newenv, environ, have * sizeof(*newenv)); + free(environ); + environ = newenv; + } + + found = envindex; + environ[found + 1] = NULL; + environ = environ; + } + + environ[found] = CastMallocN(char, 1 + len + strlen(value)); + if (environ[found] == 0) { + fprintf(stderr, "Cannot allocate environment %s\n", var); + return; + } + sprintf(environ[found], "%s=%s", var, value); } } @@ -3267,14 +3301,12 @@ xioerror(Display * dpy) void xt_error(String message) { - char *ptr; - (void) fprintf(stderr, "%s Xt error: %s\n", ProgramName, message); /* * Check for the obvious - Xt does a poor job of reporting this. */ - if ((ptr = getenv("DISPLAY")) == 0 || *x_strtrim(ptr) == '\0') { + if (x_getenv("DISPLAY") == 0) { fprintf(stderr, "%s: DISPLAY is not set\n", ProgramName); } exit(1); @@ -3577,7 +3609,7 @@ sortedOpts(OptionHelp * options, XrmOptionDescRec * descs, Cardinal numDescs) } /* - * Report the locale that xterm was started in. + * Report the character-type locale that xterm was started in. */ char * xtermEnvLocale(void) @@ -3585,10 +3617,9 @@ xtermEnvLocale(void) static char *result; if (result == 0) { - if ((result = getenv("LC_ALL")) == 0 || *result == '\0') - if ((result = getenv("LC_CTYPE")) == 0 || *result == '\0') - if ((result = getenv("LANG")) == 0 || *result == '\0') - result = ""; + if ((result = x_nonempty(setlocale(LC_CTYPE, 0))) == 0) { + result = "C"; + } TRACE(("xtermEnvLocale ->%s\n", result)); } return result; @@ -3604,7 +3635,7 @@ xtermEnvEncoding(void) result = nl_langinfo(CODESET); #else char *locale = xtermEnvLocale(); - if (*locale == 0 || !strcmp(locale, "C") || !strcmp(locale, "POSIX")) { + if (!strcmp(locale, "C") || !strcmp(locale, "POSIX")) { result = "ASCII"; } else { result = "ISO-8859-1"; diff --git a/app/xterm/mkdirs.sh b/app/xterm/mkdirs.sh index ffe7494c4..d6c0161a4 100644 --- a/app/xterm/mkdirs.sh +++ b/app/xterm/mkdirs.sh @@ -1,10 +1,12 @@ #! /bin/sh +# $Id: mkdirs.sh,v 1.1.1.2 2007/08/25 18:54:02 matthieu Exp $ +# ----------------------------------------------------------------------------- # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman # Created: 1993-05-16 # Last modified: 1994-03-25 # Public domain -# +# ----------------------------------------------------------------------------- errstatus=0 umask 022 @@ -24,8 +26,19 @@ for file in ${1+"$@"} ; do echo "mkdir $pathcomp" 1>&2 case "$pathcomp" in [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: ) - ;; # DOSISH systems - * ) mkdir "$pathcomp" || errstatus=$? ;; + ;; # DOSISH systems + * ) + mkdir "$pathcomp" + errstatus=$? + if test $errstatus != 0 + then + # may have failed if invoked in a parallel "make -j# install" + if test -d "$pathcomp" + then + errstatus=0 + fi + fi + ;; esac fi diff --git a/app/xterm/os2main.c b/app/xterm/os2main.c index 34da4e1b7..95151c60f 100644 --- a/app/xterm/os2main.c +++ b/app/xterm/os2main.c @@ -1,4 +1,4 @@ -/* $XTermId: os2main.c,v 1.247 2007/03/19 23:48:32 tom Exp $ */ +/* $XTermId: os2main.c,v 1.251 2007/07/10 20:22:05 tom Exp $ */ /* removed all foreign stuff to get the code more clear (hv) * and did some rewrite for the obscure OS/2 environment @@ -127,7 +127,7 @@ ttyname(int fd) static SIGNAL_T reapchild(int n); static int spawnXTerm(XtermWidget /* xw */ ); -static void resize_termcap(XTermWidget xw, char *oldtc, char *newtc); +static void resize_termcap(XtermWidget xw, char *newtc); static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode); static Bool added_utmp_entry = False; @@ -192,6 +192,8 @@ static struct termio d_tio; #define CWERASE CONTROL('W') #endif +#define TERMIO_STRUCT struct termio + /* * SYSV has the termio.c_cc[V] and ltchars; BSD has tchars and ltchars; * SVR4 has only termio.c_cc, but it includes everything from ltchars. @@ -295,13 +297,13 @@ static XtResource application_resources[] = Bres("ptyInitialErase", "PtyInitialErase", ptyInitialErase, DEF_INITIAL_ERASE), Bres("backarrowKeyIsErase", "BackarrowKeyIsErase", backarrow_is_erase, DEF_BACKARO_ERASE), #endif - Bres("waitForMap", "WaitForMap", wait_for_map, False), Bres("useInsertMode", "UseInsertMode", useInsertMode, False), #if OPT_ZICONBEEP Ires("zIconBeep", "ZIconBeep", zIconBeep, 0), #endif #if OPT_PTY_HANDSHAKE - Bres("ptyHandshake", "PtyHandshake", ptyHandshake, True), + Bres("waitForMap", "WaitForMap", wait_for_map, False), + Bres("ptyHandshake", "PtyHandshake", ptyHandshake, DEF_PTY_HANDSHAKE), #endif #if OPT_SAME_NAME Bres("sameName", "SameName", sameName, True), @@ -1447,6 +1449,7 @@ hungtty(int i GCC_UNUSED) SIGNAL_RETURN; } +#if OPT_PTY_HANDSHAKE struct { int rows; int cols; @@ -1458,11 +1461,14 @@ struct { void first_map_occurred(void) { - TScreen *screen = TScreenOf(term); - handshake.rows = screen->max_row; - handshake.cols = screen->max_col; - resource.wait_for_map = False; + if (resource.wait_for_map) { + TScreen *screen = TScreenOf(term); + handshake.rows = screen->max_row; + handshake.cols = screen->max_col; + resource.wait_for_map = False; + } } +#endif /* OPT_PTY_HANDSHAKE else !OPT_PTY_HANDSHAKE */ static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode) @@ -1474,26 +1480,10 @@ set_owner(char *device, uid_t uid, gid_t gid, mode_t mode) if (why != ENOENT && save_ruid == 0) { fprintf(stderr, "Cannot chown %s to %ld,%ld: %s\n", - device, (long) uid, (long) gid, strerror(why)); + device, (long) uid, (long) gid, + strerror(why)); } } -#ifndef __EMX__ -/* EMX can chmod files only, not devices */ - if (chmod(device, mode) < 0) { - why = errno; - if (why != ENOENT) { - struct stat sb; - if (stat(device, &sb) < 0) { - fprintf(stderr, "Cannot chmod %s to %03o: %s\n", - device, mode, strerror(why)); - } else { - fprintf(stderr, - "Cannot chmod %s to %03o currently %03o: %s\n", - device, mode, (sb.st_mode & S_IFMT), strerror(why)); - } - } - } -#endif } #define THE_PARENT 1 @@ -1538,13 +1528,14 @@ spawnXTerm(XtermWidget xw) int Xsocket = ConnectionNumber(screen->display); int ttyfd = -1; - struct termio tio; + TERMIO_STRUCT tio; int status; + Bool ok_termcap; + char *newtc; - char newtc[TERMCAP_SIZE]; char *TermName = NULL; char *ptr, *shname, buf[64]; - int i, no_dev_tty = False, envsize; + int i, no_dev_tty = False; char *dev_tty_name = (char *) 0; TTYSIZE_STRUCT ts; int pgrp = getpid(); @@ -1641,12 +1632,12 @@ spawnXTerm(XtermWidget xw) #if OPT_TEK4014 if (TEK4014_ACTIVE(xw)) { envnew = tekterm; - ptr = TekScreenOf(tekWidget)->tcapbuf; + newtc = TekScreenOf(tekWidget)->tcapbuf; } else #endif { envnew = vtterm; - ptr = screen->tcapbuf; + newtc = screen->tcapbuf; } /* @@ -1656,13 +1647,13 @@ spawnXTerm(XtermWidget xw) * entry is not found. */ ok_termcap = True; - if (!get_termcap(TermName = resource.term_name, ptr)) { + if (!get_termcap(TermName = resource.term_name, newtc)) { char *last = NULL; TermName = *envnew; ok_termcap = False; while (*envnew != NULL) { if ((last == NULL || strcmp(last, *envnew)) - && get_termcap(*envnew, ptr)) { + && get_termcap(*envnew, newtc)) { TermName = *envnew; ok_termcap = True; break; @@ -1672,7 +1663,7 @@ spawnXTerm(XtermWidget xw) } } if (ok_termcap) { - resize_termcap(xw, ptr, newtc); + resize_termcap(xw, newtc); } /* tell tty how big window is */ @@ -1754,7 +1745,7 @@ opencons();*/ * not have a line discipline structure */ { - struct termio t, t1; + TERMIO_STRUCT t, t1; if (ptioctl(ttyfd, TCGETA, (char *) &t) < 0) t = d_tio; @@ -1769,7 +1760,8 @@ opencons();*/ if (Console) { int on = 1; if (ioctl(ttyfd, TIOCCONS, (char *) &on) == -1) - fprintf(stderr, "%s: cannot open console\n", xterm_name); + fprintf(stderr, "%s: cannot open console: %s\n", + xterm_name, strerror(errno)); } } @@ -1781,29 +1773,20 @@ opencons();*/ signal(SIGQUIT, SIG_DFL); signal(SIGTERM, SIG_DFL); - /* copy the environment before Setenv'ing */ - for (i = 0; gblenvp[i] != NULL; i++) ; + xtermCopyEnv(gblenvp); - /* compute number of xtermSetenv() calls below */ - envsize = 1; /* (NULL terminating entry) */ - envsize += 5; /* TERM, WINDOWID, DISPLAY, _SHELL, _VERSION */ - envsize += 2; /* COLUMNS, LINES */ - - envnew = TypeCallocN(char *, (unsigned) i + envsize); - memmove((char *) envnew, (char *) gblenvp, i * sizeof(char *)); - gblenvp = envnew; - xtermSetenv("TERM=", TermName); + xtermSetenv("TERM", TermName); if (!TermName) *newtc = 0; sprintf(buf, "%lu", ((unsigned long) XtWindow(SHELL_OF(CURRENT_EMU())))); - xtermSetenv("WINDOWID=", buf); + xtermSetenv("WINDOWID", buf); /* put the display into the environment of the shell */ - xtermSetenv("DISPLAY=", XDisplayString(screen->display)); + xtermSetenv("DISPLAY", XDisplayString(screen->display)); - xtermSetenv("XTERM_VERSION=", xtermVersion()); + xtermSetenv("XTERM_VERSION", xtermVersion()); signal(SIGTERM, SIG_DFL); @@ -1833,12 +1816,11 @@ opencons();*/ } sprintf(numbuf, "%d", MaxCols(screen)); - xtermSetenv("COLUMNS=", numbuf); + xtermSetenv("COLUMNS", numbuf); sprintf(numbuf, "%d", MaxRows(screen)); - xtermSetenv("LINES=", numbuf); + xtermSetenv("LINES", numbuf); - /* reconstruct dead environ variable */ - environ = gblenvp; + gblenvp = environ; /* need to reset after all the ioctl bashing we did above */ ptioctl(0, TIOCSWINSZ, (char *) &ts); @@ -1862,7 +1844,7 @@ opencons();*/ * to command that the user gave anyway. */ if (command_to_exec_with_luit) { - xtermSetenv("XTERM_SHELL=", + xtermSetenv("XTERM_SHELL", xtermFindShell(*command_to_exec_with_luit, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec_with_luit)); execvp(*command_to_exec_with_luit, command_to_exec_with_luit); @@ -1874,7 +1856,7 @@ opencons();*/ } #endif if (command_to_exec) { - xtermSetenv("XTERM_SHELL=", + xtermSetenv("XTERM_SHELL", xtermFindShell(*command_to_exec, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec)); execvpe(*command_to_exec, command_to_exec, gblenvp); @@ -1885,14 +1867,14 @@ opencons();*/ } /* use a layered mechanism to find a shell */ - ptr = getenv("X11SHELL"); + ptr = x_getenv("X11SHELL"); if (!ptr) - ptr = getenv("SHELL"); + ptr = x_getenv("SHELL"); if (!ptr) - ptr = getenv("OS2_SHELL"); + ptr = x_getenv("OS2_SHELL"); if (!ptr) ptr = "SORRY_NO_SHELL_FOUND"; - xtermSetenv("XTERM_SHELL=", ptr); + xtermSetenv("XTERM_SHELL", ptr); shname = x_basename(ptr); if (command_to_exec) { @@ -1968,7 +1950,7 @@ Exit(int n) /* ARGSUSED */ static void -resize_termcap(XTermWidget xw, TScreen * screen, char *oldtc, char *newtc) +resize_termcap(XtermWidget xw, char *newtc) { } @@ -2032,13 +2014,17 @@ parse_tty_modes(char *s, struct _xttymodes *modelist) TRACE(("parse_tty_modes\n")); while (1) { + size_t len; + while (*s && isascii(CharOf(*s)) && isspace(CharOf(*s))) s++; if (!*s) return count; + for (len = 0; isalnum(CharOf(s[len])); ++len) ; for (mp = modelist; mp->name; mp++) { - if (strncmp(s, mp->name, mp->len) == 0) + if (len == mp->len + && strncmp(s, mp->name, mp->len) == 0) break; } if (!mp->name) @@ -2082,7 +2068,7 @@ ptioctl(int fd, int func, void *data) APIRET rc; ULONG len; struct pt_termios pt; - struct termio *t; + TERMIO_STRUCT *t; int i; switch (func) { @@ -2092,7 +2078,7 @@ ptioctl(int fd, int func, void *data) (ULONG *) & pt, sizeof(struct pt_termios), &len); if (rc) return -1; - t = (struct termio *) data; + t = (TERMIO_STRUCT *) data; t->c_iflag = pt.c_iflag; t->c_oflag = pt.c_oflag; t->c_cflag = pt.c_cflag; @@ -2103,7 +2089,7 @@ ptioctl(int fd, int func, void *data) case TCSETA: case TCSETAW: case TCSETAF: - t = (struct termio *) data; + t = (TERMIO_STRUCT *) data; pt.c_iflag = t->c_iflag; pt.c_oflag = t->c_oflag; pt.c_cflag = t->c_cflag; diff --git a/app/xterm/ptydata.c b/app/xterm/ptydata.c index 6cbef4068..63de748de 100644 --- a/app/xterm/ptydata.c +++ b/app/xterm/ptydata.c @@ -1,4 +1,4 @@ -/* $XTermId: ptydata.c,v 1.77 2007/03/12 23:42:49 tom Exp $ */ +/* $XTermId: ptydata.c,v 1.78 2007/04/15 20:37:16 tom Exp $ */ /* * $XFree86: xc/programs/xterm/ptydata.c,v 1.25 2006/02/13 01:14:59 dickey Exp $ @@ -121,7 +121,7 @@ decodeUtf8(PtyData * data) if ((utf_char >= 0xd800 && utf_char <= 0xdfff) || (utf_char == 0xfffe) || - (utf_char == 0xffff)) { + (utf_char == HIDDEN_CHAR)) { utf_char = UCS_REPL; } utf_count--; diff --git a/app/xterm/resize.c b/app/xterm/resize.c index 41160e1a4..878009060 100644 --- a/app/xterm/resize.c +++ b/app/xterm/resize.c @@ -1,9 +1,7 @@ -/* $XTermId: resize.c,v 1.101 2007/03/19 23:39:10 tom Exp $ */ - -/* $XFree86: xc/programs/xterm/resize.c,v 3.62 2006/02/13 01:14:59 dickey Exp $ */ +/* $XTermId: resize.c,v 1.104 2007/07/22 20:34:04 tom Exp $ */ /* - * Copyright 2003-2005,2006 by Thomas E. Dickey + * Copyright 2003-2006,2007 by Thomas E. Dickey * * All Rights Reserved * @@ -227,7 +225,10 @@ print_termcap(const char *termcap) int main(int argc, char **argv ENVP_ARG) { - register char *ptr, *env; +#ifdef USE_TERMCAP + register char *env; +#endif + register char *ptr; register int emu = VT100; char *shell; struct passwd *pw; @@ -279,7 +280,7 @@ main(int argc, char **argv ENVP_ARG) /* Find out what kind of shell this user is running. * This is the same algorithm that xterm uses. */ - if (((ptr = getenv("SHELL")) == NULL || *ptr == 0) && + if (((ptr = x_getenv("SHELL")) == NULL) && (((pw = getpwuid(getuid())) == NULL) || *(ptr = pw->pw_shell) == 0)) /* this is the same default that xterm uses */ @@ -318,24 +319,23 @@ main(int argc, char **argv ENVP_ARG) } tty = fileno(ttyfp); #ifdef USE_TERMCAP - if (!(env = getenv("TERM")) || !*env) { + if ((env = x_getenv("TERM")) == 0) { env = DFT_TERMTYPE; if (SHELL_BOURNE == shell_type) - setname = "TERM=xterm;\nexport TERM;\n"; + setname = "TERM=" DFT_TERMTYPE ";\nexport TERM;\n"; else - setname = "setenv TERM xterm;\n"; + setname = "setenv TERM " DFT_TERMTYPE ";\n"; } termcap[0] = 0; /* ...just in case we've accidentally gotten terminfo */ if (tgetent(termcap, env) <= 0 || termcap[0] == 0) ok_tcap = 0; #endif /* USE_TERMCAP */ #ifdef USE_TERMINFO - if (!(env = getenv("TERM")) || !*env) { - env = DFT_TERMTYPE; + if (x_getenv("TERM") == 0) { if (SHELL_BOURNE == shell_type) - setname = "TERM=xterm;\nexport TERM;\n"; + setname = "TERM=" DFT_TERMTYPE ";\nexport TERM;\n"; else - setname = "setenv TERM xterm;\n"; + setname = "setenv TERM " DFT_TERMTYPE ";\n"; } #endif /* USE_TERMINFO */ @@ -373,8 +373,17 @@ main(int argc, char **argv ENVP_ARG) #endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ if (argc == 2) { - sprintf(buf, setsize[emu], argv[0], argv[1]); - write(tty, buf, strlen(buf)); + char *tmpbuf = malloc(strlen(setsize[emu]) + + strlen(argv[0]) + + strlen(argv[1]) + + 1); + if (tmpbuf == 0) { + fprintf(stderr, "%s: Cannot query size\n", myname); + onintr(0); + } + sprintf(tmpbuf, setsize[emu], argv[0], argv[1]); + write(tty, tmpbuf, strlen(tmpbuf)); + free(tmpbuf); } write(tty, getsize[emu], strlen(getsize[emu])); readstring(ttyfp, buf, size[emu]); diff --git a/app/xterm/resize.man b/app/xterm/resize.man index 7929ccc16..e4fe65965 100644 --- a/app/xterm/resize.man +++ b/app/xterm/resize.man @@ -1,4 +1,4 @@ -.\" $XTermId: resize.man,v 1.15 2006/02/13 01:14:59 tom Exp $ +.\" $XTermId: resize.man,v 1.16 2007/05/24 21:44:06 tom Exp $ .\" .\" updated by Thomas E. Dickey for XFree86, 1998-2002. .\" @@ -73,7 +73,7 @@ for the base termcap entry to modify. ~/.cshrc user's alias for the command. .SH "SEE ALSO" -csh(1), tset(1), xterm(1) +csh(1), tset(1), xterm(__mansuffix__) .SH AUTHORS Mark Vandevoorde (MIT-Athena), Edward Moy (Berkeley) .br diff --git a/app/xterm/run-tic.sh b/app/xterm/run-tic.sh index aeaa3ff9a..7732fe20d 100644 --- a/app/xterm/run-tic.sh +++ b/app/xterm/run-tic.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $XTermId: run-tic.sh,v 1.1 2006/08/10 21:42:07 tom Exp $ +# $XTermId: run-tic.sh,v 1.3 2007/06/17 15:30:03 tom Exp $ # # Run tic, either using ncurses' extension feature or filtering out harmless # messages for the extensions which are otherwise ignored by other versions of @@ -19,7 +19,9 @@ echo "** tic $OPT" "$@" tic $OPT "$@" 2>$TMP RET=$? -fgrep -v 'Unknown Capability' $TMP >&2 +fgrep -v 'Unknown Capability' $TMP | \ +fgrep -v 'Capability is not recognized:' | \ +fgrep -v 'tic: Warning near line ' >&2 rm -f $TMP exit $RET diff --git a/app/xterm/screen.c b/app/xterm/screen.c index a701bd642..045efd242 100644 --- a/app/xterm/screen.c +++ b/app/xterm/screen.c @@ -1,4 +1,4 @@ -/* $XTermId: screen.c,v 1.210 2006/11/26 19:12:44 tom Exp $ */ +/* $XTermId: screen.c,v 1.223 2007/07/22 20:37:55 tom Exp $ */ /* * Copyright 1999-2005,2006 by Thomas E. Dickey @@ -52,8 +52,6 @@ * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/screen.c,v 3.77 2006/06/19 00:36:51 dickey Exp $ */ - /* screen.c */ #include @@ -382,6 +380,65 @@ ChangeToWide(XtermWidget xw) } #endif +/* + * Clear cells, no side-effects. + */ +void +ClearCells(XtermWidget xw, int flags, unsigned len, int row, int col) +{ + if (len != 0) { + TScreen *screen = &(xw->screen); + flags |= TERM_COLOR_FLAGS(xw); + + memset(SCRN_BUF_CHARS(screen, row) + col, ' ', len); + memset(SCRN_BUF_ATTRS(screen, row) + col, flags, len); + + if_OPT_EXT_COLORS(screen, { + memset(SCRN_BUF_FGRND(screen, row) + col, + xw->sgr_foreground, len); + memset(SCRN_BUF_BGRND(screen, row) + col, + xw->cur_background, len); + }); + if_OPT_ISO_TRADITIONAL_COLORS(screen, { + memset(SCRN_BUF_COLOR(screen, row) + col, + (int) xtermColorPair(xw), len); + }); + if_OPT_DEC_CHRSET({ + memset(SCRN_BUF_CSETS(screen, row) + col, + curXtermChrSet(xw, screen->cur_row), len); + }); + if_OPT_WIDE_CHARS(screen, { + int off; + for (off = OFF_WIDEC; off < MAX_PTRS; ++off) { + memset(SCREEN_PTR(screen, row, off) + col, 0, len); + } + }); + } +} + +/* + * Clear data in the screen-structure (no I/O). + * Check for wide-character damage as well, clearing the damaged cells. + */ +void +ScrnClearCells(XtermWidget xw, int row, int col, unsigned len) +{ +#if OPT_WIDE_CHARS + TScreen *screen = &(xw->screen); +#endif + int flags = 0; + + if_OPT_WIDE_CHARS(screen, { + int kl; + int kr; + if (DamagedCells(screen, len, &kl, &kr, INX2ROW(screen, row), col) + && kr >= kl) { + ClearCells(xw, flags, (unsigned) (kr - kl + 1), row, kl); + } + }); + ClearCells(xw, flags, len, row, col); +} + /* * Disown the selection and repaint the area that is highlighted so it is no * longer highlighted. @@ -399,11 +456,11 @@ ScrnDisownSelection(XtermWidget xw) * to match flags. */ void -ScreenWrite(XtermWidget xw, - PAIRED_CHARS(Char * str, Char * str2), - unsigned flags, - unsigned cur_fg_bg, - unsigned length) +ScrnWriteText(XtermWidget xw, + PAIRED_CHARS(Char * str, Char * str2), + unsigned flags, + unsigned cur_fg_bg, + unsigned length) { TScreen *screen = &(xw->screen); #if OPT_ISO_COLORS @@ -420,7 +477,6 @@ ScreenWrite(XtermWidget xw, Char *attrs; int avail = MaxCols(screen) - screen->cur_col; Char *chars; - int wrappedbit; #if OPT_WIDE_CHARS Char starcol1, starcol2; #endif @@ -449,8 +505,6 @@ ScreenWrite(XtermWidget xw, cb = SCRN_BUF_CSETS(screen, screen->cur_row) + screen->cur_col; }); - wrappedbit = ScrnTstWrapped(screen, screen->cur_row); - #if OPT_WIDE_CHARS starcol1 = *chars; starcol2 = chars[length - 1]; @@ -521,9 +575,7 @@ ScreenWrite(XtermWidget xw, } /* if we are overwriting the left hand half of a wide character, make the other half vanish */ - } - - else { + } else { if ((char2 = SCRN_BUF_WIDEC(screen, screen->cur_row)) != 0) { char2 += screen->cur_col; @@ -563,8 +615,8 @@ ScreenWrite(XtermWidget xw, } }); if_OPT_EXT_COLORS(screen, { - memset(fbf, (Char) (cur_fg_bg >> 8), real_width); - memset(fbb, (Char) (cur_fg_bg & 0xff), real_width); + memset(fbf, (int) ExtractForeground(cur_fg_bg), real_width); + memset(fbb, (int) ExtractBackground(cur_fg_bg), real_width); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { memset(fb, (int) cur_fg_bg, real_width); @@ -573,11 +625,6 @@ ScreenWrite(XtermWidget xw, memset(cb, curXtermChrSet(xw, screen->cur_row), real_width); }); - if (wrappedbit) - ScrnSetWrapped(screen, screen->cur_row); - else - ScrnClrWrapped(screen, screen->cur_row); - if_OPT_WIDE_CHARS(screen, { screen->last_written_col = screen->cur_col + real_width - 1; screen->last_written_row = screen->cur_row; @@ -740,19 +787,18 @@ ScrnDeleteLine(XtermWidget xw, ScrnBuf sb, int last, int where, void ScrnInsertChar(XtermWidget xw, unsigned n) { +#define Target (data + col + n) +#define Source (data + col) + TScreen *screen = &(xw->screen); ScrnBuf sb = screen->visbuf; - unsigned last = MaxCols(screen); + int last = MaxCols(screen); int row = screen->cur_row; - unsigned col = screen->cur_col; - unsigned i; - Char *ptr = BUF_CHARS(sb, row); - Char *attrs = BUF_ATTRS(sb, row); - int wrappedbit = ScrnTstWrapped(screen, row); - int flags = CHARDRAWN | TERM_COLOR_FLAGS(xw); + int col = screen->cur_col; + Char *data; size_t nbytes; - if (last <= (col + n)) { + if (last <= (int) (col + n)) { if (last <= col) return; n = last - col; @@ -762,51 +808,52 @@ ScrnInsertChar(XtermWidget xw, unsigned n) assert(screen->cur_col >= 0); assert(screen->cur_row >= 0); assert(n > 0); - assert(last > n); + assert(last > (int) n); - ScrnClrWrapped(screen, row); /* make sure the bit isn't moved */ - for (i = last - 1; i >= col + n; i--) { - unsigned j = i - n; - assert(i >= n); - ptr[i] = ptr[j]; - attrs[i] = attrs[j]; - } + if_OPT_WIDE_CHARS(screen, { + int xx = INX2ROW(screen, screen->cur_row); + int kl; + int kr = screen->cur_col; + if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { + ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); + } + kr = screen->max_col - n + 1; + if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { + ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); + } + }); + + data = BUF_CHARS(sb, row); + memmove(Target, Source, nbytes); + + data = BUF_ATTRS(sb, row); + memmove(Target, Source, nbytes); - for (i = col; i < col + n; i++) - ptr[i] = ' '; - for (i = col; i < col + n; i++) - attrs[i] = flags; if_OPT_EXT_COLORS(screen, { - ptr = BUF_FGRND(sb, row); - memmove(ptr + col + n, ptr + col, nbytes); - memset(ptr + col, xw->sgr_foreground, n); - ptr = BUF_BGRND(sb, row); - memmove(ptr + col + n, ptr + col, nbytes); - memset(ptr + col, xw->cur_background, n); + data = BUF_FGRND(sb, row); + memmove(Target, Source, nbytes); + data = BUF_BGRND(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - ptr = BUF_COLOR(sb, row); - memmove(ptr + col + n, ptr + col, nbytes); - memset(ptr + col, (int) xtermColorPair(xw), n); + data = BUF_COLOR(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_DEC_CHRSET({ - ptr = BUF_CSETS(sb, row); - memmove(ptr + col + n, ptr + col, nbytes); - memset(ptr + col, curXtermChrSet(xw, row), n); + data = BUF_CSETS(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_WIDE_CHARS(screen, { int off; for (off = OFF_WIDEC; off < MAX_PTRS; ++off) { - ptr = BUFFER_PTR(sb, row, off); - memmove(ptr + col + n, ptr + col, nbytes); - memset(ptr + col, 0, n); + data = BUFFER_PTR(sb, row, off); + memmove(Target, Source, nbytes); } }); + ClearCells(xw, CHARDRAWN, n, row, col); - if (wrappedbit) - ScrnSetWrapped(screen, row); - else - ScrnClrWrapped(screen, row); +#undef Source +#undef Target } /* @@ -815,16 +862,18 @@ ScrnInsertChar(XtermWidget xw, unsigned n) void ScrnDeleteChar(XtermWidget xw, unsigned n) { +#define Target (data + col) +#define Source (data + col + n) + TScreen *screen = &(xw->screen); ScrnBuf sb = screen->visbuf; - unsigned last = MaxCols(screen); - unsigned row = screen->cur_row; - unsigned col = screen->cur_col; - Char *ptr = BUF_CHARS(sb, row); - Char *attrs = BUF_ATTRS(sb, row); + int last = MaxCols(screen); + int row = screen->cur_row; + int col = screen->cur_col; + Char *data; size_t nbytes; - if (last <= (col + n)) { + if (last <= (int) (col + n)) { if (last <= col) return; n = last - col; @@ -834,40 +883,49 @@ ScrnDeleteChar(XtermWidget xw, unsigned n) assert(screen->cur_col >= 0); assert(screen->cur_row >= 0); assert(n > 0); - assert(last > n); + assert(last > (int) n); - memmove(ptr + col, ptr + col + n, nbytes); - memmove(attrs + col, attrs + col + n, nbytes); - bzero(ptr + last - n, n); - memset(attrs + last - n, (Char) (TERM_COLOR_FLAGS(xw)), n); + if_OPT_WIDE_CHARS(screen, { + int kl; + int kr; + if (DamagedCells(screen, n, &kl, &kr, + INX2ROW(screen, screen->cur_row), + screen->cur_col)) + ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); + }); + + data = BUF_CHARS(sb, row); + memmove(Target, Source, nbytes); + + data = BUF_ATTRS(sb, row); + memmove(Target, Source, nbytes); if_OPT_EXT_COLORS(screen, { - ptr = BUF_FGRND(sb, row); - memmove(ptr + col, ptr + col + n, nbytes); - memset(ptr + last - n, xw->sgr_foreground, n); - ptr = BUF_BGRND(sb, row); - memmove(ptr + col, ptr + col + n, nbytes); - memset(ptr + last - n, xw->cur_background, n); + data = BUF_FGRND(sb, row); + memmove(Target, Source, nbytes); + data = BUF_BGRND(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - ptr = BUF_COLOR(sb, row); - memmove(ptr + col, ptr + col + n, nbytes); - memset(ptr + last - n, (int) xtermColorPair(xw), n); + data = BUF_COLOR(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_DEC_CHRSET({ - ptr = BUF_CSETS(sb, row); - memmove(ptr + col, ptr + col + n, nbytes); - memset(ptr + last - n, curXtermChrSet(xw, row), n); + data = BUF_CSETS(sb, row); + memmove(Target, Source, nbytes); }); if_OPT_WIDE_CHARS(screen, { int off; for (off = OFF_WIDEC; off < MAX_PTRS; ++off) { - ptr = BUFFER_PTR(sb, row, off); - memmove(ptr + col, ptr + col + n, nbytes); - memset(ptr + last - n, 0, n); + data = BUFFER_PTR(sb, row, off); + memmove(Target, Source, nbytes); } }); + ClearCells(xw, 0, n, row, (int) (last - n)); ScrnClrWrapped(screen, row); + +#undef Source +#undef Target } /* @@ -1319,32 +1377,13 @@ ClearBufRows(XtermWidget xw, int last) { TScreen *screen = &(xw->screen); - ScrnBuf buf = screen->visbuf; unsigned len = MaxCols(screen); int row; - int flags = TERM_COLOR_FLAGS(xw); TRACE(("ClearBufRows %d..%d\n", first, last)); for (row = first; row <= last; row++) { ScrnClrWrapped(screen, row); - bzero(BUF_CHARS(buf, row), len); - memset(BUF_ATTRS(buf, row), flags, len); - if_OPT_EXT_COLORS(screen, { - memset(BUF_FGRND(buf, row), xw->sgr_foreground, len); - memset(BUF_BGRND(buf, row), xw->cur_background, len); - }); - if_OPT_ISO_TRADITIONAL_COLORS(screen, { - memset(BUF_COLOR(buf, row), (int) xtermColorPair(xw), len); - }); - if_OPT_DEC_CHRSET({ - memset(BUF_CSETS(buf, row), 0, len); - }); - if_OPT_WIDE_CHARS(screen, { - int off; - for (off = OFF_WIDEC; off < MAX_PTRS; ++off) { - memset(BUFFER_PTR(buf, row, off), 0, len); - } - }); + ClearCells(xw, 0, len, row, 0); } } @@ -1859,6 +1898,7 @@ ScrnWipeRectangle(XtermWidget xw, for (col = left; col <= right; ++col) { if (!((screen->protected_mode == DEC_PROTECT) && (SCRN_BUF_ATTRS(screen, row)[col] & PROTECTED))) { + /* FIXME - use ClearCells */ SCRN_BUF_ATTRS(screen, row)[col] |= CHARDRAWN; SCRN_BUF_CHARS(screen, row)[col] = ' '; if_OPT_WIDE_CHARS(screen, { diff --git a/app/xterm/terminfo b/app/xterm/terminfo index d090311d7..7bc094e74 100644 --- a/app/xterm/terminfo +++ b/app/xterm/terminfo @@ -1,4 +1,4 @@ -# $XTermId: terminfo,v 1.145 2006/10/01 22:18:13 tom Exp $ +# $XTermId: terminfo,v 1.146 2007/06/10 13:31:21 tom Exp $ # # $XFree86: xc/programs/xterm/terminfo,v 3.59 2006/02/13 01:14:59 dickey Exp $ # @@ -374,10 +374,72 @@ xterm+pcf0|fragment with modifyFunctionKeys:0, kf8=\E[19~, kf9=\E[20~, -# This is the same as xterm+pcf2 because the unmodified keys all happen to -# have a pattern that forces the modifier to the same position. +# This is almost the same as xterm+pcf2 because the unmodified keys all happen +# to have a pattern that forces the modifier to the same position. xterm+pcf1|fragment with modifyFunctionKeys:1, - use=xterm+pcf2, + kf1=\EOP, + kf10=\E[21~, + kf11=\E[23~, + kf12=\E[24~, + kf13=\E[2P, + kf14=\E[2Q, + kf15=\E[2R, + kf16=\E[2S, + kf17=\E[15;2~, + kf18=\E[17;2~, + kf19=\E[18;2~, + kf2=\EOQ, + kf20=\E[19;2~, + kf21=\E[20;2~, + kf22=\E[21;2~, + kf23=\E[23;2~, + kf24=\E[24;2~, + kf25=\E[5P, + kf26=\E[5Q, + kf27=\E[5R, + kf28=\E[5S, + kf29=\E[15;5~, + kf3=\EOR, + kf30=\E[17;5~, + kf31=\E[18;5~, + kf32=\E[19;5~, + kf33=\E[20;5~, + kf34=\E[21;5~, + kf35=\E[23;5~, + kf36=\E[24;5~, + kf37=\E[6P, + kf38=\E[6Q, + kf39=\E[6R, + kf4=\EOS, + kf40=\E[6S, + kf41=\E[15;6~, + kf42=\E[17;6~, + kf43=\E[18;6~, + kf44=\E[19;6~, + kf45=\E[20;6~, + kf46=\E[21;6~, + kf47=\E[23;6~, + kf48=\E[24;6~, + kf49=\E[3P, + kf5=\E[15~, + kf50=\E[3Q, + kf51=\E[3R, + kf52=\E[3S, + kf53=\E[15;3~, + kf54=\E[17;3~, + kf55=\E[18;3~, + kf56=\E[19;3~, + kf57=\E[20;3~, + kf58=\E[21;3~, + kf59=\E[23;3~, + kf6=\E[17~, + kf60=\E[24;3~, + kf61=\E[4P, + kf62=\E[4Q, + kf63=\E[4R, + kf7=\E[18~, + kf8=\E[19~, + kf9=\E[20~, xterm+pcf2|fragment with modifyFunctionKeys:2, kf1=\EOP, diff --git a/app/xterm/trace.c b/app/xterm/trace.c index 99f4f6011..91646950d 100644 --- a/app/xterm/trace.c +++ b/app/xterm/trace.c @@ -1,4 +1,4 @@ -/* $XTermId: trace.c,v 1.72 2007/03/17 15:45:12 tom Exp $ */ +/* $XTermId: trace.c,v 1.81 2007/07/22 16:27:25 tom Exp $ */ /* * $XFree86: xc/programs/xterm/trace.c,v 3.23 2005/09/18 23:48:13 dickey Exp $ @@ -43,6 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include +#include #ifdef HAVE_X11_TRANSLATEI_H #include @@ -130,6 +131,34 @@ TraceIds(const char *fname, int lnum) } } +static void +formatAscii(char *dst, unsigned value) +{ + switch (value) { + case '\\': + sprintf(dst, "\\\\"); + break; + case '\b': + sprintf(dst, "\\b"); + break; + case '\n': + sprintf(dst, "\\n"); + break; + case '\r': + sprintf(dst, "\\r"); + break; + case '\t': + sprintf(dst, "\\t"); + break; + default: + if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160)) + sprintf(dst, "\\%03o", value); + else + sprintf(dst, "%c", CharOf(value)); + break; + } +} + char * visibleChars(PAIRED_CHARS(Char * buf, Char * buf2), unsigned len) { @@ -155,10 +184,7 @@ visibleChars(PAIRED_CHARS(Char * buf, Char * buf2), unsigned len) sprintf(dst, "\\u+%04X", value); else #endif - if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160)) - sprintf(dst, "\\%03o", value); - else - sprintf(dst, "%c", CharOf(value)); + formatAscii(dst, value); dst += strlen(dst); } return result; @@ -184,10 +210,7 @@ visibleIChar(IChar * buf, unsigned len) sprintf(dst, "\\u+%04X", value); else #endif - if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160)) - sprintf(dst, "\\%03o", value); - else - sprintf(dst, "%c", CharOf(value)); + formatAscii(dst, value); dst += strlen(dst); } return result; @@ -285,6 +308,98 @@ visibleXError(int code) return result; } +#if OPT_TRACE_FLAGS +#define isScrnFlag(flag) ((flag) == LINEWRAPPED) + +static char * +ScrnText(TScreen * screen, int row) +{ + Char *chars = SCRN_BUF_CHARS(screen, row); +#if OPT_WIDE_CHARS + Char *widec = 0; +#endif + + if_OPT_WIDE_CHARS(screen, { + widec = SCRN_BUF_WIDEC(screen, row); + }); + return visibleChars(PAIRED_CHARS(chars, widec), screen->max_col + 1); +} + +#if OPT_TRACE_FLAGS > 1 +#define DETAILED_FLAGS(name) \ + Trace("TEST " #name " %d [%d..%d] top %d chars %p (%d)\n", \ + row, \ + -screen->savedlines, \ + screen->max_row, \ + screen->topline, \ + SCRN_BUF_CHARS(screen, row), \ + (&(SCRN_BUF_FLAGS(screen, row)) - screen->visbuf) / MAX_PTRS) +#else +#define DETAILED_FLAGS(name) /* nothing */ +#endif + +#define SHOW_BAD_ROW(name, screen, row) \ + Trace("OOPS " #name " bad row %d [%d..%d]\n", \ + row, -(screen->savedlines), screen->max_row) + +#define SHOW_SCRN_FLAG(name,code) \ + Trace(#name " {%d, top=%d, saved=%d}%05d%s:%s\n", \ + row, screen->topline, screen->savedlines, \ + ROW2ABS(screen, row), \ + code ? "*" : "", \ + ScrnText(screen, row)) + +void +ScrnClrFlag(TScreen * screen, int row, int flag) +{ + DETAILED_FLAGS(ScrnClrFlag); + if (!okScrnRow(screen, row)) { + SHOW_BAD_ROW(ScrnClrFlag, screen, row); + assert(0); + } else if (isScrnFlag(flag)) { + SHOW_SCRN_FLAG(ScrnClrFlag, 0); + } + + SCRN_BUF_FLAGS(screen, row) = + (Char *) ((long) SCRN_BUF_FLAGS(screen, row) & ~(flag)); +} + +void +ScrnSetFlag(TScreen * screen, int row, int flag) +{ + DETAILED_FLAGS(ScrnSetFlag); + if (!okScrnRow(screen, row)) { + SHOW_BAD_ROW(ScrnSetFlag, screen, row); + assert(0); + } else if (isScrnFlag(flag)) { + SHOW_SCRN_FLAG(ScrnSetFlag, 1); + } + + SCRN_BUF_FLAGS(screen, row) = + (Char *) (((long) SCRN_BUF_FLAGS(screen, row) | (flag))); +} + +int +ScrnTstFlag(TScreen * screen, int row, int flag) +{ + int code = 0; + if (!okScrnRow(screen, row)) { + SHOW_BAD_ROW(ScrnTstFlag, screen, row); + } else { + code = ((long) SCRN_BUF_FLAGS(screen, row) & (flag)) != 0; + + DETAILED_FLAGS(ScrnTstFlag); + if (!okScrnRow(screen, row)) { + SHOW_BAD_ROW(ScrnSetFlag, screen, row); + assert(0); + } else if (isScrnFlag(flag)) { + SHOW_SCRN_FLAG(ScrnTstFlag, code); + } + } + return code; +} +#endif /* OPT_TRACE_FLAGS */ + void TraceSizeHints(XSizeHints * hints) { @@ -395,13 +510,14 @@ TraceXtermResources(void) XRES_B(ptyInitialErase); XRES_B(backarrow_is_erase); #endif - XRES_B(wait_for_map); XRES_B(useInsertMode); #if OPT_ZICONBEEP XRES_I(zIconBeep); #endif #if OPT_PTY_HANDSHAKE + XRES_B(wait_for_map); XRES_B(ptyHandshake); + XRES_B(ptySttySize); #endif #if OPT_SAME_NAME XRES_B(sameName); @@ -564,6 +680,11 @@ TraceOptions(OptionHelp * options, XrmOptionDescRec * resources, Cardinal res_co case XrmoptionSkipLine: TRACE((" %-28s {remainder of line}\n", res_array[j].option)); break; + case XrmoptionIsArg: + case XrmoptionNoArg: + case XrmoptionResArg: + case XrmoptionSepArg: + case XrmoptionStickyArg: default: break; } diff --git a/app/xterm/unicode/convmap.pl b/app/xterm/unicode/convmap.pl index aa85b6fb7..a47349170 100644 --- a/app/xterm/unicode/convmap.pl +++ b/app/xterm/unicode/convmap.pl @@ -1,8 +1,22 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w +# $XTermId: convmap.pl,v 1.13 2007/06/11 23:30:44 tom Exp $ +# # Generate keysym2ucs.c file # +# See also: +# http://mail.nl.linux.org/linux-utf8/2001-04/msg00248.html +# # $XFree86: xc/programs/xterm/unicode/convmap.pl,v 1.5 2000/01/24 22:22:05 dawes Exp $ +use strict; + +our $keysym; +our %name; +our %keysym_to_ucs; +our %keysym_to_keysymname; + +sub utf8 ($); + sub utf8 ($) { my $c = shift(@_); @@ -42,7 +56,7 @@ sub utf8 ($) { } } -$unicodedata = "UnicodeData-Latest.txt"; +my $unicodedata = "UnicodeData-Latest.txt"; # read list of all Unicode names if (!open(UDATA, $unicodedata) && !open(UDATA, "$unicodedata")) { @@ -51,7 +65,7 @@ if (!open(UDATA, $unicodedata) && !open(UDATA, "$unicodedata")) { "ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData-Latest.txt\n"); } while () { - if (/^([0-9,A-F]{4});([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*)$/) { + if (/^([0-9,A-F]{4,6});([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*);([^;]*)$/) { $name{hex($1)} = $2; } else { die("Syntax error in line '$_' in file '$unicodedata'"); @@ -63,9 +77,12 @@ close(UDATA); open(LIST, ") { if (/^0x([0-9a-f]{4})\s+U([0-9a-f]{4})\s*(\#.*)?$/){ - $keysym = hex($1); - $ucs = hex($2); + my $keysym = hex($1); + my $ucs = hex($2); + my $comment = $3; + $comment =~ s/^#\s*//; $keysym_to_ucs{$keysym} = $ucs; + $keysym_to_keysymname{$keysym} = $comment; } elsif (/^\s*\#/ || /^\s*$/) { } else { die("Syntax error in 'list' in line\n$_\n"); @@ -78,16 +95,16 @@ open(LIST, ") { if (/^\#define\s+XK_([A-Za-z_0-9]+)\s+0x([0-9a-fA-F]+)\s*(\/.*)?$/) { next if /\/\* deprecated \*\//; - $keysymname = $1; - $keysym = hex($2); + my $keysymname = $1; + my $keysym = hex($2); $keysym_to_keysymname{$keysym} = $keysymname; } } close(LIST); print <, University of Cambridge, June 1999 + * Author: Markus G. Kuhn , University of Cambridge, April 2001 * * Special thanks to Richard Verhoeven for preparing * an initial draft of the mapping table. * * This software is in the public domain. Share and enjoy! + * + * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl) */ -#include +#ifndef KEYSYM2UCS_INCLUDED + +#include "keysym2ucs.h" +#define VISIBLE /* */ -struct codepair { +#else + +#define VISIBLE static + +#endif + +static struct codepair { unsigned short keysym; unsigned short ucs; } keysymtab[] = { EOT for $keysym (sort {$a <=> $b} keys(%keysym_to_keysymname)) { - $ucs = $keysym_to_ucs{$keysym}; + my $ucs = $keysym_to_ucs{$keysym}; next if $keysym >= 0xf000 || $keysym < 0x100; if ($ucs) { printf(" { 0x%04x, 0x%04x }, /*%28s %s %s */\n", @@ -143,6 +171,7 @@ for $keysym (sort {$a <=> $b} keys(%keysym_to_keysymname)) { print < -# Markus Kuhn, University of Cambridge, -# -# You are free to use and modify this table. If you introduce errors -# in the table, please remove the copyright line. If you remove errors, -# please let me know, so I can update my version. +# $XTermId: keysym.map,v 1.8 2007/06/13 00:52:16 tom Exp $ +# +# This list can be used to convert X11 Keysyms to Unicode 2.1 character. +# The list is not checked for correctness by Unicode officials. Use it +# at your own risk and the creator is not responsible for any damage that +# occurred due to using this list. +# +# The list is created by looking at the Keysym names and the Unicode data +# file. Other mapping tables were used as a reference where needed. +# Due to a lack of knowledge of the Hebrew, Thai and Hangul symbols, +# expect errors in these sections. The mapping of the keypad keys +# might also require some adjustments. +# +# The following fields are used: +# 1 The X11 keysym numbers from the include file keysymdef.h +# 2 The Unicode (2.1) position (U0000 means unknown Unicode position) +# # +# 3 the name of the X11 keysym (without XK_) +# +# Authors: Richard Verhoeven, TUE, +# Markus Kuhn, University of Cambridge, +# +# You are free to use and modify this table. If you introduce errors +# in the table, please remove the copyright line. If you remove errors, +# please let me know, so I can update my version. # # $XFree86: xc/programs/xterm/unicode/keysym.map,v 1.1 1999/06/12 15:37:24 dawes Exp $ -# -0x0020 U0020 # space -0x0021 U0021 # exclam -0x0022 U0022 # quotedbl -0x0023 U0023 # numbersign -0x0024 U0024 # dollar -0x0025 U0025 # percent -0x0026 U0026 # ampersand -0x0027 U0027 # apostrophe -0x0027 U0027 # quoteright /* deprecated */ -0x0028 U0028 # parenleft -0x0029 U0029 # parenright -0x002a U002a # asterisk -0x002b U002b # plus -0x002c U002c # comma -0x002d U002d # minus -0x002e U002e # period -0x002f U002f # slash -0x0030 U0030 # 0 -0x0031 U0031 # 1 -0x0032 U0032 # 2 -0x0033 U0033 # 3 -0x0034 U0034 # 4 -0x0035 U0035 # 5 -0x0036 U0036 # 6 -0x0037 U0037 # 7 -0x0038 U0038 # 8 -0x0039 U0039 # 9 -0x003a U003a # colon -0x003b U003b # semicolon -0x003c U003c # less -0x003d U003d # equal -0x003e U003e # greater -0x003f U003f # question -0x0040 U0040 # at -0x0041 U0041 # A -0x0042 U0042 # B -0x0043 U0043 # C -0x0044 U0044 # D -0x0045 U0045 # E -0x0046 U0046 # F -0x0047 U0047 # G -0x0048 U0048 # H -0x0049 U0049 # I -0x004a U004a # J -0x004b U004b # K -0x004c U004c # L -0x004d U004d # M -0x004e U004e # N -0x004f U004f # O -0x0050 U0050 # P -0x0051 U0051 # Q -0x0052 U0052 # R -0x0053 U0053 # S -0x0054 U0054 # T -0x0055 U0055 # U -0x0056 U0056 # V -0x0057 U0057 # W -0x0058 U0058 # X -0x0059 U0059 # Y -0x005a U005a # Z -0x005b U005b # bracketleft -0x005c U005c # backslash -0x005d U005d # bracketright -0x005e U005e # asciicircum -0x005f U005f # underscore -0x0060 U0060 # grave -0x0060 U0060 # quoteleft /* deprecated */ -0x0061 U0061 # a -0x0062 U0062 # b -0x0063 U0063 # c -0x0064 U0064 # d -0x0065 U0065 # e -0x0066 U0066 # f -0x0067 U0067 # g -0x0068 U0068 # h -0x0069 U0069 # i -0x006a U006a # j -0x006b U006b # k -0x006c U006c # l -0x006d U006d # m -0x006e U006e # n -0x006f U006f # o -0x0070 U0070 # p -0x0071 U0071 # q -0x0072 U0072 # r -0x0073 U0073 # s -0x0074 U0074 # t -0x0075 U0075 # u -0x0076 U0076 # v -0x0077 U0077 # w -0x0078 U0078 # x -0x0079 U0079 # y -0x007a U007a # z -0x007b U007b # braceleft -0x007c U007c # bar -0x007d U007d # braceright -0x007e U007e # asciitilde -0x00a0 U00a0 # nobreakspace -0x00a1 U00a1 # exclamdown -0x00a2 U00a2 # cent -0x00a3 U00a3 # sterling -0x00a4 U00a4 # currency -0x00a5 U00a5 # yen -0x00a6 U00a6 # brokenbar -0x00a7 U00a7 # section -0x00a8 U00a8 # diaeresis -0x00a9 U00a9 # copyright -0x00aa U00aa # ordfeminine -0x00ab U00ab # guillemotleft /* left angle quotation mark */ -0x00ac U00ac # notsign -0x00ad U00ad # hyphen -0x00ae U00ae # registered -0x00af U00af # macron -0x00b0 U00b0 # degree -0x00b1 U00b1 # plusminus -0x00b2 U00b2 # twosuperior -0x00b3 U00b3 # threesuperior -0x00b4 U00b4 # acute -0x00b5 U00b5 # mu -0x00b6 U00b6 # paragraph -0x00b7 U00b7 # periodcentered -0x00b8 U00b8 # cedilla -0x00b9 U00b9 # onesuperior -0x00ba U00ba # masculine -0x00bb U00bb # guillemotright /* right angle quotation mark */ -0x00bc U00bc # onequarter -0x00bd U00bd # onehalf -0x00be U00be # threequarters -0x00bf U00bf # questiondown -0x00c0 U00c0 # Agrave -0x00c1 U00c1 # Aacute -0x00c2 U00c2 # Acircumflex -0x00c3 U00c3 # Atilde -0x00c4 U00c4 # Adiaeresis -0x00c5 U00c5 # Aring -0x00c6 U00c6 # AE -0x00c7 U00c7 # Ccedilla -0x00c8 U00c8 # Egrave -0x00c9 U00c9 # Eacute -0x00ca U00ca # Ecircumflex -0x00cb U00cb # Ediaeresis -0x00cc U00cc # Igrave -0x00cd U00cd # Iacute -0x00ce U00ce # Icircumflex -0x00cf U00cf # Idiaeresis -0x00d0 U00d0 # ETH -0x00d0 U00d0 # Eth /* deprecated */ -0x00d1 U00d1 # Ntilde -0x00d2 U00d2 # Ograve -0x00d3 U00d3 # Oacute -0x00d4 U00d4 # Ocircumflex -0x00d5 U00d5 # Otilde -0x00d6 U00d6 # Odiaeresis -0x00d7 U00d7 # multiply -0x00d8 U00d8 # Ooblique -0x00d9 U00d9 # Ugrave -0x00da U00da # Uacute -0x00db U00db # Ucircumflex -0x00dc U00dc # Udiaeresis -0x00dd U00dd # Yacute -0x00de U00de # THORN -0x00de U00de # Thorn /* deprecated */ -0x00df U00df # ssharp -0x00e0 U00e0 # agrave -0x00e1 U00e1 # aacute -0x00e2 U00e2 # acircumflex -0x00e3 U00e3 # atilde -0x00e4 U00e4 # adiaeresis -0x00e5 U00e5 # aring -0x00e6 U00e6 # ae -0x00e7 U00e7 # ccedilla -0x00e8 U00e8 # egrave -0x00e9 U00e9 # eacute -0x00ea U00ea # ecircumflex -0x00eb U00eb # ediaeresis -0x00ec U00ec # igrave -0x00ed U00ed # iacute -0x00ee U00ee # icircumflex -0x00ef U00ef # idiaeresis -0x00f0 U00f0 # eth -0x00f1 U00f1 # ntilde -0x00f2 U00f2 # ograve -0x00f3 U00f3 # oacute -0x00f4 U00f4 # ocircumflex -0x00f5 U00f5 # otilde -0x00f6 U00f6 # odiaeresis -0x00f7 U00f7 # division -0x00f8 U00f8 # oslash -0x00f9 U00f9 # ugrave -0x00fa U00fa # uacute -0x00fb U00fb # ucircumflex -0x00fc U00fc # udiaeresis -0x00fd U00fd # yacute -0x00fe U00fe # thorn -0x00ff U00ff # ydiaeresis -0x01a1 U0104 # Aogonek -0x01a2 U02d8 # breve -0x01a3 U0141 # Lstroke -0x01a5 U013d # Lcaron -0x01a6 U015a # Sacute -0x01a9 U0160 # Scaron -0x01aa U015e # Scedilla -0x01ab U0164 # Tcaron -0x01ac U0179 # Zacute -0x01ae U017d # Zcaron -0x01af U017b # Zabovedot -0x01b1 U0105 # aogonek -0x01b2 U02db # ogonek -0x01b3 U0142 # lstroke -0x01b5 U013e # lcaron -0x01b6 U015b # sacute -0x01b7 U02c7 # caron -0x01b9 U0161 # scaron -0x01ba U015f # scedilla -0x01bb U0165 # tcaron -0x01bc U017a # zacute -0x01bd U02dd # doubleacute -0x01be U017e # zcaron -0x01bf U017c # zabovedot -0x01c0 U0154 # Racute -0x01c3 U0102 # Abreve -0x01c5 U0139 # Lacute -0x01c6 U0106 # Cacute -0x01c8 U010c # Ccaron -0x01ca U0118 # Eogonek -0x01cc U011a # Ecaron -0x01cf U010e # Dcaron -0x01d0 U0110 # Dstroke -0x01d1 U0143 # Nacute -0x01d2 U0147 # Ncaron -0x01d5 U0150 # Odoubleacute -0x01d8 U0158 # Rcaron -0x01d9 U016e # Uring -0x01db U0170 # Udoubleacute -0x01de U0162 # Tcedilla -0x01e0 U0155 # racute -0x01e3 U0103 # abreve -0x01e5 U013a # lacute -0x01e6 U0107 # cacute -0x01e8 U010d # ccaron -0x01ea U0119 # eogonek -0x01ec U011b # ecaron -0x01ef U010f # dcaron -0x01f0 U0111 # dstroke -0x01f1 U0144 # nacute -0x01f2 U0148 # ncaron -0x01f5 U0151 # odoubleacute -0x01f8 U0159 # rcaron -0x01f9 U016f # uring -0x01fb U0171 # udoubleacute -0x01fe U0163 # tcedilla -0x01ff U02d9 # abovedot -0x02a1 U0126 # Hstroke -0x02a6 U0124 # Hcircumflex -0x02a9 U0130 # Iabovedot -0x02ab U011e # Gbreve -0x02ac U0134 # Jcircumflex -0x02b1 U0127 # hstroke -0x02b6 U0125 # hcircumflex -0x02b9 U0131 # idotless -0x02bb U011f # gbreve -0x02bc U0135 # jcircumflex -0x02c5 U010a # Cabovedot -0x02c6 U0108 # Ccircumflex -0x02d5 U0120 # Gabovedot -0x02d8 U011c # Gcircumflex -0x02dd U016c # Ubreve -0x02de U015c # Scircumflex -0x02e5 U010b # cabovedot -0x02e6 U0109 # ccircumflex -0x02f5 U0121 # gabovedot -0x02f8 U011d # gcircumflex -0x02fd U016d # ubreve -0x02fe U015d # scircumflex -0x03a2 U0138 # kra -0x03a3 U0156 # Rcedilla -0x03a5 U0128 # Itilde -0x03a6 U013b # Lcedilla -0x03aa U0112 # Emacron -0x03ab U0122 # Gcedilla -0x03ac U0166 # Tslash -0x03b3 U0157 # rcedilla -0x03b5 U0129 # itilde -0x03b6 U013c # lcedilla -0x03ba U0113 # emacron -0x03bb U0123 # gcedilla -0x03bc U0167 # tslash -0x03bd U014a # ENG -0x03bf U014b # eng -0x03c0 U0100 # Amacron -0x03c7 U012e # Iogonek -0x03cc U0116 # Eabovedot -0x03cf U012a # Imacron -0x03d1 U0145 # Ncedilla -0x03d2 U014c # Omacron -0x03d3 U0136 # Kcedilla -0x03d9 U0172 # Uogonek -0x03dd U0168 # Utilde -0x03de U016a # Umacron -0x03e0 U0101 # amacron -0x03e7 U012f # iogonek -0x03ec U0117 # eabovedot -0x03ef U012b # imacron -0x03f1 U0146 # ncedilla -0x03f2 U014d # omacron -0x03f3 U0137 # kcedilla -0x03f9 U0173 # uogonek -0x03fd U0169 # utilde -0x03fe U016b # umacron -0x13bc U0152 # OE -0x13bd U0153 # oe -0x13be U0178 # Ydiaeresis -0x047e U203e # overline -0x04a1 U3002 # kana_fullstop -0x04a2 U300c # kana_openingbracket -0x04a3 U300d # kana_closingbracket -0x04a4 U3001 # kana_comma -0x04a5 U30fb # kana_conjunctive -0x04a6 U30f2 # kana_WO -0x04a7 U30a1 # kana_a -0x04a8 U30a3 # kana_i -0x04a9 U30a5 # kana_u -0x04aa U30a7 # kana_e -0x04ab U30a9 # kana_o -0x04ac U30e3 # kana_ya -0x04ad U30e5 # kana_yu -0x04ae U30e7 # kana_yo -0x04af U30c3 # kana_tsu -0x04b0 U30fc # prolongedsound -0x04b1 U30a2 # kana_A -0x04b2 U30a4 # kana_I -0x04b3 U30a6 # kana_U -0x04b4 U30a8 # kana_E -0x04b5 U30aa # kana_O -0x04b6 U30ab # kana_KA -0x04b7 U30ad # kana_KI -0x04b8 U30af # kana_KU -0x04b9 U30b1 # kana_KE -0x04ba U30b3 # kana_KO -0x04bb U30b5 # kana_SA -0x04bc U30b7 # kana_SHI -0x04bd U30b9 # kana_SU -0x04be U30bb # kana_SE -0x04bf U30bd # kana_SO -0x04c0 U30bf # kana_TA -0x04c1 U30c1 # kana_CHI -0x04c2 U30c4 # kana_TSU -0x04c3 U30c6 # kana_TE -0x04c4 U30c8 # kana_TO -0x04c5 U30ca # kana_NA -0x04c6 U30cb # kana_NI -0x04c7 U30cc # kana_NU -0x04c8 U30cd # kana_NE -0x04c9 U30ce # kana_NO -0x04ca U30cf # kana_HA -0x04cb U30d2 # kana_HI -0x04cc U30d5 # kana_FU -0x04cd U30d8 # kana_HE -0x04ce U30db # kana_HO -0x04cf U30de # kana_MA -0x04d0 U30df # kana_MI -0x04d1 U30e0 # kana_MU -0x04d2 U30e1 # kana_ME -0x04d3 U30e2 # kana_MO -0x04d4 U30e4 # kana_YA -0x04d5 U30e6 # kana_YU -0x04d6 U30e8 # kana_YO -0x04d7 U30e9 # kana_RA -0x04d8 U30ea # kana_RI -0x04d9 U30eb # kana_RU -0x04da U30ec # kana_RE -0x04db U30ed # kana_RO -0x04dc U30ef # kana_WA -0x04dd U30f3 # kana_N -0x04de U309b # voicedsound -0x04df U309c # semivoicedsound -0x05ac U060c # Arabic_comma -0x05bb U061b # Arabic_semicolon -0x05bf U061f # Arabic_question_mark -0x05c1 U0621 # Arabic_hamza -0x05c2 U0622 # Arabic_maddaonalef -0x05c3 U0623 # Arabic_hamzaonalef -0x05c4 U0624 # Arabic_hamzaonwaw -0x05c5 U0625 # Arabic_hamzaunderalef -0x05c6 U0626 # Arabic_hamzaonyeh -0x05c7 U0627 # Arabic_alef -0x05c8 U0628 # Arabic_beh -0x05c9 U0629 # Arabic_tehmarbuta -0x05ca U062a # Arabic_teh -0x05cb U062b # Arabic_theh -0x05cc U062c # Arabic_jeem -0x05cd U062d # Arabic_hah -0x05ce U062e # Arabic_khah -0x05cf U062f # Arabic_dal -0x05d0 U0630 # Arabic_thal -0x05d1 U0631 # Arabic_ra -0x05d2 U0632 # Arabic_zain -0x05d3 U0633 # Arabic_seen -0x05d4 U0634 # Arabic_sheen -0x05d5 U0635 # Arabic_sad -0x05d6 U0636 # Arabic_dad -0x05d7 U0637 # Arabic_tah -0x05d8 U0638 # Arabic_zah -0x05d9 U0639 # Arabic_ain -0x05da U063a # Arabic_ghain -0x05e0 U0640 # Arabic_tatweel -0x05e1 U0641 # Arabic_feh -0x05e2 U0642 # Arabic_qaf -0x05e3 U0643 # Arabic_kaf -0x05e4 U0644 # Arabic_lam -0x05e5 U0645 # Arabic_meem -0x05e6 U0646 # Arabic_noon -0x05e7 U0647 # Arabic_ha -0x05e8 U0648 # Arabic_waw -0x05e9 U0649 # Arabic_alefmaksura -0x05ea U064a # Arabic_yeh -0x05eb U064b # Arabic_fathatan -0x05ec U064c # Arabic_dammatan -0x05ed U064d # Arabic_kasratan -0x05ee U064e # Arabic_fatha -0x05ef U064f # Arabic_damma -0x05f0 U0650 # Arabic_kasra -0x05f1 U0651 # Arabic_shadda -0x05f2 U0652 # Arabic_sukun -0x06a1 U0452 # Serbian_dje -0x06a2 U0453 # Macedonia_gje -0x06a3 U0451 # Cyrillic_io -0x06a4 U0454 # Ukrainian_ie -0x06a5 U0455 # Macedonia_dse -0x06a6 U0456 # Ukrainian_i -0x06a7 U0457 # Ukrainian_yi -0x06a8 U0458 # Cyrillic_je -0x06a9 U0459 # Cyrillic_lje -0x06aa U045a # Cyrillic_nje -0x06ab U045b # Serbian_tshe -0x06ac U045c # Macedonia_kje -0x06ae U045e # Byelorussian_shortu -0x06af U045f # Cyrillic_dzhe -0x06b0 U2116 # numerosign -0x06b1 U0402 # Serbian_DJE -0x06b2 U0403 # Macedonia_GJE -0x06b3 U0401 # Cyrillic_IO -0x06b4 U0404 # Ukrainian_IE -0x06b5 U0405 # Macedonia_DSE -0x06b6 U0406 # Ukrainian_I -0x06b7 U0407 # Ukrainian_YI -0x06b8 U0408 # Cyrillic_JE -0x06b9 U0409 # Cyrillic_LJE -0x06ba U040a # Cyrillic_NJE -0x06bb U040b # Serbian_TSHE -0x06bc U040c # Macedonia_KJE -0x06be U040e # Byelorussian_SHORTU -0x06bf U040f # Cyrillic_DZHE -0x06c0 U044e # Cyrillic_yu -0x06c1 U0430 # Cyrillic_a -0x06c2 U0431 # Cyrillic_be -0x06c3 U0446 # Cyrillic_tse -0x06c4 U0434 # Cyrillic_de -0x06c5 U0435 # Cyrillic_ie -0x06c6 U0444 # Cyrillic_ef -0x06c7 U0433 # Cyrillic_ghe -0x06c8 U0445 # Cyrillic_ha -0x06c9 U0438 # Cyrillic_i -0x06ca U0439 # Cyrillic_shorti -0x06cb U043a # Cyrillic_ka -0x06cc U043b # Cyrillic_el -0x06cd U043c # Cyrillic_em -0x06ce U043d # Cyrillic_en -0x06cf U043e # Cyrillic_o -0x06d0 U043f # Cyrillic_pe -0x06d1 U044f # Cyrillic_ya -0x06d2 U0440 # Cyrillic_er -0x06d3 U0441 # Cyrillic_es -0x06d4 U0442 # Cyrillic_te -0x06d5 U0443 # Cyrillic_u -0x06d6 U0436 # Cyrillic_zhe -0x06d7 U0432 # Cyrillic_ve -0x06d8 U044c # Cyrillic_softsign -0x06d9 U044b # Cyrillic_yeru -0x06da U0437 # Cyrillic_ze -0x06db U0448 # Cyrillic_sha -0x06dc U044d # Cyrillic_e -0x06dd U0449 # Cyrillic_shcha -0x06de U0447 # Cyrillic_che -0x06df U044a # Cyrillic_hardsign -0x06e0 U042e # Cyrillic_YU -0x06e1 U0410 # Cyrillic_A -0x06e2 U0411 # Cyrillic_BE -0x06e3 U0426 # Cyrillic_TSE -0x06e4 U0414 # Cyrillic_DE -0x06e5 U0415 # Cyrillic_IE -0x06e6 U0424 # Cyrillic_EF -0x06e7 U0413 # Cyrillic_GHE -0x06e8 U0425 # Cyrillic_HA -0x06e9 U0418 # Cyrillic_I -0x06ea U0419 # Cyrillic_SHORTI -0x06eb U041a # Cyrillic_KA -0x06ec U041b # Cyrillic_EL -0x06ed U041c # Cyrillic_EM -0x06ee U041d # Cyrillic_EN -0x06ef U041e # Cyrillic_O -0x06f0 U041f # Cyrillic_PE -0x06f1 U042f # Cyrillic_YA -0x06f2 U0420 # Cyrillic_ER -0x06f3 U0421 # Cyrillic_ES -0x06f4 U0422 # Cyrillic_TE -0x06f5 U0423 # Cyrillic_U -0x06f6 U0416 # Cyrillic_ZHE -0x06f7 U0412 # Cyrillic_VE -0x06f8 U042c # Cyrillic_SOFTSIGN -0x06f9 U042b # Cyrillic_YERU -0x06fa U0417 # Cyrillic_ZE -0x06fb U0428 # Cyrillic_SHA -0x06fc U042d # Cyrillic_E -0x06fd U0429 # Cyrillic_SHCHA -0x06fe U0427 # Cyrillic_CHE -0x06ff U042a # Cyrillic_HARDSIGN -0x07a1 U0386 # Greek_ALPHAaccent -0x07a2 U0388 # Greek_EPSILONaccent -0x07a3 U0389 # Greek_ETAaccent -0x07a4 U038a # Greek_IOTAaccent -0x07a5 U03aa # Greek_IOTAdiaeresis -0x07a7 U038c # Greek_OMICRONaccent -0x07a8 U038e # Greek_UPSILONaccent -0x07a9 U03ab # Greek_UPSILONdieresis -0x07ab U038f # Greek_OMEGAaccent -0x07ae U0385 # Greek_accentdieresis -0x07af U2015 # Greek_horizbar -0x07b1 U03ac # Greek_alphaaccent -0x07b2 U03ad # Greek_epsilonaccent -0x07b3 U03ae # Greek_etaaccent -0x07b4 U03af # Greek_iotaaccent -0x07b5 U03ca # Greek_iotadieresis -0x07b6 U0390 # Greek_iotaaccentdieresis -0x07b7 U03cc # Greek_omicronaccent -0x07b8 U03cd # Greek_upsilonaccent -0x07b9 U03cb # Greek_upsilondieresis -0x07ba U03b0 # Greek_upsilonaccentdieresis -0x07bb U03ce # Greek_omegaaccent -0x07c1 U0391 # Greek_ALPHA -0x07c2 U0392 # Greek_BETA -0x07c3 U0393 # Greek_GAMMA -0x07c4 U0394 # Greek_DELTA -0x07c5 U0395 # Greek_EPSILON -0x07c6 U0396 # Greek_ZETA -0x07c7 U0397 # Greek_ETA -0x07c8 U0398 # Greek_THETA -0x07c9 U0399 # Greek_IOTA -0x07ca U039a # Greek_KAPPA -0x07cb U039b # Greek_LAMBDA -0x07cb U039b # Greek_LAMDA -0x07cc U039c # Greek_MU -0x07cd U039d # Greek_NU -0x07ce U039e # Greek_XI -0x07cf U039f # Greek_OMICRON -0x07d0 U03a0 # Greek_PI -0x07d1 U03a1 # Greek_RHO -0x07d2 U03a3 # Greek_SIGMA -0x07d4 U03a4 # Greek_TAU -0x07d5 U03a5 # Greek_UPSILON -0x07d6 U03a6 # Greek_PHI -0x07d7 U03a7 # Greek_CHI -0x07d8 U03a8 # Greek_PSI -0x07d9 U03a9 # Greek_OMEGA -0x07e1 U03b1 # Greek_alpha -0x07e2 U03b2 # Greek_beta -0x07e3 U03b3 # Greek_gamma -0x07e4 U03b4 # Greek_delta -0x07e5 U03b5 # Greek_epsilon -0x07e6 U03b6 # Greek_zeta -0x07e7 U03b7 # Greek_eta -0x07e8 U03b8 # Greek_theta -0x07e9 U03b9 # Greek_iota -0x07ea U03ba # Greek_kappa -0x07eb U03bb # Greek_lambda -0x07ec U03bc # Greek_mu -0x07ed U03bd # Greek_nu -0x07ee U03be # Greek_xi -0x07ef U03bf # Greek_omicron -0x07f0 U03c0 # Greek_pi -0x07f1 U03c1 # Greek_rho -0x07f2 U03c3 # Greek_sigma -0x07f3 U03c2 # Greek_finalsmallsigma -0x07f4 U03c4 # Greek_tau -0x07f5 U03c5 # Greek_upsilon -0x07f6 U03c6 # Greek_phi -0x07f7 U03c7 # Greek_chi -0x07f8 U03c8 # Greek_psi -0x07f9 U03c9 # Greek_omega -0x08a1 U0000 # leftradical -0x08a2 U0000 # topleftradical -0x08a3 U0000 # horizconnector -0x08a4 U2320 # topintegral -0x08a5 U2321 # botintegral -0x08a6 U2502 # vertconnector -0x08a7 U0000 # topleftsqbracket -0x08a8 U0000 # botleftsqbracket -0x08a9 U0000 # toprightsqbracket -0x08aa U0000 # botrightsqbracket -0x08ab U0000 # topleftparens -0x08ac U0000 # botleftparens -0x08ad U0000 # toprightparens -0x08ae U0000 # botrightparens -0x08af U0000 # leftmiddlecurlybrace -0x08b0 U0000 # rightmiddlecurlybrace -0x08b1 U0000 # topleftsummation -0x08b2 U0000 # botleftsummation -0x08b3 U0000 # topvertsummationconnector -0x08b4 U0000 # botvertsummationconnector -0x08b5 U0000 # toprightsummation -0x08b6 U0000 # botrightsummation -0x08b7 U0000 # rightmiddlesummation -0x08bc U2264 # lessthanequal -0x08bd U2260 # notequal -0x08be U2265 # greaterthanequal -0x08bf U222b # integral -0x08c0 U2234 # therefore -0x08c1 U221d # variation -0x08c2 U221e # infinity -0x08c5 U2207 # nabla -0x08c8 U2245 # approximate -0x08c9 U0000 # similarequal -0x08cd U21d4 # ifonlyif -0x08ce U21d2 # implies -0x08cf U2261 # identical -0x08d6 U221a # radical -0x08da U2282 # includedin -0x08db U2283 # includes -0x08dc U2229 # intersection -0x08dd U222a # union -0x08de U2227 # logicaland -0x08df U2228 # logicalor -0x08ef U2202 # partialderivative -0x08f6 U0192 # function -0x08fb U2190 # leftarrow -0x08fc U2191 # uparrow -0x08fd U2192 # rightarrow -0x08fe U2193 # downarrow -0x09df U2422 # blank -0x09e0 U25c6 # soliddiamond -0x09e1 U2592 # checkerboard -0x09e2 U2409 # ht -0x09e3 U240c # ff -0x09e4 U240d # cr -0x09e5 U240a # lf -0x09e8 U2424 # nl -0x09e9 U240b # vt -0x09ea U2518 # lowrightcorner -0x09eb U2510 # uprightcorner -0x09ec U250c # upleftcorner -0x09ed U2514 # lowleftcorner -0x09ee U253c # crossinglines -0x09ef U0000 # horizlinescan1 -0x09f0 U0000 # horizlinescan3 -0x09f1 U2500 # horizlinescan5 -0x09f2 U0000 # horizlinescan7 -0x09f3 U0000 # horizlinescan9 -0x09f4 U251c # leftt -0x09f5 U2524 # rightt -0x09f6 U2534 # bott -0x09f7 U252c # topt -0x09f8 U2502 # vertbar -0xfe50 U0300 # dead_grave -0xfe51 U0301 # dead_acute -0xfe52 U0302 # dead_circumflex -0xfe53 U0303 # dead_tilde -0xfe54 U0304 # dead_macron -0xfe55 U0306 # dead_breve -0xfe56 U0307 # dead_abovedot -0xfe57 U0308 # dead_diaeresis -0xfe58 U030a # dead_abovering -0xfe59 U030b # dead_doubleacute -0xfe5a U030c # dead_caron -0xfe5b U0327 # dead_cedilla -0xfe5c U0328 # dead_ogonek -0xfe5d U0345 # dead_iota -0xfe5e U3099 # dead_voiced_sound -0xfe5f U309a # dead_semivoiced_sound -0xff08 U0008 # BackSpace /* back space, back char */ -0xff09 U0009 # Tab -0xff0a U000a # Linefeed /* Linefeed, LF */ -0xff0b U000b # Clear -0xff0d U000d # Return /* Return, enter */ -0xff13 U0013 # Pause /* Pause, hold */ -0xff14 U0014 # Scroll_Lock -0xff15 U0015 # Sys_Req -0xff1b U001b # Escape -0xff80 U0032 # KP_Space /* space */ -0xff89 U0009 # KP_Tab -0xff8d U000d # KP_Enter /* enter */ -0xffaa U002a # KP_Multiply -0xffab U002b # KP_Add -0xffac U002c # KP_Separator /* separator, often comma */ -0xffad U002d # KP_Subtract -0xffae U002e # KP_Decimal -0xffaf U002f # KP_Divide -0xffb0 U0030 # KP_0 -0xffb1 U0031 # KP_1 -0xffb2 U0032 # KP_2 -0xffb3 U0033 # KP_3 -0xffb4 U0034 # KP_4 -0xffb5 U0035 # KP_5 -0xffb6 U0036 # KP_6 -0xffb7 U0037 # KP_7 -0xffb8 U0038 # KP_8 -0xffb9 U0039 # KP_9 -0xffbd U003d # KP_Equal /* equals */ -0x0aa1 U2003 # emspace -0x0aa2 U2002 # enspace -0x0aa3 U2004 # em3space -0x0aa4 U2005 # em4space -0x0aa5 U2007 # digitspace -0x0aa6 U2008 # punctspace -0x0aa7 U2009 # thinspace -0x0aa8 U200a # hairspace -0x0aa9 U2014 # emdash -0x0aaa U2013 # endash -0x0aac U0000 # signifblank -0x0aae U2026 # ellipsis -0x0aaf U0000 # doubbaselinedot -0x0ab0 U2153 # onethird -0x0ab1 U2154 # twothirds -0x0ab2 U2155 # onefifth -0x0ab3 U2156 # twofifths -0x0ab4 U2157 # threefifths -0x0ab5 U2158 # fourfifths -0x0ab6 U2159 # onesixth -0x0ab7 U215a # fivesixths -0x0ab8 U2105 # careof -0x0abb U2012 # figdash -0x0abc U2329 # leftanglebracket -0x0abd U002e # decimalpoint -0x0abe U232a # rightanglebracket -0x0abf U0000 # marker -0x0ac3 U215b # oneeighth -0x0ac4 U215c # threeeighths -0x0ac5 U215d # fiveeighths -0x0ac6 U215e # seveneighths -0x0ac9 U2122 # trademark -0x0aca U2613 # signaturemark -0x0acb U0000 # trademarkincircle -0x0acc U25c1 # leftopentriangle -0x0acd U25b7 # rightopentriangle -0x0ace U25cb # emopencircle -0x0acf U25a1 # emopenrectangle -0x0ad0 U2018 # leftsinglequotemark -0x0ad1 U2019 # rightsinglequotemark -0x0ad2 U201c # leftdoublequotemark -0x0ad3 U201d # rightdoublequotemark -0x0ad4 U211e # prescription -0x0ad6 U2032 # minutes -0x0ad7 U2033 # seconds -0x0ad9 U271d # latincross -0x0ada U0000 # hexagram -0x0adb U25ac # filledrectbullet -0x0adc U25c0 # filledlefttribullet -0x0add U25b6 # filledrighttribullet -0x0ade U25cf # emfilledcircle -0x0adf U25a0 # emfilledrect -0x0ae0 U25e6 # enopencircbullet -0x0ae1 U25ab # enopensquarebullet -0x0ae2 U25ad # openrectbullet -0x0ae3 U25b3 # opentribulletup -0x0ae4 U25bd # opentribulletdown -0x0ae5 U2606 # openstar -0x0ae6 U2022 # enfilledcircbullet -0x0ae7 U25aa # enfilledsqbullet -0x0ae8 U25b2 # filledtribulletup -0x0ae9 U25bc # filledtribulletdown -0x0aea U261c # leftpointer -0x0aeb U261e # rightpointer -0x0aec U2663 # club -0x0aed U2666 # diamond -0x0aee U2665 # heart -0x0af0 U2720 # maltesecross -0x0af1 U2020 # dagger -0x0af2 U2021 # doubledagger -0x0af3 U2713 # checkmark -0x0af4 U2717 # ballotcross -0x0af5 U266f # musicalsharp -0x0af6 U266d # musicalflat -0x0af7 U2642 # malesymbol -0x0af8 U2640 # femalesymbol -0x0af9 U260e # telephone -0x0afa U2315 # telephonerecorder -0x0afb U2117 # phonographcopyright -0x0afc U2038 # caret -0x0afd U201a # singlelowquotemark -0x0afe U201e # doublelowquotemark -0x0aff U0000 # cursor -0x0ba3 U003c # leftcaret -0x0ba6 U003e # rightcaret -0x0ba8 U2228 # downcaret -0x0ba9 U2227 # upcaret -0x0bc0 U00af # overbar -0x0bc2 U22a4 # downtack -0x0bc3 U2229 # upshoe -0x0bc4 U230a # downstile -0x0bc6 U005f # underbar -0x0bca U2218 # jot -0x0bcc U2395 # quad -0x0bce U22a5 # uptack -0x0bcf U25cb # circle -0x0bd3 U2308 # upstile -0x0bd6 U222a # downshoe -0x0bd8 U2283 # rightshoe -0x0bda U2282 # leftshoe -0x0bdc U22a3 # lefttack -0x0bfc U22a2 # righttack -0x0cdf U2017 # hebrew_doublelowline -0x0ce0 U05d0 # hebrew_aleph -0x0ce1 U05d1 # hebrew_bet -0x0ce1 U05d1 # hebrew_beth /* deprecated */ -0x0ce2 U05d2 # hebrew_gimel -0x0ce2 U05d2 # hebrew_gimmel /* deprecated */ -0x0ce3 U05d3 # hebrew_dalet -0x0ce3 U05d3 # hebrew_daleth /* deprecated */ -0x0ce4 U05d4 # hebrew_he -0x0ce5 U05d5 # hebrew_waw -0x0ce6 U05d6 # hebrew_zain -0x0ce6 U05d6 # hebrew_zayin /* deprecated */ -0x0ce7 U05d7 # hebrew_chet -0x0ce7 U05d7 # hebrew_het /* deprecated */ -0x0ce8 U05d8 # hebrew_tet -0x0ce8 U05d8 # hebrew_teth /* deprecated */ -0x0ce9 U05d9 # hebrew_yod -0x0cea U05da # hebrew_finalkaph -0x0ceb U05db # hebrew_kaph -0x0cec U05dc # hebrew_lamed -0x0ced U05dd # hebrew_finalmem -0x0cee U05de # hebrew_mem -0x0cef U05df # hebrew_finalnun -0x0cf0 U05e0 # hebrew_nun -0x0cf1 U05e1 # hebrew_samech -0x0cf1 U05e1 # hebrew_samekh /* deprecated */ -0x0cf2 U05e2 # hebrew_ayin -0x0cf3 U05e3 # hebrew_finalpe -0x0cf4 U05e4 # hebrew_pe -0x0cf5 U05e5 # hebrew_finalzade -0x0cf5 U05e5 # hebrew_finalzadi /* deprecated */ -0x0cf6 U05e6 # hebrew_zade -0x0cf6 U05e6 # hebrew_zadi /* deprecated */ -0x0cf7 U05e7 # hebrew_kuf /* deprecated */ -0x0cf7 U05e7 # hebrew_qoph -0x0cf8 U05e8 # hebrew_resh -0x0cf9 U05e9 # hebrew_shin -0x0cfa U05ea # hebrew_taf /* deprecated */ -0x0cfa U05ea # hebrew_taw -0x0da1 U0e01 # Thai_kokai -0x0da2 U0e02 # Thai_khokhai -0x0da3 U0e03 # Thai_khokhuat -0x0da4 U0e04 # Thai_khokhwai -0x0da5 U0e05 # Thai_khokhon -0x0da6 U0e06 # Thai_khorakhang -0x0da7 U0e07 # Thai_ngongu -0x0da8 U0e08 # Thai_chochan -0x0da9 U0e09 # Thai_choching -0x0daa U0e0a # Thai_chochang -0x0dab U0e0b # Thai_soso -0x0dac U0e0c # Thai_chochoe -0x0dad U0e0d # Thai_yoying -0x0dae U0e0e # Thai_dochada -0x0daf U0e0f # Thai_topatak -0x0db0 U0e10 # Thai_thothan -0x0db1 U0e11 # Thai_thonangmontho -0x0db2 U0e12 # Thai_thophuthao -0x0db3 U0e13 # Thai_nonen -0x0db4 U0e14 # Thai_dodek -0x0db5 U0e15 # Thai_totao -0x0db6 U0e16 # Thai_thothung -0x0db7 U0e17 # Thai_thothahan -0x0db8 U0e18 # Thai_thothong -0x0db9 U0e19 # Thai_nonu -0x0dba U0e1a # Thai_bobaimai -0x0dbb U0e1b # Thai_popla -0x0dbc U0e1c # Thai_phophung -0x0dbd U0e1d # Thai_fofa -0x0dbe U0e1e # Thai_phophan -0x0dbf U0e1f # Thai_fofan -0x0dc0 U0e20 # Thai_phosamphao -0x0dc1 U0e21 # Thai_moma -0x0dc2 U0e22 # Thai_yoyak -0x0dc3 U0e23 # Thai_rorua -0x0dc4 U0e24 # Thai_ru -0x0dc5 U0e25 # Thai_loling -0x0dc6 U0e26 # Thai_lu -0x0dc7 U0e27 # Thai_wowaen -0x0dc8 U0e28 # Thai_sosala -0x0dc9 U0e29 # Thai_sorusi -0x0dca U0e2a # Thai_sosua -0x0dcb U0e2b # Thai_hohip -0x0dcc U0e2c # Thai_lochula -0x0dcd U0e2d # Thai_oang -0x0dce U0e2e # Thai_honokhuk -0x0dcf U0e2f # Thai_paiyannoi -0x0dd0 U0e30 # Thai_saraa -0x0dd1 U0e31 # Thai_maihanakat -0x0dd2 U0e32 # Thai_saraaa -0x0dd3 U0e33 # Thai_saraam -0x0dd4 U0e34 # Thai_sarai -0x0dd5 U0e35 # Thai_saraii -0x0dd6 U0e36 # Thai_saraue -0x0dd7 U0e37 # Thai_sarauee -0x0dd8 U0e38 # Thai_sarau -0x0dd9 U0e39 # Thai_sarauu -0x0dda U0e3a # Thai_phinthu -0x0dde U0e3e # Thai_maihanakat_maitho -0x0ddf U0e3f # Thai_baht -0x0de0 U0e40 # Thai_sarae -0x0de1 U0e41 # Thai_saraae -0x0de2 U0e42 # Thai_sarao -0x0de3 U0e43 # Thai_saraaimaimuan -0x0de4 U0e44 # Thai_saraaimaimalai -0x0de5 U0e45 # Thai_lakkhangyao -0x0de6 U0e46 # Thai_maiyamok -0x0de7 U0e47 # Thai_maitaikhu -0x0de8 U0e48 # Thai_maiek -0x0de9 U0e49 # Thai_maitho -0x0dea U0e4a # Thai_maitri -0x0deb U0e4b # Thai_maichattawa -0x0dec U0e4c # Thai_thanthakhat -0x0ded U0e4d # Thai_nikhahit -0x0df0 U0e50 # Thai_leksun -0x0df1 U0e51 # Thai_leknung -0x0df2 U0e52 # Thai_leksong -0x0df3 U0e53 # Thai_leksam -0x0df4 U0e54 # Thai_leksi -0x0df5 U0e55 # Thai_lekha -0x0df6 U0e56 # Thai_lekhok -0x0df7 U0e57 # Thai_lekchet -0x0df8 U0e58 # Thai_lekpaet -0x0df9 U0e59 # Thai_lekkao -0x0ea1 U3131 # Hangul_Kiyeog -0x0ea2 U3132 # Hangul_SsangKiyeog -0x0ea3 U3133 # Hangul_KiyeogSios -0x0ea4 U3134 # Hangul_Nieun -0x0ea5 U3135 # Hangul_NieunJieuj -0x0ea6 U3136 # Hangul_NieunHieuh -0x0ea7 U3137 # Hangul_Dikeud -0x0ea8 U3138 # Hangul_SsangDikeud -0x0ea9 U3139 # Hangul_Rieul -0x0eaa U313a # Hangul_RieulKiyeog -0x0eab U313b # Hangul_RieulMieum -0x0eac U313c # Hangul_RieulPieub -0x0ead U313d # Hangul_RieulSios -0x0eae U313e # Hangul_RieulTieut -0x0eaf U313f # Hangul_RieulPhieuf -0x0eb0 U3140 # Hangul_RieulHieuh -0x0eb1 U3141 # Hangul_Mieum -0x0eb2 U3142 # Hangul_Pieub -0x0eb3 U3143 # Hangul_SsangPieub -0x0eb4 U3144 # Hangul_PieubSios -0x0eb5 U3145 # Hangul_Sios -0x0eb6 U3146 # Hangul_SsangSios -0x0eb7 U3147 # Hangul_Ieung -0x0eb8 U3148 # Hangul_Jieuj -0x0eb9 U3149 # Hangul_SsangJieuj -0x0eba U314a # Hangul_Cieuc -0x0ebb U314b # Hangul_Khieuq -0x0ebc U314c # Hangul_Tieut -0x0ebd U314d # Hangul_Phieuf -0x0ebe U314e # Hangul_Hieuh -0x0ebf U314f # Hangul_A -0x0ec0 U3150 # Hangul_AE -0x0ec1 U3151 # Hangul_YA -0x0ec2 U3152 # Hangul_YAE -0x0ec3 U3153 # Hangul_EO -0x0ec4 U3154 # Hangul_E -0x0ec5 U3155 # Hangul_YEO -0x0ec6 U3156 # Hangul_YE -0x0ec7 U3157 # Hangul_O -0x0ec8 U3158 # Hangul_WA -0x0ec9 U3159 # Hangul_WAE -0x0eca U315a # Hangul_OE -0x0ecb U315b # Hangul_YO -0x0ecc U315c # Hangul_U -0x0ecd U315d # Hangul_WEO -0x0ece U315e # Hangul_WE -0x0ecf U315f # Hangul_WI -0x0ed0 U3160 # Hangul_YU -0x0ed1 U3161 # Hangul_EU -0x0ed2 U3162 # Hangul_YI -0x0ed3 U3163 # Hangul_I -0x0ed4 U11a8 # Hangul_J_Kiyeog -0x0ed5 U11a9 # Hangul_J_SsangKiyeog -0x0ed6 U11aa # Hangul_J_KiyeogSios -0x0ed7 U11ab # Hangul_J_Nieun -0x0ed8 U11ac # Hangul_J_NieunJieuj -0x0ed9 U11ad # Hangul_J_NieunHieuh -0x0eda U11ae # Hangul_J_Dikeud -0x0edb U11af # Hangul_J_Rieul -0x0edc U11b0 # Hangul_J_RieulKiyeog -0x0edd U11b1 # Hangul_J_RieulMieum -0x0ede U11b2 # Hangul_J_RieulPieub -0x0edf U11b3 # Hangul_J_RieulSios -0x0ee0 U11b4 # Hangul_J_RieulTieut -0x0ee1 U11b5 # Hangul_J_RieulPhieuf -0x0ee2 U11b6 # Hangul_J_RieulHieuh -0x0ee3 U11b7 # Hangul_J_Mieum -0x0ee4 U11b8 # Hangul_J_Pieub -0x0ee5 U11b9 # Hangul_J_PieubSios -0x0ee6 U11ba # Hangul_J_Sios -0x0ee7 U11bb # Hangul_J_SsangSios -0x0ee8 U11bc # Hangul_J_Ieung -0x0ee9 U11bd # Hangul_J_Jieuj -0x0eea U11be # Hangul_J_Cieuc -0x0eeb U11bf # Hangul_J_Khieuq -0x0eec U11c0 # Hangul_J_Tieut -0x0eed U11c1 # Hangul_J_Phieuf -0x0eee U11c2 # Hangul_J_Hieuh -0x0eef U316d # Hangul_RieulYeorinHieuh -0x0ef0 U3171 # Hangul_SunkyeongeumMieum -0x0ef1 U3178 # Hangul_SunkyeongeumPieub -0x0ef2 U317f # Hangul_PanSios -0x0ef3 U0000 # Hangul_KkogjiDalrinIeung -0x0ef4 U3184 # Hangul_SunkyeongeumPhieuf -0x0ef5 U3186 # Hangul_YeorinHieuh -0x0ef6 U318d # Hangul_AraeA -0x0ef7 U318e # Hangul_AraeAE -0x0ef8 U11eb # Hangul_J_PanSios -0x0ef9 U0000 # Hangul_J_KkogjiDalrinIeung -0x0efa U11f9 # Hangul_J_YeorinHieuh -0x0eff U20a9 # Korean_Won -0x20a0 U20a0 # EcuSign -0x20a1 U20a1 # ColonSign -0x20a2 U20a2 # CruzeiroSign -0x20a3 U20a3 # FFrancSign -0x20a4 U20a4 # LiraSign -0x20a5 U20a5 # MillSign -0x20a6 U20a6 # NairaSign -0x20a7 U20a7 # PesetaSign -0x20a8 U20a8 # RupeeSign -0x20a9 U20a9 # WonSign -0x20aa U20aa # NewSheqelSign -0x20ab U20ab # DongSign -0x20ac U20ac # EuroSign +# +0x0020 U0020 # space +0x0021 U0021 # exclam +0x0022 U0022 # quotedbl +0x0023 U0023 # numbersign +0x0024 U0024 # dollar +0x0025 U0025 # percent +0x0026 U0026 # ampersand +0x0027 U0027 # apostrophe +0x0028 U0028 # parenleft +0x0029 U0029 # parenright +0x002a U002a # asterisk +0x002b U002b # plus +0x002c U002c # comma +0x002d U002d # minus +0x002e U002e # period +0x002f U002f # slash +0x0030 U0030 # 0 +0x0031 U0031 # 1 +0x0032 U0032 # 2 +0x0033 U0033 # 3 +0x0034 U0034 # 4 +0x0035 U0035 # 5 +0x0036 U0036 # 6 +0x0037 U0037 # 7 +0x0038 U0038 # 8 +0x0039 U0039 # 9 +0x003a U003a # colon +0x003b U003b # semicolon +0x003c U003c # less +0x003d U003d # equal +0x003e U003e # greater +0x003f U003f # question +0x0040 U0040 # at +0x0041 U0041 # A +0x0042 U0042 # B +0x0043 U0043 # C +0x0044 U0044 # D +0x0045 U0045 # E +0x0046 U0046 # F +0x0047 U0047 # G +0x0048 U0048 # H +0x0049 U0049 # I +0x004a U004a # J +0x004b U004b # K +0x004c U004c # L +0x004d U004d # M +0x004e U004e # N +0x004f U004f # O +0x0050 U0050 # P +0x0051 U0051 # Q +0x0052 U0052 # R +0x0053 U0053 # S +0x0054 U0054 # T +0x0055 U0055 # U +0x0056 U0056 # V +0x0057 U0057 # W +0x0058 U0058 # X +0x0059 U0059 # Y +0x005a U005a # Z +0x005b U005b # bracketleft +0x005c U005c # backslash +0x005d U005d # bracketright +0x005e U005e # asciicircum +0x005f U005f # underscore +0x0060 U0060 # grave +0x0061 U0061 # a +0x0062 U0062 # b +0x0063 U0063 # c +0x0064 U0064 # d +0x0065 U0065 # e +0x0066 U0066 # f +0x0067 U0067 # g +0x0068 U0068 # h +0x0069 U0069 # i +0x006a U006a # j +0x006b U006b # k +0x006c U006c # l +0x006d U006d # m +0x006e U006e # n +0x006f U006f # o +0x0070 U0070 # p +0x0071 U0071 # q +0x0072 U0072 # r +0x0073 U0073 # s +0x0074 U0074 # t +0x0075 U0075 # u +0x0076 U0076 # v +0x0077 U0077 # w +0x0078 U0078 # x +0x0079 U0079 # y +0x007a U007a # z +0x007b U007b # braceleft +0x007c U007c # bar +0x007d U007d # braceright +0x007e U007e # asciitilde +0x00a0 U00a0 # nobreakspace +0x00a1 U00a1 # exclamdown +0x00a2 U00a2 # cent +0x00a3 U00a3 # sterling +0x00a4 U00a4 # currency +0x00a5 U00a5 # yen +0x00a6 U00a6 # brokenbar +0x00a7 U00a7 # section +0x00a8 U00a8 # diaeresis +0x00a9 U00a9 # copyright +0x00aa U00aa # ordfeminine +0x00ab U00ab # guillemotleft /* left angle quotation mark */ +0x00ac U00ac # notsign +0x00ad U00ad # hyphen +0x00ae U00ae # registered +0x00af U00af # macron +0x00b0 U00b0 # degree +0x00b1 U00b1 # plusminus +0x00b2 U00b2 # twosuperior +0x00b3 U00b3 # threesuperior +0x00b4 U00b4 # acute +0x00b5 U00b5 # mu +0x00b6 U00b6 # paragraph +0x00b7 U00b7 # periodcentered +0x00b8 U00b8 # cedilla +0x00b9 U00b9 # onesuperior +0x00ba U00ba # masculine +0x00bb U00bb # guillemotright /* right angle quotation mark */ +0x00bc U00bc # onequarter +0x00bd U00bd # onehalf +0x00be U00be # threequarters +0x00bf U00bf # questiondown +0x00c0 U00c0 # Agrave +0x00c1 U00c1 # Aacute +0x00c2 U00c2 # Acircumflex +0x00c3 U00c3 # Atilde +0x00c4 U00c4 # Adiaeresis +0x00c5 U00c5 # Aring +0x00c6 U00c6 # AE +0x00c7 U00c7 # Ccedilla +0x00c8 U00c8 # Egrave +0x00c9 U00c9 # Eacute +0x00ca U00ca # Ecircumflex +0x00cb U00cb # Ediaeresis +0x00cc U00cc # Igrave +0x00cd U00cd # Iacute +0x00ce U00ce # Icircumflex +0x00cf U00cf # Idiaeresis +0x00d0 U00d0 # ETH +0x00d1 U00d1 # Ntilde +0x00d2 U00d2 # Ograve +0x00d3 U00d3 # Oacute +0x00d4 U00d4 # Ocircumflex +0x00d5 U00d5 # Otilde +0x00d6 U00d6 # Odiaeresis +0x00d7 U00d7 # multiply +0x00d8 U00d8 # Oslash +0x00d9 U00d9 # Ugrave +0x00da U00da # Uacute +0x00db U00db # Ucircumflex +0x00dc U00dc # Udiaeresis +0x00dd U00dd # Yacute +0x00de U00de # THORN +0x00df U00df # ssharp +0x00e0 U00e0 # agrave +0x00e1 U00e1 # aacute +0x00e2 U00e2 # acircumflex +0x00e3 U00e3 # atilde +0x00e4 U00e4 # adiaeresis +0x00e5 U00e5 # aring +0x00e6 U00e6 # ae +0x00e7 U00e7 # ccedilla +0x00e8 U00e8 # egrave +0x00e9 U00e9 # eacute +0x00ea U00ea # ecircumflex +0x00eb U00eb # ediaeresis +0x00ec U00ec # igrave +0x00ed U00ed # iacute +0x00ee U00ee # icircumflex +0x00ef U00ef # idiaeresis +0x00f0 U00f0 # eth +0x00f1 U00f1 # ntilde +0x00f2 U00f2 # ograve +0x00f3 U00f3 # oacute +0x00f4 U00f4 # ocircumflex +0x00f5 U00f5 # otilde +0x00f6 U00f6 # odiaeresis +0x00f7 U00f7 # division +0x00f8 U00f8 # oslash +0x00f9 U00f9 # ugrave +0x00fa U00fa # uacute +0x00fb U00fb # ucircumflex +0x00fc U00fc # udiaeresis +0x00fd U00fd # yacute +0x00fe U00fe # thorn +0x00ff U00ff # ydiaeresis +0x01a1 U0104 # Aogonek +0x01a2 U02d8 # breve +0x01a3 U0141 # Lstroke +0x01a5 U013d # Lcaron +0x01a6 U015a # Sacute +0x01a9 U0160 # Scaron +0x01aa U015e # Scedilla +0x01ab U0164 # Tcaron +0x01ac U0179 # Zacute +0x01ae U017d # Zcaron +0x01af U017b # Zabovedot +0x01b1 U0105 # aogonek +0x01b2 U02db # ogonek +0x01b3 U0142 # lstroke +0x01b5 U013e # lcaron +0x01b6 U015b # sacute +0x01b7 U02c7 # caron +0x01b9 U0161 # scaron +0x01ba U015f # scedilla +0x01bb U0165 # tcaron +0x01bc U017a # zacute +0x01bd U02dd # doubleacute +0x01be U017e # zcaron +0x01bf U017c # zabovedot +0x01c0 U0154 # Racute +0x01c3 U0102 # Abreve +0x01c5 U0139 # Lacute +0x01c6 U0106 # Cacute +0x01c8 U010c # Ccaron +0x01ca U0118 # Eogonek +0x01cc U011a # Ecaron +0x01cf U010e # Dcaron +0x01d0 U0110 # Dstroke +0x01d1 U0143 # Nacute +0x01d2 U0147 # Ncaron +0x01d5 U0150 # Odoubleacute +0x01d8 U0158 # Rcaron +0x01d9 U016e # Uring +0x01db U0170 # Udoubleacute +0x01de U0162 # Tcedilla +0x01e0 U0155 # racute +0x01e3 U0103 # abreve +0x01e5 U013a # lacute +0x01e6 U0107 # cacute +0x01e8 U010d # ccaron +0x01ea U0119 # eogonek +0x01ec U011b # ecaron +0x01ef U010f # dcaron +0x01f0 U0111 # dstroke +0x01f1 U0144 # nacute +0x01f2 U0148 # ncaron +0x01f5 U0151 # odoubleacute +0x01f8 U0159 # rcaron +0x01f9 U016f # uring +0x01fb U0171 # udoubleacute +0x01fe U0163 # tcedilla +0x01ff U02d9 # abovedot +0x02a1 U0126 # Hstroke +0x02a6 U0124 # Hcircumflex +0x02a9 U0130 # Iabovedot +0x02ab U011e # Gbreve +0x02ac U0134 # Jcircumflex +0x02b1 U0127 # hstroke +0x02b6 U0125 # hcircumflex +0x02b9 U0131 # idotless +0x02bb U011f # gbreve +0x02bc U0135 # jcircumflex +0x02c5 U010a # Cabovedot +0x02c6 U0108 # Ccircumflex +0x02d5 U0120 # Gabovedot +0x02d8 U011c # Gcircumflex +0x02dd U016c # Ubreve +0x02de U015c # Scircumflex +0x02e5 U010b # cabovedot +0x02e6 U0109 # ccircumflex +0x02f5 U0121 # gabovedot +0x02f8 U011d # gcircumflex +0x02fd U016d # ubreve +0x02fe U015d # scircumflex +0x03a2 U0138 # kra +0x03a3 U0156 # Rcedilla +0x03a5 U0128 # Itilde +0x03a6 U013b # Lcedilla +0x03aa U0112 # Emacron +0x03ab U0122 # Gcedilla +0x03ac U0166 # Tslash +0x03b3 U0157 # rcedilla +0x03b5 U0129 # itilde +0x03b6 U013c # lcedilla +0x03ba U0113 # emacron +0x03bb U0123 # gcedilla +0x03bc U0167 # tslash +0x03bd U014a # ENG +0x03bf U014b # eng +0x03c0 U0100 # Amacron +0x03c7 U012e # Iogonek +0x03cc U0116 # Eabovedot +0x03cf U012a # Imacron +0x03d1 U0145 # Ncedilla +0x03d2 U014c # Omacron +0x03d3 U0136 # Kcedilla +0x03d9 U0172 # Uogonek +0x03dd U0168 # Utilde +0x03de U016a # Umacron +0x03e0 U0101 # amacron +0x03e7 U012f # iogonek +0x03ec U0117 # eabovedot +0x03ef U012b # imacron +0x03f1 U0146 # ncedilla +0x03f2 U014d # omacron +0x03f3 U0137 # kcedilla +0x03f9 U0173 # uogonek +0x03fd U0169 # utilde +0x03fe U016b # umacron +0x047e U203e # overline +0x04a1 U3002 # kana_fullstop +0x04a2 U300c # kana_openingbracket +0x04a3 U300d # kana_closingbracket +0x04a4 U3001 # kana_comma +0x04a5 U30fb # kana_conjunctive +0x04a6 U30f2 # kana_WO +0x04a7 U30a1 # kana_a +0x04a8 U30a3 # kana_i +0x04a9 U30a5 # kana_u +0x04aa U30a7 # kana_e +0x04ab U30a9 # kana_o +0x04ac U30e3 # kana_ya +0x04ad U30e5 # kana_yu +0x04ae U30e7 # kana_yo +0x04af U30c3 # kana_tsu +0x04b0 U30fc # prolongedsound +0x04b1 U30a2 # kana_A +0x04b2 U30a4 # kana_I +0x04b3 U30a6 # kana_U +0x04b4 U30a8 # kana_E +0x04b5 U30aa # kana_O +0x04b6 U30ab # kana_KA +0x04b7 U30ad # kana_KI +0x04b8 U30af # kana_KU +0x04b9 U30b1 # kana_KE +0x04ba U30b3 # kana_KO +0x04bb U30b5 # kana_SA +0x04bc U30b7 # kana_SHI +0x04bd U30b9 # kana_SU +0x04be U30bb # kana_SE +0x04bf U30bd # kana_SO +0x04c0 U30bf # kana_TA +0x04c1 U30c1 # kana_CHI +0x04c2 U30c4 # kana_TSU +0x04c3 U30c6 # kana_TE +0x04c4 U30c8 # kana_TO +0x04c5 U30ca # kana_NA +0x04c6 U30cb # kana_NI +0x04c7 U30cc # kana_NU +0x04c8 U30cd # kana_NE +0x04c9 U30ce # kana_NO +0x04ca U30cf # kana_HA +0x04cb U30d2 # kana_HI +0x04cc U30d5 # kana_FU +0x04cd U30d8 # kana_HE +0x04ce U30db # kana_HO +0x04cf U30de # kana_MA +0x04d0 U30df # kana_MI +0x04d1 U30e0 # kana_MU +0x04d2 U30e1 # kana_ME +0x04d3 U30e2 # kana_MO +0x04d4 U30e4 # kana_YA +0x04d5 U30e6 # kana_YU +0x04d6 U30e8 # kana_YO +0x04d7 U30e9 # kana_RA +0x04d8 U30ea # kana_RI +0x04d9 U30eb # kana_RU +0x04da U30ec # kana_RE +0x04db U30ed # kana_RO +0x04dc U30ef # kana_WA +0x04dd U30f3 # kana_N +0x04de U309b # voicedsound +0x04df U309c # semivoicedsound +0x05ac U060c # Arabic_comma +0x05bb U061b # Arabic_semicolon +0x05bf U061f # Arabic_question_mark +0x05c1 U0621 # Arabic_hamza +0x05c2 U0622 # Arabic_maddaonalef +0x05c3 U0623 # Arabic_hamzaonalef +0x05c4 U0624 # Arabic_hamzaonwaw +0x05c5 U0625 # Arabic_hamzaunderalef +0x05c6 U0626 # Arabic_hamzaonyeh +0x05c7 U0627 # Arabic_alef +0x05c8 U0628 # Arabic_beh +0x05c9 U0629 # Arabic_tehmarbuta +0x05ca U062a # Arabic_teh +0x05cb U062b # Arabic_theh +0x05cc U062c # Arabic_jeem +0x05cd U062d # Arabic_hah +0x05ce U062e # Arabic_khah +0x05cf U062f # Arabic_dal +0x05d0 U0630 # Arabic_thal +0x05d1 U0631 # Arabic_ra +0x05d2 U0632 # Arabic_zain +0x05d3 U0633 # Arabic_seen +0x05d4 U0634 # Arabic_sheen +0x05d5 U0635 # Arabic_sad +0x05d6 U0636 # Arabic_dad +0x05d7 U0637 # Arabic_tah +0x05d8 U0638 # Arabic_zah +0x05d9 U0639 # Arabic_ain +0x05da U063a # Arabic_ghain +0x05e0 U0640 # Arabic_tatweel +0x05e1 U0641 # Arabic_feh +0x05e2 U0642 # Arabic_qaf +0x05e3 U0643 # Arabic_kaf +0x05e4 U0644 # Arabic_lam +0x05e5 U0645 # Arabic_meem +0x05e6 U0646 # Arabic_noon +0x05e7 U0647 # Arabic_ha +0x05e8 U0648 # Arabic_waw +0x05e9 U0649 # Arabic_alefmaksura +0x05ea U064a # Arabic_yeh +0x05eb U064b # Arabic_fathatan +0x05ec U064c # Arabic_dammatan +0x05ed U064d # Arabic_kasratan +0x05ee U064e # Arabic_fatha +0x05ef U064f # Arabic_damma +0x05f0 U0650 # Arabic_kasra +0x05f1 U0651 # Arabic_shadda +0x05f2 U0652 # Arabic_sukun +0x06a1 U0452 # Serbian_dje +0x06a2 U0453 # Macedonia_gje +0x06a3 U0451 # Cyrillic_io +0x06a4 U0454 # Ukrainian_ie +0x06a5 U0455 # Macedonia_dse +0x06a6 U0456 # Ukrainian_i +0x06a7 U0457 # Ukrainian_yi +0x06a8 U0458 # Cyrillic_je +0x06a9 U0459 # Cyrillic_lje +0x06aa U045a # Cyrillic_nje +0x06ab U045b # Serbian_tshe +0x06ac U045c # Macedonia_kje +0x06ad U0491 # Ukrainian_ghe_with_upturn +0x06ae U045e # Byelorussian_shortu +0x06af U045f # Cyrillic_dzhe +0x06b0 U2116 # numerosign +0x06b1 U0402 # Serbian_DJE +0x06b2 U0403 # Macedonia_GJE +0x06b3 U0401 # Cyrillic_IO +0x06b4 U0404 # Ukrainian_IE +0x06b5 U0405 # Macedonia_DSE +0x06b6 U0406 # Ukrainian_I +0x06b7 U0407 # Ukrainian_YI +0x06b8 U0408 # Cyrillic_JE +0x06b9 U0409 # Cyrillic_LJE +0x06ba U040a # Cyrillic_NJE +0x06bb U040b # Serbian_TSHE +0x06bc U040c # Macedonia_KJE +0x06bd U0490 # Ukrainian_GHE_WITH_UPTURN +0x06be U040e # Byelorussian_SHORTU +0x06bf U040f # Cyrillic_DZHE +0x06c0 U044e # Cyrillic_yu +0x06c1 U0430 # Cyrillic_a +0x06c2 U0431 # Cyrillic_be +0x06c3 U0446 # Cyrillic_tse +0x06c4 U0434 # Cyrillic_de +0x06c5 U0435 # Cyrillic_ie +0x06c6 U0444 # Cyrillic_ef +0x06c7 U0433 # Cyrillic_ghe +0x06c8 U0445 # Cyrillic_ha +0x06c9 U0438 # Cyrillic_i +0x06ca U0439 # Cyrillic_shorti +0x06cb U043a # Cyrillic_ka +0x06cc U043b # Cyrillic_el +0x06cd U043c # Cyrillic_em +0x06ce U043d # Cyrillic_en +0x06cf U043e # Cyrillic_o +0x06d0 U043f # Cyrillic_pe +0x06d1 U044f # Cyrillic_ya +0x06d2 U0440 # Cyrillic_er +0x06d3 U0441 # Cyrillic_es +0x06d4 U0442 # Cyrillic_te +0x06d5 U0443 # Cyrillic_u +0x06d6 U0436 # Cyrillic_zhe +0x06d7 U0432 # Cyrillic_ve +0x06d8 U044c # Cyrillic_softsign +0x06d9 U044b # Cyrillic_yeru +0x06da U0437 # Cyrillic_ze +0x06db U0448 # Cyrillic_sha +0x06dc U044d # Cyrillic_e +0x06dd U0449 # Cyrillic_shcha +0x06de U0447 # Cyrillic_che +0x06df U044a # Cyrillic_hardsign +0x06e0 U042e # Cyrillic_YU +0x06e1 U0410 # Cyrillic_A +0x06e2 U0411 # Cyrillic_BE +0x06e3 U0426 # Cyrillic_TSE +0x06e4 U0414 # Cyrillic_DE +0x06e5 U0415 # Cyrillic_IE +0x06e6 U0424 # Cyrillic_EF +0x06e7 U0413 # Cyrillic_GHE +0x06e8 U0425 # Cyrillic_HA +0x06e9 U0418 # Cyrillic_I +0x06ea U0419 # Cyrillic_SHORTI +0x06eb U041a # Cyrillic_KA +0x06ec U041b # Cyrillic_EL +0x06ed U041c # Cyrillic_EM +0x06ee U041d # Cyrillic_EN +0x06ef U041e # Cyrillic_O +0x06f0 U041f # Cyrillic_PE +0x06f1 U042f # Cyrillic_YA +0x06f2 U0420 # Cyrillic_ER +0x06f3 U0421 # Cyrillic_ES +0x06f4 U0422 # Cyrillic_TE +0x06f5 U0423 # Cyrillic_U +0x06f6 U0416 # Cyrillic_ZHE +0x06f7 U0412 # Cyrillic_VE +0x06f8 U042c # Cyrillic_SOFTSIGN +0x06f9 U042b # Cyrillic_YERU +0x06fa U0417 # Cyrillic_ZE +0x06fb U0428 # Cyrillic_SHA +0x06fc U042d # Cyrillic_E +0x06fd U0429 # Cyrillic_SHCHA +0x06fe U0427 # Cyrillic_CHE +0x06ff U042a # Cyrillic_HARDSIGN +0x07a1 U0386 # Greek_ALPHAaccent +0x07a2 U0388 # Greek_EPSILONaccent +0x07a3 U0389 # Greek_ETAaccent +0x07a4 U038a # Greek_IOTAaccent +0x07a5 U03aa # Greek_IOTAdieresis +0x07a7 U038c # Greek_OMICRONaccent +0x07a8 U038e # Greek_UPSILONaccent +0x07a9 U03ab # Greek_UPSILONdieresis +0x07ab U038f # Greek_OMEGAaccent +0x07ae U0385 # Greek_accentdieresis +0x07af U2015 # Greek_horizbar +0x07b1 U03ac # Greek_alphaaccent +0x07b2 U03ad # Greek_epsilonaccent +0x07b3 U03ae # Greek_etaaccent +0x07b4 U03af # Greek_iotaaccent +0x07b5 U03ca # Greek_IOTAdieresis +0x07b6 U0390 # Greek_iotaaccentdieresis +0x07b7 U03cc # Greek_omicronaccent +0x07b8 U03cd # Greek_upsilonaccent +0x07b9 U03cb # Greek_upsilondieresis +0x07ba U03b0 # Greek_upsilonaccentdieresis +0x07bb U03ce # Greek_omegaaccent +0x07c1 U0391 # Greek_ALPHA +0x07c2 U0392 # Greek_BETA +0x07c3 U0393 # Greek_GAMMA +0x07c4 U0394 # Greek_DELTA +0x07c5 U0395 # Greek_EPSILON +0x07c6 U0396 # Greek_ZETA +0x07c7 U0397 # Greek_ETA +0x07c8 U0398 # Greek_THETA +0x07c9 U0399 # Greek_IOTA +0x07ca U039a # Greek_KAPPA +0x07cb U039b # Greek_LAMBDA +0x07cb U039b # Greek_LAMDA +0x07cc U039c # Greek_MU +0x07cd U039d # Greek_NU +0x07ce U039e # Greek_XI +0x07cf U039f # Greek_OMICRON +0x07d0 U03a0 # Greek_PI +0x07d1 U03a1 # Greek_RHO +0x07d2 U03a3 # Greek_SIGMA +0x07d4 U03a4 # Greek_TAU +0x07d5 U03a5 # Greek_UPSILON +0x07d6 U03a6 # Greek_PHI +0x07d7 U03a7 # Greek_CHI +0x07d8 U03a8 # Greek_PSI +0x07d9 U03a9 # Greek_OMEGA +0x07e1 U03b1 # Greek_alpha +0x07e2 U03b2 # Greek_beta +0x07e3 U03b3 # Greek_gamma +0x07e4 U03b4 # Greek_delta +0x07e5 U03b5 # Greek_epsilon +0x07e6 U03b6 # Greek_zeta +0x07e7 U03b7 # Greek_eta +0x07e8 U03b8 # Greek_theta +0x07e9 U03b9 # Greek_iota +0x07ea U03ba # Greek_kappa +0x07eb U03bb # Greek_lambda +0x07ec U03bc # Greek_mu +0x07ed U03bd # Greek_nu +0x07ee U03be # Greek_xi +0x07ef U03bf # Greek_omicron +0x07f0 U03c0 # Greek_pi +0x07f1 U03c1 # Greek_rho +0x07f2 U03c3 # Greek_sigma +0x07f3 U03c2 # Greek_finalsmallsigma +0x07f4 U03c4 # Greek_tau +0x07f5 U03c5 # Greek_upsilon +0x07f6 U03c6 # Greek_phi +0x07f7 U03c7 # Greek_chi +0x07f8 U03c8 # Greek_psi +0x07f9 U03c9 # Greek_omega +0x08a1 U23b7 # leftradical +0x08a2 U250c # topleftradical +0x08a3 U2500 # horizconnector +0x08a4 U2320 # topintegral +0x08a5 U2321 # botintegral +0x08a6 U2502 # vertconnector +0x08a7 U23a1 # topleftsqbracket +0x08a8 U23a3 # botleftsqbracket +0x08a9 U23a4 # toprightsqbracket +0x08aa U23a6 # botrightsqbracket +0x08ab U239b # topleftparens +0x08ac U239d # botleftparens +0x08ad U239e # toprightparens +0x08ae U23a0 # botrightparens +0x08af U23a8 # leftmiddlecurlybrace +0x08b0 U23ac # rightmiddlecurlybrace +0x08b1 U0000 # topleftsummation +0x08b2 U0000 # botleftsummation +0x08b3 U0000 # topvertsummationconnector +0x08b4 U0000 # botvertsummationconnector +0x08b5 U0000 # toprightsummation +0x08b6 U0000 # botrightsummation +0x08b7 U0000 # rightmiddlesummation +0x08bc U2264 # lessthanequal +0x08bd U2260 # notequal +0x08be U2265 # greaterthanequal +0x08bf U222b # integral +0x08c0 U2234 # therefore +0x08c1 U221d # variation +0x08c2 U221e # infinity +0x08c5 U2207 # nabla +0x08c8 U223c # approximate +0x08c9 U2243 # similarequal +0x08cd U21d4 # ifonlyif +0x08ce U21d2 # implies +0x08cf U2261 # identical +0x08d6 U221a # radical +0x08da U2282 # includedin +0x08db U2283 # includes +0x08dc U2229 # intersection +0x08dd U222a # union +0x08de U2227 # logicaland +0x08df U2228 # logicalor +0x08ef U2202 # partialderivative +0x08f6 U0192 # function +0x08fb U2190 # leftarrow +0x08fc U2191 # uparrow +0x08fd U2192 # rightarrow +0x08fe U2193 # downarrow +0x09df U2422 # blank +0x09e0 U25c6 # soliddiamond +0x09e1 U2592 # checkerboard +0x09e2 U2409 # ht +0x09e3 U240c # ff +0x09e4 U240d # cr +0x09e5 U240a # lf +0x09e8 U2424 # nl +0x09e9 U240b # vt +0x09ea U2518 # lowrightcorner +0x09eb U2510 # uprightcorner +0x09ec U250c # upleftcorner +0x09ed U2514 # lowleftcorner +0x09ee U253c # crossinglines +0x09ef U23ba # horizlinescan1 +0x09f0 U23bb # horizlinescan3 +0x09f1 U2500 # horizlinescan5 +0x09f2 U23bc # horizlinescan7 +0x09f3 U23bd # horizlinescan9 +0x09f4 U251c # leftt +0x09f5 U2524 # rightt +0x09f6 U2534 # bott +0x09f7 U252c # topt +0x09f8 U2502 # vertbar +0x0aa1 U2003 # emspace +0x0aa2 U2002 # enspace +0x0aa3 U2004 # em3space +0x0aa4 U2005 # em4space +0x0aa5 U2007 # digitspace +0x0aa6 U2008 # punctspace +0x0aa7 U2009 # thinspace +0x0aa8 U200a # hairspace +0x0aa9 U2014 # emdash +0x0aaa U2013 # endash +0x0aac U2423 # signifblank +0x0aae U2026 # ellipsis +0x0aaf U2025 # doubbaselinedot +0x0ab0 U2153 # onethird +0x0ab1 U2154 # twothirds +0x0ab2 U2155 # onefifth +0x0ab3 U2156 # twofifths +0x0ab4 U2157 # threefifths +0x0ab5 U2158 # fourfifths +0x0ab6 U2159 # onesixth +0x0ab7 U215a # fivesixths +0x0ab8 U2105 # careof +0x0abb U2012 # figdash +0x0abc U2329 # leftanglebracket (not U+27E8) +0x0abd U002e # decimalpoint +0x0abe U232a # rightanglebracket (not U+27E9) +0x0abf U0000 # marker +0x0ac3 U215b # oneeighth +0x0ac4 U215c # threeeighths +0x0ac5 U215d # fiveeighths +0x0ac6 U215e # seveneighths +0x0ac9 U2122 # trademark +0x0aca U2613 # signaturemark +0x0acb U0000 # trademarkincircle +0x0acc U25c1 # leftopentriangle +0x0acd U25b7 # rightopentriangle +0x0ace U25cb # emopencircle +0x0acf U25af # emopenrectangle +0x0ad0 U2018 # leftsinglequotemark +0x0ad1 U2019 # rightsinglequotemark +0x0ad2 U201c # leftdoublequotemark +0x0ad3 U201d # rightdoublequotemark +0x0ad4 U211e # prescription +0x0ad6 U2032 # minutes +0x0ad7 U2033 # seconds +0x0ad9 U271d # latincross +0x0ada U0000 # hexagram +0x0adb U25ac # filledrectbullet +0x0adc U25c0 # filledlefttribullet +0x0add U25b6 # filledrighttribullet +0x0ade U25cf # emfilledcircle +0x0adf U25ae # emfilledrect +0x0ae0 U25e6 # enopencircbullet +0x0ae1 U25ab # enopensquarebullet +0x0ae2 U25ad # openrectbullet +0x0ae3 U25b3 # opentribulletup +0x0ae4 U25bd # opentribulletdown +0x0ae5 U2606 # openstar +0x0ae6 U2022 # enfilledcircbullet +0x0ae7 U25aa # enfilledsqbullet +0x0ae8 U25b2 # filledtribulletup +0x0ae9 U25bc # filledtribulletdown +0x0aea U261c # leftpointer +0x0aeb U261e # rightpointer +0x0aec U2663 # club +0x0aed U2666 # diamond +0x0aee U2665 # heart +0x0af0 U2720 # maltesecross +0x0af1 U2020 # dagger +0x0af2 U2021 # doubledagger +0x0af3 U2713 # checkmark +0x0af4 U2717 # ballotcross +0x0af5 U266f # musicalsharp +0x0af6 U266d # musicalflat +0x0af7 U2642 # malesymbol +0x0af8 U2640 # femalesymbol +0x0af9 U260e # telephone +0x0afa U2315 # telephonerecorder +0x0afb U2117 # phonographcopyright +0x0afc U2038 # caret +0x0afd U201a # singlelowquotemark +0x0afe U201e # doublelowquotemark +0x0aff U0000 # cursor +0x0ba3 U003c # leftcaret +0x0ba6 U003e # rightcaret +0x0ba8 U2228 # downcaret +0x0ba9 U2227 # upcaret +0x0bc0 U00af # overbar +0x0bc2 U22a5 # downtack +0x0bc3 U2229 # upshoe +0x0bc4 U230a # downstile +0x0bc6 U005f # underbar +0x0bca U2218 # jot +0x0bcc U2395 # quad +0x0bce U22a4 # uptack +0x0bcf U25cb # circle +0x0bd3 U2308 # upstile +0x0bd6 U222a # downshoe +0x0bd8 U2283 # rightshoe +0x0bda U2282 # leftshoe +0x0bdc U22a2 # lefttack +0x0bfc U22a3 # righttack +0x0cdf U2017 # hebrew_doublelowline +0x0ce0 U05d0 # hebrew_aleph +0x0ce1 U05d1 # hebrew_bet +0x0ce2 U05d2 # hebrew_gimel +0x0ce3 U05d3 # hebrew_dalet +0x0ce4 U05d4 # hebrew_he +0x0ce5 U05d5 # hebrew_waw +0x0ce6 U05d6 # hebrew_zain +0x0ce7 U05d7 # hebrew_chet +0x0ce8 U05d8 # hebrew_tet +0x0ce9 U05d9 # hebrew_yod +0x0cea U05da # hebrew_finalkaph +0x0ceb U05db # hebrew_kaph +0x0cec U05dc # hebrew_lamed +0x0ced U05dd # hebrew_finalmem +0x0cee U05de # hebrew_mem +0x0cef U05df # hebrew_finalnun +0x0cf0 U05e0 # hebrew_nun +0x0cf1 U05e1 # hebrew_samech +0x0cf2 U05e2 # hebrew_ayin +0x0cf3 U05e3 # hebrew_finalpe +0x0cf4 U05e4 # hebrew_pe +0x0cf5 U05e5 # hebrew_finalzade +0x0cf6 U05e6 # hebrew_zade +0x0cf7 U05e7 # hebrew_qoph +0x0cf8 U05e8 # hebrew_resh +0x0cf9 U05e9 # hebrew_shin +0x0cfa U05ea # hebrew_taw +0x0da1 U0e01 # Thai_kokai +0x0da2 U0e02 # Thai_khokhai +0x0da3 U0e03 # Thai_khokhuat +0x0da4 U0e04 # Thai_khokhwai +0x0da5 U0e05 # Thai_khokhon +0x0da6 U0e06 # Thai_khorakhang +0x0da7 U0e07 # Thai_ngongu +0x0da8 U0e08 # Thai_chochan +0x0da9 U0e09 # Thai_choching +0x0daa U0e0a # Thai_chochang +0x0dab U0e0b # Thai_soso +0x0dac U0e0c # Thai_chochoe +0x0dad U0e0d # Thai_yoying +0x0dae U0e0e # Thai_dochada +0x0daf U0e0f # Thai_topatak +0x0db0 U0e10 # Thai_thothan +0x0db1 U0e11 # Thai_thonangmontho +0x0db2 U0e12 # Thai_thophuthao +0x0db3 U0e13 # Thai_nonen +0x0db4 U0e14 # Thai_dodek +0x0db5 U0e15 # Thai_totao +0x0db6 U0e16 # Thai_thothung +0x0db7 U0e17 # Thai_thothahan +0x0db8 U0e18 # Thai_thothong +0x0db9 U0e19 # Thai_nonu +0x0dba U0e1a # Thai_bobaimai +0x0dbb U0e1b # Thai_popla +0x0dbc U0e1c # Thai_phophung +0x0dbd U0e1d # Thai_fofa +0x0dbe U0e1e # Thai_phophan +0x0dbf U0e1f # Thai_fofan +0x0dc0 U0e20 # Thai_phosamphao +0x0dc1 U0e21 # Thai_moma +0x0dc2 U0e22 # Thai_yoyak +0x0dc3 U0e23 # Thai_rorua +0x0dc4 U0e24 # Thai_ru +0x0dc5 U0e25 # Thai_loling +0x0dc6 U0e26 # Thai_lu +0x0dc7 U0e27 # Thai_wowaen +0x0dc8 U0e28 # Thai_sosala +0x0dc9 U0e29 # Thai_sorusi +0x0dca U0e2a # Thai_sosua +0x0dcb U0e2b # Thai_hohip +0x0dcc U0e2c # Thai_lochula +0x0dcd U0e2d # Thai_oang +0x0dce U0e2e # Thai_honokhuk +0x0dcf U0e2f # Thai_paiyannoi +0x0dd0 U0e30 # Thai_saraa +0x0dd1 U0e31 # Thai_maihanakat +0x0dd2 U0e32 # Thai_saraaa +0x0dd3 U0e33 # Thai_saraam +0x0dd4 U0e34 # Thai_sarai +0x0dd5 U0e35 # Thai_saraii +0x0dd6 U0e36 # Thai_saraue +0x0dd7 U0e37 # Thai_sarauee +0x0dd8 U0e38 # Thai_sarau +0x0dd9 U0e39 # Thai_sarauu +0x0dda U0e3a # Thai_phinthu +0x0dde U0e3e # Thai_maihanakat_maitho +0x0ddf U0e3f # Thai_baht +0x0de0 U0e40 # Thai_sarae +0x0de1 U0e41 # Thai_saraae +0x0de2 U0e42 # Thai_sarao +0x0de3 U0e43 # Thai_saraaimaimuan +0x0de4 U0e44 # Thai_saraaimaimalai +0x0de5 U0e45 # Thai_lakkhangyao +0x0de6 U0e46 # Thai_maiyamok +0x0de7 U0e47 # Thai_maitaikhu +0x0de8 U0e48 # Thai_maiek +0x0de9 U0e49 # Thai_maitho +0x0dea U0e4a # Thai_maitri +0x0deb U0e4b # Thai_maichattawa +0x0dec U0e4c # Thai_thanthakhat +0x0ded U0e4d # Thai_nikhahit +0x0df0 U0e50 # Thai_leksun +0x0df1 U0e51 # Thai_leknung +0x0df2 U0e52 # Thai_leksong +0x0df3 U0e53 # Thai_leksam +0x0df4 U0e54 # Thai_leksi +0x0df5 U0e55 # Thai_lekha +0x0df6 U0e56 # Thai_lekhok +0x0df7 U0e57 # Thai_lekchet +0x0df8 U0e58 # Thai_lekpaet +0x0df9 U0e59 # Thai_lekkao +0x0ea1 U3131 # Hangul_Kiyeog +0x0ea2 U3132 # Hangul_SsangKiyeog +0x0ea3 U3133 # Hangul_KiyeogSios +0x0ea4 U3134 # Hangul_Nieun +0x0ea5 U3135 # Hangul_NieunJieuj +0x0ea6 U3136 # Hangul_NieunHieuh +0x0ea7 U3137 # Hangul_Dikeud +0x0ea8 U3138 # Hangul_SsangDikeud +0x0ea9 U3139 # Hangul_Rieul +0x0eaa U313a # Hangul_RieulKiyeog +0x0eab U313b # Hangul_RieulMieum +0x0eac U313c # Hangul_RieulPieub +0x0ead U313d # Hangul_RieulSios +0x0eae U313e # Hangul_RieulTieut +0x0eaf U313f # Hangul_RieulPhieuf +0x0eb0 U3140 # Hangul_RieulHieuh +0x0eb1 U3141 # Hangul_Mieum +0x0eb2 U3142 # Hangul_Pieub +0x0eb3 U3143 # Hangul_SsangPieub +0x0eb4 U3144 # Hangul_PieubSios +0x0eb5 U3145 # Hangul_Sios +0x0eb6 U3146 # Hangul_SsangSios +0x0eb7 U3147 # Hangul_Ieung +0x0eb8 U3148 # Hangul_Jieuj +0x0eb9 U3149 # Hangul_SsangJieuj +0x0eba U314a # Hangul_Cieuc +0x0ebb U314b # Hangul_Khieuq +0x0ebc U314c # Hangul_Tieut +0x0ebd U314d # Hangul_Phieuf +0x0ebe U314e # Hangul_Hieuh +0x0ebf U314f # Hangul_A +0x0ec0 U3150 # Hangul_AE +0x0ec1 U3151 # Hangul_YA +0x0ec2 U3152 # Hangul_YAE +0x0ec3 U3153 # Hangul_EO +0x0ec4 U3154 # Hangul_E +0x0ec5 U3155 # Hangul_YEO +0x0ec6 U3156 # Hangul_YE +0x0ec7 U3157 # Hangul_O +0x0ec8 U3158 # Hangul_WA +0x0ec9 U3159 # Hangul_WAE +0x0eca U315a # Hangul_OE +0x0ecb U315b # Hangul_YO +0x0ecc U315c # Hangul_U +0x0ecd U315d # Hangul_WEO +0x0ece U315e # Hangul_WE +0x0ecf U315f # Hangul_WI +0x0ed0 U3160 # Hangul_YU +0x0ed1 U3161 # Hangul_EU +0x0ed2 U3162 # Hangul_YI +0x0ed3 U3163 # Hangul_I +0x0ed4 U11a8 # Hangul_J_Kiyeog +0x0ed5 U11a9 # Hangul_J_SsangKiyeog +0x0ed6 U11aa # Hangul_J_KiyeogSios +0x0ed7 U11ab # Hangul_J_Nieun +0x0ed8 U11ac # Hangul_J_NieunJieuj +0x0ed9 U11ad # Hangul_J_NieunHieuh +0x0eda U11ae # Hangul_J_Dikeud +0x0edb U11af # Hangul_J_Rieul +0x0edc U11b0 # Hangul_J_RieulKiyeog +0x0edd U11b1 # Hangul_J_RieulMieum +0x0ede U11b2 # Hangul_J_RieulPieub +0x0edf U11b3 # Hangul_J_RieulSios +0x0ee0 U11b4 # Hangul_J_RieulTieut +0x0ee1 U11b5 # Hangul_J_RieulPhieuf +0x0ee2 U11b6 # Hangul_J_RieulHieuh +0x0ee3 U11b7 # Hangul_J_Mieum +0x0ee4 U11b8 # Hangul_J_Pieub +0x0ee5 U11b9 # Hangul_J_PieubSios +0x0ee6 U11ba # Hangul_J_Sios +0x0ee7 U11bb # Hangul_J_SsangSios +0x0ee8 U11bc # Hangul_J_Ieung +0x0ee9 U11bd # Hangul_J_Jieuj +0x0eea U11be # Hangul_J_Cieuc +0x0eeb U11bf # Hangul_J_Khieuq +0x0eec U11c0 # Hangul_J_Tieut +0x0eed U11c1 # Hangul_J_Phieuf +0x0eee U11c2 # Hangul_J_Hieuh +0x0eef U316d # Hangul_RieulYeorinHieuh +0x0ef0 U3171 # Hangul_SunkyeongeumMieum +0x0ef1 U3178 # Hangul_SunkyeongeumPieub +0x0ef2 U317f # Hangul_PanSios +0x0ef3 U3181 # Hangul_KkogjiDalrinIeung +0x0ef4 U3184 # Hangul_SunkyeongeumPhieuf +0x0ef5 U3186 # Hangul_YeorinHieuh +0x0ef6 U318d # Hangul_AraeA +0x0ef7 U318e # Hangul_AraeAE +0x0ef8 U11eb # Hangul_J_PanSios +0x0ef9 U11f0 # Hangul_J_KkogjiDalrinIeung +0x0efa U11f9 # Hangul_J_YeorinHieuh +0x0eff U20a9 # Korean_Won +0x13a4 U20ac # Euro +0x13bc U0152 # OE +0x13bd U0153 # oe +0x13be U0178 # Ydiaeresis +0x20a0 U20a0 # EcuSign +0x20a1 U20a1 # ColonSign +0x20a2 U20a2 # CruzeiroSign +0x20a3 U20a3 # FFrancSign +0x20a4 U20a4 # LiraSign +0x20a5 U20a5 # MillSign +0x20a6 U20a6 # NairaSign +0x20a7 U20a7 # PesetaSign +0x20a8 U20a8 # RupeeSign +0x20a9 U20a9 # WonSign +0x20aa U20aa # NewSheqelSign +0x20ab U20ab # DongSign +0x20ac U20ac # EuroSign +0xfe50 U0300 # dead_grave +0xfe51 U0301 # dead_acute +0xfe52 U0302 # dead_circumflex +0xfe53 U0303 # dead_tilde +0xfe54 U0304 # dead_macron +0xfe55 U0306 # dead_breve +0xfe56 U0307 # dead_abovedot +0xfe57 U0308 # dead_diaeresis +0xfe58 U030a # dead_abovering +0xfe59 U030b # dead_doubleacute +0xfe5a U030c # dead_caron +0xfe5b U0327 # dead_cedilla +0xfe5c U0328 # dead_ogonek +0xfe5d U0345 # dead_iota +0xfe5e U3099 # dead_voiced_sound +0xfe5f U309a # dead_semivoiced_sound +0xff08 U0008 # BackSpace /* back space, back char */ +0xff09 U0009 # Tab +0xff0a U000a # Linefeed /* Linefeed, LF */ +0xff0b U000b # Clear +0xff0d U000d # Return /* Return, enter */ +0xff13 U0013 # Pause /* Pause, hold */ +0xff14 U0014 # Scroll_Lock +0xff15 U0015 # Sys_Req +0xff1b U001b # Escape +0xff80 U0032 # KP_Space /* space */ +0xff89 U0009 # KP_Tab +0xff8d U000d # KP_Enter /* enter */ +0xffaa U002a # KP_Multiply +0xffab U002b # KP_Add +0xffac U002c # KP_Separator /* separator, often comma */ +0xffad U002d # KP_Subtract +0xffae U002e # KP_Decimal +0xffaf U002f # KP_Divide +0xffb0 U0030 # KP_0 +0xffb1 U0031 # KP_1 +0xffb2 U0032 # KP_2 +0xffb3 U0033 # KP_3 +0xffb4 U0034 # KP_4 +0xffb5 U0035 # KP_5 +0xffb6 U0036 # KP_6 +0xffb7 U0037 # KP_7 +0xffb8 U0038 # KP_8 +0xffb9 U0039 # KP_9 +0xffbd U003d # KP_Equal /* equals */ diff --git a/app/xterm/util.c b/app/xterm/util.c index 640741143..fda639455 100644 --- a/app/xterm/util.c +++ b/app/xterm/util.c @@ -1,6 +1,4 @@ -/* $XTermId: util.c,v 1.351 2007/03/21 22:04:14 tom Exp $ */ - -/* $XFree86: xc/programs/xterm/util.c,v 3.98 2006/06/19 00:36:52 dickey Exp $ */ +/* $XTermId: util.c,v 1.385 2007/07/22 20:43:06 tom Exp $ */ /* * Copyright 1999-2006,2007 by Thomas E. Dickey @@ -75,7 +73,6 @@ #include #endif -static int ClearInLine(XtermWidget xw, int row, int col, unsigned len); static int handle_translated_exposure(XtermWidget xw, int rect_x, int rect_y, @@ -96,6 +93,52 @@ static void vertical_copy_area(XtermWidget xw, int (*my_wcwidth) (wchar_t); #endif +#if OPT_WIDE_CHARS +/* + * We will modify the 'n' cells beginning at the current position. + * Some of those cells may be part of multi-column characters, including + * carryover from the left. Find the limits of the multi-column characters + * that we should fill with blanks, return true if filling is needed. + */ +int +DamagedCells(TScreen * screen, unsigned n, int *klp, int *krp, int row, int col) +{ + int kl = col; + int kr = col + n; + + if (XTERM_CELL(row, kl) == HIDDEN_CHAR) { + while (kl > 0) { + if (XTERM_CELL(row, --kl) != HIDDEN_CHAR) { + break; + } + } + } else { + kl = col + 1; + } + if (XTERM_CELL(row, kr) == HIDDEN_CHAR) { + while (kr < screen->max_col) { + if (XTERM_CELL(row, ++kr) != HIDDEN_CHAR) { + --kr; + break; + } + } + } else { + kr = col - 1; + } + if (klp) + *klp = kl; + if (krp) + *krp = kr; + return (kr >= kl); +} + +int +DamagedCurCells(TScreen * screen, unsigned n, int *klp, int *krp) +{ + return DamagedCells(screen, n, klp, krp, screen->cur_row, screen->cur_col); +} +#endif /* OPT_WIDE_CHARS */ + /* * These routines are used for the jump scroll feature */ @@ -179,32 +222,69 @@ FlushScroll(XtermWidget xw) return; } +/* + * Returns true if there are lines off-screen due to scrolling which should + * include the current line. If false, the line is visible and we should + * paint it now rather than waiting for the line to become visible. + */ int -AddToRefresh(TScreen * screen) +AddToRefresh(XtermWidget xw) { + TScreen *screen = &(xw->screen); int amount = screen->refresh_amt; int row = screen->cur_row; + int result; if (amount == 0) { - return (0); + result = 0; } else if (amount > 0) { int bottom; if (row == (bottom = screen->bot_marg) - amount) { screen->refresh_amt++; - return (1); + result = 1; + } else { + result = (row >= bottom - amount + 1 && row <= bottom); } - return (row >= bottom - amount + 1 && row <= bottom); } else { int top; amount = -amount; if (row == (top = screen->top_marg) + amount) { screen->refresh_amt--; - return (1); + result = 1; + } else { + result = (row <= top + amount - 1 && row >= top); } - return (row <= top + amount - 1 && row >= top); } + + /* + * If this line is visible, and there are scrolled-off lines, flush out + * those which are now visible. + */ + if (!result && screen->scroll_amt) + FlushScroll(xw); + + return result; +} + +/* + * Returns true if the current row is in the visible area (it should be for + * screen operations) and incidentally flush the scrolled-in lines which + * have newly become visible. + */ +static Bool +AddToVisible(XtermWidget xw) +{ + TScreen *screen = &(xw->screen); + Bool result = False; + + if (INX2ROW(screen, screen->cur_row) <= screen->max_row) { + if (!AddToRefresh(xw)) { + result = True; + } + } + return result; } /* @@ -546,6 +626,119 @@ RevScroll(XtermWidget xw, int amount) return; } +/* + * write a string str of length len onto the screen at + * the current cursor position. update cursor position. + */ +void +WriteText(XtermWidget xw, PAIRED_CHARS(Char * str, Char * str2), Cardinal len) +{ + TScreen *screen = &(xw->screen); + ScrnPtr temp_str = 0; + unsigned test; + unsigned flags = xw->flags; + unsigned fg_bg = makeColorPair(xw->cur_foreground, xw->cur_background); + unsigned cells = visual_width(PAIRED_CHARS(str, str2), len); + GC currentGC; + + TRACE(("WriteText (%2d,%2d) (%d) %3d:%s\n", + screen->cur_row, + screen->cur_col, + curXtermChrSet(xw, screen->cur_row), + len, visibleChars(PAIRED_CHARS(str, str2), len))); + + if (ScrnHaveSelection(screen) + && ScrnIsLineInSelection(screen, INX2ROW(screen, screen->cur_row))) { + ScrnDisownSelection(xw); + } + + /* if we are in insert-mode, reserve space for the new cells */ + if (flags & INSERT) { + InsertChar(xw, cells); + } + + if (AddToVisible(xw)) { + if (screen->cursor_state) + HideCursor(); + + /* + * If we overwrite part of a multi-column character, fill the rest + * of it with blanks. + */ + if_OPT_WIDE_CHARS(screen, { + int kl; + int kr; + if (DamagedCurCells(screen, cells, &kl, &kr)) + ClearInLine(xw, screen->cur_row, kl, (unsigned) (kr - kl + 1)); + }); + + if (flags & INVISIBLE) { + if (cells > len) { + str = temp_str = TypeMallocN(Char, cells); + if (str == 0) + return; + } + len = cells; + + memset(str, ' ', len); + if_OPT_WIDE_CHARS(screen, { + str2 = 0; + }); + } + + TRACE(("WriteText calling drawXtermText (%d,%d)\n", + screen->cur_col, + screen->cur_row)); + + test = flags; + checkVeryBoldColors(test, xw->cur_foreground); + + /* make sure that the correct GC is current */ + currentGC = updatedXtermGC(xw, flags, fg_bg, False); + + drawXtermText(xw, test & DRAWX_MASK, currentGC, + CurCursorX(screen, screen->cur_row, screen->cur_col), + CursorY(screen, screen->cur_row), + curXtermChrSet(xw, screen->cur_row), + PAIRED_CHARS(str, str2), len, 0); + + resetXtermGC(xw, flags, False); + } + + ScrnWriteText(xw, PAIRED_CHARS(str, str2), flags, fg_bg, len); + CursorForward(screen, (int) cells); +#if OPT_ZICONBEEP + /* Flag icon name with "***" on window output when iconified. + */ + if (resource.zIconBeep && mapstate == IsUnmapped && !screen->zIconBeep_flagged) { + static char *icon_name; + static Arg args[] = + { + {XtNiconName, (XtArgVal) & icon_name} + }; + + icon_name = NULL; + XtGetValues(toplevel, args, XtNumber(args)); + + if (icon_name != NULL) { + screen->zIconBeep_flagged = True; + ChangeIconName(icon_name); + } + if (resource.zIconBeep > 0) { +#if defined(HAVE_XKB_BELL_EXT) + XkbBell(XtDisplay(toplevel), VShellWindow, resource.zIconBeep, XkbBI_Info); +#else + XBell(XtDisplay(toplevel), resource.zIconBeep); +#endif + } + } + mapstate = -1; +#endif /* OPT_ZICONBEEP */ + if (temp_str != 0) + free(temp_str); + return; +} + /* * If cursor not in scrolling region, returns. Else, * inserts n blank lines at the cursor's position. Lines above the @@ -746,33 +939,49 @@ InsertChar(XtermWidget xw, unsigned n) n = limit; assert(n != 0); - if (row <= screen->max_row) { - if (!AddToRefresh(screen)) { - int col = MaxCols(screen) - n; - if (screen->scroll_amt) - FlushScroll(xw); + if (AddToVisible(xw)) { + int col = MaxCols(screen) - n; + + /* + * If we shift part of a multi-column character, fill the rest + * of it with blanks. Do similar repair for the text which will + * be shifted into the right-margin. + */ + if_OPT_WIDE_CHARS(screen, { + int kl; + int kr = screen->cur_col; + if (DamagedCurCells(screen, n, &kl, (int *) 0) && kr > kl) { + ClearInLine(xw, screen->cur_row, kl, (unsigned) (kr - kl + 1)); + } + kr = screen->max_col - n + 1; + if (DamagedCells(screen, n, &kl, (int *) 0, + screen->cur_row, + kr) && kr > kl) { + ClearInLine(xw, screen->cur_row, kl, (unsigned) (kr - kl + 1)); + } + }); #if OPT_DEC_CHRSET - if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { - col = MaxCols(screen) / 2 - n; - } -#endif - /* - * prevent InsertChar from shifting the end of a line over - * if it is being appended to - */ - if (non_blank_line(screen, screen->cur_row, - screen->cur_col, MaxCols(screen))) - horizontal_copy_area(xw, screen->cur_col, - col - screen->cur_col, - (int) n); - - ClearCurBackground(xw, - CursorY(screen, screen->cur_row), - CurCursorX(screen, screen->cur_row, screen->cur_col), - (unsigned) FontHeight(screen), - n * CurFontWidth(screen, screen->cur_row)); + if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { + col = MaxCols(screen) / 2 - n; } +#endif + /* + * prevent InsertChar from shifting the end of a line over + * if it is being appended to + */ + if (non_blank_line(screen, screen->cur_row, + screen->cur_col, MaxCols(screen))) { + horizontal_copy_area(xw, screen->cur_col, + col - screen->cur_col, + (int) n); + } + + ClearCurBackground(xw, + CursorY(screen, screen->cur_row), + CurCursorX(screen, screen->cur_row, screen->cur_col), + (unsigned) FontHeight(screen), + n * CurFontWidth(screen, screen->cur_row)); } /* adjust screen->buf */ ScrnInsertChar(xw, n); @@ -806,32 +1015,39 @@ DeleteChar(XtermWidget xw, unsigned n) n = limit; assert(n != 0); - if (row <= screen->max_row) { - if (!AddToRefresh(screen)) { - int col = MaxCols(screen) - n; - if (screen->scroll_amt) - FlushScroll(xw); + if (AddToVisible(xw)) { + int col = MaxCols(screen) - n; + + /* + * If we delete part of a multi-column character, fill the rest + * of it with blanks. + */ + if_OPT_WIDE_CHARS(screen, { + int kl; + int kr; + if (DamagedCurCells(screen, n, &kl, &kr)) + ClearInLine(xw, screen->cur_row, kl, (unsigned) (kr - kl + 1)); + }); #if OPT_DEC_CHRSET - if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { - col = MaxCols(screen) / 2 - n; - } -#endif - horizontal_copy_area(xw, - (int) (screen->cur_col + n), - col - screen->cur_col, - -((int) n)); - - ClearCurBackground(xw, - CursorY(screen, screen->cur_row), - CurCursorX(screen, screen->cur_row, col), - (unsigned) FontHeight(screen), - n * CurFontWidth(screen, screen->cur_row)); + if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { + col = MaxCols(screen) / 2 - n; } +#endif + horizontal_copy_area(xw, + (int) (screen->cur_col + n), + col - screen->cur_col, + -((int) n)); + + ClearCurBackground(xw, + CursorY(screen, screen->cur_row), + CurCursorX(screen, screen->cur_row, col), + (unsigned) FontHeight(screen), + n * CurFontWidth(screen, screen->cur_row)); } - if (n > 0) { + if (n != 0) { /* adjust screen->buf */ - ScrnDeleteChar(xw, (unsigned) n); + ScrnDeleteChar(xw, n); } } @@ -916,11 +1132,10 @@ ClearBelow(XtermWidget xw) * protected characters were found, 0 otherwise. */ static int -ClearInLine(XtermWidget xw, int row, int col, unsigned len) +ClearInLine2(XtermWidget xw, int flags, int row, int col, unsigned len) { TScreen *screen = &(xw->screen); int rc = 1; - int flags = TERM_COLOR_FLAGS(xw); TRACE(("ClearInLine(row=%d, col=%d, len=%d) vs %d..%d\n", row, col, len, @@ -932,15 +1147,7 @@ ClearInLine(XtermWidget xw, int row, int col, unsigned len) ScrnDisownSelection(xw); } - /* - * If we're clearing to the end of the line, we won't count this as - * "drawn" characters. We'll only do cut/paste on "drawn" characters, - * so this has the effect of suppressing trailing blanks from a - * selection. - */ - if (col + (int) len < MaxCols(screen)) { - flags |= CHARDRAWN; - } else { + if (col + (int) len >= MaxCols(screen)) { len = MaxCols(screen) - col; } @@ -988,47 +1195,39 @@ ClearInLine(XtermWidget xw, int row, int col, unsigned len) HideCursor(); screen->do_wrap = 0; - if (INX2ROW(screen, row) <= screen->max_row) { - if (!AddToRefresh(screen)) { - if (screen->scroll_amt) - FlushScroll(xw); - ClearCurBackground(xw, - CursorY(screen, row), - CurCursorX(screen, row, col), - (unsigned) FontHeight(screen), - len * CurFontWidth(screen, row)); - } + if (AddToVisible(xw)) { + ClearCurBackground(xw, + CursorY(screen, row), + CurCursorX(screen, row, col), + (unsigned) FontHeight(screen), + len * CurFontWidth(screen, row)); } if (len != 0) { - memset(SCRN_BUF_CHARS(screen, row) + col, ' ', len); - memset(SCRN_BUF_ATTRS(screen, row) + col, flags, len); - - if_OPT_EXT_COLORS(screen, { - memset(SCRN_BUF_FGRND(screen, row) + col, - xw->sgr_foreground, len); - memset(SCRN_BUF_BGRND(screen, row) + col, - xw->cur_background, len); - }); - if_OPT_ISO_TRADITIONAL_COLORS(screen, { - memset(SCRN_BUF_COLOR(screen, row) + col, - (int) xtermColorPair(xw), len); - }); - if_OPT_DEC_CHRSET({ - memset(SCRN_BUF_CSETS(screen, row) + col, - curXtermChrSet(xw, screen->cur_row), len); - }); - if_OPT_WIDE_CHARS(screen, { - int off; - for (off = OFF_WIDEC; off < MAX_PTRS; ++off) { - memset(SCREEN_PTR(screen, row, off) + col, 0, len); - } - }); + ClearCells(xw, flags, len, row, col); } return rc; } +int +ClearInLine(XtermWidget xw, int row, int col, unsigned len) +{ + TScreen *screen = &(xw->screen); + int flags = 0; + + /* + * If we're clearing to the end of the line, we won't count this as + * "drawn" characters. We'll only do cut/paste on "drawn" characters, + * so this has the effect of suppressing trailing blanks from a + * selection. + */ + if (col + (int) len < MaxCols(screen)) { + flags |= CHARDRAWN; + } + return ClearInLine2(xw, flags, row, col, len); +} + /* * Clear the next n characters on the cursor's line, including the cursor's * position. @@ -1050,7 +1249,28 @@ ClearRight(XtermWidget xw, int n) if (len > (unsigned) n) len = n; - (void) ClearInLine(xw, screen->cur_row, screen->cur_col, len); + if (AddToVisible(xw)) { + if_OPT_WIDE_CHARS(screen, { + int col = screen->cur_col; + int row = screen->cur_row; + int kl; + int kr; + int xx; + if (DamagedCurCells(screen, len, &kl, &kr) && kr >= kl) { + xx = col; + if (kl < xx) { + ClearInLine2(xw, 0, row, kl, (unsigned) (xx - kl)); + } + xx = col + len - 1; + if (kr > xx) { + ClearInLine2(xw, 0, row, xx + 1, (unsigned) (kr - xx)); + } + } + }); + (void) ClearInLine(xw, screen->cur_row, screen->cur_col, len); + } else { + ScrnClearCells(xw, screen->cur_row, screen->cur_col, len); + } /* with the right part cleared, we can't be wrapping */ ScrnClrWrapped(screen, screen->cur_row); @@ -1066,7 +1286,19 @@ ClearLeft(XtermWidget xw) unsigned len = screen->cur_col + 1; assert(screen->cur_col >= 0); - (void) ClearInLine(xw, screen->cur_row, 0, len); + if (AddToVisible(xw)) { + if_OPT_WIDE_CHARS(screen, { + int row = screen->cur_row; + int kl; + int kr; + if (DamagedCurCells(screen, 1, &kl, &kr) && kr >= kl) { + ClearInLine2(xw, 0, row, kl, (unsigned) (kr - kl + 1)); + } + }); + (void) ClearInLine(xw, screen->cur_row, 0, len); + } else { + ScrnClearCells(xw, screen->cur_row, 0, len); + } } /* @@ -1442,8 +1674,8 @@ handle_translated_exposure(XtermWidget xw, XClearArea(screen->display, VWindow(screen), rect_x, rect_y, - rect_width, - rect_height, False); + (unsigned) rect_width, + (unsigned) rect_height, False); } toprow = y0 / FontHeight(screen); if (toprow < 0) @@ -1467,9 +1699,7 @@ handle_translated_exposure(XtermWidget xw, if (nrows > 0 && ncols > 0) { ScrnRefresh(xw, toprow, leftcol, nrows, ncols, True); - if (resource.wait_for_map) { - first_map_occurred(); - } + first_map_occurred(); if (screen->cur_row >= toprow && screen->cur_row < toprow + nrows && screen->cur_col >= leftcol && @@ -1635,6 +1865,11 @@ typedef struct { Pixel bg; } ToSwap; +/* + * Use this to swap the foreground/background color values in the resource + * data, and to build up a list of the pairs which must be swapped in the + * GC cache. + */ static void swapLocally(ToSwap * list, int *count, ColorRes * fg, ColorRes * bg) { @@ -1650,18 +1885,22 @@ swapLocally(ToSwap * list, int *count, ColorRes * fg, ColorRes * bg) Pixel bg_color = *bg; #endif - EXCHANGE(*fg, *bg, tmp); - for (n = 0; n < *count; ++n) { - if ((list[n].fg == fg_color && list[n].bg == bg_color) - || (list[n].fg == bg_color && list[n].bg == fg_color)) { - found = True; - break; + if (fg_color != bg_color) { + EXCHANGE(*fg, *bg, tmp); + for (n = 0; n < *count; ++n) { + if ((list[n].fg == fg_color && list[n].bg == bg_color) + || (list[n].fg == bg_color && list[n].bg == fg_color)) { + found = True; + break; + } + } + if (!found) { + list[*count].fg = fg_color; + list[*count].bg = bg_color; + *count = *count + 1; + TRACE(("swapLocally fg %#lx, bg %#lx ->%d\n", fg_color, + bg_color, *count)); } - } - if (!found) { - list[*count].fg = fg_color; - list[*count].bg = bg_color; - *count = *count + 1; } } @@ -1670,6 +1909,7 @@ reallySwapColors(XtermWidget xw, ToSwap * list, int count) { int j, k; + TRACE(("reallySwapColors\n")); for (j = 0; j < count; ++j) { for_each_text_gc(k) { redoCgs(xw, list[j].fg, list[j].bg, (CgsEnum) k); @@ -1709,6 +1949,9 @@ ReverseVideo(XtermWidget xw) swapAColor(8, 15); }); + if (T_COLOR(screen, TEXT_CURSOR) == T_COLOR(screen, TEXT_FG)) + T_COLOR(screen, TEXT_CURSOR) = T_COLOR(screen, TEXT_BG); + #define swapTColor(a,b) swapAnyColor(Tcolors, a, b) swapTColor(TEXT_FG, TEXT_BG); swapTColor(MOUSE_FG, MOUSE_BG); @@ -1870,7 +2113,7 @@ xtermXftDrawString(XtermWidget xw, int x, int y, PAIRED_CHARS(Char * text, Char * text2), - int len, + Cardinal len, Bool really) { TScreen *screen = &(xw->screen); @@ -1879,13 +2122,13 @@ xtermXftDrawString(XtermWidget xw, if (len != 0) { #if OPT_RENDERWIDE static XftCharSpec *sbuf; - static int slen = 0; + static Cardinal slen = 0; XftFont *wfont; - int src, dst; + Cardinal src, dst; XftFont *lastFont = 0; XftFont *currFont = 0; - int start = 0; + Cardinal start = 0; int charWidth; int fontnum = screen->menu_font_number; int fwidth = FontWidth(screen); @@ -1904,7 +2147,7 @@ xtermXftDrawString(XtermWidget xw, wfont = screen->renderWideNorm[fontnum]; } - if ((int) slen < len) { + if (slen < len) { slen = (len + 1) * 2; sbuf = (XftCharSpec *) XtRealloc((char *) sbuf, slen * sizeof(XftCharSpec)); @@ -1916,7 +2159,7 @@ xtermXftDrawString(XtermWidget xw, if (text2) wc |= (*text2++ << 8); - charWidth = xtermCellWidth(xw, wc); + charWidth = xtermCellWidth(xw, (wchar_t) wc); if (charWidth < 0) continue; @@ -1933,7 +2176,7 @@ xtermXftDrawString(XtermWidget xw, color, lastFont, sbuf + start, - dst - start); + (int) (dst - start)); } start = dst; lastFont = currFont; @@ -1945,7 +2188,7 @@ xtermXftDrawString(XtermWidget xw, color, lastFont, sbuf + start, - dst - start); + (int) (dst - start)); } #else /* !OPT_RENDERWIDE */ PAIRED_CHARS((void) text, (void) text2); @@ -1960,6 +2203,8 @@ xtermXftDrawString(XtermWidget xw, } return ncells; } +#define xtermXftWidth(xw, flags, color, font, x, y, paired_chars, len) \ + xtermXftDrawString(xw, flags, color, font, x, y, paired_chars, len, False) #endif /* OPT_RENDERFONT */ #define DrawX(col) x + (col * (font_width)) @@ -1993,6 +2238,12 @@ AsciiEquivs(unsigned ch) case 0x201D: /* groff rq */ ch = '"'; break; + case 0x2329: /* groff ".URL" */ + ch = '<'; + break; + case 0x232a: /* groff ".URL" */ + ch = '>'; + break; default: if (ch >= 0xff01 && ch <= 0xff5e) { /* "Fullwidth" codes (actually double-width) */ @@ -2040,6 +2291,9 @@ ucs_workaround(XtermWidget xw, PAIRED_CHARS(text, text2), 1, on_wide); + fixed = True; + } else if (ch == HIDDEN_CHAR) { + fixed = True; } } return fixed; @@ -2185,6 +2439,36 @@ xtermFillCells(XtermWidget xw, #define endXftClipping(screen) /* nothing */ #endif /* OPT_CLIP_BOLD */ +#if OPT_RENDERFONT +static int +drawClippedXftString(XtermWidget xw, + unsigned flags, + XftFont * font, + XftColor * fg_color, + int x, + int y, + PAIRED_CHARS(Char * text, Char * text2), + Cardinal len) +{ + int ncells = xtermXftWidth(xw, flags, + fg_color, + font, x, y, + PAIRED_CHARS(text, text2), + len); + TScreen *screen = &(xw->screen); + + beginXftClipping(screen, x, y, ncells); + xtermXftDrawString(xw, flags, + fg_color, + font, x, y, + PAIRED_CHARS(text, text2), + len, + True); + endXftClipping(screen); + return ncells; +} +#endif + /* * Draws text with the specified combination of bold/underline. The return * value is the updated x position. @@ -2201,8 +2485,8 @@ drawXtermText(XtermWidget xw, int on_wide) { TScreen *screen = &(xw->screen); - int real_length = len; - int underline_len; + Cardinal real_length = len; + Cardinal underline_len = 0; /* Intended width of the font to draw (as opposed to the actual width of the X font, and the width of the default font) */ int font_width = ((flags & DOUBLEWFONT) ? 2 : 1) * screen->fnt_wide; @@ -2237,9 +2521,10 @@ drawXtermText(XtermWidget xw, ? xterm_DoubleGC(xw, (unsigned) chrset, flags, gc) : 0); - TRACE(("DRAWTEXT%c[%4d,%4d] (%d) %d:%.*s\n", + TRACE(("DRAWTEXT%c[%4d,%4d] (%d) %d:%s\n", screen->cursor_state == OFF ? ' ' : '*', - y, x, chrset, len, (int) len, text)); + y, x, chrset, len, + visibleChars(PAIRED_CHARS(text, text2), len))); if (gc2 != 0) { /* draw actual double-sized characters */ /* Update the last-used cache of double-sized fonts */ @@ -2394,16 +2679,15 @@ drawXtermText(XtermWidget xw, if (!(flags & NOBACKGROUND)) { XftColor *bg_color = getXftColor(xw, values.background); - ncells = xtermXftDrawString(xw, flags, - bg_color, - font, x, y, - PAIRED_CHARS(text, text2), - len, - False); + ncells = xtermXftWidth(xw, flags, + bg_color, + font, x, y, + PAIRED_CHARS(text, text2), + len); XftDrawRect(screen->renderDraw, bg_color, x, y, - ncells * FontWidth(screen), + (unsigned) (ncells * FontWidth(screen)), (unsigned) FontHeight(screen)); } @@ -2441,14 +2725,17 @@ drawXtermText(XtermWidget xw, if (xtermIsDecGraphic(ch)) { /* line drawing character time */ if (last > first) { - ncells = xtermXftDrawString(xw, flags, - getXftColor(xw, values.foreground), - font, curX, y, - PAIRED_CHARS(text + first, - text2 + first), - last - first, - True); - curX += ncells * FontWidth(screen); + int nc = drawClippedXftString(xw, + flags, + font, + getXftColor(xw, values.foreground), + curX, + y, + PAIRED_CHARS(text + first, + text2 + first), + (Cardinal) (last - first)); + curX += nc * FontWidth(screen); + underline_len += nc; } old_wide = screen->fnt_wide; old_high = screen->fnt_high; @@ -2457,32 +2744,36 @@ drawXtermText(XtermWidget xw, xtermDrawBoxChar(xw, ch, flags, gc, curX, y - FontAscent(screen)); curX += FontWidth(screen); + underline_len += 1; screen->fnt_wide = old_wide; screen->fnt_high = old_high; first = last + 1; } } if (last > first) { - beginXftClipping(screen, curX, y, len); - xtermXftDrawString(xw, flags, - getXftColor(xw, values.foreground), - font, curX, y, - PAIRED_CHARS(text + first, text2 + first), - last - first, - True); - endXftClipping(screen); + underline_len += + drawClippedXftString(xw, + flags, + font, + getXftColor(xw, values.foreground), + curX, + y, + PAIRED_CHARS(text + first, + text2 + first), + (Cardinal) (last - first)); } } else #endif /* OPT_BOX_CHARS */ { - beginXftClipping(screen, x, y, len); - xtermXftDrawString(xw, flags, - getXftColor(xw, values.foreground), - font, x, y, - PAIRED_CHARS(text, text2), - (int) len, - True); - endXftClipping(screen); + underline_len += + drawClippedXftString(xw, + flags, + font, + getXftColor(xw, values.foreground), + x, + y, + PAIRED_CHARS(text, text2), + len); } if ((flags & UNDERLINE) && screen->underline && !did_ul) { @@ -2490,7 +2781,7 @@ drawXtermText(XtermWidget xw, y++; XDrawLine(screen->display, VWindow(screen), gc, x, y, - x + (int) len * FontWidth(screen) - 1, + x + (int) underline_len * FontWidth(screen) - 1, y); } return x + len * FontWidth(screen); @@ -2539,12 +2830,18 @@ drawXtermText(XtermWidget xw, #if OPT_WIDE_CHARS if (text2 != 0) ch |= (text2[last] << 8); - isMissing = (ch != HIDDEN_CHAR) - && (xtermMissingChar(xw, ch, - ((on_wide || iswide((int) ch)) - && okFont(NormalWFont(screen))) - ? NormalWFont(screen) - : font)); + if (ch == HIDDEN_CHAR) { + if (last > first) + DrawSegment(first, last); + first = last + 1; + continue; + } + isMissing = + xtermMissingChar(xw, ch, + ((on_wide || my_wcwidth((int) ch) > 1) + && okFont(NormalWFont(screen))) + ? NormalWFont(screen) + : font); #else isMissing = xtermMissingChar(xw, ch, font); #endif @@ -2584,8 +2881,7 @@ drawXtermText(XtermWidget xw, /* * Behave as if the font has (maybe Unicode-replacements for) drawing * characters in the range 1-31 (either we were not asked to ignore them, - * or the caller made sure that there is none). The only translation we do - * in this branch is the removal of HIDDEN_CHAR (for the wide-char case). + * or the caller made sure that there is none). */ TRACE(("drawtext%c[%4d,%4d] (%d) %d:%s\n", screen->cursor_state == OFF ? ' ' : '*', @@ -2595,62 +2891,66 @@ drawXtermText(XtermWidget xw, #if OPT_WIDE_CHARS if (screen->wide_chars || screen->unicode_font) { + Bool needWide = False; int ascent_adjust = 0; - int n; - unsigned ch = text[0] | (text2[0] << 8); - int wideness = (!IsIcon(screen) - && ((on_wide || iswide((int) ch) != 0) - && okFont(NormalWFont(screen)))); - unsigned char *endtext = text + len; + int src, dst; + if (screen->draw_len < len) { screen->draw_len = (len + 1) * 2; screen->draw_buf = (XChar2b *) XtRealloc((char *) screen->draw_buf, screen->draw_len * sizeof(*screen->draw_buf)); } - for (n = 0; n < (int) len; n++) { - screen->draw_buf[n].byte2 = *text; - screen->draw_buf[n].byte1 = *text2; + + for (src = dst = 0; src < (int) len; src++) { + unsigned ch = text[src] | (text2[src] << 8); + + if (ch == HIDDEN_CHAR) + continue; + + if (!needWide + && !IsIcon(screen) + && ((on_wide || my_wcwidth((int) ch) > 1) + && okFont(NormalWFont(screen)))) { + needWide = True; + } + + screen->draw_buf[dst].byte2 = text[src]; + screen->draw_buf[dst].byte1 = text2[src]; #if OPT_MINI_LUIT -#define UCS2SBUF(n,value) screen->draw_buf[n].byte2 = (value & 0xff);\ - screen->draw_buf[n].byte1 = (value >> 8) -#define Map2Sbuf(n,from,to) (*text == from) { UCS2SBUF(n,to); } - if (screen->latin9_mode && !screen->utf8_mode && *text2 == 0) { +#define UCS2SBUF(value) screen->draw_buf[dst].byte2 = (value & 0xff);\ + screen->draw_buf[dst].byte1 = (value >> 8) + +#define Map2Sbuf(from,to) (text[src] == from) { UCS2SBUF(to); } + + if (screen->latin9_mode && !screen->utf8_mode && text2[src] == 0) { /* see http://www.cs.tut.fi/~jkorpela/latin9.html */ /* *INDENT-OFF* */ - if Map2Sbuf(n, 0xa4, 0x20ac) - else if Map2Sbuf(n, 0xa6, 0x0160) - else if Map2Sbuf(n, 0xa8, 0x0161) - else if Map2Sbuf(n, 0xb4, 0x017d) - else if Map2Sbuf(n, 0xb8, 0x017e) - else if Map2Sbuf(n, 0xbc, 0x0152) - else if Map2Sbuf(n, 0xbd, 0x0153) - else if Map2Sbuf(n, 0xbe, 0x0178) + if Map2Sbuf(0xa4, 0x20ac) + else if Map2Sbuf(0xa6, 0x0160) + else if Map2Sbuf(0xa8, 0x0161) + else if Map2Sbuf(0xb4, 0x017d) + else if Map2Sbuf(0xb8, 0x017e) + else if Map2Sbuf(0xbc, 0x0152) + else if Map2Sbuf(0xbd, 0x0153) + else if Map2Sbuf(0xbe, 0x0178) /* *INDENT-ON* */ } if (screen->unicode_font - && *text2 == 0 - && (*text == ANSI_DEL || *text < ANSI_SPA)) { - int ni = dec2ucs((unsigned) ((*text == ANSI_DEL) ? 0 : *text)); - UCS2SBUF(n, ni); + && text2[src] == 0 + && (text[src] == ANSI_DEL || + text[src] < ANSI_SPA)) { + int ni = dec2ucs((unsigned) ((text[src] == ANSI_DEL) + ? 0 + : text[src])); + UCS2SBUF(ni); } #endif /* OPT_MINI_LUIT */ - text++; - text2++; - if (wideness) { - /* filter out those pesky fake characters. */ - while (text < endtext - && *text == HIDDEN_HI - && *text2 == HIDDEN_LO) { - text++; - text2++; - len--; - } - } + ++dst; } - /* This is probably wrong. But it works. */ + /* FIXME This is probably wrong. But it works. */ underline_len = len; /* Set the drawing font */ @@ -2661,7 +2961,7 @@ drawXtermText(XtermWidget xw, Pixel fg = getCgsFore(xw, currentWin, gc); Pixel bg = getCgsBack(xw, currentWin, gc); - if (wideness + if (needWide && (okFont(NormalWFont(screen)) || okFont(BoldWFont(screen)))) { if ((flags & BOLDATTR(screen)) != 0 && okFont(BoldWFont(screen))) { @@ -2690,9 +2990,9 @@ drawXtermText(XtermWidget xw, - NormalFont(screen)->ascent); if (thisFp->max_bounds.width == NormalFont(screen)->max_bounds.width * 2) { - underline_len = real_length = len * 2; + underline_len = real_length = dst * 2; } else if (cgsId == gcWide || cgsId == gcWBold) { - underline_len = real_length = len * 2; + underline_len = real_length = dst * 2; xtermFillCells(xw, flags, gc, @@ -2707,12 +3007,12 @@ drawXtermText(XtermWidget xw, XDrawString16(screen->display, VWindow(screen), gc, x, y + ascent_adjust, - screen->draw_buf, n); + screen->draw_buf, dst); } else { XDrawImageString16(screen->display, VWindow(screen), gc, x, y + ascent_adjust, - screen->draw_buf, n); + screen->draw_buf, dst); } if ((flags & BOLDATTR(screen)) && screen->enbolden) { @@ -2720,7 +3020,7 @@ drawXtermText(XtermWidget xw, XDrawString16(screen->display, VWindow(screen), gc, x + 1, y + ascent_adjust, - screen->draw_buf, n); + screen->draw_buf, dst); endClipping(screen, gc); } @@ -2749,7 +3049,7 @@ drawXtermText(XtermWidget xw, if (FontDescent(screen) > 1) y++; XDrawLine(screen->display, VWindow(screen), gc, - x, y, x + underline_len * font_width - 1, y); + x, y, (int) (x + underline_len * font_width - 1), y); } return x + real_length * FontWidth(screen); @@ -2820,6 +3120,8 @@ updatedXtermGC(XtermWidget xw, unsigned flags, unsigned fg_bg, Bool hilite) #if OPT_HIGHLIGHT_COLOR Pixel selbg_pix = T_COLOR(screen, HIGHLIGHT_BG); Pixel selfg_pix = T_COLOR(screen, HIGHLIGHT_FG); + Boolean use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); + Boolean use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); #endif (void) fg_bg; @@ -2828,25 +3130,28 @@ updatedXtermGC(XtermWidget xw, unsigned flags, unsigned fg_bg, Bool hilite) checkVeryBoldColors(flags, my_fg); -#if OPT_HIGHLIGHT_COLOR - if (hilite) { - Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); - Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); - - if (use_selbg) - fg_pix = selbg_pix; - if (use_selfg) - bg_pix = selfg_pix; - } -#endif - if (ReverseOrHilite(screen, flags, hilite)) { if (flags & BOLDATTR(screen)) { cgsId = gcBoldReverse; } else { cgsId = gcNormReverse; } + EXCHANGE(fg_pix, bg_pix, xx_pix); +#if OPT_HIGHLIGHT_COLOR + if (screen->hilite_reverse) { + if (use_selbg) { + if (use_selfg) + bg_pix = fg_pix; + else + fg_pix = bg_pix; + } + if (use_selbg) + bg_pix = selbg_pix; + if (use_selfg) + fg_pix = selfg_pix; + } +#endif } else { if (flags & BOLDATTR(screen)) { cgsId = gcBold; @@ -2854,6 +3159,14 @@ updatedXtermGC(XtermWidget xw, unsigned flags, unsigned fg_bg, Bool hilite) cgsId = gcNorm; } } +#if OPT_HIGHLIGHT_COLOR + if (hilite && !screen->hilite_reverse) { + if (use_selbg) + bg_pix = selbg_pix; + if (use_selfg) + fg_pix = selfg_pix; + } +#endif #if OPT_BLINK_TEXT if ((screen->blink_state == ON) && (!screen->blink_as_bold) && (flags & BLINK)) { @@ -3252,13 +3565,12 @@ decode_keyboard_type(XtermWidget xw, XTERM_RESOURCE * rp) * old runtime configurations which yield incomplete or inaccurate data. */ static Bool -systemWcwidthOk(void) +systemWcwidthOk(int samplesize, int samplepass) { wchar_t n; int oops = 0; - int last = 1024; - for (n = 0; n < last; ++n) { + for (n = 0; n < (wchar_t) samplesize; ++n) { int system_code = wcwidth(n); int intern_code = mk_wcwidth(n); @@ -3284,25 +3596,29 @@ systemWcwidthOk(void) ++oops; } } - TRACE(("systemWcwidthOk: %d/%d mismatches\n", oops, last)); - return (oops < (last / 4)); + TRACE(("systemWcwidthOk: %d/%d mismatches, allowed %d\n", + oops, samplesize, samplepass)); + return (oops <= samplepass); } #endif /* HAVE_WCWIDTH */ void -decode_wcwidth(int mode) +decode_wcwidth(int mode, int samplesize, int samplepass) { switch (mode) { default: #if defined(HAVE_WCHAR_H) && defined(HAVE_WCWIDTH) - if (xtermEnvUTF8() && systemWcwidthOk()) { + if (xtermEnvUTF8() && systemWcwidthOk(samplesize, samplepass)) { my_wcwidth = wcwidth; TRACE(("using system wcwidth() function\n")); break; } /* FALLTHRU */ - case 2: +#else + (void) samplesize; + (void) samplepass; #endif + case 2: my_wcwidth = &mk_wcwidth; TRACE(("using MK wcwidth() function\n")); break; diff --git a/app/xterm/uxterm.desktop b/app/xterm/uxterm.desktop new file mode 100644 index 000000000..0a46d690c --- /dev/null +++ b/app/xterm/uxterm.desktop @@ -0,0 +1,10 @@ +# $XTermId: uxterm.desktop,v 1.5 2007/06/17 00:54:49 tom Exp $ +[Desktop Entry] +Name=UXTerm +Comment=standard terminal emulator for the X window system +Exec=uxterm +Terminal=false +Type=Application +Encoding=UTF-8 +Icon=xterm-color_48x48.xpm +Categories=System; diff --git a/app/xterm/vttests/256colors2.pl b/app/xterm/vttests/256colors2.pl index c97c2be9d..d8c8e94ee 100644 --- a/app/xterm/vttests/256colors2.pl +++ b/app/xterm/vttests/256colors2.pl @@ -1,17 +1,40 @@ #!/usr/bin/perl -# Author: Todd Larason -# $XFree86: xc/programs/xterm/vttests/256colors2.pl,v 1.2 2002/03/26 01:46:43 dickey Exp $ - +# $XTermId: 256colors2.pl,v 1.8 2007/07/17 00:44:54 tom Exp $ +# Authors: Todd Larason +# Thomas E Dickey +# # use the resources for colors 0-15 - usually more-or-less a # reproduction of the standard ANSI colors, but possibly more # pleasing shades +use strict; + +use Getopt::Std; + +our ($opt_r); +&getopts('r') || die("Usage: $0 [-r]"); + +our ($red, $green, $blue); +our ($gray, $level, $color); + +sub map_cube($) { + my $value = $_[0]; + $value = (5 - $value) if defined($opt_r); + return $value; +} + +sub map_gray($) { + my $value = $_[0]; + $value = (23 - $value) if defined($opt_r); + return $value; +} + # colors 16-231 are a 6x6x6 color cube for ($red = 0; $red < 6; $red++) { for ($green = 0; $green < 6; $green++) { for ($blue = 0; $blue < 6; $blue++) { printf("\x1b]4;%d;rgb:%2.2x/%2.2x/%2.2x\x1b\\", - 16 + ($red * 36) + ($green * 6) + $blue, + 16 + (map_cube($red) * 36) + (map_cube($green) * 6) + map_cube($blue), ($red ? ($red * 40 + 55) : 0), ($green ? ($green * 40 + 55) : 0), ($blue ? ($blue * 40 + 55) : 0)); @@ -22,7 +45,7 @@ for ($red = 0; $red < 6; $red++) { # colors 232-255 are a grayscale ramp, intentionally leaving out # black and white for ($gray = 0; $gray < 24; $gray++) { - $level = ($gray * 10) + 8; + $level = (map_gray($gray) * 10) + 8; printf("\x1b]4;%d;rgb:%2.2x/%2.2x/%2.2x\x1b\\", 232 + $gray, $level, $level, $level); } diff --git a/app/xterm/vttests/88colors2.pl b/app/xterm/vttests/88colors2.pl index 0e4c8f529..247ade074 100644 --- a/app/xterm/vttests/88colors2.pl +++ b/app/xterm/vttests/88colors2.pl @@ -1,19 +1,44 @@ #!/usr/bin/perl -# Author: Steve Wall -# $XFree86: xc/programs/xterm/vttests/88colors2.pl,v 1.1 1999/09/25 14:38:51 dawes Exp $ -# Made from 256colors2.pl +# $XTermId: 88colors2.pl,v 1.5 2007/07/17 00:42:15 tom Exp $ +# Authors: Steve Wall +# Thomas E Dickey +# +# Adapted from 256colors2.pl # use the resources for colors 0-15 - usually more-or-less a # reproduction of the standard ANSI colors, but possibly more # pleasing shades +use strict; + +use Getopt::Std; + +our ($opt_r); +&getopts('r') || die("Usage: $0 [-r]"); + +our (@steps); +our ($red, $green, $blue); +our ($gray, $level, $color); + +sub map_cube($) { + my $value = $_[0]; + $value = (3 - $value) if defined($opt_r); + return $value; +} + +sub map_gray($) { + my $value = $_[0]; + $value = (7 - $value) if defined($opt_r); + return $value; +} + # colors 16-79 are a 4x4x4 color cube @steps=(0,139,205,255); for ($red = 0; $red < 4; $red++) { for ($green = 0; $green < 4; $green++) { for ($blue = 0; $blue < 4; $blue++) { printf("\x1b]4;%d;rgb:%2.2x/%2.2x/%2.2x\x1b\\", - 16 + ($red * 16) + ($green * 4) + $blue, + 16 + (map_cube($red) * 16) + (map_cube($green) * 4) + map_cube($blue), int (@steps[$red]), int (@steps[$green]), int (@steps[$blue])); @@ -24,7 +49,7 @@ for ($red = 0; $red < 4; $red++) { # colors 80-87 are a grayscale ramp, intentionally leaving out # black and white for ($gray = 0; $gray < 8; $gray++) { - $level = ($gray * 23.18181818) + 46.36363636; + $level = (map_gray($gray) * 23.18181818) + 46.36363636; if( $gray > 0 ) { $level += 23.18181818; } printf("\x1b]4;%d;rgb:%2.2x/%2.2x/%2.2x\x1b\\", 80 + $gray, int($level), int($level), int($level)); diff --git a/app/xterm/wcwidth.c b/app/xterm/wcwidth.c index 5d0a4913d..5dfac3e14 100644 --- a/app/xterm/wcwidth.c +++ b/app/xterm/wcwidth.c @@ -1,4 +1,4 @@ -/* $XTermId: wcwidth.c,v 1.19 2006/06/19 00:36:52 tom Exp $ */ +/* $XTermId: wcwidth.c,v 1.21 2007/06/13 00:14:29 tom Exp $ */ /* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */ @@ -54,7 +54,7 @@ * * http://www.unicode.org/unicode/reports/tr11/ * - * Markus Kuhn -- 2003-05-20 (Unicode 4.0) + * Markus Kuhn -- 2007-05-25 (Unicode 5.0) * * Permission to use, copy, modify, and distribute this software * for any purpose and without fee is hereby granted. The author @@ -128,15 +128,17 @@ int mk_wcwidth(wchar_t ucs) unsigned long cmp = (unsigned long) ucs; /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ + /* generated by + * uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c + */ static const struct interval combining[] = { { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05B9 }, { 0x05BB, 0x05BD }, { 0x05BF, 0x05BF }, - { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, - { 0x0600, 0x0603 }, { 0x0610, 0x0615 }, { 0x064B, 0x065E }, - { 0x0670, 0x0670 }, { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, - { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, - { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x0901, 0x0902 }, + { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, + { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, + { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, @@ -150,31 +152,34 @@ int mk_wcwidth(wchar_t ucs) { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, { 0x0DCA, 0x0DCA }, - { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 }, - { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, { 0x0EB1, 0x0EB1 }, - { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, { 0x0EC8, 0x0ECD }, - { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, - { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 }, - { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, { 0x0F99, 0x0FBC }, - { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1032 }, - { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, { 0x1058, 0x1059 }, - { 0x1160, 0x11FF }, { 0x135F, 0x135F }, { 0x1712, 0x1714 }, - { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, - { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, - { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, - { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, - { 0x1932, 0x1932 }, { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, - { 0x1DC0, 0x1DC3 }, { 0x200B, 0x200F }, { 0x202A, 0x202E }, - { 0x2060, 0x2063 }, { 0x206A, 0x206F }, { 0x20D0, 0x20EB }, - { 0x302A, 0x302F }, { 0x3099, 0x309A }, { 0xA806, 0xA806 }, - { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, - { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, - { 0xFFF9, 0xFFFB }, { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, - { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, - { 0x1D167, 0x1D169 }, { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, - { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, - { 0xE0020, 0xE007F }, { 0xE0100, 0xE01EF } + { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, + { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, + { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, + { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, + { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, + { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, + { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, + { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, + { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, + { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, + { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, + { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, + { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, + { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, + { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, + { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, + { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0xE0100, 0xE01EF } }; /* test for 8-bit control characters */ @@ -198,6 +203,7 @@ int mk_wcwidth(wchar_t ucs) cmp != 0x303f) || /* CJK ... Yi */ (cmp >= 0xac00 && cmp <= 0xd7a3) || /* Hangul Syllables */ (cmp >= 0xf900 && cmp <= 0xfaff) || /* CJK Compatibility Ideographs */ + (cmp >= 0xfe10 && cmp <= 0xfe19) || /* Vertical forms */ (cmp >= 0xfe30 && cmp <= 0xfe6f) || /* CJK Compatibility Forms */ (cmp >= 0xff00 && cmp <= 0xff60) || /* Fullwidth Forms */ (cmp >= 0xffe0 && cmp <= 0xffe6) || @@ -232,7 +238,21 @@ int mk_wcswidth(const wchar_t *pwcs, size_t n) int mk_wcwidth_cjk(wchar_t ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous - * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ + * characters, generated by + * + * uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf \ + * +E000..F8FF \ + * +F0000..FFFFD \ + * +100000..10FFFD c + * + * "WIDTH-A" is a file extracted from EastAsianWidth.txt by selecting + * only those with width "A", and omitting: + * + * 0xAD + * all lines with "COMBINING" + * + * (uniset does not recognize the range expressions in WIDTH-A). + */ static const struct interval ambiguous[] = { { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 }, { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 }, diff --git a/app/xterm/xstrings.c b/app/xterm/xstrings.c index 746955315..109289765 100644 --- a/app/xterm/xstrings.c +++ b/app/xterm/xstrings.c @@ -1,10 +1,10 @@ -/* $XTermId: xstrings.c,v 1.25 2006/02/13 01:14:59 tom Exp $ */ +/* $XTermId: xstrings.c,v 1.26 2007/06/09 13:43:00 tom Exp $ */ /* $XFree86: xc/programs/xterm/xstrings.c,v 1.10 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 2000-2005,2006 by Thomas E. Dickey +Copyright 2000-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -55,6 +55,31 @@ x_basename(char *name) return (cp ? cp + 1 : name); } +char * +x_getenv(const char *name) +{ + return x_nonempty(getenv(name)); +} + +/* + * Check if the given string is nonnull/nonempty. If so, return a pointer + * to the beginning of its content, otherwise return null. + */ +char * +x_nonempty(char *s) +{ + if (s != 0) { + if (*s == '\0') { + s = 0; + } else { + s = x_skip_blanks(s); + if (*s == '\0') + s = 0; + } + } + return s; +} + char * x_skip_blanks(char *s) { diff --git a/app/xterm/xstrings.h b/app/xterm/xstrings.h index b542f5fba..59279a077 100644 --- a/app/xterm/xstrings.h +++ b/app/xterm/xstrings.h @@ -1,10 +1,10 @@ -/* $XTermId: xstrings.h,v 1.11 2006/02/13 01:14:59 tom Exp $ */ +/* $XTermId: xstrings.h,v 1.12 2007/06/09 13:35:28 tom Exp $ */ /* $XFree86: xc/programs/xterm/xstrings.h,v 1.5 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 2000-2002,2005 by Thomas E. Dickey +Copyright 2000-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -37,13 +37,15 @@ authorization. #ifndef included_xstrings_h #define included_xstrings_h 1 -extern char *x_basename(char *name); -extern char *x_skip_blanks(char *s); -extern char *x_skip_nonblanks(char *s); -extern char *x_strdup(const char *s); -extern char *x_strindex(char *s1, char *s2); -extern char *x_strtrim(char *s); -extern int x_strcasecmp(const char *s1, const char *s2); -extern int x_strncasecmp(const char *s1, const char *s2, unsigned n); +extern char *x_basename(char * /* name */); +extern char *x_getenv(const char * /* name */); +extern char *x_nonempty(char * /* s */); +extern char *x_skip_blanks(char * /* s */); +extern char *x_skip_nonblanks(char * /* s */); +extern char *x_strdup(const char * /* s */); +extern char *x_strindex(char * /* s1 */, char * /* s2 */); +extern char *x_strtrim(char * /* s */); +extern int x_strcasecmp(const char * /* s1 */, const char * /* s2 */); +extern int x_strncasecmp(const char * /* s1 */, const char * /* s2 */, unsigned /* n */); #endif /* included_xstrings_h */ diff --git a/app/xterm/xterm.desktop b/app/xterm/xterm.desktop new file mode 100644 index 000000000..e2e05b3fc --- /dev/null +++ b/app/xterm/xterm.desktop @@ -0,0 +1,10 @@ +# $XTermId: xterm.desktop,v 1.6 2007/06/17 00:55:01 tom Exp $ +[Desktop Entry] +Name=XTerm +Comment=standard terminal emulator for the X window system +Exec=xterm +Terminal=false +Type=Application +Encoding=UTF-8 +Icon=xterm-color_48x48.xpm +Categories=System; diff --git a/app/xterm/xterm.log.html b/app/xterm/xterm.log.html index 8b4a4378b..83fd70028 100644 --- a/app/xterm/xterm.log.html +++ b/app/xterm/xterm.log.html @@ -20,8 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.545 2007/03/24 00:15:59 tom Exp $ - $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $ + $XTermId: xterm.log.html,v 1.600 2007/08/12 17:32:04 tom Exp $ --> @@ -46,6 +45,10 @@ Most of these are summarized in the XFree86 CHANGELOG is the latest version of this file. +

Patch #229 - 2008/8/12

+
    +
  • override locale in minstall.sh; + change in patch #226 + does not work in UTF-8 locale (report by Zdenek Sekera). + +
  • undo an incorrect fix for a memory leak + in patch #209 (Debian #435858). +
+ +

Patch #228 - 2007/7/22

+
    +
  • modify configure script to permit combining + --with-utempter + and --enable-setuid, e.g., for using xterm with + the utempter library on FreeBSD (report by Andriy Gapon). + +
  • modify "Quit" menu entry to override the -hold + command-line option. + +
  • add a check in the startup error-reporting to avoid writing to + pipe when it has not been opened. In that case, report errors + directly to the standard error. + +
  • add OPT_READLINE definition to xtermcfg.hin, overlooked in + patch #205 + (report by Kalle Olavi Niemitalo). + +
  • modify 88colors2.pl and 256colors2.pl, + adding -r + option to reverse the palettes for the extended colors. + +
  • check for partial overwrite or deletion of multi-column characters + in several cases, e.g., insert-character, delete-character, + etc., + and fill the remainder of the cells used by the multi-column + characters affected with blanks. + +
  • correct character-class codes in wide-character mode for characters + 215, 247 (see also patch #165). + +
  • fix missing assignment for UTF-8 parsing in widget initialization + (Debian #403360). + +
  • correct index expression used to set line-wrapping flag, making + selection from scrollback work consistently (Debian #430121, + report by Vincent Lefevre). + +
  • amend changes to handshake in + patch #226 + to accommodate Solaris, which relies on the extra setting of + the terminal size after I/O initialization. + Do this by adding new resource ptySttySize, + which is false for Linux and MacOS X, i.e., true for + for Solaris and other SVR4 platforms, as well as FreeBSD + (reports by David Wood, Renato Botelho). + +
  • check for X events after cursor-left, and carriage return, + consistent with indexing operations + (comments by Vegard Nossum and Ingo Molnar on a mailing-list). + +
  • initialize the .keyboard structure, + needed for some platforms (such as Solaris) after + patch #227 fixes for keysyms + (patch by David Wood). + +
  • update config.guess, config.sub +
+ +

Patch #227 - 2007/6/27

+
    +
  • exclude the Intel compiler from the extra gcc warning options + added in + patch #226. + +
  • modify change for Debian #422521 + from patch #226 + to work with configurations where the X server does not + recognize + the XF86Paste + or SunPaste keysyms (report by Paolo Pumilia). + +
  • fix incorrect free in fix for "Selection" menu entry in + patch #226. +
+ +

Patch #226 - 2007/6/17

+
    +
  • add configure check to use -Wno-unknown-pragmas for + Solaris, and a few other new gcc warning options to address + regressions in its warning options. + +
  • add sample desktop and icon files, along with configure options for + manipulating them. + +
  • fix an infinite loop when showing a 2-column character in a + 1-column screen (Debian #426863). + +
  • add XF86Paste and SunPaste to the + default translations (Debian #422521, patch by Bernhard R Link). + +
  • update wcwidth.c (partly based on/prompted by mailing list + comment). + +
  • update/improve keysym2ucs.c based on Unicode 5.0.1d3 and Xorg + 7.1 keysymdef.h file. + +
  • improve gen-pc-fkeys.pl, making it show all of the + building-block terminfo entries used by xterm. + +
  • correct strings used for modifiers applied to F1-F4 in xterm+pcf1 + terminfo entry. + +
  • improve session management by adding the ICE connection number + to the select call rather than waking up once per + second (patch by Miroslav Lichvar). + +
  • add environment variable $XTERM_LOCALE to help + with shell initialization, e.g., to set a specific locale for + xterm on systems where a global locale is set in the shell + startup scripts. + +
  • add resource settings mkSampleSize and + mkSamplePass + to modify the mkWidth added + in patch #201. + In patch #202, + xterm would also check if the system's + wcwidth matched its built-in tables + "well enough" to be used when mkWidth was false, + and if not would use the built-in tables anyway. + These resources allow the user to customize the decision + (prompted by comments by Emanuele Giaquinta) + +
  • modify logic which resets/updates the screensize on the child + process side of the pseudo-terminal to do this only if a + successful handshake was received, e.g., as determined by + the waitForMap resource (prompted by reports + by Emanuele Giaquinta and Bernhard R Link, but see also + patch #177 and + patch #159. + +
  • improve permissions logic when closing pseudo-terminal + (Debian #12261, + patch by Nathanael Nerode, + analysis by Richard Braakman). + +
  • add resource highlightReverse which controls whether + xterm will allow selection highlighting to hide reverse-video + or use the older behavior which inverts the foreground and + background colors when selected text with reverse-video attribute + (report by Adam M Costello, comments by Victor Vaile). + +
  • restore a special case for cursor-color in + ReverseVideo() + lost in rewrite for patch #224 + (report by Adam Sulmicki). + +
  • correct initialization for menu entry for bellIsUrgent + (patch by Emanuele Giaquinta). + +
  • correct length of underlining for double-width Xft fonts + (report by Shidai Liu "Leo"). + +
  • correct clipping for double-width Xft fonts + (report by Shidai Liu "Leo"). + +
  • modify initialization for italicULMode to avoid + XftPatternBuild reusing bold attributes + (report by Shidai Liu "Leo"). + +
  • add a check in case someone tries to call the + popup-menu() action on a menu which is not initialized + (Debian #426364). + +
  • improve CF_IMAKE_CFLAGS to work with Solaris sed (report by Peter + Bray). + +
  • improve guess for X's manpage section in minstall.sh, + (prompted by comment by Miroslav Lichvar). + +
  • modify minstall.sh to handle manpage patch with more + than one dot (patch by Miroslav Lichvar). + +
  • fix configure message for --disable-setgid option (patch by + Miroslav Lichvar). + +
  • add allowTitleOps resource to allow users to prevent + the title- and icon-names from changing (request by John Bashinski). + +
  • fix "spawn-new-terminal" action, for the case where no parameter + is passed to the action (patch by Daniel Colascione). + +
  • fix error-checking on internal font switching for "Selection" + menu entry (Debian #421523). + +
  • amend select/paste change from + patch #225 + by limiting it to non-UTF-8/non-KOI8-R encoding (Debian #420974). + +
  • add workaround for groff ".URL" codes which are not present in + some commonly-used bitmap fonts (Debian #418324). +
+

Patch #225 - 2007/3/24

  • add useClipping resource to allow clipping to be @@ -314,7 +521,7 @@ is the latest version of this file.
  • add "spawn-new-terminal" action, which can be assigned to key translation, allowing one to spawn a new copy of xterm using the current process' working directory (adapted from patch - by Daniel Colascio). + by Daniel Colascione).
  • improve select/paste between UTF-8 and Latin1 xterms by adapting the translations from patch #185. @@ -1337,7 +1544,8 @@ is the latest version of this file.
  • rename $CMD variable in plink.sh because it is a reserved symbol in bash 3.00.16 (report by Ted Taylor). -
  • add environment variables $XTERM_SHELL and $XTERM_VERSION +
  • add environment variables $XTERM_SHELL and + $XTERM_VERSION (request by Zdenek Sekera).
  • corrected workaround for background color of menubar, which gave diff --git a/app/xterm/xtermcfg.hin b/app/xterm/xtermcfg.hin index c2dc8713e..22f163825 100644 --- a/app/xterm/xtermcfg.hin +++ b/app/xterm/xtermcfg.hin @@ -1,4 +1,4 @@ -/* $XTermId: xtermcfg.hin,v 1.163 2007/03/21 22:05:18 tom Exp $ */ +/* $XTermId: xtermcfg.hin,v 1.166 2007/07/19 21:43:21 tom Exp $ */ /* * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.61 2006/06/19 00:36:52 dickey Exp $ @@ -80,6 +80,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #undef HAVE_WCWIDTH /* AC_CHECK_FUNCS(wcwidth) */ #undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.h) */ #undef HAVE_X11_SUNKEYSYM_H /* AC_CHECK_HEADERS(X11/Sunkeysym.h) */ +#undef HAVE_X11_XF86KEYSYM_H /* AC_CHECK_HEADERS(X11/XF86keysym.h) */ #undef HAVE_X11_XPOLL_H /* AC_CHECK_HEADERS(X11/Xpoll.h) */ #undef HAVE_XFTDRAWSETCLIP /* CF_X_FREETYPE */ #undef HAVE_XFTDRAWSETCLIPRECTANGLES /* CF_X_FREETYPE */ @@ -116,6 +117,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #undef OPT_PASTE64 /* CF_ARG_ENABLE(past64) */ #undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */ #undef OPT_PTY_HANDSHAKE /* CF_ARG_ENABLE(pty-handshake) */ +#undef OPT_READLINE /* CF_ARG_ENABLE(readline-mouse) */ #undef OPT_SAME_NAME /* CF_ARG_DISABLE(samename) */ #undef OPT_SCO_FUNC_KEYS /* CF_ARG_ENABLE(sco-fkeys) */ #undef OPT_SELECT_REGEX /* CF_ARG_DISABLE(regex) */ @@ -168,6 +170,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef OPT_TRACE #undef OPT_TRACE /* CF_ARG_ENABLE(trace) */ +#undef OPT_TRACE_FLAGS /* ...no option */ #endif /*