« back to all changes in this revision
Viewing changes to debian/patches/ncurses-upstream.patch
- browse files at revision 11
- compare with another revision
- download diff
- download tarball
- view history from revision 11
- Committer: Bazaar Package Importer
- Author(s): Matthias Klose
- Date: 2007-05-17 09:00:42 UTC
- mfrom: (1.1.3 upstream)
- Revision ID: james.westby@ubuntu.com-20070517090042-86fgxrr6j5jzagot
Tags: 5.6-0ubuntu1
* New upstream version.
- Remove patches applied upstream: ncurses.upstream, signed-chars.
- Update patches: debian-backspace.
* Build-depend on g++-multilib instead of lib{32,64}c*-dev-*.
- Remove patches applied upstream: ncurses.upstream, signed-chars.
- Update patches: debian-backspace.
* Build-depend on g++-multilib instead of lib{32,64}c*-dev-*.
- files added:
- AUTHORS
- files removed:
- debian/patches/ncurses-upstream.patch
- files modified:
- ANNOUNCE
added
removed
debian/patches/ncurses-upstream.patch
1
# ------------------------------------------------------------------------------
2
# INSTALL | 12
3
# MANIFEST | 5
4
# NEWS | 141 +
5
# aclocal.m4 | 17
6
# c++/demo.cc | 6
7
# config.guess | 46
8
# config.sub | 34
9
# configure | 2705 +++++++++----------
10
# configure.in | 37
11
# dist.mk | 4
12
# doc/hackguide.doc | 6
13
# doc/html/hackguide.html | 37
14
# doc/html/ncurses-intro.html | 31
15
# doc/ncurses-intro.doc | 2
16
# form/frm_data.c | 6
17
# form/frm_def.c | 6
18
# form/frm_driver.c | 40
19
# include/curses.h.in | 14
20
# include/curses.tail | 10
21
# include/curses.wide | 12
22
# include/ncurses_defs | 22
23
# include/tic.h | 20
24
# man/curs_addch.3x | 8
25
# man/curs_addchstr.3x | 4
26
# man/curs_color.3x | 26
27
# man/curs_extend.3x | 7
28
# man/curs_getstr.3x | 18
29
# man/curs_termcap.3x | 11
30
# man/curs_util.3x | 33
31
# man/tic.1m | 15
32
# man/toe.1m | 19
33
# man/tput.1 | 12
34
# menu/m_cursor.c | 8
35
# menu/m_driver.c | 4
36
# menu/m_global.c | 82
37
# menu/mf_common.h | 11
38
# misc/jpf-indent | 5
39
# misc/ncu-indent | 5
40
# misc/terminfo.src | 74
41
# ncurses-5.5-20060128/man/legacy_coding.3x | 82
42
# ncurses-5.5-20060128/ncurses/base/legacy_coding.c | 48
43
# ncurses-5.5-20060128/test/bulgarian-utf8.txt | 6
44
# ncurses-5.5-20060128/test/demo_altkeys.c | 142 +
45
# ncurses-5.5-20060128/test/widechars-utf8.txt | 7
46
# ncurses/base/MKkeyname.awk | 3
47
# ncurses/base/MKlib_gen.sh | 7
48
# ncurses/base/MKunctrl.awk | 45
49
# ncurses/base/keybound.c | 5
50
# ncurses/base/lib_addch.c | 14
51
# ncurses/base/lib_bkgd.c | 12
52
# ncurses/base/lib_box.c | 8
53
# ncurses/base/lib_color.c | 18
54
# ncurses/base/lib_dft_fgbg.c | 4
55
# ncurses/base/lib_erase.c | 21
56
# ncurses/base/lib_getch.c | 10
57
# ncurses/base/lib_getstr.c | 17
58
# ncurses/base/lib_initscr.c | 10
59
# ncurses/base/lib_instr.c | 4
60
# ncurses/base/lib_mouse.c | 31
61
# ncurses/base/lib_newterm.c | 181 -
62
# ncurses/base/lib_restart.c | 59
63
# ncurses/base/lib_set_term.c | 85
64
# ncurses/base/tries.c | 6
65
# ncurses/curses.priv.h | 38
66
# ncurses/llib-lncurses | 111
67
# ncurses/llib-lncursesw | 133
68
# ncurses/modules | 3
69
# ncurses/tinfo/add_tries.c | 6
70
# ncurses/tinfo/captoinfo.c | 6
71
# ncurses/tinfo/comp_error.c | 4
72
# ncurses/tinfo/comp_scan.c | 4
73
# ncurses/tinfo/init_keytry.c | 6
74
# ncurses/tinfo/lib_acs.c | 32
75
# ncurses/tinfo/lib_setup.c | 54
76
# ncurses/tinfo/lib_tparm.c | 24
77
# ncurses/tinfo/lib_ttyflags.c | 49
78
# ncurses/tinfo/read_entry.c | 262 +
79
# ncurses/tinfo/read_termcap.c | 25
80
# ncurses/tinfo/trim_sgr0.c | 4
81
# ncurses/tty/hashmap.c | 6
82
# ncurses/tty/lib_mvcur.c | 10
83
# ncurses/tty/lib_tstp.c | 55
84
# ncurses/tty/lib_vidattr.c | 44
85
# ncurses/tty/tty_update.c | 137
86
# ncurses/widechar/lib_ins_wch.c | 4
87
# panel/panel.priv.h | 8
88
# progs/Makefile.in | 7
89
# progs/dump_entry.c | 6
90
# progs/toe.c | 293 +-
91
# test/Makefile.in | 8
92
# test/README | 6
93
# test/aclocal.m4 | 723 ++++-
94
# test/blue.c | 13
95
# test/bs.c | 37
96
# test/configure | 2787 +++++++++++++++++---
97
# test/configure.in | 63
98
# test/demo_defkey.c | 15
99
# test/demo_forms.c | 29
100
# test/demo_termcap.c | 17
101
# test/dots.c | 15
102
# test/filter.c | 32
103
# test/inserts.c | 39
104
# test/lrtest.c | 34
105
# test/modules | 3
106
# test/ncurses.c | 534 +++
107
# test/railroad.c | 18
108
# test/test.priv.h | 143 -
109
# test/testcurs.c | 30
110
# 108 files changed, 7492 insertions(+), 2765 deletions(-)
111
# ------------------------------------------------------------------------------
112
Index: ncurses-5.5/INSTALL
113
===================================================================
114
--- ncurses-5.5.orig/INSTALL 2005-10-09 10:09:37.000000000 -0400
115
+++ ncurses-5.5/INSTALL 2006-04-29 10:41:13.000000000 -0400
116
@@ -1,4 +1,31 @@
117
--- $Id: INSTALL,v 1.98 2005/10/09 14:09:37 tom Exp $
118
+-------------------------------------------------------------------------------
119
+-- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
120
+-- --
121
+-- Permission is hereby granted, free of charge, to any person obtaining a --
122
+-- copy of this software and associated documentation files (the --
123
+-- "Software"), to deal in the Software without restriction, including --
124
+-- without limitation the rights to use, copy, modify, merge, publish, --
125
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
126
+-- of the Software, and to permit persons to whom the Software is furnished --
127
+-- to do so, subject to the following conditions: --
128
+-- --
129
+-- The above copyright notice and this permission notice shall be included --
130
+-- in all copies or substantial portions of the Software. --
131
+-- --
132
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
133
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
134
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
135
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
136
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
137
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
138
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
139
+-- --
140
+-- Except as contained in this notice, the name(s) of the above copyright --
141
+-- holders shall not be used in advertising or otherwise to promote the --
142
+-- sale, use or other dealings in this Software without prior written --
143
+-- authorization. --
144
+-------------------------------------------------------------------------------
145
+-- $Id: INSTALL,v 1.101 2006/04/22 22:19:37 tom Exp $
146
---------------------------------------------------------------------
147
How to install Ncurses/Terminfo on your system
148
---------------------------------------------------------------------
149
@@ -594,6 +621,8 @@ SUMMARY OF CONFIGURE OPTIONS:
150
bind to the at runtime, so it is only necessary that the library be
151
present when ncurses is built.
152
153
+ See also --without-dlsym
154
+
155
--with-install-prefix=XXX
156
Allows you to specify an alternate location for installing ncurses
157
after building it. The value you specify is prepended to the "real"
158
@@ -678,6 +707,11 @@ SUMMARY OF CONFIGURE OPTIONS:
159
--with-normal
160
Generate normal (i.e., static) libraries (default).
161
162
+ Note: on Linux, the configure script will attempt to use the GPM
163
+ library via the dlsym() function call. Use --without-dlsym to disable
164
+ this feature, or --without-gpm, depending on whether you wish to use
165
+ GPM.
166
+
167
--with-profile
168
Generate profile-libraries These are named by adding "_p" to the root,
169
e.g., libncurses_p.a
170
@@ -772,6 +806,9 @@ SUMMARY OF CONFIGURE OPTIONS:
171
Suppress the configure script's check for C++, do not build the
172
C++ binding and related demo.
173
174
+ --without-dlsym
175
+ Do not use dlsym() to load GPM dynamically.
176
+
177
--without-progs
178
Tell the configure script to suppress the build of ncurses' application
179
programs (e.g., tic). The test applications will still be built if you
180
Index: ncurses-5.5/MANIFEST
181
===================================================================
182
--- ncurses-5.5.orig/MANIFEST 2005-07-16 20:27:51.000000000 -0400
183
+++ ncurses-5.5/MANIFEST 2006-04-18 15:48:06.000000000 -0400
184
@@ -598,6 +598,7 @@
185
./man/key_defined.3x
186
./man/keybound.3x
187
./man/keyok.3x
188
+./man/legacy_coding.3x
189
./man/make_sed.sh
190
./man/man_db.renames
191
./man/manlinks.sed
192
@@ -716,6 +717,7 @@
193
./ncurses/base/key_defined.c
194
./ncurses/base/keybound.c
195
./ncurses/base/keyok.c
196
+./ncurses/base/legacy_coding.c
197
./ncurses/base/lib_addch.c
198
./ncurses/base/lib_addstr.c
199
./ncurses/base/lib_beep.c
200
@@ -956,11 +958,13 @@
201
./test/blue.c
202
./test/bs.6
203
./test/bs.c
204
+./test/bulgarian-utf8.txt
205
./test/cardfile.c
206
./test/cardfile.dat
207
./test/color_set.c
208
./test/configure
209
./test/configure.in
210
+./test/demo_altkeys.c
211
./test/demo_defkey.c
212
./test/demo_forms.c
213
./test/demo_keyok.c
214
@@ -986,11 +990,13 @@
215
./test/listused.sh
216
./test/lrtest.c
217
./test/modules
218
+./test/movewindow.c
219
./test/ncurses.c
220
./test/ncurses_tst.hin
221
./test/newdemo.c
222
./test/railroad.c
223
./test/rain.c
224
+./test/savescreen.c
225
./test/tclock.c
226
./test/test.priv.h
227
./test/testaddch.c
228
@@ -998,6 +1004,7 @@
229
./test/testscanw.c
230
./test/tracemunch
231
./test/view.c
232
+./test/widechars-utf8.txt
233
./test/worm.c
234
./test/xmas.c
235
./test/xterm-16color.dat
236
Index: ncurses-5.5/NEWS
237
===================================================================
238
--- ncurses-5.5.orig/NEWS 2005-10-09 10:17:59.000000000 -0400
239
+++ ncurses-5.5/NEWS 2006-04-29 10:41:13.000000000 -0400
240
@@ -1,4 +1,32 @@
241
--- $Id: NEWS,v 1.929 2005/10/09 14:17:59 tom Exp $
242
+-------------------------------------------------------------------------------
243
+-- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
244
+-- --
245
+-- Permission is hereby granted, free of charge, to any person obtaining a --
246
+-- copy of this software and associated documentation files (the --
247
+-- "Software"), to deal in the Software without restriction, including --
248
+-- without limitation the rights to use, copy, modify, merge, publish, --
249
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
250
+-- of the Software, and to permit persons to whom the Software is furnished --
251
+-- to do so, subject to the following conditions: --
252
+-- --
253
+-- The above copyright notice and this permission notice shall be included --
254
+-- in all copies or substantial portions of the Software. --
255
+-- --
256
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
257
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
258
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
259
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
260
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
261
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
262
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
263
+-- --
264
+-- Except as contained in this notice, the name(s) of the above copyright --
265
+-- holders shall not be used in advertising or otherwise to promote the --
266
+-- sale, use or other dealings in this Software without prior written --
267
+-- authorization. --
268
+-------------------------------------------------------------------------------
269
+-- $Id: NEWS,v 1.976 2006/04/22 23:27:50 tom Exp $
270
+-------------------------------------------------------------------------------
271
272
This is a log of changes that ncurses has gone through since Zeyd started
273
working with Pavel Curtis' original work, pcurses, in 1992.
274
@@ -6,6 +34,242 @@ working with Pavel Curtis' original work
275
Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
276
Changes since 1.9.9e are recorded by Thomas Dickey.
277
278
+20060422
279
+ + add copyright notices to files other than those that are generated,
280
+ data or adapted from pdcurses (reports by William McBrine, David
281
+ Taylor).
282
+ + improve rendering on hpterm by not resetting attributes at the end
283
+ of doupdate() if the terminal has the magic-cookie feature (report
284
+ by Bernd Rieke).
285
+ + add 256color variants of terminfo entries for programs which are
286
+ reported to implement this feature -TD
287
+
288
+20060416
289
+ + fix typo in change to NewChar() macro from 20060311 changes, which
290
+ broke tab-expansion (report by Frederic L W Meunier).
291
+
292
+20060415
293
+ + document -U option of tic and infocmp.
294
+ + modify tic/infocmp to suppress smacs/rmacs when acsc is suppressed
295
+ due to size limit, e.g., converting to termcap format. Also
296
+ suppress them if the output format does not contain acsc and it
297
+ was not VT100-like, i.e., a one-one mapping (Novell #163715).
298
+ + add configure check to ensure that SIGWINCH is defined on platforms
299
+ such as OS X which exclude that when _XOPEN_SOURCE, etc., are
300
+ defined (report by Nicholas Cole)
301
+
302
+20060408
303
+ + modify write_object() to not write coincidental extensions of an
304
+ entry made due to it being referenced in a use= clause (report by
305
+ Alain Bench).
306
+ + another fix for infocmp -i option, which did not ensure that some
307
+ escape sequences had comparable prefixes (report by Alain Bench).
308
+
309
+20060401
310
+ + improve discussion of init/reset in terminfo and tput manpages
311
+ (report by Alain Bench).
312
+ + use is3 string for a fallback of rs3 in the reset program; it was
313
+ using is2 (report by Alain Bench).
314
+ + correct logic for infocmp -i option, which did not account for
315
+ multiple digits in a parameter (cf: 20040828) (report by Alain
316
+ Bench).
317
+ + move _nc_handle_sigwinch() to lib_setup.c to make --with-termlib
318
+ option work after 20060114 changes (report by Arkadiusz Miskiewicz).
319
+ + add copyright notices to test-programs as needed (report by William
320
+ McBrine).
321
+
322
+20060318
323
+ + modify ncurses.c 'F' test to combine the wide-characters with color
324
+ and/or video attributes.
325
+ + modify test/ncurses to use CTL/Q or ESC consistently for exiting
326
+ a test-screen (some commands used 'x' or 'q').
327
+
328
+20060312
329
+ + fix an off-by-one in the scrolling-region change (cf_ 20060311).
330
+
331
+20060311
332
+ + add checks in waddchnstr() and wadd_wchnstr() to stop copying when
333
+ a null character is found (report by Igor Bogomazov).
334
+ + modify progs/Makefile.in to make "tput init" work properly with
335
+ cygwin, i.e., do not pass a ".exe" in the reference string used
336
+ in check_aliases (report by Samuel Thibault).
337
+ + add some checks to ensure current position is within scrolling
338
+ region before scrolling on a new line (report by Dan Gookin).
339
+ + change some NewChar() usage to static variables to work around
340
+ stack garbage introduced when cchar_t is not packed (Redhat #182024).
341
+
342
+20060225
343
+ + workarounds to build test/movewindow with PDcurses 2.7.
344
+ + fix for nsterm-16color entry (patch by Alain Bench).
345
+ + correct a typo in infocmp manpage (Debian #354281).
346
+
347
+20060218
348
+ + add nsterm-16color entry -TD
349
+ + updated mlterm terminfo entry -TD
350
+ + remove 970913 feature for copying subwindows as they are moved in
351
+ mvwin() (discussion with Bryan Christ).
352
+ + modify test/demo_menus.c to demonstrate moving a menu (both the
353
+ window and subwindow) using shifted cursor-keys.
354
+ + start implementing recursive mvwin() in movewindow.c (incomplete).
355
+ + add a fallback definition for GCC_PRINTFLIKE() in test.priv.h,
356
+ for movewindow.c (report by William McBrine).
357
+ + add help-message to test/movewindow.c
358
+
359
+20060211
360
+ + add test/movewindow.c, to test mvderwin().
361
+ + fix ncurses soft-key test so color changes are shown immediately
362
+ rather than delayed.
363
+ + modify ncurses soft-key test to hide the keys when exiting the test
364
+ screen.
365
+ + fixes to build test programs with PDCurses 2.7, e.g., its headers
366
+ rely on autoconf symbols, and it declares stubs for nonfunctional
367
+ terminfo and termcap entrypoints.
368
+
369
+20060204
370
+ + improved test/configure to build test/ncurses on HPUX 11 using the
371
+ vendor curses.
372
+ + documented ALTERNATE CONFIGURATIONS in the ncurses manpage, for the
373
+ benefit of developers who do not read INSTALL.
374
+
375
+20060128
376
+ + correct form library Window_To_Buffer() change (cf: 20040516), which
377
+ should ignore the video attributes (report by Ricardo Cantu).
378
+
379
+20060121
380
+ + minor fixes to xmc-glitch experimental code:
381
+ + suppress line-drawing
382
+ + implement max_attributes
383
+ tested with xterm.
384
+ + minor fixes for the database iterator.
385
+ + fix some buffer limits in c++ demo (comment by Falk Hueffner in
386
+ Debian #348117).
387
+
388
+20060114
389
+ + add toe -a option, to show all databases. This uses new private
390
+ interfaces in the ncurses library for iterating through the list of
391
+ databases.
392
+ + fix toe from 20000909 changes which made it not look at
393
+ $HOME/.terminfo
394
+ + make toe's -v option parameter optional as per manpage.
395
+ + improve SIGWINCH handling by postponing its effect during newterm(),
396
+ etc., when allocating screens.
397
+
398
+20060111
399
+ + modify wgetnstr() to return KEY_RESIZE if a sigwinch occurs. Use
400
+ this in test/filter.c
401
+ + fix an error in filter() modification which caused some applications
402
+ to fail.
403
+
404
+20060107
405
+ + check if filter() was called when getting the screensize. Keep it
406
+ at 1 if so (based on Redhat #174498).
407
+ + add extension nofilter().
408
+ + refined the workaround for ACS mapping.
409
+ + make ifdef's consistent in curses.h for the extended colors so the
410
+ header file can be used for the normal curses library. The header
411
+ file installed for extended colors is a variation of the
412
+ wide-character configuration (report by Frederic L W Meunier).
413
+
414
+20051231
415
+ + add a workaround to ACS mapping to allow applications such as
416
+ test/blue.c to use the "PC ROM" characters by masking them with
417
+ A_ALTCHARSET. This worked up til 5.5, but was lost in the revision
418
+ of legacy coding (report by Michael Deutschmann).
419
+ + add a null-pointer check in the wide-character version of
420
+ calculate_actual_width() (report by Victor Julien).
421
+ + improve test/ncurses 'd' (color-edit) test by allowing the RGB
422
+ values to be set independently (patch by William McBrine).
423
+ + modify test/configure script to allow building test programs with
424
+ PDCurses/X11.
425
+ + modified test programs to allow some to work with NetBSD curses.
426
+ Several do not because NetBSD curses implements a subset of X/Open
427
+ curses, and also lacks much of SVr4 additions. But it's enough for
428
+ comparison.
429
+ + update config.guess and config.sub
430
+
431
+20051224
432
+ + use BSD-specific fix for return-value from cgetent() from CVS where
433
+ an unknown terminal type would be reportd as "database not found".
434
+ + make tgetent() return code more readable using new symbols
435
+ TGETENT_YES, etc.
436
+ + remove references to non-existent "tctest" program.
437
+ + remove TESTPROGS from progs/Makefile.in (it was referring to code
438
+ that was never built in that directory).
439
+ + typos in curs_addchstr.3x, some doc files (noticed in OpenBSD CVS).
440
+
441
+20051217
442
+ + add use_legacy_coding() function to support lynx's font-switching
443
+ feature.
444
+ + fix formatting in curs_termcap.3x (report by Mike Frysinger).
445
+ + modify MKlib_gen.sh to change preprocessor-expanded _Bool back to
446
+ bool.
447
+
448
+20051210
449
+ + extend test/ncurses.c 's' (overlay window) test to exercise overlay(),
450
+ overwrite() and copywin() with different combinations of colors and
451
+ attributes (including background color) to make it easy to see the
452
+ effect of the different functions.
453
+ + corrections to menu/m_global.c for wide-characters (report by
454
+ Victor Julien).
455
+
456
+20051203
457
+ + add configure option --without-dlsym, allowing developers to
458
+ configure GPM support without using dlsym() (discussion with Michael
459
+ Setzer).
460
+ + fix wins_nwstr(), which did not handle single-column non-8bit codes
461
+ (Debian #341661).
462
+
463
+20051126
464
+ + move prototypes for wide-character trace functions from curses.tail
465
+ to curses.wide to avoid accidental reference to those if
466
+ _XOPEN_SOURCE_EXTENDED is defined without ensuring that <wchar.h> is
467
+ included.
468
+ + add/use NCURSES_INLINE definition.
469
+ + change some internal functions to use int/unsigned rather than the
470
+ short equivalents.
471
+
472
+20051119
473
+ + remove a redundant check in lib_color.c (Debian #335655).
474
+ + use ld's -search_paths_first option on Darwin to work around odd
475
+ search rules on that platform (report by Christian Gennerat, analysis
476
+ by Andrea Govoni).
477
+ + remove special case for Darwin in CF_XOPEN_SOURCE configure macro.
478
+ + ignore EINTR in tcgetattr/tcsetattr calls (Debian #339518).
479
+ + fix several bugs in test/bs.c (patch by Stephen Lindholm).
480
+
481
+20051112
482
+ + other minor fixes to cygwin based on tack -TD
483
+ + correct smacs in cygwin (Debian #338234, report by Baurzhan
484
+ Ismagulov, who noted that it was fixed in Cygwin).
485
+
486
+20051029
487
+ + add shifted up/down arrow codes to xterm-new as kind/kri strings -TD
488
+ + modify wbkgrnd() to avoid clearing the A_CHARTEXT attribute bits
489
+ since those record the state of multicolumn characters (Debian
490
+ #316663).
491
+ + modify werase to clear multicolumn characters that extend into
492
+ a derived window (Debian #316663).
493
+
494
+20051022
495
+ + move assignment from environment variable ESCDELAY from initscr()
496
+ down to newterm() so the environment variable affects timeouts for
497
+ terminals opened with newterm() as well.
498
+ + fix a memory leak in keyname().
499
+ + add test/demo_altkeys.c
500
+ + modify test/demo_defkey.c to exit from loop via 'q' to allow
501
+ leak-checking, as well as fix a buffer size in winnstr() call.
502
+
503
+20051015
504
+ + correct order of use-clauses in rxvt-basic entry which made codes for
505
+ f1-f4 vt100-style rather than vt220-style (report by Gabor Z Papp).
506
+ + suppress configure check for gnatmake if Ada95/Makefile.in is not
507
+ found.
508
+ + correct a typo in configure --with-bool option for the case where
509
+ --without-cxx is used (report by Daniel Jacobowitz).
510
+ + add a note to INSTALL's discussion of --with-normal, pointing out
511
+ that one may wish to use --without-gpm to ensure a completely
512
+ static link (prompted by report by Felix von Leitner).
513
+
514
20051010 5.5 release for upload to ftp.gnu.org
515
516
20051008
517
Index: ncurses-5.5/aclocal.m4
518
===================================================================
519
--- ncurses-5.5.orig/aclocal.m4 2005-09-24 17:58:59.000000000 -0400
520
+++ ncurses-5.5/aclocal.m4 2006-04-18 15:48:07.000000000 -0400
521
@@ -28,7 +28,7 @@ dnl*************************************
522
dnl
523
dnl Author: Thomas E. Dickey 1995-on
524
dnl
525
-dnl $Id: aclocal.m4,v 1.373 2005/09/24 21:58:59 tom Exp $
526
+dnl $Id: aclocal.m4,v 1.376 2006/04/15 17:39:02 tom Exp $
527
dnl Macros used in NCURSES auto-configuration script.
528
dnl
529
dnl See http://invisible-island.net/autoconf/ for additional information.
530
@@ -1692,7 +1692,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
531
AC_SUBST(LIB_PREFIX)
532
])dnl
533
dnl ---------------------------------------------------------------------------
534
-dnl CF_LIB_RULES version: 36 updated: 2005/05/28 13:16:28
535
+dnl CF_LIB_RULES version: 37 updated: 2006/04/15 13:38:12
536
dnl ------------
537
dnl Append definitions and rules for the given models to the subdirectory
538
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
539
@@ -1716,7 +1716,7 @@ do
540
IMPORT_LIB=
541
SHARED_LIB=
542
LIBS_TO_MAKE=
543
- for cf_item in $CF_LIST_MODELS
544
+ for cf_item in $cf_LIST_MODELS
545
do
546
CF_LIB_SUFFIX($cf_item,cf_suffix)
547
if test $cf_item = shared ; then
548
@@ -1793,7 +1793,7 @@ do
549
for cf_subset in $cf_subsets
550
do
551
cf_subdirs=
552
- for cf_item in $CF_LIST_MODELS
553
+ for cf_item in $cf_LIST_MODELS
554
do
555
echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
556
CF_UPPER(cf_ITEM,$cf_item)
557
@@ -3069,7 +3069,7 @@ ifelse($1,,,[$1=$PATHSEP])
558
AC_SUBST(PATHSEP)
559
])dnl
560
dnl ---------------------------------------------------------------------------
561
-dnl CF_PATH_SYNTAX version: 9 updated: 2002/09/17 23:03:38
562
+dnl CF_PATH_SYNTAX version: 10 updated: 2006/01/02 19:36:00
563
dnl --------------
564
dnl Check the argument to see that it looks like a pathname. Rewrite it if it
565
dnl begins with one of the prefix/exec_prefix variables, and then again if the
566
@@ -3091,7 +3091,7 @@ case ".[$]$1" in #(vi
567
;;
568
esac
569
;; #(vi
570
-.NONE/*)
571
+.no|.NONE/*)
572
$1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
573
;;
574
*)
575
@@ -3390,7 +3390,7 @@ $1=`echo "$2" | \
576
-e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'`
577
])dnl
578
dnl ---------------------------------------------------------------------------
579
-dnl CF_SHARED_OPTS version: 31 updated: 2005/01/01 16:39:44
580
+dnl CF_SHARED_OPTS version: 32 updated: 2005/11/19 16:44:37
581
dnl --------------
582
dnl Attempt to determine the appropriate CC/LD options for creating a shared
583
dnl library.
584
@@ -3476,6 +3476,14 @@ AC_DEFUN([CF_SHARED_OPTS],
585
MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $[@]` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $[@]'
586
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
587
cf_cv_shlib_version_infix=yes
588
+ AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
589
+ cf_save_LDFLAGS=$LDFLAGS
590
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
591
+ AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
592
+ LDFLAGS=$cf_save_LDFLAGS])
593
+ if test $cf_cv_ldflags_search_paths_first = yes; then
594
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
595
+ fi
596
;;
597
hpux*)
598
# (tested with gcc 2.7.2 -- I don't have c89)
599
@@ -3670,6 +3678,65 @@ AC_DEFUN([CF_SHARED_OPTS],
600
AC_SUBST(INSTALL_LIB)
601
])dnl
602
dnl ---------------------------------------------------------------------------
603
+dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09
604
+dnl -----------
605
+dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
606
+dnl programs need this test).
607
+dnl
608
+dnl This is really a MacOS X 10.4.3 workaround. Defining _POSIX_C_SOURCE
609
+dnl forces SIGWINCH to be undefined (breaks xterm, ncurses). Oddly, the struct
610
+dnl winsize declaration is left alone - we may revisit this if Apple choose to
611
+dnl break that part of the interface as well.
612
+AC_DEFUN([CF_SIGWINCH],
613
+[
614
+AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[
615
+ AC_TRY_COMPILE([
616
+#include <sys/types.h>
617
+#include <sys/signal.h>
618
+],[int x = SIGWINCH],
619
+ [cf_cv_define_sigwinch=yes],
620
+ [AC_TRY_COMPILE([
621
+#undef _XOPEN_SOURCE
622
+#undef _POSIX_SOURCE
623
+#undef _POSIX_C_SOURCE
624
+#include <sys/types.h>
625
+#include <sys/signal.h>
626
+],[int x = SIGWINCH],
627
+ [cf_cv_define_sigwinch=maybe],
628
+ [cf_cv_define_sigwinch=no])
629
+])
630
+])
631
+
632
+if test "$cf_cv_define_sigwinch" = maybe ; then
633
+AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
634
+cf_cv_fixup_sigwinch=unknown
635
+cf_sigwinch=32
636
+while test $cf_sigwinch != 1
637
+do
638
+ AC_TRY_COMPILE([
639
+#undef _XOPEN_SOURCE
640
+#undef _POSIX_SOURCE
641
+#undef _POSIX_C_SOURCE
642
+#include <sys/types.h>
643
+#include <sys/signal.h>
644
+],[
645
+#if SIGWINCH != $cf_sigwinch
646
+make an error
647
+#endif
648
+int x = SIGWINCH],
649
+ [cf_cv_fixup_sigwinch=$cf_sigwinch
650
+ break])
651
+
652
+cf_sigwinch=`expr $cf_sigwinch - 1`
653
+done
654
+])
655
+
656
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
657
+ CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch"
658
+ fi
659
+fi
660
+])dnl
661
+dnl ---------------------------------------------------------------------------
662
dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
663
dnl -------------
664
dnl Check for definitions & structures needed for window size-changing
665
@@ -4487,10 +4554,11 @@ test "$cf_with_sysmouse" = yes && AC_DEF
666
fi
667
])dnl
668
dnl ---------------------------------------------------------------------------
669
-dnl CF_XOPEN_SOURCE version: 22 updated: 2005/08/06 18:06:32
670
+dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
671
dnl ---------------
672
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
673
-dnl or adapt to the vendor's definitions to get equivalent functionality.
674
+dnl or adapt to the vendor's definitions to get equivalent functionality,
675
+dnl without losing the common non-POSIX features.
676
dnl
677
dnl Parameters:
678
dnl $1 is the nominal value for _XOPEN_SOURCE
679
@@ -4506,9 +4574,6 @@ case $host_os in #(vi
680
aix[[45]]*) #(vi
681
CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
682
;;
683
-darwin*) #(vi
684
- # setting _XOPEN_SOURCE breaks things on Darwin
685
- ;;
686
freebsd*) #(vi
687
# 5.x headers associate
688
# _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
689
Index: ncurses-5.5/c++/demo.cc
690
===================================================================
691
--- ncurses-5.5.orig/c++/demo.cc 2005-08-13 14:14:44.000000000 -0400
692
+++ ncurses-5.5/c++/demo.cc 2006-04-29 10:41:13.000000000 -0400
693
@@ -1,3 +1,32 @@
694
+// * This makes emacs happy -*-Mode: C++;-*-
695
+/****************************************************************************
696
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
697
+ * *
698
+ * Permission is hereby granted, free of charge, to any person obtaining a *
699
+ * copy of this software and associated documentation files (the *
700
+ * "Software"), to deal in the Software without restriction, including *
701
+ * without limitation the rights to use, copy, modify, merge, publish, *
702
+ * distribute, distribute with modifications, sublicense, and/or sell *
703
+ * copies of the Software, and to permit persons to whom the Software is *
704
+ * furnished to do so, subject to the following conditions: *
705
+ * *
706
+ * The above copyright notice and this permission notice shall be included *
707
+ * in all copies or substantial portions of the Software. *
708
+ * *
709
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
710
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
711
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
712
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
713
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
714
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
715
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
716
+ * *
717
+ * Except as contained in this notice, the name(s) of the above copyright *
718
+ * holders shall not be used in advertising or otherwise to promote the *
719
+ * sale, use or other dealings in this Software without prior written *
720
+ * authorization. *
721
+ ****************************************************************************/
722
+
723
/*
724
* Silly demo program for the NCursesPanel class.
725
*
726
@@ -6,7 +35,7 @@
727
* Demo code for NCursesMenu and NCursesForm written by
728
* Juergen Pfeifer
729
*
730
- * $Id: demo.cc,v 1.32 2005/08/13 18:14:44 tom Exp $
731
+ * $Id: demo.cc,v 1.34 2006/04/22 22:38:57 tom Exp $
732
*/
733
734
#include "internal.h"
735
@@ -282,7 +311,7 @@ public:
736
TestForm F;
737
Soft_Label_Key_Set* S = new Soft_Label_Key_Set;
738
for(int i=1; i <= S->labels(); i++) {
739
- char buf[5];
740
+ char buf[8];
741
::sprintf(buf,"Frm%02d",i);
742
(*S)[i] = buf; // Text
743
(*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
744
@@ -500,7 +529,7 @@ public:
745
void TestApplication::init_labels(Soft_Label_Key_Set& S) const
746
{
747
for(int i=1; i <= S.labels(); i++) {
748
- char buf[5];
749
+ char buf[8];
750
::sprintf(buf,"Key%02d",i);
751
S[i] = buf; // Text
752
S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
753
Index: ncurses-5.5/config.guess
754
===================================================================
755
--- ncurses-5.5.orig/config.guess 2005-09-24 15:51:40.000000000 -0400
756
+++ ncurses-5.5/config.guess 2006-04-18 15:47:21.000000000 -0400
757
@@ -3,7 +3,7 @@
758
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
759
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
760
761
-timestamp='2005-09-19'
762
+timestamp='2005-11-11'
763
764
# This file is free software; you can redistribute it and/or modify it
765
# under the terms of the GNU General Public License as published by
766
@@ -214,11 +214,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
767
exit ;;
768
alpha:OSF1:*:*)
769
case $UNAME_RELEASE in
770
- *4.0)
771
+ *4.0)
772
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
773
;;
774
- *5.*)
775
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
776
+ *5.*)
777
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
778
;;
779
esac
780
# According to Compaq, /usr/sbin/psrinfo has been available on
781
@@ -290,7 +290,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
782
echo s390-ibm-zvmoe
783
exit ;;
784
*:OS400:*:*)
785
- echo powerpc-ibm-os400
786
+ echo powerpc-ibm-os400
787
exit ;;
788
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
789
echo arm-acorn-riscix${UNAME_RELEASE}
790
@@ -745,14 +745,14 @@ EOF
791
exit ;;
792
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
793
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
794
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
795
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
796
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
797
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
798
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
799
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
800
exit ;;
801
5000:UNIX_System_V:4.*:*)
802
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
803
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
804
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
805
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
806
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
807
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
808
exit ;;
809
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
810
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
811
@@ -773,13 +773,13 @@ EOF
812
echo ${UNAME_MACHINE}-pc-mingw32
813
exit ;;
814
i*:windows32*:*)
815
- # uname -m includes "-pc" on this system.
816
- echo ${UNAME_MACHINE}-mingw32
817
+ # uname -m includes "-pc" on this system.
818
+ echo ${UNAME_MACHINE}-mingw32
819
exit ;;
820
i*:PW*:*)
821
echo ${UNAME_MACHINE}-pc-pw32
822
exit ;;
823
- x86:Interix*:[34]*)
824
+ x86:Interix*:[345]*)
825
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
826
exit ;;
827
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
828
@@ -824,7 +824,7 @@ EOF
829
echo crisv32-axis-linux-gnu
830
exit ;;
831
frv:Linux:*:*)
832
- echo frv-unknown-linux-gnu
833
+ echo frv-unknown-linux-gnu
834
exit ;;
835
ia64:Linux:*:*)
836
echo ${UNAME_MACHINE}-unknown-linux-gnu
837
@@ -874,8 +874,8 @@ EOF
838
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
839
;;
840
or32:Linux:*:*)
841
- echo or32-unknown-linux-gnu
842
- exit ;;
843
+ echo or32-unknown-linux-gnu
844
+ exit ;;
845
ppc:Linux:*:*)
846
echo powerpc-unknown-linux-gnu
847
exit ;;
848
@@ -911,7 +911,7 @@ EOF
849
echo ${UNAME_MACHINE}-ibm-linux
850
exit ;;
851
sh64*:Linux:*:*)
852
- echo ${UNAME_MACHINE}-unknown-linux-gnu
853
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
854
exit ;;
855
sh*:Linux:*:*)
856
echo ${UNAME_MACHINE}-unknown-linux-gnu
857
@@ -1024,7 +1024,7 @@ EOF
858
fi
859
exit ;;
860
i*86:*:5:[678]*)
861
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
862
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
863
case `/bin/uname -X | grep "^Machine"` in
864
*486*) UNAME_MACHINE=i486 ;;
865
*Pentium) UNAME_MACHINE=i586 ;;
866
@@ -1192,8 +1192,8 @@ EOF
867
*:procnto*:*:* | *:QNX:[0123456789]*:*)
868
UNAME_PROCESSOR=`uname -p`
869
if test "$UNAME_PROCESSOR" = "x86"; then
870
- UNAME_PROCESSOR=i386
871
- UNAME_MACHINE=pc
872
+ UNAME_PROCESSOR=i386
873
+ UNAME_MACHINE=pc
874
fi
875
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
876
exit ;;
877
@@ -1245,13 +1245,13 @@ EOF
878
echo pdp10-unknown-its
879
exit ;;
880
SEI:*:*:SEIUX)
881
- echo mips-sei-seiux${UNAME_RELEASE}
882
+ echo mips-sei-seiux${UNAME_RELEASE}
883
exit ;;
884
*:DragonFly:*:*)
885
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
886
exit ;;
887
*:*VMS:*:*)
888
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
889
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
890
case "${UNAME_MACHINE}" in
891
A*) echo alpha-dec-vms ; exit ;;
892
I*) echo ia64-dec-vms ; exit ;;
893
Index: ncurses-5.5/config.sub
894
===================================================================
895
--- ncurses-5.5.orig/config.sub 2005-09-24 15:51:26.000000000 -0400
896
+++ ncurses-5.5/config.sub 2006-04-18 15:47:21.000000000 -0400
897
@@ -3,7 +3,7 @@
898
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
899
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
900
901
-timestamp='2005-07-08'
902
+timestamp='2005-11-13'
903
904
# This file is (in principle) common to ALL GNU software.
905
# The presence of a machine in this file suggests that SOME GNU software
906
@@ -171,6 +171,10 @@ case $os in
907
-hiux*)
908
os=-hiuxwe2
909
;;
910
+ -sco6)
911
+ os=-sco5v6
912
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
913
+ ;;
914
-sco5)
915
os=-sco3.2v5
916
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
917
@@ -187,6 +191,10 @@ case $os in
918
# Don't forget version if it is 3.2v4 or newer.
919
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
920
;;
921
+ -sco5v6*)
922
+ # Don't forget version if it is 3.2v4 or newer.
923
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
924
+ ;;
925
-sco*)
926
os=-sco3.2v2
927
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
928
@@ -291,8 +299,8 @@ case $basic_machine in
929
# because (1) that's what they normally are, and
930
# (2) the word "unknown" tends to confuse beginning users.
931
i*86 | x86_64)
932
- basic_machine=$basic_machine-pc
933
- ;;
934
+ basic_machine=$basic_machine-pc
935
+ ;;
936
# Object if more than one company name word.
937
*-*-*)
938
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
939
@@ -377,7 +385,7 @@ case $basic_machine in
940
basic_machine=a29k-amd
941
os=-udi
942
;;
943
- abacus)
944
+ abacus)
945
basic_machine=abacus-unknown
946
;;
947
adobe68k)
948
@@ -1145,8 +1153,8 @@ esac
949
if [ x"$os" != x"" ]
950
then
951
case $os in
952
- # First match some system type aliases
953
- # that might get confused with valid system types.
954
+ # First match some system type aliases
955
+ # that might get confused with valid system types.
956
# -solaris* is a basic system type, with this one exception.
957
-solaris1 | -solaris1.*)
958
os=`echo $os | sed -e 's|solaris1|sunos4|'`
959
@@ -1188,7 +1196,7 @@ case $os in
960
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
961
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
962
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
963
- | -skyos* | -haiku*)
964
+ | -skyos* | haiku*)
965
# Remember, each alternative MUST END IN *, to match a version number.
966
;;
967
-qnx*)
968
@@ -1227,7 +1235,7 @@ case $os in
969
-opened*)
970
os=-openedition
971
;;
972
- -os400*)
973
+ -os400*)
974
os=-os400
975
;;
976
-wince*)
977
@@ -1276,7 +1284,7 @@ case $os in
978
-sinix*)
979
os=-sysv4
980
;;
981
- -tpf*)
982
+ -tpf*)
983
os=-tpf
984
;;
985
-triton*)
986
@@ -1349,9 +1357,9 @@ case $basic_machine in
987
arm*-semi)
988
os=-aout
989
;;
990
- c4x-* | tic4x-*)
991
- os=-coff
992
- ;;
993
+ c4x-* | tic4x-*)
994
+ os=-coff
995
+ ;;
996
# This must come before the *-dec entry.
997
pdp10-*)
998
os=-tops20
999
@@ -1401,7 +1409,7 @@ case $basic_machine in
1000
*-ibm)
1001
os=-aix
1002
;;
1003
- *-knuth)
1004
+ *-knuth)
1005
os=-mmixware
1006
;;
1007
*-wec)
1008
Index: ncurses-5.5/configure
1009
===================================================================
1010
--- ncurses-5.5.orig/configure 2005-09-24 17:50:50.000000000 -0400
1011
+++ ncurses-5.5/configure 2006-04-18 15:48:07.000000000 -0400
1012
@@ -1,5 +1,5 @@
1013
#! /bin/sh
1014
-# From configure.in Revision: 1.351 .
1015
+# From configure.in Revision: 1.357 .
1016
# Guess values for system-dependent variables and create Makefiles.
1017
# Generated by Autoconf 2.52.20030208.
1018
#
1019
@@ -681,6 +681,7 @@ Options to Specify the Libraries Built/U
1020
--with-dbmalloc use Conor Cahill's dbmalloc library
1021
--with-dmalloc use Gray Watson's dmalloc library
1022
--with-gpm use Alessandro Rubini's GPM library
1023
+ --without-dlsym do not use dlsym() to load GPM dynamically
1024
--with-sysmouse use sysmouse (FreeBSD console)
1025
--enable-rpath use rpath option when generating shared libraries
1026
--with-shlib-version=X Specify rel or abi version for shared libs
1027
@@ -944,7 +945,7 @@ if test -z "$CONFIG_SITE"; then
1028
fi
1029
for ac_site_file in $CONFIG_SITE; do
1030
if test -r "$ac_site_file"; then
1031
- { echo "$as_me:947: loading site script $ac_site_file" >&5
1032
+ { echo "$as_me:948: loading site script $ac_site_file" >&5
1033
echo "$as_me: loading site script $ac_site_file" >&6;}
1034
cat "$ac_site_file" >&5
1035
. "$ac_site_file"
1036
@@ -955,7 +956,7 @@ if test -r "$cache_file"; then
1037
# Some versions of bash will fail to source /dev/null (special
1038
# files actually), so we avoid doing that.
1039
if test -f "$cache_file"; then
1040
- { echo "$as_me:958: loading cache $cache_file" >&5
1041
+ { echo "$as_me:959: loading cache $cache_file" >&5
1042
echo "$as_me: loading cache $cache_file" >&6;}
1043
case $cache_file in
1044
[\\/]* | ?:[\\/]* ) . $cache_file;;
1045
@@ -963,7 +964,7 @@ echo "$as_me: loading cache $cache_file"
1046
esac
1047
fi
1048
else
1049
- { echo "$as_me:966: creating cache $cache_file" >&5
1050
+ { echo "$as_me:967: creating cache $cache_file" >&5
1051
echo "$as_me: creating cache $cache_file" >&6;}
1052
>$cache_file
1053
fi
1054
@@ -979,21 +980,21 @@ for ac_var in `(set) 2>&1 |
1055
eval ac_new_val="\$ac_env_${ac_var}_value"
1056
case $ac_old_set,$ac_new_set in
1057
set,)
1058
- { echo "$as_me:982: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1059
+ { echo "$as_me:983: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1060
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1061
ac_cache_corrupted=: ;;
1062
,set)
1063
- { echo "$as_me:986: error: \`$ac_var' was not set in the previous run" >&5
1064
+ { echo "$as_me:987: error: \`$ac_var' was not set in the previous run" >&5
1065
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1066
ac_cache_corrupted=: ;;
1067
,);;
1068
*)
1069
if test "x$ac_old_val" != "x$ac_new_val"; then
1070
- { echo "$as_me:992: error: \`$ac_var' has changed since the previous run:" >&5
1071
+ { echo "$as_me:993: error: \`$ac_var' has changed since the previous run:" >&5
1072
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1073
- { echo "$as_me:994: former value: $ac_old_val" >&5
1074
+ { echo "$as_me:995: former value: $ac_old_val" >&5
1075
echo "$as_me: former value: $ac_old_val" >&2;}
1076
- { echo "$as_me:996: current value: $ac_new_val" >&5
1077
+ { echo "$as_me:997: current value: $ac_new_val" >&5
1078
echo "$as_me: current value: $ac_new_val" >&2;}
1079
ac_cache_corrupted=:
1080
fi;;
1081
@@ -1012,9 +1013,9 @@ echo "$as_me: current value: $ac_new_v
1082
fi
1083
done
1084
if $ac_cache_corrupted; then
1085
- { echo "$as_me:1015: error: changes in the environment can compromise the build" >&5
1086
+ { echo "$as_me:1016: error: changes in the environment can compromise the build" >&5
1087
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1088
- { { echo "$as_me:1017: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1089
+ { { echo "$as_me:1018: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1090
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1091
{ (exit 1); exit 1; }; }
1092
fi
1093
@@ -1034,10 +1035,10 @@ esac
1094
echo "#! $SHELL" >conftest.sh
1095
echo "exit 0" >>conftest.sh
1096
chmod +x conftest.sh
1097
-if { (echo "$as_me:1037: PATH=\".;.\"; conftest.sh") >&5
1098
+if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5
1099
(PATH=".;."; conftest.sh) 2>&5
1100
ac_status=$?
1101
- echo "$as_me:1040: \$? = $ac_status" >&5
1102
+ echo "$as_me:1041: \$? = $ac_status" >&5
1103
(exit $ac_status); }; then
1104
ac_path_separator=';'
1105
else
1106
@@ -1054,7 +1055,7 @@ NCURSES_PATCH="`egrep '^NCURSES_PATCH[
1107
cf_cv_abi_version=${NCURSES_MAJOR}
1108
cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
1109
cf_cv_timestamp=`date`
1110
-echo "$as_me:1057: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
1111
+echo "$as_me:1058: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
1112
echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
1113
1114
test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
1115
@@ -1062,7 +1063,7 @@ test -z "$cf_cv_rel_version" && cf_cv_re
1116
# Check whether --with-rel-version or --without-rel-version was given.
1117
if test "${with_rel_version+set}" = set; then
1118
withval="$with_rel_version"
1119
- { echo "$as_me:1065: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
1120
+ { echo "$as_me:1066: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
1121
echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
1122
cf_cv_rel_version=$withval
1123
fi;
1124
@@ -1075,13 +1076,13 @@ if test -n "$NCURSES_MAJOR" ; then
1125
[0-9]*) #(vi
1126
;;
1127
*)
1128
- { { echo "$as_me:1078: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
1129
+ { { echo "$as_me:1079: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
1130
echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
1131
{ (exit 1); exit 1; }; }
1132
;;
1133
esac
1134
else
1135
- { { echo "$as_me:1084: error: Release major-version value is empty" >&5
1136
+ { { echo "$as_me:1085: error: Release major-version value is empty" >&5
1137
echo "$as_me: error: Release major-version value is empty" >&2;}
1138
{ (exit 1); exit 1; }; }
1139
fi
1140
@@ -1091,13 +1092,13 @@ if test -n "$NCURSES_MINOR" ; then
1141
[0-9]*) #(vi
1142
;;
1143
*)
1144
- { { echo "$as_me:1094: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
1145
+ { { echo "$as_me:1095: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
1146
echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
1147
{ (exit 1); exit 1; }; }
1148
;;
1149
esac
1150
else
1151
- { { echo "$as_me:1100: error: Release minor-version value is empty" >&5
1152
+ { { echo "$as_me:1101: error: Release minor-version value is empty" >&5
1153
echo "$as_me: error: Release minor-version value is empty" >&2;}
1154
{ (exit 1); exit 1; }; }
1155
fi
1156
@@ -1107,7 +1108,7 @@ test -z "$cf_cv_abi_version" && cf_cv_ab
1157
# Check whether --with-abi-version or --without-abi-version was given.
1158
if test "${with_abi_version+set}" = set; then
1159
withval="$with_abi_version"
1160
- { echo "$as_me:1110: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
1161
+ { echo "$as_me:1111: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
1162
echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
1163
cf_cv_abi_version=$withval
1164
fi;
1165
@@ -1117,13 +1118,13 @@ if test -n "$cf_cv_abi_version" ; then
1166
[0-9]*) #(vi
1167
;;
1168
*)
1169
- { { echo "$as_me:1120: error: ABI version is not a number: $cf_cv_abi_version" >&5
1170
+ { { echo "$as_me:1121: error: ABI version is not a number: $cf_cv_abi_version" >&5
1171
echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
1172
{ (exit 1); exit 1; }; }
1173
;;
1174
esac
1175
else
1176
- { { echo "$as_me:1126: error: ABI version value is empty" >&5
1177
+ { { echo "$as_me:1127: error: ABI version value is empty" >&5
1178
echo "$as_me: error: ABI version value is empty" >&2;}
1179
{ (exit 1); exit 1; }; }
1180
fi
1181
@@ -1145,7 +1146,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir
1182
fi
1183
done
1184
if test -z "$ac_aux_dir"; then
1185
- { { echo "$as_me:1148: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
1186
+ { { echo "$as_me:1149: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
1187
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
1188
{ (exit 1); exit 1; }; }
1189
fi
1190
@@ -1155,11 +1156,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
1191
1192
# Make sure we can run config.sub.
1193
$ac_config_sub sun4 >/dev/null 2>&1 ||
1194
- { { echo "$as_me:1158: error: cannot run $ac_config_sub" >&5
1195
+ { { echo "$as_me:1159: error: cannot run $ac_config_sub" >&5
1196
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
1197
{ (exit 1); exit 1; }; }
1198
1199
-echo "$as_me:1162: checking build system type" >&5
1200
+echo "$as_me:1163: checking build system type" >&5
1201
echo $ECHO_N "checking build system type... $ECHO_C" >&6
1202
if test "${ac_cv_build+set}" = set; then
1203
echo $ECHO_N "(cached) $ECHO_C" >&6
1204
@@ -1168,23 +1169,23 @@ else
1205
test -z "$ac_cv_build_alias" &&
1206
ac_cv_build_alias=`$ac_config_guess`
1207
test -z "$ac_cv_build_alias" &&
1208
- { { echo "$as_me:1171: error: cannot guess build type; you must specify one" >&5
1209
+ { { echo "$as_me:1172: error: cannot guess build type; you must specify one" >&5
1210
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
1211
{ (exit 1); exit 1; }; }
1212
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
1213
- { { echo "$as_me:1175: error: $ac_config_sub $ac_cv_build_alias failed." >&5
1214
+ { { echo "$as_me:1176: error: $ac_config_sub $ac_cv_build_alias failed." >&5
1215
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
1216
{ (exit 1); exit 1; }; }
1217
1218
fi
1219
-echo "$as_me:1180: result: $ac_cv_build" >&5
1220
+echo "$as_me:1181: result: $ac_cv_build" >&5
1221
echo "${ECHO_T}$ac_cv_build" >&6
1222
build=$ac_cv_build
1223
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
1224
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
1225
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
1226
1227
-echo "$as_me:1187: checking host system type" >&5
1228
+echo "$as_me:1188: checking host system type" >&5
1229
echo $ECHO_N "checking host system type... $ECHO_C" >&6
1230
if test "${ac_cv_host+set}" = set; then
1231
echo $ECHO_N "(cached) $ECHO_C" >&6
1232
@@ -1193,12 +1194,12 @@ else
1233
test -z "$ac_cv_host_alias" &&
1234
ac_cv_host_alias=$ac_cv_build_alias
1235
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
1236
- { { echo "$as_me:1196: error: $ac_config_sub $ac_cv_host_alias failed" >&5
1237
+ { { echo "$as_me:1197: error: $ac_config_sub $ac_cv_host_alias failed" >&5
1238
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
1239
{ (exit 1); exit 1; }; }
1240
1241
fi
1242
-echo "$as_me:1201: result: $ac_cv_host" >&5
1243
+echo "$as_me:1202: result: $ac_cv_host" >&5
1244
echo "${ECHO_T}$ac_cv_host" >&6
1245
host=$ac_cv_host
1246
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
1247
@@ -1206,7 +1207,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^
1248
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
1249
1250
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
1251
- echo "$as_me:1209: checking target system type" >&5
1252
+ echo "$as_me:1210: checking target system type" >&5
1253
echo $ECHO_N "checking target system type... $ECHO_C" >&6
1254
if test "${ac_cv_target+set}" = set; then
1255
echo $ECHO_N "(cached) $ECHO_C" >&6
1256
@@ -1215,12 +1216,12 @@ else
1257
test "x$ac_cv_target_alias" = "x" &&
1258
ac_cv_target_alias=$ac_cv_host_alias
1259
ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
1260
- { { echo "$as_me:1218: error: $ac_config_sub $ac_cv_target_alias failed" >&5
1261
+ { { echo "$as_me:1219: error: $ac_config_sub $ac_cv_target_alias failed" >&5
1262
echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
1263
{ (exit 1); exit 1; }; }
1264
1265
fi
1266
-echo "$as_me:1223: result: $ac_cv_target" >&5
1267
+echo "$as_me:1224: result: $ac_cv_target" >&5
1268
echo "${ECHO_T}$ac_cv_target" >&6
1269
target=$ac_cv_target
1270
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
1271
@@ -1251,13 +1252,13 @@ else
1272
fi
1273
1274
test -z "$system_name" && system_name="$cf_cv_system_name"
1275
-test -n "$cf_cv_system_name" && echo "$as_me:1254: result: Configuring for $cf_cv_system_name" >&5
1276
+test -n "$cf_cv_system_name" && echo "$as_me:1255: result: Configuring for $cf_cv_system_name" >&5
1277
echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
1278
1279
if test ".$system_name" != ".$cf_cv_system_name" ; then
1280
- echo "$as_me:1258: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
1281
+ echo "$as_me:1259: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
1282
echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
1283
- { { echo "$as_me:1260: error: \"Please remove config.cache and try again.\"" >&5
1284
+ { { echo "$as_me:1261: error: \"Please remove config.cache and try again.\"" >&5
1285
echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
1286
{ (exit 1); exit 1; }; }
1287
fi
1288
@@ -1265,7 +1266,7 @@ fi
1289
# Check whether --with-system-type or --without-system-type was given.
1290
if test "${with_system_type+set}" = set; then
1291
withval="$with_system_type"
1292
- { echo "$as_me:1268: WARNING: overriding system type to $withval" >&5
1293
+ { echo "$as_me:1269: WARNING: overriding system type to $withval" >&5
1294
echo "$as_me: WARNING: overriding system type to $withval" >&2;}
1295
cf_cv_system_name=$withval
1296
fi;
1297
@@ -1275,7 +1276,7 @@ cf_user_CFLAGS="$CFLAGS"
1298
1299
### Default install-location
1300
1301
-echo "$as_me:1278: checking for prefix" >&5
1302
+echo "$as_me:1279: checking for prefix" >&5
1303
echo $ECHO_N "checking for prefix... $ECHO_C" >&6
1304
if test "x$prefix" = "xNONE" ; then
1305
case "$cf_cv_system_name" in
1306
@@ -1287,11 +1288,11 @@ if test "x$prefix" = "xNONE" ; then
1307
;;
1308
esac
1309
fi
1310
-echo "$as_me:1290: result: $prefix" >&5
1311
+echo "$as_me:1291: result: $prefix" >&5
1312
echo "${ECHO_T}$prefix" >&6
1313
1314
if test "x$prefix" = "xNONE" ; then
1315
-echo "$as_me:1294: checking for default include-directory" >&5
1316
+echo "$as_me:1295: checking for default include-directory" >&5
1317
echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
1318
test -n "$verbose" && echo 1>&6
1319
for cf_symbol in \
1320
@@ -1314,7 +1315,7 @@ do
1321
fi
1322
test -n "$verbose" && echo " tested $cf_dir" 1>&6
1323
done
1324
-echo "$as_me:1317: result: $includedir" >&5
1325
+echo "$as_me:1318: result: $includedir" >&5
1326
echo "${ECHO_T}$includedir" >&6
1327
fi
1328
1329
@@ -1327,7 +1328,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1330
if test -n "$ac_tool_prefix"; then
1331
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1332
set dummy ${ac_tool_prefix}gcc; ac_word=$2
1333
-echo "$as_me:1330: checking for $ac_word" >&5
1334
+echo "$as_me:1331: checking for $ac_word" >&5
1335
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1336
if test "${ac_cv_prog_CC+set}" = set; then
1337
echo $ECHO_N "(cached) $ECHO_C" >&6
1338
@@ -1342,7 +1343,7 @@ for ac_dir in $ac_dummy; do
1339
test -z "$ac_dir" && ac_dir=.
1340
$as_executable_p "$ac_dir/$ac_word" || continue
1341
ac_cv_prog_CC="${ac_tool_prefix}gcc"
1342
-echo "$as_me:1345: found $ac_dir/$ac_word" >&5
1343
+echo "$as_me:1346: found $ac_dir/$ac_word" >&5
1344
break
1345
done
1346
1347
@@ -1350,10 +1351,10 @@ fi
1348
fi
1349
CC=$ac_cv_prog_CC
1350
if test -n "$CC"; then
1351
- echo "$as_me:1353: result: $CC" >&5
1352
+ echo "$as_me:1354: result: $CC" >&5
1353
echo "${ECHO_T}$CC" >&6
1354
else
1355
- echo "$as_me:1356: result: no" >&5
1356
+ echo "$as_me:1357: result: no" >&5
1357
echo "${ECHO_T}no" >&6
1358
fi
1359
1360
@@ -1362,7 +1363,7 @@ if test -z "$ac_cv_prog_CC"; then
1361
ac_ct_CC=$CC
1362
# Extract the first word of "gcc", so it can be a program name with args.
1363
set dummy gcc; ac_word=$2
1364
-echo "$as_me:1365: checking for $ac_word" >&5
1365
+echo "$as_me:1366: checking for $ac_word" >&5
1366
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1367
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1368
echo $ECHO_N "(cached) $ECHO_C" >&6
1369
@@ -1377,7 +1378,7 @@ for ac_dir in $ac_dummy; do
1370
test -z "$ac_dir" && ac_dir=.
1371
$as_executable_p "$ac_dir/$ac_word" || continue
1372
ac_cv_prog_ac_ct_CC="gcc"
1373
-echo "$as_me:1380: found $ac_dir/$ac_word" >&5
1374
+echo "$as_me:1381: found $ac_dir/$ac_word" >&5
1375
break
1376
done
1377
1378
@@ -1385,10 +1386,10 @@ fi
1379
fi
1380
ac_ct_CC=$ac_cv_prog_ac_ct_CC
1381
if test -n "$ac_ct_CC"; then
1382
- echo "$as_me:1388: result: $ac_ct_CC" >&5
1383
+ echo "$as_me:1389: result: $ac_ct_CC" >&5
1384
echo "${ECHO_T}$ac_ct_CC" >&6
1385
else
1386
- echo "$as_me:1391: result: no" >&5
1387
+ echo "$as_me:1392: result: no" >&5
1388
echo "${ECHO_T}no" >&6
1389
fi
1390
1391
@@ -1401,7 +1402,7 @@ if test -z "$CC"; then
1392
if test -n "$ac_tool_prefix"; then
1393
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1394
set dummy ${ac_tool_prefix}cc; ac_word=$2
1395
-echo "$as_me:1404: checking for $ac_word" >&5
1396
+echo "$as_me:1405: checking for $ac_word" >&5
1397
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1398
if test "${ac_cv_prog_CC+set}" = set; then
1399
echo $ECHO_N "(cached) $ECHO_C" >&6
1400
@@ -1416,7 +1417,7 @@ for ac_dir in $ac_dummy; do
1401
test -z "$ac_dir" && ac_dir=.
1402
$as_executable_p "$ac_dir/$ac_word" || continue
1403
ac_cv_prog_CC="${ac_tool_prefix}cc"
1404
-echo "$as_me:1419: found $ac_dir/$ac_word" >&5
1405
+echo "$as_me:1420: found $ac_dir/$ac_word" >&5
1406
break
1407
done
1408
1409
@@ -1424,10 +1425,10 @@ fi
1410
fi
1411
CC=$ac_cv_prog_CC
1412
if test -n "$CC"; then
1413
- echo "$as_me:1427: result: $CC" >&5
1414
+ echo "$as_me:1428: result: $CC" >&5
1415
echo "${ECHO_T}$CC" >&6
1416
else
1417
- echo "$as_me:1430: result: no" >&5
1418
+ echo "$as_me:1431: result: no" >&5
1419
echo "${ECHO_T}no" >&6
1420
fi
1421
1422
@@ -1436,7 +1437,7 @@ if test -z "$ac_cv_prog_CC"; then
1423
ac_ct_CC=$CC
1424
# Extract the first word of "cc", so it can be a program name with args.
1425
set dummy cc; ac_word=$2
1426
-echo "$as_me:1439: checking for $ac_word" >&5
1427
+echo "$as_me:1440: checking for $ac_word" >&5
1428
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1429
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1430
echo $ECHO_N "(cached) $ECHO_C" >&6
1431
@@ -1451,7 +1452,7 @@ for ac_dir in $ac_dummy; do
1432
test -z "$ac_dir" && ac_dir=.
1433
$as_executable_p "$ac_dir/$ac_word" || continue
1434
ac_cv_prog_ac_ct_CC="cc"
1435
-echo "$as_me:1454: found $ac_dir/$ac_word" >&5
1436
+echo "$as_me:1455: found $ac_dir/$ac_word" >&5
1437
break
1438
done
1439
1440
@@ -1459,10 +1460,10 @@ fi
1441
fi
1442
ac_ct_CC=$ac_cv_prog_ac_ct_CC
1443
if test -n "$ac_ct_CC"; then
1444
- echo "$as_me:1462: result: $ac_ct_CC" >&5
1445
+ echo "$as_me:1463: result: $ac_ct_CC" >&5
1446
echo "${ECHO_T}$ac_ct_CC" >&6
1447
else
1448
- echo "$as_me:1465: result: no" >&5
1449
+ echo "$as_me:1466: result: no" >&5
1450
echo "${ECHO_T}no" >&6
1451
fi
1452
1453
@@ -1475,7 +1476,7 @@ fi
1454
if test -z "$CC"; then
1455
# Extract the first word of "cc", so it can be a program name with args.
1456
set dummy cc; ac_word=$2
1457
-echo "$as_me:1478: checking for $ac_word" >&5
1458
+echo "$as_me:1479: checking for $ac_word" >&5
1459
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1460
if test "${ac_cv_prog_CC+set}" = set; then
1461
echo $ECHO_N "(cached) $ECHO_C" >&6
1462
@@ -1495,7 +1496,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/c
1463
continue
1464
fi
1465
ac_cv_prog_CC="cc"
1466
-echo "$as_me:1498: found $ac_dir/$ac_word" >&5
1467
+echo "$as_me:1499: found $ac_dir/$ac_word" >&5
1468
break
1469
done
1470
1471
@@ -1517,10 +1518,10 @@ fi
1472
fi
1473
CC=$ac_cv_prog_CC
1474
if test -n "$CC"; then
1475
- echo "$as_me:1520: result: $CC" >&5
1476
+ echo "$as_me:1521: result: $CC" >&5
1477
echo "${ECHO_T}$CC" >&6
1478
else
1479
- echo "$as_me:1523: result: no" >&5
1480
+ echo "$as_me:1524: result: no" >&5
1481
echo "${ECHO_T}no" >&6
1482
fi
1483
1484
@@ -1531,7 +1532,7 @@ if test -z "$CC"; then
1485
do
1486
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1487
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1488
-echo "$as_me:1534: checking for $ac_word" >&5
1489
+echo "$as_me:1535: checking for $ac_word" >&5
1490
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1491
if test "${ac_cv_prog_CC+set}" = set; then
1492
echo $ECHO_N "(cached) $ECHO_C" >&6
1493
@@ -1546,7 +1547,7 @@ for ac_dir in $ac_dummy; do
1494
test -z "$ac_dir" && ac_dir=.
1495
$as_executable_p "$ac_dir/$ac_word" || continue
1496
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1497
-echo "$as_me:1549: found $ac_dir/$ac_word" >&5
1498
+echo "$as_me:1550: found $ac_dir/$ac_word" >&5
1499
break
1500
done
1501
1502
@@ -1554,10 +1555,10 @@ fi
1503
fi
1504
CC=$ac_cv_prog_CC
1505
if test -n "$CC"; then
1506
- echo "$as_me:1557: result: $CC" >&5
1507
+ echo "$as_me:1558: result: $CC" >&5
1508
echo "${ECHO_T}$CC" >&6
1509
else
1510
- echo "$as_me:1560: result: no" >&5
1511
+ echo "$as_me:1561: result: no" >&5
1512
echo "${ECHO_T}no" >&6
1513
fi
1514
1515
@@ -1570,7 +1571,7 @@ if test -z "$CC"; then
1516
do
1517
# Extract the first word of "$ac_prog", so it can be a program name with args.
1518
set dummy $ac_prog; ac_word=$2
1519
-echo "$as_me:1573: checking for $ac_word" >&5
1520
+echo "$as_me:1574: checking for $ac_word" >&5
1521
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1522
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1523
echo $ECHO_N "(cached) $ECHO_C" >&6
1524
@@ -1585,7 +1586,7 @@ for ac_dir in $ac_dummy; do
1525
test -z "$ac_dir" && ac_dir=.
1526
$as_executable_p "$ac_dir/$ac_word" || continue
1527
ac_cv_prog_ac_ct_CC="$ac_prog"
1528
-echo "$as_me:1588: found $ac_dir/$ac_word" >&5
1529
+echo "$as_me:1589: found $ac_dir/$ac_word" >&5
1530
break
1531
done
1532
1533
@@ -1593,10 +1594,10 @@ fi
1534
fi
1535
ac_ct_CC=$ac_cv_prog_ac_ct_CC
1536
if test -n "$ac_ct_CC"; then
1537
- echo "$as_me:1596: result: $ac_ct_CC" >&5
1538
+ echo "$as_me:1597: result: $ac_ct_CC" >&5
1539
echo "${ECHO_T}$ac_ct_CC" >&6
1540
else
1541
- echo "$as_me:1599: result: no" >&5
1542
+ echo "$as_me:1600: result: no" >&5
1543
echo "${ECHO_T}no" >&6
1544
fi
1545
1546
@@ -1608,32 +1609,32 @@ fi
1547
1548
fi
1549
1550
-test -z "$CC" && { { echo "$as_me:1611: error: no acceptable cc found in \$PATH" >&5
1551
+test -z "$CC" && { { echo "$as_me:1612: error: no acceptable cc found in \$PATH" >&5
1552
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
1553
{ (exit 1); exit 1; }; }
1554
1555
# Provide some information about the compiler.
1556
-echo "$as_me:1616:" \
1557
+echo "$as_me:1617:" \
1558
"checking for C compiler version" >&5
1559
ac_compiler=`set X $ac_compile; echo $2`
1560
-{ (eval echo "$as_me:1619: \"$ac_compiler --version </dev/null >&5\"") >&5
1561
+{ (eval echo "$as_me:1620: \"$ac_compiler --version </dev/null >&5\"") >&5
1562
(eval $ac_compiler --version </dev/null >&5) 2>&5
1563
ac_status=$?
1564
- echo "$as_me:1622: \$? = $ac_status" >&5
1565
+ echo "$as_me:1623: \$? = $ac_status" >&5
1566
(exit $ac_status); }
1567
-{ (eval echo "$as_me:1624: \"$ac_compiler -v </dev/null >&5\"") >&5
1568
+{ (eval echo "$as_me:1625: \"$ac_compiler -v </dev/null >&5\"") >&5
1569
(eval $ac_compiler -v </dev/null >&5) 2>&5
1570
ac_status=$?
1571
- echo "$as_me:1627: \$? = $ac_status" >&5
1572
+ echo "$as_me:1628: \$? = $ac_status" >&5
1573
(exit $ac_status); }
1574
-{ (eval echo "$as_me:1629: \"$ac_compiler -V </dev/null >&5\"") >&5
1575
+{ (eval echo "$as_me:1630: \"$ac_compiler -V </dev/null >&5\"") >&5
1576
(eval $ac_compiler -V </dev/null >&5) 2>&5
1577
ac_status=$?
1578
- echo "$as_me:1632: \$? = $ac_status" >&5
1579
+ echo "$as_me:1633: \$? = $ac_status" >&5
1580
(exit $ac_status); }
1581
1582
cat >conftest.$ac_ext <<_ACEOF
1583
-#line 1636 "configure"
1584
+#line 1637 "configure"
1585
#include "confdefs.h"
1586
1587
int
1588
@@ -1649,13 +1650,13 @@ ac_clean_files="$ac_clean_files a.out a.
1589
# Try to create an executable without -o first, disregard a.out.
1590
# It will help us diagnose broken compilers, and finding out an intuition
1591
# of exeext.
1592
-echo "$as_me:1652: checking for C compiler default output" >&5
1593
+echo "$as_me:1653: checking for C compiler default output" >&5
1594
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
1595
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1596
-if { (eval echo "$as_me:1655: \"$ac_link_default\"") >&5
1597
+if { (eval echo "$as_me:1656: \"$ac_link_default\"") >&5
1598
(eval $ac_link_default) 2>&5
1599
ac_status=$?
1600
- echo "$as_me:1658: \$? = $ac_status" >&5
1601
+ echo "$as_me:1659: \$? = $ac_status" >&5
1602
(exit $ac_status); }; then
1603
# Find the output, starting from the most likely. This scheme is
1604
# not robust to junk in `.', hence go to wildcards (a.*) only as a last
1605
@@ -1678,34 +1679,34 @@ done
1606
else
1607
echo "$as_me: failed program was:" >&5
1608
cat conftest.$ac_ext >&5
1609
-{ { echo "$as_me:1681: error: C compiler cannot create executables" >&5
1610
+{ { echo "$as_me:1682: error: C compiler cannot create executables" >&5
1611
echo "$as_me: error: C compiler cannot create executables" >&2;}
1612
{ (exit 77); exit 77; }; }
1613
fi
1614
1615
ac_exeext=$ac_cv_exeext
1616
-echo "$as_me:1687: result: $ac_file" >&5
1617
+echo "$as_me:1688: result: $ac_file" >&5
1618
echo "${ECHO_T}$ac_file" >&6
1619
1620
# Check the compiler produces executables we can run. If not, either
1621
# the compiler is broken, or we cross compile.
1622
-echo "$as_me:1692: checking whether the C compiler works" >&5
1623
+echo "$as_me:1693: checking whether the C compiler works" >&5
1624
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
1625
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1626
# If not cross compiling, check that we can run a simple program.
1627
if test "$cross_compiling" != yes; then
1628
if { ac_try='./$ac_file'
1629
- { (eval echo "$as_me:1698: \"$ac_try\"") >&5
1630
+ { (eval echo "$as_me:1699: \"$ac_try\"") >&5
1631
(eval $ac_try) 2>&5
1632
ac_status=$?
1633
- echo "$as_me:1701: \$? = $ac_status" >&5
1634
+ echo "$as_me:1702: \$? = $ac_status" >&5
1635
(exit $ac_status); }; }; then
1636
cross_compiling=no
1637
else
1638
if test "$cross_compiling" = maybe; then
1639
cross_compiling=yes
1640
else
1641
- { { echo "$as_me:1708: error: cannot run C compiled programs.
1642
+ { { echo "$as_me:1709: error: cannot run C compiled programs.
1643
If you meant to cross compile, use \`--host'." >&5
1644
echo "$as_me: error: cannot run C compiled programs.
1645
If you meant to cross compile, use \`--host'." >&2;}
1646
@@ -1713,24 +1714,24 @@ If you meant to cross compile, use \`--h
1647
fi
1648
fi
1649
fi
1650
-echo "$as_me:1716: result: yes" >&5
1651
+echo "$as_me:1717: result: yes" >&5
1652
echo "${ECHO_T}yes" >&6
1653
1654
rm -f a.out a.exe conftest$ac_cv_exeext
1655
ac_clean_files=$ac_clean_files_save
1656
# Check the compiler produces executables we can run. If not, either
1657
# the compiler is broken, or we cross compile.
1658
-echo "$as_me:1723: checking whether we are cross compiling" >&5
1659
+echo "$as_me:1724: checking whether we are cross compiling" >&5
1660
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
1661
-echo "$as_me:1725: result: $cross_compiling" >&5
1662
+echo "$as_me:1726: result: $cross_compiling" >&5
1663
echo "${ECHO_T}$cross_compiling" >&6
1664
1665
-echo "$as_me:1728: checking for executable suffix" >&5
1666
+echo "$as_me:1729: checking for executable suffix" >&5
1667
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
1668
-if { (eval echo "$as_me:1730: \"$ac_link\"") >&5
1669
+if { (eval echo "$as_me:1731: \"$ac_link\"") >&5
1670
(eval $ac_link) 2>&5
1671
ac_status=$?
1672
- echo "$as_me:1733: \$? = $ac_status" >&5
1673
+ echo "$as_me:1734: \$? = $ac_status" >&5
1674
(exit $ac_status); }; then
1675
# If both `conftest.exe' and `conftest' are `present' (well, observable)
1676
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
1677
@@ -1746,25 +1747,25 @@ for ac_file in `(ls conftest.exe; ls con
1678
esac
1679
done
1680
else
1681
- { { echo "$as_me:1749: error: cannot compute EXEEXT: cannot compile and link" >&5
1682
+ { { echo "$as_me:1750: error: cannot compute EXEEXT: cannot compile and link" >&5
1683
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
1684
{ (exit 1); exit 1; }; }
1685
fi
1686
1687
rm -f conftest$ac_cv_exeext
1688
-echo "$as_me:1755: result: $ac_cv_exeext" >&5
1689
+echo "$as_me:1756: result: $ac_cv_exeext" >&5
1690
echo "${ECHO_T}$ac_cv_exeext" >&6
1691
1692
rm -f conftest.$ac_ext
1693
EXEEXT=$ac_cv_exeext
1694
ac_exeext=$EXEEXT
1695
-echo "$as_me:1761: checking for object suffix" >&5
1696
+echo "$as_me:1762: checking for object suffix" >&5
1697
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
1698
if test "${ac_cv_objext+set}" = set; then
1699
echo $ECHO_N "(cached) $ECHO_C" >&6
1700
else
1701
cat >conftest.$ac_ext <<_ACEOF
1702
-#line 1767 "configure"
1703
+#line 1768 "configure"
1704
#include "confdefs.h"
1705
1706
int
1707
@@ -1776,10 +1777,10 @@ main ()
1708
}
1709
_ACEOF
1710
rm -f conftest.o conftest.obj
1711
-if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5
1712
+if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
1713
(eval $ac_compile) 2>&5
1714
ac_status=$?
1715
- echo "$as_me:1782: \$? = $ac_status" >&5
1716
+ echo "$as_me:1783: \$? = $ac_status" >&5
1717
(exit $ac_status); }; then
1718
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
1719
case $ac_file in
1720
@@ -1791,24 +1792,24 @@ done
1721
else
1722
echo "$as_me: failed program was:" >&5
1723
cat conftest.$ac_ext >&5
1724
-{ { echo "$as_me:1794: error: cannot compute OBJEXT: cannot compile" >&5
1725
+{ { echo "$as_me:1795: error: cannot compute OBJEXT: cannot compile" >&5
1726
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
1727
{ (exit 1); exit 1; }; }
1728
fi
1729
1730
rm -f conftest.$ac_cv_objext conftest.$ac_ext
1731
fi
1732
-echo "$as_me:1801: result: $ac_cv_objext" >&5
1733
+echo "$as_me:1802: result: $ac_cv_objext" >&5
1734
echo "${ECHO_T}$ac_cv_objext" >&6
1735
OBJEXT=$ac_cv_objext
1736
ac_objext=$OBJEXT
1737
-echo "$as_me:1805: checking whether we are using the GNU C compiler" >&5
1738
+echo "$as_me:1806: checking whether we are using the GNU C compiler" >&5
1739
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
1740
if test "${ac_cv_c_compiler_gnu+set}" = set; then
1741
echo $ECHO_N "(cached) $ECHO_C" >&6
1742
else
1743
cat >conftest.$ac_ext <<_ACEOF
1744
-#line 1811 "configure"
1745
+#line 1812 "configure"
1746
#include "confdefs.h"
1747
1748
int
1749
@@ -1823,16 +1824,16 @@ main ()
1750
}
1751
_ACEOF
1752
rm -f conftest.$ac_objext
1753
-if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5
1754
+if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5
1755
(eval $ac_compile) 2>&5
1756
ac_status=$?
1757
- echo "$as_me:1829: \$? = $ac_status" >&5
1758
+ echo "$as_me:1830: \$? = $ac_status" >&5
1759
(exit $ac_status); } &&
1760
{ ac_try='test -s conftest.$ac_objext'
1761
- { (eval echo "$as_me:1832: \"$ac_try\"") >&5
1762
+ { (eval echo "$as_me:1833: \"$ac_try\"") >&5
1763
(eval $ac_try) 2>&5
1764
ac_status=$?
1765
- echo "$as_me:1835: \$? = $ac_status" >&5
1766
+ echo "$as_me:1836: \$? = $ac_status" >&5
1767
(exit $ac_status); }; }; then
1768
ac_compiler_gnu=yes
1769
else
1770
@@ -1844,19 +1845,19 @@ rm -f conftest.$ac_objext conftest.$ac_e
1771
ac_cv_c_compiler_gnu=$ac_compiler_gnu
1772
1773
fi
1774
-echo "$as_me:1847: result: $ac_cv_c_compiler_gnu" >&5
1775
+echo "$as_me:1848: result: $ac_cv_c_compiler_gnu" >&5
1776
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
1777
GCC=`test $ac_compiler_gnu = yes && echo yes`
1778
ac_test_CFLAGS=${CFLAGS+set}
1779
ac_save_CFLAGS=$CFLAGS
1780
CFLAGS="-g"
1781
-echo "$as_me:1853: checking whether $CC accepts -g" >&5
1782
+echo "$as_me:1854: checking whether $CC accepts -g" >&5
1783
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
1784
if test "${ac_cv_prog_cc_g+set}" = set; then
1785
echo $ECHO_N "(cached) $ECHO_C" >&6
1786
else
1787
cat >conftest.$ac_ext <<_ACEOF
1788
-#line 1859 "configure"
1789
+#line 1860 "configure"
1790
#include "confdefs.h"
1791
1792
int
1793
@@ -1868,16 +1869,16 @@ main ()
1794
}
1795
_ACEOF
1796
rm -f conftest.$ac_objext
1797
-if { (eval echo "$as_me:1871: \"$ac_compile\"") >&5
1798
+if { (eval echo "$as_me:1872: \"$ac_compile\"") >&5
1799
(eval $ac_compile) 2>&5
1800
ac_status=$?
1801
- echo "$as_me:1874: \$? = $ac_status" >&5
1802
+ echo "$as_me:1875: \$? = $ac_status" >&5
1803
(exit $ac_status); } &&
1804
{ ac_try='test -s conftest.$ac_objext'
1805
- { (eval echo "$as_me:1877: \"$ac_try\"") >&5
1806
+ { (eval echo "$as_me:1878: \"$ac_try\"") >&5
1807
(eval $ac_try) 2>&5
1808
ac_status=$?
1809
- echo "$as_me:1880: \$? = $ac_status" >&5
1810
+ echo "$as_me:1881: \$? = $ac_status" >&5
1811
(exit $ac_status); }; }; then
1812
ac_cv_prog_cc_g=yes
1813
else
1814
@@ -1887,7 +1888,7 @@ ac_cv_prog_cc_g=no
1815
fi
1816
rm -f conftest.$ac_objext conftest.$ac_ext
1817
fi
1818
-echo "$as_me:1890: result: $ac_cv_prog_cc_g" >&5
1819
+echo "$as_me:1891: result: $ac_cv_prog_cc_g" >&5
1820
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
1821
if test "$ac_test_CFLAGS" = set; then
1822
CFLAGS=$ac_save_CFLAGS
1823
@@ -1914,16 +1915,16 @@ cat >conftest.$ac_ext <<_ACEOF
1824
#endif
1825
_ACEOF
1826
rm -f conftest.$ac_objext
1827
-if { (eval echo "$as_me:1917: \"$ac_compile\"") >&5
1828
+if { (eval echo "$as_me:1918: \"$ac_compile\"") >&5
1829
(eval $ac_compile) 2>&5
1830
ac_status=$?
1831
- echo "$as_me:1920: \$? = $ac_status" >&5
1832
+ echo "$as_me:1921: \$? = $ac_status" >&5
1833
(exit $ac_status); } &&
1834
{ ac_try='test -s conftest.$ac_objext'
1835
- { (eval echo "$as_me:1923: \"$ac_try\"") >&5
1836
+ { (eval echo "$as_me:1924: \"$ac_try\"") >&5
1837
(eval $ac_try) 2>&5
1838
ac_status=$?
1839
- echo "$as_me:1926: \$? = $ac_status" >&5
1840
+ echo "$as_me:1927: \$? = $ac_status" >&5
1841
(exit $ac_status); }; }; then
1842
for ac_declaration in \
1843
''\
1844
@@ -1935,7 +1936,7 @@ if { (eval echo "$as_me:1917: \"$ac_comp
1845
'void exit (int);'
1846
do
1847
cat >conftest.$ac_ext <<_ACEOF
1848
-#line 1938 "configure"
1849
+#line 1939 "configure"
1850
#include "confdefs.h"
1851
#include <stdlib.h>
1852
$ac_declaration
1853
@@ -1948,16 +1949,16 @@ exit (42);
1854
}
1855
_ACEOF
1856
rm -f conftest.$ac_objext
1857
-if { (eval echo "$as_me:1951: \"$ac_compile\"") >&5
1858
+if { (eval echo "$as_me:1952: \"$ac_compile\"") >&5
1859
(eval $ac_compile) 2>&5
1860
ac_status=$?
1861
- echo "$as_me:1954: \$? = $ac_status" >&5
1862
+ echo "$as_me:1955: \$? = $ac_status" >&5
1863
(exit $ac_status); } &&
1864
{ ac_try='test -s conftest.$ac_objext'
1865
- { (eval echo "$as_me:1957: \"$ac_try\"") >&5
1866
+ { (eval echo "$as_me:1958: \"$ac_try\"") >&5
1867
(eval $ac_try) 2>&5
1868
ac_status=$?
1869
- echo "$as_me:1960: \$? = $ac_status" >&5
1870
+ echo "$as_me:1961: \$? = $ac_status" >&5
1871
(exit $ac_status); }; }; then
1872
:
1873
else
1874
@@ -1967,7 +1968,7 @@ continue
1875
fi
1876
rm -f conftest.$ac_objext conftest.$ac_ext
1877
cat >conftest.$ac_ext <<_ACEOF
1878
-#line 1970 "configure"
1879
+#line 1971 "configure"
1880
#include "confdefs.h"
1881
$ac_declaration
1882
int
1883
@@ -1979,16 +1980,16 @@ exit (42);
1884
}
1885
_ACEOF
1886
rm -f conftest.$ac_objext
1887
-if { (eval echo "$as_me:1982: \"$ac_compile\"") >&5
1888
+if { (eval echo "$as_me:1983: \"$ac_compile\"") >&5
1889
(eval $ac_compile) 2>&5
1890
ac_status=$?
1891
- echo "$as_me:1985: \$? = $ac_status" >&5
1892
+ echo "$as_me:1986: \$? = $ac_status" >&5
1893
(exit $ac_status); } &&
1894
{ ac_try='test -s conftest.$ac_objext'
1895
- { (eval echo "$as_me:1988: \"$ac_try\"") >&5
1896
+ { (eval echo "$as_me:1989: \"$ac_try\"") >&5
1897
(eval $ac_try) 2>&5
1898
ac_status=$?
1899
- echo "$as_me:1991: \$? = $ac_status" >&5
1900
+ echo "$as_me:1992: \$? = $ac_status" >&5
1901
(exit $ac_status); }; }; then
1902
break
1903
else
1904
@@ -2017,11 +2018,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1905
1906
GCC_VERSION=none
1907
if test "$GCC" = yes ; then
1908
- echo "$as_me:2020: checking version of $CC" >&5
1909
+ echo "$as_me:2021: checking version of $CC" >&5
1910
echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
1911
GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
1912
test -z "$GCC_VERSION" && GCC_VERSION=unknown
1913
- echo "$as_me:2024: result: $GCC_VERSION" >&5
1914
+ echo "$as_me:2025: result: $GCC_VERSION" >&5
1915
echo "${ECHO_T}$GCC_VERSION" >&6
1916
fi
1917
1918
@@ -2030,7 +2031,7 @@ ac_cpp='$CPP $CPPFLAGS'
1919
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1920
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1921
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1922
-echo "$as_me:2033: checking how to run the C preprocessor" >&5
1923
+echo "$as_me:2034: checking how to run the C preprocessor" >&5
1924
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
1925
# On Suns, sometimes $CPP names a directory.
1926
if test -n "$CPP" && test -d "$CPP"; then
1927
@@ -2051,18 +2052,18 @@ do
1928
# On the NeXT, cc -E runs the code through the compiler's parser,
1929
# not just through cpp. "Syntax error" is here to catch this case.
1930
cat >conftest.$ac_ext <<_ACEOF
1931
-#line 2054 "configure"
1932
+#line 2055 "configure"
1933
#include "confdefs.h"
1934
#include <assert.h>
1935
Syntax error
1936
_ACEOF
1937
-if { (eval echo "$as_me:2059: \"$ac_cpp conftest.$ac_ext\"") >&5
1938
+if { (eval echo "$as_me:2060: \"$ac_cpp conftest.$ac_ext\"") >&5
1939
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1940
ac_status=$?
1941
egrep -v '^ *\+' conftest.er1 >conftest.err
1942
rm -f conftest.er1
1943
cat conftest.err >&5
1944
- echo "$as_me:2065: \$? = $ac_status" >&5
1945
+ echo "$as_me:2066: \$? = $ac_status" >&5
1946
(exit $ac_status); } >/dev/null; then
1947
if test -s conftest.err; then
1948
ac_cpp_err=$ac_c_preproc_warn_flag
1949
@@ -2085,17 +2086,17 @@ rm -f conftest.err conftest.$ac_ext
1950
# OK, works on sane cases. Now check whether non-existent headers
1951
# can be detected and how.
1952
cat >conftest.$ac_ext <<_ACEOF
1953
-#line 2088 "configure"
1954
+#line 2089 "configure"
1955
#include "confdefs.h"
1956
#include <ac_nonexistent.h>
1957
_ACEOF
1958
-if { (eval echo "$as_me:2092: \"$ac_cpp conftest.$ac_ext\"") >&5
1959
+if { (eval echo "$as_me:2093: \"$ac_cpp conftest.$ac_ext\"") >&5
1960
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1961
ac_status=$?
1962
egrep -v '^ *\+' conftest.er1 >conftest.err
1963
rm -f conftest.er1
1964
cat conftest.err >&5
1965
- echo "$as_me:2098: \$? = $ac_status" >&5
1966
+ echo "$as_me:2099: \$? = $ac_status" >&5
1967
(exit $ac_status); } >/dev/null; then
1968
if test -s conftest.err; then
1969
ac_cpp_err=$ac_c_preproc_warn_flag
1970
@@ -2132,7 +2133,7 @@ fi
1971
else
1972
ac_cv_prog_CPP=$CPP
1973
fi
1974
-echo "$as_me:2135: result: $CPP" >&5
1975
+echo "$as_me:2136: result: $CPP" >&5
1976
echo "${ECHO_T}$CPP" >&6
1977
ac_preproc_ok=false
1978
for ac_c_preproc_warn_flag in '' yes
1979
@@ -2142,18 +2143,18 @@ do
1980
# On the NeXT, cc -E runs the code through the compiler's parser,
1981
# not just through cpp. "Syntax error" is here to catch this case.
1982
cat >conftest.$ac_ext <<_ACEOF
1983
-#line 2145 "configure"
1984
+#line 2146 "configure"
1985
#include "confdefs.h"
1986
#include <assert.h>
1987
Syntax error
1988
_ACEOF
1989
-if { (eval echo "$as_me:2150: \"$ac_cpp conftest.$ac_ext\"") >&5
1990
+if { (eval echo "$as_me:2151: \"$ac_cpp conftest.$ac_ext\"") >&5
1991
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1992
ac_status=$?
1993
egrep -v '^ *\+' conftest.er1 >conftest.err
1994
rm -f conftest.er1
1995
cat conftest.err >&5
1996
- echo "$as_me:2156: \$? = $ac_status" >&5
1997
+ echo "$as_me:2157: \$? = $ac_status" >&5
1998
(exit $ac_status); } >/dev/null; then
1999
if test -s conftest.err; then
2000
ac_cpp_err=$ac_c_preproc_warn_flag
2001
@@ -2176,17 +2177,17 @@ rm -f conftest.err conftest.$ac_ext
2002
# OK, works on sane cases. Now check whether non-existent headers
2003
# can be detected and how.
2004
cat >conftest.$ac_ext <<_ACEOF
2005
-#line 2179 "configure"
2006
+#line 2180 "configure"
2007
#include "confdefs.h"
2008
#include <ac_nonexistent.h>
2009
_ACEOF
2010
-if { (eval echo "$as_me:2183: \"$ac_cpp conftest.$ac_ext\"") >&5
2011
+if { (eval echo "$as_me:2184: \"$ac_cpp conftest.$ac_ext\"") >&5
2012
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2013
ac_status=$?
2014
egrep -v '^ *\+' conftest.er1 >conftest.err
2015
rm -f conftest.er1
2016
cat conftest.err >&5
2017
- echo "$as_me:2189: \$? = $ac_status" >&5
2018
+ echo "$as_me:2190: \$? = $ac_status" >&5
2019
(exit $ac_status); } >/dev/null; then
2020
if test -s conftest.err; then
2021
ac_cpp_err=$ac_c_preproc_warn_flag
2022
@@ -2214,7 +2215,7 @@ rm -f conftest.err conftest.$ac_ext
2023
if $ac_preproc_ok; then
2024
:
2025
else
2026
- { { echo "$as_me:2217: error: C preprocessor \"$CPP\" fails sanity check" >&5
2027
+ { { echo "$as_me:2218: error: C preprocessor \"$CPP\" fails sanity check" >&5
2028
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
2029
{ (exit 1); exit 1; }; }
2030
fi
2031
@@ -2226,14 +2227,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
2032
ac_compiler_gnu=$ac_cv_c_compiler_gnu
2033
2034
if test $ac_cv_c_compiler_gnu = yes; then
2035
- echo "$as_me:2229: checking whether $CC needs -traditional" >&5
2036
+ echo "$as_me:2230: checking whether $CC needs -traditional" >&5
2037
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
2038
if test "${ac_cv_prog_gcc_traditional+set}" = set; then
2039
echo $ECHO_N "(cached) $ECHO_C" >&6
2040
else
2041
ac_pattern="Autoconf.*'x'"
2042
cat >conftest.$ac_ext <<_ACEOF
2043
-#line 2236 "configure"
2044
+#line 2237 "configure"
2045
#include "confdefs.h"
2046
#include <sgtty.h>
2047
int Autoconf = TIOCGETP;
2048
@@ -2248,7 +2249,7 @@ rm -f conftest*
2049
2050
if test $ac_cv_prog_gcc_traditional = no; then
2051
cat >conftest.$ac_ext <<_ACEOF
2052
-#line 2251 "configure"
2053
+#line 2252 "configure"
2054
#include "confdefs.h"
2055
#include <termio.h>
2056
int Autoconf = TCGETA;
2057
@@ -2261,14 +2262,14 @@ rm -f conftest*
2058
2059
fi
2060
fi
2061
-echo "$as_me:2264: result: $ac_cv_prog_gcc_traditional" >&5
2062
+echo "$as_me:2265: result: $ac_cv_prog_gcc_traditional" >&5
2063
echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
2064
if test $ac_cv_prog_gcc_traditional = yes; then
2065
CC="$CC -traditional"
2066
fi
2067
fi
2068
2069
-echo "$as_me:2271: checking whether $CC understands -c and -o together" >&5
2070
+echo "$as_me:2272: checking whether $CC understands -c and -o together" >&5
2071
echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
2072
if test "${cf_cv_prog_CC_c_o+set}" = set; then
2073
echo $ECHO_N "(cached) $ECHO_C" >&6
2074
@@ -2284,15 +2285,15 @@ CF_EOF
2075
# We do the test twice because some compilers refuse to overwrite an
2076
# existing .o file with -o, though they will create one.
2077
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
2078
-if { (eval echo "$as_me:2287: \"$ac_try\"") >&5
2079
+if { (eval echo "$as_me:2288: \"$ac_try\"") >&5
2080
(eval $ac_try) 2>&5
2081
ac_status=$?
2082
- echo "$as_me:2290: \$? = $ac_status" >&5
2083
+ echo "$as_me:2291: \$? = $ac_status" >&5
2084
(exit $ac_status); } &&
2085
- test -f conftest2.$ac_objext && { (eval echo "$as_me:2292: \"$ac_try\"") >&5
2086
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:2293: \"$ac_try\"") >&5
2087
(eval $ac_try) 2>&5
2088
ac_status=$?
2089
- echo "$as_me:2295: \$? = $ac_status" >&5
2090
+ echo "$as_me:2296: \$? = $ac_status" >&5
2091
(exit $ac_status); };
2092
then
2093
eval cf_cv_prog_CC_c_o=yes
2094
@@ -2303,19 +2304,19 @@ rm -f conftest*
2095
2096
fi
2097
if test $cf_cv_prog_CC_c_o = yes; then
2098
- echo "$as_me:2306: result: yes" >&5
2099
+ echo "$as_me:2307: result: yes" >&5
2100
echo "${ECHO_T}yes" >&6
2101
else
2102
- echo "$as_me:2309: result: no" >&5
2103
+ echo "$as_me:2310: result: no" >&5
2104
echo "${ECHO_T}no" >&6
2105
fi
2106
2107
-echo "$as_me:2313: checking for POSIXized ISC" >&5
2108
+echo "$as_me:2314: checking for POSIXized ISC" >&5
2109
echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
2110
if test -d /etc/conf/kconfig.d &&
2111
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
2112
then
2113
- echo "$as_me:2318: result: yes" >&5
2114
+ echo "$as_me:2319: result: yes" >&5
2115
echo "${ECHO_T}yes" >&6
2116
ISC=yes # If later tests want to check for ISC.
2117
2118
@@ -2329,12 +2330,12 @@ EOF
2119
CC="$CC -Xp"
2120
fi
2121
else
2122
- echo "$as_me:2332: result: no" >&5
2123
+ echo "$as_me:2333: result: no" >&5
2124
echo "${ECHO_T}no" >&6
2125
ISC=
2126
fi
2127
2128
-echo "$as_me:2337: checking for ${CC-cc} option to accept ANSI C" >&5
2129
+echo "$as_me:2338: checking for ${CC-cc} option to accept ANSI C" >&5
2130
echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
2131
if test "${cf_cv_ansi_cc+set}" = set; then
2132
echo $ECHO_N "(cached) $ECHO_C" >&6
2133
@@ -2428,7 +2429,7 @@ if test -n "$cf_new_extra_cppflags" ; th
2134
fi
2135
2136
cat >conftest.$ac_ext <<_ACEOF
2137
-#line 2431 "configure"
2138
+#line 2432 "configure"
2139
#include "confdefs.h"
2140
2141
#ifndef CC_HAS_PROTOS
2142
@@ -2449,16 +2450,16 @@ main ()
2143
}
2144
_ACEOF
2145
rm -f conftest.$ac_objext
2146
-if { (eval echo "$as_me:2452: \"$ac_compile\"") >&5
2147
+if { (eval echo "$as_me:2453: \"$ac_compile\"") >&5
2148
(eval $ac_compile) 2>&5
2149
ac_status=$?
2150
- echo "$as_me:2455: \$? = $ac_status" >&5
2151
+ echo "$as_me:2456: \$? = $ac_status" >&5
2152
(exit $ac_status); } &&
2153
{ ac_try='test -s conftest.$ac_objext'
2154
- { (eval echo "$as_me:2458: \"$ac_try\"") >&5
2155
+ { (eval echo "$as_me:2459: \"$ac_try\"") >&5
2156
(eval $ac_try) 2>&5
2157
ac_status=$?
2158
- echo "$as_me:2461: \$? = $ac_status" >&5
2159
+ echo "$as_me:2462: \$? = $ac_status" >&5
2160
(exit $ac_status); }; }; then
2161
cf_cv_ansi_cc="$cf_arg"; break
2162
else
2163
@@ -2471,7 +2472,7 @@ CFLAGS="$cf_save_CFLAGS"
2164
CPPFLAGS="$cf_save_CPPFLAGS"
2165
2166
fi
2167
-echo "$as_me:2474: result: $cf_cv_ansi_cc" >&5
2168
+echo "$as_me:2475: result: $cf_cv_ansi_cc" >&5
2169
echo "${ECHO_T}$cf_cv_ansi_cc" >&6
2170
2171
if test "$cf_cv_ansi_cc" != "no"; then
2172
@@ -2554,7 +2555,7 @@ fi
2173
fi
2174
2175
if test "$cf_cv_ansi_cc" = "no"; then
2176
- { { echo "$as_me:2557: error: Your compiler does not appear to recognize prototypes.
2177
+ { { echo "$as_me:2558: error: Your compiler does not appear to recognize prototypes.
2178
You have the following choices:
2179
a. adjust your compiler options
2180
b. get an up-to-date compiler
2181
@@ -2594,7 +2595,7 @@ freebsd*) #(vi
2182
*) LDPATH=$PATH:/sbin:/usr/sbin
2183
# Extract the first word of "ldconfig", so it can be a program name with args.
2184
set dummy ldconfig; ac_word=$2
2185
-echo "$as_me:2597: checking for $ac_word" >&5
2186
+echo "$as_me:2598: checking for $ac_word" >&5
2187
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2188
if test "${ac_cv_path_LDCONFIG+set}" = set; then
2189
echo $ECHO_N "(cached) $ECHO_C" >&6
2190
@@ -2611,7 +2612,7 @@ for ac_dir in $ac_dummy; do
2191
test -z "$ac_dir" && ac_dir=.
2192
if $as_executable_p "$ac_dir/$ac_word"; then
2193
ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
2194
- echo "$as_me:2614: found $ac_dir/$ac_word" >&5
2195
+ echo "$as_me:2615: found $ac_dir/$ac_word" >&5
2196
break
2197
fi
2198
done
2199
@@ -2622,10 +2623,10 @@ fi
2200
LDCONFIG=$ac_cv_path_LDCONFIG
2201
2202
if test -n "$LDCONFIG"; then
2203
- echo "$as_me:2625: result: $LDCONFIG" >&5
2204
+ echo "$as_me:2626: result: $LDCONFIG" >&5
2205
echo "${ECHO_T}$LDCONFIG" >&6
2206
else
2207
- echo "$as_me:2628: result: no" >&5
2208
+ echo "$as_me:2629: result: no" >&5
2209
echo "${ECHO_T}no" >&6
2210
fi
2211
2212
@@ -2633,7 +2634,7 @@ fi
2213
esac
2214
fi
2215
2216
-echo "$as_me:2636: checking if you want to ensure bool is consistent with C++" >&5
2217
+echo "$as_me:2637: checking if you want to ensure bool is consistent with C++" >&5
2218
echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
2219
2220
# Check whether --with-cxx or --without-cxx was given.
2221
@@ -2643,7 +2644,7 @@ if test "${with_cxx+set}" = set; then
2222
else
2223
cf_with_cxx=yes
2224
fi;
2225
-echo "$as_me:2646: result: $cf_with_cxx" >&5
2226
+echo "$as_me:2647: result: $cf_with_cxx" >&5
2227
echo "${ECHO_T}$cf_with_cxx" >&6
2228
if test "X$cf_with_cxx" = Xno ; then
2229
CXX=""
2230
@@ -2660,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
2231
do
2232
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2233
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2234
-echo "$as_me:2663: checking for $ac_word" >&5
2235
+echo "$as_me:2664: checking for $ac_word" >&5
2236
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2237
if test "${ac_cv_prog_CXX+set}" = set; then
2238
echo $ECHO_N "(cached) $ECHO_C" >&6
2239
@@ -2675,7 +2676,7 @@ for ac_dir in $ac_dummy; do
2240
test -z "$ac_dir" && ac_dir=.
2241
$as_executable_p "$ac_dir/$ac_word" || continue
2242
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
2243
-echo "$as_me:2678: found $ac_dir/$ac_word" >&5
2244
+echo "$as_me:2679: found $ac_dir/$ac_word" >&5
2245
break
2246
done
2247
2248
@@ -2683,10 +2684,10 @@ fi
2249
fi
2250
CXX=$ac_cv_prog_CXX
2251
if test -n "$CXX"; then
2252
- echo "$as_me:2686: result: $CXX" >&5
2253
+ echo "$as_me:2687: result: $CXX" >&5
2254
echo "${ECHO_T}$CXX" >&6
2255
else
2256
- echo "$as_me:2689: result: no" >&5
2257
+ echo "$as_me:2690: result: no" >&5
2258
echo "${ECHO_T}no" >&6
2259
fi
2260
2261
@@ -2699,7 +2700,7 @@ if test -z "$CXX"; then
2262
do
2263
# Extract the first word of "$ac_prog", so it can be a program name with args.
2264
set dummy $ac_prog; ac_word=$2
2265
-echo "$as_me:2702: checking for $ac_word" >&5
2266
+echo "$as_me:2703: checking for $ac_word" >&5
2267
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2268
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
2269
echo $ECHO_N "(cached) $ECHO_C" >&6
2270
@@ -2714,7 +2715,7 @@ for ac_dir in $ac_dummy; do
2271
test -z "$ac_dir" && ac_dir=.
2272
$as_executable_p "$ac_dir/$ac_word" || continue
2273
ac_cv_prog_ac_ct_CXX="$ac_prog"
2274
-echo "$as_me:2717: found $ac_dir/$ac_word" >&5
2275
+echo "$as_me:2718: found $ac_dir/$ac_word" >&5
2276
break
2277
done
2278
2279
@@ -2722,10 +2723,10 @@ fi
2280
fi
2281
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
2282
if test -n "$ac_ct_CXX"; then
2283
- echo "$as_me:2725: result: $ac_ct_CXX" >&5
2284
+ echo "$as_me:2726: result: $ac_ct_CXX" >&5
2285
echo "${ECHO_T}$ac_ct_CXX" >&6
2286
else
2287
- echo "$as_me:2728: result: no" >&5
2288
+ echo "$as_me:2729: result: no" >&5
2289
echo "${ECHO_T}no" >&6
2290
fi
2291
2292
@@ -2737,32 +2738,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
2293
fi
2294
2295
# Provide some information about the compiler.
2296
-echo "$as_me:2740:" \
2297
+echo "$as_me:2741:" \
2298
"checking for C++ compiler version" >&5
2299
ac_compiler=`set X $ac_compile; echo $2`
2300
-{ (eval echo "$as_me:2743: \"$ac_compiler --version </dev/null >&5\"") >&5
2301
+{ (eval echo "$as_me:2744: \"$ac_compiler --version </dev/null >&5\"") >&5
2302
(eval $ac_compiler --version </dev/null >&5) 2>&5
2303
ac_status=$?
2304
- echo "$as_me:2746: \$? = $ac_status" >&5
2305
+ echo "$as_me:2747: \$? = $ac_status" >&5
2306
(exit $ac_status); }
2307
-{ (eval echo "$as_me:2748: \"$ac_compiler -v </dev/null >&5\"") >&5
2308
+{ (eval echo "$as_me:2749: \"$ac_compiler -v </dev/null >&5\"") >&5
2309
(eval $ac_compiler -v </dev/null >&5) 2>&5
2310
ac_status=$?
2311
- echo "$as_me:2751: \$? = $ac_status" >&5
2312
+ echo "$as_me:2752: \$? = $ac_status" >&5
2313
(exit $ac_status); }
2314
-{ (eval echo "$as_me:2753: \"$ac_compiler -V </dev/null >&5\"") >&5
2315
+{ (eval echo "$as_me:2754: \"$ac_compiler -V </dev/null >&5\"") >&5
2316
(eval $ac_compiler -V </dev/null >&5) 2>&5
2317
ac_status=$?
2318
- echo "$as_me:2756: \$? = $ac_status" >&5
2319
+ echo "$as_me:2757: \$? = $ac_status" >&5
2320
(exit $ac_status); }
2321
2322
-echo "$as_me:2759: checking whether we are using the GNU C++ compiler" >&5
2323
+echo "$as_me:2760: checking whether we are using the GNU C++ compiler" >&5
2324
echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
2325
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
2326
echo $ECHO_N "(cached) $ECHO_C" >&6
2327
else
2328
cat >conftest.$ac_ext <<_ACEOF
2329
-#line 2765 "configure"
2330
+#line 2766 "configure"
2331
#include "confdefs.h"
2332
2333
int
2334
@@ -2777,16 +2778,16 @@ main ()
2335
}
2336
_ACEOF
2337
rm -f conftest.$ac_objext
2338
-if { (eval echo "$as_me:2780: \"$ac_compile\"") >&5
2339
+if { (eval echo "$as_me:2781: \"$ac_compile\"") >&5
2340
(eval $ac_compile) 2>&5
2341
ac_status=$?
2342
- echo "$as_me:2783: \$? = $ac_status" >&5
2343
+ echo "$as_me:2784: \$? = $ac_status" >&5
2344
(exit $ac_status); } &&
2345
{ ac_try='test -s conftest.$ac_objext'
2346
- { (eval echo "$as_me:2786: \"$ac_try\"") >&5
2347
+ { (eval echo "$as_me:2787: \"$ac_try\"") >&5
2348
(eval $ac_try) 2>&5
2349
ac_status=$?
2350
- echo "$as_me:2789: \$? = $ac_status" >&5
2351
+ echo "$as_me:2790: \$? = $ac_status" >&5
2352
(exit $ac_status); }; }; then
2353
ac_compiler_gnu=yes
2354
else
2355
@@ -2798,19 +2799,19 @@ rm -f conftest.$ac_objext conftest.$ac_e
2356
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
2357
2358
fi
2359
-echo "$as_me:2801: result: $ac_cv_cxx_compiler_gnu" >&5
2360
+echo "$as_me:2802: result: $ac_cv_cxx_compiler_gnu" >&5
2361
echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
2362
GXX=`test $ac_compiler_gnu = yes && echo yes`
2363
ac_test_CXXFLAGS=${CXXFLAGS+set}
2364
ac_save_CXXFLAGS=$CXXFLAGS
2365
CXXFLAGS="-g"
2366
-echo "$as_me:2807: checking whether $CXX accepts -g" >&5
2367
+echo "$as_me:2808: checking whether $CXX accepts -g" >&5
2368
echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
2369
if test "${ac_cv_prog_cxx_g+set}" = set; then
2370
echo $ECHO_N "(cached) $ECHO_C" >&6
2371
else
2372
cat >conftest.$ac_ext <<_ACEOF
2373
-#line 2813 "configure"
2374
+#line 2814 "configure"
2375
#include "confdefs.h"
2376
2377
int
2378
@@ -2822,16 +2823,16 @@ main ()
2379
}
2380
_ACEOF
2381
rm -f conftest.$ac_objext
2382
-if { (eval echo "$as_me:2825: \"$ac_compile\"") >&5
2383
+if { (eval echo "$as_me:2826: \"$ac_compile\"") >&5
2384
(eval $ac_compile) 2>&5
2385
ac_status=$?
2386
- echo "$as_me:2828: \$? = $ac_status" >&5
2387
+ echo "$as_me:2829: \$? = $ac_status" >&5
2388
(exit $ac_status); } &&
2389
{ ac_try='test -s conftest.$ac_objext'
2390
- { (eval echo "$as_me:2831: \"$ac_try\"") >&5
2391
+ { (eval echo "$as_me:2832: \"$ac_try\"") >&5
2392
(eval $ac_try) 2>&5
2393
ac_status=$?
2394
- echo "$as_me:2834: \$? = $ac_status" >&5
2395
+ echo "$as_me:2835: \$? = $ac_status" >&5
2396
(exit $ac_status); }; }; then
2397
ac_cv_prog_cxx_g=yes
2398
else
2399
@@ -2841,7 +2842,7 @@ ac_cv_prog_cxx_g=no
2400
fi
2401
rm -f conftest.$ac_objext conftest.$ac_ext
2402
fi
2403
-echo "$as_me:2844: result: $ac_cv_prog_cxx_g" >&5
2404
+echo "$as_me:2845: result: $ac_cv_prog_cxx_g" >&5
2405
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
2406
if test "$ac_test_CXXFLAGS" = set; then
2407
CXXFLAGS=$ac_save_CXXFLAGS
2408
@@ -2868,7 +2869,7 @@ for ac_declaration in \
2409
'void exit (int);'
2410
do
2411
cat >conftest.$ac_ext <<_ACEOF
2412
-#line 2871 "configure"
2413
+#line 2872 "configure"
2414
#include "confdefs.h"
2415
#include <stdlib.h>
2416
$ac_declaration
2417
@@ -2881,16 +2882,16 @@ exit (42);
2418
}
2419
_ACEOF
2420
rm -f conftest.$ac_objext
2421
-if { (eval echo "$as_me:2884: \"$ac_compile\"") >&5
2422
+if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
2423
(eval $ac_compile) 2>&5
2424
ac_status=$?
2425
- echo "$as_me:2887: \$? = $ac_status" >&5
2426
+ echo "$as_me:2888: \$? = $ac_status" >&5
2427
(exit $ac_status); } &&
2428
{ ac_try='test -s conftest.$ac_objext'
2429
- { (eval echo "$as_me:2890: \"$ac_try\"") >&5
2430
+ { (eval echo "$as_me:2891: \"$ac_try\"") >&5
2431
(eval $ac_try) 2>&5
2432
ac_status=$?
2433
- echo "$as_me:2893: \$? = $ac_status" >&5
2434
+ echo "$as_me:2894: \$? = $ac_status" >&5
2435
(exit $ac_status); }; }; then
2436
:
2437
else
2438
@@ -2900,7 +2901,7 @@ continue
2439
fi
2440
rm -f conftest.$ac_objext conftest.$ac_ext
2441
cat >conftest.$ac_ext <<_ACEOF
2442
-#line 2903 "configure"
2443
+#line 2904 "configure"
2444
#include "confdefs.h"
2445
$ac_declaration
2446
int
2447
@@ -2912,16 +2913,16 @@ exit (42);
2448
}
2449
_ACEOF
2450
rm -f conftest.$ac_objext
2451
-if { (eval echo "$as_me:2915: \"$ac_compile\"") >&5
2452
+if { (eval echo "$as_me:2916: \"$ac_compile\"") >&5
2453
(eval $ac_compile) 2>&5
2454
ac_status=$?
2455
- echo "$as_me:2918: \$? = $ac_status" >&5
2456
+ echo "$as_me:2919: \$? = $ac_status" >&5
2457
(exit $ac_status); } &&
2458
{ ac_try='test -s conftest.$ac_objext'
2459
- { (eval echo "$as_me:2921: \"$ac_try\"") >&5
2460
+ { (eval echo "$as_me:2922: \"$ac_try\"") >&5
2461
(eval $ac_try) 2>&5
2462
ac_status=$?
2463
- echo "$as_me:2924: \$? = $ac_status" >&5
2464
+ echo "$as_me:2925: \$? = $ac_status" >&5
2465
(exit $ac_status); }; }; then
2466
break
2467
else
2468
@@ -2947,7 +2948,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
2469
if test "$CXX" = "g++" ; then
2470
# Extract the first word of "g++", so it can be a program name with args.
2471
set dummy g++; ac_word=$2
2472
-echo "$as_me:2950: checking for $ac_word" >&5
2473
+echo "$as_me:2951: checking for $ac_word" >&5
2474
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2475
if test "${ac_cv_path_CXX+set}" = set; then
2476
echo $ECHO_N "(cached) $ECHO_C" >&6
2477
@@ -2964,7 +2965,7 @@ for ac_dir in $ac_dummy; do
2478
test -z "$ac_dir" && ac_dir=.
2479
if $as_executable_p "$ac_dir/$ac_word"; then
2480
ac_cv_path_CXX="$ac_dir/$ac_word"
2481
- echo "$as_me:2967: found $ac_dir/$ac_word" >&5
2482
+ echo "$as_me:2968: found $ac_dir/$ac_word" >&5
2483
break
2484
fi
2485
done
2486
@@ -2975,16 +2976,16 @@ fi
2487
CXX=$ac_cv_path_CXX
2488
2489
if test -n "$CXX"; then
2490
- echo "$as_me:2978: result: $CXX" >&5
2491
+ echo "$as_me:2979: result: $CXX" >&5
2492
echo "${ECHO_T}$CXX" >&6
2493
else
2494
- echo "$as_me:2981: result: no" >&5
2495
+ echo "$as_me:2982: result: no" >&5
2496
echo "${ECHO_T}no" >&6
2497
fi
2498
2499
fi
2500
if test "$CXX" = "g++" ; then
2501
- { echo "$as_me:2987: WARNING: ignoring hardcoded g++" >&5
2502
+ { echo "$as_me:2988: WARNING: ignoring hardcoded g++" >&5
2503
echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
2504
cf_with_cxx=no; CXX=""; GXX="";
2505
fi
2506
@@ -2992,11 +2993,11 @@ fi
2507
2508
GXX_VERSION=none
2509
if test "$GXX" = yes; then
2510
- echo "$as_me:2995: checking version of g++" >&5
2511
+ echo "$as_me:2996: checking version of g++" >&5
2512
echo $ECHO_N "checking version of g++... $ECHO_C" >&6
2513
GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
2514
test -z "$GXX_VERSION" && GXX_VERSION=unknown
2515
- echo "$as_me:2999: result: $GXX_VERSION" >&5
2516
+ echo "$as_me:3000: result: $GXX_VERSION" >&5
2517
echo "${ECHO_T}$GXX_VERSION" >&6
2518
fi
2519
2520
@@ -3004,12 +3005,12 @@ case $GXX_VERSION in
2521
1*|2.[0-6]*)
2522
GXX=""; CXX=""; ac_cv_cxx_compiler_gnu=no
2523
cf_cxx_library=no
2524
- { echo "$as_me:3007: WARNING: templates do not work" >&5
2525
+ { echo "$as_me:3008: WARNING: templates do not work" >&5
2526
echo "$as_me: WARNING: templates do not work" >&2;}
2527
;;
2528
esac
2529
2530
-echo "$as_me:3012: checking if you want to build C++ binding and demo" >&5
2531
+echo "$as_me:3013: checking if you want to build C++ binding and demo" >&5
2532
echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
2533
2534
# Check whether --with-cxx-binding or --without-cxx-binding was given.
2535
@@ -3019,10 +3020,10 @@ if test "${with_cxx_binding+set}" = set;
2536
else
2537
cf_with_cxx_binding=$cf_with_cxx
2538
fi;
2539
-echo "$as_me:3022: result: $cf_with_cxx_binding" >&5
2540
+echo "$as_me:3023: result: $cf_with_cxx_binding" >&5
2541
echo "${ECHO_T}$cf_with_cxx_binding" >&6
2542
2543
-echo "$as_me:3025: checking if you want to build with Ada95" >&5
2544
+echo "$as_me:3026: checking if you want to build with Ada95" >&5
2545
echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
2546
2547
# Check whether --with-ada or --without-ada was given.
2548
@@ -3032,10 +3033,10 @@ if test "${with_ada+set}" = set; then
2549
else
2550
cf_with_ada=yes
2551
fi;
2552
-echo "$as_me:3035: result: $cf_with_ada" >&5
2553
+echo "$as_me:3036: result: $cf_with_ada" >&5
2554
echo "${ECHO_T}$cf_with_ada" >&6
2555
2556
-echo "$as_me:3038: checking if you want to build programs such as tic" >&5
2557
+echo "$as_me:3039: checking if you want to build programs such as tic" >&5
2558
echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
2559
2560
# Check whether --with-progs or --without-progs was given.
2561
@@ -3045,10 +3046,10 @@ if test "${with_progs+set}" = set; then
2562
else
2563
cf_with_progs=yes
2564
fi;
2565
-echo "$as_me:3048: result: $cf_with_progs" >&5
2566
+echo "$as_me:3049: result: $cf_with_progs" >&5
2567
echo "${ECHO_T}$cf_with_progs" >&6
2568
2569
-echo "$as_me:3051: checking if you wish to install curses.h" >&5
2570
+echo "$as_me:3052: checking if you wish to install curses.h" >&5
2571
echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
2572
2573
# Check whether --with-curses-h or --without-curses-h was given.
2574
@@ -3058,7 +3059,7 @@ if test "${with_curses_h+set}" = set; th
2575
else
2576
with_curses_h=yes
2577
fi;
2578
-echo "$as_me:3061: result: $with_curses_h" >&5
2579
+echo "$as_me:3062: result: $with_curses_h" >&5
2580
echo "${ECHO_T}$with_curses_h" >&6
2581
2582
modules_to_build="ncurses"
2583
@@ -3084,7 +3085,7 @@ for ac_prog in mawk gawk nawk awk
2584
do
2585
# Extract the first word of "$ac_prog", so it can be a program name with args.
2586
set dummy $ac_prog; ac_word=$2
2587
-echo "$as_me:3087: checking for $ac_word" >&5
2588
+echo "$as_me:3088: checking for $ac_word" >&5
2589
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2590
if test "${ac_cv_prog_AWK+set}" = set; then
2591
echo $ECHO_N "(cached) $ECHO_C" >&6
2592
@@ -3099,7 +3100,7 @@ for ac_dir in $ac_dummy; do
2593
test -z "$ac_dir" && ac_dir=.
2594
$as_executable_p "$ac_dir/$ac_word" || continue
2595
ac_cv_prog_AWK="$ac_prog"
2596
-echo "$as_me:3102: found $ac_dir/$ac_word" >&5
2597
+echo "$as_me:3103: found $ac_dir/$ac_word" >&5
2598
break
2599
done
2600
2601
@@ -3107,17 +3108,17 @@ fi
2602
fi
2603
AWK=$ac_cv_prog_AWK
2604
if test -n "$AWK"; then
2605
- echo "$as_me:3110: result: $AWK" >&5
2606
+ echo "$as_me:3111: result: $AWK" >&5
2607
echo "${ECHO_T}$AWK" >&6
2608
else
2609
- echo "$as_me:3113: result: no" >&5
2610
+ echo "$as_me:3114: result: no" >&5
2611
echo "${ECHO_T}no" >&6
2612
fi
2613
2614
test -n "$AWK" && break
2615
done
2616
2617
-echo "$as_me:3120: checking whether ${MAKE-make} sets \${MAKE}" >&5
2618
+echo "$as_me:3121: checking whether ${MAKE-make} sets \${MAKE}" >&5
2619
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
2620
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
2621
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
2622
@@ -3137,11 +3138,11 @@ fi
2623
rm -f conftest.make
2624
fi
2625
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
2626
- echo "$as_me:3140: result: yes" >&5
2627
+ echo "$as_me:3141: result: yes" >&5
2628
echo "${ECHO_T}yes" >&6
2629
SET_MAKE=
2630
else
2631
- echo "$as_me:3144: result: no" >&5
2632
+ echo "$as_me:3145: result: no" >&5
2633
echo "${ECHO_T}no" >&6
2634
SET_MAKE="MAKE=${MAKE-make}"
2635
fi
2636
@@ -3158,7 +3159,7 @@ fi
2637
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
2638
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2639
# ./install, which can be erroneously created by make from ./install.sh.
2640
-echo "$as_me:3161: checking for a BSD compatible install" >&5
2641
+echo "$as_me:3162: checking for a BSD compatible install" >&5
2642
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
2643
if test -z "$INSTALL"; then
2644
if test "${ac_cv_path_install+set}" = set; then
2645
@@ -3207,7 +3208,7 @@ fi
2646
INSTALL=$ac_install_sh
2647
fi
2648
fi
2649
-echo "$as_me:3210: result: $INSTALL" >&5
2650
+echo "$as_me:3211: result: $INSTALL" >&5
2651
echo "${ECHO_T}$INSTALL" >&6
2652
2653
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2654
@@ -3228,7 +3229,7 @@ case $INSTALL in
2655
;;
2656
esac
2657
2658
-echo "$as_me:3231: checking for long file names" >&5
2659
+echo "$as_me:3232: checking for long file names" >&5
2660
echo $ECHO_N "checking for long file names... $ECHO_C" >&6
2661
if test "${ac_cv_sys_long_file_names+set}" = set; then
2662
echo $ECHO_N "(cached) $ECHO_C" >&6
2663
@@ -3267,7 +3268,7 @@ for ac_dir in . $ac_tmpdirs `eval echo
2664
rm -rf $ac_xdir 2>/dev/null
2665
done
2666
fi
2667
-echo "$as_me:3270: result: $ac_cv_sys_long_file_names" >&5
2668
+echo "$as_me:3271: result: $ac_cv_sys_long_file_names" >&5
2669
echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
2670
if test $ac_cv_sys_long_file_names = yes; then
2671
2672
@@ -3277,7 +3278,7 @@ EOF
2673
2674
fi
2675
2676
-echo "$as_me:3280: checking if filesystem supports mixed-case filenames" >&5
2677
+echo "$as_me:3281: checking if filesystem supports mixed-case filenames" >&5
2678
echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
2679
if test "${cf_cv_mixedcase+set}" = set; then
2680
echo $ECHO_N "(cached) $ECHO_C" >&6
2681
@@ -3304,26 +3305,26 @@ else
2682
fi
2683
2684
fi
2685
-echo "$as_me:3307: result: $cf_cv_mixedcase" >&5
2686
+echo "$as_me:3308: result: $cf_cv_mixedcase" >&5
2687
echo "${ECHO_T}$cf_cv_mixedcase" >&6
2688
test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
2689
#define MIXEDCASE_FILENAMES 1
2690
EOF
2691
2692
-echo "$as_me:3313: checking whether ln -s works" >&5
2693
+echo "$as_me:3314: checking whether ln -s works" >&5
2694
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
2695
LN_S=$as_ln_s
2696
if test "$LN_S" = "ln -s"; then
2697
- echo "$as_me:3317: result: yes" >&5
2698
+ echo "$as_me:3318: result: yes" >&5
2699
echo "${ECHO_T}yes" >&6
2700
else
2701
- echo "$as_me:3320: result: no, using $LN_S" >&5
2702
+ echo "$as_me:3321: result: no, using $LN_S" >&5
2703
echo "${ECHO_T}no, using $LN_S" >&6
2704
fi
2705
2706
# Extract the first word of "ctags", so it can be a program name with args.
2707
set dummy ctags; ac_word=$2
2708
-echo "$as_me:3326: checking for $ac_word" >&5
2709
+echo "$as_me:3327: checking for $ac_word" >&5
2710
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2711
if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
2712
echo $ECHO_N "(cached) $ECHO_C" >&6
2713
@@ -3338,7 +3339,7 @@ for ac_dir in $ac_dummy; do
2714
test -z "$ac_dir" && ac_dir=.
2715
$as_executable_p "$ac_dir/$ac_word" || continue
2716
ac_cv_prog_MAKE_LOWER_TAGS="yes"
2717
-echo "$as_me:3341: found $ac_dir/$ac_word" >&5
2718
+echo "$as_me:3342: found $ac_dir/$ac_word" >&5
2719
break
2720
done
2721
2722
@@ -3347,17 +3348,17 @@ fi
2723
fi
2724
MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
2725
if test -n "$MAKE_LOWER_TAGS"; then
2726
- echo "$as_me:3350: result: $MAKE_LOWER_TAGS" >&5
2727
+ echo "$as_me:3351: result: $MAKE_LOWER_TAGS" >&5
2728
echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
2729
else
2730
- echo "$as_me:3353: result: no" >&5
2731
+ echo "$as_me:3354: result: no" >&5
2732
echo "${ECHO_T}no" >&6
2733
fi
2734
2735
if test "$cf_cv_mixedcase" = yes ; then
2736
# Extract the first word of "etags", so it can be a program name with args.
2737
set dummy etags; ac_word=$2
2738
-echo "$as_me:3360: checking for $ac_word" >&5
2739
+echo "$as_me:3361: checking for $ac_word" >&5
2740
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2741
if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
2742
echo $ECHO_N "(cached) $ECHO_C" >&6
2743
@@ -3372,7 +3373,7 @@ for ac_dir in $ac_dummy; do
2744
test -z "$ac_dir" && ac_dir=.
2745
$as_executable_p "$ac_dir/$ac_word" || continue
2746
ac_cv_prog_MAKE_UPPER_TAGS="yes"
2747
-echo "$as_me:3375: found $ac_dir/$ac_word" >&5
2748
+echo "$as_me:3376: found $ac_dir/$ac_word" >&5
2749
break
2750
done
2751
2752
@@ -3381,10 +3382,10 @@ fi
2753
fi
2754
MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
2755
if test -n "$MAKE_UPPER_TAGS"; then
2756
- echo "$as_me:3384: result: $MAKE_UPPER_TAGS" >&5
2757
+ echo "$as_me:3385: result: $MAKE_UPPER_TAGS" >&5
2758
echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
2759
else
2760
- echo "$as_me:3387: result: no" >&5
2761
+ echo "$as_me:3388: result: no" >&5
2762
echo "${ECHO_T}no" >&6
2763
fi
2764
2765
@@ -3408,7 +3409,7 @@ for ac_prog in tdlint lint alint
2766
do
2767
# Extract the first word of "$ac_prog", so it can be a program name with args.
2768
set dummy $ac_prog; ac_word=$2
2769
-echo "$as_me:3411: checking for $ac_word" >&5
2770
+echo "$as_me:3412: checking for $ac_word" >&5
2771
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2772
if test "${ac_cv_prog_LINT+set}" = set; then
2773
echo $ECHO_N "(cached) $ECHO_C" >&6
2774
@@ -3423,7 +3424,7 @@ for ac_dir in $ac_dummy; do
2775
test -z "$ac_dir" && ac_dir=.
2776
$as_executable_p "$ac_dir/$ac_word" || continue
2777
ac_cv_prog_LINT="$ac_prog"
2778
-echo "$as_me:3426: found $ac_dir/$ac_word" >&5
2779
+echo "$as_me:3427: found $ac_dir/$ac_word" >&5
2780
break
2781
done
2782
2783
@@ -3431,10 +3432,10 @@ fi
2784
fi
2785
LINT=$ac_cv_prog_LINT
2786
if test -n "$LINT"; then
2787
- echo "$as_me:3434: result: $LINT" >&5
2788
+ echo "$as_me:3435: result: $LINT" >&5
2789
echo "${ECHO_T}$LINT" >&6
2790
else
2791
- echo "$as_me:3437: result: no" >&5
2792
+ echo "$as_me:3438: result: no" >&5
2793
echo "${ECHO_T}no" >&6
2794
fi
2795
2796
@@ -3445,7 +3446,7 @@ for ac_prog in man man_db
2797
do
2798
# Extract the first word of "$ac_prog", so it can be a program name with args.
2799
set dummy $ac_prog; ac_word=$2
2800
-echo "$as_me:3448: checking for $ac_word" >&5
2801
+echo "$as_me:3449: checking for $ac_word" >&5
2802
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2803
if test "${ac_cv_prog_MAN+set}" = set; then
2804
echo $ECHO_N "(cached) $ECHO_C" >&6
2805
@@ -3460,7 +3461,7 @@ for ac_dir in $ac_dummy; do
2806
test -z "$ac_dir" && ac_dir=.
2807
$as_executable_p "$ac_dir/$ac_word" || continue
2808
ac_cv_prog_MAN="$ac_prog"
2809
-echo "$as_me:3463: found $ac_dir/$ac_word" >&5
2810
+echo "$as_me:3464: found $ac_dir/$ac_word" >&5
2811
break
2812
done
2813
2814
@@ -3468,10 +3469,10 @@ fi
2815
fi
2816
MAN=$ac_cv_prog_MAN
2817
if test -n "$MAN"; then
2818
- echo "$as_me:3471: result: $MAN" >&5
2819
+ echo "$as_me:3472: result: $MAN" >&5
2820
echo "${ECHO_T}$MAN" >&6
2821
else
2822
- echo "$as_me:3474: result: no" >&5
2823
+ echo "$as_me:3475: result: no" >&5
2824
echo "${ECHO_T}no" >&6
2825
fi
2826
2827
@@ -3481,7 +3482,7 @@ done
2828
if test -n "$ac_tool_prefix"; then
2829
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
2830
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
2831
-echo "$as_me:3484: checking for $ac_word" >&5
2832
+echo "$as_me:3485: checking for $ac_word" >&5
2833
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2834
if test "${ac_cv_prog_RANLIB+set}" = set; then
2835
echo $ECHO_N "(cached) $ECHO_C" >&6
2836
@@ -3496,7 +3497,7 @@ for ac_dir in $ac_dummy; do
2837
test -z "$ac_dir" && ac_dir=.
2838
$as_executable_p "$ac_dir/$ac_word" || continue
2839
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
2840
-echo "$as_me:3499: found $ac_dir/$ac_word" >&5
2841
+echo "$as_me:3500: found $ac_dir/$ac_word" >&5
2842
break
2843
done
2844
2845
@@ -3504,10 +3505,10 @@ fi
2846
fi
2847
RANLIB=$ac_cv_prog_RANLIB
2848
if test -n "$RANLIB"; then
2849
- echo "$as_me:3507: result: $RANLIB" >&5
2850
+ echo "$as_me:3508: result: $RANLIB" >&5
2851
echo "${ECHO_T}$RANLIB" >&6
2852
else
2853
- echo "$as_me:3510: result: no" >&5
2854
+ echo "$as_me:3511: result: no" >&5
2855
echo "${ECHO_T}no" >&6
2856
fi
2857
2858
@@ -3516,7 +3517,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
2859
ac_ct_RANLIB=$RANLIB
2860
# Extract the first word of "ranlib", so it can be a program name with args.
2861
set dummy ranlib; ac_word=$2
2862
-echo "$as_me:3519: checking for $ac_word" >&5
2863
+echo "$as_me:3520: checking for $ac_word" >&5
2864
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2865
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
2866
echo $ECHO_N "(cached) $ECHO_C" >&6
2867
@@ -3531,7 +3532,7 @@ for ac_dir in $ac_dummy; do
2868
test -z "$ac_dir" && ac_dir=.
2869
$as_executable_p "$ac_dir/$ac_word" || continue
2870
ac_cv_prog_ac_ct_RANLIB="ranlib"
2871
-echo "$as_me:3534: found $ac_dir/$ac_word" >&5
2872
+echo "$as_me:3535: found $ac_dir/$ac_word" >&5
2873
break
2874
done
2875
2876
@@ -3540,10 +3541,10 @@ fi
2877
fi
2878
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
2879
if test -n "$ac_ct_RANLIB"; then
2880
- echo "$as_me:3543: result: $ac_ct_RANLIB" >&5
2881
+ echo "$as_me:3544: result: $ac_ct_RANLIB" >&5
2882
echo "${ECHO_T}$ac_ct_RANLIB" >&6
2883
else
2884
- echo "$as_me:3546: result: no" >&5
2885
+ echo "$as_me:3547: result: no" >&5
2886
echo "${ECHO_T}no" >&6
2887
fi
2888
2889
@@ -3555,7 +3556,7 @@ fi
2890
if test -n "$ac_tool_prefix"; then
2891
# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
2892
set dummy ${ac_tool_prefix}ld; ac_word=$2
2893
-echo "$as_me:3558: checking for $ac_word" >&5
2894
+echo "$as_me:3559: checking for $ac_word" >&5
2895
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2896
if test "${ac_cv_prog_LD+set}" = set; then
2897
echo $ECHO_N "(cached) $ECHO_C" >&6
2898
@@ -3570,7 +3571,7 @@ for ac_dir in $ac_dummy; do
2899
test -z "$ac_dir" && ac_dir=.
2900
$as_executable_p "$ac_dir/$ac_word" || continue
2901
ac_cv_prog_LD="${ac_tool_prefix}ld"
2902
-echo "$as_me:3573: found $ac_dir/$ac_word" >&5
2903
+echo "$as_me:3574: found $ac_dir/$ac_word" >&5
2904
break
2905
done
2906
2907
@@ -3578,10 +3579,10 @@ fi
2908
fi
2909
LD=$ac_cv_prog_LD
2910
if test -n "$LD"; then
2911
- echo "$as_me:3581: result: $LD" >&5
2912
+ echo "$as_me:3582: result: $LD" >&5
2913
echo "${ECHO_T}$LD" >&6
2914
else
2915
- echo "$as_me:3584: result: no" >&5
2916
+ echo "$as_me:3585: result: no" >&5
2917
echo "${ECHO_T}no" >&6
2918
fi
2919
2920
@@ -3590,7 +3591,7 @@ if test -z "$ac_cv_prog_LD"; then
2921
ac_ct_LD=$LD
2922
# Extract the first word of "ld", so it can be a program name with args.
2923
set dummy ld; ac_word=$2
2924
-echo "$as_me:3593: checking for $ac_word" >&5
2925
+echo "$as_me:3594: checking for $ac_word" >&5
2926
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2927
if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
2928
echo $ECHO_N "(cached) $ECHO_C" >&6
2929
@@ -3605,7 +3606,7 @@ for ac_dir in $ac_dummy; do
2930
test -z "$ac_dir" && ac_dir=.
2931
$as_executable_p "$ac_dir/$ac_word" || continue
2932
ac_cv_prog_ac_ct_LD="ld"
2933
-echo "$as_me:3608: found $ac_dir/$ac_word" >&5
2934
+echo "$as_me:3609: found $ac_dir/$ac_word" >&5
2935
break
2936
done
2937
2938
@@ -3614,10 +3615,10 @@ fi
2939
fi
2940
ac_ct_LD=$ac_cv_prog_ac_ct_LD
2941
if test -n "$ac_ct_LD"; then
2942
- echo "$as_me:3617: result: $ac_ct_LD" >&5
2943
+ echo "$as_me:3618: result: $ac_ct_LD" >&5
2944
echo "${ECHO_T}$ac_ct_LD" >&6
2945
else
2946
- echo "$as_me:3620: result: no" >&5
2947
+ echo "$as_me:3621: result: no" >&5
2948
echo "${ECHO_T}no" >&6
2949
fi
2950
2951
@@ -3629,7 +3630,7 @@ fi
2952
if test -n "$ac_tool_prefix"; then
2953
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2954
set dummy ${ac_tool_prefix}ar; ac_word=$2
2955
-echo "$as_me:3632: checking for $ac_word" >&5
2956
+echo "$as_me:3633: checking for $ac_word" >&5
2957
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2958
if test "${ac_cv_prog_AR+set}" = set; then
2959
echo $ECHO_N "(cached) $ECHO_C" >&6
2960
@@ -3644,7 +3645,7 @@ for ac_dir in $ac_dummy; do
2961
test -z "$ac_dir" && ac_dir=.
2962
$as_executable_p "$ac_dir/$ac_word" || continue
2963
ac_cv_prog_AR="${ac_tool_prefix}ar"
2964
-echo "$as_me:3647: found $ac_dir/$ac_word" >&5
2965
+echo "$as_me:3648: found $ac_dir/$ac_word" >&5
2966
break
2967
done
2968
2969
@@ -3652,10 +3653,10 @@ fi
2970
fi
2971
AR=$ac_cv_prog_AR
2972
if test -n "$AR"; then
2973
- echo "$as_me:3655: result: $AR" >&5
2974
+ echo "$as_me:3656: result: $AR" >&5
2975
echo "${ECHO_T}$AR" >&6
2976
else
2977
- echo "$as_me:3658: result: no" >&5
2978
+ echo "$as_me:3659: result: no" >&5
2979
echo "${ECHO_T}no" >&6
2980
fi
2981
2982
@@ -3664,7 +3665,7 @@ if test -z "$ac_cv_prog_AR"; then
2983
ac_ct_AR=$AR
2984
# Extract the first word of "ar", so it can be a program name with args.
2985
set dummy ar; ac_word=$2
2986
-echo "$as_me:3667: checking for $ac_word" >&5
2987
+echo "$as_me:3668: checking for $ac_word" >&5
2988
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2989
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
2990
echo $ECHO_N "(cached) $ECHO_C" >&6
2991
@@ -3679,7 +3680,7 @@ for ac_dir in $ac_dummy; do
2992
test -z "$ac_dir" && ac_dir=.
2993
$as_executable_p "$ac_dir/$ac_word" || continue
2994
ac_cv_prog_ac_ct_AR="ar"
2995
-echo "$as_me:3682: found $ac_dir/$ac_word" >&5
2996
+echo "$as_me:3683: found $ac_dir/$ac_word" >&5
2997
break
2998
done
2999
3000
@@ -3688,10 +3689,10 @@ fi
3001
fi
3002
ac_ct_AR=$ac_cv_prog_ac_ct_AR
3003
if test -n "$ac_ct_AR"; then
3004
- echo "$as_me:3691: result: $ac_ct_AR" >&5
3005
+ echo "$as_me:3692: result: $ac_ct_AR" >&5
3006
echo "${ECHO_T}$ac_ct_AR" >&6
3007
else
3008
- echo "$as_me:3694: result: no" >&5
3009
+ echo "$as_me:3695: result: no" >&5
3010
echo "${ECHO_T}no" >&6
3011
fi
3012
3013
@@ -3704,10 +3705,10 @@ if test "${cf_cv_subst_AR_OPTS+set}" = s
3014
echo $ECHO_N "(cached) $ECHO_C" >&6
3015
else
3016
3017
-echo "$as_me:3707: checking for archiver options (symbol AR_OPTS)" >&5
3018
+echo "$as_me:3708: checking for archiver options (symbol AR_OPTS)" >&5
3019
echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
3020
test -z "$AR_OPTS" && AR_OPTS=rv
3021
-echo "$as_me:3710: result: $AR_OPTS" >&5
3022
+echo "$as_me:3711: result: $AR_OPTS" >&5
3023
echo "${ECHO_T}$AR_OPTS" >&6
3024
3025
cf_cv_subst_AR_OPTS=$AR_OPTS
3026
@@ -3715,7 +3716,7 @@ fi
3027
3028
AR_OPTS=${cf_cv_subst_AR_OPTS}
3029
3030
-echo "$as_me:3718: checking for makeflags variable" >&5
3031
+echo "$as_me:3719: checking for makeflags variable" >&5
3032
echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
3033
if test "${cf_cv_makeflags+set}" = set; then
3034
echo $ECHO_N "(cached) $ECHO_C" >&6
3035
@@ -3748,10 +3749,10 @@ CF_EOF
3036
rm -f cf_makeflags.tmp
3037
3038
fi
3039
-echo "$as_me:3751: result: $cf_cv_makeflags" >&5
3040
+echo "$as_me:3752: result: $cf_cv_makeflags" >&5
3041
echo "${ECHO_T}$cf_cv_makeflags" >&6
3042
3043
-echo "$as_me:3754: checking if you have specified an install-prefix" >&5
3044
+echo "$as_me:3755: checking if you have specified an install-prefix" >&5
3045
echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
3046
3047
# Check whether --with-install-prefix or --without-install-prefix was given.
3048
@@ -3764,7 +3765,7 @@ if test "${with_install_prefix+set}" = s
3049
;;
3050
esac
3051
fi;
3052
-echo "$as_me:3767: result: $DESTDIR" >&5
3053
+echo "$as_me:3768: result: $DESTDIR" >&5
3054
echo "${ECHO_T}$DESTDIR" >&6
3055
3056
###############################################################################
3057
@@ -3792,7 +3793,7 @@ else
3058
do
3059
# Extract the first word of "$ac_prog", so it can be a program name with args.
3060
set dummy $ac_prog; ac_word=$2
3061
-echo "$as_me:3795: checking for $ac_word" >&5
3062
+echo "$as_me:3796: checking for $ac_word" >&5
3063
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3064
if test "${ac_cv_prog_BUILD_CC+set}" = set; then
3065
echo $ECHO_N "(cached) $ECHO_C" >&6
3066
@@ -3807,7 +3808,7 @@ for ac_dir in $ac_dummy; do
3067
test -z "$ac_dir" && ac_dir=.
3068
$as_executable_p "$ac_dir/$ac_word" || continue
3069
ac_cv_prog_BUILD_CC="$ac_prog"
3070
-echo "$as_me:3810: found $ac_dir/$ac_word" >&5
3071
+echo "$as_me:3811: found $ac_dir/$ac_word" >&5
3072
break
3073
done
3074
3075
@@ -3815,10 +3816,10 @@ fi
3076
fi
3077
BUILD_CC=$ac_cv_prog_BUILD_CC
3078
if test -n "$BUILD_CC"; then
3079
- echo "$as_me:3818: result: $BUILD_CC" >&5
3080
+ echo "$as_me:3819: result: $BUILD_CC" >&5
3081
echo "${ECHO_T}$BUILD_CC" >&6
3082
else
3083
- echo "$as_me:3821: result: no" >&5
3084
+ echo "$as_me:3822: result: no" >&5
3085
echo "${ECHO_T}no" >&6
3086
fi
3087
3088
@@ -3826,12 +3827,12 @@ fi
3089
done
3090
3091
fi;
3092
- echo "$as_me:3829: checking for native build C compiler" >&5
3093
+ echo "$as_me:3830: checking for native build C compiler" >&5
3094
echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
3095
- echo "$as_me:3831: result: $BUILD_CC" >&5
3096
+ echo "$as_me:3832: result: $BUILD_CC" >&5
3097
echo "${ECHO_T}$BUILD_CC" >&6
3098
3099
- echo "$as_me:3834: checking for native build C preprocessor" >&5
3100
+ echo "$as_me:3835: checking for native build C preprocessor" >&5
3101
echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
3102
3103
# Check whether --with-build-cpp or --without-build-cpp was given.
3104
@@ -3841,10 +3842,10 @@ if test "${with_build_cpp+set}" = set; t
3105
else
3106
BUILD_CPP='$(BUILD_CC) -E'
3107
fi;
3108
- echo "$as_me:3844: result: $BUILD_CPP" >&5
3109
+ echo "$as_me:3845: result: $BUILD_CPP" >&5
3110
echo "${ECHO_T}$BUILD_CPP" >&6
3111
3112
- echo "$as_me:3847: checking for native build C flags" >&5
3113
+ echo "$as_me:3848: checking for native build C flags" >&5
3114
echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
3115
3116
# Check whether --with-build-cflags or --without-build-cflags was given.
3117
@@ -3852,10 +3853,10 @@ if test "${with_build_cflags+set}" = set
3118
withval="$with_build_cflags"
3119
BUILD_CFLAGS="$withval"
3120
fi;
3121
- echo "$as_me:3855: result: $BUILD_CFLAGS" >&5
3122
+ echo "$as_me:3856: result: $BUILD_CFLAGS" >&5
3123
echo "${ECHO_T}$BUILD_CFLAGS" >&6
3124
3125
- echo "$as_me:3858: checking for native build C preprocessor-flags" >&5
3126
+ echo "$as_me:3859: checking for native build C preprocessor-flags" >&5
3127
echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
3128
3129
# Check whether --with-build-cppflags or --without-build-cppflags was given.
3130
@@ -3863,10 +3864,10 @@ if test "${with_build_cppflags+set}" = s
3131
withval="$with_build_cppflags"
3132
BUILD_CPPFLAGS="$withval"
3133
fi;
3134
- echo "$as_me:3866: result: $BUILD_CPPFLAGS" >&5
3135
+ echo "$as_me:3867: result: $BUILD_CPPFLAGS" >&5
3136
echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
3137
3138
- echo "$as_me:3869: checking for native build linker-flags" >&5
3139
+ echo "$as_me:3870: checking for native build linker-flags" >&5
3140
echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
3141
3142
# Check whether --with-build-ldflags or --without-build-ldflags was given.
3143
@@ -3874,10 +3875,10 @@ if test "${with_build_ldflags+set}" = se
3144
withval="$with_build_ldflags"
3145
BUILD_LDFLAGS="$withval"
3146
fi;
3147
- echo "$as_me:3877: result: $BUILD_LDFLAGS" >&5
3148
+ echo "$as_me:3878: result: $BUILD_LDFLAGS" >&5
3149
echo "${ECHO_T}$BUILD_LDFLAGS" >&6
3150
3151
- echo "$as_me:3880: checking for native build linker-libraries" >&5
3152
+ echo "$as_me:3881: checking for native build linker-libraries" >&5
3153
echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
3154
3155
# Check whether --with-build-libs or --without-build-libs was given.
3156
@@ -3885,7 +3886,7 @@ if test "${with_build_libs+set}" = set;
3157
withval="$with_build_libs"
3158
BUILD_LIBS="$withval"
3159
fi;
3160
- echo "$as_me:3888: result: $BUILD_LIBS" >&5
3161
+ echo "$as_me:3889: result: $BUILD_LIBS" >&5
3162
echo "${ECHO_T}$BUILD_LIBS" >&6
3163
3164
# this assumes we're on Unix.
3165
@@ -3895,7 +3896,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
3166
: ${BUILD_CC:='$(CC)'}
3167
3168
if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then
3169
- { { echo "$as_me:3898: error: Cross-build requires two compilers.
3170
+ { { echo "$as_me:3899: error: Cross-build requires two compilers.
3171
Use --with-build-cc to specify the native compiler." >&5
3172
echo "$as_me: error: Cross-build requires two compilers.
3173
Use --with-build-cc to specify the native compiler." >&2;}
3174
@@ -3936,7 +3937,7 @@ LIB_LINK=
3175
LIB_INSTALL=
3176
LIB_UNINSTALL=
3177
3178
-echo "$as_me:3939: checking if you want to build libraries with libtool" >&5
3179
+echo "$as_me:3940: checking if you want to build libraries with libtool" >&5
3180
echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
3181
3182
# Check whether --with-libtool or --without-libtool was given.
3183
@@ -3946,7 +3947,7 @@ if test "${with_libtool+set}" = set; the
3184
else
3185
with_libtool=no
3186
fi;
3187
-echo "$as_me:3949: result: $with_libtool" >&5
3188
+echo "$as_me:3950: result: $with_libtool" >&5
3189
echo "${ECHO_T}$with_libtool" >&6
3190
if test "$with_libtool" != "no"; then
3191
3192
@@ -3967,11 +3968,11 @@ case ".$with_libtool" in #(vi
3193
;;
3194
esac
3195
;; #(vi
3196
-.NONE/*)
3197
+.no|.NONE/*)
3198
with_libtool=`echo $with_libtool | sed -e s%NONE%$ac_default_prefix%`
3199
;;
3200
*)
3201
- { { echo "$as_me:3974: error: expected a pathname, not \"$with_libtool\"" >&5
3202
+ { { echo "$as_me:3975: error: expected a pathname, not \"$with_libtool\"" >&5
3203
echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
3204
{ (exit 1); exit 1; }; }
3205
;;
3206
@@ -3981,7 +3982,7 @@ esac
3207
else
3208
# Extract the first word of "libtool", so it can be a program name with args.
3209
set dummy libtool; ac_word=$2
3210
-echo "$as_me:3984: checking for $ac_word" >&5
3211
+echo "$as_me:3985: checking for $ac_word" >&5
3212
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3213
if test "${ac_cv_path_LIBTOOL+set}" = set; then
3214
echo $ECHO_N "(cached) $ECHO_C" >&6
3215
@@ -3998,7 +3999,7 @@ for ac_dir in $ac_dummy; do
3216
test -z "$ac_dir" && ac_dir=.
3217
if $as_executable_p "$ac_dir/$ac_word"; then
3218
ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
3219
- echo "$as_me:4001: found $ac_dir/$ac_word" >&5
3220
+ echo "$as_me:4002: found $ac_dir/$ac_word" >&5
3221
break
3222
fi
3223
done
3224
@@ -4009,16 +4010,16 @@ fi
3225
LIBTOOL=$ac_cv_path_LIBTOOL
3226
3227
if test -n "$LIBTOOL"; then
3228
- echo "$as_me:4012: result: $LIBTOOL" >&5
3229
+ echo "$as_me:4013: result: $LIBTOOL" >&5
3230
echo "${ECHO_T}$LIBTOOL" >&6
3231
else
3232
- echo "$as_me:4015: result: no" >&5
3233
+ echo "$as_me:4016: result: no" >&5
3234
echo "${ECHO_T}no" >&6
3235
fi
3236
3237
fi
3238
if test -z "$LIBTOOL" ; then
3239
- { { echo "$as_me:4021: error: Cannot find libtool" >&5
3240
+ { { echo "$as_me:4022: error: Cannot find libtool" >&5
3241
echo "$as_me: error: Cannot find libtool" >&2;}
3242
{ (exit 1); exit 1; }; }
3243
fi
3244
@@ -4033,17 +4034,17 @@ echo "$as_me: error: Cannot find libtool
3245
LIB_PREP=:
3246
3247
# Show the version of libtool
3248
- echo "$as_me:4036: checking version of libtool" >&5
3249
+ echo "$as_me:4037: checking version of libtool" >&5
3250
echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
3251
3252
# Save the version in a cache variable - this is not entirely a good
3253
# thing, but the version string from libtool is very ugly, and for
3254
# bug reports it might be useful to have the original string.
3255
cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
3256
- echo "$as_me:4043: result: $cf_cv_libtool_version" >&5
3257
+ echo "$as_me:4044: result: $cf_cv_libtool_version" >&5
3258
echo "${ECHO_T}$cf_cv_libtool_version" >&6
3259
if test -z "$cf_cv_libtool_version" ; then
3260
- { { echo "$as_me:4046: error: This is not libtool" >&5
3261
+ { { echo "$as_me:4047: error: This is not libtool" >&5
3262
echo "$as_me: error: This is not libtool" >&2;}
3263
{ (exit 1); exit 1; }; }
3264
fi
3265
@@ -4070,7 +4071,7 @@ cf_list_models="$cf_list_models libtool"
3266
3267
else
3268
3269
-echo "$as_me:4073: checking if you want to build shared libraries" >&5
3270
+echo "$as_me:4074: checking if you want to build shared libraries" >&5
3271
echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
3272
3273
# Check whether --with-shared or --without-shared was given.
3274
@@ -4080,11 +4081,11 @@ if test "${with_shared+set}" = set; then
3275
else
3276
with_shared=no
3277
fi;
3278
-echo "$as_me:4083: result: $with_shared" >&5
3279
+echo "$as_me:4084: result: $with_shared" >&5
3280
echo "${ECHO_T}$with_shared" >&6
3281
test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
3282
3283
-echo "$as_me:4087: checking if you want to build static libraries" >&5
3284
+echo "$as_me:4088: checking if you want to build static libraries" >&5
3285
echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
3286
3287
# Check whether --with-normal or --without-normal was given.
3288
@@ -4094,11 +4095,11 @@ if test "${with_normal+set}" = set; then
3289
else
3290
with_normal=yes
3291
fi;
3292
-echo "$as_me:4097: result: $with_normal" >&5
3293
+echo "$as_me:4098: result: $with_normal" >&5
3294
echo "${ECHO_T}$with_normal" >&6
3295
test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
3296
3297
-echo "$as_me:4101: checking if you want to build debug libraries" >&5
3298
+echo "$as_me:4102: checking if you want to build debug libraries" >&5
3299
echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
3300
3301
# Check whether --with-debug or --without-debug was given.
3302
@@ -4108,11 +4109,11 @@ if test "${with_debug+set}" = set; then
3303
else
3304
with_debug=yes
3305
fi;
3306
-echo "$as_me:4111: result: $with_debug" >&5
3307
+echo "$as_me:4112: result: $with_debug" >&5
3308
echo "${ECHO_T}$with_debug" >&6
3309
test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
3310
3311
-echo "$as_me:4115: checking if you want to build profiling libraries" >&5
3312
+echo "$as_me:4116: checking if you want to build profiling libraries" >&5
3313
echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
3314
3315
# Check whether --with-profile or --without-profile was given.
3316
@@ -4122,7 +4123,7 @@ if test "${with_profile+set}" = set; the
3317
else
3318
with_profile=no
3319
fi;
3320
-echo "$as_me:4125: result: $with_profile" >&5
3321
+echo "$as_me:4126: result: $with_profile" >&5
3322
echo "${ECHO_T}$with_profile" >&6
3323
test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
3324
3325
@@ -4130,19 +4131,19 @@ fi
3326
3327
###############################################################################
3328
3329
-echo "$as_me:4133: checking for specified models" >&5
3330
+echo "$as_me:4134: checking for specified models" >&5
3331
echo $ECHO_N "checking for specified models... $ECHO_C" >&6
3332
test -z "$cf_list_models" && cf_list_models=normal
3333
test "$with_libtool" != "no" && cf_list_models=libtool
3334
-echo "$as_me:4137: result: $cf_list_models" >&5
3335
+echo "$as_me:4138: result: $cf_list_models" >&5
3336
echo "${ECHO_T}$cf_list_models" >&6
3337
3338
### Use the first model as the default, and save its suffix for use in building
3339
### up test-applications.
3340
-echo "$as_me:4142: checking for default model" >&5
3341
+echo "$as_me:4143: checking for default model" >&5
3342
echo $ECHO_N "checking for default model... $ECHO_C" >&6
3343
DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
3344
-echo "$as_me:4145: result: $DFT_LWR_MODEL" >&5
3345
+echo "$as_me:4146: result: $DFT_LWR_MODEL" >&5
3346
echo "${ECHO_T}$DFT_LWR_MODEL" >&6
3347
3348
DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
3349
@@ -4167,7 +4168,7 @@ LIB_SUFFIX=
3350
3351
###############################################################################
3352
3353
-echo "$as_me:4170: checking if you want to build a separate terminfo library" >&5
3354
+echo "$as_me:4171: checking if you want to build a separate terminfo library" >&5
3355
echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
3356
3357
# Check whether --with-termlib or --without-termlib was given.
3358
@@ -4177,12 +4178,12 @@ if test "${with_termlib+set}" = set; the
3359
else
3360
with_termlib=no
3361
fi;
3362
-echo "$as_me:4180: result: $with_termlib" >&5
3363
+echo "$as_me:4181: result: $with_termlib" >&5
3364
echo "${ECHO_T}$with_termlib" >&6
3365
3366
### Checks for special libraries, must be done up-front.
3367
3368
-echo "$as_me:4185: checking if you want to link with dbmalloc for testing" >&5
3369
+echo "$as_me:4186: checking if you want to link with dbmalloc for testing" >&5
3370
echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6
3371
3372
# Check whether --with-dbmalloc or --without-dbmalloc was given.
3373
@@ -4192,26 +4193,26 @@ if test "${with_dbmalloc+set}" = set; th
3374
else
3375
with_dbmalloc=no
3376
fi;
3377
-echo "$as_me:4195: result: $with_dbmalloc" >&5
3378
+echo "$as_me:4196: result: $with_dbmalloc" >&5
3379
echo "${ECHO_T}$with_dbmalloc" >&6
3380
if test "$with_dbmalloc" = yes ; then
3381
- echo "$as_me:4198: checking for dbmalloc.h" >&5
3382
+ echo "$as_me:4199: checking for dbmalloc.h" >&5
3383
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
3384
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
3385
echo $ECHO_N "(cached) $ECHO_C" >&6
3386
else
3387
cat >conftest.$ac_ext <<_ACEOF
3388
-#line 4204 "configure"
3389
+#line 4205 "configure"
3390
#include "confdefs.h"
3391
#include <dbmalloc.h>
3392
_ACEOF
3393
-if { (eval echo "$as_me:4208: \"$ac_cpp conftest.$ac_ext\"") >&5
3394
+if { (eval echo "$as_me:4209: \"$ac_cpp conftest.$ac_ext\"") >&5
3395
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3396
ac_status=$?
3397
egrep -v '^ *\+' conftest.er1 >conftest.err
3398
rm -f conftest.er1
3399
cat conftest.err >&5
3400
- echo "$as_me:4214: \$? = $ac_status" >&5
3401
+ echo "$as_me:4215: \$? = $ac_status" >&5
3402
(exit $ac_status); } >/dev/null; then
3403
if test -s conftest.err; then
3404
ac_cpp_err=$ac_c_preproc_warn_flag
3405
@@ -4230,11 +4231,11 @@ else
3406
fi
3407
rm -f conftest.err conftest.$ac_ext
3408
fi
3409
-echo "$as_me:4233: result: $ac_cv_header_dbmalloc_h" >&5
3410
+echo "$as_me:4234: result: $ac_cv_header_dbmalloc_h" >&5
3411
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
3412
if test $ac_cv_header_dbmalloc_h = yes; then
3413
3414
-echo "$as_me:4237: checking for debug_malloc in -ldbmalloc" >&5
3415
+echo "$as_me:4238: checking for debug_malloc in -ldbmalloc" >&5
3416
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
3417
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
3418
echo $ECHO_N "(cached) $ECHO_C" >&6
3419
@@ -4242,7 +4243,7 @@ else
3420
ac_check_lib_save_LIBS=$LIBS
3421
LIBS="-ldbmalloc $LIBS"
3422
cat >conftest.$ac_ext <<_ACEOF
3423
-#line 4245 "configure"
3424
+#line 4246 "configure"
3425
#include "confdefs.h"
3426
3427
/* Override any gcc2 internal prototype to avoid an error. */
3428
@@ -4261,16 +4262,16 @@ debug_malloc ();
3429
}
3430
_ACEOF
3431
rm -f conftest.$ac_objext conftest$ac_exeext
3432
-if { (eval echo "$as_me:4264: \"$ac_link\"") >&5
3433
+if { (eval echo "$as_me:4265: \"$ac_link\"") >&5
3434
(eval $ac_link) 2>&5
3435
ac_status=$?
3436
- echo "$as_me:4267: \$? = $ac_status" >&5
3437
+ echo "$as_me:4268: \$? = $ac_status" >&5
3438
(exit $ac_status); } &&
3439
{ ac_try='test -s conftest$ac_exeext'
3440
- { (eval echo "$as_me:4270: \"$ac_try\"") >&5
3441
+ { (eval echo "$as_me:4271: \"$ac_try\"") >&5
3442
(eval $ac_try) 2>&5
3443
ac_status=$?
3444
- echo "$as_me:4273: \$? = $ac_status" >&5
3445
+ echo "$as_me:4274: \$? = $ac_status" >&5
3446
(exit $ac_status); }; }; then
3447
ac_cv_lib_dbmalloc_debug_malloc=yes
3448
else
3449
@@ -4281,7 +4282,7 @@ fi
3450
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3451
LIBS=$ac_check_lib_save_LIBS
3452
fi
3453
-echo "$as_me:4284: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
3454
+echo "$as_me:4285: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
3455
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
3456
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
3457
cat >>confdefs.h <<EOF
3458
@@ -4296,7 +4297,7 @@ fi
3459
3460
fi
3461
3462
-echo "$as_me:4299: checking if you want to link with dmalloc for testing" >&5
3463
+echo "$as_me:4300: checking if you want to link with dmalloc for testing" >&5
3464
echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6
3465
3466
# Check whether --with-dmalloc or --without-dmalloc was given.
3467
@@ -4306,26 +4307,26 @@ if test "${with_dmalloc+set}" = set; the
3468
else
3469
with_dmalloc=no
3470
fi;
3471
-echo "$as_me:4309: result: $with_dmalloc" >&5
3472
+echo "$as_me:4310: result: $with_dmalloc" >&5
3473
echo "${ECHO_T}$with_dmalloc" >&6
3474
if test "$with_dmalloc" = yes ; then
3475
- echo "$as_me:4312: checking for dmalloc.h" >&5
3476
+ echo "$as_me:4313: checking for dmalloc.h" >&5
3477
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
3478
if test "${ac_cv_header_dmalloc_h+set}" = set; then
3479
echo $ECHO_N "(cached) $ECHO_C" >&6
3480
else
3481
cat >conftest.$ac_ext <<_ACEOF
3482
-#line 4318 "configure"
3483
+#line 4319 "configure"
3484
#include "confdefs.h"
3485
#include <dmalloc.h>
3486
_ACEOF
3487
-if { (eval echo "$as_me:4322: \"$ac_cpp conftest.$ac_ext\"") >&5
3488
+if { (eval echo "$as_me:4323: \"$ac_cpp conftest.$ac_ext\"") >&5
3489
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3490
ac_status=$?
3491
egrep -v '^ *\+' conftest.er1 >conftest.err
3492
rm -f conftest.er1
3493
cat conftest.err >&5
3494
- echo "$as_me:4328: \$? = $ac_status" >&5
3495
+ echo "$as_me:4329: \$? = $ac_status" >&5
3496
(exit $ac_status); } >/dev/null; then
3497
if test -s conftest.err; then
3498
ac_cpp_err=$ac_c_preproc_warn_flag
3499
@@ -4344,11 +4345,11 @@ else
3500
fi
3501
rm -f conftest.err conftest.$ac_ext
3502
fi
3503
-echo "$as_me:4347: result: $ac_cv_header_dmalloc_h" >&5
3504
+echo "$as_me:4348: result: $ac_cv_header_dmalloc_h" >&5
3505
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
3506
if test $ac_cv_header_dmalloc_h = yes; then
3507
3508
-echo "$as_me:4351: checking for dmalloc_debug in -ldmalloc" >&5
3509
+echo "$as_me:4352: checking for dmalloc_debug in -ldmalloc" >&5
3510
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
3511
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
3512
echo $ECHO_N "(cached) $ECHO_C" >&6
3513
@@ -4356,7 +4357,7 @@ else
3514
ac_check_lib_save_LIBS=$LIBS
3515
LIBS="-ldmalloc $LIBS"
3516
cat >conftest.$ac_ext <<_ACEOF
3517
-#line 4359 "configure"
3518
+#line 4360 "configure"
3519
#include "confdefs.h"
3520
3521
/* Override any gcc2 internal prototype to avoid an error. */
3522
@@ -4375,16 +4376,16 @@ dmalloc_debug ();
3523
}
3524
_ACEOF
3525
rm -f conftest.$ac_objext conftest$ac_exeext
3526
-if { (eval echo "$as_me:4378: \"$ac_link\"") >&5
3527
+if { (eval echo "$as_me:4379: \"$ac_link\"") >&5
3528
(eval $ac_link) 2>&5
3529
ac_status=$?
3530
- echo "$as_me:4381: \$? = $ac_status" >&5
3531
+ echo "$as_me:4382: \$? = $ac_status" >&5
3532
(exit $ac_status); } &&
3533
{ ac_try='test -s conftest$ac_exeext'
3534
- { (eval echo "$as_me:4384: \"$ac_try\"") >&5
3535
+ { (eval echo "$as_me:4385: \"$ac_try\"") >&5
3536
(eval $ac_try) 2>&5
3537
ac_status=$?
3538
- echo "$as_me:4387: \$? = $ac_status" >&5
3539
+ echo "$as_me:4388: \$? = $ac_status" >&5
3540
(exit $ac_status); }; }; then
3541
ac_cv_lib_dmalloc_dmalloc_debug=yes
3542
else
3543
@@ -4395,7 +4396,7 @@ fi
3544
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3545
LIBS=$ac_check_lib_save_LIBS
3546
fi
3547
-echo "$as_me:4398: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
3548
+echo "$as_me:4399: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
3549
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
3550
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
3551
cat >>confdefs.h <<EOF
3552
@@ -4412,7 +4413,7 @@ fi
3553
3554
SHLIB_LIST=""
3555
3556
-echo "$as_me:4415: checking if you want to link with the GPM mouse library" >&5
3557
+echo "$as_me:4416: checking if you want to link with the GPM mouse library" >&5
3558
echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
3559
3560
# Check whether --with-gpm or --without-gpm was given.
3561
@@ -4422,10 +4423,10 @@ if test "${with_gpm+set}" = set; then
3562
else
3563
with_gpm=maybe
3564
fi;
3565
-echo "$as_me:4425: result: $with_gpm" >&5
3566
+echo "$as_me:4426: result: $with_gpm" >&5
3567
echo "${ECHO_T}$with_gpm" >&6
3568
if test "$with_gpm" != no ; then
3569
- echo "$as_me:4428: checking for Gpm_Open in -lgpm" >&5
3570
+ echo "$as_me:4429: checking for Gpm_Open in -lgpm" >&5
3571
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
3572
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
3573
echo $ECHO_N "(cached) $ECHO_C" >&6
3574
@@ -4433,7 +4434,7 @@ else
3575
ac_check_lib_save_LIBS=$LIBS
3576
LIBS="-lgpm $LIBS"
3577
cat >conftest.$ac_ext <<_ACEOF
3578
-#line 4436 "configure"
3579
+#line 4437 "configure"
3580
#include "confdefs.h"
3581
3582
/* Override any gcc2 internal prototype to avoid an error. */
3583
@@ -4452,16 +4453,16 @@ Gpm_Open ();
3584
}
3585
_ACEOF
3586
rm -f conftest.$ac_objext conftest$ac_exeext
3587
-if { (eval echo "$as_me:4455: \"$ac_link\"") >&5
3588
+if { (eval echo "$as_me:4456: \"$ac_link\"") >&5
3589
(eval $ac_link) 2>&5
3590
ac_status=$?
3591
- echo "$as_me:4458: \$? = $ac_status" >&5
3592
+ echo "$as_me:4459: \$? = $ac_status" >&5
3593
(exit $ac_status); } &&
3594
{ ac_try='test -s conftest$ac_exeext'
3595
- { (eval echo "$as_me:4461: \"$ac_try\"") >&5
3596
+ { (eval echo "$as_me:4462: \"$ac_try\"") >&5
3597
(eval $ac_try) 2>&5
3598
ac_status=$?
3599
- echo "$as_me:4464: \$? = $ac_status" >&5
3600
+ echo "$as_me:4465: \$? = $ac_status" >&5
3601
(exit $ac_status); }; }; then
3602
ac_cv_lib_gpm_Gpm_Open=yes
3603
else
3604
@@ -4472,27 +4473,27 @@ fi
3605
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3606
LIBS=$ac_check_lib_save_LIBS
3607
fi
3608
-echo "$as_me:4475: result: $ac_cv_lib_gpm_Gpm_Open" >&5
3609
+echo "$as_me:4476: result: $ac_cv_lib_gpm_Gpm_Open" >&5
3610
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
3611
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
3612
3613
- echo "$as_me:4479: checking for gpm.h" >&5
3614
+ echo "$as_me:4480: checking for gpm.h" >&5
3615
echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
3616
if test "${ac_cv_header_gpm_h+set}" = set; then
3617
echo $ECHO_N "(cached) $ECHO_C" >&6
3618
else
3619
cat >conftest.$ac_ext <<_ACEOF
3620
-#line 4485 "configure"
3621
+#line 4486 "configure"
3622
#include "confdefs.h"
3623
#include <gpm.h>
3624
_ACEOF
3625
-if { (eval echo "$as_me:4489: \"$ac_cpp conftest.$ac_ext\"") >&5
3626
+if { (eval echo "$as_me:4490: \"$ac_cpp conftest.$ac_ext\"") >&5
3627
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3628
ac_status=$?
3629
egrep -v '^ *\+' conftest.er1 >conftest.err
3630
rm -f conftest.er1
3631
cat conftest.err >&5
3632
- echo "$as_me:4495: \$? = $ac_status" >&5
3633
+ echo "$as_me:4496: \$? = $ac_status" >&5
3634
(exit $ac_status); } >/dev/null; then
3635
if test -s conftest.err; then
3636
ac_cpp_err=$ac_c_preproc_warn_flag
3637
@@ -4511,7 +4512,7 @@ else
3638
fi
3639
rm -f conftest.err conftest.$ac_ext
3640
fi
3641
-echo "$as_me:4514: result: $ac_cv_header_gpm_h" >&5
3642
+echo "$as_me:4515: result: $ac_cv_header_gpm_h" >&5
3643
echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
3644
if test $ac_cv_header_gpm_h = yes; then
3645
3646
@@ -4524,7 +4525,7 @@ EOF
3647
else
3648
3649
if test "$with_gpm" = yes ; then
3650
- { { echo "$as_me:4527: error: Cannot find GPM header" >&5
3651
+ { { echo "$as_me:4528: error: Cannot find GPM header" >&5
3652
echo "$as_me: error: Cannot find GPM header" >&2;}
3653
{ (exit 1); exit 1; }; }
3654
fi
3655
@@ -4534,7 +4535,7 @@ fi
3656
else
3657
3658
if test "$with_gpm" = yes ; then
3659
- { { echo "$as_me:4537: error: Cannot link with GPM library" >&5
3660
+ { { echo "$as_me:4538: error: Cannot link with GPM library" >&5
3661
echo "$as_me: error: Cannot link with GPM library" >&2;}
3662
{ (exit 1); exit 1; }; }
3663
fi
3664
@@ -4545,15 +4546,28 @@ fi
3665
fi
3666
3667
if test "$with_gpm" = yes ; then
3668
+ echo "$as_me:4549: checking if you want to load GPM dynamically" >&5
3669
+echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
3670
+
3671
+# Check whether --with-dlsym or --without-dlsym was given.
3672
+if test "${with_dlsym+set}" = set; then
3673
+ withval="$with_dlsym"
3674
+ with_dlsym=$withval
3675
+else
3676
+ with_dlsym=yes
3677
+fi;
3678
+ echo "$as_me:4559: result: $with_dlsym" >&5
3679
+echo "${ECHO_T}$with_dlsym" >&6
3680
+ if test "$with_dlsym" = yes ; then
3681
3682
cf_have_dlsym=no
3683
-echo "$as_me:4550: checking for dlsym" >&5
3684
+echo "$as_me:4564: checking for dlsym" >&5
3685
echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
3686
if test "${ac_cv_func_dlsym+set}" = set; then
3687
echo $ECHO_N "(cached) $ECHO_C" >&6
3688
else
3689
cat >conftest.$ac_ext <<_ACEOF
3690
-#line 4556 "configure"
3691
+#line 4570 "configure"
3692
#include "confdefs.h"
3693
/* System header to define __stub macros and hopefully few prototypes,
3694
which can conflict with char dlsym (); below. */
3695
@@ -4584,16 +4598,16 @@ f = dlsym;
3696
}
3697
_ACEOF
3698
rm -f conftest.$ac_objext conftest$ac_exeext
3699
-if { (eval echo "$as_me:4587: \"$ac_link\"") >&5
3700
+if { (eval echo "$as_me:4601: \"$ac_link\"") >&5
3701
(eval $ac_link) 2>&5
3702
ac_status=$?
3703
- echo "$as_me:4590: \$? = $ac_status" >&5
3704
+ echo "$as_me:4604: \$? = $ac_status" >&5
3705
(exit $ac_status); } &&
3706
{ ac_try='test -s conftest$ac_exeext'
3707
- { (eval echo "$as_me:4593: \"$ac_try\"") >&5
3708
+ { (eval echo "$as_me:4607: \"$ac_try\"") >&5
3709
(eval $ac_try) 2>&5
3710
ac_status=$?
3711
- echo "$as_me:4596: \$? = $ac_status" >&5
3712
+ echo "$as_me:4610: \$? = $ac_status" >&5
3713
(exit $ac_status); }; }; then
3714
ac_cv_func_dlsym=yes
3715
else
3716
@@ -4603,14 +4617,14 @@ ac_cv_func_dlsym=no
3717
fi
3718
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3719
fi
3720
-echo "$as_me:4606: result: $ac_cv_func_dlsym" >&5
3721
+echo "$as_me:4620: result: $ac_cv_func_dlsym" >&5
3722
echo "${ECHO_T}$ac_cv_func_dlsym" >&6
3723
if test $ac_cv_func_dlsym = yes; then
3724
cf_have_dlsym=yes
3725
else
3726
3727
cf_have_libdl=no
3728
-echo "$as_me:4613: checking for dlsym in -ldl" >&5
3729
+echo "$as_me:4627: checking for dlsym in -ldl" >&5
3730
echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
3731
if test "${ac_cv_lib_dl_dlsym+set}" = set; then
3732
echo $ECHO_N "(cached) $ECHO_C" >&6
3733
@@ -4618,7 +4632,7 @@ else
3734
ac_check_lib_save_LIBS=$LIBS
3735
LIBS="-ldl $LIBS"
3736
cat >conftest.$ac_ext <<_ACEOF
3737
-#line 4621 "configure"
3738
+#line 4635 "configure"
3739
#include "confdefs.h"
3740
3741
/* Override any gcc2 internal prototype to avoid an error. */
3742
@@ -4637,16 +4651,16 @@ dlsym ();
3743
}
3744
_ACEOF
3745
rm -f conftest.$ac_objext conftest$ac_exeext
3746
-if { (eval echo "$as_me:4640: \"$ac_link\"") >&5
3747
+if { (eval echo "$as_me:4654: \"$ac_link\"") >&5
3748
(eval $ac_link) 2>&5
3749
ac_status=$?
3750
- echo "$as_me:4643: \$? = $ac_status" >&5
3751
+ echo "$as_me:4657: \$? = $ac_status" >&5
3752
(exit $ac_status); } &&
3753
{ ac_try='test -s conftest$ac_exeext'
3754
- { (eval echo "$as_me:4646: \"$ac_try\"") >&5
3755
+ { (eval echo "$as_me:4660: \"$ac_try\"") >&5
3756
(eval $ac_try) 2>&5
3757
ac_status=$?
3758
- echo "$as_me:4649: \$? = $ac_status" >&5
3759
+ echo "$as_me:4663: \$? = $ac_status" >&5
3760
(exit $ac_status); }; }; then
3761
ac_cv_lib_dl_dlsym=yes
3762
else
3763
@@ -4657,7 +4671,7 @@ fi
3764
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3765
LIBS=$ac_check_lib_save_LIBS
3766
fi
3767
-echo "$as_me:4660: result: $ac_cv_lib_dl_dlsym" >&5
3768
+echo "$as_me:4674: result: $ac_cv_lib_dl_dlsym" >&5
3769
echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
3770
if test $ac_cv_lib_dl_dlsym = yes; then
3771
3772
@@ -4670,10 +4684,10 @@ fi
3773
if test "$cf_have_dlsym" = yes ; then
3774
test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
3775
3776
- echo "$as_me:4673: checking whether able to link to dl*() functions" >&5
3777
+ echo "$as_me:4687: checking whether able to link to dl*() functions" >&5
3778
echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
3779
cat >conftest.$ac_ext <<_ACEOF
3780
-#line 4676 "configure"
3781
+#line 4690 "configure"
3782
#include "confdefs.h"
3783
#include <dlfcn.h>
3784
int
3785
@@ -4691,16 +4705,16 @@ main ()
3786
}
3787
_ACEOF
3788
rm -f conftest.$ac_objext conftest$ac_exeext
3789
-if { (eval echo "$as_me:4694: \"$ac_link\"") >&5
3790
+if { (eval echo "$as_me:4708: \"$ac_link\"") >&5
3791
(eval $ac_link) 2>&5
3792
ac_status=$?
3793
- echo "$as_me:4697: \$? = $ac_status" >&5
3794
+ echo "$as_me:4711: \$? = $ac_status" >&5
3795
(exit $ac_status); } &&
3796
{ ac_try='test -s conftest$ac_exeext'
3797
- { (eval echo "$as_me:4700: \"$ac_try\"") >&5
3798
+ { (eval echo "$as_me:4714: \"$ac_try\"") >&5
3799
(eval $ac_try) 2>&5
3800
ac_status=$?
3801
- echo "$as_me:4703: \$? = $ac_status" >&5
3802
+ echo "$as_me:4717: \$? = $ac_status" >&5
3803
(exit $ac_status); }; }; then
3804
3805
cat >>confdefs.h <<\EOF
3806
@@ -4711,20 +4725,20 @@ else
3807
echo "$as_me: failed program was:" >&5
3808
cat conftest.$ac_ext >&5
3809
3810
- { { echo "$as_me:4714: error: Cannot link test program for libdl" >&5
3811
+ { { echo "$as_me:4728: error: Cannot link test program for libdl" >&5
3812
echo "$as_me: error: Cannot link test program for libdl" >&2;}
3813
{ (exit 1); exit 1; }; }
3814
fi
3815
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3816
- echo "$as_me:4719: result: ok" >&5
3817
+ echo "$as_me:4733: result: ok" >&5
3818
echo "${ECHO_T}ok" >&6
3819
else
3820
- { { echo "$as_me:4722: error: Cannot find dlsym function" >&5
3821
+ { { echo "$as_me:4736: error: Cannot find dlsym function" >&5
3822
echo "$as_me: error: Cannot find dlsym function" >&2;}
3823
{ (exit 1); exit 1; }; }
3824
fi
3825
3826
-echo "$as_me:4727: checking for soname of gpm library" >&5
3827
+echo "$as_me:4741: checking for soname of gpm library" >&5
3828
echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
3829
if test "${cf_cv_gpm_soname+set}" = set; then
3830
echo $ECHO_N "(cached) $ECHO_C" >&6
3831
@@ -4742,15 +4756,15 @@ return 0;
3832
CF_EOF
3833
cf_save_LIBS="$LIBS"
3834
LIBS="-lgpm $LIBS"
3835
- if { (eval echo "$as_me:4745: \"$ac_compile\"") >&5
3836
+ if { (eval echo "$as_me:4759: \"$ac_compile\"") >&5
3837
(eval $ac_compile) 2>&5
3838
ac_status=$?
3839
- echo "$as_me:4748: \$? = $ac_status" >&5
3840
+ echo "$as_me:4762: \$? = $ac_status" >&5
3841
(exit $ac_status); } ; then
3842
- if { (eval echo "$as_me:4750: \"$ac_link\"") >&5
3843
+ if { (eval echo "$as_me:4764: \"$ac_link\"") >&5
3844
(eval $ac_link) 2>&5
3845
ac_status=$?
3846
- echo "$as_me:4753: \$? = $ac_status" >&5
3847
+ echo "$as_me:4767: \$? = $ac_status" >&5
3848
(exit $ac_status); } ; then
3849
cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
3850
test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
3851
@@ -4761,19 +4775,22 @@ LIBS="$cf_save_LIBS"
3852
fi
3853
3854
fi
3855
-echo "$as_me:4764: result: $cf_cv_gpm_soname" >&5
3856
+echo "$as_me:4778: result: $cf_cv_gpm_soname" >&5
3857
echo "${ECHO_T}$cf_cv_gpm_soname" >&6
3858
3859
- test "$cf_cv_gpm_soname" != "unknown" && cat >>confdefs.h <<EOF
3860
+ test "$cf_cv_gpm_soname" != "unknown" && cat >>confdefs.h <<EOF
3861
#define LIBGPM_SONAME "$cf_cv_gpm_soname"
3862
EOF
3863
3864
- SHLIB_LIST="-ldl $SHLIB_LIST"
3865
+ SHLIB_LIST="-ldl $SHLIB_LIST"
3866
+ else
3867
+ SHLIB_LIST="-lgpm $SHLIB_LIST"
3868
+ fi
3869
cat >>confdefs.h <<\EOF
3870
#define HAVE_LIBGPM 1
3871
EOF
3872
3873
- echo "$as_me:4776: checking for Gpm_Wgetch in -lgpm" >&5
3874
+ echo "$as_me:4793: checking for Gpm_Wgetch in -lgpm" >&5
3875
echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
3876
if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
3877
echo $ECHO_N "(cached) $ECHO_C" >&6
3878
@@ -4781,7 +4798,7 @@ else
3879
ac_check_lib_save_LIBS=$LIBS
3880
LIBS="-lgpm $LIBS"
3881
cat >conftest.$ac_ext <<_ACEOF
3882
-#line 4784 "configure"
3883
+#line 4801 "configure"
3884
#include "confdefs.h"
3885
3886
/* Override any gcc2 internal prototype to avoid an error. */
3887
@@ -4800,16 +4817,16 @@ Gpm_Wgetch ();
3888
}
3889
_ACEOF
3890
rm -f conftest.$ac_objext conftest$ac_exeext
3891
-if { (eval echo "$as_me:4803: \"$ac_link\"") >&5
3892
+if { (eval echo "$as_me:4820: \"$ac_link\"") >&5
3893
(eval $ac_link) 2>&5
3894
ac_status=$?
3895
- echo "$as_me:4806: \$? = $ac_status" >&5
3896
+ echo "$as_me:4823: \$? = $ac_status" >&5
3897
(exit $ac_status); } &&
3898
{ ac_try='test -s conftest$ac_exeext'
3899
- { (eval echo "$as_me:4809: \"$ac_try\"") >&5
3900
+ { (eval echo "$as_me:4826: \"$ac_try\"") >&5
3901
(eval $ac_try) 2>&5
3902
ac_status=$?
3903
- echo "$as_me:4812: \$? = $ac_status" >&5
3904
+ echo "$as_me:4829: \$? = $ac_status" >&5
3905
(exit $ac_status); }; }; then
3906
ac_cv_lib_gpm_Gpm_Wgetch=yes
3907
else
3908
@@ -4820,11 +4837,11 @@ fi
3909
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3910
LIBS=$ac_check_lib_save_LIBS
3911
fi
3912
-echo "$as_me:4823: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
3913
+echo "$as_me:4840: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
3914
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
3915
if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
3916
3917
- { echo "$as_me:4827: WARNING: GPM library is already linked with curses - read the FAQ" >&5
3918
+ { echo "$as_me:4844: WARNING: GPM library is already linked with curses - read the FAQ" >&5
3919
echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
3920
3921
fi
3922
@@ -4833,7 +4850,7 @@ fi
3923
3924
# not everyone has "test -c"
3925
if test -c /dev/sysmouse 2>/dev/null ; then
3926
-echo "$as_me:4836: checking if you want to use sysmouse" >&5
3927
+echo "$as_me:4853: checking if you want to use sysmouse" >&5
3928
echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
3929
3930
# Check whether --with-sysmouse or --without-sysmouse was given.
3931
@@ -4845,7 +4862,7 @@ else
3932
fi;
3933
if test "$cf_with_sysmouse" != no ; then
3934
cat >conftest.$ac_ext <<_ACEOF
3935
-#line 4848 "configure"
3936
+#line 4865 "configure"
3937
#include "confdefs.h"
3938
3939
#include <osreldate.h>
3940
@@ -4868,16 +4885,16 @@ main ()
3941
}
3942
_ACEOF
3943
rm -f conftest.$ac_objext
3944
-if { (eval echo "$as_me:4871: \"$ac_compile\"") >&5
3945
+if { (eval echo "$as_me:4888: \"$ac_compile\"") >&5
3946
(eval $ac_compile) 2>&5
3947
ac_status=$?
3948
- echo "$as_me:4874: \$? = $ac_status" >&5
3949
+ echo "$as_me:4891: \$? = $ac_status" >&5
3950
(exit $ac_status); } &&
3951
{ ac_try='test -s conftest.$ac_objext'
3952
- { (eval echo "$as_me:4877: \"$ac_try\"") >&5
3953
+ { (eval echo "$as_me:4894: \"$ac_try\"") >&5
3954
(eval $ac_try) 2>&5
3955
ac_status=$?
3956
- echo "$as_me:4880: \$? = $ac_status" >&5
3957
+ echo "$as_me:4897: \$? = $ac_status" >&5
3958
(exit $ac_status); }; }; then
3959
cf_with_sysmouse=yes
3960
else
3961
@@ -4887,7 +4904,7 @@ cf_with_sysmouse=no
3962
fi
3963
rm -f conftest.$ac_objext conftest.$ac_ext
3964
fi
3965
-echo "$as_me:4890: result: $cf_with_sysmouse" >&5
3966
+echo "$as_me:4907: result: $cf_with_sysmouse" >&5
3967
echo "${ECHO_T}$cf_with_sysmouse" >&6
3968
test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
3969
#define USE_SYSMOUSE 1
3970
@@ -4905,7 +4922,7 @@ if test X"$CXX_G_OPT" = X"" ; then
3971
test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
3972
fi
3973
3974
-echo "$as_me:4908: checking for default loader flags" >&5
3975
+echo "$as_me:4925: checking for default loader flags" >&5
3976
echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
3977
case $DFT_LWR_MODEL in
3978
libtool) LD_MODEL='' ;;
3979
@@ -4914,10 +4931,10 @@ debug) LD_MODEL=$CC_G_OPT ;;
3980
profile) LD_MODEL='-pg';;
3981
shared) LD_MODEL='' ;;
3982
esac
3983
-echo "$as_me:4917: result: $LD_MODEL" >&5
3984
+echo "$as_me:4934: result: $LD_MODEL" >&5
3985
echo "${ECHO_T}$LD_MODEL" >&6
3986
3987
-echo "$as_me:4920: checking if rpath option should be used" >&5
3988
+echo "$as_me:4937: checking if rpath option should be used" >&5
3989
echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
3990
3991
# Check whether --enable-rpath or --disable-rpath was given.
3992
@@ -4927,7 +4944,7 @@ if test "${enable_rpath+set}" = set; the
3993
else
3994
cf_cv_ld_rpath=no
3995
fi;
3996
-echo "$as_me:4930: result: $cf_cv_ld_rpath" >&5
3997
+echo "$as_me:4947: result: $cf_cv_ld_rpath" >&5
3998
echo "${ECHO_T}$cf_cv_ld_rpath" >&6
3999
4000
LOCAL_LDFLAGS=
4001
@@ -4937,7 +4954,7 @@ echo "${ECHO_T}$cf_cv_ld_rpath" >&6
4002
4003
cf_cv_do_symlinks=no
4004
4005
- echo "$as_me:4940: checking if release/abi version should be used for shared libs" >&5
4006
+ echo "$as_me:4957: checking if release/abi version should be used for shared libs" >&5
4007
echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
4008
4009
# Check whether --with-shlib-version or --without-shlib-version was given.
4010
@@ -4952,7 +4969,7 @@ if test "${with_shlib_version+set}" = se
4011
cf_cv_shlib_version=$withval
4012
;;
4013
*)
4014
- { { echo "$as_me:4955: error: option value must be one of: rel, abi, auto or no" >&5
4015
+ { { echo "$as_me:4972: error: option value must be one of: rel, abi, auto or no" >&5
4016
echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
4017
{ (exit 1); exit 1; }; }
4018
;;
4019
@@ -4961,7 +4978,7 @@ echo "$as_me: error: option value must b
4020
else
4021
cf_cv_shlib_version=auto
4022
fi;
4023
- echo "$as_me:4964: result: $cf_cv_shlib_version" >&5
4024
+ echo "$as_me:4981: result: $cf_cv_shlib_version" >&5
4025
echo "${ECHO_T}$cf_cv_shlib_version" >&6
4026
4027
cf_cv_rm_so_locs=no
4028
@@ -4970,14 +4987,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
4029
CC_SHARED_OPTS=
4030
if test "$GCC" = yes
4031
then
4032
- echo "$as_me:4973: checking which $CC option to use" >&5
4033
+ echo "$as_me:4990: checking which $CC option to use" >&5
4034
echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
4035
cf_save_CFLAGS="$CFLAGS"
4036
for CC_SHARED_OPTS in -fPIC -fpic ''
4037
do
4038
CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
4039
cat >conftest.$ac_ext <<_ACEOF
4040
-#line 4980 "configure"
4041
+#line 4997 "configure"
4042
#include "confdefs.h"
4043
#include <stdio.h>
4044
int
4045
@@ -4989,16 +5006,16 @@ int x = 1
4046
}
4047
_ACEOF
4048
rm -f conftest.$ac_objext
4049
-if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5
4050
+if { (eval echo "$as_me:5009: \"$ac_compile\"") >&5
4051
(eval $ac_compile) 2>&5
4052
ac_status=$?
4053
- echo "$as_me:4995: \$? = $ac_status" >&5
4054
+ echo "$as_me:5012: \$? = $ac_status" >&5
4055
(exit $ac_status); } &&
4056
{ ac_try='test -s conftest.$ac_objext'
4057
- { (eval echo "$as_me:4998: \"$ac_try\"") >&5
4058
+ { (eval echo "$as_me:5015: \"$ac_try\"") >&5
4059
(eval $ac_try) 2>&5
4060
ac_status=$?
4061
- echo "$as_me:5001: \$? = $ac_status" >&5
4062
+ echo "$as_me:5018: \$? = $ac_status" >&5
4063
(exit $ac_status); }; }; then
4064
break
4065
else
4066
@@ -5007,7 +5024,7 @@ cat conftest.$ac_ext >&5
4067
fi
4068
rm -f conftest.$ac_objext conftest.$ac_ext
4069
done
4070
- echo "$as_me:5010: result: $CC_SHARED_OPTS" >&5
4071
+ echo "$as_me:5027: result: $CC_SHARED_OPTS" >&5
4072
echo "${ECHO_T}$CC_SHARED_OPTS" >&6
4073
CFLAGS="$cf_save_CFLAGS"
4074
fi
4075
@@ -5030,6 +5047,52 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
4076
MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $@` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $@'
4077
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
4078
cf_cv_shlib_version_infix=yes
4079
+ echo "$as_me:5050: checking if ld -search_paths_first works" >&5
4080
+echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
4081
+if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
4082
+ echo $ECHO_N "(cached) $ECHO_C" >&6
4083
+else
4084
+
4085
+ cf_save_LDFLAGS=$LDFLAGS
4086
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
4087
+ cat >conftest.$ac_ext <<_ACEOF
4088
+#line 5059 "configure"
4089
+#include "confdefs.h"
4090
+
4091
+int
4092
+main ()
4093
+{
4094
+int i;
4095
+ ;
4096
+ return 0;
4097
+}
4098
+_ACEOF
4099
+rm -f conftest.$ac_objext conftest$ac_exeext
4100
+if { (eval echo "$as_me:5071: \"$ac_link\"") >&5
4101
+ (eval $ac_link) 2>&5
4102
+ ac_status=$?
4103
+ echo "$as_me:5074: \$? = $ac_status" >&5
4104
+ (exit $ac_status); } &&
4105
+ { ac_try='test -s conftest$ac_exeext'
4106
+ { (eval echo "$as_me:5077: \"$ac_try\"") >&5
4107
+ (eval $ac_try) 2>&5
4108
+ ac_status=$?
4109
+ echo "$as_me:5080: \$? = $ac_status" >&5
4110
+ (exit $ac_status); }; }; then
4111
+ cf_cv_ldflags_search_paths_first=yes
4112
+else
4113
+ echo "$as_me: failed program was:" >&5
4114
+cat conftest.$ac_ext >&5
4115
+cf_cv_ldflags_search_paths_first=no
4116
+fi
4117
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4118
+ LDFLAGS=$cf_save_LDFLAGS
4119
+fi
4120
+echo "$as_me:5091: result: $cf_cv_ldflags_search_paths_first" >&5
4121
+echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
4122
+ if test $cf_cv_ldflags_search_paths_first = yes; then
4123
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
4124
+ fi
4125
;;
4126
hpux*)
4127
# (tested with gcc 2.7.2 -- I don't have c89)
4128
@@ -5196,7 +5259,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
4129
test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
4130
;;
4131
*)
4132
- { echo "$as_me:5199: WARNING: ignored --with-shlib-version" >&5
4133
+ { echo "$as_me:5262: WARNING: ignored --with-shlib-version" >&5
4134
echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
4135
;;
4136
esac
4137
@@ -5204,12 +5267,12 @@ echo "$as_me: WARNING: ignored --with-sh
4138
esac
4139
4140
if test -n "$cf_ld_rpath_opt" ; then
4141
- echo "$as_me:5207: checking if we need a space after rpath option" >&5
4142
+ echo "$as_me:5270: checking if we need a space after rpath option" >&5
4143
echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
4144
cf_save_LIBS="$LIBS"
4145
LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
4146
cat >conftest.$ac_ext <<_ACEOF
4147
-#line 5212 "configure"
4148
+#line 5275 "configure"
4149
#include "confdefs.h"
4150
4151
int
4152
@@ -5221,16 +5284,16 @@ main ()
4153
}
4154
_ACEOF
4155
rm -f conftest.$ac_objext conftest$ac_exeext
4156
-if { (eval echo "$as_me:5224: \"$ac_link\"") >&5
4157
+if { (eval echo "$as_me:5287: \"$ac_link\"") >&5
4158
(eval $ac_link) 2>&5
4159
ac_status=$?
4160
- echo "$as_me:5227: \$? = $ac_status" >&5
4161
+ echo "$as_me:5290: \$? = $ac_status" >&5
4162
(exit $ac_status); } &&
4163
{ ac_try='test -s conftest$ac_exeext'
4164
- { (eval echo "$as_me:5230: \"$ac_try\"") >&5
4165
+ { (eval echo "$as_me:5293: \"$ac_try\"") >&5
4166
(eval $ac_try) 2>&5
4167
ac_status=$?
4168
- echo "$as_me:5233: \$? = $ac_status" >&5
4169
+ echo "$as_me:5296: \$? = $ac_status" >&5
4170
(exit $ac_status); }; }; then
4171
cf_rpath_space=no
4172
else
4173
@@ -5240,7 +5303,7 @@ cf_rpath_space=yes
4174
fi
4175
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4176
LIBS="$cf_save_LIBS"
4177
- echo "$as_me:5243: result: $cf_rpath_space" >&5
4178
+ echo "$as_me:5306: result: $cf_rpath_space" >&5
4179
echo "${ECHO_T}$cf_rpath_space" >&6
4180
test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
4181
MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\$(libdir)"
4182
@@ -5249,7 +5312,7 @@ echo "${ECHO_T}$cf_rpath_space" >&6
4183
if test "$CC_SHARED_OPTS" = "unknown"; then
4184
for model in $cf_list_models; do
4185
if test "$model" = "shared"; then
4186
- { { echo "$as_me:5252: error: Shared libraries are not supported in this version" >&5
4187
+ { { echo "$as_me:5315: error: Shared libraries are not supported in this version" >&5
4188
echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
4189
{ (exit 1); exit 1; }; }
4190
fi
4191
@@ -5259,7 +5322,7 @@ fi
4192
###############################################################################
4193
4194
### use option --disable-overwrite to leave out the link to -lcurses
4195
-echo "$as_me:5262: checking if you wish to install ncurses overwriting curses" >&5
4196
+echo "$as_me:5325: checking if you wish to install ncurses overwriting curses" >&5
4197
echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
4198
4199
# Check whether --enable-overwrite or --disable-overwrite was given.
4200
@@ -5269,10 +5332,10 @@ if test "${enable_overwrite+set}" = set;
4201
else
4202
if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
4203
fi;
4204
-echo "$as_me:5272: result: $with_overwrite" >&5
4205
+echo "$as_me:5335: result: $with_overwrite" >&5
4206
echo "${ECHO_T}$with_overwrite" >&6
4207
4208
-echo "$as_me:5275: checking if external terminfo-database is used" >&5
4209
+echo "$as_me:5338: checking if external terminfo-database is used" >&5
4210
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
4211
4212
# Check whether --enable-database or --disable-database was given.
4213
@@ -5282,7 +5345,7 @@ if test "${enable_database+set}" = set;
4214
else
4215
use_database=yes
4216
fi;
4217
-echo "$as_me:5285: result: $use_database" >&5
4218
+echo "$as_me:5348: result: $use_database" >&5
4219
echo "${ECHO_T}$use_database" >&6
4220
4221
case $host_os in #(vi
4222
@@ -5304,7 +5367,7 @@ if test "$use_database" != no ; then
4223
#define USE_DATABASE 1
4224
EOF
4225
4226
- echo "$as_me:5307: checking which terminfo source-file will be installed" >&5
4227
+ echo "$as_me:5370: checking which terminfo source-file will be installed" >&5
4228
echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
4229
4230
# Check whether --enable-database or --disable-database was given.
4231
@@ -5312,11 +5375,11 @@ if test "${enable_database+set}" = set;
4232
enableval="$enable_database"
4233
TERMINFO_SRC=$withval
4234
fi;
4235
- echo "$as_me:5315: result: $TERMINFO_SRC" >&5
4236
+ echo "$as_me:5378: result: $TERMINFO_SRC" >&5
4237
echo "${ECHO_T}$TERMINFO_SRC" >&6
4238
fi
4239
4240
-echo "$as_me:5319: checking for list of fallback descriptions" >&5
4241
+echo "$as_me:5382: checking for list of fallback descriptions" >&5
4242
echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
4243
4244
# Check whether --with-fallbacks or --without-fallbacks was given.
4245
@@ -5326,11 +5389,11 @@ if test "${with_fallbacks+set}" = set; t
4246
else
4247
with_fallback=
4248
fi;
4249
-echo "$as_me:5329: result: $with_fallback" >&5
4250
+echo "$as_me:5392: result: $with_fallback" >&5
4251
echo "${ECHO_T}$with_fallback" >&6
4252
FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
4253
4254
-echo "$as_me:5333: checking if you want modern xterm or antique" >&5
4255
+echo "$as_me:5396: checking if you want modern xterm or antique" >&5
4256
echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
4257
4258
# Check whether --with-xterm-new or --without-xterm-new was given.
4259
@@ -5344,7 +5407,7 @@ case $with_xterm_new in
4260
no) with_xterm_new=xterm-old;;
4261
*) with_xterm_new=xterm-new;;
4262
esac
4263
-echo "$as_me:5347: result: $with_xterm_new" >&5
4264
+echo "$as_me:5410: result: $with_xterm_new" >&5
4265
echo "${ECHO_T}$with_xterm_new" >&6
4266
WHICH_XTERM=$with_xterm_new
4267
4268
@@ -5354,7 +5417,7 @@ if test "$use_database" = no ; then
4269
MAKE_TERMINFO="#"
4270
else
4271
4272
-echo "$as_me:5357: checking for list of terminfo directories" >&5
4273
+echo "$as_me:5420: checking for list of terminfo directories" >&5
4274
echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
4275
4276
# Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
4277
@@ -5384,11 +5447,11 @@ case ".$cf_src_path" in #(vi
4278
;;
4279
esac
4280
;; #(vi
4281
-.NONE/*)
4282
+.no|.NONE/*)
4283
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
4284
;;
4285
*)
4286
- { { echo "$as_me:5391: error: expected a pathname, not \"$cf_src_path\"" >&5
4287
+ { { echo "$as_me:5454: error: expected a pathname, not \"$cf_src_path\"" >&5
4288
echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
4289
{ (exit 1); exit 1; }; }
4290
;;
4291
@@ -5401,13 +5464,13 @@ IFS="$ac_save_ifs"
4292
4293
eval 'TERMINFO_DIRS="$cf_dst_path"'
4294
4295
-echo "$as_me:5404: result: $TERMINFO_DIRS" >&5
4296
+echo "$as_me:5467: result: $TERMINFO_DIRS" >&5
4297
echo "${ECHO_T}$TERMINFO_DIRS" >&6
4298
test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
4299
#define TERMINFO_DIRS "$TERMINFO_DIRS"
4300
EOF
4301
4302
-echo "$as_me:5410: checking for default terminfo directory" >&5
4303
+echo "$as_me:5473: checking for default terminfo directory" >&5
4304
echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
4305
4306
# Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
4307
@@ -5432,11 +5495,11 @@ case ".$withval" in #(vi
4308
;;
4309
esac
4310
;; #(vi
4311
-.NONE/*)
4312
+.no|.NONE/*)
4313
withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
4314
;;
4315
*)
4316
- { { echo "$as_me:5439: error: expected a pathname, not \"$withval\"" >&5
4317
+ { { echo "$as_me:5502: error: expected a pathname, not \"$withval\"" >&5
4318
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
4319
{ (exit 1); exit 1; }; }
4320
;;
4321
@@ -5444,7 +5507,7 @@ esac
4322
4323
eval TERMINFO="$withval"
4324
4325
-echo "$as_me:5447: result: $TERMINFO" >&5
4326
+echo "$as_me:5510: result: $TERMINFO" >&5
4327
echo "${ECHO_T}$TERMINFO" >&6
4328
cat >>confdefs.h <<EOF
4329
#define TERMINFO "$TERMINFO"
4330
@@ -5454,7 +5517,7 @@ fi
4331
4332
### use option --disable-big-core to make tic run on small machines
4333
### We need 4Mb, check if we can allocate 50% more than that.
4334
-echo "$as_me:5457: checking if big-core option selected" >&5
4335
+echo "$as_me:5520: checking if big-core option selected" >&5
4336
echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
4337
4338
# Check whether --enable-big-core or --disable-big-core was given.
4339
@@ -5466,7 +5529,7 @@ else
4340
with_big_core=no
4341
else
4342
cat >conftest.$ac_ext <<_ACEOF
4343
-#line 5469 "configure"
4344
+#line 5532 "configure"
4345
#include "confdefs.h"
4346
4347
#include <stdlib.h>
4348
@@ -5480,15 +5543,15 @@ int main() {
4349
}
4350
_ACEOF
4351
rm -f conftest$ac_exeext
4352
-if { (eval echo "$as_me:5483: \"$ac_link\"") >&5
4353
+if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
4354
(eval $ac_link) 2>&5
4355
ac_status=$?
4356
- echo "$as_me:5486: \$? = $ac_status" >&5
4357
+ echo "$as_me:5549: \$? = $ac_status" >&5
4358
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4359
- { (eval echo "$as_me:5488: \"$ac_try\"") >&5
4360
+ { (eval echo "$as_me:5551: \"$ac_try\"") >&5
4361
(eval $ac_try) 2>&5
4362
ac_status=$?
4363
- echo "$as_me:5491: \$? = $ac_status" >&5
4364
+ echo "$as_me:5554: \$? = $ac_status" >&5
4365
(exit $ac_status); }; }; then
4366
with_big_core=yes
4367
else
4368
@@ -5500,14 +5563,14 @@ fi
4369
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4370
fi
4371
fi;
4372
-echo "$as_me:5503: result: $with_big_core" >&5
4373
+echo "$as_me:5566: result: $with_big_core" >&5
4374
echo "${ECHO_T}$with_big_core" >&6
4375
test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
4376
#define HAVE_BIG_CORE 1
4377
EOF
4378
4379
### use option --enable-termcap to compile in the termcap fallback support
4380
-echo "$as_me:5510: checking if you want termcap-fallback support" >&5
4381
+echo "$as_me:5573: checking if you want termcap-fallback support" >&5
4382
echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
4383
4384
# Check whether --enable-termcap or --disable-termcap was given.
4385
@@ -5517,13 +5580,13 @@ if test "${enable_termcap+set}" = set; t
4386
else
4387
with_termcap=no
4388
fi;
4389
-echo "$as_me:5520: result: $with_termcap" >&5
4390
+echo "$as_me:5583: result: $with_termcap" >&5
4391
echo "${ECHO_T}$with_termcap" >&6
4392
4393
if test "$with_termcap" != "yes" ; then
4394
if test "$use_database" = no ; then
4395
if test -z "$with_fallback" ; then
4396
- { { echo "$as_me:5526: error: You have disabled the database w/o specifying fallbacks" >&5
4397
+ { { echo "$as_me:5589: error: You have disabled the database w/o specifying fallbacks" >&5
4398
echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
4399
{ (exit 1); exit 1; }; }
4400
fi
4401
@@ -5538,7 +5601,7 @@ cat >>confdefs.h <<\EOF
4402
#define USE_TERMCAP 1
4403
EOF
4404
4405
-echo "$as_me:5541: checking for list of termcap files" >&5
4406
+echo "$as_me:5604: checking for list of termcap files" >&5
4407
echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
4408
4409
# Check whether --with-termpath or --without-termpath was given.
4410
@@ -5568,11 +5631,11 @@ case ".$cf_src_path" in #(vi
4411
;;
4412
esac
4413
;; #(vi
4414
-.NONE/*)
4415
+.no|.NONE/*)
4416
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
4417
;;
4418
*)
4419
- { { echo "$as_me:5575: error: expected a pathname, not \"$cf_src_path\"" >&5
4420
+ { { echo "$as_me:5638: error: expected a pathname, not \"$cf_src_path\"" >&5
4421
echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
4422
{ (exit 1); exit 1; }; }
4423
;;
4424
@@ -5585,14 +5648,14 @@ IFS="$ac_save_ifs"
4425
4426
eval 'TERMPATH="$cf_dst_path"'
4427
4428
-echo "$as_me:5588: result: $TERMPATH" >&5
4429
+echo "$as_me:5651: result: $TERMPATH" >&5
4430
echo "${ECHO_T}$TERMPATH" >&6
4431
test -n "$TERMPATH" && cat >>confdefs.h <<EOF
4432
#define TERMPATH "$TERMPATH"
4433
EOF
4434
4435
### use option --enable-getcap to use a hacked getcap for reading termcaps
4436
-echo "$as_me:5595: checking if fast termcap-loader is needed" >&5
4437
+echo "$as_me:5658: checking if fast termcap-loader is needed" >&5
4438
echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
4439
4440
# Check whether --enable-getcap or --disable-getcap was given.
4441
@@ -5602,13 +5665,13 @@ if test "${enable_getcap+set}" = set; th
4442
else
4443
with_getcap=no
4444
fi;
4445
-echo "$as_me:5605: result: $with_getcap" >&5
4446
+echo "$as_me:5668: result: $with_getcap" >&5
4447
echo "${ECHO_T}$with_getcap" >&6
4448
test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
4449
#define USE_GETCAP 1
4450
EOF
4451
4452
-echo "$as_me:5611: checking if translated termcaps will be cached in ~/.terminfo" >&5
4453
+echo "$as_me:5674: checking if translated termcaps will be cached in ~/.terminfo" >&5
4454
echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
4455
4456
# Check whether --enable-getcap-cache or --disable-getcap-cache was given.
4457
@@ -5618,7 +5681,7 @@ if test "${enable_getcap_cache+set}" = s
4458
else
4459
with_getcap_cache=no
4460
fi;
4461
-echo "$as_me:5621: result: $with_getcap_cache" >&5
4462
+echo "$as_me:5684: result: $with_getcap_cache" >&5
4463
echo "${ECHO_T}$with_getcap_cache" >&6
4464
test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
4465
#define USE_GETCAP_CACHE 1
4466
@@ -5627,7 +5690,7 @@ EOF
4467
fi
4468
4469
### Use option --disable-home-terminfo to completely remove ~/.terminfo
4470
-echo "$as_me:5630: checking if ~/.terminfo is wanted" >&5
4471
+echo "$as_me:5693: checking if ~/.terminfo is wanted" >&5
4472
echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
4473
4474
# Check whether --enable-home-terminfo or --disable-home-terminfo was given.
4475
@@ -5637,13 +5700,13 @@ if test "${enable_home_terminfo+set}" =
4476
else
4477
with_home_terminfo=yes
4478
fi;
4479
-echo "$as_me:5640: result: $with_home_terminfo" >&5
4480
+echo "$as_me:5703: result: $with_home_terminfo" >&5
4481
echo "${ECHO_T}$with_home_terminfo" >&6
4482
test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
4483
#define USE_HOME_TERMINFO 1
4484
EOF
4485
4486
-echo "$as_me:5646: checking if you want to use restrict environment when running as root" >&5
4487
+echo "$as_me:5709: checking if you want to use restrict environment when running as root" >&5
4488
echo $ECHO_N "checking if you want to use restrict environment when running as root... $ECHO_C" >&6
4489
4490
# Check whether --enable-root-environ or --disable-root-environ was given.
4491
@@ -5653,7 +5716,7 @@ if test "${enable_root_environ+set}" = s
4492
else
4493
with_root_environ=yes
4494
fi;
4495
-echo "$as_me:5656: result: $with_root_environ" >&5
4496
+echo "$as_me:5719: result: $with_root_environ" >&5
4497
echo "${ECHO_T}$with_root_environ" >&6
4498
test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
4499
#define USE_ROOT_ENVIRON 1
4500
@@ -5667,13 +5730,13 @@ for ac_func in \
4501
unlink
4502
do
4503
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
4504
-echo "$as_me:5670: checking for $ac_func" >&5
4505
+echo "$as_me:5733: checking for $ac_func" >&5
4506
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
4507
if eval "test \"\${$as_ac_var+set}\" = set"; then
4508
echo $ECHO_N "(cached) $ECHO_C" >&6
4509
else
4510
cat >conftest.$ac_ext <<_ACEOF
4511
-#line 5676 "configure"
4512
+#line 5739 "configure"
4513
#include "confdefs.h"
4514
/* System header to define __stub macros and hopefully few prototypes,
4515
which can conflict with char $ac_func (); below. */
4516
@@ -5704,16 +5767,16 @@ f = $ac_func;
4517
}
4518
_ACEOF
4519
rm -f conftest.$ac_objext conftest$ac_exeext
4520
-if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
4521
+if { (eval echo "$as_me:5770: \"$ac_link\"") >&5
4522
(eval $ac_link) 2>&5
4523
ac_status=$?
4524
- echo "$as_me:5710: \$? = $ac_status" >&5
4525
+ echo "$as_me:5773: \$? = $ac_status" >&5
4526
(exit $ac_status); } &&
4527
{ ac_try='test -s conftest$ac_exeext'
4528
- { (eval echo "$as_me:5713: \"$ac_try\"") >&5
4529
+ { (eval echo "$as_me:5776: \"$ac_try\"") >&5
4530
(eval $ac_try) 2>&5
4531
ac_status=$?
4532
- echo "$as_me:5716: \$? = $ac_status" >&5
4533
+ echo "$as_me:5779: \$? = $ac_status" >&5
4534
(exit $ac_status); }; }; then
4535
eval "$as_ac_var=yes"
4536
else
4537
@@ -5723,7 +5786,7 @@ eval "$as_ac_var=no"
4538
fi
4539
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4540
fi
4541
-echo "$as_me:5726: result: `eval echo '${'$as_ac_var'}'`" >&5
4542
+echo "$as_me:5789: result: `eval echo '${'$as_ac_var'}'`" >&5
4543
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
4544
if test `eval echo '${'$as_ac_var'}'` = yes; then
4545
cat >>confdefs.h <<EOF
4546
@@ -5740,13 +5803,13 @@ for ac_func in \
4547
symlink
4548
do
4549
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
4550
-echo "$as_me:5743: checking for $ac_func" >&5
4551
+echo "$as_me:5806: checking for $ac_func" >&5
4552
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
4553
if eval "test \"\${$as_ac_var+set}\" = set"; then
4554
echo $ECHO_N "(cached) $ECHO_C" >&6
4555
else
4556
cat >conftest.$ac_ext <<_ACEOF
4557
-#line 5749 "configure"
4558
+#line 5812 "configure"
4559
#include "confdefs.h"
4560
/* System header to define __stub macros and hopefully few prototypes,
4561
which can conflict with char $ac_func (); below. */
4562
@@ -5777,16 +5840,16 @@ f = $ac_func;
4563
}
4564
_ACEOF
4565
rm -f conftest.$ac_objext conftest$ac_exeext
4566
-if { (eval echo "$as_me:5780: \"$ac_link\"") >&5
4567
+if { (eval echo "$as_me:5843: \"$ac_link\"") >&5
4568
(eval $ac_link) 2>&5
4569
ac_status=$?
4570
- echo "$as_me:5783: \$? = $ac_status" >&5
4571
+ echo "$as_me:5846: \$? = $ac_status" >&5
4572
(exit $ac_status); } &&
4573
{ ac_try='test -s conftest$ac_exeext'
4574
- { (eval echo "$as_me:5786: \"$ac_try\"") >&5
4575
+ { (eval echo "$as_me:5849: \"$ac_try\"") >&5
4576
(eval $ac_try) 2>&5
4577
ac_status=$?
4578
- echo "$as_me:5789: \$? = $ac_status" >&5
4579
+ echo "$as_me:5852: \$? = $ac_status" >&5
4580
(exit $ac_status); }; }; then
4581
eval "$as_ac_var=yes"
4582
else
4583
@@ -5796,7 +5859,7 @@ eval "$as_ac_var=no"
4584
fi
4585
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4586
fi
4587
-echo "$as_me:5799: result: `eval echo '${'$as_ac_var'}'`" >&5
4588
+echo "$as_me:5862: result: `eval echo '${'$as_ac_var'}'`" >&5
4589
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
4590
if test `eval echo '${'$as_ac_var'}'` = yes; then
4591
cat >>confdefs.h <<EOF
4592
@@ -5807,7 +5870,7 @@ fi
4593
done
4594
4595
else
4596
- echo "$as_me:5810: checking if link/symlink functions work" >&5
4597
+ echo "$as_me:5873: checking if link/symlink functions work" >&5
4598
echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
4599
if test "${cf_cv_link_funcs+set}" = set; then
4600
echo $ECHO_N "(cached) $ECHO_C" >&6
4601
@@ -5820,7 +5883,7 @@ else
4602
eval 'ac_cv_func_'$cf_func'=error'
4603
else
4604
cat >conftest.$ac_ext <<_ACEOF
4605
-#line 5823 "configure"
4606
+#line 5886 "configure"
4607
#include "confdefs.h"
4608
4609
#include <sys/types.h>
4610
@@ -5850,15 +5913,15 @@ int main()
4611
4612
_ACEOF
4613
rm -f conftest$ac_exeext
4614
-if { (eval echo "$as_me:5853: \"$ac_link\"") >&5
4615
+if { (eval echo "$as_me:5916: \"$ac_link\"") >&5
4616
(eval $ac_link) 2>&5
4617
ac_status=$?
4618
- echo "$as_me:5856: \$? = $ac_status" >&5
4619
+ echo "$as_me:5919: \$? = $ac_status" >&5
4620
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4621
- { (eval echo "$as_me:5858: \"$ac_try\"") >&5
4622
+ { (eval echo "$as_me:5921: \"$ac_try\"") >&5
4623
(eval $ac_try) 2>&5
4624
ac_status=$?
4625
- echo "$as_me:5861: \$? = $ac_status" >&5
4626
+ echo "$as_me:5924: \$? = $ac_status" >&5
4627
(exit $ac_status); }; }; then
4628
4629
cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
4630
@@ -5876,7 +5939,7 @@ fi
4631
test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
4632
4633
fi
4634
-echo "$as_me:5879: result: $cf_cv_link_funcs" >&5
4635
+echo "$as_me:5942: result: $cf_cv_link_funcs" >&5
4636
echo "${ECHO_T}$cf_cv_link_funcs" >&6
4637
test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF
4638
#define HAVE_LINK 1
4639
@@ -5892,27 +5955,27 @@ with_links=no
4640
with_symlinks=no
4641
4642
if test "$ac_cv_func_link" != yes ; then
4643
- echo "$as_me:5895: checking if tic should use symbolic links" >&5
4644
+ echo "$as_me:5958: checking if tic should use symbolic links" >&5
4645
echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
4646
if test "$ac_cv_func_symlink" = yes ; then
4647
with_symlinks=yes
4648
else
4649
with_symlinks=no
4650
fi
4651
- echo "$as_me:5902: result: $with_symlinks" >&5
4652
+ echo "$as_me:5965: result: $with_symlinks" >&5
4653
echo "${ECHO_T}$with_symlinks" >&6
4654
elif test "$ac_cv_func_symlink" != yes ; then
4655
- echo "$as_me:5905: checking if tic should use hard links" >&5
4656
+ echo "$as_me:5968: checking if tic should use hard links" >&5
4657
echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
4658
if test "$ac_cv_func_link" = yes ; then
4659
with_links=yes
4660
else
4661
with_links=no
4662
fi
4663
- echo "$as_me:5912: result: $with_links" >&5
4664
+ echo "$as_me:5975: result: $with_links" >&5
4665
echo "${ECHO_T}$with_links" >&6
4666
else
4667
- echo "$as_me:5915: checking if tic should use symbolic links" >&5
4668
+ echo "$as_me:5978: checking if tic should use symbolic links" >&5
4669
echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
4670
4671
# Check whether --enable-symlinks or --disable-symlinks was given.
4672
@@ -5922,7 +5985,7 @@ if test "${enable_symlinks+set}" = set;
4673
else
4674
with_symlinks=no
4675
fi;
4676
- echo "$as_me:5925: result: $with_symlinks" >&5
4677
+ echo "$as_me:5988: result: $with_symlinks" >&5
4678
echo "${ECHO_T}$with_symlinks" >&6
4679
fi
4680
4681
@@ -5935,7 +5998,7 @@ test "$with_symlinks" = yes && cat >>con
4682
EOF
4683
4684
### use option --enable-broken-linker to force on use of broken-linker support
4685
-echo "$as_me:5938: checking if you want broken-linker support code" >&5
4686
+echo "$as_me:6001: checking if you want broken-linker support code" >&5
4687
echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
4688
4689
# Check whether --enable-broken_linker or --disable-broken_linker was given.
4690
@@ -5945,7 +6008,7 @@ if test "${enable_broken_linker+set}" =
4691
else
4692
with_broken_linker=${BROKEN_LINKER-no}
4693
fi;
4694
-echo "$as_me:5948: result: $with_broken_linker" >&5
4695
+echo "$as_me:6011: result: $with_broken_linker" >&5
4696
echo "${ECHO_T}$with_broken_linker" >&6
4697
4698
BROKEN_LINKER=0
4699
@@ -5980,7 +6043,7 @@ NCURSES_WINT_T=0
4700
4701
# Check to define _XOPEN_SOURCE "automatically"
4702
4703
-echo "$as_me:5983: checking if $CC -U and -D options work together" >&5
4704
+echo "$as_me:6046: checking if $CC -U and -D options work together" >&5
4705
echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
4706
if test "${cf_cv_cc_u_d_options+set}" = set; then
4707
echo $ECHO_N "(cached) $ECHO_C" >&6
4708
@@ -5989,7 +6052,7 @@ else
4709
cf_save_CPPFLAGS="$CPPFLAGS"
4710
CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
4711
cat >conftest.$ac_ext <<_ACEOF
4712
-#line 5992 "configure"
4713
+#line 6055 "configure"
4714
#include "confdefs.h"
4715
4716
int
4717
@@ -6008,16 +6071,16 @@ make a defined-error
4718
}
4719
_ACEOF
4720
rm -f conftest.$ac_objext
4721
-if { (eval echo "$as_me:6011: \"$ac_compile\"") >&5
4722
+if { (eval echo "$as_me:6074: \"$ac_compile\"") >&5
4723
(eval $ac_compile) 2>&5
4724
ac_status=$?
4725
- echo "$as_me:6014: \$? = $ac_status" >&5
4726
+ echo "$as_me:6077: \$? = $ac_status" >&5
4727
(exit $ac_status); } &&
4728
{ ac_try='test -s conftest.$ac_objext'
4729
- { (eval echo "$as_me:6017: \"$ac_try\"") >&5
4730
+ { (eval echo "$as_me:6080: \"$ac_try\"") >&5
4731
(eval $ac_try) 2>&5
4732
ac_status=$?
4733
- echo "$as_me:6020: \$? = $ac_status" >&5
4734
+ echo "$as_me:6083: \$? = $ac_status" >&5
4735
(exit $ac_status); }; }; then
4736
4737
cf_cv_cc_u_d_options=yes
4738
@@ -6031,7 +6094,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
4739
CPPFLAGS="$cf_save_CPPFLAGS"
4740
4741
fi
4742
-echo "$as_me:6034: result: $cf_cv_cc_u_d_options" >&5
4743
+echo "$as_me:6097: result: $cf_cv_cc_u_d_options" >&5
4744
echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
4745
4746
cf_XOPEN_SOURCE=500
4747
@@ -6041,9 +6104,6 @@ case $host_os in #(vi
4748
aix[45]*) #(vi
4749
CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
4750
;;
4751
-darwin*) #(vi
4752
- # setting _XOPEN_SOURCE breaks things on Darwin
4753
- ;;
4754
freebsd*) #(vi
4755
# 5.x headers associate
4756
# _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
4757
@@ -6060,14 +6120,14 @@ irix[56].*) #(vi
4758
;;
4759
linux*|gnu*) #(vi
4760
4761
-echo "$as_me:6063: checking if we must define _GNU_SOURCE" >&5
4762
+echo "$as_me:6123: checking if we must define _GNU_SOURCE" >&5
4763
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
4764
if test "${cf_cv_gnu_source+set}" = set; then
4765
echo $ECHO_N "(cached) $ECHO_C" >&6
4766
else
4767
4768
cat >conftest.$ac_ext <<_ACEOF
4769
-#line 6070 "configure"
4770
+#line 6130 "configure"
4771
#include "confdefs.h"
4772
#include <sys/types.h>
4773
int
4774
@@ -6082,16 +6142,16 @@ make an error
4775
}
4776
_ACEOF
4777
rm -f conftest.$ac_objext
4778
-if { (eval echo "$as_me:6085: \"$ac_compile\"") >&5
4779
+if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
4780
(eval $ac_compile) 2>&5
4781
ac_status=$?
4782
- echo "$as_me:6088: \$? = $ac_status" >&5
4783
+ echo "$as_me:6148: \$? = $ac_status" >&5
4784
(exit $ac_status); } &&
4785
{ ac_try='test -s conftest.$ac_objext'
4786
- { (eval echo "$as_me:6091: \"$ac_try\"") >&5
4787
+ { (eval echo "$as_me:6151: \"$ac_try\"") >&5
4788
(eval $ac_try) 2>&5
4789
ac_status=$?
4790
- echo "$as_me:6094: \$? = $ac_status" >&5
4791
+ echo "$as_me:6154: \$? = $ac_status" >&5
4792
(exit $ac_status); }; }; then
4793
cf_cv_gnu_source=no
4794
else
4795
@@ -6100,7 +6160,7 @@ cat conftest.$ac_ext >&5
4796
cf_save="$CPPFLAGS"
4797
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
4798
cat >conftest.$ac_ext <<_ACEOF
4799
-#line 6103 "configure"
4800
+#line 6163 "configure"
4801
#include "confdefs.h"
4802
#include <sys/types.h>
4803
int
4804
@@ -6115,16 +6175,16 @@ make an error
4805
}
4806
_ACEOF
4807
rm -f conftest.$ac_objext
4808
-if { (eval echo "$as_me:6118: \"$ac_compile\"") >&5
4809
+if { (eval echo "$as_me:6178: \"$ac_compile\"") >&5
4810
(eval $ac_compile) 2>&5
4811
ac_status=$?
4812
- echo "$as_me:6121: \$? = $ac_status" >&5
4813
+ echo "$as_me:6181: \$? = $ac_status" >&5
4814
(exit $ac_status); } &&
4815
{ ac_try='test -s conftest.$ac_objext'
4816
- { (eval echo "$as_me:6124: \"$ac_try\"") >&5
4817
+ { (eval echo "$as_me:6184: \"$ac_try\"") >&5
4818
(eval $ac_try) 2>&5
4819
ac_status=$?
4820
- echo "$as_me:6127: \$? = $ac_status" >&5
4821
+ echo "$as_me:6187: \$? = $ac_status" >&5
4822
(exit $ac_status); }; }; then
4823
cf_cv_gnu_source=no
4824
else
4825
@@ -6139,7 +6199,7 @@ fi
4826
rm -f conftest.$ac_objext conftest.$ac_ext
4827
4828
fi
4829
-echo "$as_me:6142: result: $cf_cv_gnu_source" >&5
4830
+echo "$as_me:6202: result: $cf_cv_gnu_source" >&5
4831
echo "${ECHO_T}$cf_cv_gnu_source" >&6
4832
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
4833
4834
@@ -6166,14 +6226,14 @@ solaris*) #(vi
4835
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
4836
;;
4837
*)
4838
- echo "$as_me:6169: checking if we should define _XOPEN_SOURCE" >&5
4839
+ echo "$as_me:6229: checking if we should define _XOPEN_SOURCE" >&5
4840
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
4841
if test "${cf_cv_xopen_source+set}" = set; then
4842
echo $ECHO_N "(cached) $ECHO_C" >&6
4843
else
4844
4845
cat >conftest.$ac_ext <<_ACEOF
4846
-#line 6176 "configure"
4847
+#line 6236 "configure"
4848
#include "confdefs.h"
4849
#include <sys/types.h>
4850
int
4851
@@ -6188,16 +6248,16 @@ make an error
4852
}
4853
_ACEOF
4854
rm -f conftest.$ac_objext
4855
-if { (eval echo "$as_me:6191: \"$ac_compile\"") >&5
4856
+if { (eval echo "$as_me:6251: \"$ac_compile\"") >&5
4857
(eval $ac_compile) 2>&5
4858
ac_status=$?
4859
- echo "$as_me:6194: \$? = $ac_status" >&5
4860
+ echo "$as_me:6254: \$? = $ac_status" >&5
4861
(exit $ac_status); } &&
4862
{ ac_try='test -s conftest.$ac_objext'
4863
- { (eval echo "$as_me:6197: \"$ac_try\"") >&5
4864
+ { (eval echo "$as_me:6257: \"$ac_try\"") >&5
4865
(eval $ac_try) 2>&5
4866
ac_status=$?
4867
- echo "$as_me:6200: \$? = $ac_status" >&5
4868
+ echo "$as_me:6260: \$? = $ac_status" >&5
4869
(exit $ac_status); }; }; then
4870
cf_cv_xopen_source=no
4871
else
4872
@@ -6206,7 +6266,7 @@ cat conftest.$ac_ext >&5
4873
cf_save="$CPPFLAGS"
4874
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
4875
cat >conftest.$ac_ext <<_ACEOF
4876
-#line 6209 "configure"
4877
+#line 6269 "configure"
4878
#include "confdefs.h"
4879
#include <sys/types.h>
4880
int
4881
@@ -6221,16 +6281,16 @@ make an error
4882
}
4883
_ACEOF
4884
rm -f conftest.$ac_objext
4885
-if { (eval echo "$as_me:6224: \"$ac_compile\"") >&5
4886
+if { (eval echo "$as_me:6284: \"$ac_compile\"") >&5
4887
(eval $ac_compile) 2>&5
4888
ac_status=$?
4889
- echo "$as_me:6227: \$? = $ac_status" >&5
4890
+ echo "$as_me:6287: \$? = $ac_status" >&5
4891
(exit $ac_status); } &&
4892
{ ac_try='test -s conftest.$ac_objext'
4893
- { (eval echo "$as_me:6230: \"$ac_try\"") >&5
4894
+ { (eval echo "$as_me:6290: \"$ac_try\"") >&5
4895
(eval $ac_try) 2>&5
4896
ac_status=$?
4897
- echo "$as_me:6233: \$? = $ac_status" >&5
4898
+ echo "$as_me:6293: \$? = $ac_status" >&5
4899
(exit $ac_status); }; }; then
4900
cf_cv_xopen_source=no
4901
else
4902
@@ -6245,7 +6305,7 @@ fi
4903
rm -f conftest.$ac_objext conftest.$ac_ext
4904
4905
fi
4906
-echo "$as_me:6248: result: $cf_cv_xopen_source" >&5
4907
+echo "$as_me:6308: result: $cf_cv_xopen_source" >&5
4908
echo "${ECHO_T}$cf_cv_xopen_source" >&6
4909
if test "$cf_cv_xopen_source" != no ; then
4910
4911
@@ -6279,16 +6339,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG
4912
sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
4913
-e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'`
4914
4915
-echo "$as_me:6282: checking if we should define _POSIX_C_SOURCE" >&5
4916
+echo "$as_me:6342: checking if we should define _POSIX_C_SOURCE" >&5
4917
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
4918
if test "${cf_cv_posix_c_source+set}" = set; then
4919
echo $ECHO_N "(cached) $ECHO_C" >&6
4920
else
4921
4922
-echo "(line 6288) testing if the symbol is already defined go no further ..." 1>&5
4923
+echo "(line 6348) testing if the symbol is already defined go no further ..." 1>&5
4924
4925
cat >conftest.$ac_ext <<_ACEOF
4926
-#line 6291 "configure"
4927
+#line 6351 "configure"
4928
#include "confdefs.h"
4929
#include <sys/types.h>
4930
int
4931
@@ -6303,16 +6363,16 @@ make an error
4932
}
4933
_ACEOF
4934
rm -f conftest.$ac_objext
4935
-if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
4936
+if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
4937
(eval $ac_compile) 2>&5
4938
ac_status=$?
4939
- echo "$as_me:6309: \$? = $ac_status" >&5
4940
+ echo "$as_me:6369: \$? = $ac_status" >&5
4941
(exit $ac_status); } &&
4942
{ ac_try='test -s conftest.$ac_objext'
4943
- { (eval echo "$as_me:6312: \"$ac_try\"") >&5
4944
+ { (eval echo "$as_me:6372: \"$ac_try\"") >&5
4945
(eval $ac_try) 2>&5
4946
ac_status=$?
4947
- echo "$as_me:6315: \$? = $ac_status" >&5
4948
+ echo "$as_me:6375: \$? = $ac_status" >&5
4949
(exit $ac_status); }; }; then
4950
cf_cv_posix_c_source=no
4951
else
4952
@@ -6333,7 +6393,7 @@ cf_want_posix_source=no
4953
esac
4954
if test "$cf_want_posix_source" = yes ; then
4955
cat >conftest.$ac_ext <<_ACEOF
4956
-#line 6336 "configure"
4957
+#line 6396 "configure"
4958
#include "confdefs.h"
4959
#include <sys/types.h>
4960
int
4961
@@ -6348,16 +6408,16 @@ make an error
4962
}
4963
_ACEOF
4964
rm -f conftest.$ac_objext
4965
-if { (eval echo "$as_me:6351: \"$ac_compile\"") >&5
4966
+if { (eval echo "$as_me:6411: \"$ac_compile\"") >&5
4967
(eval $ac_compile) 2>&5
4968
ac_status=$?
4969
- echo "$as_me:6354: \$? = $ac_status" >&5
4970
+ echo "$as_me:6414: \$? = $ac_status" >&5
4971
(exit $ac_status); } &&
4972
{ ac_try='test -s conftest.$ac_objext'
4973
- { (eval echo "$as_me:6357: \"$ac_try\"") >&5
4974
+ { (eval echo "$as_me:6417: \"$ac_try\"") >&5
4975
(eval $ac_try) 2>&5
4976
ac_status=$?
4977
- echo "$as_me:6360: \$? = $ac_status" >&5
4978
+ echo "$as_me:6420: \$? = $ac_status" >&5
4979
(exit $ac_status); }; }; then
4980
:
4981
else
4982
@@ -6368,15 +6428,15 @@ fi
4983
rm -f conftest.$ac_objext conftest.$ac_ext
4984
fi
4985
4986
-echo "(line 6371) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4987
+echo "(line 6431) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4988
4989
CFLAGS="$cf_trim_CFLAGS"
4990
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
4991
4992
-echo "(line 6376) testing if the second compile does not leave our definition intact error ..." 1>&5
4993
+echo "(line 6436) testing if the second compile does not leave our definition intact error ..." 1>&5
4994
4995
cat >conftest.$ac_ext <<_ACEOF
4996
-#line 6379 "configure"
4997
+#line 6439 "configure"
4998
#include "confdefs.h"
4999
#include <sys/types.h>
5000
int
5001
@@ -6391,16 +6451,16 @@ make an error
5002
}
5003
_ACEOF
5004
rm -f conftest.$ac_objext
5005
-if { (eval echo "$as_me:6394: \"$ac_compile\"") >&5
5006
+if { (eval echo "$as_me:6454: \"$ac_compile\"") >&5
5007
(eval $ac_compile) 2>&5
5008
ac_status=$?
5009
- echo "$as_me:6397: \$? = $ac_status" >&5
5010
+ echo "$as_me:6457: \$? = $ac_status" >&5
5011
(exit $ac_status); } &&
5012
{ ac_try='test -s conftest.$ac_objext'
5013
- { (eval echo "$as_me:6400: \"$ac_try\"") >&5
5014
+ { (eval echo "$as_me:6460: \"$ac_try\"") >&5
5015
(eval $ac_try) 2>&5
5016
ac_status=$?
5017
- echo "$as_me:6403: \$? = $ac_status" >&5
5018
+ echo "$as_me:6463: \$? = $ac_status" >&5
5019
(exit $ac_status); }; }; then
5020
:
5021
else
5022
@@ -6416,7 +6476,7 @@ fi
5023
rm -f conftest.$ac_objext conftest.$ac_ext
5024
5025
fi
5026
-echo "$as_me:6419: result: $cf_cv_posix_c_source" >&5
5027
+echo "$as_me:6479: result: $cf_cv_posix_c_source" >&5
5028
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
5029
5030
if test "$cf_cv_posix_c_source" != no ; then
5031
@@ -6433,15 +6493,164 @@ fi
5032
;;
5033
esac
5034
5035
+# Work around breakage on OS X
5036
+
5037
+echo "$as_me:6498: checking if SIGWINCH is defined" >&5
5038
+echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
5039
+if test "${cf_cv_define_sigwinch+set}" = set; then
5040
+ echo $ECHO_N "(cached) $ECHO_C" >&6
5041
+else
5042
+
5043
+ cat >conftest.$ac_ext <<_ACEOF
5044
+#line 6505 "configure"
5045
+#include "confdefs.h"
5046
+
5047
+#include <sys/types.h>
5048
+#include <sys/signal.h>
5049
+
5050
+int
5051
+main ()
5052
+{
5053
+int x = SIGWINCH
5054
+ ;
5055
+ return 0;
5056
+}
5057
+_ACEOF
5058
+rm -f conftest.$ac_objext
5059
+if { (eval echo "$as_me:6520: \"$ac_compile\"") >&5
5060
+ (eval $ac_compile) 2>&5
5061
+ ac_status=$?
5062
+ echo "$as_me:6523: \$? = $ac_status" >&5
5063
+ (exit $ac_status); } &&
5064
+ { ac_try='test -s conftest.$ac_objext'
5065
+ { (eval echo "$as_me:6526: \"$ac_try\"") >&5
5066
+ (eval $ac_try) 2>&5
5067
+ ac_status=$?
5068
+ echo "$as_me:6529: \$? = $ac_status" >&5
5069
+ (exit $ac_status); }; }; then
5070
+ cf_cv_define_sigwinch=yes
5071
+else
5072
+ echo "$as_me: failed program was:" >&5
5073
+cat conftest.$ac_ext >&5
5074
+cat >conftest.$ac_ext <<_ACEOF
5075
+#line 6536 "configure"
5076
+#include "confdefs.h"
5077
+
5078
+#undef _XOPEN_SOURCE
5079
+#undef _POSIX_SOURCE
5080
+#undef _POSIX_C_SOURCE
5081
+#include <sys/types.h>
5082
+#include <sys/signal.h>
5083
+
5084
+int
5085
+main ()
5086
+{
5087
+int x = SIGWINCH
5088
+ ;
5089
+ return 0;
5090
+}
5091
+_ACEOF
5092
+rm -f conftest.$ac_objext
5093
+if { (eval echo "$as_me:6554: \"$ac_compile\"") >&5
5094
+ (eval $ac_compile) 2>&5
5095
+ ac_status=$?
5096
+ echo "$as_me:6557: \$? = $ac_status" >&5
5097
+ (exit $ac_status); } &&
5098
+ { ac_try='test -s conftest.$ac_objext'
5099
+ { (eval echo "$as_me:6560: \"$ac_try\"") >&5
5100
+ (eval $ac_try) 2>&5
5101
+ ac_status=$?
5102
+ echo "$as_me:6563: \$? = $ac_status" >&5
5103
+ (exit $ac_status); }; }; then
5104
+ cf_cv_define_sigwinch=maybe
5105
+else
5106
+ echo "$as_me: failed program was:" >&5
5107
+cat conftest.$ac_ext >&5
5108
+cf_cv_define_sigwinch=no
5109
+fi
5110
+rm -f conftest.$ac_objext conftest.$ac_ext
5111
+
5112
+fi
5113
+rm -f conftest.$ac_objext conftest.$ac_ext
5114
+
5115
+fi
5116
+echo "$as_me:6577: result: $cf_cv_define_sigwinch" >&5
5117
+echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
5118
+
5119
+if test "$cf_cv_define_sigwinch" = maybe ; then
5120
+echo "$as_me:6581: checking for actual SIGWINCH definition" >&5
5121
+echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
5122
+if test "${cf_cv_fixup_sigwinch+set}" = set; then
5123
+ echo $ECHO_N "(cached) $ECHO_C" >&6
5124
+else
5125
+
5126
+cf_cv_fixup_sigwinch=unknown
5127
+cf_sigwinch=32
5128
+while test $cf_sigwinch != 1
5129
+do
5130
+ cat >conftest.$ac_ext <<_ACEOF
5131
+#line 6592 "configure"
5132
+#include "confdefs.h"
5133
+
5134
+#undef _XOPEN_SOURCE
5135
+#undef _POSIX_SOURCE
5136
+#undef _POSIX_C_SOURCE
5137
+#include <sys/types.h>
5138
+#include <sys/signal.h>
5139
+
5140
+int
5141
+main ()
5142
+{
5143
+
5144
+#if SIGWINCH != $cf_sigwinch
5145
+make an error
5146
+#endif
5147
+int x = SIGWINCH
5148
+ ;
5149
+ return 0;
5150
+}
5151
+_ACEOF
5152
+rm -f conftest.$ac_objext
5153
+if { (eval echo "$as_me:6614: \"$ac_compile\"") >&5
5154
+ (eval $ac_compile) 2>&5
5155
+ ac_status=$?
5156
+ echo "$as_me:6617: \$? = $ac_status" >&5
5157
+ (exit $ac_status); } &&
5158
+ { ac_try='test -s conftest.$ac_objext'
5159
+ { (eval echo "$as_me:6620: \"$ac_try\"") >&5
5160
+ (eval $ac_try) 2>&5
5161
+ ac_status=$?
5162
+ echo "$as_me:6623: \$? = $ac_status" >&5
5163
+ (exit $ac_status); }; }; then
5164
+ cf_cv_fixup_sigwinch=$cf_sigwinch
5165
+ break
5166
+else
5167
+ echo "$as_me: failed program was:" >&5
5168
+cat conftest.$ac_ext >&5
5169
+fi
5170
+rm -f conftest.$ac_objext conftest.$ac_ext
5171
+
5172
+cf_sigwinch=`expr $cf_sigwinch - 1`
5173
+done
5174
+
5175
+fi
5176
+echo "$as_me:6637: result: $cf_cv_fixup_sigwinch" >&5
5177
+echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
5178
+
5179
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
5180
+ CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch"
5181
+ fi
5182
+fi
5183
+
5184
# Checks for CODESET support.
5185
5186
- echo "$as_me:6438: checking for nl_langinfo and CODESET" >&5
5187
+ echo "$as_me:6647: checking for nl_langinfo and CODESET" >&5
5188
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
5189
if test "${am_cv_langinfo_codeset+set}" = set; then
5190
echo $ECHO_N "(cached) $ECHO_C" >&6
5191
else
5192
cat >conftest.$ac_ext <<_ACEOF
5193
-#line 6444 "configure"
5194
+#line 6653 "configure"
5195
#include "confdefs.h"
5196
#include <langinfo.h>
5197
int
5198
@@ -6453,16 +6662,16 @@ char* cs = nl_langinfo(CODESET);
5199
}
5200
_ACEOF
5201
rm -f conftest.$ac_objext conftest$ac_exeext
5202
-if { (eval echo "$as_me:6456: \"$ac_link\"") >&5
5203
+if { (eval echo "$as_me:6665: \"$ac_link\"") >&5
5204
(eval $ac_link) 2>&5
5205
ac_status=$?
5206
- echo "$as_me:6459: \$? = $ac_status" >&5
5207
+ echo "$as_me:6668: \$? = $ac_status" >&5
5208
(exit $ac_status); } &&
5209
{ ac_try='test -s conftest$ac_exeext'
5210
- { (eval echo "$as_me:6462: \"$ac_try\"") >&5
5211
+ { (eval echo "$as_me:6671: \"$ac_try\"") >&5
5212
(eval $ac_try) 2>&5
5213
ac_status=$?
5214
- echo "$as_me:6465: \$? = $ac_status" >&5
5215
+ echo "$as_me:6674: \$? = $ac_status" >&5
5216
(exit $ac_status); }; }; then
5217
am_cv_langinfo_codeset=yes
5218
else
5219
@@ -6473,7 +6682,7 @@ fi
5220
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5221
5222
fi
5223
-echo "$as_me:6476: result: $am_cv_langinfo_codeset" >&5
5224
+echo "$as_me:6685: result: $am_cv_langinfo_codeset" >&5
5225
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
5226
if test $am_cv_langinfo_codeset = yes; then
5227
5228
@@ -6487,7 +6696,7 @@ EOF
5229
NCURSES_OK_WCHAR_T=
5230
NCURSES_OK_WINT_T=
5231
5232
-echo "$as_me:6490: checking if you want wide-character code" >&5
5233
+echo "$as_me:6699: checking if you want wide-character code" >&5
5234
echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
5235
5236
# Check whether --enable-widec or --disable-widec was given.
5237
@@ -6497,7 +6706,7 @@ if test "${enable_widec+set}" = set; the
5238
else
5239
with_widec=no
5240
fi;
5241
-echo "$as_me:6500: result: $with_widec" >&5
5242
+echo "$as_me:6709: result: $with_widec" >&5
5243
echo "${ECHO_T}$with_widec" >&6
5244
if test "$with_widec" = yes ; then
5245
LIB_SUFFIX="w${LIB_SUFFIX}"
5246
@@ -6505,10 +6714,10 @@ if test "$with_widec" = yes ; then
5247
#define USE_WIDEC_SUPPORT 1
5248
EOF
5249
5250
-echo "$as_me:6508: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
5251
+echo "$as_me:6717: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
5252
echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
5253
cat >conftest.$ac_ext <<_ACEOF
5254
-#line 6511 "configure"
5255
+#line 6720 "configure"
5256
#include "confdefs.h"
5257
#include <sys/types.h>
5258
5259
@@ -6524,16 +6733,16 @@ make an error
5260
}
5261
_ACEOF
5262
rm -f conftest.$ac_objext
5263
-if { (eval echo "$as_me:6527: \"$ac_compile\"") >&5
5264
+if { (eval echo "$as_me:6736: \"$ac_compile\"") >&5
5265
(eval $ac_compile) 2>&5
5266
ac_status=$?
5267
- echo "$as_me:6530: \$? = $ac_status" >&5
5268
+ echo "$as_me:6739: \$? = $ac_status" >&5
5269
(exit $ac_status); } &&
5270
{ ac_try='test -s conftest.$ac_objext'
5271
- { (eval echo "$as_me:6533: \"$ac_try\"") >&5
5272
+ { (eval echo "$as_me:6742: \"$ac_try\"") >&5
5273
(eval $ac_try) 2>&5
5274
ac_status=$?
5275
- echo "$as_me:6536: \$? = $ac_status" >&5
5276
+ echo "$as_me:6745: \$? = $ac_status" >&5
5277
(exit $ac_status); }; }; then
5278
cf_result=no
5279
else
5280
@@ -6542,16 +6751,16 @@ cat conftest.$ac_ext >&5
5281
cf_result=yes
5282
fi
5283
rm -f conftest.$ac_objext conftest.$ac_ext
5284
-echo "$as_me:6545: result: $cf_result" >&5
5285
+echo "$as_me:6754: result: $cf_result" >&5
5286
echo "${ECHO_T}$cf_result" >&6
5287
5288
if test "$cf_result" = yes ; then
5289
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
5290
elif test "x" != "x" ; then
5291
- echo "$as_me:6551: checking checking for compatible value versus " >&5
5292
+ echo "$as_me:6760: checking checking for compatible value versus " >&5
5293
echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
5294
cat >conftest.$ac_ext <<_ACEOF
5295
-#line 6554 "configure"
5296
+#line 6763 "configure"
5297
#include "confdefs.h"
5298
#include <sys/types.h>
5299
5300
@@ -6567,16 +6776,16 @@ make an error
5301
}
5302
_ACEOF
5303
rm -f conftest.$ac_objext
5304
-if { (eval echo "$as_me:6570: \"$ac_compile\"") >&5
5305
+if { (eval echo "$as_me:6779: \"$ac_compile\"") >&5
5306
(eval $ac_compile) 2>&5
5307
ac_status=$?
5308
- echo "$as_me:6573: \$? = $ac_status" >&5
5309
+ echo "$as_me:6782: \$? = $ac_status" >&5
5310
(exit $ac_status); } &&
5311
{ ac_try='test -s conftest.$ac_objext'
5312
- { (eval echo "$as_me:6576: \"$ac_try\"") >&5
5313
+ { (eval echo "$as_me:6785: \"$ac_try\"") >&5
5314
(eval $ac_try) 2>&5
5315
ac_status=$?
5316
- echo "$as_me:6579: \$? = $ac_status" >&5
5317
+ echo "$as_me:6788: \$? = $ac_status" >&5
5318
(exit $ac_status); }; }; then
5319
cf_result=yes
5320
else
5321
@@ -6585,7 +6794,7 @@ cat conftest.$ac_ext >&5
5322
cf_result=no
5323
fi
5324
rm -f conftest.$ac_objext conftest.$ac_ext
5325
- echo "$as_me:6588: result: $cf_result" >&5
5326
+ echo "$as_me:6797: result: $cf_result" >&5
5327
echo "${ECHO_T}$cf_result" >&6
5328
if test "$cf_result" = no ; then
5329
# perhaps we can override it - try...
5330
@@ -6599,13 +6808,13 @@ fi
5331
for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
5332
do
5333
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5334
-echo "$as_me:6602: checking for $ac_func" >&5
5335
+echo "$as_me:6811: checking for $ac_func" >&5
5336
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5337
if eval "test \"\${$as_ac_var+set}\" = set"; then
5338
echo $ECHO_N "(cached) $ECHO_C" >&6
5339
else
5340
cat >conftest.$ac_ext <<_ACEOF
5341
-#line 6608 "configure"
5342
+#line 6817 "configure"
5343
#include "confdefs.h"
5344
/* System header to define __stub macros and hopefully few prototypes,
5345
which can conflict with char $ac_func (); below. */
5346
@@ -6636,16 +6845,16 @@ f = $ac_func;
5347
}
5348
_ACEOF
5349
rm -f conftest.$ac_objext conftest$ac_exeext
5350
-if { (eval echo "$as_me:6639: \"$ac_link\"") >&5
5351
+if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
5352
(eval $ac_link) 2>&5
5353
ac_status=$?
5354
- echo "$as_me:6642: \$? = $ac_status" >&5
5355
+ echo "$as_me:6851: \$? = $ac_status" >&5
5356
(exit $ac_status); } &&
5357
{ ac_try='test -s conftest$ac_exeext'
5358
- { (eval echo "$as_me:6645: \"$ac_try\"") >&5
5359
+ { (eval echo "$as_me:6854: \"$ac_try\"") >&5
5360
(eval $ac_try) 2>&5
5361
ac_status=$?
5362
- echo "$as_me:6648: \$? = $ac_status" >&5
5363
+ echo "$as_me:6857: \$? = $ac_status" >&5
5364
(exit $ac_status); }; }; then
5365
eval "$as_ac_var=yes"
5366
else
5367
@@ -6655,7 +6864,7 @@ eval "$as_ac_var=no"
5368
fi
5369
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5370
fi
5371
-echo "$as_me:6658: result: `eval echo '${'$as_ac_var'}'`" >&5
5372
+echo "$as_me:6867: result: `eval echo '${'$as_ac_var'}'`" >&5
5373
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5374
if test `eval echo '${'$as_ac_var'}'` = yes; then
5375
cat >>confdefs.h <<EOF
5376
@@ -6667,7 +6876,7 @@ done
5377
5378
if test "$ac_cv_func_putwc" != yes ; then
5379
5380
-echo "$as_me:6670: checking for putwc in libutf8" >&5
5381
+echo "$as_me:6879: checking for putwc in libutf8" >&5
5382
echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
5383
if test "${cf_cv_libutf8+set}" = set; then
5384
echo $ECHO_N "(cached) $ECHO_C" >&6
5385
@@ -6676,7 +6885,7 @@ else
5386
cf_save_LIBS="$LIBS"
5387
LIBS="-lutf8 $LIBS"
5388
cat >conftest.$ac_ext <<_ACEOF
5389
-#line 6679 "configure"
5390
+#line 6888 "configure"
5391
#include "confdefs.h"
5392
5393
#include <libutf8.h>
5394
@@ -6689,16 +6898,16 @@ putwc(0,0);
5395
}
5396
_ACEOF
5397
rm -f conftest.$ac_objext conftest$ac_exeext
5398
-if { (eval echo "$as_me:6692: \"$ac_link\"") >&5
5399
+if { (eval echo "$as_me:6901: \"$ac_link\"") >&5
5400
(eval $ac_link) 2>&5
5401
ac_status=$?
5402
- echo "$as_me:6695: \$? = $ac_status" >&5
5403
+ echo "$as_me:6904: \$? = $ac_status" >&5
5404
(exit $ac_status); } &&
5405
{ ac_try='test -s conftest$ac_exeext'
5406
- { (eval echo "$as_me:6698: \"$ac_try\"") >&5
5407
+ { (eval echo "$as_me:6907: \"$ac_try\"") >&5
5408
(eval $ac_try) 2>&5
5409
ac_status=$?
5410
- echo "$as_me:6701: \$? = $ac_status" >&5
5411
+ echo "$as_me:6910: \$? = $ac_status" >&5
5412
(exit $ac_status); }; }; then
5413
cf_cv_libutf8=yes
5414
else
5415
@@ -6710,7 +6919,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
5416
LIBS="$cf_save_LIBS"
5417
5418
fi
5419
-echo "$as_me:6713: result: $cf_cv_libutf8" >&5
5420
+echo "$as_me:6922: result: $cf_cv_libutf8" >&5
5421
echo "${ECHO_T}$cf_cv_libutf8" >&6
5422
5423
if test "$cf_cv_libutf8" = yes ; then
5424
@@ -6727,14 +6936,14 @@ fi
5425
fi
5426
5427
# This is needed on Tru64 5.0 to declare mbstate_t
5428
-echo "$as_me:6730: checking if we must include wchar.h to declare mbstate_t" >&5
5429
+echo "$as_me:6939: checking if we must include wchar.h to declare mbstate_t" >&5
5430
echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
5431
if test "${cf_cv_mbstate_t+set}" = set; then
5432
echo $ECHO_N "(cached) $ECHO_C" >&6
5433
else
5434
5435
cat >conftest.$ac_ext <<_ACEOF
5436
-#line 6737 "configure"
5437
+#line 6946 "configure"
5438
#include "confdefs.h"
5439
5440
#include <stdlib.h>
5441
@@ -6752,23 +6961,23 @@ mbstate_t state
5442
}
5443
_ACEOF
5444
rm -f conftest.$ac_objext
5445
-if { (eval echo "$as_me:6755: \"$ac_compile\"") >&5
5446
+if { (eval echo "$as_me:6964: \"$ac_compile\"") >&5
5447
(eval $ac_compile) 2>&5
5448
ac_status=$?
5449
- echo "$as_me:6758: \$? = $ac_status" >&5
5450
+ echo "$as_me:6967: \$? = $ac_status" >&5
5451
(exit $ac_status); } &&
5452
{ ac_try='test -s conftest.$ac_objext'
5453
- { (eval echo "$as_me:6761: \"$ac_try\"") >&5
5454
+ { (eval echo "$as_me:6970: \"$ac_try\"") >&5
5455
(eval $ac_try) 2>&5
5456
ac_status=$?
5457
- echo "$as_me:6764: \$? = $ac_status" >&5
5458
+ echo "$as_me:6973: \$? = $ac_status" >&5
5459
(exit $ac_status); }; }; then
5460
cf_cv_mbstate_t=no
5461
else
5462
echo "$as_me: failed program was:" >&5
5463
cat conftest.$ac_ext >&5
5464
cat >conftest.$ac_ext <<_ACEOF
5465
-#line 6771 "configure"
5466
+#line 6980 "configure"
5467
#include "confdefs.h"
5468
5469
#include <stdlib.h>
5470
@@ -6787,16 +6996,16 @@ mbstate_t value
5471
}
5472
_ACEOF
5473
rm -f conftest.$ac_objext
5474
-if { (eval echo "$as_me:6790: \"$ac_compile\"") >&5
5475
+if { (eval echo "$as_me:6999: \"$ac_compile\"") >&5
5476
(eval $ac_compile) 2>&5
5477
ac_status=$?
5478
- echo "$as_me:6793: \$? = $ac_status" >&5
5479
+ echo "$as_me:7002: \$? = $ac_status" >&5
5480
(exit $ac_status); } &&
5481
{ ac_try='test -s conftest.$ac_objext'
5482
- { (eval echo "$as_me:6796: \"$ac_try\"") >&5
5483
+ { (eval echo "$as_me:7005: \"$ac_try\"") >&5
5484
(eval $ac_try) 2>&5
5485
ac_status=$?
5486
- echo "$as_me:6799: \$? = $ac_status" >&5
5487
+ echo "$as_me:7008: \$? = $ac_status" >&5
5488
(exit $ac_status); }; }; then
5489
cf_cv_mbstate_t=yes
5490
else
5491
@@ -6808,7 +7017,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
5492
fi
5493
rm -f conftest.$ac_objext conftest.$ac_ext
5494
fi
5495
-echo "$as_me:6811: result: $cf_cv_mbstate_t" >&5
5496
+echo "$as_me:7020: result: $cf_cv_mbstate_t" >&5
5497
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
5498
5499
if test "$cf_cv_mbstate_t" = yes ; then
5500
@@ -6825,14 +7034,14 @@ if test "$cf_cv_mbstate_t" = unknown ; t
5501
fi
5502
5503
# This is needed on Tru64 5.0 to declare wchar_t
5504
-echo "$as_me:6828: checking if we must include wchar.h to declare wchar_t" >&5
5505
+echo "$as_me:7037: checking if we must include wchar.h to declare wchar_t" >&5
5506
echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
5507
if test "${cf_cv_wchar_t+set}" = set; then
5508
echo $ECHO_N "(cached) $ECHO_C" >&6
5509
else
5510
5511
cat >conftest.$ac_ext <<_ACEOF
5512
-#line 6835 "configure"
5513
+#line 7044 "configure"
5514
#include "confdefs.h"
5515
5516
#include <stdlib.h>
5517
@@ -6850,23 +7059,23 @@ wchar_t state
5518
}
5519
_ACEOF
5520
rm -f conftest.$ac_objext
5521
-if { (eval echo "$as_me:6853: \"$ac_compile\"") >&5
5522
+if { (eval echo "$as_me:7062: \"$ac_compile\"") >&5
5523
(eval $ac_compile) 2>&5
5524
ac_status=$?
5525
- echo "$as_me:6856: \$? = $ac_status" >&5
5526
+ echo "$as_me:7065: \$? = $ac_status" >&5
5527
(exit $ac_status); } &&
5528
{ ac_try='test -s conftest.$ac_objext'
5529
- { (eval echo "$as_me:6859: \"$ac_try\"") >&5
5530
+ { (eval echo "$as_me:7068: \"$ac_try\"") >&5
5531
(eval $ac_try) 2>&5
5532
ac_status=$?
5533
- echo "$as_me:6862: \$? = $ac_status" >&5
5534
+ echo "$as_me:7071: \$? = $ac_status" >&5
5535
(exit $ac_status); }; }; then
5536
cf_cv_wchar_t=no
5537
else
5538
echo "$as_me: failed program was:" >&5
5539
cat conftest.$ac_ext >&5
5540
cat >conftest.$ac_ext <<_ACEOF
5541
-#line 6869 "configure"
5542
+#line 7078 "configure"
5543
#include "confdefs.h"
5544
5545
#include <stdlib.h>
5546
@@ -6885,16 +7094,16 @@ wchar_t value
5547
}
5548
_ACEOF
5549
rm -f conftest.$ac_objext
5550
-if { (eval echo "$as_me:6888: \"$ac_compile\"") >&5
5551
+if { (eval echo "$as_me:7097: \"$ac_compile\"") >&5
5552
(eval $ac_compile) 2>&5
5553
ac_status=$?
5554
- echo "$as_me:6891: \$? = $ac_status" >&5
5555
+ echo "$as_me:7100: \$? = $ac_status" >&5
5556
(exit $ac_status); } &&
5557
{ ac_try='test -s conftest.$ac_objext'
5558
- { (eval echo "$as_me:6894: \"$ac_try\"") >&5
5559
+ { (eval echo "$as_me:7103: \"$ac_try\"") >&5
5560
(eval $ac_try) 2>&5
5561
ac_status=$?
5562
- echo "$as_me:6897: \$? = $ac_status" >&5
5563
+ echo "$as_me:7106: \$? = $ac_status" >&5
5564
(exit $ac_status); }; }; then
5565
cf_cv_wchar_t=yes
5566
else
5567
@@ -6906,7 +7115,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
5568
fi
5569
rm -f conftest.$ac_objext conftest.$ac_ext
5570
fi
5571
-echo "$as_me:6909: result: $cf_cv_wchar_t" >&5
5572
+echo "$as_me:7118: result: $cf_cv_wchar_t" >&5
5573
echo "${ECHO_T}$cf_cv_wchar_t" >&6
5574
5575
if test "$cf_cv_wchar_t" = yes ; then
5576
@@ -6928,14 +7137,14 @@ if test "$cf_cv_wchar_t" != unknown ; th
5577
fi
5578
5579
# This is needed on Tru64 5.0 to declare wint_t
5580
-echo "$as_me:6931: checking if we must include wchar.h to declare wint_t" >&5
5581
+echo "$as_me:7140: checking if we must include wchar.h to declare wint_t" >&5
5582
echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
5583
if test "${cf_cv_wint_t+set}" = set; then
5584
echo $ECHO_N "(cached) $ECHO_C" >&6
5585
else
5586
5587
cat >conftest.$ac_ext <<_ACEOF
5588
-#line 6938 "configure"
5589
+#line 7147 "configure"
5590
#include "confdefs.h"
5591
5592
#include <stdlib.h>
5593
@@ -6953,23 +7162,23 @@ wint_t state
5594
}
5595
_ACEOF
5596
rm -f conftest.$ac_objext
5597
-if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5
5598
+if { (eval echo "$as_me:7165: \"$ac_compile\"") >&5
5599
(eval $ac_compile) 2>&5
5600
ac_status=$?
5601
- echo "$as_me:6959: \$? = $ac_status" >&5
5602
+ echo "$as_me:7168: \$? = $ac_status" >&5
5603
(exit $ac_status); } &&
5604
{ ac_try='test -s conftest.$ac_objext'
5605
- { (eval echo "$as_me:6962: \"$ac_try\"") >&5
5606
+ { (eval echo "$as_me:7171: \"$ac_try\"") >&5
5607
(eval $ac_try) 2>&5
5608
ac_status=$?
5609
- echo "$as_me:6965: \$? = $ac_status" >&5
5610
+ echo "$as_me:7174: \$? = $ac_status" >&5
5611
(exit $ac_status); }; }; then
5612
cf_cv_wint_t=no
5613
else
5614
echo "$as_me: failed program was:" >&5
5615
cat conftest.$ac_ext >&5
5616
cat >conftest.$ac_ext <<_ACEOF
5617
-#line 6972 "configure"
5618
+#line 7181 "configure"
5619
#include "confdefs.h"
5620
5621
#include <stdlib.h>
5622
@@ -6988,16 +7197,16 @@ wint_t value
5623
}
5624
_ACEOF
5625
rm -f conftest.$ac_objext
5626
-if { (eval echo "$as_me:6991: \"$ac_compile\"") >&5
5627
+if { (eval echo "$as_me:7200: \"$ac_compile\"") >&5
5628
(eval $ac_compile) 2>&5
5629
ac_status=$?
5630
- echo "$as_me:6994: \$? = $ac_status" >&5
5631
+ echo "$as_me:7203: \$? = $ac_status" >&5
5632
(exit $ac_status); } &&
5633
{ ac_try='test -s conftest.$ac_objext'
5634
- { (eval echo "$as_me:6997: \"$ac_try\"") >&5
5635
+ { (eval echo "$as_me:7206: \"$ac_try\"") >&5
5636
(eval $ac_try) 2>&5
5637
ac_status=$?
5638
- echo "$as_me:7000: \$? = $ac_status" >&5
5639
+ echo "$as_me:7209: \$? = $ac_status" >&5
5640
(exit $ac_status); }; }; then
5641
cf_cv_wint_t=yes
5642
else
5643
@@ -7009,7 +7218,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
5644
fi
5645
rm -f conftest.$ac_objext conftest.$ac_ext
5646
fi
5647
-echo "$as_me:7012: result: $cf_cv_wint_t" >&5
5648
+echo "$as_me:7221: result: $cf_cv_wint_t" >&5
5649
echo "${ECHO_T}$cf_cv_wint_t" >&6
5650
5651
if test "$cf_cv_wint_t" = yes ; then
5652
@@ -7048,7 +7257,7 @@ case $cf_cv_abi_version in
5653
;;
5654
esac
5655
5656
-echo "$as_me:7051: checking whether to enable _LP64 definition in curses.h" >&5
5657
+echo "$as_me:7260: checking whether to enable _LP64 definition in curses.h" >&5
5658
echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
5659
5660
# Check whether --enable-lp64 or --disable-lp64 was given.
5661
@@ -7058,7 +7267,7 @@ if test "${enable_lp64+set}" = set; then
5662
else
5663
with_lp64=$default_with_lp64
5664
fi;
5665
-echo "$as_me:7061: result: $with_lp64" >&5
5666
+echo "$as_me:7270: result: $with_lp64" >&5
5667
echo "${ECHO_T}$with_lp64" >&6
5668
5669
if test "$with_lp64" = yes ; then
5670
@@ -7067,7 +7276,7 @@ else
5671
cf_cv_enable_lp64=0
5672
fi
5673
5674
- echo "$as_me:7070: checking for _LARGEFILE_SOURCE value needed for large files" >&5
5675
+ echo "$as_me:7279: checking for _LARGEFILE_SOURCE value needed for large files" >&5
5676
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
5677
if test "${ac_cv_sys_largefile_source+set}" = set; then
5678
echo $ECHO_N "(cached) $ECHO_C" >&6
5679
@@ -7075,7 +7284,7 @@ else
5680
while :; do
5681
ac_cv_sys_largefile_source=no
5682
cat >conftest.$ac_ext <<_ACEOF
5683
-#line 7078 "configure"
5684
+#line 7287 "configure"
5685
#include "confdefs.h"
5686
#include <stdio.h>
5687
int
5688
@@ -7087,16 +7296,16 @@ return !fseeko;
5689
}
5690
_ACEOF
5691
rm -f conftest.$ac_objext
5692
-if { (eval echo "$as_me:7090: \"$ac_compile\"") >&5
5693
+if { (eval echo "$as_me:7299: \"$ac_compile\"") >&5
5694
(eval $ac_compile) 2>&5
5695
ac_status=$?
5696
- echo "$as_me:7093: \$? = $ac_status" >&5
5697
+ echo "$as_me:7302: \$? = $ac_status" >&5
5698
(exit $ac_status); } &&
5699
{ ac_try='test -s conftest.$ac_objext'
5700
- { (eval echo "$as_me:7096: \"$ac_try\"") >&5
5701
+ { (eval echo "$as_me:7305: \"$ac_try\"") >&5
5702
(eval $ac_try) 2>&5
5703
ac_status=$?
5704
- echo "$as_me:7099: \$? = $ac_status" >&5
5705
+ echo "$as_me:7308: \$? = $ac_status" >&5
5706
(exit $ac_status); }; }; then
5707
break
5708
else
5709
@@ -7105,7 +7314,7 @@ cat conftest.$ac_ext >&5
5710
fi
5711
rm -f conftest.$ac_objext conftest.$ac_ext
5712
cat >conftest.$ac_ext <<_ACEOF
5713
-#line 7108 "configure"
5714
+#line 7317 "configure"
5715
#include "confdefs.h"
5716
#define _LARGEFILE_SOURCE 1
5717
#include <stdio.h>
5718
@@ -7118,16 +7327,16 @@ return !fseeko;
5719
}
5720
_ACEOF
5721
rm -f conftest.$ac_objext
5722
-if { (eval echo "$as_me:7121: \"$ac_compile\"") >&5
5723
+if { (eval echo "$as_me:7330: \"$ac_compile\"") >&5
5724
(eval $ac_compile) 2>&5
5725
ac_status=$?
5726
- echo "$as_me:7124: \$? = $ac_status" >&5
5727
+ echo "$as_me:7333: \$? = $ac_status" >&5
5728
(exit $ac_status); } &&
5729
{ ac_try='test -s conftest.$ac_objext'
5730
- { (eval echo "$as_me:7127: \"$ac_try\"") >&5
5731
+ { (eval echo "$as_me:7336: \"$ac_try\"") >&5
5732
(eval $ac_try) 2>&5
5733
ac_status=$?
5734
- echo "$as_me:7130: \$? = $ac_status" >&5
5735
+ echo "$as_me:7339: \$? = $ac_status" >&5
5736
(exit $ac_status); }; }; then
5737
ac_cv_sys_largefile_source=1; break
5738
else
5739
@@ -7138,7 +7347,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
5740
break
5741
done
5742
fi
5743
-echo "$as_me:7141: result: $ac_cv_sys_largefile_source" >&5
5744
+echo "$as_me:7350: result: $ac_cv_sys_largefile_source" >&5
5745
echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
5746
if test "$ac_cv_sys_largefile_source" != no; then
5747
5748
@@ -7152,13 +7361,13 @@ rm -f conftest*
5749
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
5750
# in glibc 2.1.3, but that breaks too many other things.
5751
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
5752
-echo "$as_me:7155: checking for fseeko" >&5
5753
+echo "$as_me:7364: checking for fseeko" >&5
5754
echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
5755
if test "${ac_cv_func_fseeko+set}" = set; then
5756
echo $ECHO_N "(cached) $ECHO_C" >&6
5757
else
5758
cat >conftest.$ac_ext <<_ACEOF
5759
-#line 7161 "configure"
5760
+#line 7370 "configure"
5761
#include "confdefs.h"
5762
#include <stdio.h>
5763
int
5764
@@ -7170,16 +7379,16 @@ return fseeko && fseeko (stdin, 0, 0);
5765
}
5766
_ACEOF
5767
rm -f conftest.$ac_objext conftest$ac_exeext
5768
-if { (eval echo "$as_me:7173: \"$ac_link\"") >&5
5769
+if { (eval echo "$as_me:7382: \"$ac_link\"") >&5
5770
(eval $ac_link) 2>&5
5771
ac_status=$?
5772
- echo "$as_me:7176: \$? = $ac_status" >&5
5773
+ echo "$as_me:7385: \$? = $ac_status" >&5
5774
(exit $ac_status); } &&
5775
{ ac_try='test -s conftest$ac_exeext'
5776
- { (eval echo "$as_me:7179: \"$ac_try\"") >&5
5777
+ { (eval echo "$as_me:7388: \"$ac_try\"") >&5
5778
(eval $ac_try) 2>&5
5779
ac_status=$?
5780
- echo "$as_me:7182: \$? = $ac_status" >&5
5781
+ echo "$as_me:7391: \$? = $ac_status" >&5
5782
(exit $ac_status); }; }; then
5783
ac_cv_func_fseeko=yes
5784
else
5785
@@ -7189,7 +7398,7 @@ ac_cv_func_fseeko=no
5786
fi
5787
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5788
fi
5789
-echo "$as_me:7192: result: $ac_cv_func_fseeko" >&5
5790
+echo "$as_me:7401: result: $ac_cv_func_fseeko" >&5
5791
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
5792
if test $ac_cv_func_fseeko = yes; then
5793
5794
@@ -7206,7 +7415,7 @@ if test "${enable_largefile+set}" = set;
5795
fi;
5796
if test "$enable_largefile" != no; then
5797
5798
- echo "$as_me:7209: checking for special C compiler options needed for large files" >&5
5799
+ echo "$as_me:7418: checking for special C compiler options needed for large files" >&5
5800
echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
5801
if test "${ac_cv_sys_largefile_CC+set}" = set; then
5802
echo $ECHO_N "(cached) $ECHO_C" >&6
5803
@@ -7218,7 +7427,7 @@ else
5804
# IRIX 6.2 and later do not support large files by default,
5805
# so use the C compiler's -n32 option if that helps.
5806
cat >conftest.$ac_ext <<_ACEOF
5807
-#line 7221 "configure"
5808
+#line 7430 "configure"
5809
#include "confdefs.h"
5810
#include <sys/types.h>
5811
/* Check that off_t can represent 2**63 - 1 correctly.
5812
@@ -7238,16 +7447,16 @@ main ()
5813
}
5814
_ACEOF
5815
rm -f conftest.$ac_objext
5816
-if { (eval echo "$as_me:7241: \"$ac_compile\"") >&5
5817
+if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
5818
(eval $ac_compile) 2>&5
5819
ac_status=$?
5820
- echo "$as_me:7244: \$? = $ac_status" >&5
5821
+ echo "$as_me:7453: \$? = $ac_status" >&5
5822
(exit $ac_status); } &&
5823
{ ac_try='test -s conftest.$ac_objext'
5824
- { (eval echo "$as_me:7247: \"$ac_try\"") >&5
5825
+ { (eval echo "$as_me:7456: \"$ac_try\"") >&5
5826
(eval $ac_try) 2>&5
5827
ac_status=$?
5828
- echo "$as_me:7250: \$? = $ac_status" >&5
5829
+ echo "$as_me:7459: \$? = $ac_status" >&5
5830
(exit $ac_status); }; }; then
5831
break
5832
else
5833
@@ -7257,16 +7466,16 @@ fi
5834
rm -f conftest.$ac_objext
5835
CC="$CC -n32"
5836
rm -f conftest.$ac_objext
5837
-if { (eval echo "$as_me:7260: \"$ac_compile\"") >&5
5838
+if { (eval echo "$as_me:7469: \"$ac_compile\"") >&5
5839
(eval $ac_compile) 2>&5
5840
ac_status=$?
5841
- echo "$as_me:7263: \$? = $ac_status" >&5
5842
+ echo "$as_me:7472: \$? = $ac_status" >&5
5843
(exit $ac_status); } &&
5844
{ ac_try='test -s conftest.$ac_objext'
5845
- { (eval echo "$as_me:7266: \"$ac_try\"") >&5
5846
+ { (eval echo "$as_me:7475: \"$ac_try\"") >&5
5847
(eval $ac_try) 2>&5
5848
ac_status=$?
5849
- echo "$as_me:7269: \$? = $ac_status" >&5
5850
+ echo "$as_me:7478: \$? = $ac_status" >&5
5851
(exit $ac_status); }; }; then
5852
ac_cv_sys_largefile_CC=' -n32'; break
5853
else
5854
@@ -7280,13 +7489,13 @@ rm -f conftest.$ac_objext
5855
rm -f conftest.$ac_ext
5856
fi
5857
fi
5858
-echo "$as_me:7283: result: $ac_cv_sys_largefile_CC" >&5
5859
+echo "$as_me:7492: result: $ac_cv_sys_largefile_CC" >&5
5860
echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
5861
if test "$ac_cv_sys_largefile_CC" != no; then
5862
CC=$CC$ac_cv_sys_largefile_CC
5863
fi
5864
5865
- echo "$as_me:7289: checking for _FILE_OFFSET_BITS value needed for large files" >&5
5866
+ echo "$as_me:7498: checking for _FILE_OFFSET_BITS value needed for large files" >&5
5867
echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
5868
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
5869
echo $ECHO_N "(cached) $ECHO_C" >&6
5870
@@ -7294,7 +7503,7 @@ else
5871
while :; do
5872
ac_cv_sys_file_offset_bits=no
5873
cat >conftest.$ac_ext <<_ACEOF
5874
-#line 7297 "configure"
5875
+#line 7506 "configure"
5876
#include "confdefs.h"
5877
#include <sys/types.h>
5878
/* Check that off_t can represent 2**63 - 1 correctly.
5879
@@ -7314,16 +7523,16 @@ main ()
5880
}
5881
_ACEOF
5882
rm -f conftest.$ac_objext
5883
-if { (eval echo "$as_me:7317: \"$ac_compile\"") >&5
5884
+if { (eval echo "$as_me:7526: \"$ac_compile\"") >&5
5885
(eval $ac_compile) 2>&5
5886
ac_status=$?
5887
- echo "$as_me:7320: \$? = $ac_status" >&5
5888
+ echo "$as_me:7529: \$? = $ac_status" >&5
5889
(exit $ac_status); } &&
5890
{ ac_try='test -s conftest.$ac_objext'
5891
- { (eval echo "$as_me:7323: \"$ac_try\"") >&5
5892
+ { (eval echo "$as_me:7532: \"$ac_try\"") >&5
5893
(eval $ac_try) 2>&5
5894
ac_status=$?
5895
- echo "$as_me:7326: \$? = $ac_status" >&5
5896
+ echo "$as_me:7535: \$? = $ac_status" >&5
5897
(exit $ac_status); }; }; then
5898
break
5899
else
5900
@@ -7332,7 +7541,7 @@ cat conftest.$ac_ext >&5
5901
fi
5902
rm -f conftest.$ac_objext conftest.$ac_ext
5903
cat >conftest.$ac_ext <<_ACEOF
5904
-#line 7335 "configure"
5905
+#line 7544 "configure"
5906
#include "confdefs.h"
5907
#define _FILE_OFFSET_BITS 64
5908
#include <sys/types.h>
5909
@@ -7353,16 +7562,16 @@ main ()
5910
}
5911
_ACEOF
5912
rm -f conftest.$ac_objext
5913
-if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
5914
+if { (eval echo "$as_me:7565: \"$ac_compile\"") >&5
5915
(eval $ac_compile) 2>&5
5916
ac_status=$?
5917
- echo "$as_me:7359: \$? = $ac_status" >&5
5918
+ echo "$as_me:7568: \$? = $ac_status" >&5
5919
(exit $ac_status); } &&
5920
{ ac_try='test -s conftest.$ac_objext'
5921
- { (eval echo "$as_me:7362: \"$ac_try\"") >&5
5922
+ { (eval echo "$as_me:7571: \"$ac_try\"") >&5
5923
(eval $ac_try) 2>&5
5924
ac_status=$?
5925
- echo "$as_me:7365: \$? = $ac_status" >&5
5926
+ echo "$as_me:7574: \$? = $ac_status" >&5
5927
(exit $ac_status); }; }; then
5928
ac_cv_sys_file_offset_bits=64; break
5929
else
5930
@@ -7373,7 +7582,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
5931
break
5932
done
5933
fi
5934
-echo "$as_me:7376: result: $ac_cv_sys_file_offset_bits" >&5
5935
+echo "$as_me:7585: result: $ac_cv_sys_file_offset_bits" >&5
5936
echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
5937
if test "$ac_cv_sys_file_offset_bits" != no; then
5938
5939
@@ -7383,7 +7592,7 @@ EOF
5940
5941
fi
5942
rm -f conftest*
5943
- echo "$as_me:7386: checking for _LARGE_FILES value needed for large files" >&5
5944
+ echo "$as_me:7595: checking for _LARGE_FILES value needed for large files" >&5
5945
echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
5946
if test "${ac_cv_sys_large_files+set}" = set; then
5947
echo $ECHO_N "(cached) $ECHO_C" >&6
5948
@@ -7391,7 +7600,7 @@ else
5949
while :; do
5950
ac_cv_sys_large_files=no
5951
cat >conftest.$ac_ext <<_ACEOF
5952
-#line 7394 "configure"
5953
+#line 7603 "configure"
5954
#include "confdefs.h"
5955
#include <sys/types.h>
5956
/* Check that off_t can represent 2**63 - 1 correctly.
5957
@@ -7411,16 +7620,16 @@ main ()
5958
}
5959
_ACEOF
5960
rm -f conftest.$ac_objext
5961
-if { (eval echo "$as_me:7414: \"$ac_compile\"") >&5
5962
+if { (eval echo "$as_me:7623: \"$ac_compile\"") >&5
5963
(eval $ac_compile) 2>&5
5964
ac_status=$?
5965
- echo "$as_me:7417: \$? = $ac_status" >&5
5966
+ echo "$as_me:7626: \$? = $ac_status" >&5
5967
(exit $ac_status); } &&
5968
{ ac_try='test -s conftest.$ac_objext'
5969
- { (eval echo "$as_me:7420: \"$ac_try\"") >&5
5970
+ { (eval echo "$as_me:7629: \"$ac_try\"") >&5
5971
(eval $ac_try) 2>&5
5972
ac_status=$?
5973
- echo "$as_me:7423: \$? = $ac_status" >&5
5974
+ echo "$as_me:7632: \$? = $ac_status" >&5
5975
(exit $ac_status); }; }; then
5976
break
5977
else
5978
@@ -7429,7 +7638,7 @@ cat conftest.$ac_ext >&5
5979
fi
5980
rm -f conftest.$ac_objext conftest.$ac_ext
5981
cat >conftest.$ac_ext <<_ACEOF
5982
-#line 7432 "configure"
5983
+#line 7641 "configure"
5984
#include "confdefs.h"
5985
#define _LARGE_FILES 1
5986
#include <sys/types.h>
5987
@@ -7450,16 +7659,16 @@ main ()
5988
}
5989
_ACEOF
5990
rm -f conftest.$ac_objext
5991
-if { (eval echo "$as_me:7453: \"$ac_compile\"") >&5
5992
+if { (eval echo "$as_me:7662: \"$ac_compile\"") >&5
5993
(eval $ac_compile) 2>&5
5994
ac_status=$?
5995
- echo "$as_me:7456: \$? = $ac_status" >&5
5996
+ echo "$as_me:7665: \$? = $ac_status" >&5
5997
(exit $ac_status); } &&
5998
{ ac_try='test -s conftest.$ac_objext'
5999
- { (eval echo "$as_me:7459: \"$ac_try\"") >&5
6000
+ { (eval echo "$as_me:7668: \"$ac_try\"") >&5
6001
(eval $ac_try) 2>&5
6002
ac_status=$?
6003
- echo "$as_me:7462: \$? = $ac_status" >&5
6004
+ echo "$as_me:7671: \$? = $ac_status" >&5
6005
(exit $ac_status); }; }; then
6006
ac_cv_sys_large_files=1; break
6007
else
6008
@@ -7470,7 +7679,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
6009
break
6010
done
6011
fi
6012
-echo "$as_me:7473: result: $ac_cv_sys_large_files" >&5
6013
+echo "$as_me:7682: result: $ac_cv_sys_large_files" >&5
6014
echo "${ECHO_T}$ac_cv_sys_large_files" >&6
6015
if test "$ac_cv_sys_large_files" != no; then
6016
6017
@@ -7492,14 +7701,14 @@ fi
6018
test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
6019
test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
6020
6021
- echo "$as_me:7495: checking whether to use struct dirent64" >&5
6022
+ echo "$as_me:7704: checking whether to use struct dirent64" >&5
6023
echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
6024
if test "${cf_cv_struct_dirent64+set}" = set; then
6025
echo $ECHO_N "(cached) $ECHO_C" >&6
6026
else
6027
6028
cat >conftest.$ac_ext <<_ACEOF
6029
-#line 7502 "configure"
6030
+#line 7711 "configure"
6031
#include "confdefs.h"
6032
6033
#include <sys/types.h>
6034
@@ -7520,16 +7729,16 @@ main ()
6035
}
6036
_ACEOF
6037
rm -f conftest.$ac_objext
6038
-if { (eval echo "$as_me:7523: \"$ac_compile\"") >&5
6039
+if { (eval echo "$as_me:7732: \"$ac_compile\"") >&5
6040
(eval $ac_compile) 2>&5
6041
ac_status=$?
6042
- echo "$as_me:7526: \$? = $ac_status" >&5
6043
+ echo "$as_me:7735: \$? = $ac_status" >&5
6044
(exit $ac_status); } &&
6045
{ ac_try='test -s conftest.$ac_objext'
6046
- { (eval echo "$as_me:7529: \"$ac_try\"") >&5
6047
+ { (eval echo "$as_me:7738: \"$ac_try\"") >&5
6048
(eval $ac_try) 2>&5
6049
ac_status=$?
6050
- echo "$as_me:7532: \$? = $ac_status" >&5
6051
+ echo "$as_me:7741: \$? = $ac_status" >&5
6052
(exit $ac_status); }; }; then
6053
cf_cv_struct_dirent64=yes
6054
else
6055
@@ -7540,14 +7749,14 @@ fi
6056
rm -f conftest.$ac_objext conftest.$ac_ext
6057
6058
fi
6059
-echo "$as_me:7543: result: $cf_cv_struct_dirent64" >&5
6060
+echo "$as_me:7752: result: $cf_cv_struct_dirent64" >&5
6061
echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
6062
test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
6063
#define HAVE_STRUCT_DIRENT64 1
6064
EOF
6065
6066
### use option --with-bool to override bool's type
6067
-echo "$as_me:7550: checking for type of bool" >&5
6068
+echo "$as_me:7759: checking for type of bool" >&5
6069
echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
6070
6071
# Check whether --with-bool or --without-bool was given.
6072
@@ -7557,10 +7766,10 @@ if test "${with_bool+set}" = set; then
6073
else
6074
NCURSES_BOOL=auto
6075
fi;
6076
-echo "$as_me:7560: result: $NCURSES_BOOL" >&5
6077
+echo "$as_me:7769: result: $NCURSES_BOOL" >&5
6078
echo "${ECHO_T}$NCURSES_BOOL" >&6
6079
6080
-echo "$as_me:7563: checking for alternate terminal capabilities file" >&5
6081
+echo "$as_me:7772: checking for alternate terminal capabilities file" >&5
6082
echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
6083
6084
# Check whether --with-caps or --without-caps was given.
6085
@@ -7570,12 +7779,12 @@ if test "${with_caps+set}" = set; then
6086
else
6087
TERMINFO_CAPS=Caps
6088
fi;
6089
-test -f ${srcdir}/include/${TERMINFO_CAPS} || TERMINFO_CAPS=Caps
6090
-echo "$as_me:7574: result: $TERMINFO_CAPS" >&5
6091
+test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
6092
+echo "$as_me:7783: result: $TERMINFO_CAPS" >&5
6093
echo "${ECHO_T}$TERMINFO_CAPS" >&6
6094
6095
### use option --with-chtype to override chtype's type
6096
-echo "$as_me:7578: checking for type of chtype" >&5
6097
+echo "$as_me:7787: checking for type of chtype" >&5
6098
echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
6099
6100
# Check whether --with-chtype or --without-chtype was given.
6101
@@ -7585,11 +7794,11 @@ if test "${with_chtype+set}" = set; then
6102
else
6103
NCURSES_CHTYPE=auto
6104
fi;
6105
-echo "$as_me:7588: result: $NCURSES_CHTYPE" >&5
6106
+echo "$as_me:7797: result: $NCURSES_CHTYPE" >&5
6107
echo "${ECHO_T}$NCURSES_CHTYPE" >&6
6108
6109
### use option --with-ospeed to override ospeed's type
6110
-echo "$as_me:7592: checking for type of ospeed" >&5
6111
+echo "$as_me:7801: checking for type of ospeed" >&5
6112
echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
6113
6114
# Check whether --with-ospeed or --without-ospeed was given.
6115
@@ -7599,11 +7808,11 @@ if test "${with_ospeed+set}" = set; then
6116
else
6117
NCURSES_OSPEED=short
6118
fi;
6119
-echo "$as_me:7602: result: $NCURSES_OSPEED" >&5
6120
+echo "$as_me:7811: result: $NCURSES_OSPEED" >&5
6121
echo "${ECHO_T}$NCURSES_OSPEED" >&6
6122
6123
### use option --with-mmask-t to override mmask_t's type
6124
-echo "$as_me:7606: checking for type of mmask_t" >&5
6125
+echo "$as_me:7815: checking for type of mmask_t" >&5
6126
echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
6127
6128
# Check whether --with-mmask-t or --without-mmask-t was given.
6129
@@ -7613,11 +7822,11 @@ if test "${with_mmask_t+set}" = set; the
6130
else
6131
NCURSES_MMASK_T=auto
6132
fi;
6133
-echo "$as_me:7616: result: $NCURSES_MMASK_T" >&5
6134
+echo "$as_me:7825: result: $NCURSES_MMASK_T" >&5
6135
echo "${ECHO_T}$NCURSES_MMASK_T" >&6
6136
6137
### use option --enable-bsdpad to have tputs process BSD-style prefix padding
6138
-echo "$as_me:7620: checking if tputs should process BSD-style prefix padding" >&5
6139
+echo "$as_me:7829: checking if tputs should process BSD-style prefix padding" >&5
6140
echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
6141
6142
# Check whether --enable-bsdpad or --disable-bsdpad was given.
6143
@@ -7627,14 +7836,14 @@ if test "${enable_bsdpad+set}" = set; th
6144
else
6145
with_bsdpad=no
6146
fi;
6147
-echo "$as_me:7630: result: $with_bsdpad" >&5
6148
+echo "$as_me:7839: result: $with_bsdpad" >&5
6149
echo "${ECHO_T}$with_bsdpad" >&6
6150
test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
6151
#define BSD_TPUTS 1
6152
EOF
6153
6154
### Enable compiling-in rcs id's
6155
-echo "$as_me:7637: checking if RCS identifiers should be compiled-in" >&5
6156
+echo "$as_me:7846: checking if RCS identifiers should be compiled-in" >&5
6157
echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
6158
6159
# Check whether --with-rcs-ids or --without-rcs-ids was given.
6160
@@ -7644,7 +7853,7 @@ if test "${with_rcs_ids+set}" = set; the
6161
else
6162
with_rcs_ids=no
6163
fi;
6164
-echo "$as_me:7647: result: $with_rcs_ids" >&5
6165
+echo "$as_me:7856: result: $with_rcs_ids" >&5
6166
echo "${ECHO_T}$with_rcs_ids" >&6
6167
test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
6168
#define USE_RCS_IDS 1
6169
@@ -7652,7 +7861,7 @@ EOF
6170
6171
###############################################################################
6172
6173
-echo "$as_me:7655: checking format of man-pages" >&5
6174
+echo "$as_me:7864: checking format of man-pages" >&5
6175
echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
6176
6177
# Check whether --with-manpage-format or --without-manpage-format was given.
6178
@@ -7741,14 +7950,14 @@ unknown)
6179
;;
6180
esac
6181
6182
-echo "$as_me:7744: result: $MANPAGE_FORMAT" >&5
6183
+echo "$as_me:7953: result: $MANPAGE_FORMAT" >&5
6184
echo "${ECHO_T}$MANPAGE_FORMAT" >&6
6185
if test -n "$cf_unknown" ; then
6186
- { echo "$as_me:7747: WARNING: Unexpected manpage-format $cf_unknown" >&5
6187
+ { echo "$as_me:7956: WARNING: Unexpected manpage-format $cf_unknown" >&5
6188
echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
6189
fi
6190
6191
-echo "$as_me:7751: checking for manpage renaming" >&5
6192
+echo "$as_me:7960: checking for manpage renaming" >&5
6193
echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
6194
6195
# Check whether --with-manpage-renames or --without-manpage-renames was given.
6196
@@ -7776,7 +7985,7 @@ if test "$MANPAGE_RENAMES" != no ; then
6197
if test -f $srcdir/man/$MANPAGE_RENAMES ; then
6198
MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
6199
elif test ! -f $MANPAGE_RENAMES ; then
6200
- { { echo "$as_me:7779: error: not a filename: $MANPAGE_RENAMES" >&5
6201
+ { { echo "$as_me:7988: error: not a filename: $MANPAGE_RENAMES" >&5
6202
echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
6203
{ (exit 1); exit 1; }; }
6204
fi
6205
@@ -7790,10 +7999,10 @@ echo "$as_me: error: not a filename: $MA
6206
fi
6207
fi
6208
6209
-echo "$as_me:7793: result: $MANPAGE_RENAMES" >&5
6210
+echo "$as_me:8002: result: $MANPAGE_RENAMES" >&5
6211
echo "${ECHO_T}$MANPAGE_RENAMES" >&6
6212
6213
-echo "$as_me:7796: checking if manpage aliases will be installed" >&5
6214
+echo "$as_me:8005: checking if manpage aliases will be installed" >&5
6215
echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
6216
6217
# Check whether --with-manpage-aliases or --without-manpage-aliases was given.
6218
@@ -7804,7 +8013,7 @@ else
6219
MANPAGE_ALIASES=yes
6220
fi;
6221
6222
-echo "$as_me:7807: result: $MANPAGE_ALIASES" >&5
6223
+echo "$as_me:8016: result: $MANPAGE_ALIASES" >&5
6224
echo "${ECHO_T}$MANPAGE_ALIASES" >&6
6225
6226
if test "$LN_S" = "ln -s"; then
6227
@@ -7815,7 +8024,7 @@ fi
6228
6229
MANPAGE_SYMLINKS=no
6230
if test "$MANPAGE_ALIASES" = yes ; then
6231
-echo "$as_me:7818: checking if manpage symlinks should be used" >&5
6232
+echo "$as_me:8027: checking if manpage symlinks should be used" >&5
6233
echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
6234
6235
# Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
6236
@@ -7828,17 +8037,17 @@ fi;
6237
6238
if test "$$cf_use_symlinks" = no; then
6239
if test "$MANPAGE_SYMLINKS" = yes ; then
6240
- { echo "$as_me:7831: WARNING: cannot make symlinks" >&5
6241
+ { echo "$as_me:8040: WARNING: cannot make symlinks" >&5
6242
echo "$as_me: WARNING: cannot make symlinks" >&2;}
6243
MANPAGE_SYMLINKS=no
6244
fi
6245
fi
6246
6247
-echo "$as_me:7837: result: $MANPAGE_SYMLINKS" >&5
6248
+echo "$as_me:8046: result: $MANPAGE_SYMLINKS" >&5
6249
echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
6250
fi
6251
6252
-echo "$as_me:7841: checking for manpage tbl" >&5
6253
+echo "$as_me:8050: checking for manpage tbl" >&5
6254
echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
6255
6256
# Check whether --with-manpage-tbl or --without-manpage-tbl was given.
6257
@@ -7849,7 +8058,7 @@ else
6258
MANPAGE_TBL=no
6259
fi;
6260
6261
-echo "$as_me:7852: result: $MANPAGE_TBL" >&5
6262
+echo "$as_me:8061: result: $MANPAGE_TBL" >&5
6263
echo "${ECHO_T}$MANPAGE_TBL" >&6
6264
6265
if test "$prefix" = "NONE" ; then
6266
@@ -8138,7 +8347,7 @@ chmod 755 $cf_edit_man
6267
###############################################################################
6268
6269
### Note that some functions (such as const) are normally disabled anyway.
6270
-echo "$as_me:8141: checking if you want to build with function extensions" >&5
6271
+echo "$as_me:8350: checking if you want to build with function extensions" >&5
6272
echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
6273
6274
# Check whether --enable-ext-funcs or --disable-ext-funcs was given.
6275
@@ -8148,7 +8357,7 @@ if test "${enable_ext_funcs+set}" = set;
6276
else
6277
with_ext_funcs=yes
6278
fi;
6279
-echo "$as_me:8151: result: $with_ext_funcs" >&5
6280
+echo "$as_me:8360: result: $with_ext_funcs" >&5
6281
echo "${ECHO_T}$with_ext_funcs" >&6
6282
if test "$with_ext_funcs" = yes ; then
6283
NCURSES_EXT_FUNCS=1
6284
@@ -8185,7 +8394,7 @@ else
6285
fi
6286
6287
### use option --enable-const to turn on use of const beyond that in XSI.
6288
-echo "$as_me:8188: checking for extended use of const keyword" >&5
6289
+echo "$as_me:8397: checking for extended use of const keyword" >&5
6290
echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
6291
6292
# Check whether --enable-const or --disable-const was given.
6293
@@ -8195,14 +8404,14 @@ if test "${enable_const+set}" = set; the
6294
else
6295
with_ext_const=no
6296
fi;
6297
-echo "$as_me:8198: result: $with_ext_const" >&5
6298
+echo "$as_me:8407: result: $with_ext_const" >&5
6299
echo "${ECHO_T}$with_ext_const" >&6
6300
NCURSES_CONST='/*nothing*/'
6301
if test "$with_ext_const" = yes ; then
6302
NCURSES_CONST=const
6303
fi
6304
6305
-echo "$as_me:8205: checking if you want \$NCURSES_NO_PADDING code" >&5
6306
+echo "$as_me:8414: checking if you want \$NCURSES_NO_PADDING code" >&5
6307
echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
6308
6309
# Check whether --enable-no-padding or --disable-no-padding was given.
6310
@@ -8212,14 +8421,14 @@ if test "${enable_no_padding+set}" = set
6311
else
6312
with_no_padding=$with_ext_funcs
6313
fi;
6314
-echo "$as_me:8215: result: $with_no_padding" >&5
6315
+echo "$as_me:8424: result: $with_no_padding" >&5
6316
echo "${ECHO_T}$with_no_padding" >&6
6317
test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
6318
#define NCURSES_NO_PADDING 1
6319
EOF
6320
6321
### use option --enable-sigwinch to turn on use of SIGWINCH logic
6322
-echo "$as_me:8222: checking if you want SIGWINCH handler" >&5
6323
+echo "$as_me:8431: checking if you want SIGWINCH handler" >&5
6324
echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
6325
6326
# Check whether --enable-sigwinch or --disable-sigwinch was given.
6327
@@ -8229,14 +8438,14 @@ if test "${enable_sigwinch+set}" = set;
6328
else
6329
with_sigwinch=$with_ext_funcs
6330
fi;
6331
-echo "$as_me:8232: result: $with_sigwinch" >&5
6332
+echo "$as_me:8441: result: $with_sigwinch" >&5
6333
echo "${ECHO_T}$with_sigwinch" >&6
6334
test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
6335
#define USE_SIGWINCH 1
6336
EOF
6337
6338
### use option --enable-tcap-names to allow user to define new capabilities
6339
-echo "$as_me:8239: checking if you want user-definable terminal capabilities like termcap" >&5
6340
+echo "$as_me:8448: checking if you want user-definable terminal capabilities like termcap" >&5
6341
echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
6342
6343
# Check whether --enable-tcap-names or --disable-tcap-names was given.
6344
@@ -8246,7 +8455,7 @@ if test "${enable_tcap_names+set}" = set
6345
else
6346
with_tcap_names=$with_ext_funcs
6347
fi;
6348
-echo "$as_me:8249: result: $with_tcap_names" >&5
6349
+echo "$as_me:8458: result: $with_tcap_names" >&5
6350
echo "${ECHO_T}$with_tcap_names" >&6
6351
NCURSES_XNAMES=0
6352
test "$with_tcap_names" = yes && NCURSES_XNAMES=1
6353
@@ -8254,7 +8463,7 @@ test "$with_tcap_names" = yes && NCURSES
6354
###############################################################################
6355
# These options are relatively safe to experiment with.
6356
6357
-echo "$as_me:8257: checking if you want all development code" >&5
6358
+echo "$as_me:8466: checking if you want all development code" >&5
6359
echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
6360
6361
# Check whether --with-develop or --without-develop was given.
6362
@@ -8264,11 +8473,11 @@ if test "${with_develop+set}" = set; the
6363
else
6364
with_develop=no
6365
fi;
6366
-echo "$as_me:8267: result: $with_develop" >&5
6367
+echo "$as_me:8476: result: $with_develop" >&5
6368
echo "${ECHO_T}$with_develop" >&6
6369
6370
### use option --enable-hard-tabs to turn on use of hard-tabs optimize
6371
-echo "$as_me:8271: checking if you want hard-tabs code" >&5
6372
+echo "$as_me:8480: checking if you want hard-tabs code" >&5
6373
echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
6374
6375
# Check whether --enable-hard-tabs or --disable-hard-tabs was given.
6376
@@ -8278,14 +8487,14 @@ if test "${enable_hard_tabs+set}" = set;
6377
else
6378
with_hardtabs=$with_develop
6379
fi;
6380
-echo "$as_me:8281: result: $with_hardtabs" >&5
6381
+echo "$as_me:8490: result: $with_hardtabs" >&5
6382
echo "${ECHO_T}$with_hardtabs" >&6
6383
test "$with_hardtabs" = yes && cat >>confdefs.h <<\EOF
6384
#define USE_HARD_TABS 1
6385
EOF
6386
6387
### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
6388
-echo "$as_me:8288: checking if you want limited support for xmc" >&5
6389
+echo "$as_me:8497: checking if you want limited support for xmc" >&5
6390
echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
6391
6392
# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
6393
@@ -8295,7 +8504,7 @@ if test "${enable_xmc_glitch+set}" = set
6394
else
6395
with_xmc_glitch=$with_develop
6396
fi;
6397
-echo "$as_me:8298: result: $with_xmc_glitch" >&5
6398
+echo "$as_me:8507: result: $with_xmc_glitch" >&5
6399
echo "${ECHO_T}$with_xmc_glitch" >&6
6400
test "$with_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
6401
#define USE_XMC_SUPPORT 1
6402
@@ -8304,7 +8513,7 @@ EOF
6403
###############################################################################
6404
# These are just experimental, probably should not be in a package:
6405
6406
-echo "$as_me:8307: checking if you do not want to assume colors are white-on-black" >&5
6407
+echo "$as_me:8516: checking if you do not want to assume colors are white-on-black" >&5
6408
echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
6409
6410
# Check whether --enable-assumed-color or --disable-assumed-color was given.
6411
@@ -8314,14 +8523,14 @@ if test "${enable_assumed_color+set}" =
6412
else
6413
with_assumed_color=yes
6414
fi;
6415
-echo "$as_me:8317: result: $with_assumed_color" >&5
6416
+echo "$as_me:8526: result: $with_assumed_color" >&5
6417
echo "${ECHO_T}$with_assumed_color" >&6
6418
test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
6419
#define USE_ASSUMED_COLOR 1
6420
EOF
6421
6422
### use option --enable-hashmap to turn on use of hashmap scrolling logic
6423
-echo "$as_me:8324: checking if you want hashmap scrolling-optimization code" >&5
6424
+echo "$as_me:8533: checking if you want hashmap scrolling-optimization code" >&5
6425
echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
6426
6427
# Check whether --enable-hashmap or --disable-hashmap was given.
6428
@@ -8331,14 +8540,14 @@ if test "${enable_hashmap+set}" = set; t
6429
else
6430
with_hashmap=yes
6431
fi;
6432
-echo "$as_me:8334: result: $with_hashmap" >&5
6433
+echo "$as_me:8543: result: $with_hashmap" >&5
6434
echo "${ECHO_T}$with_hashmap" >&6
6435
test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
6436
#define USE_HASHMAP 1
6437
EOF
6438
6439
### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
6440
-echo "$as_me:8341: checking if you want colorfgbg code" >&5
6441
+echo "$as_me:8550: checking if you want colorfgbg code" >&5
6442
echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
6443
6444
# Check whether --enable-colorfgbg or --disable-colorfgbg was given.
6445
@@ -8348,14 +8557,14 @@ if test "${enable_colorfgbg+set}" = set;
6446
else
6447
with_colorfgbg=no
6448
fi;
6449
-echo "$as_me:8351: result: $with_colorfgbg" >&5
6450
+echo "$as_me:8560: result: $with_colorfgbg" >&5
6451
echo "${ECHO_T}$with_colorfgbg" >&6
6452
test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
6453
#define USE_COLORFGBG 1
6454
EOF
6455
6456
### use option --enable-ext-colors to turn on use of colors beyond 16.
6457
-echo "$as_me:8358: checking if you want to use experimental extended colors" >&5
6458
+echo "$as_me:8567: checking if you want to use experimental extended colors" >&5
6459
echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6
6460
6461
# Check whether --enable-ext-colors or --disable-ext-colors was given.
6462
@@ -8365,12 +8574,12 @@ if test "${enable_ext_colors+set}" = set
6463
else
6464
with_ext_colors=no
6465
fi;
6466
-echo "$as_me:8368: result: $with_ext_colors" >&5
6467
+echo "$as_me:8577: result: $with_ext_colors" >&5
6468
echo "${ECHO_T}$with_ext_colors" >&6
6469
NCURSES_EXT_COLORS=0
6470
if test "$with_ext_colors" = yes ; then
6471
if test "$with_widec" != yes ; then
6472
- { echo "$as_me:8373: WARNING: This option applies only to wide-character library" >&5
6473
+ { echo "$as_me:8582: WARNING: This option applies only to wide-character library" >&5
6474
echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
6475
else
6476
# cannot be ABI 5 since it changes sizeof(cchar_t)
6477
@@ -8380,7 +8589,7 @@ if test "${with_abi_version+set}" != set
6478
5.*)
6479
cf_cv_rel_version=6.0
6480
cf_cv_abi_version=6
6481
- { echo "$as_me:8383: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
6482
+ { echo "$as_me:8592: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
6483
echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
6484
;;
6485
esac
6486
@@ -8395,7 +8604,7 @@ EOF
6487
fi
6488
6489
### use option --enable-ext-mouse to modify coding to support 5-button mice
6490
-echo "$as_me:8398: checking if you want to use experimental extended mouse encoding" >&5
6491
+echo "$as_me:8607: checking if you want to use experimental extended mouse encoding" >&5
6492
echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6
6493
6494
# Check whether --enable-ext-mouse or --disable-ext-mouse was given.
6495
@@ -8405,7 +8614,7 @@ if test "${enable_ext_mouse+set}" = set;
6496
else
6497
with_ext_mouse=no
6498
fi;
6499
-echo "$as_me:8408: result: $with_ext_mouse" >&5
6500
+echo "$as_me:8617: result: $with_ext_mouse" >&5
6501
echo "${ECHO_T}$with_ext_mouse" >&6
6502
NCURSES_MOUSE_VERSION=1
6503
if test "$with_ext_mouse" = yes ; then
6504
@@ -8416,7 +8625,7 @@ if test "${with_abi_version+set}" != set
6505
5.*)
6506
cf_cv_rel_version=6.0
6507
cf_cv_abi_version=6
6508
- { echo "$as_me:8419: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
6509
+ { echo "$as_me:8628: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
6510
echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
6511
;;
6512
esac
6513
@@ -8424,7 +8633,7 @@ fi
6514
6515
fi
6516
6517
-echo "$as_me:8427: checking if you want experimental safe-sprintf code" >&5
6518
+echo "$as_me:8636: checking if you want experimental safe-sprintf code" >&5
6519
echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
6520
6521
# Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
6522
@@ -8434,7 +8643,7 @@ if test "${enable_safe_sprintf+set}" = s
6523
else
6524
with_safe_sprintf=no
6525
fi;
6526
-echo "$as_me:8437: result: $with_safe_sprintf" >&5
6527
+echo "$as_me:8646: result: $with_safe_sprintf" >&5
6528
echo "${ECHO_T}$with_safe_sprintf" >&6
6529
test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
6530
#define USE_SAFE_SPRINTF 1
6531
@@ -8443,7 +8652,7 @@ EOF
6532
### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
6533
# when hashmap is used scroll hints are useless
6534
if test "$with_hashmap" = no ; then
6535
-echo "$as_me:8446: checking if you want to experiment without scrolling-hints code" >&5
6536
+echo "$as_me:8655: checking if you want to experiment without scrolling-hints code" >&5
6537
echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
6538
6539
# Check whether --enable-scroll-hints or --disable-scroll-hints was given.
6540
@@ -8453,7 +8662,7 @@ if test "${enable_scroll_hints+set}" = s
6541
else
6542
with_scroll_hints=yes
6543
fi;
6544
-echo "$as_me:8456: result: $with_scroll_hints" >&5
6545
+echo "$as_me:8665: result: $with_scroll_hints" >&5
6546
echo "${ECHO_T}$with_scroll_hints" >&6
6547
test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
6548
#define USE_SCROLL_HINTS 1
6549
@@ -8464,7 +8673,7 @@ fi
6550
###############################################################################
6551
6552
### use option --disable-echo to suppress full display compiling commands
6553
-echo "$as_me:8467: checking if you want to display full commands during build" >&5
6554
+echo "$as_me:8676: checking if you want to display full commands during build" >&5
6555
echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
6556
6557
# Check whether --enable-echo or --disable-echo was given.
6558
@@ -8480,11 +8689,11 @@ else
6559
ECHO_LINK='@ echo linking $@ ... ;'
6560
test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
6561
fi
6562
-echo "$as_me:8483: result: $with_echo" >&5
6563
+echo "$as_me:8692: result: $with_echo" >&5
6564
echo "${ECHO_T}$with_echo" >&6
6565
6566
### use option --enable-warnings to turn on all gcc warnings
6567
-echo "$as_me:8487: checking if you want to see compiler warnings" >&5
6568
+echo "$as_me:8696: checking if you want to see compiler warnings" >&5
6569
echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
6570
6571
# Check whether --enable-warnings or --disable-warnings was given.
6572
@@ -8492,7 +8701,7 @@ if test "${enable_warnings+set}" = set;
6573
enableval="$enable_warnings"
6574
with_warnings=$enableval
6575
fi;
6576
-echo "$as_me:8495: result: $with_warnings" >&5
6577
+echo "$as_me:8704: result: $with_warnings" >&5
6578
echo "${ECHO_T}$with_warnings" >&6
6579
6580
if test -n "$with_warnings"; then
6581
@@ -8503,12 +8712,12 @@ INTEL_COMPILER=no
6582
if test "$GCC" = yes ; then
6583
case $host_os in
6584
linux*|gnu*)
6585
- echo "$as_me:8506: checking if this is really Intel C compiler" >&5
6586
+ echo "$as_me:8715: checking if this is really Intel C compiler" >&5
6587
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
6588
cf_save_CFLAGS="$CFLAGS"
6589
CFLAGS="$CFLAGS -no-gcc"
6590
cat >conftest.$ac_ext <<_ACEOF
6591
-#line 8511 "configure"
6592
+#line 8720 "configure"
6593
#include "confdefs.h"
6594
6595
int
6596
@@ -8525,16 +8734,16 @@ make an error
6597
}
6598
_ACEOF
6599
rm -f conftest.$ac_objext
6600
-if { (eval echo "$as_me:8528: \"$ac_compile\"") >&5
6601
+if { (eval echo "$as_me:8737: \"$ac_compile\"") >&5
6602
(eval $ac_compile) 2>&5
6603
ac_status=$?
6604
- echo "$as_me:8531: \$? = $ac_status" >&5
6605
+ echo "$as_me:8740: \$? = $ac_status" >&5
6606
(exit $ac_status); } &&
6607
{ ac_try='test -s conftest.$ac_objext'
6608
- { (eval echo "$as_me:8534: \"$ac_try\"") >&5
6609
+ { (eval echo "$as_me:8743: \"$ac_try\"") >&5
6610
(eval $ac_try) 2>&5
6611
ac_status=$?
6612
- echo "$as_me:8537: \$? = $ac_status" >&5
6613
+ echo "$as_me:8746: \$? = $ac_status" >&5
6614
(exit $ac_status); }; }; then
6615
INTEL_COMPILER=yes
6616
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
6617
@@ -8545,14 +8754,14 @@ cat conftest.$ac_ext >&5
6618
fi
6619
rm -f conftest.$ac_objext conftest.$ac_ext
6620
CFLAGS="$cf_save_CFLAGS"
6621
- echo "$as_me:8548: result: $INTEL_COMPILER" >&5
6622
+ echo "$as_me:8757: result: $INTEL_COMPILER" >&5
6623
echo "${ECHO_T}$INTEL_COMPILER" >&6
6624
;;
6625
esac
6626
fi
6627
6628
cat > conftest.$ac_ext <<EOF
6629
-#line 8555 "configure"
6630
+#line 8764 "configure"
6631
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
6632
EOF
6633
6634
@@ -8570,7 +8779,7 @@ then
6635
# remark #981: operands are evaluated in unspecified order
6636
# warning #269: invalid format string conversion
6637
6638
- { echo "$as_me:8573: checking for $CC warning options..." >&5
6639
+ { echo "$as_me:8782: checking for $CC warning options..." >&5
6640
echo "$as_me: checking for $CC warning options..." >&6;}
6641
cf_save_CFLAGS="$CFLAGS"
6642
EXTRA_CFLAGS="-Wall"
6643
@@ -8587,12 +8796,12 @@ echo "$as_me: checking for $CC warning o
6644
wd981
6645
do
6646
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
6647
- if { (eval echo "$as_me:8590: \"$ac_compile\"") >&5
6648
+ if { (eval echo "$as_me:8799: \"$ac_compile\"") >&5
6649
(eval $ac_compile) 2>&5
6650
ac_status=$?
6651
- echo "$as_me:8593: \$? = $ac_status" >&5
6652
+ echo "$as_me:8802: \$? = $ac_status" >&5
6653
(exit $ac_status); }; then
6654
- test -n "$verbose" && echo "$as_me:8595: result: ... -$cf_opt" >&5
6655
+ test -n "$verbose" && echo "$as_me:8804: result: ... -$cf_opt" >&5
6656
echo "${ECHO_T}... -$cf_opt" >&6
6657
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
6658
fi
6659
@@ -8601,7 +8810,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
6660
6661
elif test "$GCC" = yes
6662
then
6663
- { echo "$as_me:8604: checking for $CC warning options..." >&5
6664
+ { echo "$as_me:8813: checking for $CC warning options..." >&5
6665
echo "$as_me: checking for $CC warning options..." >&6;}
6666
cf_save_CFLAGS="$CFLAGS"
6667
EXTRA_CFLAGS="-W -Wall"
6668
@@ -8621,12 +8830,12 @@ echo "$as_me: checking for $CC warning o
6669
Wundef $cf_warn_CONST
6670
do
6671
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
6672
- if { (eval echo "$as_me:8624: \"$ac_compile\"") >&5
6673
+ if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5
6674
(eval $ac_compile) 2>&5
6675
ac_status=$?
6676
- echo "$as_me:8627: \$? = $ac_status" >&5
6677
+ echo "$as_me:8836: \$? = $ac_status" >&5
6678
(exit $ac_status); }; then
6679
- test -n "$verbose" && echo "$as_me:8629: result: ... -$cf_opt" >&5
6680
+ test -n "$verbose" && echo "$as_me:8838: result: ... -$cf_opt" >&5
6681
echo "${ECHO_T}... -$cf_opt" >&6
6682
case $cf_opt in #(vi
6683
Wcast-qual) #(vi
6684
@@ -8655,12 +8864,12 @@ INTEL_CPLUSPLUS=no
6685
if test "$GCC" = yes ; then
6686
case $host_os in
6687
linux*|gnu*)
6688
- echo "$as_me:8658: checking if this is really Intel C++ compiler" >&5
6689
+ echo "$as_me:8867: checking if this is really Intel C++ compiler" >&5
6690
echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
6691
cf_save_CFLAGS="$CXXFLAGS"
6692
CXXFLAGS="$CXXFLAGS -no-gcc"
6693
cat >conftest.$ac_ext <<_ACEOF
6694
-#line 8663 "configure"
6695
+#line 8872 "configure"
6696
#include "confdefs.h"
6697
6698
int
6699
@@ -8677,16 +8886,16 @@ make an error
6700
}
6701
_ACEOF
6702
rm -f conftest.$ac_objext
6703
-if { (eval echo "$as_me:8680: \"$ac_compile\"") >&5
6704
+if { (eval echo "$as_me:8889: \"$ac_compile\"") >&5
6705
(eval $ac_compile) 2>&5
6706
ac_status=$?
6707
- echo "$as_me:8683: \$? = $ac_status" >&5
6708
+ echo "$as_me:8892: \$? = $ac_status" >&5
6709
(exit $ac_status); } &&
6710
{ ac_try='test -s conftest.$ac_objext'
6711
- { (eval echo "$as_me:8686: \"$ac_try\"") >&5
6712
+ { (eval echo "$as_me:8895: \"$ac_try\"") >&5
6713
(eval $ac_try) 2>&5
6714
ac_status=$?
6715
- echo "$as_me:8689: \$? = $ac_status" >&5
6716
+ echo "$as_me:8898: \$? = $ac_status" >&5
6717
(exit $ac_status); }; }; then
6718
INTEL_CPLUSPLUS=yes
6719
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
6720
@@ -8697,7 +8906,7 @@ cat conftest.$ac_ext >&5
6721
fi
6722
rm -f conftest.$ac_objext conftest.$ac_ext
6723
CXXFLAGS="$cf_save_CFLAGS"
6724
- echo "$as_me:8700: result: $INTEL_CPLUSPLUS" >&5
6725
+ echo "$as_me:8909: result: $INTEL_CPLUSPLUS" >&5
6726
echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
6727
;;
6728
esac
6729
@@ -8710,7 +8919,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
6730
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6731
6732
cat > conftest.$ac_ext <<EOF
6733
-#line 8713 "configure"
6734
+#line 8922 "configure"
6735
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
6736
EOF
6737
6738
@@ -8728,7 +8937,7 @@ then
6739
# remark #981: operands are evaluated in unspecified order
6740
# warning #269: invalid format string conversion
6741
6742
- { echo "$as_me:8731: checking for $CC warning options..." >&5
6743
+ { echo "$as_me:8940: checking for $CC warning options..." >&5
6744
echo "$as_me: checking for $CC warning options..." >&6;}
6745
cf_save_CXXFLAGS="$CXXFLAGS"
6746
EXTRA_CXXFLAGS="-Wall"
6747
@@ -8745,12 +8954,12 @@ echo "$as_me: checking for $CC warning o
6748
wd981
6749
do
6750
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
6751
- if { (eval echo "$as_me:8748: \"$ac_compile\"") >&5
6752
+ if { (eval echo "$as_me:8957: \"$ac_compile\"") >&5
6753
(eval $ac_compile) 2>&5
6754
ac_status=$?
6755
- echo "$as_me:8751: \$? = $ac_status" >&5
6756
+ echo "$as_me:8960: \$? = $ac_status" >&5
6757
(exit $ac_status); }; then
6758
- test -n "$verbose" && echo "$as_me:8753: result: ... -$cf_opt" >&5
6759
+ test -n "$verbose" && echo "$as_me:8962: result: ... -$cf_opt" >&5
6760
echo "${ECHO_T}... -$cf_opt" >&6
6761
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
6762
fi
6763
@@ -8759,7 +8968,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
6764
6765
elif test "$GXX" = yes
6766
then
6767
- { echo "$as_me:8762: checking for $CXX warning options..." >&5
6768
+ { echo "$as_me:8971: checking for $CXX warning options..." >&5
6769
echo "$as_me: checking for $CXX warning options..." >&6;}
6770
cf_save_CXXFLAGS="$CXXFLAGS"
6771
EXTRA_CXXFLAGS="-W -Wall"
6772
@@ -8788,16 +8997,16 @@ echo "$as_me: checking for $CXX warning
6773
Wundef $cf_gxx_extra_warnings Wno-unused
6774
do
6775
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
6776
- if { (eval echo "$as_me:8791: \"$ac_compile\"") >&5
6777
+ if { (eval echo "$as_me:9000: \"$ac_compile\"") >&5
6778
(eval $ac_compile) 2>&5
6779
ac_status=$?
6780
- echo "$as_me:8794: \$? = $ac_status" >&5
6781
+ echo "$as_me:9003: \$? = $ac_status" >&5
6782
(exit $ac_status); }; then
6783
- test -n "$verbose" && echo "$as_me:8796: result: ... -$cf_opt" >&5
6784
+ test -n "$verbose" && echo "$as_me:9005: result: ... -$cf_opt" >&5
6785
echo "${ECHO_T}... -$cf_opt" >&6
6786
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
6787
else
6788
- test -n "$verbose" && echo "$as_me:8800: result: ... no -$cf_opt" >&5
6789
+ test -n "$verbose" && echo "$as_me:9009: result: ... no -$cf_opt" >&5
6790
echo "${ECHO_T}... no -$cf_opt" >&6
6791
fi
6792
done
6793
@@ -8832,10 +9041,10 @@ cat > conftest.i <<EOF
6794
EOF
6795
if test "$GCC" = yes
6796
then
6797
- { echo "$as_me:8835: checking for $CC __attribute__ directives..." >&5
6798
+ { echo "$as_me:9044: checking for $CC __attribute__ directives..." >&5
6799
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
6800
cat > conftest.$ac_ext <<EOF
6801
-#line 8838 "configure"
6802
+#line 9047 "configure"
6803
#include "confdefs.h"
6804
#include "conftest.h"
6805
#include "conftest.i"
6806
@@ -8873,12 +9082,12 @@ EOF
6807
EOF
6808
;;
6809
esac
6810
- if { (eval echo "$as_me:8876: \"$ac_compile\"") >&5
6811
+ if { (eval echo "$as_me:9085: \"$ac_compile\"") >&5
6812
(eval $ac_compile) 2>&5
6813
ac_status=$?
6814
- echo "$as_me:8879: \$? = $ac_status" >&5
6815
+ echo "$as_me:9088: \$? = $ac_status" >&5
6816
(exit $ac_status); }; then
6817
- test -n "$verbose" && echo "$as_me:8881: result: ... $cf_attribute" >&5
6818
+ test -n "$verbose" && echo "$as_me:9090: result: ... $cf_attribute" >&5
6819
echo "${ECHO_T}... $cf_attribute" >&6
6820
cat conftest.h >>confdefs.h
6821
fi
6822
@@ -8890,7 +9099,7 @@ rm -rf conftest*
6823
fi
6824
6825
### use option --enable-assertions to turn on generation of assertion code
6826
-echo "$as_me:8893: checking if you want to enable runtime assertions" >&5
6827
+echo "$as_me:9102: checking if you want to enable runtime assertions" >&5
6828
echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
6829
6830
# Check whether --enable-assertions or --disable-assertions was given.
6831
@@ -8900,7 +9109,7 @@ if test "${enable_assertions+set}" = set
6832
else
6833
with_assertions=no
6834
fi;
6835
-echo "$as_me:8903: result: $with_assertions" >&5
6836
+echo "$as_me:9112: result: $with_assertions" >&5
6837
echo "${ECHO_T}$with_assertions" >&6
6838
if test -n "$GCC"
6839
then
6840
@@ -8961,7 +9170,7 @@ case "$CFLAGS $CPPFLAGS" in
6841
;;
6842
esac
6843
6844
-echo "$as_me:8964: checking whether to add trace feature to all models" >&5
6845
+echo "$as_me:9173: checking whether to add trace feature to all models" >&5
6846
echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
6847
6848
# Check whether --with-trace or --without-trace was given.
6849
@@ -8971,7 +9180,7 @@ if test "${with_trace+set}" = set; then
6850
else
6851
cf_with_trace=$cf_all_traces
6852
fi;
6853
-echo "$as_me:8974: result: $cf_with_trace" >&5
6854
+echo "$as_me:9183: result: $cf_with_trace" >&5
6855
echo "${ECHO_T}$cf_with_trace" >&6
6856
6857
if test "$cf_with_trace" = yes ; then
6858
@@ -9052,13 +9261,13 @@ else
6859
fi
6860
6861
### Checks for libraries.
6862
-echo "$as_me:9055: checking for gettimeofday" >&5
6863
+echo "$as_me:9264: checking for gettimeofday" >&5
6864
echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
6865
if test "${ac_cv_func_gettimeofday+set}" = set; then
6866
echo $ECHO_N "(cached) $ECHO_C" >&6
6867
else
6868
cat >conftest.$ac_ext <<_ACEOF
6869
-#line 9061 "configure"
6870
+#line 9270 "configure"
6871
#include "confdefs.h"
6872
/* System header to define __stub macros and hopefully few prototypes,
6873
which can conflict with char gettimeofday (); below. */
6874
@@ -9089,16 +9298,16 @@ f = gettimeofday;
6875
}
6876
_ACEOF
6877
rm -f conftest.$ac_objext conftest$ac_exeext
6878
-if { (eval echo "$as_me:9092: \"$ac_link\"") >&5
6879
+if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
6880
(eval $ac_link) 2>&5
6881
ac_status=$?
6882
- echo "$as_me:9095: \$? = $ac_status" >&5
6883
+ echo "$as_me:9304: \$? = $ac_status" >&5
6884
(exit $ac_status); } &&
6885
{ ac_try='test -s conftest$ac_exeext'
6886
- { (eval echo "$as_me:9098: \"$ac_try\"") >&5
6887
+ { (eval echo "$as_me:9307: \"$ac_try\"") >&5
6888
(eval $ac_try) 2>&5
6889
ac_status=$?
6890
- echo "$as_me:9101: \$? = $ac_status" >&5
6891
+ echo "$as_me:9310: \$? = $ac_status" >&5
6892
(exit $ac_status); }; }; then
6893
ac_cv_func_gettimeofday=yes
6894
else
6895
@@ -9108,7 +9317,7 @@ ac_cv_func_gettimeofday=no
6896
fi
6897
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6898
fi
6899
-echo "$as_me:9111: result: $ac_cv_func_gettimeofday" >&5
6900
+echo "$as_me:9320: result: $ac_cv_func_gettimeofday" >&5
6901
echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
6902
if test $ac_cv_func_gettimeofday = yes; then
6903
cat >>confdefs.h <<\EOF
6904
@@ -9117,7 +9326,7 @@ EOF
6905
6906
else
6907
6908
-echo "$as_me:9120: checking for gettimeofday in -lbsd" >&5
6909
+echo "$as_me:9329: checking for gettimeofday in -lbsd" >&5
6910
echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
6911
if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
6912
echo $ECHO_N "(cached) $ECHO_C" >&6
6913
@@ -9125,7 +9334,7 @@ else
6914
ac_check_lib_save_LIBS=$LIBS
6915
LIBS="-lbsd $LIBS"
6916
cat >conftest.$ac_ext <<_ACEOF
6917
-#line 9128 "configure"
6918
+#line 9337 "configure"
6919
#include "confdefs.h"
6920
6921
/* Override any gcc2 internal prototype to avoid an error. */
6922
@@ -9144,16 +9353,16 @@ gettimeofday ();
6923
}
6924
_ACEOF
6925
rm -f conftest.$ac_objext conftest$ac_exeext
6926
-if { (eval echo "$as_me:9147: \"$ac_link\"") >&5
6927
+if { (eval echo "$as_me:9356: \"$ac_link\"") >&5
6928
(eval $ac_link) 2>&5
6929
ac_status=$?
6930
- echo "$as_me:9150: \$? = $ac_status" >&5
6931
+ echo "$as_me:9359: \$? = $ac_status" >&5
6932
(exit $ac_status); } &&
6933
{ ac_try='test -s conftest$ac_exeext'
6934
- { (eval echo "$as_me:9153: \"$ac_try\"") >&5
6935
+ { (eval echo "$as_me:9362: \"$ac_try\"") >&5
6936
(eval $ac_try) 2>&5
6937
ac_status=$?
6938
- echo "$as_me:9156: \$? = $ac_status" >&5
6939
+ echo "$as_me:9365: \$? = $ac_status" >&5
6940
(exit $ac_status); }; }; then
6941
ac_cv_lib_bsd_gettimeofday=yes
6942
else
6943
@@ -9164,7 +9373,7 @@ fi
6944
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6945
LIBS=$ac_check_lib_save_LIBS
6946
fi
6947
-echo "$as_me:9167: result: $ac_cv_lib_bsd_gettimeofday" >&5
6948
+echo "$as_me:9376: result: $ac_cv_lib_bsd_gettimeofday" >&5
6949
echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
6950
if test $ac_cv_lib_bsd_gettimeofday = yes; then
6951
cat >>confdefs.h <<\EOF
6952
@@ -9176,14 +9385,14 @@ fi
6953
6954
fi
6955
6956
-echo "$as_me:9179: checking if -lm needed for math functions" >&5
6957
+echo "$as_me:9388: checking if -lm needed for math functions" >&5
6958
echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
6959
if test "${cf_cv_need_libm+set}" = set; then
6960
echo $ECHO_N "(cached) $ECHO_C" >&6
6961
else
6962
6963
cat >conftest.$ac_ext <<_ACEOF
6964
-#line 9186 "configure"
6965
+#line 9395 "configure"
6966
#include "confdefs.h"
6967
6968
#include <stdio.h>
6969
@@ -9198,16 +9407,16 @@ double x = rand(); printf("result = %g\n
6970
}
6971
_ACEOF
6972
rm -f conftest.$ac_objext conftest$ac_exeext
6973
-if { (eval echo "$as_me:9201: \"$ac_link\"") >&5
6974
+if { (eval echo "$as_me:9410: \"$ac_link\"") >&5
6975
(eval $ac_link) 2>&5
6976
ac_status=$?
6977
- echo "$as_me:9204: \$? = $ac_status" >&5
6978
+ echo "$as_me:9413: \$? = $ac_status" >&5
6979
(exit $ac_status); } &&
6980
{ ac_try='test -s conftest$ac_exeext'
6981
- { (eval echo "$as_me:9207: \"$ac_try\"") >&5
6982
+ { (eval echo "$as_me:9416: \"$ac_try\"") >&5
6983
(eval $ac_try) 2>&5
6984
ac_status=$?
6985
- echo "$as_me:9210: \$? = $ac_status" >&5
6986
+ echo "$as_me:9419: \$? = $ac_status" >&5
6987
(exit $ac_status); }; }; then
6988
cf_cv_need_libm=no
6989
else
6990
@@ -9217,7 +9426,7 @@ cf_cv_need_libm=yes
6991
fi
6992
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6993
fi
6994
-echo "$as_me:9220: result: $cf_cv_need_libm" >&5
6995
+echo "$as_me:9429: result: $cf_cv_need_libm" >&5
6996
echo "${ECHO_T}$cf_cv_need_libm" >&6
6997
if test "$cf_cv_need_libm" = yes
6998
then
6999
@@ -9225,13 +9434,13 @@ MATH_LIB=-lm
7000
fi
7001
7002
### Checks for header files.
7003
-echo "$as_me:9228: checking for ANSI C header files" >&5
7004
+echo "$as_me:9437: checking for ANSI C header files" >&5
7005
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
7006
if test "${ac_cv_header_stdc+set}" = set; then
7007
echo $ECHO_N "(cached) $ECHO_C" >&6
7008
else
7009
cat >conftest.$ac_ext <<_ACEOF
7010
-#line 9234 "configure"
7011
+#line 9443 "configure"
7012
#include "confdefs.h"
7013
#include <stdlib.h>
7014
#include <stdarg.h>
7015
@@ -9239,13 +9448,13 @@ else
7016
#include <float.h>
7017
7018
_ACEOF
7019
-if { (eval echo "$as_me:9242: \"$ac_cpp conftest.$ac_ext\"") >&5
7020
+if { (eval echo "$as_me:9451: \"$ac_cpp conftest.$ac_ext\"") >&5
7021
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7022
ac_status=$?
7023
egrep -v '^ *\+' conftest.er1 >conftest.err
7024
rm -f conftest.er1
7025
cat conftest.err >&5
7026
- echo "$as_me:9248: \$? = $ac_status" >&5
7027
+ echo "$as_me:9457: \$? = $ac_status" >&5
7028
(exit $ac_status); } >/dev/null; then
7029
if test -s conftest.err; then
7030
ac_cpp_err=$ac_c_preproc_warn_flag
7031
@@ -9267,7 +9476,7 @@ rm -f conftest.err conftest.$ac_ext
7032
if test $ac_cv_header_stdc = yes; then
7033
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
7034
cat >conftest.$ac_ext <<_ACEOF
7035
-#line 9270 "configure"
7036
+#line 9479 "configure"
7037
#include "confdefs.h"
7038
#include <string.h>
7039
7040
@@ -9285,7 +9494,7 @@ fi
7041
if test $ac_cv_header_stdc = yes; then
7042
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
7043
cat >conftest.$ac_ext <<_ACEOF
7044
-#line 9288 "configure"
7045
+#line 9497 "configure"
7046
#include "confdefs.h"
7047
#include <stdlib.h>
7048
7049
@@ -9306,7 +9515,7 @@ if test $ac_cv_header_stdc = yes; then
7050
:
7051
else
7052
cat >conftest.$ac_ext <<_ACEOF
7053
-#line 9309 "configure"
7054
+#line 9518 "configure"
7055
#include "confdefs.h"
7056
#include <ctype.h>
7057
#if ((' ' & 0x0FF) == 0x020)
7058
@@ -9332,15 +9541,15 @@ main ()
7059
}
7060
_ACEOF
7061
rm -f conftest$ac_exeext
7062
-if { (eval echo "$as_me:9335: \"$ac_link\"") >&5
7063
+if { (eval echo "$as_me:9544: \"$ac_link\"") >&5
7064
(eval $ac_link) 2>&5
7065
ac_status=$?
7066
- echo "$as_me:9338: \$? = $ac_status" >&5
7067
+ echo "$as_me:9547: \$? = $ac_status" >&5
7068
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7069
- { (eval echo "$as_me:9340: \"$ac_try\"") >&5
7070
+ { (eval echo "$as_me:9549: \"$ac_try\"") >&5
7071
(eval $ac_try) 2>&5
7072
ac_status=$?
7073
- echo "$as_me:9343: \$? = $ac_status" >&5
7074
+ echo "$as_me:9552: \$? = $ac_status" >&5
7075
(exit $ac_status); }; }; then
7076
:
7077
else
7078
@@ -9353,7 +9562,7 @@ rm -f core core.* *.core conftest$ac_exe
7079
fi
7080
fi
7081
fi
7082
-echo "$as_me:9356: result: $ac_cv_header_stdc" >&5
7083
+echo "$as_me:9565: result: $ac_cv_header_stdc" >&5
7084
echo "${ECHO_T}$ac_cv_header_stdc" >&6
7085
if test $ac_cv_header_stdc = yes; then
7086
7087
@@ -9366,13 +9575,13 @@ fi
7088
ac_header_dirent=no
7089
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
7090
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
7091
-echo "$as_me:9369: checking for $ac_hdr that defines DIR" >&5
7092
+echo "$as_me:9578: checking for $ac_hdr that defines DIR" >&5
7093
echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
7094
if eval "test \"\${$as_ac_Header+set}\" = set"; then
7095
echo $ECHO_N "(cached) $ECHO_C" >&6
7096
else
7097
cat >conftest.$ac_ext <<_ACEOF
7098
-#line 9375 "configure"
7099
+#line 9584 "configure"
7100
#include "confdefs.h"
7101
#include <sys/types.h>
7102
#include <$ac_hdr>
7103
@@ -9387,16 +9596,16 @@ return 0;
7104
}
7105
_ACEOF
7106
rm -f conftest.$ac_objext
7107
-if { (eval echo "$as_me:9390: \"$ac_compile\"") >&5
7108
+if { (eval echo "$as_me:9599: \"$ac_compile\"") >&5
7109
(eval $ac_compile) 2>&5
7110
ac_status=$?
7111
- echo "$as_me:9393: \$? = $ac_status" >&5
7112
+ echo "$as_me:9602: \$? = $ac_status" >&5
7113
(exit $ac_status); } &&
7114
{ ac_try='test -s conftest.$ac_objext'
7115
- { (eval echo "$as_me:9396: \"$ac_try\"") >&5
7116
+ { (eval echo "$as_me:9605: \"$ac_try\"") >&5
7117
(eval $ac_try) 2>&5
7118
ac_status=$?
7119
- echo "$as_me:9399: \$? = $ac_status" >&5
7120
+ echo "$as_me:9608: \$? = $ac_status" >&5
7121
(exit $ac_status); }; }; then
7122
eval "$as_ac_Header=yes"
7123
else
7124
@@ -9406,7 +9615,7 @@ eval "$as_ac_Header=no"
7125
fi
7126
rm -f conftest.$ac_objext conftest.$ac_ext
7127
fi
7128
-echo "$as_me:9409: result: `eval echo '${'$as_ac_Header'}'`" >&5
7129
+echo "$as_me:9618: result: `eval echo '${'$as_ac_Header'}'`" >&5
7130
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7131
if test `eval echo '${'$as_ac_Header'}'` = yes; then
7132
cat >>confdefs.h <<EOF
7133
@@ -9419,7 +9628,7 @@ fi
7134
done
7135
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
7136
if test $ac_header_dirent = dirent.h; then
7137
- echo "$as_me:9422: checking for opendir in -ldir" >&5
7138
+ echo "$as_me:9631: checking for opendir in -ldir" >&5
7139
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
7140
if test "${ac_cv_lib_dir_opendir+set}" = set; then
7141
echo $ECHO_N "(cached) $ECHO_C" >&6
7142
@@ -9427,7 +9636,7 @@ else
7143
ac_check_lib_save_LIBS=$LIBS
7144
LIBS="-ldir $LIBS"
7145
cat >conftest.$ac_ext <<_ACEOF
7146
-#line 9430 "configure"
7147
+#line 9639 "configure"
7148
#include "confdefs.h"
7149
7150
/* Override any gcc2 internal prototype to avoid an error. */
7151
@@ -9446,16 +9655,16 @@ opendir ();
7152
}
7153
_ACEOF
7154
rm -f conftest.$ac_objext conftest$ac_exeext
7155
-if { (eval echo "$as_me:9449: \"$ac_link\"") >&5
7156
+if { (eval echo "$as_me:9658: \"$ac_link\"") >&5
7157
(eval $ac_link) 2>&5
7158
ac_status=$?
7159
- echo "$as_me:9452: \$? = $ac_status" >&5
7160
+ echo "$as_me:9661: \$? = $ac_status" >&5
7161
(exit $ac_status); } &&
7162
{ ac_try='test -s conftest$ac_exeext'
7163
- { (eval echo "$as_me:9455: \"$ac_try\"") >&5
7164
+ { (eval echo "$as_me:9664: \"$ac_try\"") >&5
7165
(eval $ac_try) 2>&5
7166
ac_status=$?
7167
- echo "$as_me:9458: \$? = $ac_status" >&5
7168
+ echo "$as_me:9667: \$? = $ac_status" >&5
7169
(exit $ac_status); }; }; then
7170
ac_cv_lib_dir_opendir=yes
7171
else
7172
@@ -9466,14 +9675,14 @@ fi
7173
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7174
LIBS=$ac_check_lib_save_LIBS
7175
fi
7176
-echo "$as_me:9469: result: $ac_cv_lib_dir_opendir" >&5
7177
+echo "$as_me:9678: result: $ac_cv_lib_dir_opendir" >&5
7178
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
7179
if test $ac_cv_lib_dir_opendir = yes; then
7180
LIBS="$LIBS -ldir"
7181
fi
7182
7183
else
7184
- echo "$as_me:9476: checking for opendir in -lx" >&5
7185
+ echo "$as_me:9685: checking for opendir in -lx" >&5
7186
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
7187
if test "${ac_cv_lib_x_opendir+set}" = set; then
7188
echo $ECHO_N "(cached) $ECHO_C" >&6
7189
@@ -9481,7 +9690,7 @@ else
7190
ac_check_lib_save_LIBS=$LIBS
7191
LIBS="-lx $LIBS"
7192
cat >conftest.$ac_ext <<_ACEOF
7193
-#line 9484 "configure"
7194
+#line 9693 "configure"
7195
#include "confdefs.h"
7196
7197
/* Override any gcc2 internal prototype to avoid an error. */
7198
@@ -9500,16 +9709,16 @@ opendir ();
7199
}
7200
_ACEOF
7201
rm -f conftest.$ac_objext conftest$ac_exeext
7202
-if { (eval echo "$as_me:9503: \"$ac_link\"") >&5
7203
+if { (eval echo "$as_me:9712: \"$ac_link\"") >&5
7204
(eval $ac_link) 2>&5
7205
ac_status=$?
7206
- echo "$as_me:9506: \$? = $ac_status" >&5
7207
+ echo "$as_me:9715: \$? = $ac_status" >&5
7208
(exit $ac_status); } &&
7209
{ ac_try='test -s conftest$ac_exeext'
7210
- { (eval echo "$as_me:9509: \"$ac_try\"") >&5
7211
+ { (eval echo "$as_me:9718: \"$ac_try\"") >&5
7212
(eval $ac_try) 2>&5
7213
ac_status=$?
7214
- echo "$as_me:9512: \$? = $ac_status" >&5
7215
+ echo "$as_me:9721: \$? = $ac_status" >&5
7216
(exit $ac_status); }; }; then
7217
ac_cv_lib_x_opendir=yes
7218
else
7219
@@ -9520,7 +9729,7 @@ fi
7220
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7221
LIBS=$ac_check_lib_save_LIBS
7222
fi
7223
-echo "$as_me:9523: result: $ac_cv_lib_x_opendir" >&5
7224
+echo "$as_me:9732: result: $ac_cv_lib_x_opendir" >&5
7225
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
7226
if test $ac_cv_lib_x_opendir = yes; then
7227
LIBS="$LIBS -lx"
7228
@@ -9528,13 +9737,13 @@ fi
7229
7230
fi
7231
7232
-echo "$as_me:9531: checking whether time.h and sys/time.h may both be included" >&5
7233
+echo "$as_me:9740: checking whether time.h and sys/time.h may both be included" >&5
7234
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
7235
if test "${ac_cv_header_time+set}" = set; then
7236
echo $ECHO_N "(cached) $ECHO_C" >&6
7237
else
7238
cat >conftest.$ac_ext <<_ACEOF
7239
-#line 9537 "configure"
7240
+#line 9746 "configure"
7241
#include "confdefs.h"
7242
#include <sys/types.h>
7243
#include <sys/time.h>
7244
@@ -9550,16 +9759,16 @@ return 0;
7245
}
7246
_ACEOF
7247
rm -f conftest.$ac_objext
7248
-if { (eval echo "$as_me:9553: \"$ac_compile\"") >&5
7249
+if { (eval echo "$as_me:9762: \"$ac_compile\"") >&5
7250
(eval $ac_compile) 2>&5
7251
ac_status=$?
7252
- echo "$as_me:9556: \$? = $ac_status" >&5
7253
+ echo "$as_me:9765: \$? = $ac_status" >&5
7254
(exit $ac_status); } &&
7255
{ ac_try='test -s conftest.$ac_objext'
7256
- { (eval echo "$as_me:9559: \"$ac_try\"") >&5
7257
+ { (eval echo "$as_me:9768: \"$ac_try\"") >&5
7258
(eval $ac_try) 2>&5
7259
ac_status=$?
7260
- echo "$as_me:9562: \$? = $ac_status" >&5
7261
+ echo "$as_me:9771: \$? = $ac_status" >&5
7262
(exit $ac_status); }; }; then
7263
ac_cv_header_time=yes
7264
else
7265
@@ -9569,7 +9778,7 @@ ac_cv_header_time=no
7266
fi
7267
rm -f conftest.$ac_objext conftest.$ac_ext
7268
fi
7269
-echo "$as_me:9572: result: $ac_cv_header_time" >&5
7270
+echo "$as_me:9781: result: $ac_cv_header_time" >&5
7271
echo "${ECHO_T}$ac_cv_header_time" >&6
7272
if test $ac_cv_header_time = yes; then
7273
7274
@@ -9579,14 +9788,14 @@ EOF
7275
7276
fi
7277
7278
-echo "$as_me:9582: checking for regular-expression headers" >&5
7279
+echo "$as_me:9791: checking for regular-expression headers" >&5
7280
echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
7281
if test "${cf_cv_regex+set}" = set; then
7282
echo $ECHO_N "(cached) $ECHO_C" >&6
7283
else
7284
7285
cat >conftest.$ac_ext <<_ACEOF
7286
-#line 9589 "configure"
7287
+#line 9798 "configure"
7288
#include "confdefs.h"
7289
#include <sys/types.h>
7290
#include <regex.h>
7291
@@ -9604,16 +9813,16 @@ main ()
7292
}
7293
_ACEOF
7294
rm -f conftest.$ac_objext conftest$ac_exeext
7295
-if { (eval echo "$as_me:9607: \"$ac_link\"") >&5
7296
+if { (eval echo "$as_me:9816: \"$ac_link\"") >&5
7297
(eval $ac_link) 2>&5
7298
ac_status=$?
7299
- echo "$as_me:9610: \$? = $ac_status" >&5
7300
+ echo "$as_me:9819: \$? = $ac_status" >&5
7301
(exit $ac_status); } &&
7302
{ ac_try='test -s conftest$ac_exeext'
7303
- { (eval echo "$as_me:9613: \"$ac_try\"") >&5
7304
+ { (eval echo "$as_me:9822: \"$ac_try\"") >&5
7305
(eval $ac_try) 2>&5
7306
ac_status=$?
7307
- echo "$as_me:9616: \$? = $ac_status" >&5
7308
+ echo "$as_me:9825: \$? = $ac_status" >&5
7309
(exit $ac_status); }; }; then
7310
cf_cv_regex="regex.h"
7311
else
7312
@@ -9621,7 +9830,7 @@ else
7313
cat conftest.$ac_ext >&5
7314
7315
cat >conftest.$ac_ext <<_ACEOF
7316
-#line 9624 "configure"
7317
+#line 9833 "configure"
7318
#include "confdefs.h"
7319
#include <regexp.h>
7320
int
7321
@@ -9636,16 +9845,16 @@ main ()
7322
}
7323
_ACEOF
7324
rm -f conftest.$ac_objext conftest$ac_exeext
7325
-if { (eval echo "$as_me:9639: \"$ac_link\"") >&5
7326
+if { (eval echo "$as_me:9848: \"$ac_link\"") >&5
7327
(eval $ac_link) 2>&5
7328
ac_status=$?
7329
- echo "$as_me:9642: \$? = $ac_status" >&5
7330
+ echo "$as_me:9851: \$? = $ac_status" >&5
7331
(exit $ac_status); } &&
7332
{ ac_try='test -s conftest$ac_exeext'
7333
- { (eval echo "$as_me:9645: \"$ac_try\"") >&5
7334
+ { (eval echo "$as_me:9854: \"$ac_try\"") >&5
7335
(eval $ac_try) 2>&5
7336
ac_status=$?
7337
- echo "$as_me:9648: \$? = $ac_status" >&5
7338
+ echo "$as_me:9857: \$? = $ac_status" >&5
7339
(exit $ac_status); }; }; then
7340
cf_cv_regex="regexp.h"
7341
else
7342
@@ -9655,7 +9864,7 @@ cat conftest.$ac_ext >&5
7343
cf_save_LIBS="$LIBS"
7344
LIBS="-lgen $LIBS"
7345
cat >conftest.$ac_ext <<_ACEOF
7346
-#line 9658 "configure"
7347
+#line 9867 "configure"
7348
#include "confdefs.h"
7349
#include <regexpr.h>
7350
int
7351
@@ -9670,16 +9879,16 @@ main ()
7352
}
7353
_ACEOF
7354
rm -f conftest.$ac_objext conftest$ac_exeext
7355
-if { (eval echo "$as_me:9673: \"$ac_link\"") >&5
7356
+if { (eval echo "$as_me:9882: \"$ac_link\"") >&5
7357
(eval $ac_link) 2>&5
7358
ac_status=$?
7359
- echo "$as_me:9676: \$? = $ac_status" >&5
7360
+ echo "$as_me:9885: \$? = $ac_status" >&5
7361
(exit $ac_status); } &&
7362
{ ac_try='test -s conftest$ac_exeext'
7363
- { (eval echo "$as_me:9679: \"$ac_try\"") >&5
7364
+ { (eval echo "$as_me:9888: \"$ac_try\"") >&5
7365
(eval $ac_try) 2>&5
7366
ac_status=$?
7367
- echo "$as_me:9682: \$? = $ac_status" >&5
7368
+ echo "$as_me:9891: \$? = $ac_status" >&5
7369
(exit $ac_status); }; }; then
7370
cf_cv_regex="regexpr.h"
7371
else
7372
@@ -9695,7 +9904,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
7373
7374
fi
7375
7376
-echo "$as_me:9698: result: $cf_cv_regex" >&5
7377
+echo "$as_me:9907: result: $cf_cv_regex" >&5
7378
echo "${ECHO_T}$cf_cv_regex" >&6
7379
case $cf_cv_regex in
7380
regex.h) cat >>confdefs.h <<\EOF
7381
@@ -9731,23 +9940,23 @@ wctype.h \
7382
7383
do
7384
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
7385
-echo "$as_me:9734: checking for $ac_header" >&5
7386
+echo "$as_me:9943: checking for $ac_header" >&5
7387
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
7388
if eval "test \"\${$as_ac_Header+set}\" = set"; then
7389
echo $ECHO_N "(cached) $ECHO_C" >&6
7390
else
7391
cat >conftest.$ac_ext <<_ACEOF
7392
-#line 9740 "configure"
7393
+#line 9949 "configure"
7394
#include "confdefs.h"
7395
#include <$ac_header>
7396
_ACEOF
7397
-if { (eval echo "$as_me:9744: \"$ac_cpp conftest.$ac_ext\"") >&5
7398
+if { (eval echo "$as_me:9953: \"$ac_cpp conftest.$ac_ext\"") >&5
7399
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7400
ac_status=$?
7401
egrep -v '^ *\+' conftest.er1 >conftest.err
7402
rm -f conftest.er1
7403
cat conftest.err >&5
7404
- echo "$as_me:9750: \$? = $ac_status" >&5
7405
+ echo "$as_me:9959: \$? = $ac_status" >&5
7406
(exit $ac_status); } >/dev/null; then
7407
if test -s conftest.err; then
7408
ac_cpp_err=$ac_c_preproc_warn_flag
7409
@@ -9766,7 +9975,7 @@ else
7410
fi
7411
rm -f conftest.err conftest.$ac_ext
7412
fi
7413
-echo "$as_me:9769: result: `eval echo '${'$as_ac_Header'}'`" >&5
7414
+echo "$as_me:9978: result: `eval echo '${'$as_ac_Header'}'`" >&5
7415
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7416
if test `eval echo '${'$as_ac_Header'}'` = yes; then
7417
cat >>confdefs.h <<EOF
7418
@@ -9780,7 +9989,7 @@ done
7419
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
7420
if test "$ISC" = yes ; then
7421
7422
-echo "$as_me:9783: checking for main in -lcposix" >&5
7423
+echo "$as_me:9992: checking for main in -lcposix" >&5
7424
echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
7425
if test "${ac_cv_lib_cposix_main+set}" = set; then
7426
echo $ECHO_N "(cached) $ECHO_C" >&6
7427
@@ -9788,7 +9997,7 @@ else
7428
ac_check_lib_save_LIBS=$LIBS
7429
LIBS="-lcposix $LIBS"
7430
cat >conftest.$ac_ext <<_ACEOF
7431
-#line 9791 "configure"
7432
+#line 10000 "configure"
7433
#include "confdefs.h"
7434
7435
int
7436
@@ -9800,16 +10009,16 @@ main ();
7437
}
7438
_ACEOF
7439
rm -f conftest.$ac_objext conftest$ac_exeext
7440
-if { (eval echo "$as_me:9803: \"$ac_link\"") >&5
7441
+if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
7442
(eval $ac_link) 2>&5
7443
ac_status=$?
7444
- echo "$as_me:9806: \$? = $ac_status" >&5
7445
+ echo "$as_me:10015: \$? = $ac_status" >&5
7446
(exit $ac_status); } &&
7447
{ ac_try='test -s conftest$ac_exeext'
7448
- { (eval echo "$as_me:9809: \"$ac_try\"") >&5
7449
+ { (eval echo "$as_me:10018: \"$ac_try\"") >&5
7450
(eval $ac_try) 2>&5
7451
ac_status=$?
7452
- echo "$as_me:9812: \$? = $ac_status" >&5
7453
+ echo "$as_me:10021: \$? = $ac_status" >&5
7454
(exit $ac_status); }; }; then
7455
ac_cv_lib_cposix_main=yes
7456
else
7457
@@ -9820,7 +10029,7 @@ fi
7458
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7459
LIBS=$ac_check_lib_save_LIBS
7460
fi
7461
-echo "$as_me:9823: result: $ac_cv_lib_cposix_main" >&5
7462
+echo "$as_me:10032: result: $ac_cv_lib_cposix_main" >&5
7463
echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
7464
if test $ac_cv_lib_cposix_main = yes; then
7465
cat >>confdefs.h <<EOF
7466
@@ -9831,7 +10040,7 @@ EOF
7467
7468
fi
7469
7470
- echo "$as_me:9834: checking for bzero in -linet" >&5
7471
+ echo "$as_me:10043: checking for bzero in -linet" >&5
7472
echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
7473
if test "${ac_cv_lib_inet_bzero+set}" = set; then
7474
echo $ECHO_N "(cached) $ECHO_C" >&6
7475
@@ -9839,7 +10048,7 @@ else
7476
ac_check_lib_save_LIBS=$LIBS
7477
LIBS="-linet $LIBS"
7478
cat >conftest.$ac_ext <<_ACEOF
7479
-#line 9842 "configure"
7480
+#line 10051 "configure"
7481
#include "confdefs.h"
7482
7483
/* Override any gcc2 internal prototype to avoid an error. */
7484
@@ -9858,16 +10067,16 @@ bzero ();
7485
}
7486
_ACEOF
7487
rm -f conftest.$ac_objext conftest$ac_exeext
7488
-if { (eval echo "$as_me:9861: \"$ac_link\"") >&5
7489
+if { (eval echo "$as_me:10070: \"$ac_link\"") >&5
7490
(eval $ac_link) 2>&5
7491
ac_status=$?
7492
- echo "$as_me:9864: \$? = $ac_status" >&5
7493
+ echo "$as_me:10073: \$? = $ac_status" >&5
7494
(exit $ac_status); } &&
7495
{ ac_try='test -s conftest$ac_exeext'
7496
- { (eval echo "$as_me:9867: \"$ac_try\"") >&5
7497
+ { (eval echo "$as_me:10076: \"$ac_try\"") >&5
7498
(eval $ac_try) 2>&5
7499
ac_status=$?
7500
- echo "$as_me:9870: \$? = $ac_status" >&5
7501
+ echo "$as_me:10079: \$? = $ac_status" >&5
7502
(exit $ac_status); }; }; then
7503
ac_cv_lib_inet_bzero=yes
7504
else
7505
@@ -9878,21 +10087,21 @@ fi
7506
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7507
LIBS=$ac_check_lib_save_LIBS
7508
fi
7509
-echo "$as_me:9881: result: $ac_cv_lib_inet_bzero" >&5
7510
+echo "$as_me:10090: result: $ac_cv_lib_inet_bzero" >&5
7511
echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
7512
if test $ac_cv_lib_inet_bzero = yes; then
7513
LIBS="$LIBS -linet"
7514
fi
7515
fi
7516
7517
-echo "$as_me:9888: checking if sys/time.h works with sys/select.h" >&5
7518
+echo "$as_me:10097: checking if sys/time.h works with sys/select.h" >&5
7519
echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
7520
if test "${cf_cv_sys_time_select+set}" = set; then
7521
echo $ECHO_N "(cached) $ECHO_C" >&6
7522
else
7523
7524
cat >conftest.$ac_ext <<_ACEOF
7525
-#line 9895 "configure"
7526
+#line 10104 "configure"
7527
#include "confdefs.h"
7528
7529
#include <sys/types.h>
7530
@@ -9912,16 +10121,16 @@ main ()
7531
}
7532
_ACEOF
7533
rm -f conftest.$ac_objext
7534
-if { (eval echo "$as_me:9915: \"$ac_compile\"") >&5
7535
+if { (eval echo "$as_me:10124: \"$ac_compile\"") >&5
7536
(eval $ac_compile) 2>&5
7537
ac_status=$?
7538
- echo "$as_me:9918: \$? = $ac_status" >&5
7539
+ echo "$as_me:10127: \$? = $ac_status" >&5
7540
(exit $ac_status); } &&
7541
{ ac_try='test -s conftest.$ac_objext'
7542
- { (eval echo "$as_me:9921: \"$ac_try\"") >&5
7543
+ { (eval echo "$as_me:10130: \"$ac_try\"") >&5
7544
(eval $ac_try) 2>&5
7545
ac_status=$?
7546
- echo "$as_me:9924: \$? = $ac_status" >&5
7547
+ echo "$as_me:10133: \$? = $ac_status" >&5
7548
(exit $ac_status); }; }; then
7549
cf_cv_sys_time_select=yes
7550
else
7551
@@ -9933,7 +10142,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
7552
7553
fi
7554
7555
-echo "$as_me:9936: result: $cf_cv_sys_time_select" >&5
7556
+echo "$as_me:10145: result: $cf_cv_sys_time_select" >&5
7557
echo "${ECHO_T}$cf_cv_sys_time_select" >&6
7558
test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
7559
#define HAVE_SYS_TIME_SELECT 1
7560
@@ -9946,7 +10155,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
7561
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7562
ac_compiler_gnu=$ac_cv_c_compiler_gnu
7563
7564
-echo "$as_me:9949: checking for $CC option to accept ANSI C" >&5
7565
+echo "$as_me:10158: checking for $CC option to accept ANSI C" >&5
7566
echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
7567
if test "${ac_cv_prog_cc_stdc+set}" = set; then
7568
echo $ECHO_N "(cached) $ECHO_C" >&6
7569
@@ -9954,7 +10163,7 @@ else
7570
ac_cv_prog_cc_stdc=no
7571
ac_save_CC=$CC
7572
cat >conftest.$ac_ext <<_ACEOF
7573
-#line 9957 "configure"
7574
+#line 10166 "configure"
7575
#include "confdefs.h"
7576
#include <stdarg.h>
7577
#include <stdio.h>
7578
@@ -10003,16 +10212,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A
7579
do
7580
CC="$ac_save_CC $ac_arg"
7581
rm -f conftest.$ac_objext
7582
-if { (eval echo "$as_me:10006: \"$ac_compile\"") >&5
7583
+if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
7584
(eval $ac_compile) 2>&5
7585
ac_status=$?
7586
- echo "$as_me:10009: \$? = $ac_status" >&5
7587
+ echo "$as_me:10218: \$? = $ac_status" >&5
7588
(exit $ac_status); } &&
7589
{ ac_try='test -s conftest.$ac_objext'
7590
- { (eval echo "$as_me:10012: \"$ac_try\"") >&5
7591
+ { (eval echo "$as_me:10221: \"$ac_try\"") >&5
7592
(eval $ac_try) 2>&5
7593
ac_status=$?
7594
- echo "$as_me:10015: \$? = $ac_status" >&5
7595
+ echo "$as_me:10224: \$? = $ac_status" >&5
7596
(exit $ac_status); }; }; then
7597
ac_cv_prog_cc_stdc=$ac_arg
7598
break
7599
@@ -10029,21 +10238,21 @@ fi
7600
7601
case "x$ac_cv_prog_cc_stdc" in
7602
x|xno)
7603
- echo "$as_me:10032: result: none needed" >&5
7604
+ echo "$as_me:10241: result: none needed" >&5
7605
echo "${ECHO_T}none needed" >&6 ;;
7606
*)
7607
- echo "$as_me:10035: result: $ac_cv_prog_cc_stdc" >&5
7608
+ echo "$as_me:10244: result: $ac_cv_prog_cc_stdc" >&5
7609
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
7610
CC="$CC $ac_cv_prog_cc_stdc" ;;
7611
esac
7612
7613
-echo "$as_me:10040: checking for an ANSI C-conforming const" >&5
7614
+echo "$as_me:10249: checking for an ANSI C-conforming const" >&5
7615
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
7616
if test "${ac_cv_c_const+set}" = set; then
7617
echo $ECHO_N "(cached) $ECHO_C" >&6
7618
else
7619
cat >conftest.$ac_ext <<_ACEOF
7620
-#line 10046 "configure"
7621
+#line 10255 "configure"
7622
#include "confdefs.h"
7623
7624
int
7625
@@ -10101,16 +10310,16 @@ main ()
7626
}
7627
_ACEOF
7628
rm -f conftest.$ac_objext
7629
-if { (eval echo "$as_me:10104: \"$ac_compile\"") >&5
7630
+if { (eval echo "$as_me:10313: \"$ac_compile\"") >&5
7631
(eval $ac_compile) 2>&5
7632
ac_status=$?
7633
- echo "$as_me:10107: \$? = $ac_status" >&5
7634
+ echo "$as_me:10316: \$? = $ac_status" >&5
7635
(exit $ac_status); } &&
7636
{ ac_try='test -s conftest.$ac_objext'
7637
- { (eval echo "$as_me:10110: \"$ac_try\"") >&5
7638
+ { (eval echo "$as_me:10319: \"$ac_try\"") >&5
7639
(eval $ac_try) 2>&5
7640
ac_status=$?
7641
- echo "$as_me:10113: \$? = $ac_status" >&5
7642
+ echo "$as_me:10322: \$? = $ac_status" >&5
7643
(exit $ac_status); }; }; then
7644
ac_cv_c_const=yes
7645
else
7646
@@ -10120,7 +10329,7 @@ ac_cv_c_const=no
7647
fi
7648
rm -f conftest.$ac_objext conftest.$ac_ext
7649
fi
7650
-echo "$as_me:10123: result: $ac_cv_c_const" >&5
7651
+echo "$as_me:10332: result: $ac_cv_c_const" >&5
7652
echo "${ECHO_T}$ac_cv_c_const" >&6
7653
if test $ac_cv_c_const = no; then
7654
7655
@@ -10130,7 +10339,7 @@ EOF
7656
7657
fi
7658
7659
-echo "$as_me:10133: checking for inline" >&5
7660
+echo "$as_me:10342: checking for inline" >&5
7661
echo $ECHO_N "checking for inline... $ECHO_C" >&6
7662
if test "${ac_cv_c_inline+set}" = set; then
7663
echo $ECHO_N "(cached) $ECHO_C" >&6
7664
@@ -10138,7 +10347,7 @@ else
7665
ac_cv_c_inline=no
7666
for ac_kw in inline __inline__ __inline; do
7667
cat >conftest.$ac_ext <<_ACEOF
7668
-#line 10141 "configure"
7669
+#line 10350 "configure"
7670
#include "confdefs.h"
7671
#ifndef __cplusplus
7672
static $ac_kw int static_foo () {return 0; }
7673
@@ -10147,16 +10356,16 @@ $ac_kw int foo () {return 0; }
7674
7675
_ACEOF
7676
rm -f conftest.$ac_objext
7677
-if { (eval echo "$as_me:10150: \"$ac_compile\"") >&5
7678
+if { (eval echo "$as_me:10359: \"$ac_compile\"") >&5
7679
(eval $ac_compile) 2>&5
7680
ac_status=$?
7681
- echo "$as_me:10153: \$? = $ac_status" >&5
7682
+ echo "$as_me:10362: \$? = $ac_status" >&5
7683
(exit $ac_status); } &&
7684
{ ac_try='test -s conftest.$ac_objext'
7685
- { (eval echo "$as_me:10156: \"$ac_try\"") >&5
7686
+ { (eval echo "$as_me:10365: \"$ac_try\"") >&5
7687
(eval $ac_try) 2>&5
7688
ac_status=$?
7689
- echo "$as_me:10159: \$? = $ac_status" >&5
7690
+ echo "$as_me:10368: \$? = $ac_status" >&5
7691
(exit $ac_status); }; }; then
7692
ac_cv_c_inline=$ac_kw; break
7693
else
7694
@@ -10167,7 +10376,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
7695
done
7696
7697
fi
7698
-echo "$as_me:10170: result: $ac_cv_c_inline" >&5
7699
+echo "$as_me:10379: result: $ac_cv_c_inline" >&5
7700
echo "${ECHO_T}$ac_cv_c_inline" >&6
7701
case $ac_cv_c_inline in
7702
inline | yes) ;;
7703
@@ -10182,13 +10391,18 @@ EOF
7704
;;
7705
esac
7706
7707
-test "$ac_cv_c_inline" != no && cat >>confdefs.h <<\EOF
7708
+NCURSES_INLINE=
7709
+if test "$ac_cv_c_inline" != no ; then
7710
+ cat >>confdefs.h <<\EOF
7711
#define CC_HAS_INLINE_FUNCS 1
7712
EOF
7713
7714
+ NCURSES_INLINE=inline
7715
+fi
7716
+
7717
if test $NCURSES_CHTYPE = auto ; then
7718
7719
-echo "$as_me:10191: checking for type of chtype" >&5
7720
+echo "$as_me:10405: checking for type of chtype" >&5
7721
echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
7722
if test "${cf_cv_typeof_chtype+set}" = set; then
7723
echo $ECHO_N "(cached) $ECHO_C" >&6
7724
@@ -10198,7 +10412,7 @@ else
7725
cf_cv_typeof_chtype=long
7726
else
7727
cat >conftest.$ac_ext <<_ACEOF
7728
-#line 10201 "configure"
7729
+#line 10415 "configure"
7730
#include "confdefs.h"
7731
7732
#define WANT_BITS 31
7733
@@ -10233,15 +10447,15 @@ int main()
7734
7735
_ACEOF
7736
rm -f conftest$ac_exeext
7737
-if { (eval echo "$as_me:10236: \"$ac_link\"") >&5
7738
+if { (eval echo "$as_me:10450: \"$ac_link\"") >&5
7739
(eval $ac_link) 2>&5
7740
ac_status=$?
7741
- echo "$as_me:10239: \$? = $ac_status" >&5
7742
+ echo "$as_me:10453: \$? = $ac_status" >&5
7743
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7744
- { (eval echo "$as_me:10241: \"$ac_try\"") >&5
7745
+ { (eval echo "$as_me:10455: \"$ac_try\"") >&5
7746
(eval $ac_try) 2>&5
7747
ac_status=$?
7748
- echo "$as_me:10244: \$? = $ac_status" >&5
7749
+ echo "$as_me:10458: \$? = $ac_status" >&5
7750
(exit $ac_status); }; }; then
7751
cf_cv_typeof_chtype=`cat cf_test.out`
7752
else
7753
@@ -10256,7 +10470,7 @@ fi
7754
7755
fi
7756
7757
-echo "$as_me:10259: result: $cf_cv_typeof_chtype" >&5
7758
+echo "$as_me:10473: result: $cf_cv_typeof_chtype" >&5
7759
echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
7760
7761
cat >>confdefs.h <<EOF
7762
@@ -10267,14 +10481,14 @@ else
7763
cf_cv_typeof_chtype=$NCURSES_CHTYPE
7764
fi
7765
7766
-echo "$as_me:10270: checking if unsigned literals are legal" >&5
7767
+echo "$as_me:10484: checking if unsigned literals are legal" >&5
7768
echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
7769
if test "${cf_cv_unsigned_literals+set}" = set; then
7770
echo $ECHO_N "(cached) $ECHO_C" >&6
7771
else
7772
7773
cat >conftest.$ac_ext <<_ACEOF
7774
-#line 10277 "configure"
7775
+#line 10491 "configure"
7776
#include "confdefs.h"
7777
7778
int
7779
@@ -10286,16 +10500,16 @@ long x = 1L + 1UL + 1U + 1
7780
}
7781
_ACEOF
7782
rm -f conftest.$ac_objext
7783
-if { (eval echo "$as_me:10289: \"$ac_compile\"") >&5
7784
+if { (eval echo "$as_me:10503: \"$ac_compile\"") >&5
7785
(eval $ac_compile) 2>&5
7786
ac_status=$?
7787
- echo "$as_me:10292: \$? = $ac_status" >&5
7788
+ echo "$as_me:10506: \$? = $ac_status" >&5
7789
(exit $ac_status); } &&
7790
{ ac_try='test -s conftest.$ac_objext'
7791
- { (eval echo "$as_me:10295: \"$ac_try\"") >&5
7792
+ { (eval echo "$as_me:10509: \"$ac_try\"") >&5
7793
(eval $ac_try) 2>&5
7794
ac_status=$?
7795
- echo "$as_me:10298: \$? = $ac_status" >&5
7796
+ echo "$as_me:10512: \$? = $ac_status" >&5
7797
(exit $ac_status); }; }; then
7798
cf_cv_unsigned_literals=yes
7799
else
7800
@@ -10307,7 +10521,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
7801
7802
fi
7803
7804
-echo "$as_me:10310: result: $cf_cv_unsigned_literals" >&5
7805
+echo "$as_me:10524: result: $cf_cv_unsigned_literals" >&5
7806
echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
7807
7808
cf_cv_1UL="1"
7809
@@ -10322,14 +10536,14 @@ fi
7810
7811
### Checks for external-data
7812
7813
-echo "$as_me:10325: checking if external errno is declared" >&5
7814
+echo "$as_me:10539: checking if external errno is declared" >&5
7815
echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
7816
if test "${cf_cv_dcl_errno+set}" = set; then
7817
echo $ECHO_N "(cached) $ECHO_C" >&6
7818
else
7819
7820
cat >conftest.$ac_ext <<_ACEOF
7821
-#line 10332 "configure"
7822
+#line 10546 "configure"
7823
#include "confdefs.h"
7824
7825
#ifdef HAVE_STDLIB_H
7826
@@ -10347,16 +10561,16 @@ long x = (long) errno
7827
}
7828
_ACEOF
7829
rm -f conftest.$ac_objext
7830
-if { (eval echo "$as_me:10350: \"$ac_compile\"") >&5
7831
+if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5
7832
(eval $ac_compile) 2>&5
7833
ac_status=$?
7834
- echo "$as_me:10353: \$? = $ac_status" >&5
7835
+ echo "$as_me:10567: \$? = $ac_status" >&5
7836
(exit $ac_status); } &&
7837
{ ac_try='test -s conftest.$ac_objext'
7838
- { (eval echo "$as_me:10356: \"$ac_try\"") >&5
7839
+ { (eval echo "$as_me:10570: \"$ac_try\"") >&5
7840
(eval $ac_try) 2>&5
7841
ac_status=$?
7842
- echo "$as_me:10359: \$? = $ac_status" >&5
7843
+ echo "$as_me:10573: \$? = $ac_status" >&5
7844
(exit $ac_status); }; }; then
7845
cf_cv_dcl_errno=yes
7846
else
7847
@@ -10367,7 +10581,7 @@ fi
7848
rm -f conftest.$ac_objext conftest.$ac_ext
7849
7850
fi
7851
-echo "$as_me:10370: result: $cf_cv_dcl_errno" >&5
7852
+echo "$as_me:10584: result: $cf_cv_dcl_errno" >&5
7853
echo "${ECHO_T}$cf_cv_dcl_errno" >&6
7854
7855
if test "$cf_cv_dcl_errno" = no ; then
7856
@@ -10382,14 +10596,14 @@ fi
7857
7858
# It's possible (for near-UNIX clones) that the data doesn't exist
7859
7860
-echo "$as_me:10385: checking if external errno exists" >&5
7861
+echo "$as_me:10599: checking if external errno exists" >&5
7862
echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
7863
if test "${cf_cv_have_errno+set}" = set; then
7864
echo $ECHO_N "(cached) $ECHO_C" >&6
7865
else
7866
7867
cat >conftest.$ac_ext <<_ACEOF
7868
-#line 10392 "configure"
7869
+#line 10606 "configure"
7870
#include "confdefs.h"
7871
7872
#undef errno
7873
@@ -10404,16 +10618,16 @@ errno = 2
7874
}
7875
_ACEOF
7876
rm -f conftest.$ac_objext conftest$ac_exeext
7877
-if { (eval echo "$as_me:10407: \"$ac_link\"") >&5
7878
+if { (eval echo "$as_me:10621: \"$ac_link\"") >&5
7879
(eval $ac_link) 2>&5
7880
ac_status=$?
7881
- echo "$as_me:10410: \$? = $ac_status" >&5
7882
+ echo "$as_me:10624: \$? = $ac_status" >&5
7883
(exit $ac_status); } &&
7884
{ ac_try='test -s conftest$ac_exeext'
7885
- { (eval echo "$as_me:10413: \"$ac_try\"") >&5
7886
+ { (eval echo "$as_me:10627: \"$ac_try\"") >&5
7887
(eval $ac_try) 2>&5
7888
ac_status=$?
7889
- echo "$as_me:10416: \$? = $ac_status" >&5
7890
+ echo "$as_me:10630: \$? = $ac_status" >&5
7891
(exit $ac_status); }; }; then
7892
cf_cv_have_errno=yes
7893
else
7894
@@ -10424,7 +10638,7 @@ fi
7895
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7896
7897
fi
7898
-echo "$as_me:10427: result: $cf_cv_have_errno" >&5
7899
+echo "$as_me:10641: result: $cf_cv_have_errno" >&5
7900
echo "${ECHO_T}$cf_cv_have_errno" >&6
7901
7902
if test "$cf_cv_have_errno" = yes ; then
7903
@@ -10437,7 +10651,7 @@ EOF
7904
7905
fi
7906
7907
-echo "$as_me:10440: checking if data-only library module links" >&5
7908
+echo "$as_me:10654: checking if data-only library module links" >&5
7909
echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
7910
if test "${cf_cv_link_dataonly+set}" = set; then
7911
echo $ECHO_N "(cached) $ECHO_C" >&6
7912
@@ -10445,20 +10659,20 @@ else
7913
7914
rm -f conftest.a
7915
cat >conftest.$ac_ext <<EOF
7916
-#line 10448 "configure"
7917
+#line 10662 "configure"
7918
int testdata[3] = { 123, 456, 789 };
7919
EOF
7920
- if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5
7921
+ if { (eval echo "$as_me:10665: \"$ac_compile\"") >&5
7922
(eval $ac_compile) 2>&5
7923
ac_status=$?
7924
- echo "$as_me:10454: \$? = $ac_status" >&5
7925
+ echo "$as_me:10668: \$? = $ac_status" >&5
7926
(exit $ac_status); } ; then
7927
mv conftest.o data.o && \
7928
( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
7929
fi
7930
rm -f conftest.$ac_ext data.o
7931
cat >conftest.$ac_ext <<EOF
7932
-#line 10461 "configure"
7933
+#line 10675 "configure"
7934
int testfunc()
7935
{
7936
#if defined(NeXT)
7937
@@ -10471,10 +10685,10 @@ int testfunc()
7938
#endif
7939
}
7940
EOF
7941
- if { (eval echo "$as_me:10474: \"$ac_compile\"") >&5
7942
+ if { (eval echo "$as_me:10688: \"$ac_compile\"") >&5
7943
(eval $ac_compile) 2>&5
7944
ac_status=$?
7945
- echo "$as_me:10477: \$? = $ac_status" >&5
7946
+ echo "$as_me:10691: \$? = $ac_status" >&5
7947
(exit $ac_status); }; then
7948
mv conftest.o func.o && \
7949
( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
7950
@@ -10487,7 +10701,7 @@ EOF
7951
cf_cv_link_dataonly=unknown
7952
else
7953
cat >conftest.$ac_ext <<_ACEOF
7954
-#line 10490 "configure"
7955
+#line 10704 "configure"
7956
#include "confdefs.h"
7957
7958
int main()
7959
@@ -10498,15 +10712,15 @@ else
7960
7961
_ACEOF
7962
rm -f conftest$ac_exeext
7963
-if { (eval echo "$as_me:10501: \"$ac_link\"") >&5
7964
+if { (eval echo "$as_me:10715: \"$ac_link\"") >&5
7965
(eval $ac_link) 2>&5
7966
ac_status=$?
7967
- echo "$as_me:10504: \$? = $ac_status" >&5
7968
+ echo "$as_me:10718: \$? = $ac_status" >&5
7969
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7970
- { (eval echo "$as_me:10506: \"$ac_try\"") >&5
7971
+ { (eval echo "$as_me:10720: \"$ac_try\"") >&5
7972
(eval $ac_try) 2>&5
7973
ac_status=$?
7974
- echo "$as_me:10509: \$? = $ac_status" >&5
7975
+ echo "$as_me:10723: \$? = $ac_status" >&5
7976
(exit $ac_status); }; }; then
7977
cf_cv_link_dataonly=yes
7978
else
7979
@@ -10521,7 +10735,7 @@ fi
7980
7981
fi
7982
7983
-echo "$as_me:10524: result: $cf_cv_link_dataonly" >&5
7984
+echo "$as_me:10738: result: $cf_cv_link_dataonly" >&5
7985
echo "${ECHO_T}$cf_cv_link_dataonly" >&6
7986
7987
if test "$cf_cv_link_dataonly" = no ; then
7988
@@ -10556,13 +10770,13 @@ vsnprintf \
7989
7990
do
7991
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7992
-echo "$as_me:10559: checking for $ac_func" >&5
7993
+echo "$as_me:10773: checking for $ac_func" >&5
7994
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7995
if eval "test \"\${$as_ac_var+set}\" = set"; then
7996
echo $ECHO_N "(cached) $ECHO_C" >&6
7997
else
7998
cat >conftest.$ac_ext <<_ACEOF
7999
-#line 10565 "configure"
8000
+#line 10779 "configure"
8001
#include "confdefs.h"
8002
/* System header to define __stub macros and hopefully few prototypes,
8003
which can conflict with char $ac_func (); below. */
8004
@@ -10593,16 +10807,16 @@ f = $ac_func;
8005
}
8006
_ACEOF
8007
rm -f conftest.$ac_objext conftest$ac_exeext
8008
-if { (eval echo "$as_me:10596: \"$ac_link\"") >&5
8009
+if { (eval echo "$as_me:10810: \"$ac_link\"") >&5
8010
(eval $ac_link) 2>&5
8011
ac_status=$?
8012
- echo "$as_me:10599: \$? = $ac_status" >&5
8013
+ echo "$as_me:10813: \$? = $ac_status" >&5
8014
(exit $ac_status); } &&
8015
{ ac_try='test -s conftest$ac_exeext'
8016
- { (eval echo "$as_me:10602: \"$ac_try\"") >&5
8017
+ { (eval echo "$as_me:10816: \"$ac_try\"") >&5
8018
(eval $ac_try) 2>&5
8019
ac_status=$?
8020
- echo "$as_me:10605: \$? = $ac_status" >&5
8021
+ echo "$as_me:10819: \$? = $ac_status" >&5
8022
(exit $ac_status); }; }; then
8023
eval "$as_ac_var=yes"
8024
else
8025
@@ -10612,7 +10826,7 @@ eval "$as_ac_var=no"
8026
fi
8027
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8028
fi
8029
-echo "$as_me:10615: result: `eval echo '${'$as_ac_var'}'`" >&5
8030
+echo "$as_me:10829: result: `eval echo '${'$as_ac_var'}'`" >&5
8031
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
8032
if test `eval echo '${'$as_ac_var'}'` = yes; then
8033
cat >>confdefs.h <<EOF
8034
@@ -10624,14 +10838,14 @@ done
8035
8036
if test "$with_getcap" = "yes" ; then
8037
8038
-echo "$as_me:10627: checking for terminal-capability database functions" >&5
8039
+echo "$as_me:10841: checking for terminal-capability database functions" >&5
8040
echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
8041
if test "${cf_cv_cgetent+set}" = set; then
8042
echo $ECHO_N "(cached) $ECHO_C" >&6
8043
else
8044
8045
cat >conftest.$ac_ext <<_ACEOF
8046
-#line 10634 "configure"
8047
+#line 10848 "configure"
8048
#include "confdefs.h"
8049
8050
#include <stdlib.h>
8051
@@ -10651,16 +10865,16 @@ main ()
8052
}
8053
_ACEOF
8054
rm -f conftest.$ac_objext conftest$ac_exeext
8055
-if { (eval echo "$as_me:10654: \"$ac_link\"") >&5
8056
+if { (eval echo "$as_me:10868: \"$ac_link\"") >&5
8057
(eval $ac_link) 2>&5
8058
ac_status=$?
8059
- echo "$as_me:10657: \$? = $ac_status" >&5
8060
+ echo "$as_me:10871: \$? = $ac_status" >&5
8061
(exit $ac_status); } &&
8062
{ ac_try='test -s conftest$ac_exeext'
8063
- { (eval echo "$as_me:10660: \"$ac_try\"") >&5
8064
+ { (eval echo "$as_me:10874: \"$ac_try\"") >&5
8065
(eval $ac_try) 2>&5
8066
ac_status=$?
8067
- echo "$as_me:10663: \$? = $ac_status" >&5
8068
+ echo "$as_me:10877: \$? = $ac_status" >&5
8069
(exit $ac_status); }; }; then
8070
cf_cv_cgetent=yes
8071
else
8072
@@ -10672,7 +10886,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
8073
8074
fi
8075
8076
-echo "$as_me:10675: result: $cf_cv_cgetent" >&5
8077
+echo "$as_me:10889: result: $cf_cv_cgetent" >&5
8078
echo "${ECHO_T}$cf_cv_cgetent" >&6
8079
test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
8080
#define HAVE_BSD_CGETENT 1
8081
@@ -10680,14 +10894,14 @@ EOF
8082
8083
fi
8084
8085
-echo "$as_me:10683: checking for isascii" >&5
8086
+echo "$as_me:10897: checking for isascii" >&5
8087
echo $ECHO_N "checking for isascii... $ECHO_C" >&6
8088
if test "${cf_cv_have_isascii+set}" = set; then
8089
echo $ECHO_N "(cached) $ECHO_C" >&6
8090
else
8091
8092
cat >conftest.$ac_ext <<_ACEOF
8093
-#line 10690 "configure"
8094
+#line 10904 "configure"
8095
#include "confdefs.h"
8096
#include <ctype.h>
8097
int
8098
@@ -10699,16 +10913,16 @@ int x = isascii(' ')
8099
}
8100
_ACEOF
8101
rm -f conftest.$ac_objext conftest$ac_exeext
8102
-if { (eval echo "$as_me:10702: \"$ac_link\"") >&5
8103
+if { (eval echo "$as_me:10916: \"$ac_link\"") >&5
8104
(eval $ac_link) 2>&5
8105
ac_status=$?
8106
- echo "$as_me:10705: \$? = $ac_status" >&5
8107
+ echo "$as_me:10919: \$? = $ac_status" >&5
8108
(exit $ac_status); } &&
8109
{ ac_try='test -s conftest$ac_exeext'
8110
- { (eval echo "$as_me:10708: \"$ac_try\"") >&5
8111
+ { (eval echo "$as_me:10922: \"$ac_try\"") >&5
8112
(eval $ac_try) 2>&5
8113
ac_status=$?
8114
- echo "$as_me:10711: \$? = $ac_status" >&5
8115
+ echo "$as_me:10925: \$? = $ac_status" >&5
8116
(exit $ac_status); }; }; then
8117
cf_cv_have_isascii=yes
8118
else
8119
@@ -10719,17 +10933,17 @@ fi
8120
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8121
8122
fi
8123
-echo "$as_me:10722: result: $cf_cv_have_isascii" >&5
8124
+echo "$as_me:10936: result: $cf_cv_have_isascii" >&5
8125
echo "${ECHO_T}$cf_cv_have_isascii" >&6
8126
test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
8127
#define HAVE_ISASCII 1
8128
EOF
8129
8130
if test "$ac_cv_func_sigaction" = yes; then
8131
-echo "$as_me:10729: checking whether sigaction needs _POSIX_SOURCE" >&5
8132
+echo "$as_me:10943: checking whether sigaction needs _POSIX_SOURCE" >&5
8133
echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
8134
cat >conftest.$ac_ext <<_ACEOF
8135
-#line 10732 "configure"
8136
+#line 10946 "configure"
8137
#include "confdefs.h"
8138
8139
#include <sys/types.h>
8140
@@ -10743,16 +10957,16 @@ struct sigaction act
8141
}
8142
_ACEOF
8143
rm -f conftest.$ac_objext
8144
-if { (eval echo "$as_me:10746: \"$ac_compile\"") >&5
8145
+if { (eval echo "$as_me:10960: \"$ac_compile\"") >&5
8146
(eval $ac_compile) 2>&5
8147
ac_status=$?
8148
- echo "$as_me:10749: \$? = $ac_status" >&5
8149
+ echo "$as_me:10963: \$? = $ac_status" >&5
8150
(exit $ac_status); } &&
8151
{ ac_try='test -s conftest.$ac_objext'
8152
- { (eval echo "$as_me:10752: \"$ac_try\"") >&5
8153
+ { (eval echo "$as_me:10966: \"$ac_try\"") >&5
8154
(eval $ac_try) 2>&5
8155
ac_status=$?
8156
- echo "$as_me:10755: \$? = $ac_status" >&5
8157
+ echo "$as_me:10969: \$? = $ac_status" >&5
8158
(exit $ac_status); }; }; then
8159
sigact_bad=no
8160
else
8161
@@ -10760,7 +10974,7 @@ else
8162
cat conftest.$ac_ext >&5
8163
8164
cat >conftest.$ac_ext <<_ACEOF
8165
-#line 10763 "configure"
8166
+#line 10977 "configure"
8167
#include "confdefs.h"
8168
8169
#define _POSIX_SOURCE
8170
@@ -10775,16 +10989,16 @@ struct sigaction act
8171
}
8172
_ACEOF
8173
rm -f conftest.$ac_objext
8174
-if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
8175
+if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
8176
(eval $ac_compile) 2>&5
8177
ac_status=$?
8178
- echo "$as_me:10781: \$? = $ac_status" >&5
8179
+ echo "$as_me:10995: \$? = $ac_status" >&5
8180
(exit $ac_status); } &&
8181
{ ac_try='test -s conftest.$ac_objext'
8182
- { (eval echo "$as_me:10784: \"$ac_try\"") >&5
8183
+ { (eval echo "$as_me:10998: \"$ac_try\"") >&5
8184
(eval $ac_try) 2>&5
8185
ac_status=$?
8186
- echo "$as_me:10787: \$? = $ac_status" >&5
8187
+ echo "$as_me:11001: \$? = $ac_status" >&5
8188
(exit $ac_status); }; }; then
8189
sigact_bad=yes
8190
cat >>confdefs.h <<\EOF
8191
@@ -10799,11 +11013,11 @@ fi
8192
rm -f conftest.$ac_objext conftest.$ac_ext
8193
fi
8194
rm -f conftest.$ac_objext conftest.$ac_ext
8195
-echo "$as_me:10802: result: $sigact_bad" >&5
8196
+echo "$as_me:11016: result: $sigact_bad" >&5
8197
echo "${ECHO_T}$sigact_bad" >&6
8198
fi
8199
8200
-echo "$as_me:10806: checking if nanosleep really works" >&5
8201
+echo "$as_me:11020: checking if nanosleep really works" >&5
8202
echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
8203
if test "${cf_cv_func_nanosleep+set}" = set; then
8204
echo $ECHO_N "(cached) $ECHO_C" >&6
8205
@@ -10813,7 +11027,7 @@ if test "$cross_compiling" = yes; then
8206
cf_cv_func_nanosleep=unknown
8207
else
8208
cat >conftest.$ac_ext <<_ACEOF
8209
-#line 10816 "configure"
8210
+#line 11030 "configure"
8211
#include "confdefs.h"
8212
8213
#include <stdio.h>
8214
@@ -10838,15 +11052,15 @@ int main() {
8215
8216
_ACEOF
8217
rm -f conftest$ac_exeext
8218
-if { (eval echo "$as_me:10841: \"$ac_link\"") >&5
8219
+if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
8220
(eval $ac_link) 2>&5
8221
ac_status=$?
8222
- echo "$as_me:10844: \$? = $ac_status" >&5
8223
+ echo "$as_me:11058: \$? = $ac_status" >&5
8224
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8225
- { (eval echo "$as_me:10846: \"$ac_try\"") >&5
8226
+ { (eval echo "$as_me:11060: \"$ac_try\"") >&5
8227
(eval $ac_try) 2>&5
8228
ac_status=$?
8229
- echo "$as_me:10849: \$? = $ac_status" >&5
8230
+ echo "$as_me:11063: \$? = $ac_status" >&5
8231
(exit $ac_status); }; }; then
8232
cf_cv_func_nanosleep=yes
8233
else
8234
@@ -10858,7 +11072,7 @@ fi
8235
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8236
fi
8237
fi
8238
-echo "$as_me:10861: result: $cf_cv_func_nanosleep" >&5
8239
+echo "$as_me:11075: result: $cf_cv_func_nanosleep" >&5
8240
echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
8241
8242
test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
8243
@@ -10872,23 +11086,23 @@ unistd.h \
8244
8245
do
8246
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8247
-echo "$as_me:10875: checking for $ac_header" >&5
8248
+echo "$as_me:11089: checking for $ac_header" >&5
8249
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8250
if eval "test \"\${$as_ac_Header+set}\" = set"; then
8251
echo $ECHO_N "(cached) $ECHO_C" >&6
8252
else
8253
cat >conftest.$ac_ext <<_ACEOF
8254
-#line 10881 "configure"
8255
+#line 11095 "configure"
8256
#include "confdefs.h"
8257
#include <$ac_header>
8258
_ACEOF
8259
-if { (eval echo "$as_me:10885: \"$ac_cpp conftest.$ac_ext\"") >&5
8260
+if { (eval echo "$as_me:11099: \"$ac_cpp conftest.$ac_ext\"") >&5
8261
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8262
ac_status=$?
8263
egrep -v '^ *\+' conftest.er1 >conftest.err
8264
rm -f conftest.er1
8265
cat conftest.err >&5
8266
- echo "$as_me:10891: \$? = $ac_status" >&5
8267
+ echo "$as_me:11105: \$? = $ac_status" >&5
8268
(exit $ac_status); } >/dev/null; then
8269
if test -s conftest.err; then
8270
ac_cpp_err=$ac_c_preproc_warn_flag
8271
@@ -10907,7 +11121,7 @@ else
8272
fi
8273
rm -f conftest.err conftest.$ac_ext
8274
fi
8275
-echo "$as_me:10910: result: `eval echo '${'$as_ac_Header'}'`" >&5
8276
+echo "$as_me:11124: result: `eval echo '${'$as_ac_Header'}'`" >&5
8277
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8278
if test `eval echo '${'$as_ac_Header'}'` = yes; then
8279
cat >>confdefs.h <<EOF
8280
@@ -10922,23 +11136,23 @@ if test "$ISC" = yes ; then
8281
for ac_header in sys/termio.h
8282
do
8283
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8284
-echo "$as_me:10925: checking for $ac_header" >&5
8285
+echo "$as_me:11139: checking for $ac_header" >&5
8286
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8287
if eval "test \"\${$as_ac_Header+set}\" = set"; then
8288
echo $ECHO_N "(cached) $ECHO_C" >&6
8289
else
8290
cat >conftest.$ac_ext <<_ACEOF
8291
-#line 10931 "configure"
8292
+#line 11145 "configure"
8293
#include "confdefs.h"
8294
#include <$ac_header>
8295
_ACEOF
8296
-if { (eval echo "$as_me:10935: \"$ac_cpp conftest.$ac_ext\"") >&5
8297
+if { (eval echo "$as_me:11149: \"$ac_cpp conftest.$ac_ext\"") >&5
8298
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8299
ac_status=$?
8300
egrep -v '^ *\+' conftest.er1 >conftest.err
8301
rm -f conftest.er1
8302
cat conftest.err >&5
8303
- echo "$as_me:10941: \$? = $ac_status" >&5
8304
+ echo "$as_me:11155: \$? = $ac_status" >&5
8305
(exit $ac_status); } >/dev/null; then
8306
if test -s conftest.err; then
8307
ac_cpp_err=$ac_c_preproc_warn_flag
8308
@@ -10957,7 +11171,7 @@ else
8309
fi
8310
rm -f conftest.err conftest.$ac_ext
8311
fi
8312
-echo "$as_me:10960: result: `eval echo '${'$as_ac_Header'}'`" >&5
8313
+echo "$as_me:11174: result: `eval echo '${'$as_ac_Header'}'`" >&5
8314
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8315
if test `eval echo '${'$as_ac_Header'}'` = yes; then
8316
cat >>confdefs.h <<EOF
8317
@@ -10975,10 +11189,10 @@ if test "$ac_cv_header_termios_h" = yes
8318
*) termios_bad=maybe ;;
8319
esac
8320
if test "$termios_bad" = maybe ; then
8321
- echo "$as_me:10978: checking whether termios.h needs _POSIX_SOURCE" >&5
8322
+ echo "$as_me:11192: checking whether termios.h needs _POSIX_SOURCE" >&5
8323
echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
8324
cat >conftest.$ac_ext <<_ACEOF
8325
-#line 10981 "configure"
8326
+#line 11195 "configure"
8327
#include "confdefs.h"
8328
#include <termios.h>
8329
int
8330
@@ -10990,16 +11204,16 @@ struct termios foo; int x = foo.c_iflag
8331
}
8332
_ACEOF
8333
rm -f conftest.$ac_objext
8334
-if { (eval echo "$as_me:10993: \"$ac_compile\"") >&5
8335
+if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5
8336
(eval $ac_compile) 2>&5
8337
ac_status=$?
8338
- echo "$as_me:10996: \$? = $ac_status" >&5
8339
+ echo "$as_me:11210: \$? = $ac_status" >&5
8340
(exit $ac_status); } &&
8341
{ ac_try='test -s conftest.$ac_objext'
8342
- { (eval echo "$as_me:10999: \"$ac_try\"") >&5
8343
+ { (eval echo "$as_me:11213: \"$ac_try\"") >&5
8344
(eval $ac_try) 2>&5
8345
ac_status=$?
8346
- echo "$as_me:11002: \$? = $ac_status" >&5
8347
+ echo "$as_me:11216: \$? = $ac_status" >&5
8348
(exit $ac_status); }; }; then
8349
termios_bad=no
8350
else
8351
@@ -11007,7 +11221,7 @@ else
8352
cat conftest.$ac_ext >&5
8353
8354
cat >conftest.$ac_ext <<_ACEOF
8355
-#line 11010 "configure"
8356
+#line 11224 "configure"
8357
#include "confdefs.h"
8358
8359
#define _POSIX_SOURCE
8360
@@ -11021,16 +11235,16 @@ struct termios foo; int x = foo.c_iflag
8361
}
8362
_ACEOF
8363
rm -f conftest.$ac_objext
8364
-if { (eval echo "$as_me:11024: \"$ac_compile\"") >&5
8365
+if { (eval echo "$as_me:11238: \"$ac_compile\"") >&5
8366
(eval $ac_compile) 2>&5
8367
ac_status=$?
8368
- echo "$as_me:11027: \$? = $ac_status" >&5
8369
+ echo "$as_me:11241: \$? = $ac_status" >&5
8370
(exit $ac_status); } &&
8371
{ ac_try='test -s conftest.$ac_objext'
8372
- { (eval echo "$as_me:11030: \"$ac_try\"") >&5
8373
+ { (eval echo "$as_me:11244: \"$ac_try\"") >&5
8374
(eval $ac_try) 2>&5
8375
ac_status=$?
8376
- echo "$as_me:11033: \$? = $ac_status" >&5
8377
+ echo "$as_me:11247: \$? = $ac_status" >&5
8378
(exit $ac_status); }; }; then
8379
termios_bad=unknown
8380
else
8381
@@ -11045,19 +11259,19 @@ rm -f conftest.$ac_objext conftest.$ac_e
8382
8383
fi
8384
rm -f conftest.$ac_objext conftest.$ac_ext
8385
- echo "$as_me:11048: result: $termios_bad" >&5
8386
+ echo "$as_me:11262: result: $termios_bad" >&5
8387
echo "${ECHO_T}$termios_bad" >&6
8388
fi
8389
fi
8390
8391
-echo "$as_me:11053: checking for tcgetattr" >&5
8392
+echo "$as_me:11267: checking for tcgetattr" >&5
8393
echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
8394
if test "${cf_cv_have_tcgetattr+set}" = set; then
8395
echo $ECHO_N "(cached) $ECHO_C" >&6
8396
else
8397
8398
cat >conftest.$ac_ext <<_ACEOF
8399
-#line 11060 "configure"
8400
+#line 11274 "configure"
8401
#include "confdefs.h"
8402
8403
#include <sys/types.h>
8404
@@ -11085,16 +11299,16 @@ tcgetattr(1, &foo);
8405
}
8406
_ACEOF
8407
rm -f conftest.$ac_objext conftest$ac_exeext
8408
-if { (eval echo "$as_me:11088: \"$ac_link\"") >&5
8409
+if { (eval echo "$as_me:11302: \"$ac_link\"") >&5
8410
(eval $ac_link) 2>&5
8411
ac_status=$?
8412
- echo "$as_me:11091: \$? = $ac_status" >&5
8413
+ echo "$as_me:11305: \$? = $ac_status" >&5
8414
(exit $ac_status); } &&
8415
{ ac_try='test -s conftest$ac_exeext'
8416
- { (eval echo "$as_me:11094: \"$ac_try\"") >&5
8417
+ { (eval echo "$as_me:11308: \"$ac_try\"") >&5
8418
(eval $ac_try) 2>&5
8419
ac_status=$?
8420
- echo "$as_me:11097: \$? = $ac_status" >&5
8421
+ echo "$as_me:11311: \$? = $ac_status" >&5
8422
(exit $ac_status); }; }; then
8423
cf_cv_have_tcgetattr=yes
8424
else
8425
@@ -11104,20 +11318,20 @@ cf_cv_have_tcgetattr=no
8426
fi
8427
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8428
fi
8429
-echo "$as_me:11107: result: $cf_cv_have_tcgetattr" >&5
8430
+echo "$as_me:11321: result: $cf_cv_have_tcgetattr" >&5
8431
echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
8432
test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
8433
#define HAVE_TCGETATTR 1
8434
EOF
8435
8436
-echo "$as_me:11113: checking for vsscanf function or workaround" >&5
8437
+echo "$as_me:11327: checking for vsscanf function or workaround" >&5
8438
echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
8439
if test "${cf_cv_func_vsscanf+set}" = set; then
8440
echo $ECHO_N "(cached) $ECHO_C" >&6
8441
else
8442
8443
cat >conftest.$ac_ext <<_ACEOF
8444
-#line 11120 "configure"
8445
+#line 11334 "configure"
8446
#include "confdefs.h"
8447
8448
#include <stdarg.h>
8449
@@ -11133,16 +11347,16 @@ main ()
8450
}
8451
_ACEOF
8452
rm -f conftest.$ac_objext conftest$ac_exeext
8453
-if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
8454
+if { (eval echo "$as_me:11350: \"$ac_link\"") >&5
8455
(eval $ac_link) 2>&5
8456
ac_status=$?
8457
- echo "$as_me:11139: \$? = $ac_status" >&5
8458
+ echo "$as_me:11353: \$? = $ac_status" >&5
8459
(exit $ac_status); } &&
8460
{ ac_try='test -s conftest$ac_exeext'
8461
- { (eval echo "$as_me:11142: \"$ac_try\"") >&5
8462
+ { (eval echo "$as_me:11356: \"$ac_try\"") >&5
8463
(eval $ac_try) 2>&5
8464
ac_status=$?
8465
- echo "$as_me:11145: \$? = $ac_status" >&5
8466
+ echo "$as_me:11359: \$? = $ac_status" >&5
8467
(exit $ac_status); }; }; then
8468
cf_cv_func_vsscanf=vsscanf
8469
else
8470
@@ -11150,7 +11364,7 @@ else
8471
cat conftest.$ac_ext >&5
8472
8473
cat >conftest.$ac_ext <<_ACEOF
8474
-#line 11153 "configure"
8475
+#line 11367 "configure"
8476
#include "confdefs.h"
8477
8478
#include <stdarg.h>
8479
@@ -11172,16 +11386,16 @@ main ()
8480
}
8481
_ACEOF
8482
rm -f conftest.$ac_objext conftest$ac_exeext
8483
-if { (eval echo "$as_me:11175: \"$ac_link\"") >&5
8484
+if { (eval echo "$as_me:11389: \"$ac_link\"") >&5
8485
(eval $ac_link) 2>&5
8486
ac_status=$?
8487
- echo "$as_me:11178: \$? = $ac_status" >&5
8488
+ echo "$as_me:11392: \$? = $ac_status" >&5
8489
(exit $ac_status); } &&
8490
{ ac_try='test -s conftest$ac_exeext'
8491
- { (eval echo "$as_me:11181: \"$ac_try\"") >&5
8492
+ { (eval echo "$as_me:11395: \"$ac_try\"") >&5
8493
(eval $ac_try) 2>&5
8494
ac_status=$?
8495
- echo "$as_me:11184: \$? = $ac_status" >&5
8496
+ echo "$as_me:11398: \$? = $ac_status" >&5
8497
(exit $ac_status); }; }; then
8498
cf_cv_func_vsscanf=vfscanf
8499
else
8500
@@ -11189,7 +11403,7 @@ else
8501
cat conftest.$ac_ext >&5
8502
8503
cat >conftest.$ac_ext <<_ACEOF
8504
-#line 11192 "configure"
8505
+#line 11406 "configure"
8506
#include "confdefs.h"
8507
8508
#include <stdarg.h>
8509
@@ -11211,16 +11425,16 @@ main ()
8510
}
8511
_ACEOF
8512
rm -f conftest.$ac_objext conftest$ac_exeext
8513
-if { (eval echo "$as_me:11214: \"$ac_link\"") >&5
8514
+if { (eval echo "$as_me:11428: \"$ac_link\"") >&5
8515
(eval $ac_link) 2>&5
8516
ac_status=$?
8517
- echo "$as_me:11217: \$? = $ac_status" >&5
8518
+ echo "$as_me:11431: \$? = $ac_status" >&5
8519
(exit $ac_status); } &&
8520
{ ac_try='test -s conftest$ac_exeext'
8521
- { (eval echo "$as_me:11220: \"$ac_try\"") >&5
8522
+ { (eval echo "$as_me:11434: \"$ac_try\"") >&5
8523
(eval $ac_try) 2>&5
8524
ac_status=$?
8525
- echo "$as_me:11223: \$? = $ac_status" >&5
8526
+ echo "$as_me:11437: \$? = $ac_status" >&5
8527
(exit $ac_status); }; }; then
8528
cf_cv_func_vsscanf=_doscan
8529
else
8530
@@ -11235,7 +11449,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
8531
fi
8532
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8533
fi
8534
-echo "$as_me:11238: result: $cf_cv_func_vsscanf" >&5
8535
+echo "$as_me:11452: result: $cf_cv_func_vsscanf" >&5
8536
echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
8537
8538
case $cf_cv_func_vsscanf in #(vi
8539
@@ -11253,7 +11467,7 @@ EOF
8540
;;
8541
esac
8542
8543
-echo "$as_me:11256: checking for working mkstemp" >&5
8544
+echo "$as_me:11470: checking for working mkstemp" >&5
8545
echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
8546
if test "${cf_cv_func_mkstemp+set}" = set; then
8547
echo $ECHO_N "(cached) $ECHO_C" >&6
8548
@@ -11261,13 +11475,13 @@ else
8549
8550
rm -f conftest*
8551
if test "$cross_compiling" = yes; then
8552
- echo "$as_me:11264: checking for mkstemp" >&5
8553
+ echo "$as_me:11478: checking for mkstemp" >&5
8554
echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
8555
if test "${ac_cv_func_mkstemp+set}" = set; then
8556
echo $ECHO_N "(cached) $ECHO_C" >&6
8557
else
8558
cat >conftest.$ac_ext <<_ACEOF
8559
-#line 11270 "configure"
8560
+#line 11484 "configure"
8561
#include "confdefs.h"
8562
/* System header to define __stub macros and hopefully few prototypes,
8563
which can conflict with char mkstemp (); below. */
8564
@@ -11298,16 +11512,16 @@ f = mkstemp;
8565
}
8566
_ACEOF
8567
rm -f conftest.$ac_objext conftest$ac_exeext
8568
-if { (eval echo "$as_me:11301: \"$ac_link\"") >&5
8569
+if { (eval echo "$as_me:11515: \"$ac_link\"") >&5
8570
(eval $ac_link) 2>&5
8571
ac_status=$?
8572
- echo "$as_me:11304: \$? = $ac_status" >&5
8573
+ echo "$as_me:11518: \$? = $ac_status" >&5
8574
(exit $ac_status); } &&
8575
{ ac_try='test -s conftest$ac_exeext'
8576
- { (eval echo "$as_me:11307: \"$ac_try\"") >&5
8577
+ { (eval echo "$as_me:11521: \"$ac_try\"") >&5
8578
(eval $ac_try) 2>&5
8579
ac_status=$?
8580
- echo "$as_me:11310: \$? = $ac_status" >&5
8581
+ echo "$as_me:11524: \$? = $ac_status" >&5
8582
(exit $ac_status); }; }; then
8583
ac_cv_func_mkstemp=yes
8584
else
8585
@@ -11317,12 +11531,12 @@ ac_cv_func_mkstemp=no
8586
fi
8587
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8588
fi
8589
-echo "$as_me:11320: result: $ac_cv_func_mkstemp" >&5
8590
+echo "$as_me:11534: result: $ac_cv_func_mkstemp" >&5
8591
echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
8592
8593
else
8594
cat >conftest.$ac_ext <<_ACEOF
8595
-#line 11325 "configure"
8596
+#line 11539 "configure"
8597
#include "confdefs.h"
8598
8599
#include <sys/types.h>
8600
@@ -11360,15 +11574,15 @@ int main()
8601
8602
_ACEOF
8603
rm -f conftest$ac_exeext
8604
-if { (eval echo "$as_me:11363: \"$ac_link\"") >&5
8605
+if { (eval echo "$as_me:11577: \"$ac_link\"") >&5
8606
(eval $ac_link) 2>&5
8607
ac_status=$?
8608
- echo "$as_me:11366: \$? = $ac_status" >&5
8609
+ echo "$as_me:11580: \$? = $ac_status" >&5
8610
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8611
- { (eval echo "$as_me:11368: \"$ac_try\"") >&5
8612
+ { (eval echo "$as_me:11582: \"$ac_try\"") >&5
8613
(eval $ac_try) 2>&5
8614
ac_status=$?
8615
- echo "$as_me:11371: \$? = $ac_status" >&5
8616
+ echo "$as_me:11585: \$? = $ac_status" >&5
8617
(exit $ac_status); }; }; then
8618
cf_cv_func_mkstemp=yes
8619
8620
@@ -11383,7 +11597,7 @@ rm -f core core.* *.core conftest$ac_exe
8621
fi
8622
8623
fi
8624
-echo "$as_me:11386: result: $cf_cv_func_mkstemp" >&5
8625
+echo "$as_me:11600: result: $cf_cv_func_mkstemp" >&5
8626
echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
8627
if test "$cf_cv_func_mkstemp" = yes ; then
8628
cat >>confdefs.h <<\EOF
8629
@@ -11400,21 +11614,21 @@ else
8630
fi
8631
8632
if test "$cross_compiling" = yes ; then
8633
- { echo "$as_me:11403: WARNING: cross compiling: assume setvbuf params not reversed" >&5
8634
+ { echo "$as_me:11617: WARNING: cross compiling: assume setvbuf params not reversed" >&5
8635
echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
8636
else
8637
- echo "$as_me:11406: checking whether setvbuf arguments are reversed" >&5
8638
+ echo "$as_me:11620: checking whether setvbuf arguments are reversed" >&5
8639
echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
8640
if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
8641
echo $ECHO_N "(cached) $ECHO_C" >&6
8642
else
8643
if test "$cross_compiling" = yes; then
8644
- { { echo "$as_me:11412: error: cannot run test program while cross compiling" >&5
8645
+ { { echo "$as_me:11626: error: cannot run test program while cross compiling" >&5
8646
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
8647
{ (exit 1); exit 1; }; }
8648
else
8649
cat >conftest.$ac_ext <<_ACEOF
8650
-#line 11417 "configure"
8651
+#line 11631 "configure"
8652
#include "confdefs.h"
8653
#include <stdio.h>
8654
/* If setvbuf has the reversed format, exit 0. */
8655
@@ -11431,15 +11645,15 @@ main ()
8656
}
8657
_ACEOF
8658
rm -f conftest$ac_exeext
8659
-if { (eval echo "$as_me:11434: \"$ac_link\"") >&5
8660
+if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
8661
(eval $ac_link) 2>&5
8662
ac_status=$?
8663
- echo "$as_me:11437: \$? = $ac_status" >&5
8664
+ echo "$as_me:11651: \$? = $ac_status" >&5
8665
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8666
- { (eval echo "$as_me:11439: \"$ac_try\"") >&5
8667
+ { (eval echo "$as_me:11653: \"$ac_try\"") >&5
8668
(eval $ac_try) 2>&5
8669
ac_status=$?
8670
- echo "$as_me:11442: \$? = $ac_status" >&5
8671
+ echo "$as_me:11656: \$? = $ac_status" >&5
8672
(exit $ac_status); }; }; then
8673
ac_cv_func_setvbuf_reversed=yes
8674
else
8675
@@ -11452,7 +11666,7 @@ rm -f core core.* *.core conftest$ac_exe
8676
fi
8677
rm -f core core.* *.core
8678
fi
8679
-echo "$as_me:11455: result: $ac_cv_func_setvbuf_reversed" >&5
8680
+echo "$as_me:11669: result: $ac_cv_func_setvbuf_reversed" >&5
8681
echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
8682
if test $ac_cv_func_setvbuf_reversed = yes; then
8683
8684
@@ -11463,13 +11677,13 @@ EOF
8685
fi
8686
8687
fi
8688
-echo "$as_me:11466: checking return type of signal handlers" >&5
8689
+echo "$as_me:11680: checking return type of signal handlers" >&5
8690
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
8691
if test "${ac_cv_type_signal+set}" = set; then
8692
echo $ECHO_N "(cached) $ECHO_C" >&6
8693
else
8694
cat >conftest.$ac_ext <<_ACEOF
8695
-#line 11472 "configure"
8696
+#line 11686 "configure"
8697
#include "confdefs.h"
8698
#include <sys/types.h>
8699
#include <signal.h>
8700
@@ -11491,16 +11705,16 @@ int i;
8701
}
8702
_ACEOF
8703
rm -f conftest.$ac_objext
8704
-if { (eval echo "$as_me:11494: \"$ac_compile\"") >&5
8705
+if { (eval echo "$as_me:11708: \"$ac_compile\"") >&5
8706
(eval $ac_compile) 2>&5
8707
ac_status=$?
8708
- echo "$as_me:11497: \$? = $ac_status" >&5
8709
+ echo "$as_me:11711: \$? = $ac_status" >&5
8710
(exit $ac_status); } &&
8711
{ ac_try='test -s conftest.$ac_objext'
8712
- { (eval echo "$as_me:11500: \"$ac_try\"") >&5
8713
+ { (eval echo "$as_me:11714: \"$ac_try\"") >&5
8714
(eval $ac_try) 2>&5
8715
ac_status=$?
8716
- echo "$as_me:11503: \$? = $ac_status" >&5
8717
+ echo "$as_me:11717: \$? = $ac_status" >&5
8718
(exit $ac_status); }; }; then
8719
ac_cv_type_signal=void
8720
else
8721
@@ -11510,21 +11724,21 @@ ac_cv_type_signal=int
8722
fi
8723
rm -f conftest.$ac_objext conftest.$ac_ext
8724
fi
8725
-echo "$as_me:11513: result: $ac_cv_type_signal" >&5
8726
+echo "$as_me:11727: result: $ac_cv_type_signal" >&5
8727
echo "${ECHO_T}$ac_cv_type_signal" >&6
8728
8729
cat >>confdefs.h <<EOF
8730
#define RETSIGTYPE $ac_cv_type_signal
8731
EOF
8732
8733
-echo "$as_me:11520: checking for type sigaction_t" >&5
8734
+echo "$as_me:11734: checking for type sigaction_t" >&5
8735
echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
8736
if test "${cf_cv_type_sigaction+set}" = set; then
8737
echo $ECHO_N "(cached) $ECHO_C" >&6
8738
else
8739
8740
cat >conftest.$ac_ext <<_ACEOF
8741
-#line 11527 "configure"
8742
+#line 11741 "configure"
8743
#include "confdefs.h"
8744
8745
#include <signal.h>
8746
@@ -11537,16 +11751,16 @@ sigaction_t x
8747
}
8748
_ACEOF
8749
rm -f conftest.$ac_objext
8750
-if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
8751
+if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5
8752
(eval $ac_compile) 2>&5
8753
ac_status=$?
8754
- echo "$as_me:11543: \$? = $ac_status" >&5
8755
+ echo "$as_me:11757: \$? = $ac_status" >&5
8756
(exit $ac_status); } &&
8757
{ ac_try='test -s conftest.$ac_objext'
8758
- { (eval echo "$as_me:11546: \"$ac_try\"") >&5
8759
+ { (eval echo "$as_me:11760: \"$ac_try\"") >&5
8760
(eval $ac_try) 2>&5
8761
ac_status=$?
8762
- echo "$as_me:11549: \$? = $ac_status" >&5
8763
+ echo "$as_me:11763: \$? = $ac_status" >&5
8764
(exit $ac_status); }; }; then
8765
cf_cv_type_sigaction=yes
8766
else
8767
@@ -11557,13 +11771,13 @@ fi
8768
rm -f conftest.$ac_objext conftest.$ac_ext
8769
fi
8770
8771
-echo "$as_me:11560: result: $cf_cv_type_sigaction" >&5
8772
+echo "$as_me:11774: result: $cf_cv_type_sigaction" >&5
8773
echo "${ECHO_T}$cf_cv_type_sigaction" >&6
8774
test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
8775
#define HAVE_TYPE_SIGACTION 1
8776
EOF
8777
8778
-echo "$as_me:11566: checking declaration of size-change" >&5
8779
+echo "$as_me:11780: checking declaration of size-change" >&5
8780
echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
8781
if test "${cf_cv_sizechange+set}" = set; then
8782
echo $ECHO_N "(cached) $ECHO_C" >&6
8783
@@ -11578,7 +11792,7 @@ do
8784
CPPFLAGS="$cf_save_CPPFLAGS"
8785
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
8786
cat >conftest.$ac_ext <<_ACEOF
8787
-#line 11581 "configure"
8788
+#line 11795 "configure"
8789
#include "confdefs.h"
8790
#include <sys/types.h>
8791
#ifdef HAVE_TERMIOS_H
8792
@@ -11622,16 +11836,16 @@ main ()
8793
}
8794
_ACEOF
8795
rm -f conftest.$ac_objext
8796
-if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
8797
+if { (eval echo "$as_me:11839: \"$ac_compile\"") >&5
8798
(eval $ac_compile) 2>&5
8799
ac_status=$?
8800
- echo "$as_me:11628: \$? = $ac_status" >&5
8801
+ echo "$as_me:11842: \$? = $ac_status" >&5
8802
(exit $ac_status); } &&
8803
{ ac_try='test -s conftest.$ac_objext'
8804
- { (eval echo "$as_me:11631: \"$ac_try\"") >&5
8805
+ { (eval echo "$as_me:11845: \"$ac_try\"") >&5
8806
(eval $ac_try) 2>&5
8807
ac_status=$?
8808
- echo "$as_me:11634: \$? = $ac_status" >&5
8809
+ echo "$as_me:11848: \$? = $ac_status" >&5
8810
(exit $ac_status); }; }; then
8811
cf_cv_sizechange=yes
8812
else
8813
@@ -11650,7 +11864,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
8814
done
8815
8816
fi
8817
-echo "$as_me:11653: result: $cf_cv_sizechange" >&5
8818
+echo "$as_me:11867: result: $cf_cv_sizechange" >&5
8819
echo "${ECHO_T}$cf_cv_sizechange" >&6
8820
if test "$cf_cv_sizechange" != no ; then
8821
cat >>confdefs.h <<\EOF
8822
@@ -11667,13 +11881,13 @@ EOF
8823
esac
8824
fi
8825
8826
-echo "$as_me:11670: checking for memmove" >&5
8827
+echo "$as_me:11884: checking for memmove" >&5
8828
echo $ECHO_N "checking for memmove... $ECHO_C" >&6
8829
if test "${ac_cv_func_memmove+set}" = set; then
8830
echo $ECHO_N "(cached) $ECHO_C" >&6
8831
else
8832
cat >conftest.$ac_ext <<_ACEOF
8833
-#line 11676 "configure"
8834
+#line 11890 "configure"
8835
#include "confdefs.h"
8836
/* System header to define __stub macros and hopefully few prototypes,
8837
which can conflict with char memmove (); below. */
8838
@@ -11704,16 +11918,16 @@ f = memmove;
8839
}
8840
_ACEOF
8841
rm -f conftest.$ac_objext conftest$ac_exeext
8842
-if { (eval echo "$as_me:11707: \"$ac_link\"") >&5
8843
+if { (eval echo "$as_me:11921: \"$ac_link\"") >&5
8844
(eval $ac_link) 2>&5
8845
ac_status=$?
8846
- echo "$as_me:11710: \$? = $ac_status" >&5
8847
+ echo "$as_me:11924: \$? = $ac_status" >&5
8848
(exit $ac_status); } &&
8849
{ ac_try='test -s conftest$ac_exeext'
8850
- { (eval echo "$as_me:11713: \"$ac_try\"") >&5
8851
+ { (eval echo "$as_me:11927: \"$ac_try\"") >&5
8852
(eval $ac_try) 2>&5
8853
ac_status=$?
8854
- echo "$as_me:11716: \$? = $ac_status" >&5
8855
+ echo "$as_me:11930: \$? = $ac_status" >&5
8856
(exit $ac_status); }; }; then
8857
ac_cv_func_memmove=yes
8858
else
8859
@@ -11723,19 +11937,19 @@ ac_cv_func_memmove=no
8860
fi
8861
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8862
fi
8863
-echo "$as_me:11726: result: $ac_cv_func_memmove" >&5
8864
+echo "$as_me:11940: result: $ac_cv_func_memmove" >&5
8865
echo "${ECHO_T}$ac_cv_func_memmove" >&6
8866
if test $ac_cv_func_memmove = yes; then
8867
:
8868
else
8869
8870
-echo "$as_me:11732: checking for bcopy" >&5
8871
+echo "$as_me:11946: checking for bcopy" >&5
8872
echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
8873
if test "${ac_cv_func_bcopy+set}" = set; then
8874
echo $ECHO_N "(cached) $ECHO_C" >&6
8875
else
8876
cat >conftest.$ac_ext <<_ACEOF
8877
-#line 11738 "configure"
8878
+#line 11952 "configure"
8879
#include "confdefs.h"
8880
/* System header to define __stub macros and hopefully few prototypes,
8881
which can conflict with char bcopy (); below. */
8882
@@ -11766,16 +11980,16 @@ f = bcopy;
8883
}
8884
_ACEOF
8885
rm -f conftest.$ac_objext conftest$ac_exeext
8886
-if { (eval echo "$as_me:11769: \"$ac_link\"") >&5
8887
+if { (eval echo "$as_me:11983: \"$ac_link\"") >&5
8888
(eval $ac_link) 2>&5
8889
ac_status=$?
8890
- echo "$as_me:11772: \$? = $ac_status" >&5
8891
+ echo "$as_me:11986: \$? = $ac_status" >&5
8892
(exit $ac_status); } &&
8893
{ ac_try='test -s conftest$ac_exeext'
8894
- { (eval echo "$as_me:11775: \"$ac_try\"") >&5
8895
+ { (eval echo "$as_me:11989: \"$ac_try\"") >&5
8896
(eval $ac_try) 2>&5
8897
ac_status=$?
8898
- echo "$as_me:11778: \$? = $ac_status" >&5
8899
+ echo "$as_me:11992: \$? = $ac_status" >&5
8900
(exit $ac_status); }; }; then
8901
ac_cv_func_bcopy=yes
8902
else
8903
@@ -11785,11 +11999,11 @@ ac_cv_func_bcopy=no
8904
fi
8905
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8906
fi
8907
-echo "$as_me:11788: result: $ac_cv_func_bcopy" >&5
8908
+echo "$as_me:12002: result: $ac_cv_func_bcopy" >&5
8909
echo "${ECHO_T}$ac_cv_func_bcopy" >&6
8910
if test $ac_cv_func_bcopy = yes; then
8911
8912
- echo "$as_me:11792: checking if bcopy does overlapping moves" >&5
8913
+ echo "$as_me:12006: checking if bcopy does overlapping moves" >&5
8914
echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
8915
if test "${cf_cv_good_bcopy+set}" = set; then
8916
echo $ECHO_N "(cached) $ECHO_C" >&6
8917
@@ -11799,7 +12013,7 @@ else
8918
cf_cv_good_bcopy=unknown
8919
else
8920
cat >conftest.$ac_ext <<_ACEOF
8921
-#line 11802 "configure"
8922
+#line 12016 "configure"
8923
#include "confdefs.h"
8924
8925
int main() {
8926
@@ -11813,15 +12027,15 @@ int main() {
8927
8928
_ACEOF
8929
rm -f conftest$ac_exeext
8930
-if { (eval echo "$as_me:11816: \"$ac_link\"") >&5
8931
+if { (eval echo "$as_me:12030: \"$ac_link\"") >&5
8932
(eval $ac_link) 2>&5
8933
ac_status=$?
8934
- echo "$as_me:11819: \$? = $ac_status" >&5
8935
+ echo "$as_me:12033: \$? = $ac_status" >&5
8936
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8937
- { (eval echo "$as_me:11821: \"$ac_try\"") >&5
8938
+ { (eval echo "$as_me:12035: \"$ac_try\"") >&5
8939
(eval $ac_try) 2>&5
8940
ac_status=$?
8941
- echo "$as_me:11824: \$? = $ac_status" >&5
8942
+ echo "$as_me:12038: \$? = $ac_status" >&5
8943
(exit $ac_status); }; }; then
8944
cf_cv_good_bcopy=yes
8945
else
8946
@@ -11834,7 +12048,7 @@ rm -f core core.* *.core conftest$ac_exe
8947
fi
8948
8949
fi
8950
-echo "$as_me:11837: result: $cf_cv_good_bcopy" >&5
8951
+echo "$as_me:12051: result: $cf_cv_good_bcopy" >&5
8952
echo "${ECHO_T}$cf_cv_good_bcopy" >&6
8953
8954
else
8955
@@ -11855,7 +12069,7 @@ EOF
8956
8957
fi
8958
8959
-echo "$as_me:11858: checking if poll really works" >&5
8960
+echo "$as_me:12072: checking if poll really works" >&5
8961
echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
8962
if test "${cf_cv_working_poll+set}" = set; then
8963
echo $ECHO_N "(cached) $ECHO_C" >&6
8964
@@ -11865,7 +12079,7 @@ if test "$cross_compiling" = yes; then
8965
cf_cv_working_poll=unknown
8966
else
8967
cat >conftest.$ac_ext <<_ACEOF
8968
-#line 11868 "configure"
8969
+#line 12082 "configure"
8970
#include "confdefs.h"
8971
8972
#include <stdio.h>
8973
@@ -11886,15 +12100,15 @@ int main() {
8974
}
8975
_ACEOF
8976
rm -f conftest$ac_exeext
8977
-if { (eval echo "$as_me:11889: \"$ac_link\"") >&5
8978
+if { (eval echo "$as_me:12103: \"$ac_link\"") >&5
8979
(eval $ac_link) 2>&5
8980
ac_status=$?
8981
- echo "$as_me:11892: \$? = $ac_status" >&5
8982
+ echo "$as_me:12106: \$? = $ac_status" >&5
8983
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8984
- { (eval echo "$as_me:11894: \"$ac_try\"") >&5
8985
+ { (eval echo "$as_me:12108: \"$ac_try\"") >&5
8986
(eval $ac_try) 2>&5
8987
ac_status=$?
8988
- echo "$as_me:11897: \$? = $ac_status" >&5
8989
+ echo "$as_me:12111: \$? = $ac_status" >&5
8990
(exit $ac_status); }; }; then
8991
cf_cv_working_poll=yes
8992
else
8993
@@ -11906,7 +12120,7 @@ fi
8994
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8995
fi
8996
fi
8997
-echo "$as_me:11909: result: $cf_cv_working_poll" >&5
8998
+echo "$as_me:12123: result: $cf_cv_working_poll" >&5
8999
echo "${ECHO_T}$cf_cv_working_poll" >&6
9000
test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
9001
#define HAVE_WORKING_POLL 1
9002
@@ -11919,7 +12133,7 @@ fi
9003
9004
# Just in case, check if the C compiler has a bool type.
9005
9006
-echo "$as_me:11922: checking if we should include stdbool.h" >&5
9007
+echo "$as_me:12136: checking if we should include stdbool.h" >&5
9008
echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
9009
9010
if test "${cf_cv_header_stdbool_h+set}" = set; then
9011
@@ -11927,7 +12141,7 @@ if test "${cf_cv_header_stdbool_h+set}"
9012
else
9013
9014
cat >conftest.$ac_ext <<_ACEOF
9015
-#line 11930 "configure"
9016
+#line 12144 "configure"
9017
#include "confdefs.h"
9018
9019
int
9020
@@ -11939,23 +12153,23 @@ bool foo = false
9021
}
9022
_ACEOF
9023
rm -f conftest.$ac_objext
9024
-if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
9025
+if { (eval echo "$as_me:12156: \"$ac_compile\"") >&5
9026
(eval $ac_compile) 2>&5
9027
ac_status=$?
9028
- echo "$as_me:11945: \$? = $ac_status" >&5
9029
+ echo "$as_me:12159: \$? = $ac_status" >&5
9030
(exit $ac_status); } &&
9031
{ ac_try='test -s conftest.$ac_objext'
9032
- { (eval echo "$as_me:11948: \"$ac_try\"") >&5
9033
+ { (eval echo "$as_me:12162: \"$ac_try\"") >&5
9034
(eval $ac_try) 2>&5
9035
ac_status=$?
9036
- echo "$as_me:11951: \$? = $ac_status" >&5
9037
+ echo "$as_me:12165: \$? = $ac_status" >&5
9038
(exit $ac_status); }; }; then
9039
cf_cv_header_stdbool_h=0
9040
else
9041
echo "$as_me: failed program was:" >&5
9042
cat conftest.$ac_ext >&5
9043
cat >conftest.$ac_ext <<_ACEOF
9044
-#line 11958 "configure"
9045
+#line 12172 "configure"
9046
#include "confdefs.h"
9047
9048
#ifndef __BEOS__
9049
@@ -11971,16 +12185,16 @@ bool foo = false
9050
}
9051
_ACEOF
9052
rm -f conftest.$ac_objext
9053
-if { (eval echo "$as_me:11974: \"$ac_compile\"") >&5
9054
+if { (eval echo "$as_me:12188: \"$ac_compile\"") >&5
9055
(eval $ac_compile) 2>&5
9056
ac_status=$?
9057
- echo "$as_me:11977: \$? = $ac_status" >&5
9058
+ echo "$as_me:12191: \$? = $ac_status" >&5
9059
(exit $ac_status); } &&
9060
{ ac_try='test -s conftest.$ac_objext'
9061
- { (eval echo "$as_me:11980: \"$ac_try\"") >&5
9062
+ { (eval echo "$as_me:12194: \"$ac_try\"") >&5
9063
(eval $ac_try) 2>&5
9064
ac_status=$?
9065
- echo "$as_me:11983: \$? = $ac_status" >&5
9066
+ echo "$as_me:12197: \$? = $ac_status" >&5
9067
(exit $ac_status); }; }; then
9068
cf_cv_header_stdbool_h=1
9069
else
9070
@@ -11994,13 +12208,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
9071
fi
9072
9073
if test "$cf_cv_header_stdbool_h" = 1
9074
-then echo "$as_me:11997: result: yes" >&5
9075
+then echo "$as_me:12211: result: yes" >&5
9076
echo "${ECHO_T}yes" >&6
9077
-else echo "$as_me:11999: result: no" >&5
9078
+else echo "$as_me:12213: result: no" >&5
9079
echo "${ECHO_T}no" >&6
9080
fi
9081
9082
-echo "$as_me:12003: checking for builtin bool type" >&5
9083
+echo "$as_me:12217: checking for builtin bool type" >&5
9084
echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
9085
9086
if test "${cf_cv_cc_bool_type+set}" = set; then
9087
@@ -12008,7 +12222,7 @@ if test "${cf_cv_cc_bool_type+set}" = se
9088
else
9089
9090
cat >conftest.$ac_ext <<_ACEOF
9091
-#line 12011 "configure"
9092
+#line 12225 "configure"
9093
#include "confdefs.h"
9094
9095
#include <stdio.h>
9096
@@ -12023,16 +12237,16 @@ bool x = false
9097
}
9098
_ACEOF
9099
rm -f conftest.$ac_objext
9100
-if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
9101
+if { (eval echo "$as_me:12240: \"$ac_compile\"") >&5
9102
(eval $ac_compile) 2>&5
9103
ac_status=$?
9104
- echo "$as_me:12029: \$? = $ac_status" >&5
9105
+ echo "$as_me:12243: \$? = $ac_status" >&5
9106
(exit $ac_status); } &&
9107
{ ac_try='test -s conftest.$ac_objext'
9108
- { (eval echo "$as_me:12032: \"$ac_try\"") >&5
9109
+ { (eval echo "$as_me:12246: \"$ac_try\"") >&5
9110
(eval $ac_try) 2>&5
9111
ac_status=$?
9112
- echo "$as_me:12035: \$? = $ac_status" >&5
9113
+ echo "$as_me:12249: \$? = $ac_status" >&5
9114
(exit $ac_status); }; }; then
9115
cf_cv_cc_bool_type=1
9116
else
9117
@@ -12045,9 +12259,9 @@ rm -f conftest.$ac_objext conftest.$ac_e
9118
fi
9119
9120
if test "$cf_cv_cc_bool_type" = 1
9121
-then echo "$as_me:12048: result: yes" >&5
9122
+then echo "$as_me:12262: result: yes" >&5
9123
echo "${ECHO_T}yes" >&6
9124
-else echo "$as_me:12050: result: no" >&5
9125
+else echo "$as_me:12264: result: no" >&5
9126
echo "${ECHO_T}no" >&6
9127
fi
9128
9129
@@ -12068,7 +12282,7 @@ os2*) #(vi
9130
cf_stdcpp_libname=stdc++
9131
;;
9132
esac
9133
-echo "$as_me:12071: checking for library $cf_stdcpp_libname" >&5
9134
+echo "$as_me:12285: checking for library $cf_stdcpp_libname" >&5
9135
echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
9136
if test "${cf_cv_libstdcpp+set}" = set; then
9137
echo $ECHO_N "(cached) $ECHO_C" >&6
9138
@@ -12077,7 +12291,7 @@ else
9139
cf_save="$LIBS"
9140
LIBS="$LIBS -l$cf_stdcpp_libname"
9141
cat >conftest.$ac_ext <<_ACEOF
9142
-#line 12080 "configure"
9143
+#line 12294 "configure"
9144
#include "confdefs.h"
9145
9146
#include <strstream.h>
9147
@@ -12093,16 +12307,16 @@ strstreambuf foo(buf, sizeof(buf))
9148
}
9149
_ACEOF
9150
rm -f conftest.$ac_objext conftest$ac_exeext
9151
-if { (eval echo "$as_me:12096: \"$ac_link\"") >&5
9152
+if { (eval echo "$as_me:12310: \"$ac_link\"") >&5
9153
(eval $ac_link) 2>&5
9154
ac_status=$?
9155
- echo "$as_me:12099: \$? = $ac_status" >&5
9156
+ echo "$as_me:12313: \$? = $ac_status" >&5
9157
(exit $ac_status); } &&
9158
{ ac_try='test -s conftest$ac_exeext'
9159
- { (eval echo "$as_me:12102: \"$ac_try\"") >&5
9160
+ { (eval echo "$as_me:12316: \"$ac_try\"") >&5
9161
(eval $ac_try) 2>&5
9162
ac_status=$?
9163
- echo "$as_me:12105: \$? = $ac_status" >&5
9164
+ echo "$as_me:12319: \$? = $ac_status" >&5
9165
(exit $ac_status); }; }; then
9166
cf_cv_libstdcpp=yes
9167
else
9168
@@ -12114,12 +12328,12 @@ rm -f conftest.$ac_objext conftest$ac_ex
9169
LIBS="$cf_save"
9170
9171
fi
9172
-echo "$as_me:12117: result: $cf_cv_libstdcpp" >&5
9173
+echo "$as_me:12331: result: $cf_cv_libstdcpp" >&5
9174
echo "${ECHO_T}$cf_cv_libstdcpp" >&6
9175
test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
9176
fi
9177
9178
- echo "$as_me:12122: checking whether $CXX understands -c and -o together" >&5
9179
+ echo "$as_me:12336: checking whether $CXX understands -c and -o together" >&5
9180
echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
9181
if test "${cf_cv_prog_CXX_c_o+set}" = set; then
9182
echo $ECHO_N "(cached) $ECHO_C" >&6
9183
@@ -12135,15 +12349,15 @@ CF_EOF
9184
# We do the test twice because some compilers refuse to overwrite an
9185
# existing .o file with -o, though they will create one.
9186
ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
9187
-if { (eval echo "$as_me:12138: \"$ac_try\"") >&5
9188
+if { (eval echo "$as_me:12352: \"$ac_try\"") >&5
9189
(eval $ac_try) 2>&5
9190
ac_status=$?
9191
- echo "$as_me:12141: \$? = $ac_status" >&5
9192
+ echo "$as_me:12355: \$? = $ac_status" >&5
9193
(exit $ac_status); } &&
9194
- test -f conftest2.$ac_objext && { (eval echo "$as_me:12143: \"$ac_try\"") >&5
9195
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:12357: \"$ac_try\"") >&5
9196
(eval $ac_try) 2>&5
9197
ac_status=$?
9198
- echo "$as_me:12146: \$? = $ac_status" >&5
9199
+ echo "$as_me:12360: \$? = $ac_status" >&5
9200
(exit $ac_status); };
9201
then
9202
eval cf_cv_prog_CXX_c_o=yes
9203
@@ -12154,10 +12368,10 @@ rm -f conftest*
9204
9205
fi
9206
if test $cf_cv_prog_CXX_c_o = yes; then
9207
- echo "$as_me:12157: result: yes" >&5
9208
+ echo "$as_me:12371: result: yes" >&5
9209
echo "${ECHO_T}yes" >&6
9210
else
9211
- echo "$as_me:12160: result: no" >&5
9212
+ echo "$as_me:12374: result: no" >&5
9213
echo "${ECHO_T}no" >&6
9214
fi
9215
9216
@@ -12177,12 +12391,12 @@ os2*) #(vi
9217
;;
9218
esac
9219
if test "$GXX" = yes; then
9220
- echo "$as_me:12180: checking for lib$cf_gpp_libname" >&5
9221
+ echo "$as_me:12394: checking for lib$cf_gpp_libname" >&5
9222
echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
9223
cf_save="$LIBS"
9224
LIBS="$LIBS -l$cf_gpp_libname"
9225
cat >conftest.$ac_ext <<_ACEOF
9226
-#line 12185 "configure"
9227
+#line 12399 "configure"
9228
#include "confdefs.h"
9229
9230
#include <$cf_gpp_libname/builtin.h>
9231
@@ -12196,16 +12410,16 @@ two_arg_error_handler_t foo2 = lib_error
9232
}
9233
_ACEOF
9234
rm -f conftest.$ac_objext conftest$ac_exeext
9235
-if { (eval echo "$as_me:12199: \"$ac_link\"") >&5
9236
+if { (eval echo "$as_me:12413: \"$ac_link\"") >&5
9237
(eval $ac_link) 2>&5
9238
ac_status=$?
9239
- echo "$as_me:12202: \$? = $ac_status" >&5
9240
+ echo "$as_me:12416: \$? = $ac_status" >&5
9241
(exit $ac_status); } &&
9242
{ ac_try='test -s conftest$ac_exeext'
9243
- { (eval echo "$as_me:12205: \"$ac_try\"") >&5
9244
+ { (eval echo "$as_me:12419: \"$ac_try\"") >&5
9245
(eval $ac_try) 2>&5
9246
ac_status=$?
9247
- echo "$as_me:12208: \$? = $ac_status" >&5
9248
+ echo "$as_me:12422: \$? = $ac_status" >&5
9249
(exit $ac_status); }; }; then
9250
cf_cxx_library=yes
9251
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
9252
@@ -12224,7 +12438,7 @@ else
9253
echo "$as_me: failed program was:" >&5
9254
cat conftest.$ac_ext >&5
9255
cat >conftest.$ac_ext <<_ACEOF
9256
-#line 12227 "configure"
9257
+#line 12441 "configure"
9258
#include "confdefs.h"
9259
9260
#include <builtin.h>
9261
@@ -12238,16 +12452,16 @@ two_arg_error_handler_t foo2 = lib_error
9262
}
9263
_ACEOF
9264
rm -f conftest.$ac_objext conftest$ac_exeext
9265
-if { (eval echo "$as_me:12241: \"$ac_link\"") >&5
9266
+if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
9267
(eval $ac_link) 2>&5
9268
ac_status=$?
9269
- echo "$as_me:12244: \$? = $ac_status" >&5
9270
+ echo "$as_me:12458: \$? = $ac_status" >&5
9271
(exit $ac_status); } &&
9272
{ ac_try='test -s conftest$ac_exeext'
9273
- { (eval echo "$as_me:12247: \"$ac_try\"") >&5
9274
+ { (eval echo "$as_me:12461: \"$ac_try\"") >&5
9275
(eval $ac_try) 2>&5
9276
ac_status=$?
9277
- echo "$as_me:12250: \$? = $ac_status" >&5
9278
+ echo "$as_me:12464: \$? = $ac_status" >&5
9279
(exit $ac_status); }; }; then
9280
cf_cxx_library=yes
9281
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
9282
@@ -12264,7 +12478,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
9283
fi
9284
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9285
LIBS="$cf_save"
9286
- echo "$as_me:12267: result: $cf_cxx_library" >&5
9287
+ echo "$as_me:12481: result: $cf_cxx_library" >&5
9288
echo "${ECHO_T}$cf_cxx_library" >&6
9289
fi
9290
9291
@@ -12279,7 +12493,7 @@ ac_cpp='$CXXCPP $CPPFLAGS'
9292
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9293
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9294
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9295
-echo "$as_me:12282: checking how to run the C++ preprocessor" >&5
9296
+echo "$as_me:12496: checking how to run the C++ preprocessor" >&5
9297
echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
9298
if test -z "$CXXCPP"; then
9299
if test "${ac_cv_prog_CXXCPP+set}" = set; then
9300
@@ -12296,18 +12510,18 @@ do
9301
# On the NeXT, cc -E runs the code through the compiler's parser,
9302
# not just through cpp. "Syntax error" is here to catch this case.
9303
cat >conftest.$ac_ext <<_ACEOF
9304
-#line 12299 "configure"
9305
+#line 12513 "configure"
9306
#include "confdefs.h"
9307
#include <assert.h>
9308
Syntax error
9309
_ACEOF
9310
-if { (eval echo "$as_me:12304: \"$ac_cpp conftest.$ac_ext\"") >&5
9311
+if { (eval echo "$as_me:12518: \"$ac_cpp conftest.$ac_ext\"") >&5
9312
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9313
ac_status=$?
9314
egrep -v '^ *\+' conftest.er1 >conftest.err
9315
rm -f conftest.er1
9316
cat conftest.err >&5
9317
- echo "$as_me:12310: \$? = $ac_status" >&5
9318
+ echo "$as_me:12524: \$? = $ac_status" >&5
9319
(exit $ac_status); } >/dev/null; then
9320
if test -s conftest.err; then
9321
ac_cpp_err=$ac_cxx_preproc_warn_flag
9322
@@ -12330,17 +12544,17 @@ rm -f conftest.err conftest.$ac_ext
9323
# OK, works on sane cases. Now check whether non-existent headers
9324
# can be detected and how.
9325
cat >conftest.$ac_ext <<_ACEOF
9326
-#line 12333 "configure"
9327
+#line 12547 "configure"
9328
#include "confdefs.h"
9329
#include <ac_nonexistent.h>
9330
_ACEOF
9331
-if { (eval echo "$as_me:12337: \"$ac_cpp conftest.$ac_ext\"") >&5
9332
+if { (eval echo "$as_me:12551: \"$ac_cpp conftest.$ac_ext\"") >&5
9333
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9334
ac_status=$?
9335
egrep -v '^ *\+' conftest.er1 >conftest.err
9336
rm -f conftest.er1
9337
cat conftest.err >&5
9338
- echo "$as_me:12343: \$? = $ac_status" >&5
9339
+ echo "$as_me:12557: \$? = $ac_status" >&5
9340
(exit $ac_status); } >/dev/null; then
9341
if test -s conftest.err; then
9342
ac_cpp_err=$ac_cxx_preproc_warn_flag
9343
@@ -12377,7 +12591,7 @@ fi
9344
else
9345
ac_cv_prog_CXXCPP=$CXXCPP
9346
fi
9347
-echo "$as_me:12380: result: $CXXCPP" >&5
9348
+echo "$as_me:12594: result: $CXXCPP" >&5
9349
echo "${ECHO_T}$CXXCPP" >&6
9350
ac_preproc_ok=false
9351
for ac_cxx_preproc_warn_flag in '' yes
9352
@@ -12387,18 +12601,18 @@ do
9353
# On the NeXT, cc -E runs the code through the compiler's parser,
9354
# not just through cpp. "Syntax error" is here to catch this case.
9355
cat >conftest.$ac_ext <<_ACEOF
9356
-#line 12390 "configure"
9357
+#line 12604 "configure"
9358
#include "confdefs.h"
9359
#include <assert.h>
9360
Syntax error
9361
_ACEOF
9362
-if { (eval echo "$as_me:12395: \"$ac_cpp conftest.$ac_ext\"") >&5
9363
+if { (eval echo "$as_me:12609: \"$ac_cpp conftest.$ac_ext\"") >&5
9364
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9365
ac_status=$?
9366
egrep -v '^ *\+' conftest.er1 >conftest.err
9367
rm -f conftest.er1
9368
cat conftest.err >&5
9369
- echo "$as_me:12401: \$? = $ac_status" >&5
9370
+ echo "$as_me:12615: \$? = $ac_status" >&5
9371
(exit $ac_status); } >/dev/null; then
9372
if test -s conftest.err; then
9373
ac_cpp_err=$ac_cxx_preproc_warn_flag
9374
@@ -12421,17 +12635,17 @@ rm -f conftest.err conftest.$ac_ext
9375
# OK, works on sane cases. Now check whether non-existent headers
9376
# can be detected and how.
9377
cat >conftest.$ac_ext <<_ACEOF
9378
-#line 12424 "configure"
9379
+#line 12638 "configure"
9380
#include "confdefs.h"
9381
#include <ac_nonexistent.h>
9382
_ACEOF
9383
-if { (eval echo "$as_me:12428: \"$ac_cpp conftest.$ac_ext\"") >&5
9384
+if { (eval echo "$as_me:12642: \"$ac_cpp conftest.$ac_ext\"") >&5
9385
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9386
ac_status=$?
9387
egrep -v '^ *\+' conftest.er1 >conftest.err
9388
rm -f conftest.er1
9389
cat conftest.err >&5
9390
- echo "$as_me:12434: \$? = $ac_status" >&5
9391
+ echo "$as_me:12648: \$? = $ac_status" >&5
9392
(exit $ac_status); } >/dev/null; then
9393
if test -s conftest.err; then
9394
ac_cpp_err=$ac_cxx_preproc_warn_flag
9395
@@ -12459,7 +12673,7 @@ rm -f conftest.err conftest.$ac_ext
9396
if $ac_preproc_ok; then
9397
:
9398
else
9399
- { { echo "$as_me:12462: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
9400
+ { { echo "$as_me:12676: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
9401
echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
9402
{ (exit 1); exit 1; }; }
9403
fi
9404
@@ -12473,23 +12687,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9405
for ac_header in typeinfo
9406
do
9407
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
9408
-echo "$as_me:12476: checking for $ac_header" >&5
9409
+echo "$as_me:12690: checking for $ac_header" >&5
9410
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
9411
if eval "test \"\${$as_ac_Header+set}\" = set"; then
9412
echo $ECHO_N "(cached) $ECHO_C" >&6
9413
else
9414
cat >conftest.$ac_ext <<_ACEOF
9415
-#line 12482 "configure"
9416
+#line 12696 "configure"
9417
#include "confdefs.h"
9418
#include <$ac_header>
9419
_ACEOF
9420
-if { (eval echo "$as_me:12486: \"$ac_cpp conftest.$ac_ext\"") >&5
9421
+if { (eval echo "$as_me:12700: \"$ac_cpp conftest.$ac_ext\"") >&5
9422
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9423
ac_status=$?
9424
egrep -v '^ *\+' conftest.er1 >conftest.err
9425
rm -f conftest.er1
9426
cat conftest.err >&5
9427
- echo "$as_me:12492: \$? = $ac_status" >&5
9428
+ echo "$as_me:12706: \$? = $ac_status" >&5
9429
(exit $ac_status); } >/dev/null; then
9430
if test -s conftest.err; then
9431
ac_cpp_err=$ac_cxx_preproc_warn_flag
9432
@@ -12508,7 +12722,7 @@ else
9433
fi
9434
rm -f conftest.err conftest.$ac_ext
9435
fi
9436
-echo "$as_me:12511: result: `eval echo '${'$as_ac_Header'}'`" >&5
9437
+echo "$as_me:12725: result: `eval echo '${'$as_ac_Header'}'`" >&5
9438
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9439
if test `eval echo '${'$as_ac_Header'}'` = yes; then
9440
cat >>confdefs.h <<EOF
9441
@@ -12518,7 +12732,7 @@ EOF
9442
fi
9443
done
9444
9445
-echo "$as_me:12521: checking if we should include stdbool.h" >&5
9446
+echo "$as_me:12735: checking if we should include stdbool.h" >&5
9447
echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
9448
9449
if test "${cf_cv_header_stdbool_h+set}" = set; then
9450
@@ -12526,7 +12740,7 @@ if test "${cf_cv_header_stdbool_h+set}"
9451
else
9452
9453
cat >conftest.$ac_ext <<_ACEOF
9454
-#line 12529 "configure"
9455
+#line 12743 "configure"
9456
#include "confdefs.h"
9457
9458
int
9459
@@ -12538,23 +12752,23 @@ bool foo = false
9460
}
9461
_ACEOF
9462
rm -f conftest.$ac_objext
9463
-if { (eval echo "$as_me:12541: \"$ac_compile\"") >&5
9464
+if { (eval echo "$as_me:12755: \"$ac_compile\"") >&5
9465
(eval $ac_compile) 2>&5
9466
ac_status=$?
9467
- echo "$as_me:12544: \$? = $ac_status" >&5
9468
+ echo "$as_me:12758: \$? = $ac_status" >&5
9469
(exit $ac_status); } &&
9470
{ ac_try='test -s conftest.$ac_objext'
9471
- { (eval echo "$as_me:12547: \"$ac_try\"") >&5
9472
+ { (eval echo "$as_me:12761: \"$ac_try\"") >&5
9473
(eval $ac_try) 2>&5
9474
ac_status=$?
9475
- echo "$as_me:12550: \$? = $ac_status" >&5
9476
+ echo "$as_me:12764: \$? = $ac_status" >&5
9477
(exit $ac_status); }; }; then
9478
cf_cv_header_stdbool_h=0
9479
else
9480
echo "$as_me: failed program was:" >&5
9481
cat conftest.$ac_ext >&5
9482
cat >conftest.$ac_ext <<_ACEOF
9483
-#line 12557 "configure"
9484
+#line 12771 "configure"
9485
#include "confdefs.h"
9486
9487
#ifndef __BEOS__
9488
@@ -12570,16 +12784,16 @@ bool foo = false
9489
}
9490
_ACEOF
9491
rm -f conftest.$ac_objext
9492
-if { (eval echo "$as_me:12573: \"$ac_compile\"") >&5
9493
+if { (eval echo "$as_me:12787: \"$ac_compile\"") >&5
9494
(eval $ac_compile) 2>&5
9495
ac_status=$?
9496
- echo "$as_me:12576: \$? = $ac_status" >&5
9497
+ echo "$as_me:12790: \$? = $ac_status" >&5
9498
(exit $ac_status); } &&
9499
{ ac_try='test -s conftest.$ac_objext'
9500
- { (eval echo "$as_me:12579: \"$ac_try\"") >&5
9501
+ { (eval echo "$as_me:12793: \"$ac_try\"") >&5
9502
(eval $ac_try) 2>&5
9503
ac_status=$?
9504
- echo "$as_me:12582: \$? = $ac_status" >&5
9505
+ echo "$as_me:12796: \$? = $ac_status" >&5
9506
(exit $ac_status); }; }; then
9507
cf_cv_header_stdbool_h=1
9508
else
9509
@@ -12593,13 +12807,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
9510
fi
9511
9512
if test "$cf_cv_header_stdbool_h" = 1
9513
-then echo "$as_me:12596: result: yes" >&5
9514
+then echo "$as_me:12810: result: yes" >&5
9515
echo "${ECHO_T}yes" >&6
9516
-else echo "$as_me:12598: result: no" >&5
9517
+else echo "$as_me:12812: result: no" >&5
9518
echo "${ECHO_T}no" >&6
9519
fi
9520
9521
-echo "$as_me:12602: checking for builtin bool type" >&5
9522
+echo "$as_me:12816: checking for builtin bool type" >&5
9523
echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
9524
9525
if test "${cf_cv_builtin_bool+set}" = set; then
9526
@@ -12607,7 +12821,7 @@ if test "${cf_cv_builtin_bool+set}" = se
9527
else
9528
9529
cat >conftest.$ac_ext <<_ACEOF
9530
-#line 12610 "configure"
9531
+#line 12824 "configure"
9532
#include "confdefs.h"
9533
9534
#include <stdio.h>
9535
@@ -12622,16 +12836,16 @@ bool x = false
9536
}
9537
_ACEOF
9538
rm -f conftest.$ac_objext
9539
-if { (eval echo "$as_me:12625: \"$ac_compile\"") >&5
9540
+if { (eval echo "$as_me:12839: \"$ac_compile\"") >&5
9541
(eval $ac_compile) 2>&5
9542
ac_status=$?
9543
- echo "$as_me:12628: \$? = $ac_status" >&5
9544
+ echo "$as_me:12842: \$? = $ac_status" >&5
9545
(exit $ac_status); } &&
9546
{ ac_try='test -s conftest.$ac_objext'
9547
- { (eval echo "$as_me:12631: \"$ac_try\"") >&5
9548
+ { (eval echo "$as_me:12845: \"$ac_try\"") >&5
9549
(eval $ac_try) 2>&5
9550
ac_status=$?
9551
- echo "$as_me:12634: \$? = $ac_status" >&5
9552
+ echo "$as_me:12848: \$? = $ac_status" >&5
9553
(exit $ac_status); }; }; then
9554
cf_cv_builtin_bool=1
9555
else
9556
@@ -12644,13 +12858,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
9557
fi
9558
9559
if test "$cf_cv_builtin_bool" = 1
9560
-then echo "$as_me:12647: result: yes" >&5
9561
+then echo "$as_me:12861: result: yes" >&5
9562
echo "${ECHO_T}yes" >&6
9563
-else echo "$as_me:12649: result: no" >&5
9564
+else echo "$as_me:12863: result: no" >&5
9565
echo "${ECHO_T}no" >&6
9566
fi
9567
9568
-echo "$as_me:12653: checking for size of bool" >&5
9569
+echo "$as_me:12867: checking for size of bool" >&5
9570
echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
9571
if test "${cf_cv_type_of_bool+set}" = set; then
9572
echo $ECHO_N "(cached) $ECHO_C" >&6
9573
@@ -12661,7 +12875,7 @@ else
9574
cf_cv_type_of_bool=unknown
9575
else
9576
cat >conftest.$ac_ext <<_ACEOF
9577
-#line 12664 "configure"
9578
+#line 12878 "configure"
9579
#include "confdefs.h"
9580
9581
#include <stdlib.h>
9582
@@ -12703,15 +12917,15 @@ main()
9583
9584
_ACEOF
9585
rm -f conftest$ac_exeext
9586
-if { (eval echo "$as_me:12706: \"$ac_link\"") >&5
9587
+if { (eval echo "$as_me:12920: \"$ac_link\"") >&5
9588
(eval $ac_link) 2>&5
9589
ac_status=$?
9590
- echo "$as_me:12709: \$? = $ac_status" >&5
9591
+ echo "$as_me:12923: \$? = $ac_status" >&5
9592
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9593
- { (eval echo "$as_me:12711: \"$ac_try\"") >&5
9594
+ { (eval echo "$as_me:12925: \"$ac_try\"") >&5
9595
(eval $ac_try) 2>&5
9596
ac_status=$?
9597
- echo "$as_me:12714: \$? = $ac_status" >&5
9598
+ echo "$as_me:12928: \$? = $ac_status" >&5
9599
(exit $ac_status); }; }; then
9600
cf_cv_type_of_bool=`cat cf_test.out`
9601
if test -z "$cf_cv_type_of_bool"; then
9602
@@ -12729,18 +12943,18 @@ fi
9603
fi
9604
9605
rm -f cf_test.out
9606
-echo "$as_me:12732: result: $cf_cv_type_of_bool" >&5
9607
+echo "$as_me:12946: result: $cf_cv_type_of_bool" >&5
9608
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
9609
if test "$cf_cv_type_of_bool" = unknown ; then
9610
case .$NCURSES_BOOL in #(vi
9611
.auto|.) NCURSES_BOOL=unsigned;;
9612
esac
9613
- { echo "$as_me:12738: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
9614
+ { echo "$as_me:12952: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
9615
echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
9616
cf_cv_type_of_bool=$NCURSES_BOOL
9617
fi
9618
9619
-echo "$as_me:12743: checking for special defines needed for etip.h" >&5
9620
+echo "$as_me:12957: checking for special defines needed for etip.h" >&5
9621
echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
9622
cf_save_CXXFLAGS="$CXXFLAGS"
9623
cf_result="none"
9624
@@ -12752,7 +12966,7 @@ do
9625
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
9626
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
9627
cat >conftest.$ac_ext <<_ACEOF
9628
-#line 12755 "configure"
9629
+#line 12969 "configure"
9630
#include "confdefs.h"
9631
9632
#include <etip.h.in>
9633
@@ -12766,16 +12980,16 @@ main ()
9634
}
9635
_ACEOF
9636
rm -f conftest.$ac_objext
9637
-if { (eval echo "$as_me:12769: \"$ac_compile\"") >&5
9638
+if { (eval echo "$as_me:12983: \"$ac_compile\"") >&5
9639
(eval $ac_compile) 2>&5
9640
ac_status=$?
9641
- echo "$as_me:12772: \$? = $ac_status" >&5
9642
+ echo "$as_me:12986: \$? = $ac_status" >&5
9643
(exit $ac_status); } &&
9644
{ ac_try='test -s conftest.$ac_objext'
9645
- { (eval echo "$as_me:12775: \"$ac_try\"") >&5
9646
+ { (eval echo "$as_me:12989: \"$ac_try\"") >&5
9647
(eval $ac_try) 2>&5
9648
ac_status=$?
9649
- echo "$as_me:12778: \$? = $ac_status" >&5
9650
+ echo "$as_me:12992: \$? = $ac_status" >&5
9651
(exit $ac_status); }; }; then
9652
9653
test -n "$cf_math" && cat >>confdefs.h <<EOF
9654
@@ -12796,12 +13010,12 @@ fi
9655
rm -f conftest.$ac_objext conftest.$ac_ext
9656
done
9657
done
9658
-echo "$as_me:12799: result: $cf_result" >&5
9659
+echo "$as_me:13013: result: $cf_result" >&5
9660
echo "${ECHO_T}$cf_result" >&6
9661
CXXFLAGS="$cf_save_CXXFLAGS"
9662
9663
if test -n "$CXX"; then
9664
-echo "$as_me:12804: checking if $CXX accepts parameter initialization" >&5
9665
+echo "$as_me:13018: checking if $CXX accepts parameter initialization" >&5
9666
echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
9667
if test "${cf_cv_cpp_param_init+set}" = set; then
9668
echo $ECHO_N "(cached) $ECHO_C" >&6
9669
@@ -12817,7 +13031,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9670
cf_cv_cpp_param_init=unknown
9671
else
9672
cat >conftest.$ac_ext <<_ACEOF
9673
-#line 12820 "configure"
9674
+#line 13034 "configure"
9675
#include "confdefs.h"
9676
9677
class TEST {
9678
@@ -12836,15 +13050,15 @@ void main() { }
9679
9680
_ACEOF
9681
rm -f conftest$ac_exeext
9682
-if { (eval echo "$as_me:12839: \"$ac_link\"") >&5
9683
+if { (eval echo "$as_me:13053: \"$ac_link\"") >&5
9684
(eval $ac_link) 2>&5
9685
ac_status=$?
9686
- echo "$as_me:12842: \$? = $ac_status" >&5
9687
+ echo "$as_me:13056: \$? = $ac_status" >&5
9688
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9689
- { (eval echo "$as_me:12844: \"$ac_try\"") >&5
9690
+ { (eval echo "$as_me:13058: \"$ac_try\"") >&5
9691
(eval $ac_try) 2>&5
9692
ac_status=$?
9693
- echo "$as_me:12847: \$? = $ac_status" >&5
9694
+ echo "$as_me:13061: \$? = $ac_status" >&5
9695
(exit $ac_status); }; }; then
9696
cf_cv_cpp_param_init=yes
9697
else
9698
@@ -12862,7 +13076,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
9699
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9700
9701
fi
9702
-echo "$as_me:12865: result: $cf_cv_cpp_param_init" >&5
9703
+echo "$as_me:13079: result: $cf_cv_cpp_param_init" >&5
9704
echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
9705
fi
9706
test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
9707
@@ -12871,7 +13085,7 @@ EOF
9708
9709
if test -n "$CXX"; then
9710
9711
-echo "$as_me:12874: checking if $CXX accepts static_cast" >&5
9712
+echo "$as_me:13088: checking if $CXX accepts static_cast" >&5
9713
echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
9714
if test "${cf_cv_cpp_static_cast+set}" = set; then
9715
echo $ECHO_N "(cached) $ECHO_C" >&6
9716
@@ -12884,7 +13098,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
9717
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9718
9719
cat >conftest.$ac_ext <<_ACEOF
9720
-#line 12887 "configure"
9721
+#line 13101 "configure"
9722
#include "confdefs.h"
9723
9724
class NCursesPanel
9725
@@ -12928,16 +13142,16 @@ main ()
9726
}
9727
_ACEOF
9728
rm -f conftest.$ac_objext
9729
-if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5
9730
+if { (eval echo "$as_me:13145: \"$ac_compile\"") >&5
9731
(eval $ac_compile) 2>&5
9732
ac_status=$?
9733
- echo "$as_me:12934: \$? = $ac_status" >&5
9734
+ echo "$as_me:13148: \$? = $ac_status" >&5
9735
(exit $ac_status); } &&
9736
{ ac_try='test -s conftest.$ac_objext'
9737
- { (eval echo "$as_me:12937: \"$ac_try\"") >&5
9738
+ { (eval echo "$as_me:13151: \"$ac_try\"") >&5
9739
(eval $ac_try) 2>&5
9740
ac_status=$?
9741
- echo "$as_me:12940: \$? = $ac_status" >&5
9742
+ echo "$as_me:13154: \$? = $ac_status" >&5
9743
(exit $ac_status); }; }; then
9744
cf_cv_cpp_static_cast=yes
9745
else
9746
@@ -12954,7 +13168,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
9747
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9748
9749
fi
9750
-echo "$as_me:12957: result: $cf_cv_cpp_static_cast" >&5
9751
+echo "$as_me:13171: result: $cf_cv_cpp_static_cast" >&5
9752
echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
9753
9754
fi
9755
@@ -12974,23 +13188,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9756
for ac_header in strstream.h
9757
do
9758
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
9759
-echo "$as_me:12977: checking for $ac_header" >&5
9760
+echo "$as_me:13191: checking for $ac_header" >&5
9761
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
9762
if eval "test \"\${$as_ac_Header+set}\" = set"; then
9763
echo $ECHO_N "(cached) $ECHO_C" >&6
9764
else
9765
cat >conftest.$ac_ext <<_ACEOF
9766
-#line 12983 "configure"
9767
+#line 13197 "configure"
9768
#include "confdefs.h"
9769
#include <$ac_header>
9770
_ACEOF
9771
-if { (eval echo "$as_me:12987: \"$ac_cpp conftest.$ac_ext\"") >&5
9772
+if { (eval echo "$as_me:13201: \"$ac_cpp conftest.$ac_ext\"") >&5
9773
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9774
ac_status=$?
9775
egrep -v '^ *\+' conftest.er1 >conftest.err
9776
rm -f conftest.er1
9777
cat conftest.err >&5
9778
- echo "$as_me:12993: \$? = $ac_status" >&5
9779
+ echo "$as_me:13207: \$? = $ac_status" >&5
9780
(exit $ac_status); } >/dev/null; then
9781
if test -s conftest.err; then
9782
ac_cpp_err=$ac_cxx_preproc_warn_flag
9783
@@ -13009,7 +13223,7 @@ else
9784
fi
9785
rm -f conftest.err conftest.$ac_ext
9786
fi
9787
-echo "$as_me:13012: result: `eval echo '${'$as_ac_Header'}'`" >&5
9788
+echo "$as_me:13226: result: `eval echo '${'$as_ac_Header'}'`" >&5
9789
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9790
if test `eval echo '${'$as_ac_Header'}'` = yes; then
9791
cat >>confdefs.h <<EOF
9792
@@ -13019,7 +13233,7 @@ EOF
9793
fi
9794
done
9795
9796
-echo "$as_me:13022: checking if $CXX supports vscan function" >&5
9797
+echo "$as_me:13236: checking if $CXX supports vscan function" >&5
9798
echo $ECHO_N "checking if $CXX supports vscan function... $ECHO_C" >&6
9799
if test "${cf_cv_cpp_vscan_func+set}" = set; then
9800
echo $ECHO_N "(cached) $ECHO_C" >&6
9801
@@ -13033,7 +13247,7 @@ else
9802
strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
9803
esac
9804
cat >conftest.$ac_ext <<_ACEOF
9805
-#line 13036 "configure"
9806
+#line 13250 "configure"
9807
#include "confdefs.h"
9808
9809
#include <stdio.h>
9810
@@ -13078,16 +13292,16 @@ int tmp, foo = scanw("%d", &tmp)
9811
}
9812
_ACEOF
9813
rm -f conftest.$ac_objext conftest$ac_exeext
9814
-if { (eval echo "$as_me:13081: \"$ac_link\"") >&5
9815
+if { (eval echo "$as_me:13295: \"$ac_link\"") >&5
9816
(eval $ac_link) 2>&5
9817
ac_status=$?
9818
- echo "$as_me:13084: \$? = $ac_status" >&5
9819
+ echo "$as_me:13298: \$? = $ac_status" >&5
9820
(exit $ac_status); } &&
9821
{ ac_try='test -s conftest$ac_exeext'
9822
- { (eval echo "$as_me:13087: \"$ac_try\"") >&5
9823
+ { (eval echo "$as_me:13301: \"$ac_try\"") >&5
9824
(eval $ac_try) 2>&5
9825
ac_status=$?
9826
- echo "$as_me:13090: \$? = $ac_status" >&5
9827
+ echo "$as_me:13304: \$? = $ac_status" >&5
9828
(exit $ac_status); }; }; then
9829
cf_cv_cpp_vscan_func=$cf_vscan_func; break
9830
else
9831
@@ -13100,7 +13314,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
9832
done
9833
9834
fi
9835
-echo "$as_me:13103: result: $cf_cv_cpp_vscan_func" >&5
9836
+echo "$as_me:13317: result: $cf_cv_cpp_vscan_func" >&5
9837
echo "${ECHO_T}$cf_cv_cpp_vscan_func" >&6
9838
9839
ac_ext=cc
9840
@@ -13178,11 +13392,12 @@ else
9841
# may change.
9842
9843
if test "$NCURSES_BOOL" != auto ; then
9844
- cf_cv_type_of_bool=$NCURSES_AUTO
9845
+ cf_cv_type_of_bool=$NCURSES_BOOL
9846
+ cf_cv_header_stdbool_h=0
9847
else
9848
if test "$cf_cv_header_stdbool_h" = 1 ; then
9849
9850
-echo "$as_me:13185: checking for size of bool" >&5
9851
+echo "$as_me:13400: checking for size of bool" >&5
9852
echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
9853
if test "${cf_cv_type_of_bool+set}" = set; then
9854
echo $ECHO_N "(cached) $ECHO_C" >&6
9855
@@ -13193,7 +13408,7 @@ else
9856
cf_cv_type_of_bool=unknown
9857
else
9858
cat >conftest.$ac_ext <<_ACEOF
9859
-#line 13196 "configure"
9860
+#line 13411 "configure"
9861
#include "confdefs.h"
9862
9863
#include <stdlib.h>
9864
@@ -13235,15 +13450,15 @@ main()
9865
9866
_ACEOF
9867
rm -f conftest$ac_exeext
9868
-if { (eval echo "$as_me:13238: \"$ac_link\"") >&5
9869
+if { (eval echo "$as_me:13453: \"$ac_link\"") >&5
9870
(eval $ac_link) 2>&5
9871
ac_status=$?
9872
- echo "$as_me:13241: \$? = $ac_status" >&5
9873
+ echo "$as_me:13456: \$? = $ac_status" >&5
9874
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9875
- { (eval echo "$as_me:13243: \"$ac_try\"") >&5
9876
+ { (eval echo "$as_me:13458: \"$ac_try\"") >&5
9877
(eval $ac_try) 2>&5
9878
ac_status=$?
9879
- echo "$as_me:13246: \$? = $ac_status" >&5
9880
+ echo "$as_me:13461: \$? = $ac_status" >&5
9881
(exit $ac_status); }; }; then
9882
cf_cv_type_of_bool=`cat cf_test.out`
9883
if test -z "$cf_cv_type_of_bool"; then
9884
@@ -13261,25 +13476,25 @@ fi
9885
fi
9886
9887
rm -f cf_test.out
9888
-echo "$as_me:13264: result: $cf_cv_type_of_bool" >&5
9889
+echo "$as_me:13479: result: $cf_cv_type_of_bool" >&5
9890
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
9891
if test "$cf_cv_type_of_bool" = unknown ; then
9892
case .$NCURSES_BOOL in #(vi
9893
.auto|.) NCURSES_BOOL=unsigned;;
9894
esac
9895
- { echo "$as_me:13270: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
9896
+ { echo "$as_me:13485: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
9897
echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
9898
cf_cv_type_of_bool=$NCURSES_BOOL
9899
fi
9900
9901
else
9902
- echo "$as_me:13276: checking for fallback type of bool" >&5
9903
+ echo "$as_me:13491: checking for fallback type of bool" >&5
9904
echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
9905
case "$host_cpu" in #(vi
9906
i?86) cf_cv_type_of_bool=char ;; #(vi
9907
*) cf_cv_type_of_bool=int ;;
9908
esac
9909
- echo "$as_me:13282: result: $cf_cv_type_of_bool" >&5
9910
+ echo "$as_me:13497: result: $cf_cv_type_of_bool" >&5
9911
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
9912
fi
9913
fi
9914
@@ -13304,11 +13519,12 @@ else
9915
USE_CXX_BOOL='defined(__cplusplus)'
9916
fi
9917
9918
+if test -f "${srcdir}/Ada95/Makefile.in" ; then
9919
if test "$cf_with_ada" != "no" ; then
9920
cf_ada_make=gnatmake
9921
# Extract the first word of "$cf_ada_make", so it can be a program name with args.
9922
set dummy $cf_ada_make; ac_word=$2
9923
-echo "$as_me:13311: checking for $ac_word" >&5
9924
+echo "$as_me:13527: checking for $ac_word" >&5
9925
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9926
if test "${ac_cv_prog_gnat_exists+set}" = set; then
9927
echo $ECHO_N "(cached) $ECHO_C" >&6
9928
@@ -13323,7 +13539,7 @@ for ac_dir in $ac_dummy; do
9929
test -z "$ac_dir" && ac_dir=.
9930
$as_executable_p "$ac_dir/$ac_word" || continue
9931
ac_cv_prog_gnat_exists="yes"
9932
-echo "$as_me:13326: found $ac_dir/$ac_word" >&5
9933
+echo "$as_me:13542: found $ac_dir/$ac_word" >&5
9934
break
9935
done
9936
9937
@@ -13332,10 +13548,10 @@ fi
9938
fi
9939
gnat_exists=$ac_cv_prog_gnat_exists
9940
if test -n "$gnat_exists"; then
9941
- echo "$as_me:13335: result: $gnat_exists" >&5
9942
+ echo "$as_me:13551: result: $gnat_exists" >&5
9943
echo "${ECHO_T}$gnat_exists" >&6
9944
else
9945
- echo "$as_me:13338: result: no" >&5
9946
+ echo "$as_me:13554: result: no" >&5
9947
echo "${ECHO_T}no" >&6
9948
fi
9949
9950
@@ -13343,11 +13559,11 @@ if test "$ac_cv_prog_gnat_exists" = no;
9951
cf_ada_make=
9952
else
9953
9954
-echo "$as_me:13346: checking for gnat version" >&5
9955
+echo "$as_me:13562: checking for gnat version" >&5
9956
echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
9957
cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
9958
sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
9959
-echo "$as_me:13350: result: $cf_gnat_version" >&5
9960
+echo "$as_me:13566: result: $cf_gnat_version" >&5
9961
echo "${ECHO_T}$cf_gnat_version" >&6
9962
9963
case $cf_gnat_version in
9964
@@ -13370,7 +13586,7 @@ esac
9965
9966
# Extract the first word of "m4", so it can be a program name with args.
9967
set dummy m4; ac_word=$2
9968
-echo "$as_me:13373: checking for $ac_word" >&5
9969
+echo "$as_me:13589: checking for $ac_word" >&5
9970
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9971
if test "${ac_cv_prog_M4_exists+set}" = set; then
9972
echo $ECHO_N "(cached) $ECHO_C" >&6
9973
@@ -13385,7 +13601,7 @@ for ac_dir in $ac_dummy; do
9974
test -z "$ac_dir" && ac_dir=.
9975
$as_executable_p "$ac_dir/$ac_word" || continue
9976
ac_cv_prog_M4_exists="yes"
9977
-echo "$as_me:13388: found $ac_dir/$ac_word" >&5
9978
+echo "$as_me:13604: found $ac_dir/$ac_word" >&5
9979
break
9980
done
9981
9982
@@ -13394,10 +13610,10 @@ fi
9983
fi
9984
M4_exists=$ac_cv_prog_M4_exists
9985
if test -n "$M4_exists"; then
9986
- echo "$as_me:13397: result: $M4_exists" >&5
9987
+ echo "$as_me:13613: result: $M4_exists" >&5
9988
echo "${ECHO_T}$M4_exists" >&6
9989
else
9990
- echo "$as_me:13400: result: no" >&5
9991
+ echo "$as_me:13616: result: no" >&5
9992
echo "${ECHO_T}no" >&6
9993
fi
9994
9995
@@ -13406,7 +13622,7 @@ fi
9996
echo Ada95 binding required program m4 not found. Ada95 binding disabled.
9997
fi
9998
if test "$cf_cv_prog_gnat_correct" = yes; then
9999
- echo "$as_me:13409: checking if GNAT works" >&5
10000
+ echo "$as_me:13625: checking if GNAT works" >&5
10001
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
10002
10003
rm -f conftest*
10004
@@ -13434,14 +13650,14 @@ else
10005
fi
10006
rm -f conftest*
10007
10008
- echo "$as_me:13437: result: $cf_cv_prog_gnat_correct" >&5
10009
+ echo "$as_me:13653: result: $cf_cv_prog_gnat_correct" >&5
10010
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
10011
fi
10012
fi
10013
if test "$cf_cv_prog_gnat_correct" = yes; then
10014
ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
10015
10016
- echo "$as_me:13444: checking if GNAT pragma Unreferenced works" >&5
10017
+ echo "$as_me:13660: checking if GNAT pragma Unreferenced works" >&5
10018
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
10019
10020
rm -f conftest*
10021
@@ -13468,7 +13684,7 @@ else
10022
fi
10023
rm -f conftest*
10024
10025
- echo "$as_me:13471: result: $cf_cv_pragma_unreferenced" >&5
10026
+ echo "$as_me:13687: result: $cf_cv_pragma_unreferenced" >&5
10027
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
10028
10029
# if the pragma is supported, use it (needed in the Trace code).
10030
@@ -13510,11 +13726,11 @@ case ".$withval" in #(vi
10031
;;
10032
esac
10033
;; #(vi
10034
-.NONE/*)
10035
+.no|.NONE/*)
10036
withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
10037
;;
10038
*)
10039
- { { echo "$as_me:13517: error: expected a pathname, not \"$withval\"" >&5
10040
+ { { echo "$as_me:13733: error: expected a pathname, not \"$withval\"" >&5
10041
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
10042
{ (exit 1); exit 1; }; }
10043
;;
10044
@@ -13544,11 +13760,11 @@ case ".$withval" in #(vi
10045
;;
10046
esac
10047
;; #(vi
10048
-.NONE/*)
10049
+.no|.NONE/*)
10050
withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
10051
;;
10052
*)
10053
- { { echo "$as_me:13551: error: expected a pathname, not \"$withval\"" >&5
10054
+ { { echo "$as_me:13767: error: expected a pathname, not \"$withval\"" >&5
10055
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
10056
{ (exit 1); exit 1; }; }
10057
;;
10058
@@ -13558,10 +13774,11 @@ eval ADA_OBJECTS="$withval"
10059
10060
fi
10061
fi
10062
+fi
10063
10064
### Construct the library-subsets, if any, from this set of keywords:
10065
### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
10066
-echo "$as_me:13564: checking for library subsets" >&5
10067
+echo "$as_me:13781: checking for library subsets" >&5
10068
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
10069
if test "$with_termlib" != no ; then
10070
LIB_SUBSETS="termlib"
10071
@@ -13574,7 +13791,7 @@ fi
10072
LIB_SUBSETS="${LIB_SUBSETS}base"
10073
test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
10074
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
10075
-echo "$as_me:13577: result: $LIB_SUBSETS" >&5
10076
+echo "$as_me:13794: result: $LIB_SUBSETS" >&5
10077
echo "${ECHO_T}$LIB_SUBSETS" >&6
10078
10079
### Construct the list of include-directories to be generated
10080
@@ -13612,7 +13829,7 @@ elif test "$includedir" != "/usr/include
10081
fi
10082
10083
### Build up pieces for makefile rules
10084
-echo "$as_me:13615: checking default library suffix" >&5
10085
+echo "$as_me:13832: checking default library suffix" >&5
10086
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
10087
10088
case $DFT_LWR_MODEL in
10089
@@ -13623,10 +13840,10 @@ echo $ECHO_N "checking default library s
10090
shared) DFT_ARG_SUFFIX='' ;;
10091
esac
10092
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
10093
-echo "$as_me:13626: result: $DFT_ARG_SUFFIX" >&5
10094
+echo "$as_me:13843: result: $DFT_ARG_SUFFIX" >&5
10095
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
10096
10097
-echo "$as_me:13629: checking default library-dependency suffix" >&5
10098
+echo "$as_me:13846: checking default library-dependency suffix" >&5
10099
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
10100
10101
case $DFT_LWR_MODEL in
10102
@@ -13655,10 +13872,10 @@ if test $DFT_LWR_MODEL = shared ; then
10103
;;
10104
esac
10105
fi
10106
-echo "$as_me:13658: result: $DFT_DEP_SUFFIX" >&5
10107
+echo "$as_me:13875: result: $DFT_DEP_SUFFIX" >&5
10108
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
10109
10110
-echo "$as_me:13661: checking default object directory" >&5
10111
+echo "$as_me:13878: checking default object directory" >&5
10112
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
10113
10114
case $DFT_LWR_MODEL in
10115
@@ -13674,12 +13891,12 @@ echo $ECHO_N "checking default object di
10116
DFT_OBJ_SUBDIR='obj_s' ;;
10117
esac
10118
esac
10119
-echo "$as_me:13677: result: $DFT_OBJ_SUBDIR" >&5
10120
+echo "$as_me:13894: result: $DFT_OBJ_SUBDIR" >&5
10121
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
10122
10123
# libtool thinks it can make c++ shared libraries (perhaps only g++)
10124
if test "$cf_with_cxx" = yes ; then
10125
-echo "$as_me:13682: checking c++ library-dependency suffix" >&5
10126
+echo "$as_me:13899: checking c++ library-dependency suffix" >&5
10127
echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
10128
if test "$with_libtool" != "no"; then
10129
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
10130
@@ -13705,7 +13922,7 @@ else
10131
esac
10132
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
10133
fi
10134
-echo "$as_me:13708: result: $CXX_LIB_SUFFIX" >&5
10135
+echo "$as_me:13925: result: $CXX_LIB_SUFFIX" >&5
10136
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
10137
10138
fi
10139
@@ -13744,12 +13961,12 @@ fi
10140
# needed for Ada95
10141
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
10142
10143
-echo "$as_me:13747: checking where we will install curses.h" >&5
10144
+echo "$as_me:13964: checking where we will install curses.h" >&5
10145
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
10146
test "$with_overwrite" = no && \
10147
test "x$includedir" = 'x${prefix}/include' && \
10148
includedir='$(prefix)/include/ncurses'${LIB_SUFFIX}
10149
-echo "$as_me:13752: result: $includedir" >&5
10150
+echo "$as_me:13969: result: $includedir" >&5
10151
echo "${ECHO_T}$includedir" >&6
10152
10153
### Resolve a conflict between normal and wide-curses by forcing applications
10154
@@ -13757,7 +13974,7 @@ echo "${ECHO_T}$includedir" >&6
10155
if test "$with_overwrite" != no ; then
10156
if test "$NCURSES_LIBUTF8" = 1 ; then
10157
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
10158
- { echo "$as_me:13760: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
10159
+ { echo "$as_me:13977: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
10160
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
10161
fi
10162
fi
10163
@@ -13770,7 +13987,7 @@ EOF
10164
### Construct the list of subdirectories for which we'll customize makefiles
10165
### with the appropriate compile-rules.
10166
10167
-echo "$as_me:13773: checking for src modules" >&5
10168
+echo "$as_me:13990: checking for src modules" >&5
10169
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
10170
10171
# dependencies and linker-arguments for test-programs
10172
@@ -13833,7 +14050,7 @@ EOF
10173
fi
10174
fi
10175
done
10176
-echo "$as_me:13836: result: $cf_cv_src_modules" >&5
10177
+echo "$as_me:14053: result: $cf_cv_src_modules" >&5
10178
echo "${ECHO_T}$cf_cv_src_modules" >&6
10179
10180
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
10181
@@ -14058,7 +14275,7 @@ DEFS=-DHAVE_CONFIG_H
10182
: ${CONFIG_STATUS=./config.status}
10183
ac_clean_files_save=$ac_clean_files
10184
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
10185
-{ echo "$as_me:14061: creating $CONFIG_STATUS" >&5
10186
+{ echo "$as_me:14278: creating $CONFIG_STATUS" >&5
10187
echo "$as_me: creating $CONFIG_STATUS" >&6;}
10188
cat >$CONFIG_STATUS <<_ACEOF
10189
#! $SHELL
10190
@@ -14234,7 +14451,7 @@ cat >>$CONFIG_STATUS <<\EOF
10191
echo "$ac_cs_version"; exit 0 ;;
10192
--he | --h)
10193
# Conflict between --help and --header
10194
- { { echo "$as_me:14237: error: ambiguous option: $1
10195
+ { { echo "$as_me:14454: error: ambiguous option: $1
10196
Try \`$0 --help' for more information." >&5
10197
echo "$as_me: error: ambiguous option: $1
10198
Try \`$0 --help' for more information." >&2;}
10199
@@ -14253,7 +14470,7 @@ Try \`$0 --help' for more information."
10200
ac_need_defaults=false;;
10201
10202
# This is an error.
10203
- -*) { { echo "$as_me:14256: error: unrecognized option: $1
10204
+ -*) { { echo "$as_me:14473: error: unrecognized option: $1
10205
Try \`$0 --help' for more information." >&5
10206
echo "$as_me: error: unrecognized option: $1
10207
Try \`$0 --help' for more information." >&2;}
10208
@@ -14292,7 +14509,6 @@ cat >>$CONFIG_STATUS <<EOF
10209
### configuration-run into config.status
10210
10211
AWK="$AWK"
10212
-CF_LIST_MODELS="$cf_list_models"
10213
DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
10214
DFT_LWR_MODEL="$DFT_LWR_MODEL"
10215
LDCONFIG="$LDCONFIG"
10216
@@ -14310,6 +14526,7 @@ TINFO_NAME="$TINFO_NAME"
10217
WITH_CURSES_H="$with_curses_h"
10218
WITH_ECHO="$with_echo"
10219
WITH_OVERWRITE="$with_overwrite"
10220
+cf_LIST_MODELS="$cf_list_models"
10221
cf_cv_abi_version="$cf_cv_abi_version"
10222
cf_cv_do_symlinks="$cf_cv_do_symlinks"
10223
cf_cv_enable_lp64="$cf_cv_enable_lp64"
10224
@@ -14339,7 +14556,7 @@ do
10225
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
10226
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
10227
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
10228
- *) { { echo "$as_me:14342: error: invalid argument: $ac_config_target" >&5
10229
+ *) { { echo "$as_me:14559: error: invalid argument: $ac_config_target" >&5
10230
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
10231
{ (exit 1); exit 1; }; };;
10232
esac
10233
@@ -14544,6 +14761,7 @@ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
10234
s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t
10235
s,@ADA_TRACE@,$ADA_TRACE,;t t
10236
s,@MATH_LIB@,$MATH_LIB,;t t
10237
+s,@NCURSES_INLINE@,$NCURSES_INLINE,;t t
10238
s,@cf_cv_typeof_chtype@,$cf_cv_typeof_chtype,;t t
10239
s,@cf_cv_1UL@,$cf_cv_1UL,;t t
10240
s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t
10241
@@ -14697,7 +14915,7 @@ done; }
10242
esac
10243
10244
if test x"$ac_file" != x-; then
10245
- { echo "$as_me:14700: creating $ac_file" >&5
10246
+ { echo "$as_me:14918: creating $ac_file" >&5
10247
echo "$as_me: creating $ac_file" >&6;}
10248
rm -f "$ac_file"
10249
fi
10250
@@ -14715,7 +14933,7 @@ echo "$as_me: creating $ac_file" >&6;}
10251
-) echo $tmp/stdin ;;
10252
[\\/$]*)
10253
# Absolute (can't be DOS-style, as IFS=:)
10254
- test -f "$f" || { { echo "$as_me:14718: error: cannot find input file: $f" >&5
10255
+ test -f "$f" || { { echo "$as_me:14936: error: cannot find input file: $f" >&5
10256
echo "$as_me: error: cannot find input file: $f" >&2;}
10257
{ (exit 1); exit 1; }; }
10258
echo $f;;
10259
@@ -14728,7 +14946,7 @@ echo "$as_me: error: cannot find input f
10260
echo $srcdir/$f
10261
else
10262
# /dev/null tree
10263
- { { echo "$as_me:14731: error: cannot find input file: $f" >&5
10264
+ { { echo "$as_me:14949: error: cannot find input file: $f" >&5
10265
echo "$as_me: error: cannot find input file: $f" >&2;}
10266
{ (exit 1); exit 1; }; }
10267
fi;;
10268
@@ -14794,7 +15012,7 @@ for ac_file in : $CONFIG_HEADERS; do tes
10269
* ) ac_file_in=$ac_file.in ;;
10270
esac
10271
10272
- test x"$ac_file" != x- && { echo "$as_me:14797: creating $ac_file" >&5
10273
+ test x"$ac_file" != x- && { echo "$as_me:15015: creating $ac_file" >&5
10274
echo "$as_me: creating $ac_file" >&6;}
10275
10276
# First look for the input files in the build tree, otherwise in the
10277
@@ -14805,7 +15023,7 @@ echo "$as_me: creating $ac_file" >&6;}
10278
-) echo $tmp/stdin ;;
10279
[\\/$]*)
10280
# Absolute (can't be DOS-style, as IFS=:)
10281
- test -f "$f" || { { echo "$as_me:14808: error: cannot find input file: $f" >&5
10282
+ test -f "$f" || { { echo "$as_me:15026: error: cannot find input file: $f" >&5
10283
echo "$as_me: error: cannot find input file: $f" >&2;}
10284
{ (exit 1); exit 1; }; }
10285
echo $f;;
10286
@@ -14818,7 +15036,7 @@ echo "$as_me: error: cannot find input f
10287
echo $srcdir/$f
10288
else
10289
# /dev/null tree
10290
- { { echo "$as_me:14821: error: cannot find input file: $f" >&5
10291
+ { { echo "$as_me:15039: error: cannot find input file: $f" >&5
10292
echo "$as_me: error: cannot find input file: $f" >&2;}
10293
{ (exit 1); exit 1; }; }
10294
fi;;
10295
@@ -14876,7 +15094,7 @@ cat >>$CONFIG_STATUS <<\EOF
10296
rm -f $tmp/in
10297
if test x"$ac_file" != x-; then
10298
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
10299
- { echo "$as_me:14879: $ac_file is unchanged" >&5
10300
+ { echo "$as_me:15097: $ac_file is unchanged" >&5
10301
echo "$as_me: $ac_file is unchanged" >&6;}
10302
else
10303
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10304
@@ -14943,7 +15161,7 @@ do
10305
IMPORT_LIB=
10306
SHARED_LIB=
10307
LIBS_TO_MAKE=
10308
- for cf_item in $CF_LIST_MODELS
10309
+ for cf_item in $cf_LIST_MODELS
10310
do
10311
10312
case $cf_item in
10313
@@ -15040,7 +15258,7 @@ do
10314
for cf_subset in $cf_subsets
10315
do
10316
cf_subdirs=
10317
- for cf_item in $CF_LIST_MODELS
10318
+ for cf_item in $cf_LIST_MODELS
10319
do
10320
echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
10321
10322
Index: ncurses-5.5/configure.in
10323
===================================================================
10324
--- ncurses-5.5.orig/configure.in 2005-09-17 18:41:48.000000000 -0400
10325
+++ ncurses-5.5/configure.in 2006-04-18 15:48:07.000000000 -0400
10326
@@ -28,14 +28,14 @@ dnl*************************************
10327
dnl
10328
dnl Author: Thomas E. Dickey 1995-on
10329
dnl
10330
-dnl $Id: configure.in,v 1.351 2005/09/17 22:41:48 tom Exp $
10331
+dnl $Id: configure.in,v 1.357 2006/04/15 17:40:51 tom Exp $
10332
dnl Process this file with autoconf to produce a configure script.
10333
dnl
10334
dnl See http://invisible-island.net/autoconf/ for additional information.
10335
dnl
10336
dnl ---------------------------------------------------------------------------
10337
AC_PREREQ(2.13.20020210)
10338
-AC_REVISION($Revision: 1.351 $)
10339
+AC_REVISION($Revision: 1.357 $)
10340
AC_INIT(ncurses/base/lib_initscr.c)
10341
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
10342
10343
@@ -285,10 +285,20 @@ CF_WITH_DMALLOC
10344
SHLIB_LIST=""
10345
CF_WITH_GPM
10346
if test "$with_gpm" = yes ; then
10347
- CF_FUNC_DLSYM
10348
- CF_LIB_SONAME([#include <gpm.h>],[if (Gpm_Open(0,0)) Gpm_Close();],gpm)
10349
- test "$cf_cv_gpm_soname" != "unknown" && AC_DEFINE_UNQUOTED(LIBGPM_SONAME,"$cf_cv_gpm_soname")
10350
- SHLIB_LIST="-ldl $SHLIB_LIST"
10351
+ AC_MSG_CHECKING(if you want to load GPM dynamically)
10352
+ AC_ARG_WITH(dlsym,
10353
+ [ --without-dlsym do not use dlsym() to load GPM dynamically],
10354
+ [with_dlsym=$withval],
10355
+ [with_dlsym=yes])
10356
+ AC_MSG_RESULT($with_dlsym)
10357
+ if test "$with_dlsym" = yes ; then
10358
+ CF_FUNC_DLSYM
10359
+ CF_LIB_SONAME([#include <gpm.h>],[if (Gpm_Open(0,0)) Gpm_Close();],gpm)
10360
+ test "$cf_cv_gpm_soname" != "unknown" && AC_DEFINE_UNQUOTED(LIBGPM_SONAME,"$cf_cv_gpm_soname")
10361
+ SHLIB_LIST="-ldl $SHLIB_LIST"
10362
+ else
10363
+ SHLIB_LIST="-lgpm $SHLIB_LIST"
10364
+ fi
10365
AC_DEFINE(HAVE_LIBGPM)
10366
AC_CHECK_LIB(gpm,Gpm_Wgetch,[
10367
AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
10368
@@ -581,6 +591,9 @@ NCURSES_WINT_T=0
10369
# Check to define _XOPEN_SOURCE "automatically"
10370
CF_XOPEN_SOURCE
10371
10372
+# Work around breakage on OS X
10373
+CF_SIGWINCH
10374
+
10375
# Checks for CODESET support.
10376
AM_LANGINFO_CODESET
10377
10378
@@ -666,7 +679,7 @@ AC_ARG_WITH(caps,
10379
[ --with-caps=alt compile with alternate Caps file],
10380
[TERMINFO_CAPS=Caps.$withval],
10381
[TERMINFO_CAPS=Caps])
10382
-test -f ${srcdir}/include/${TERMINFO_CAPS} || TERMINFO_CAPS=Caps
10383
+test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
10384
AC_MSG_RESULT($TERMINFO_CAPS)
10385
AC_SUBST(TERMINFO_CAPS)
10386
10387
@@ -1037,7 +1050,13 @@ CF_SYS_TIME_SELECT
10388
AC_LANG_C
10389
AC_C_CONST
10390
AC_C_INLINE
10391
-test "$ac_cv_c_inline" != no && AC_DEFINE(CC_HAS_INLINE_FUNCS)
10392
+
10393
+NCURSES_INLINE=
10394
+if test "$ac_cv_c_inline" != no ; then
10395
+ AC_DEFINE(CC_HAS_INLINE_FUNCS)
10396
+ NCURSES_INLINE=inline
10397
+fi
10398
+AC_SUBST(NCURSES_INLINE)
10399
10400
if test $NCURSES_CHTYPE = auto ; then
10401
CF_TYPEOF_CHTYPE
10402
@@ -1187,7 +1206,8 @@ else
10403
# may change.
10404
10405
if test "$NCURSES_BOOL" != auto ; then
10406
- cf_cv_type_of_bool=$NCURSES_AUTO
10407
+ cf_cv_type_of_bool=$NCURSES_BOOL
10408
+ cf_cv_header_stdbool_h=0
10409
else
10410
if test "$cf_cv_header_stdbool_h" = 1 ; then
10411
CF_BOOL_SIZE
10412
@@ -1227,6 +1247,7 @@ CF_HELP_MESSAGE(Ada95 Binding Options:)
10413
10414
dnl Check for availability of GNU Ada Translator (GNAT).
10415
dnl At the moment we support no other Ada95 compiler.
10416
+if test -f "${srcdir}/Ada95/Makefile.in" ; then
10417
if test "$cf_with_ada" != "no" ; then
10418
cf_ada_make=gnatmake
10419
AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
10420
@@ -1309,6 +1330,7 @@ end conftest;],[cf_cv_pragma_unreference
10421
10422
fi
10423
fi
10424
+fi
10425
10426
### Construct the library-subsets, if any, from this set of keywords:
10427
### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
10428
@@ -1453,7 +1475,6 @@ CF_LIB_RULES
10429
### configuration-run into config.status
10430
10431
AWK="$AWK"
10432
-CF_LIST_MODELS="$cf_list_models"
10433
DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
10434
DFT_LWR_MODEL="$DFT_LWR_MODEL"
10435
LDCONFIG="$LDCONFIG"
10436
@@ -1471,6 +1492,7 @@ TINFO_NAME="$TINFO_NAME"
10437
WITH_CURSES_H="$with_curses_h"
10438
WITH_ECHO="$with_echo"
10439
WITH_OVERWRITE="$with_overwrite"
10440
+cf_LIST_MODELS="$cf_list_models"
10441
cf_cv_abi_version="$cf_cv_abi_version"
10442
cf_cv_do_symlinks="$cf_cv_do_symlinks"
10443
cf_cv_enable_lp64="$cf_cv_enable_lp64"
10444
Index: ncurses-5.5/dist.mk
10445
===================================================================
10446
--- ncurses-5.5.orig/dist.mk 2005-10-09 10:41:57.000000000 -0400
10447
+++ ncurses-5.5/dist.mk 2006-04-29 10:41:13.000000000 -0400
10448
@@ -1,4 +1,31 @@
10449
-# $Id: dist.mk,v 1.498 2005/10/09 14:41:57 tom Exp $
10450
+##############################################################################
10451
+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
10452
+# #
10453
+# Permission is hereby granted, free of charge, to any person obtaining a #
10454
+# copy of this software and associated documentation files (the "Software"), #
10455
+# to deal in the Software without restriction, including without limitation #
10456
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
10457
+# with modifications, sublicense, and/or sell copies of the Software, and to #
10458
+# permit persons to whom the Software is furnished to do so, subject to the #
10459
+# following conditions: #
10460
+# #
10461
+# The above copyright notice and this permission notice shall be included in #
10462
+# all copies or substantial portions of the Software. #
10463
+# #
10464
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
10465
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
10466
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
10467
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
10468
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
10469
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
10470
+# DEALINGS IN THE SOFTWARE. #
10471
+# #
10472
+# Except as contained in this notice, the name(s) of the above copyright #
10473
+# holders shall not be used in advertising or otherwise to promote the sale, #
10474
+# use or other dealings in this Software without prior written #
10475
+# authorization. #
10476
+##############################################################################
10477
+# $Id: dist.mk,v 1.528 2006/04/22 21:46:17 tom Exp $
10478
# Makefile for creating ncurses distributions.
10479
#
10480
# This only needs to be used directly as a makefile by developers, but
10481
@@ -10,7 +37,7 @@ SHELL = /bin/sh
10482
# These define the major/minor/patch versions of ncurses.
10483
NCURSES_MAJOR = 5
10484
NCURSES_MINOR = 5
10485
-NCURSES_PATCH = 20051010
10486
+NCURSES_PATCH = 20060422
10487
10488
# We don't append the patch to the version, since this only applies to releases
10489
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
10490
Index: ncurses-5.5/doc/hackguide.doc
10491
===================================================================
10492
--- ncurses-5.5.orig/doc/hackguide.doc 2005-08-27 17:15:09.000000000 -0400
10493
+++ ncurses-5.5/doc/hackguide.doc 2006-04-18 15:47:21.000000000 -0400
10494
@@ -228,10 +228,6 @@ How to Design Extensions
10495
comments of hardscroll.c and hashmap.c; then try it out. You can also
10496
test the hardware-scrolling optimization separately with hardscroll.
10497
10498
- There's one other interactive tester, tctest, that exercises
10499
- translation between termcap and terminfo formats. If you have a
10500
- serious need to run this, you probably belong on our development team!
10501
-
10502
A Tour of the Ncurses Library
10503
10504
Library Overview
10505
@@ -401,7 +397,7 @@ The Engine Room
10506
transformations of curscr lines to newscr lines. Its main tool is the
10507
routine mvcur() in lib_mvcur.c. This routine does cursor-movement
10508
optimization, attempting to get from given screen location A to given
10509
- location B in the fewest output characters posible.
10510
+ location B in the fewest output characters possible.
10511
10512
If you want to work on screen optimizations, you should use the fact
10513
that (in the trace-enabled version of the library) enabling the
10514
Index: ncurses-5.5/doc/html/hackguide.html
10515
===================================================================
10516
--- ncurses-5.5.orig/doc/html/hackguide.html 2003-10-04 18:34:02.000000000 -0400
10517
+++ ncurses-5.5/doc/html/hackguide.html 2006-04-18 15:47:21.000000000 -0400
10518
@@ -1,6 +1,33 @@
10519
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
10520
<!--
10521
- $Id: hackguide.html,v 1.26 2003/10/04 22:34:02 tom Exp $
10522
+ $Id: hackguide.html,v 1.27 2005/12/24 15:37:13 tom Exp $
10523
+ ****************************************************************************
10524
+ * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
10525
+ * *
10526
+ * Permission is hereby granted, free of charge, to any person obtaining a *
10527
+ * copy of this software and associated documentation files (the *
10528
+ * "Software"), to deal in the Software without restriction, including *
10529
+ * without limitation the rights to use, copy, modify, merge, publish, *
10530
+ * distribute, distribute with modifications, sublicense, and/or sell *
10531
+ * copies of the Software, and to permit persons to whom the Software is *
10532
+ * furnished to do so, subject to the following conditions: *
10533
+ * *
10534
+ * The above copyright notice and this permission notice shall be included *
10535
+ * in all copies or substantial portions of the Software. *
10536
+ * *
10537
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
10538
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
10539
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
10540
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
10541
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
10542
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
10543
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
10544
+ * *
10545
+ * Except as contained in this notice, the name(s) of the above copyright *
10546
+ * holders shall not be used in advertising or otherwise to promote the *
10547
+ * sale, use or other dealings in this Software without prior written *
10548
+ * authorization. *
10549
+ ****************************************************************************
10550
-->
10551
<HTML>
10552
<HEAD>
10553
@@ -287,10 +314,6 @@ header comments of <CODE>hardscroll.c</C
10554
it out. You can also test the hardware-scrolling optimization separately
10555
with <CODE>hardscroll</CODE>. <P>
10556
10557
-There's one other interactive tester, <CODE>tctest</CODE>, that exercises
10558
-translation between termcap and terminfo formats. If you have a serious
10559
-need to run this, you probably belong on our development team!
10560
-
10561
<H1><A NAME="ncurslib">A Tour of the Ncurses Library</A></H1>
10562
10563
<H2><A NAME="loverview">Library Overview</A></H2>
10564
@@ -378,7 +401,7 @@ trace_buf.c
10565
</code>
10566
</blockquote>
10567
It is rather unlikely you will ever need to change these, unless
10568
-you want to introduce a new debug trace level for some reasoon.<P>
10569
+you want to introduce a new debug trace level for some reason.<P>
10570
10571
There is another group of files that do direct I/O via <EM>tputs()</EM>,
10572
computations on the terminal capabilities, or queries to the OS
10573
@@ -559,7 +582,7 @@ Then <CODE>lib_doupdate.c</CODE> goes to
10574
transformations of <CODE>curscr</CODE> lines to <CODE>newscr</CODE> lines. Its main
10575
tool is the routine <CODE>mvcur()</CODE> in <CODE>lib_mvcur.c</CODE>. This routine
10576
does cursor-movement optimization, attempting to get from given screen
10577
-location A to given location B in the fewest output characters posible. <P>
10578
+location A to given location B in the fewest output characters possible. <P>
10579
10580
If you want to work on screen optimizations, you should use the fact
10581
that (in the trace-enabled version of the library) enabling the
10582
Index: ncurses-5.5/doc/html/ncurses-intro.html
10583
===================================================================
10584
--- ncurses-5.5.orig/doc/html/ncurses-intro.html 2004-06-05 15:10:10.000000000 -0400
10585
+++ ncurses-5.5/doc/html/ncurses-intro.html 2006-04-18 15:47:21.000000000 -0400
10586
@@ -1,6 +1,33 @@
10587
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
10588
<!--
10589
- $Id: ncurses-intro.html,v 1.40 2004/06/05 19:10:10 tom Exp $
10590
+ $Id: ncurses-intro.html,v 1.41 2005/12/24 15:47:05 tom Exp $
10591
+ ****************************************************************************
10592
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
10593
+ * *
10594
+ * Permission is hereby granted, free of charge, to any person obtaining a *
10595
+ * copy of this software and associated documentation files (the *
10596
+ * "Software"), to deal in the Software without restriction, including *
10597
+ * without limitation the rights to use, copy, modify, merge, publish, *
10598
+ * distribute, distribute with modifications, sublicense, and/or sell *
10599
+ * copies of the Software, and to permit persons to whom the Software is *
10600
+ * furnished to do so, subject to the following conditions: *
10601
+ * *
10602
+ * The above copyright notice and this permission notice shall be included *
10603
+ * in all copies or substantial portions of the Software. *
10604
+ * *
10605
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
10606
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
10607
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
10608
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
10609
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
10610
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
10611
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
10612
+ * *
10613
+ * Except as contained in this notice, the name(s) of the above copyright *
10614
+ * holders shall not be used in advertising or otherwise to promote the *
10615
+ * sale, use or other dealings in this Software without prior written *
10616
+ * authorization. *
10617
+ ****************************************************************************
10618
-->
10619
<HTML>
10620
<HEAD>
10621
@@ -979,7 +1006,7 @@ on and refresh them, the changes made to
10622
10623
To understand why this is a problem, remember that screen updates are
10624
calculated between two representations of the <EM>entire</EM> display. The
10625
-documentation says that when you refresh a window, it is first copied to to the
10626
+documentation says that when you refresh a window, it is first copied to the
10627
virtual screen, and then changes are calculated to update the physical screen
10628
(and applied to the terminal). But "copied to" is not very specific, and
10629
subtle differences in how copying works can produce different behaviors in the
10630
Index: ncurses-5.5/doc/ncurses-intro.doc
10631
===================================================================
10632
--- ncurses-5.5.orig/doc/ncurses-intro.doc 2005-08-27 17:15:09.000000000 -0400
10633
+++ ncurses-5.5/doc/ncurses-intro.doc 2006-04-18 15:47:22.000000000 -0400
10634
@@ -889,7 +889,7 @@ Compatibility with Older Versions
10635
To understand why this is a problem, remember that screen updates are
10636
calculated between two representations of the entire display. The
10637
documentation says that when you refresh a window, it is first copied
10638
- to to the virtual screen, and then changes are calculated to update
10639
+ to the virtual screen, and then changes are calculated to update
10640
the physical screen (and applied to the terminal). But "copied to" is
10641
not very specific, and subtle differences in how copying works can
10642
produce different behaviors in the case where two overlapping windows
10643
Index: ncurses-5.5/form/frm_data.c
10644
===================================================================
10645
--- ncurses-5.5.orig/form/frm_data.c 2004-12-11 17:29:28.000000000 -0500
10646
+++ ncurses-5.5/form/frm_data.c 2006-04-18 15:47:22.000000000 -0400
10647
@@ -1,5 +1,5 @@
10648
/****************************************************************************
10649
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
10650
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
10651
* *
10652
* Permission is hereby granted, free of charge, to any person obtaining a *
10653
* copy of this software and associated documentation files (the *
10654
@@ -32,7 +32,7 @@
10655
10656
#include "form.priv.h"
10657
10658
-MODULE_ID("$Id: frm_data.c,v 1.13 2004/12/11 22:29:28 tom Exp $")
10659
+MODULE_ID("$Id: frm_data.c,v 1.14 2005/11/26 15:34:01 tom Exp $")
10660
10661
/*---------------------------------------------------------------------------
10662
| Facility : libnform
10663
@@ -80,7 +80,7 @@ data_behind(const FORM *form)
10664
|
10665
| Return Values : true if only padding cells are found
10666
+--------------------------------------------------------------------------*/
10667
-INLINE static bool
10668
+NCURSES_INLINE static bool
10669
Only_Padding(WINDOW *w, int len, int pad)
10670
{
10671
bool result = TRUE;
10672
Index: ncurses-5.5/form/frm_def.c
10673
===================================================================
10674
--- ncurses-5.5.orig/form/frm_def.c 2004-12-25 17:26:01.000000000 -0500
10675
+++ ncurses-5.5/form/frm_def.c 2006-04-18 15:47:22.000000000 -0400
10676
@@ -1,5 +1,5 @@
10677
/****************************************************************************
10678
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
10679
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
10680
* *
10681
* Permission is hereby granted, free of charge, to any person obtaining a *
10682
* copy of this software and associated documentation files (the *
10683
@@ -32,7 +32,7 @@
10684
10685
#include "form.priv.h"
10686
10687
-MODULE_ID("$Id: frm_def.c,v 1.17 2004/12/25 22:26:01 tom Exp $")
10688
+MODULE_ID("$Id: frm_def.c,v 1.18 2005/11/26 15:33:52 tom Exp $")
10689
10690
/* this can't be readonly */
10691
static FORM default_form =
10692
@@ -249,7 +249,7 @@ Connect_Fields(FORM *form, FIELD **field
10693
| Return Values : E_OK - success
10694
| any other - error occurred
10695
+--------------------------------------------------------------------------*/
10696
-INLINE static int
10697
+NCURSES_INLINE static int
10698
Associate_Fields(FORM *form, FIELD **fields)
10699
{
10700
int res = Connect_Fields(form, fields);
10701
Index: ncurses-5.5/form/frm_driver.c
10702
===================================================================
10703
--- ncurses-5.5.orig/form/frm_driver.c 2005-10-01 15:42:40.000000000 -0400
10704
+++ ncurses-5.5/form/frm_driver.c 2006-04-18 15:47:22.000000000 -0400
10705
@@ -1,5 +1,5 @@
10706
/****************************************************************************
10707
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
10708
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
10709
* *
10710
* Permission is hereby granted, free of charge, to any person obtaining a *
10711
* copy of this software and associated documentation files (the *
10712
@@ -32,7 +32,7 @@
10713
10714
#include "form.priv.h"
10715
10716
-MODULE_ID("$Id: frm_driver.c,v 1.71 2005/10/01 19:42:40 tom Exp $")
10717
+MODULE_ID("$Id: frm_driver.c,v 1.73 2006/01/28 23:09:30 tom Exp $")
10718
10719
/*----------------------------------------------------------------------------
10720
This is the core module of the form library. It contains the majority
10721
@@ -346,7 +346,7 @@ delete_char(FORM *form)
10722
|
10723
| Return Values : Pointer to first non-blank position in buffer
10724
+--------------------------------------------------------------------------*/
10725
-INLINE static FIELD_CELL *
10726
+NCURSES_INLINE static FIELD_CELL *
10727
Get_Start_Of_Data(FIELD_CELL *buf, int blen)
10728
{
10729
FIELD_CELL *p = buf;
10730
@@ -368,7 +368,7 @@ Get_Start_Of_Data(FIELD_CELL *buf, int b
10731
| Return Values : Pointer to position after last non-blank position in
10732
| buffer.
10733
+--------------------------------------------------------------------------*/
10734
-INLINE static FIELD_CELL *
10735
+NCURSES_INLINE static FIELD_CELL *
10736
After_End_Of_Data(FIELD_CELL *buf, int blen)
10737
{
10738
FIELD_CELL *p = &buf[blen];
10739
@@ -388,7 +388,7 @@ After_End_Of_Data(FIELD_CELL *buf, int b
10740
|
10741
| Return Values : Pointer to first whitespace character in buffer.
10742
+--------------------------------------------------------------------------*/
10743
-INLINE static FIELD_CELL *
10744
+NCURSES_INLINE static FIELD_CELL *
10745
Get_First_Whitespace_Character(FIELD_CELL *buf, int blen)
10746
{
10747
FIELD_CELL *p = buf;
10748
@@ -410,7 +410,7 @@ Get_First_Whitespace_Character(FIELD_CEL
10749
| Return Values : Pointer to position after last whitespace character in
10750
| buffer.
10751
+--------------------------------------------------------------------------*/
10752
-INLINE static FIELD_CELL *
10753
+NCURSES_INLINE static FIELD_CELL *
10754
After_Last_Whitespace_Character(FIELD_CELL *buf, int blen)
10755
{
10756
FIELD_CELL *p = &buf[blen];
10757
@@ -439,7 +439,7 @@ After_Last_Whitespace_Character(FIELD_CE
10758
|
10759
| Return Values : -
10760
+--------------------------------------------------------------------------*/
10761
-INLINE static void
10762
+NCURSES_INLINE static void
10763
Adjust_Cursor_Position(FORM *form, const FIELD_CELL *pos)
10764
{
10765
FIELD *field;
10766
@@ -543,7 +543,7 @@ Window_To_Buffer(WINDOW *win, FIELD *fie
10767
#if USE_WIDEC_SUPPORT
10768
&& p->chars[1] == 0
10769
#endif
10770
- && AttrOf(*p) == ChAttrOf(pad))
10771
+ )
10772
*p = myBLANK;
10773
}
10774
}
10775
@@ -560,7 +560,7 @@ Window_To_Buffer(WINDOW *win, FIELD *fie
10776
|
10777
| Return Values : -
10778
+--------------------------------------------------------------------------*/
10779
-INLINE static void
10780
+NCURSES_INLINE static void
10781
Synchronize_Buffer(FORM *form)
10782
{
10783
if (form->status & _WINDOW_MODIFIED)
10784
@@ -2206,7 +2206,7 @@ HSC_Horizontal_Half_Line_Backward(FORM *
10785
| Return Values : TRUE - there is enough space
10786
| FALSE - there is not enough space
10787
+--------------------------------------------------------------------------*/
10788
-INLINE static bool
10789
+NCURSES_INLINE static bool
10790
Is_There_Room_For_A_Line(FORM *form)
10791
{
10792
FIELD *field = form->current;
10793
@@ -2228,7 +2228,7 @@ Is_There_Room_For_A_Line(FORM *form)
10794
| Return Values : TRUE - there is room
10795
| FALSE - there is not enough room (line full)
10796
+--------------------------------------------------------------------------*/
10797
-INLINE static bool
10798
+NCURSES_INLINE static bool
10799
Is_There_Room_For_A_Char_In_Line(FORM *form)
10800
{
10801
int last_char_in_line;
10802
@@ -2690,7 +2690,7 @@ FE_Delete_Previous(FORM *form)
10803
* automatically (given the proper options). But we cannot eat the
10804
* keystroke to back over the wrapping point, since that would put the
10805
* cursor past the end of the form field. In this case, just delete the
10806
- * character at the end of the field.
10807
+ * character at the end of the field.
10808
*/
10809
if (form->currow == this_row && this_row > 0)
10810
{
10811
@@ -3110,7 +3110,7 @@ FV_Validation(FORM *form)
10812
|
10813
| Return Values : Pointer to the next field.
10814
+--------------------------------------------------------------------------*/
10815
-INLINE static FIELD *
10816
+NCURSES_INLINE static FIELD *
10817
Next_Field_On_Page(FIELD *field)
10818
{
10819
FORM *form = field->form;
10820
@@ -3192,7 +3192,7 @@ _nc_First_Active_Field(FORM *form)
10821
|
10822
| Return Values : Pointer to the previous field.
10823
+--------------------------------------------------------------------------*/
10824
-INLINE static FIELD *
10825
+NCURSES_INLINE static FIELD *
10826
Previous_Field_On_Page(FIELD *field)
10827
{
10828
FORM *form = field->form;
10829
@@ -3222,7 +3222,7 @@ Previous_Field_On_Page(FIELD *field)
10830
|
10831
| Return Values : Pointer to the next field.
10832
+--------------------------------------------------------------------------*/
10833
-INLINE static FIELD *
10834
+NCURSES_INLINE static FIELD *
10835
Sorted_Next_Field(FIELD *field)
10836
{
10837
FIELD *field_on_page = field;
10838
@@ -3248,7 +3248,7 @@ Sorted_Next_Field(FIELD *field)
10839
|
10840
| Return Values : Pointer to the previous field.
10841
+--------------------------------------------------------------------------*/
10842
-INLINE static FIELD *
10843
+NCURSES_INLINE static FIELD *
10844
Sorted_Previous_Field(FIELD *field)
10845
{
10846
FIELD *field_on_page = field;
10847
@@ -3273,7 +3273,7 @@ Sorted_Previous_Field(FIELD *field)
10848
|
10849
| Return Values : Pointer to left neighbor field.
10850
+--------------------------------------------------------------------------*/
10851
-INLINE static FIELD *
10852
+NCURSES_INLINE static FIELD *
10853
Left_Neighbor_Field(FIELD *field)
10854
{
10855
FIELD *field_on_page = field;
10856
@@ -3301,7 +3301,7 @@ Left_Neighbor_Field(FIELD *field)
10857
|
10858
| Return Values : Pointer to right neighbor field.
10859
+--------------------------------------------------------------------------*/
10860
-INLINE static FIELD *
10861
+NCURSES_INLINE static FIELD *
10862
Right_Neighbor_Field(FIELD *field)
10863
{
10864
FIELD *field_on_page = field;
10865
@@ -3734,7 +3734,7 @@ _nc_Set_Form_Page(FORM *form, int page,
10866
|
10867
| Return Values : The next page number
10868
+--------------------------------------------------------------------------*/
10869
-INLINE static int
10870
+NCURSES_INLINE static int
10871
Next_Page_Number(const FORM *form)
10872
{
10873
return (form->curpage + 1) % form->maxpage;
10874
@@ -3750,7 +3750,7 @@ Next_Page_Number(const FORM *form)
10875
|
10876
| Return Values : The previous page number
10877
+--------------------------------------------------------------------------*/
10878
-INLINE static int
10879
+NCURSES_INLINE static int
10880
Previous_Page_Number(const FORM *form)
10881
{
10882
return (form->curpage != 0 ? form->curpage - 1 : form->maxpage - 1);
10883
Index: ncurses-5.5/include/curses.h.in
10884
===================================================================
10885
--- ncurses-5.5.orig/include/curses.h.in 2005-07-02 12:58:28.000000000 -0400
10886
+++ ncurses-5.5/include/curses.h.in 2006-04-18 15:47:22.000000000 -0400
10887
@@ -1,5 +1,5 @@
10888
/****************************************************************************
10889
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
10890
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
10891
* *
10892
* Permission is hereby granted, free of charge, to any person obtaining a *
10893
* copy of this software and associated documentation files (the *
10894
@@ -32,7 +32,7 @@
10895
* and: Thomas E. Dickey 1996-on *
10896
****************************************************************************/
10897
10898
-/* $Id: curses.h.in,v 1.157 2005/07/02 16:58:28 tom Exp $ */
10899
+/* $Id: curses.h.in,v 1.162 2006/01/07 22:13:59 tom Exp $ */
10900
10901
#ifndef __NCURSES_H
10902
#define __NCURSES_H
10903
@@ -91,6 +91,10 @@
10904
#undef NCURSES_CONST
10905
#define NCURSES_CONST @NCURSES_CONST@
10906
10907
+#ifndef NCURSES_INLINE
10908
+#define NCURSES_INLINE @NCURSES_INLINE@
10909
+#endif
10910
+
10911
/*
10912
* The internal type used for color values
10913
*/
10914
@@ -429,7 +433,9 @@ extern NCURSES_EXPORT(int) resize_term (
10915
extern NCURSES_EXPORT(int) resizeterm (int, int);
10916
extern NCURSES_EXPORT(int) use_default_colors (void);
10917
extern NCURSES_EXPORT(int) use_extended_names (bool);
10918
+extern NCURSES_EXPORT(int) use_legacy_coding (int);
10919
extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
10920
+extern NCURSES_EXPORT(void) nofilter(void);
10921
#else
10922
#define curses_version() NCURSES_VERSION
10923
#endif
10924
@@ -888,7 +894,7 @@ extern NCURSES_EXPORT(int) wvline (WINDO
10925
#define wattron(win,at) wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
10926
#define wattroff(win,at) wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
10927
10928
-#if @NCURSES_EXT_COLORS@
10929
+#if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
10930
#define wattrset(win,at) ((win)->_color = PAIR_NUMBER(at), \
10931
(win)->_attrs = (at))
10932
#else
10933
@@ -1017,7 +1023,7 @@ extern NCURSES_EXPORT(int) wvline (WINDO
10934
#define slk_attr_off(a,v) ((v) ? ERR : slk_attroff(a))
10935
#define slk_attr_on(a,v) ((v) ? ERR : slk_attron(a))
10936
10937
-#if @NCURSES_EXT_COLORS@
10938
+#if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
10939
#define wattr_set(win,a,p,opts) ((win)->_attrs = ((a) & ~A_COLOR), \
10940
(win)->_color = (p), \
10941
OK)
10942
Index: ncurses-5.5/include/curses.tail
10943
===================================================================
10944
--- ncurses-5.5.orig/include/curses.tail 2005-03-26 19:09:51.000000000 -0500
10945
+++ ncurses-5.5/include/curses.tail 2006-04-18 15:47:22.000000000 -0400
10946
@@ -1,4 +1,8 @@
10947
-/* $Id: curses.tail,v 1.12 2005/03/27 00:09:51 tom Exp $ */
10948
+/*
10949
+ * This file is part of ncurses, designed to be appended after curses.h.in
10950
+ * (see that file for the relevant copyright).
10951
+ */
10952
+/* $Id: curses.tail,v 1.13 2005/11/26 15:58:54 tom Exp $ */
10953
10954
/* mouse interface */
10955
10956
@@ -148,10 +152,6 @@ extern NCURSES_EXPORT(void) trace (const
10957
10958
#if defined(TRACE) || defined(NCURSES_TEST)
10959
extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable; /* enable optimizations */
10960
-#ifdef _XOPEN_SOURCE_EXTENDED
10961
-extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
10962
-extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
10963
-#endif
10964
extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
10965
#define OPTIMIZE_MVCUR 0x01 /* cursor movement optimization */
10966
#define OPTIMIZE_HASHMAP 0x02 /* diff hashing to detect scrolls */
10967
Index: ncurses-5.5/include/curses.wide
10968
===================================================================
10969
--- ncurses-5.5.orig/include/curses.wide 2005-01-28 16:11:53.000000000 -0500
10970
+++ ncurses-5.5/include/curses.wide 2006-04-18 15:47:22.000000000 -0400
10971
@@ -1,7 +1,10 @@
10972
-
10973
+/*
10974
+ * This file is part of ncurses, designed to be appended after curses.h.in
10975
+ * (see that file for the relevant copyright).
10976
+ */
10977
#ifdef _XOPEN_SOURCE_EXTENDED
10978
10979
-/* $Id: curses.wide,v 1.29 2005/01/28 21:11:53 tom Exp $ */
10980
+/* $Id: curses.wide,v 1.30 2005/11/26 15:58:51 tom Exp $ */
10981
10982
extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
10983
10984
@@ -234,4 +237,9 @@ extern NCURSES_EXPORT(int) wvline_set (W
10985
#define mvwinwstr(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : winwstr(win,c))
10986
#define mvwvline_set(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n))
10987
10988
+#if defined(TRACE) || defined(NCURSES_TEST)
10989
+extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
10990
+extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
10991
+#endif
10992
+
10993
#endif /* _XOPEN_SOURCE_EXTENDED */
10994
Index: ncurses-5.5/include/ncurses_defs
10995
===================================================================
10996
--- ncurses-5.5.orig/include/ncurses_defs 2005-01-28 16:11:53.000000000 -0500
10997
+++ ncurses-5.5/include/ncurses_defs 2006-04-18 15:47:22.000000000 -0400
10998
@@ -1,4 +1,4 @@
10999
-# $Id: ncurses_defs,v 1.27 2005/01/28 21:11:53 tom Exp $
11000
+# $Id: ncurses_defs,v 1.28 2005/12/31 21:14:27 tom Exp $
11001
##############################################################################
11002
# Copyright (c) 2000-2004,2005 Free Software Foundation, Inc. #
11003
# #
11004
@@ -51,14 +51,19 @@ HAVE_BUILTIN_H
11005
HAVE_DIRENT_H
11006
HAVE_ERRNO
11007
HAVE_FCNTL_H
11008
+HAVE_FILTER 1
11009
HAVE_FORM_H
11010
+HAVE_GETBEGX 1
11011
+HAVE_GETCURX 1
11012
HAVE_GETCWD
11013
HAVE_GETEGID
11014
HAVE_GETEUID
11015
+HAVE_GETMAXX 1
11016
HAVE_GETNSTR
11017
HAVE_GETOPT_H
11018
HAVE_GETTIMEOFDAY
11019
HAVE_GETTTYNAM
11020
+HAVE_GETWIN 1
11021
HAVE_GPM_H
11022
HAVE_GPP_BUILTIN_H
11023
HAVE_GXX_BUILTIN_H
11024
@@ -84,6 +89,8 @@ HAVE_MBRTOWC
11025
HAVE_MBTOWC
11026
HAVE_MENU_H
11027
HAVE_MKSTEMP
11028
+HAVE_MVVLINE 1
11029
+HAVE_MVWVLINE 1
11030
HAVE_NANOSLEEP
11031
HAVE_NC_ALLOC_H
11032
HAVE_PANEL_H
11033
@@ -91,19 +98,24 @@ HAVE_POLL
11034
HAVE_POLL_H
11035
HAVE_PURIFY
11036
HAVE_PUTWC
11037
+HAVE_PUTWIN 1
11038
HAVE_REGEXPR_H_FUNCS
11039
HAVE_REGEXP_H_FUNCS
11040
HAVE_REGEX_H_FUNCS
11041
HAVE_REMOVE
11042
HAVE_RESIZETERM
11043
+HAVE_RESIZE_TERM
11044
+HAVE_RIPOFFLINE 1
11045
HAVE_SELECT
11046
HAVE_SETBUF
11047
HAVE_SETBUFFER
11048
+HAVE_SETUPTERM 1
11049
HAVE_SETVBUF
11050
HAVE_SIGACTION
11051
HAVE_SIGVEC
11052
HAVE_SIZECHANGE
11053
HAVE_SLK_COLOR
11054
+HAVE_SLK_INIT 1
11055
HAVE_STRDUP
11056
HAVE_STRSTR
11057
HAVE_SYMLINK
11058
@@ -119,10 +131,17 @@ HAVE_SYS_TIME_SELECT
11059
HAVE_TCGETATTR
11060
HAVE_TCGETPGRP
11061
HAVE_TELL
11062
+HAVE_TERMATTRS 1
11063
HAVE_TERMIOS_H
11064
HAVE_TERMIO_H
11065
+HAVE_TERMNAME 1
11066
+HAVE_TERM_H 1
11067
+HAVE_TGETENT 1
11068
+HAVE_TIGETNUM 1
11069
+HAVE_TIGETSTR 1
11070
HAVE_TIMES
11071
HAVE_TTYENT_H
11072
+HAVE_TYPEAHEAD 1
11073
HAVE_TYPEINFO
11074
HAVE_TYPE_ATTR_T
11075
HAVE_TYPE_SIGACTION
11076
@@ -135,6 +154,7 @@ HAVE_VSSCANF
11077
HAVE_WCTOB
11078
HAVE_WCTOMB
11079
HAVE_WCTYPE_H
11080
+HAVE_WINSSTR 1
11081
HAVE_WORKING_POLL
11082
HAVE_WRESIZE
11083
HAVE__DOSCAN
11084
Index: ncurses-5.5/include/tic.h
11085
===================================================================
11086
--- ncurses-5.5.orig/include/tic.h 2005-08-20 15:41:40.000000000 -0400
11087
+++ ncurses-5.5/include/tic.h 2006-04-18 15:47:22.000000000 -0400
11088
@@ -1,5 +1,5 @@
11089
/****************************************************************************
11090
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
11091
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
11092
* *
11093
* Permission is hereby granted, free of charge, to any person obtaining a *
11094
* copy of this software and associated documentation files (the *
11095
@@ -33,7 +33,7 @@
11096
****************************************************************************/
11097
11098
/*
11099
- * $Id: tic.h,v 1.50 2005/08/20 19:41:40 tom Exp $
11100
+ * $Id: tic.h,v 1.51 2006/01/14 22:25:41 tom Exp $
11101
* tic.h - Global variables and structures for the terminfo
11102
* compiler.
11103
*/
11104
@@ -286,6 +286,9 @@ extern NCURSES_EXPORT(int) _nc_trans_str
11105
extern NCURSES_EXPORT(char *) _nc_captoinfo (const char *, const char *, int const);
11106
extern NCURSES_EXPORT(char *) _nc_infotocap (const char *, const char *, int const);
11107
11108
+/* home_terminfo.c */
11109
+extern NCURSES_EXPORT(char *) _nc_home_terminfo (void);
11110
+
11111
/* lib_tparm.c */
11112
#define NUM_PARM 9
11113
11114
@@ -300,7 +303,20 @@ extern NCURSES_EXPORT_VAR(int) _nc_nulls
11115
extern const char * _nc_progname;
11116
11117
/* read_entry.c */
11118
+typedef enum {
11119
+ dbdTIC = 0,
11120
+ dbdEnvOnce,
11121
+ dbdHome,
11122
+ dbdEnvList,
11123
+ dbdCfgList,
11124
+ dbdCfgOnce,
11125
+ dbdLAST
11126
+} DBDIRS;
11127
+
11128
+extern NCURSES_EXPORT(const char *) _nc_next_db(DBDIRS *, int *);
11129
extern NCURSES_EXPORT(const char *) _nc_tic_dir (const char *);
11130
+extern NCURSES_EXPORT(void) _nc_first_db(DBDIRS *, int *);
11131
+extern NCURSES_EXPORT(void) _nc_last_db(void);
11132
11133
/* write_entry.c */
11134
extern NCURSES_EXPORT(int) _nc_tic_written (void);
11135
Index: ncurses-5.5/man/curs_addch.3x
11136
===================================================================
11137
--- ncurses-5.5.orig/man/curs_addch.3x 2004-01-31 08:16:21.000000000 -0500
11138
+++ ncurses-5.5/man/curs_addch.3x 2006-04-18 15:47:22.000000000 -0400
11139
@@ -1,6 +1,6 @@
11140
'\" t
11141
.\"***************************************************************************
11142
-.\" Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
11143
+.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
11144
.\" *
11145
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11146
.\" copy of this software and associated documentation files (the *
11147
@@ -27,7 +27,7 @@
11148
.\" authorization. *
11149
.\"***************************************************************************
11150
.\"
11151
-.\" $Id: curs_addch.3x,v 1.23 2004/01/31 13:16:21 tom Exp $
11152
+.\" $Id: curs_addch.3x,v 1.24 2006/01/01 01:02:05 tom Exp $
11153
.TH curs_addch 3X ""
11154
.SH NAME
11155
\fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR,
11156
@@ -88,8 +88,8 @@ their equivalents.
11157
The following variables may be used to add line drawing characters to the
11158
screen with routines of the \fBaddch\fR family. The default character listed
11159
below is used if the \fBacsc\fR capability doesn't define a terminal-specific
11160
-replacement for it (but see the EXTENSIONS section below). The names are
11161
-taken from VT100 nomenclature.
11162
+replacement for it.
11163
+The names are taken from VT100 nomenclature.
11164
.PP
11165
.TS
11166
l l l
11167
Index: ncurses-5.5/man/curs_addchstr.3x
11168
===================================================================
11169
--- ncurses-5.5.orig/man/curs_addchstr.3x 2005-05-15 12:17:07.000000000 -0400
11170
+++ ncurses-5.5/man/curs_addchstr.3x 2006-04-18 15:47:22.000000000 -0400
11171
@@ -26,7 +26,7 @@
11172
.\" authorization. *
11173
.\"***************************************************************************
11174
.\"
11175
-.\" $Id: curs_addchstr.3x,v 1.10 2005/05/15 16:17:07 tom Exp $
11176
+.\" $Id: curs_addchstr.3x,v 1.11 2005/12/24 13:19:59 tom Exp $
11177
.TH curs_addchstr 3X ""
11178
.na
11179
.hy 0
11180
@@ -71,7 +71,7 @@ The window cursor is \fInot\fR advanced,
11181
(such as for the newline, backspace, or carriage return characters), they do not
11182
advance the current cursor position, they do not expand other control characters
11183
to ^-escapes, and they truncate the string if it crosses the right margin,
11184
-rather then wrapping it around to the new line.
11185
+rather than wrapping it around to the new line.
11186
.SH RETURN VALUES
11187
All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success
11188
(the SVr4 manuals specify only "an integer value other than \fBERR\fR") upon
11189
Index: ncurses-5.5/man/curs_color.3x
11190
===================================================================
11191
--- ncurses-5.5.orig/man/curs_color.3x 2005-05-15 12:55:36.000000000 -0400
11192
+++ ncurses-5.5/man/curs_color.3x 2006-04-18 15:47:22.000000000 -0400
11193
@@ -26,7 +26,7 @@
11194
.\" authorization. *
11195
.\"***************************************************************************
11196
.\"
11197
-.\" $Id: curs_color.3x,v 1.27 2005/05/15 16:55:36 tom Exp $
11198
+.\" $Id: curs_color.3x,v 1.28 2005/12/18 00:00:37 tom Exp $
11199
.TH curs_color 3X ""
11200
.na
11201
.hy 0
11202
@@ -68,7 +68,7 @@ color (for the blank field on which the
11203
programmer initializes a color-pair with the routine \fBinit_pair\fR. After it
11204
has been initialized, \fBCOLOR_PAIR\fR(\fIn\fR), a macro defined in
11205
\fB<curses.h>\fR, can be used as a new video attribute.
11206
-.SP
11207
+.PP
11208
If a terminal is capable of redefining colors, the programmer can use the
11209
routine \fBinit_color\fR to change the definition of a color. The routines
11210
\fBhas_colors\fR and \fBcan_change_color\fR return \fBTRUE\fR or \fBFALSE\fR,
11211
@@ -88,7 +88,7 @@ and white), and two global variables, \f
11212
and color-pairs the terminal can support). It also restores the
11213
colors on the terminal to the values they had when the terminal was
11214
just turned on.
11215
-.SP
11216
+.PP
11217
The \fBinit_pair\fR routine changes the definition of a color-pair. It takes
11218
three arguments: the number of the color-pair to be changed, the foreground
11219
color number, and the background color number.
11220
@@ -108,12 +108,12 @@ It cannot be modified by the application
11221
If the color-pair was previously
11222
initialized, the screen is refreshed and all occurrences of that color-pair
11223
are changed to the new definition.
11224
-.SP
11225
+.PP
11226
As an extension, ncurses allows you to set color pair 0 via
11227
the \fBassume_default_colors\fR routine, or to specify the use of
11228
default colors (color number \fB-1\fR) if you first invoke the
11229
\fBuse_default_colors\fR routine.
11230
-.SP
11231
+.PP
11232
The \fBinit_color\fR routine changes the definition of a color. It takes four
11233
arguments: the number of the color to be changed followed by three RGB values
11234
(for the amounts of red, green, and blue components). The value of the first
11235
@@ -122,18 +122,18 @@ argument must be between \fB0\fR and \fB
11236
must be a value between 0 and 1000. When \fBinit_color\fR is used, all
11237
occurrences of that color on the screen immediately change to the new
11238
definition.
11239
-.SP
11240
+.PP
11241
The \fBhas_colors\fR routine requires no arguments. It returns \fBTRUE\fR if
11242
the terminal can manipulate colors; otherwise, it returns \fBFALSE\fR. This
11243
routine facilitates writing terminal-independent programs. For example, a
11244
programmer can use it to decide whether to use color or some other video
11245
attribute.
11246
-.SP
11247
+.PP
11248
The \fBcan_change_color\fR routine requires no arguments. It returns
11249
\fBTRUE\fR if the terminal supports colors and can change their definitions;
11250
other, it returns \fBFALSE\fR. This routine facilitates writing
11251
terminal-independent programs.
11252
-.SP
11253
+.PP
11254
The \fBcolor_content\fR routine gives programmers a way to find the intensity
11255
of the red, green, and blue (RGB) components in a color. It requires four
11256
arguments: the color number, and three addresses of \fBshort\fRs for storing
11257
@@ -142,7 +142,7 @@ given color. The value of the first arg
11258
\fBCOLORS\fR. The values that are stored at the addresses pointed to by the
11259
last three arguments are between 0 (no component) and 1000 (maximum amount of
11260
component).
11261
-.SP
11262
+.PP
11263
The \fBpair_content\fR routine allows programmers to find out what colors a
11264
given color-pair consists of. It requires three arguments: the color-pair
11265
number, and two addresses of \fBshort\fRs for storing the foreground and the
11266
@@ -153,7 +153,7 @@ to by the second and third arguments are
11267
In \fB<curses.h>\fR the following macros are defined. These are the default
11268
colors. \fBcurses\fR also assumes that \fBCOLOR_BLACK\fR is the default
11269
background color for all terminals.
11270
-.SP
11271
+.PP
11272
.nf
11273
\fBCOLOR_BLACK\fR
11274
\fBCOLOR_RED\fR
11275
@@ -167,7 +167,7 @@ background color for all terminals.
11276
.SH RETURN VALUE
11277
The routines \fBcan_change_color()\fR and \fBhas_colors()\fR return \fBTRUE\fR
11278
or \fBFALSE\fR.
11279
-.SP
11280
+.PP
11281
All other routines return the integer \fBERR\fR upon failure and an \fBOK\fR
11282
(SVr4 specifies only "an integer value other than \fBERR\fR") upon successful
11283
completion.
11284
@@ -199,12 +199,12 @@ color palette, color pairs table, and as
11285
for each screen; the \fBstart_color\fR function only affects the current
11286
screen. The SVr4/XSI interface is not really designed with this in mind, and
11287
historical implementations may use a single shared color palette.
11288
-.SP
11289
+.PP
11290
Note that setting an implicit background color via a color pair affects only
11291
character cells that a character write operation explicitly touches. To change
11292
the background color used when parts of a window are blanked by erasing or
11293
scrolling operations, see \fBcurs_bkgd\fR(3X).
11294
-.SP
11295
+.PP
11296
Several caveats apply on 386 and 486 machines with VGA-compatible graphics:
11297
.TP 5
11298
-
11299
Index: ncurses-5.5/man/curs_extend.3x
11300
===================================================================
11301
--- ncurses-5.5.orig/man/curs_extend.3x 2004-07-05 09:16:08.000000000 -0400
11302
+++ ncurses-5.5/man/curs_extend.3x 2006-04-18 15:48:06.000000000 -0400
11303
@@ -1,5 +1,5 @@
11304
.\"***************************************************************************
11305
-.\" Copyright (c) 1999-2003,2004 Free Software Foundation, Inc. *
11306
+.\" Copyright (c) 1999-2004,2006 Free Software Foundation, Inc. *
11307
.\" *
11308
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11309
.\" copy of this software and associated documentation files (the *
11310
@@ -26,17 +26,17 @@
11311
.\" authorization. *
11312
.\"***************************************************************************
11313
.\"
11314
-.\" Author: Thomas E. Dickey 1999
11315
+.\" Author: Thomas E. Dickey 1999-on
11316
.\"
11317
-.\" $Id: curs_extend.3x,v 1.13 2004/07/05 13:16:08 tom Exp $
11318
+.\" $Id: curs_extend.3x,v 1.15 2006/02/25 21:04:43 tom Exp $
11319
.TH curs_extend 3X ""
11320
.SH NAME
11321
\fBcurses_version\fP,
11322
\fBuse_extended_names\fP \- miscellaneous curses extensions
11323
-
11324
+.
11325
.SH SYNOPSIS
11326
\fB#include <curses.h>\fP
11327
-
11328
+.sp
11329
\fBconst char * curses_version(void);\fP
11330
.br
11331
\fBint use_extended_names(bool enable);\fP
11332
@@ -72,6 +72,7 @@ any code depending on them be conditione
11333
\fBdefine_key\fR(3X),
11334
\fBkeybound\fR(3X),
11335
\fBkeyok\fR(3X),
11336
+\fBnofilter\fR(3X),
11337
\fBresizeterm\fR(3X),
11338
\fBwresize\fR(3X).
11339
.SH AUTHOR
11340
Index: ncurses-5.5/man/curs_getstr.3x
11341
===================================================================
11342
--- ncurses-5.5.orig/man/curs_getstr.3x 2005-05-15 12:17:55.000000000 -0400
11343
+++ ncurses-5.5/man/curs_getstr.3x 2006-04-18 15:47:22.000000000 -0400
11344
@@ -26,7 +26,7 @@
11345
.\" authorization. *
11346
.\"***************************************************************************
11347
.\"
11348
-.\" $Id: curs_getstr.3x,v 1.14 2005/05/15 16:17:55 tom Exp $
11349
+.\" $Id: curs_getstr.3x,v 1.15 2006/01/12 00:30:58 tom Exp $
11350
.TH curs_getstr 3X ""
11351
.na
11352
.hy 0
11353
@@ -43,7 +43,7 @@
11354
.hy
11355
.SH SYNOPSIS
11356
\fB#include <curses.h>\fR
11357
-
11358
+.sp
11359
\fBint getstr(char *str);\fR
11360
.br
11361
\fBint getnstr(char *str, int n);\fR
11362
@@ -65,17 +65,17 @@ The function \fBgetstr\fR is equivalent
11363
until a newline or carriage return is received (the terminating character is
11364
not included in the returned string). The resulting value is placed in the
11365
area pointed to by the character pointer \fIstr\fR.
11366
-
11367
+.PP
11368
\fBwgetnstr\fR reads at most \fIn\fR characters, thus preventing a possible
11369
overflow of the input buffer. Any attempt to enter more characters (other
11370
than the terminating newline or carriage return) causes a beep. Function
11371
keys also cause a beep and are ignored. The \fBgetnstr\fR function reads
11372
from the \fIstdscr\fR default window.
11373
-
11374
+.PP
11375
The user's erase and kill characters are interpreted. If keypad
11376
mode is on for the window, \fBKEY_LEFT\fR and \fBKEY_BACKSPACE\fR
11377
are both considered equivalent to the user's kill character.
11378
-
11379
+.PP
11380
Characters input are echoed only if \fBecho\fR is currently on. In that case,
11381
backspace is echoed as deletion of the previous character (typically a left
11382
motion).
11383
@@ -90,6 +90,10 @@ In this implementation,
11384
these functions return an error
11385
if the window pointer is null, or
11386
if its timeout expires without having any data.
11387
+.PP
11388
+This implementation provides an extension as well.
11389
+If a SIGWINCH interrupts the function, it will return \fBKEY_RESIZE\fP
11390
+rather than \fBOK\fP or \fBERR\fP.
11391
.SH NOTES
11392
Note that \fBgetstr\fR, \fBmvgetstr\fR, and \fBmvwgetstr\fR may be macros.
11393
.SH PORTABILITY
11394
@@ -98,14 +102,14 @@ They read single-byte characters only.
11395
The standard does not define any error conditions.
11396
This implementation returns ERR if the window pointer is null,
11397
or if the lower-level \fBwgetch\fR call returns an ERR.
11398
-
11399
+.PP
11400
SVr3 and early SVr4 curses implementations did not reject function keys;
11401
the SVr4.0 documentation claimed that "special keys" (such as function
11402
keys, "home" key, "clear" key, \fIetc\fR.) are "interpreted", without
11403
giving details. It lied. In fact, the `character' value appended to the
11404
string by those implementations was predictable but not useful
11405
(being, in fact, the low-order eight bits of the key's KEY_ value).
11406
-
11407
+.PP
11408
The functions \fBgetnstr\fR, \fBmvgetnstr\fR, and \fBmvwgetnstr\fR were
11409
present but not documented in SVr4.
11410
.SH SEE ALSO
11411
Index: ncurses-5.5/man/curs_termcap.3x
11412
===================================================================
11413
--- ncurses-5.5.orig/man/curs_termcap.3x 2003-02-08 17:25:47.000000000 -0500
11414
+++ ncurses-5.5/man/curs_termcap.3x 2006-04-18 15:48:06.000000000 -0400
11415
@@ -1,5 +1,5 @@
11416
.\"***************************************************************************
11417
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
11418
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
11419
.\" *
11420
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11421
.\" copy of this software and associated documentation files (the *
11422
@@ -26,7 +26,7 @@
11423
.\" authorization. *
11424
.\"***************************************************************************
11425
.\"
11426
-.\" $Id: curs_termcap.3x,v 1.18 2003/02/08 22:25:47 tom Exp $
11427
+.\" $Id: curs_termcap.3x,v 1.20 2006/02/25 21:50:01 tom Exp $
11428
.TH curs_termcap 3X ""
11429
.ds n 5
11430
.SH NAME
11431
@@ -40,12 +40,15 @@
11432
\fB#include <curses.h>\fR
11433
.br
11434
\fB#include <term.h>\fR
11435
-.br
11436
+.sp
11437
\fBextern char PC;\fR
11438
+.br
11439
\fBextern char * UP;\fR
11440
+.br
11441
\fBextern char * BC;\fR
11442
-\fBextern @NCURSES_OSPEED@ ospeed;\fR
11443
.br
11444
+\fBextern @NCURSES_OSPEED@ ospeed;\fR
11445
+.sp
11446
\fBint tgetent(char *bp, const char *name);\fR
11447
.br
11448
\fBint tgetflag(char *id);\fR
11449
@@ -64,36 +67,36 @@ the \fItermcap\fR library. Their parame
11450
routines are emulated using the \fIterminfo\fR database. Thus, they
11451
can only be used to query the capabilities of entries for which a
11452
terminfo entry has been compiled.
11453
-
11454
+.PP
11455
The \fBtgetent\fR routine loads the entry for \fIname\fR.
11456
It returns 1 on success, 0 if there is no such entry, and -1 if the
11457
terminfo database could not be found.
11458
The emulation ignores the buffer pointer \fIbp\fR.
11459
-
11460
+.PP
11461
The \fBtgetflag\fR routine gets the boolean entry for \fIid\fR,
11462
or zero if it is not available.
11463
-
11464
+.PP
11465
The \fBtgetnum\fR routine gets the numeric entry for \fIid\fR,
11466
or -1 if it is not available.
11467
-
11468
+.PP
11469
The \fBtgetstr\fR routine returns the string entry for \fIid\fR,
11470
or zero if it is not available.
11471
Use \fBtputs\fR to output the returned string.
11472
The return value will also be copied to the buffer pointed to by \fIarea\fR,
11473
and the \fIarea\fR value will be updated to point past the null ending
11474
this value.
11475
-
11476
+.PP
11477
Only the first two characters of the \fBid\fR parameter of
11478
\fBtgetflag\fR,
11479
\fBtgetnum\fR and
11480
\fBtgetstr\fR are compared in lookups.
11481
-
11482
+.PP
11483
The \fBtgoto\fR routine instantiates the parameters into the given capability.
11484
The output from this routine is to be passed to \fBtputs\fR.
11485
-
11486
+.PP
11487
The \fBtputs\fR routine is described on the \fBcurs_terminfo\fR(3X) manual
11488
page. It can retrieve capabilities by either termcap or terminfo name.
11489
-
11490
+.PP
11491
The variables
11492
\fBPC\fR,
11493
\fBUP\fR and
11494
@@ -108,13 +111,13 @@ respectively.
11495
\fBBC\fR is used in the \fBtgoto\fR emulation.
11496
The variable \fBospeed\fR is set by ncurses in a system-specific coding
11497
to reflect the terminal speed.
11498
-
11499
+.
11500
.SH RETURN VALUE
11501
Except where explicitly noted,
11502
routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
11503
(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
11504
completion.
11505
-
11506
+.PP
11507
Routines that return pointers return \fBNULL\fR on error.
11508
.SH BUGS
11509
If you call \fBtgetstr\fR to fetch \fBca\fR or any other parameterized string,
11510
@@ -126,11 +129,11 @@ terminfo-style strings as terminfo.
11511
if the string is indeed terminfo-style by looking for "%p" parameters or
11512
"$<..>" delays, and invoke a termcap-style parser if the string does not
11513
appear to be terminfo).
11514
-
11515
+.PP
11516
Because terminfo conventions for representing padding in string capabilities
11517
differ from termcap's, \fBtputs("50");\fR will put out a literal "50" rather
11518
than busy-waiting for 50 milliseconds. Cope with it.
11519
-
11520
+.PP
11521
Note that termcap has nothing analogous to terminfo's \fBsgr\fR string.
11522
One consequence of this is that termcap applications assume \fRme\fR
11523
(terminfo \fBsgr0\fR) does not reset the alternate character set.
11524
@@ -139,7 +142,7 @@ termcap interface to accommodate termcap
11525
.SH PORTABILITY
11526
The XSI Curses standard, Issue 4 describes these functions. However, they
11527
are marked TO BE WITHDRAWN and may be removed in future versions.
11528
-
11529
+.PP
11530
Neither the XSI Curses standard nor the SVr4 man pages documented the return
11531
values of \fBtgetent\fR correctly, though all three were in fact returned ever
11532
since SVr1.
11533
@@ -148,7 +151,7 @@ misinterpreted to mean that \fBtgetent\f
11534
Because the purpose of these functions is to provide compatibility with
11535
the \fItermcap\fR library, that is a defect in XCurses, Issue 4, Version 2
11536
rather than in ncurses.
11537
-
11538
+.PP
11539
External variables are provided for support of certain termcap applications.
11540
However, termcap applications' use of those variables is poorly documented,
11541
e.g., not distinguishing between input and output.
11542
Index: ncurses-5.5/man/curs_util.3x
11543
===================================================================
11544
--- ncurses-5.5.orig/man/curs_util.3x 2005-06-25 17:51:37.000000000 -0400
11545
+++ ncurses-5.5/man/curs_util.3x 2006-04-18 15:47:22.000000000 -0400
11546
@@ -1,5 +1,5 @@
11547
.\"***************************************************************************
11548
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
11549
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
11550
.\" *
11551
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11552
.\" copy of this software and associated documentation files (the *
11553
@@ -26,7 +26,7 @@
11554
.\" authorization. *
11555
.\"***************************************************************************
11556
.\"
11557
-.\" $Id: curs_util.3x,v 1.17 2005/06/25 21:51:37 tom Exp $
11558
+.\" $Id: curs_util.3x,v 1.20 2006/01/07 22:47:45 tom Exp $
11559
.TH curs_util 3X ""
11560
.na
11561
.hy 0
11562
@@ -37,6 +37,7 @@
11563
\fBgetwin\fR,
11564
\fBkey_name\fR,
11565
\fBkeyname\fR,
11566
+\fBnofilter\fR,
11567
\fBputwin\fR,
11568
\fBunctrl\fR,
11569
\fBuse_env\fR,
11570
@@ -56,6 +57,8 @@
11571
.br
11572
\fBvoid filter(void);\fR
11573
.br
11574
+\fBvoid nofilter(void);\fR
11575
+.br
11576
\fBvoid use_env(bool f);\fR
11577
.br
11578
\fBint putwin(WINDOW *win, FILE *filep);\fR
11579
@@ -89,6 +92,13 @@ is set to 1; the capabilities \fBclear\f
11580
\fBcuu1\fR, \fBcuu\fR, \fBvpa\fR are disabled; and the \fBhome\fR string is
11581
set to the value of \fBcr\fR.
11582
.PP
11583
+The \fBnofilter\fP routine cancels the effect of a preceding \fBfilter\fP
11584
+call.
11585
+That allows the caller to initialize a screen on a different device,
11586
+using a different value of \fB$TERM\fP.
11587
+The limitation arises because the \fBfilter\fP routine modifies the
11588
+in-memory copy of the terminal information.
11589
+.PP
11590
The \fBuse_env\fR routine, if used, is called before \fBinitscr\fR or
11591
\fBnewterm\fR are called. When called with \fBFALSE\fR as an
11592
argument, the values of \fBlines\fR and \fBcolumns\fR specified in the
11593
@@ -142,17 +152,28 @@ terms. The description here is adapted
11594
erroneously fails to describe the disabling of \fBcuu\fR).
11595
.PP
11596
The strings returned by \fBunctrl\fR in this implementation are determined
11597
-at compile time, showing C1 controls from the upper-128 codes with a `~'
11598
-prefix rather than `^'.
11599
-Other implementations typically show both sets of control characters with `^',
11600
-and may strip the parameter to 7 bits.
11601
+at compile time,
11602
+showing C1 controls from the upper-128 codes with a `~' prefix rather than `^'.
11603
+Other implementations have different conventions.
11604
+For example, they may show both sets of control characters with `^',
11605
+and strip the parameter to 7 bits.
11606
+Or they may ignore C1 controls and treat all of the upper-1280 codes as
11607
+printable.
11608
This implementation uses 8 bits but does not modify the string to reflect
11609
locale.
11610
+The \fBuse_legacy_coding\fP function allows the caller to
11611
+change the output of \fBunctrl\fP.
11612
.PP
11613
The \fBkeyname\fP function may return the names of user-defined
11614
string capabilities which are defined in the terminfo entry via the \fB-x\fP
11615
option of \fBtic\fP.
11616
+.PP
11617
+The \fBnofilter\fP routine is specific to ncurses.
11618
+It was not supported on Version 7, BSD or System V implementations.
11619
+It is recommended that any code depending on ncurses extensions
11620
+be conditioned using NCURSES_VERSION.
11621
.SH SEE ALSO
11622
+\fBuse_legacy_coding\fR(3),
11623
\fBcurses\fR(3X),
11624
\fBcurs_initscr\fR(3X),
11625
\fBcurs_kernel\fR(3X),
11626
Index: ncurses-5.5/man/legacy_coding.3x
11627
===================================================================
11628
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
11629
+++ ncurses-5.5/man/legacy_coding.3x 2006-04-18 15:48:06.000000000 -0400
11630
@@ -0,0 +1,82 @@
11631
+.\"***************************************************************************
11632
+.\" Copyright (c) 2005,2006 Free Software Foundation, Inc. *
11633
+.\" *
11634
+.\" Permission is hereby granted, free of charge, to any person obtaining a *
11635
+.\" copy of this software and associated documentation files (the *
11636
+.\" "Software"), to deal in the Software without restriction, including *
11637
+.\" without limitation the rights to use, copy, modify, merge, publish, *
11638
+.\" distribute, distribute with modifications, sublicense, and/or sell *
11639
+.\" copies of the Software, and to permit persons to whom the Software is *
11640
+.\" furnished to do so, subject to the following conditions: *
11641
+.\" *
11642
+.\" The above copyright notice and this permission notice shall be included *
11643
+.\" in all copies or substantial portions of the Software. *
11644
+.\" *
11645
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
11646
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
11647
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
11648
+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
11649
+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
11650
+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
11651
+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
11652
+.\" *
11653
+.\" Except as contained in this notice, the name(s) of the above copyright *
11654
+.\" holders shall not be used in advertising or otherwise to promote the *
11655
+.\" sale, use or other dealings in this Software without prior written *
11656
+.\" authorization. *
11657
+.\"***************************************************************************
11658
+.\"
11659
+.\" Author: Thomas E. Dickey
11660
+.\"
11661
+.\" $Id: legacy_coding.3x,v 1.2 2006/02/25 21:50:01 tom Exp $
11662
+.TH legacy_coding 3X ""
11663
+.SH NAME
11664
+\fBuse_legacy_coding\fR \- use terminal's default colors
11665
+.SH SYNOPSIS
11666
+\fB#include <curses.h>\fP
11667
+.sp
11668
+\fBint use_legacy_coding(int level);\fP
11669
+.SH DESCRIPTION
11670
+The
11671
+.I use_legacy_coding()
11672
+function is an extension to the curses library.
11673
+It allows the caller to change the result of \fBunctrl\fP,
11674
+and suppress related checks within the library that would normally
11675
+cause nonprinting characters to be rendered in visible form.
11676
+This affects only 8-bit characters.
11677
+.PP
11678
+The \fIlevel\fP parameter controls the result:
11679
+.RS
11680
+.TP 5
11681
+0
11682
+the library functions normally,
11683
+rendering nonprinting characters as described in \fBunctrl\fP(3X).
11684
+.TP
11685
+1
11686
+the library ignores \fBisprintf\fP for codes in the range 160-255.
11687
+.TP
11688
+2
11689
+the library ignores \fBisprintf\fP for codes in the range 128-255.
11690
+It also modifies the output of \fBunctrl\fP, showing codes in the
11691
+range 128-159 as is.
11692
+.RE
11693
+.SH RETURN VALUE
11694
+If the screen has not been initialized,
11695
+or the \fIlevel\fP parameter is out of range,
11696
+the function returns \fBERR\fP.
11697
+Otherwise, it returns the previous level: \fB0\fP, \fB1\fP or \fB2\fP.
11698
+.SH PORTABILITY
11699
+This routine is specific to ncurses.
11700
+It was not supported on Version 7, BSD or System V implementations.
11701
+It is recommended that any code depending on ncurses extensions
11702
+be conditioned using NCURSES_VERSION.
11703
+.SH SEE ALSO
11704
+\fBunctrl\fR.
11705
+.SH AUTHOR
11706
+Thomas Dickey (to support lynx's font-switching feature).
11707
+.\"#
11708
+.\"# The following sets edit modes for GNU EMACS
11709
+.\"# Local Variables:
11710
+.\"# mode:nroff
11711
+.\"# fill-column:79
11712
+.\"# End:
11713
Index: ncurses-5.5/man/tic.1m
11714
===================================================================
11715
--- ncurses-5.5.orig/man/tic.1m 2005-04-30 15:39:28.000000000 -0400
11716
+++ ncurses-5.5/man/tic.1m 2006-04-18 15:48:07.000000000 -0400
11717
@@ -1,5 +1,5 @@
11718
.\"***************************************************************************
11719
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
11720
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
11721
.\" *
11722
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11723
.\" copy of this software and associated documentation files (the *
11724
@@ -26,7 +26,7 @@
11725
.\" authorization. *
11726
.\"***************************************************************************
11727
.\"
11728
-.\" $Id: tic.1m,v 1.38 2005/04/30 19:39:28 tom Exp $
11729
+.\" $Id: tic.1m,v 1.42 2006/04/15 20:12:08 tom Exp $
11730
.TH tic 1M ""
11731
.ds n 5
11732
.ds d @TERMINFO@
11733
@@ -42,6 +42,7 @@ I\
11734
L\
11735
N\
11736
T\
11737
+U\
11738
V\
11739
a\
11740
c\
11741
@@ -176,20 +177,28 @@ descriptions are limited (e.g., 1023 for
11742
tells \fBtic\fP to discard commented-out capabilities.
11743
Normally when translating from terminfo to termcap,
11744
untranslatable capabilities are commented-out.
11745
+.TP 5
11746
+\fB-U\fR
11747
+tells \fBtic\fP to not post-process the data after parsing the source file.
11748
+Normally, it infers data which is commonly missing in older terminfo data,
11749
+or in termcaps.
11750
.TP
11751
\fB-V\fR
11752
reports the version of ncurses which was used in this program, and exits.
11753
.TP
11754
\fB-v\fR\fIn\fR
11755
specifies that (verbose) output be written to standard error trace
11756
-information showing \fBtic\fR's progress. The optional integer
11757
-\fIn\fR is a number from 1 to 10, inclusive, indicating the desired
11758
-level of detail of information. If \fIn\fR is omitted, the default
11759
-level is 1. If \fIn\fR is specified and greater than 1, the level of
11760
+information showing \fBtic\fR's progress.
11761
+The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
11762
+indicating the desired level of detail of information.
11763
+If \fIn\fR is omitted, the default level is 1.
11764
+If \fIn\fR is specified and greater than 1, the level of
11765
detail is increased.
11766
.TP
11767
\fB-w\fR\fIn\fR
11768
specifies the width of the output.
11769
+The parameter is optional.
11770
+If it is omitted, it defaults to 60.
11771
.TP
11772
\fB-x\fR
11773
Treat unknown capabilities as user-defined.
11774
@@ -231,7 +240,7 @@ If the debug level \fIn\fR is not given,
11775
.PP
11776
All but one of the capabilities recognized by \fBtic\fR are documented
11777
in \fBterminfo\fR(\*n). The exception is the \fBuse\fR capability.
11778
-
11779
+.PP
11780
When a \fBuse\fR=\fIentry\fR-\fIname\fR field is discovered in a
11781
terminal entry currently being compiled, \fBtic\fR reads in the binary
11782
from \fB\*d\fR to complete the entry. (Entries created from
11783
@@ -240,16 +249,16 @@ from \fB\*d\fR to complete the entry. (
11784
\fB\*d\fR.) \fBtic\fR duplicates the capabilities in
11785
\fIentry\fR-\fIname\fR for the current entry, with the exception of
11786
those capabilities that explicitly are defined in the current entry.
11787
-
11788
+.PP
11789
When an entry, e.g., \fBentry_name_1\fR, contains a
11790
\fBuse=\fR\fIentry\fR_\fIname\fR_\fI2\fR field, any canceled
11791
capabilities in \fIentry\fR_\fIname\fR_\fI2\fR must also appear in
11792
\fBentry_name_1\fR before \fBuse=\fR for these capabilities to be
11793
canceled in \fBentry_name_1\fR.
11794
-
11795
+.PP
11796
If the environment variable \fBTERMINFO\fR is set, the compiled
11797
results are placed there instead of \fB\*d\fR.
11798
-
11799
+.PP
11800
Total compiled entries cannot exceed 4096 bytes. The name field cannot
11801
exceed 512 bytes. Terminal names exceeding the maximum alias length
11802
(32 characters on systems with long filenames, 14 characters otherwise)
11803
@@ -265,7 +274,7 @@ Unlike the stock SVr4 \fBtic\fR command,
11804
compile termcap sources. In fact, entries in terminfo and termcap syntax can
11805
be mixed in a single source file. See \fBterminfo\fR(\*n) for the list of
11806
termcap names taken to be equivalent to terminfo names.
11807
-
11808
+.PP
11809
The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR
11810
capabilities.
11811
This implementation of \fBtic\fR will find \fBuse\fR targets anywhere
11812
@@ -273,10 +282,10 @@ in the source file, or anywhere in the f
11813
\fBTERMINFO\fR is defined), or in the user's \fI$HOME/.terminfo\fR directory
11814
(if it exists), or (finally) anywhere in the system's file tree of
11815
compiled entries.
11816
-
11817
+.PP
11818
The error messages from this \fBtic\fR have the same format as GNU C
11819
error messages, and can be parsed by GNU Emacs's compile facility.
11820
-
11821
+.PP
11822
The
11823
\fB-C\fR,
11824
\fB-G\fR,
11825
@@ -297,7 +306,7 @@ The
11826
options
11827
are not supported under SVr4.
11828
The SVr4 \fB-c\fR mode does not report bad use links.
11829
-
11830
+.PP
11831
System V does not compile entries to or read entries from your
11832
\fI$HOME/.terminfo\fR directory unless TERMINFO is explicitly set to it.
11833
.SH FILES
11834
@@ -305,8 +314,12 @@ System V does not compile entries to or
11835
\fB\*d/?/*\fR
11836
Compiled terminal description database.
11837
.SH SEE ALSO
11838
-\fB@INFOCMP@\fR(1M), \fB@CAPTOINFO@\fR(1M), \fB@INFOTOCAP@\fR(1M),
11839
-\fB@TOE@\fR(1M), \fBcurses\fR(3X), \fBterminfo\fR(\*n).
11840
+\fB@INFOCMP@\fR(1M),
11841
+\fB@CAPTOINFO@\fR(1M),
11842
+\fB@INFOTOCAP@\fR(1M),
11843
+\fB@TOE@\fR(1M),
11844
+\fBcurses\fR(3X),
11845
+\fBterminfo\fR(\*n).
11846
.\"#
11847
.\"# The following sets edit modes for GNU EMACS
11848
.\"# Local Variables:
11849
Index: ncurses-5.5/man/toe.1m
11850
===================================================================
11851
--- ncurses-5.5.orig/man/toe.1m 2004-07-05 09:16:08.000000000 -0400
11852
+++ ncurses-5.5/man/toe.1m 2006-04-18 15:48:06.000000000 -0400
11853
@@ -1,5 +1,5 @@
11854
.\"***************************************************************************
11855
-.\" Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
11856
+.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
11857
.\" *
11858
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11859
.\" copy of this software and associated documentation files (the *
11860
@@ -26,14 +26,14 @@
11861
.\" authorization. *
11862
.\"***************************************************************************
11863
.\"
11864
-.\" $Id: toe.1m,v 1.13 2004/07/05 13:16:08 tom Exp $
11865
+.\" $Id: toe.1m,v 1.17 2006/02/25 17:42:08 tom Exp $
11866
.TH toe 1M ""
11867
.ds n 5
11868
.ds d @TERMINFO@
11869
.SH NAME
11870
\fBtoe\fR - table of (terminfo) entries
11871
.SH SYNOPSIS
11872
-\fBtoe\fR [\fB-v\fR[\fIn\fR]] [\fB-huUV\fR] \fIfile...\fR
11873
+\fBtoe\fR [\fB-v\fR[\fIn\fR]] [\fB-ahuUV\fR] \fIfile...\fR
11874
.br
11875
.SH DESCRIPTION
11876
.PP
11877
@@ -45,6 +45,10 @@ directory is entered.
11878
.PP
11879
There are other options intended for use by terminfo file maintainers:
11880
.TP
11881
+\fB-a\fR
11882
+report on all of the terminal databases which ncurses would search,
11883
+rather than only the first one that it finds.
11884
+.TP
11885
\fB-u\fR \fIfile\fR
11886
says to issue a report on dependencies in the given file. This report condenses
11887
the `use' relation: each line consists of the primary name of a terminal that
11888
@@ -60,10 +64,11 @@ whitespace-separated primary names of al
11889
followed by a newline.
11890
.TP
11891
\fB-v\fR\fIn\fR
11892
-specifies that (verbose) output be written to standard error trace
11893
-information showing \fBtoe\fR's progress. The optional integer
11894
-\fIn\fR is a number from 1 to 10, interpreted as for \fBtic\fR(1).
11895
-.TP 5
11896
+specifies that (verbose) output be written to standard error,
11897
+showing \fBtoe\fR's progress.
11898
+The optional parameter \fIn\fR is a number from 1 to 10,
11899
+interpreted as for \fBtic\fR(1).
11900
+.TP
11901
\fB-V\fR
11902
reports the version of ncurses which was used in this program, and exits.
11903
.SH FILES
11904
@@ -71,8 +76,12 @@ reports the version of ncurses which was
11905
\fB\*d/?/*\fR
11906
Compiled terminal description database.
11907
.SH SEE ALSO
11908
-\fB@TIC@\fR(1M), \fB@INFOCMP@\fR(1M), \fB@CAPTOINFO@\fR(1M),
11909
-\fB@INFOTOCAP@\fR(1M), \fBcurses\fR(3X), \fBterminfo\fR(\*n).
11910
+\fB@TIC@\fR(1M),
11911
+\fB@INFOCMP@\fR(1M),
11912
+\fB@CAPTOINFO@\fR(1M),
11913
+\fB@INFOTOCAP@\fR(1M),
11914
+\fBcurses\fR(3X),
11915
+\fBterminfo\fR(\*n).
11916
.\"#
11917
.\"# The following sets edit modes for GNU EMACS
11918
.\"# Local Variables:
11919
Index: ncurses-5.5/man/tput.1
11920
===================================================================
11921
--- ncurses-5.5.orig/man/tput.1 2005-01-08 12:44:26.000000000 -0500
11922
+++ ncurses-5.5/man/tput.1 2006-04-18 15:48:07.000000000 -0400
11923
@@ -1,6 +1,6 @@
11924
'\" t
11925
.\"***************************************************************************
11926
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
11927
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
11928
.\" *
11929
.\" Permission is hereby granted, free of charge, to any person obtaining a *
11930
.\" copy of this software and associated documentation files (the *
11931
@@ -27,7 +27,7 @@
11932
.\" authorization. *
11933
.\"***************************************************************************
11934
.\"
11935
-.\" $Id: tput.1,v 1.22 2005/01/08 17:44:26 tom Exp $
11936
+.\" $Id: tput.1,v 1.24 2006/04/01 23:23:57 tom Exp $
11937
.TH tput 1 ""
11938
.ds d @TERMINFO@
11939
.ds n 1
11940
@@ -118,12 +118,28 @@ reports the version of ncurses which was
11941
\fBinit\fR
11942
If the \fBterminfo\fR database is present and an entry for the user's
11943
terminal exists (see \fB-T\fR\fItype\fR, above), the following will
11944
-occur: (1) if present, the terminal's initialization strings will be
11945
-output (\fBis1\fR, \fBis2\fR, \fBis3\fR, \fBif\fR, \fBiprog\fR), (2)
11946
-any delays (e.g., newline) specified in the entry will be set in the
11947
-tty driver, (3) tabs expansion will be turned on or off according to
11948
-the specification in the entry, and (4) if tabs are not expanded,
11949
-standard tabs will be set (every 8 spaces). If an entry does not
11950
+occur:
11951
+.RS
11952
+.TP
11953
+(1)
11954
+if present, the terminal's initialization strings will be
11955
+output as detailed in the \fBterminfo\fR(5) section on
11956
+.IR "Tabs and Initialization" ,
11957
+.TP
11958
+(2)
11959
+any delays (e.g., newline) specified in the entry will
11960
+be set in the tty driver,
11961
+.TP
11962
+(3)
11963
+tabs expansion will be turned on or off according to
11964
+the specification in the entry, and
11965
+.TP
11966
+(4)
11967
+if tabs are not expanded,
11968
+standard tabs will be set (every 8 spaces).
11969
+.RE
11970
+.IP
11971
+If an entry does not
11972
contain the information needed for any of the four above activities,
11973
that activity will silently be skipped.
11974
.TP
11975
@@ -280,9 +296,19 @@ T}
11976
=
11977
.TE
11978
.SH PORTABILITY
11979
+.PP
11980
The \fBlongname\fR and \fB-S\fR options, and the parameter-substitution
11981
features used in the \fBcup\fR example, are not supported in BSD curses or in
11982
AT&T/USL curses before SVr4.
11983
+.PP
11984
+X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
11985
+In this implementation, \fBclear\fP is part of the \fIcapname\fR support.
11986
+Other implementations of \fBtput\fP on
11987
+SVr4-based systems such as Solaris, IRIX64 and HPUX
11988
+as well as others such as AIX and Tru64
11989
+provide support for \fIcapname\fR operands.
11990
+A few platforms such as FreeBSD and NetBSD recognize termcap names rather
11991
+than terminfo capability names in their respective \fBtput\fP commands.
11992
.SH SEE ALSO
11993
\fB@CLEAR@\fR(1),
11994
\fBstty\fR(1),
11995
Index: ncurses-5.5/menu/m_cursor.c
11996
===================================================================
11997
--- ncurses-5.5.orig/menu/m_cursor.c 2004-12-25 17:03:00.000000000 -0500
11998
+++ ncurses-5.5/menu/m_cursor.c 2006-04-18 15:47:22.000000000 -0400
11999
@@ -1,5 +1,5 @@
12000
/****************************************************************************
12001
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
12002
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
12003
* *
12004
* Permission is hereby granted, free of charge, to any person obtaining a *
12005
* copy of this software and associated documentation files (the *
12006
@@ -32,12 +32,12 @@
12007
12008
/***************************************************************************
12009
* Module m_cursor *
12010
-* Correctly position a menus cursor *
12011
+* Correctly position a menu's cursor *
12012
***************************************************************************/
12013
12014
#include "menu.priv.h"
12015
12016
-MODULE_ID("$Id: m_cursor.c,v 1.19 2004/12/25 22:03:00 tom Exp $")
12017
+MODULE_ID("$Id: m_cursor.c,v 1.20 2005/10/22 23:03:32 tom Exp $")
12018
12019
/*---------------------------------------------------------------------------
12020
| Facility : libnmenu
12021
@@ -83,7 +83,7 @@ NCURSES_EXPORT(int)
12022
pos_menu_cursor(const MENU * menu)
12023
{
12024
WINDOW *win, *sub;
12025
- int x, y;
12026
+ int x = 0, y = 0;
12027
int err = _nc_menu_cursor_pos(menu, (ITEM *) 0, &y, &x);
12028
12029
T((T_CALLED("pos_menu_cursor(%p)"), menu));
12030
Index: ncurses-5.5/menu/m_driver.c
12031
===================================================================
12032
--- ncurses-5.5.orig/menu/m_driver.c 2005-04-09 16:40:25.000000000 -0400
12033
+++ ncurses-5.5/menu/m_driver.c 2006-04-18 15:47:22.000000000 -0400
12034
@@ -37,7 +37,7 @@
12035
12036
#include "menu.priv.h"
12037
12038
-MODULE_ID("$Id: m_driver.c,v 1.24 2005/04/09 20:40:25 tom Exp $")
12039
+MODULE_ID("$Id: m_driver.c,v 1.25 2005/11/26 20:46:59 tom Exp $")
12040
12041
/* Macros */
12042
12043
@@ -157,7 +157,7 @@ _nc_Match_Next_Character_In_Item_Name
12044
if (++idx >= menu->nitems)
12045
idx = 0;
12046
}
12047
- if (Is_Sub_String((menu->opt & O_IGNORECASE) != 0,
12048
+ if (Is_Sub_String((bool)((menu->opt & O_IGNORECASE) != 0),
12049
menu->pattern,
12050
menu->items[idx]->name.str)
12051
)
12052
Index: ncurses-5.5/menu/m_global.c
12053
===================================================================
12054
--- ncurses-5.5.orig/menu/m_global.c 2005-04-16 13:30:57.000000000 -0400
12055
+++ ncurses-5.5/menu/m_global.c 2006-04-18 15:47:22.000000000 -0400
12056
@@ -37,7 +37,7 @@
12057
12058
#include "menu.priv.h"
12059
12060
-MODULE_ID("$Id: m_global.c,v 1.20 2005/04/16 17:30:57 tom Exp $")
12061
+MODULE_ID("$Id: m_global.c,v 1.23 2005/12/31 21:51:52 tom Exp $")
12062
12063
static char mark[] = "-";
12064
/* *INDENT-OFF* */
12065
@@ -106,21 +106,24 @@ NCURSES_EXPORT_VAR(ITEM) _nc_Default_Ite
12066
|
12067
| Return Values : -
12068
+--------------------------------------------------------------------------*/
12069
-INLINE static void
12070
+NCURSES_INLINE static void
12071
ComputeMaximum_NameDesc_Lengths(MENU * menu)
12072
{
12073
unsigned MaximumNameLength = 0;
12074
unsigned MaximumDescriptionLength = 0;
12075
ITEM **items;
12076
+ unsigned check;
12077
12078
assert(menu && menu->items);
12079
for (items = menu->items; *items; items++)
12080
{
12081
- if (items[0]->name.length > MaximumNameLength)
12082
- MaximumNameLength = items[0]->name.length;
12083
-
12084
- if (items[0]->description.length > MaximumDescriptionLength)
12085
- MaximumDescriptionLength = items[0]->description.length;
12086
+ check = _nc_Calculate_Text_Width(&((*items)->name));
12087
+ if (check > MaximumNameLength)
12088
+ MaximumNameLength = check;
12089
+
12090
+ check = _nc_Calculate_Text_Width(&((*items)->description));
12091
+ if (check > MaximumDescriptionLength)
12092
+ MaximumDescriptionLength = check;
12093
}
12094
12095
menu->namelen = MaximumNameLength;
12096
@@ -137,7 +140,7 @@ ComputeMaximum_NameDesc_Lengths(MENU * m
12097
|
12098
| Return Values : -
12099
+--------------------------------------------------------------------------*/
12100
-INLINE static void
12101
+NCURSES_INLINE static void
12102
ResetConnectionInfo(MENU * menu, ITEM ** items)
12103
{
12104
ITEM **item;
12105
@@ -249,26 +252,30 @@ _nc_Calculate_Text_Width(const TEXT * it
12106
{
12107
#if USE_WIDEC_SUPPORT
12108
int result = item->length;
12109
- int count = mbstowcs(0, item->str, 0);
12110
- wchar_t *temp = 0;
12111
12112
T((T_CALLED("_nc_menu_text_width(%p)"), item));
12113
- if (count > 0
12114
- && (temp = typeMalloc(wchar_t, 2 + count)) != 0)
12115
+ if (result != 0 && item->str != 0)
12116
{
12117
- int n;
12118
+ int count = mbstowcs(0, item->str, 0);
12119
+ wchar_t *temp = 0;
12120
12121
- result = 0;
12122
- mbstowcs(temp, item->str, (unsigned)count);
12123
- for (n = 0; n < count; ++n)
12124
+ if (count > 0
12125
+ && (temp = typeMalloc(wchar_t, 2 + count)) != 0)
12126
{
12127
- int test = wcwidth(temp[n]);
12128
+ int n;
12129
+
12130
+ result = 0;
12131
+ mbstowcs(temp, item->str, (unsigned)count);
12132
+ for (n = 0; n < count; ++n)
12133
+ {
12134
+ int test = wcwidth(temp[n]);
12135
12136
- if (test <= 0)
12137
- test = 1;
12138
- result += test;
12139
+ if (test <= 0)
12140
+ test = 1;
12141
+ result += test;
12142
+ }
12143
+ free(temp);
12144
}
12145
- free(temp);
12146
}
12147
returnCode(result);
12148
#else
12149
@@ -276,10 +283,10 @@ _nc_Calculate_Text_Width(const TEXT * it
12150
#endif
12151
}
12152
12153
-/* FIXME: this is experimental, should cache the results but don't want to
12154
- * modify the MENU struct to do this until it's complete.
12155
+/*
12156
+ * Calculate the actual width of a menu entry for wide-characters.
12157
*/
12158
-#if 0 /* USE_WIDEC_SUPPORT */
12159
+#if USE_WIDEC_SUPPORT
12160
static int
12161
calculate_actual_width(MENU * menu, bool name)
12162
{
12163
@@ -288,25 +295,32 @@ calculate_actual_width(MENU * menu, bool
12164
ITEM **items;
12165
12166
assert(menu && menu->items);
12167
- for (items = menu->items; *items; items++)
12168
+
12169
+ if (menu->items != 0)
12170
{
12171
- if (name)
12172
+ for (items = menu->items; *items; items++)
12173
{
12174
- check = _nc_Calculate_Text_Width(&((*items)->name));
12175
- }
12176
- else
12177
- {
12178
- check = _nc_Calculate_Text_Width(&((*items)->description));
12179
+ if (name)
12180
+ {
12181
+ check = _nc_Calculate_Text_Width(&((*items)->name));
12182
+ }
12183
+ else
12184
+ {
12185
+ check = _nc_Calculate_Text_Width(&((*items)->description));
12186
+ }
12187
+ if (check > width)
12188
+ width = check;
12189
}
12190
- if (check > width)
12191
- width = check;
12192
+ }
12193
+ else
12194
+ {
12195
+ width = (name ? menu->namelen : menu->desclen);
12196
}
12197
12198
T(("calculate_actual_width %s = %d/%d",
12199
name ? "name" : "desc",
12200
width,
12201
name ? menu->namelen : menu->desclen));
12202
- width += 2; /* FIXME - need this? */
12203
return width;
12204
}
12205
#else
12206
Index: ncurses-5.5/menu/mf_common.h
12207
===================================================================
12208
--- ncurses-5.5.orig/menu/mf_common.h 2004-12-11 17:40:40.000000000 -0500
12209
+++ ncurses-5.5/menu/mf_common.h 2006-04-18 15:47:22.000000000 -0400
12210
@@ -30,7 +30,7 @@
12211
* Author: Juergen Pfeifer, 1995,1997 *
12212
****************************************************************************/
12213
12214
-/* $Id: mf_common.h,v 0.21 2004/12/11 22:40:40 tom Exp $ */
12215
+/* $Id: mf_common.h,v 0.22 2005/11/26 15:26:52 tom Exp $ */
12216
12217
/* Common internal header for menu and form library */
12218
12219
@@ -92,13 +92,4 @@ extern int errno;
12220
(object)->status &= ~_IN_DRIVER;\
12221
}
12222
12223
-#define INLINE
12224
-
12225
-#ifndef TRACE
12226
-# if CC_HAS_INLINE_FUNCS
12227
-# undef INLINE
12228
-# define INLINE inline
12229
-# endif
12230
-#endif
12231
-
12232
#endif /* MF_COMMON_H_incl */
12233
Index: ncurses-5.5/misc/jpf-indent
12234
===================================================================
12235
--- ncurses-5.5.orig/misc/jpf-indent 2004-05-29 15:14:45.000000000 -0400
12236
+++ ncurses-5.5/misc/jpf-indent 2006-04-18 15:48:06.000000000 -0400
12237
@@ -1,5 +1,32 @@
12238
#!/bin/sh
12239
-# $Id: jpf-indent,v 1.3 2004/05/29 19:14:45 tom Exp $
12240
+#****************************************************************************
12241
+#* Copyright (c) 2004-2005,2006 Thomas E. Dickey *
12242
+#* *
12243
+#* Permission is hereby granted, free of charge, to any person obtaining a *
12244
+#* copy of this software and associated documentation files (the *
12245
+#* "Software"), to deal in the Software without restriction, including *
12246
+#* without limitation the rights to use, copy, modify, merge, publish, *
12247
+#* distribute, distribute with modifications, sublicense, and/or sell *
12248
+#* copies of the Software, and to permit persons to whom the Software is *
12249
+#* furnished to do so, subject to the following conditions: *
12250
+#* *
12251
+#* The above copyright notice and this permission notice shall be included *
12252
+#* in all copies or substantial portions of the Software. *
12253
+#* *
12254
+#* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
12255
+#* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
12256
+#* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
12257
+#* IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
12258
+#* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
12259
+#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
12260
+#* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
12261
+#* *
12262
+#* Except as contained in this notice, the name(s) of the above copyright *
12263
+#* holders shall not be used in advertising or otherwise to promote the *
12264
+#* sale, use or other dealings in this Software without prior written *
12265
+#* authorization. *
12266
+#****************************************************************************/
12267
+# $Id: jpf-indent,v 1.6 2006/02/18 17:07:15 tom Exp $
12268
# indent ncurses source written by Juergen Pfeifer
12269
NOOP=no
12270
OPTS='
12271
@@ -16,11 +43,12 @@ OPTS='
12272
--parameter-indentation4
12273
--swallow-optional-blank-lines
12274
--tab-size8
12275
+
12276
-T FIELD
12277
-T FIELDTYPE
12278
-T FIELD_CELL
12279
-T FORM
12280
--T INLINE
12281
+-T NCURSES_INLINE
12282
-T RegExp_Arg
12283
-T TypeArgument
12284
-T WINDOW
12285
@@ -50,15 +78,19 @@ do
12286
sed \
12287
-e '/MODULE_ID(/s/)$/);/' \
12288
-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
12289
+ -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
12290
+ -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
12291
-e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
12292
"$save" >"$test"
12293
cp "$test" "$name"
12294
chmod u+w "$name"
12295
# ${INDENT_PROG-indent} --version
12296
- ${INDENT_PROG-indent} $OPTS "$name"
12297
+ ${INDENT_PROG-indent} -npro $OPTS "$name"
12298
sed \
12299
-e '/MODULE_ID(/s/);$/)/' \
12300
-e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
12301
+ -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
12302
+ -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
12303
-e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
12304
"$name" >"$test"
12305
mv "$test" "$name"
12306
Index: ncurses-5.5/misc/ncu-indent
12307
===================================================================
12308
--- ncurses-5.5.orig/misc/ncu-indent 2004-11-22 19:45:48.000000000 -0500
12309
+++ ncurses-5.5/misc/ncu-indent 2006-04-18 15:48:06.000000000 -0400
12310
@@ -1,5 +1,32 @@
12311
#!/bin/sh
12312
-# $Id: ncu-indent,v 1.12 2004/11/23 00:45:48 tom Exp $
12313
+#****************************************************************************
12314
+#* Copyright (c) 2001-2005,2006 Thomas E. Dickey *
12315
+#* *
12316
+#* Permission is hereby granted, free of charge, to any person obtaining a *
12317
+#* copy of this software and associated documentation files (the *
12318
+#* "Software"), to deal in the Software without restriction, including *
12319
+#* without limitation the rights to use, copy, modify, merge, publish, *
12320
+#* distribute, distribute with modifications, sublicense, and/or sell *
12321
+#* copies of the Software, and to permit persons to whom the Software is *
12322
+#* furnished to do so, subject to the following conditions: *
12323
+#* *
12324
+#* The above copyright notice and this permission notice shall be included *
12325
+#* in all copies or substantial portions of the Software. *
12326
+#* *
12327
+#* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
12328
+#* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
12329
+#* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
12330
+#* IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
12331
+#* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
12332
+#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
12333
+#* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
12334
+#* *
12335
+#* Except as contained in this notice, the name(s) of the above copyright *
12336
+#* holders shall not be used in advertising or otherwise to promote the *
12337
+#* sale, use or other dealings in this Software without prior written *
12338
+#* authorization. *
12339
+#****************************************************************************/
12340
+# $Id: ncu-indent,v 1.16 2006/02/18 17:02:22 tom Exp $
12341
NOOP=no
12342
OPTS='
12343
--blank-lines-after-procedures
12344
@@ -18,6 +45,7 @@ OPTS='
12345
--tab-size8
12346
12347
-T NCURSES_EXPORT_VAR
12348
+-T NCURSES_INLINE
12349
-T SCREEN
12350
-T TERMTYPE
12351
-T attr_t
12352
@@ -53,7 +81,7 @@ do
12353
-*)
12354
OPTS="$OPTS $name"
12355
;;
12356
- *.[ch])
12357
+ *.[ch]|*.cc|*.cpp)
12358
save="${name}".a$$
12359
test="${name}".b$$
12360
rm -f "$save" "$test"
12361
@@ -61,6 +89,8 @@ do
12362
sed \
12363
-e '/MODULE_ID(/s/)$/);/' \
12364
-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
12365
+ -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
12366
+ -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
12367
-e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
12368
"$save" >"$test"
12369
cp "$test" "$name"
12370
@@ -70,6 +100,8 @@ do
12371
sed \
12372
-e '/MODULE_ID(/s/);$/)/' \
12373
-e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
12374
+ -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
12375
+ -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
12376
-e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
12377
"$name" >"$test"
12378
mv "$test" "$name"
12379
Index: ncurses-5.5/misc/terminfo.src
12380
===================================================================
12381
--- ncurses-5.5.orig/misc/terminfo.src 2006-04-18 15:40:42.000000000 -0400
12382
+++ ncurses-5.5/misc/terminfo.src 2006-04-29 10:41:13.000000000 -0400
12383
@@ -4,8 +4,8 @@
12384
# Report bugs and new terminal descriptions to
12385
# bug-ncurses@gnu.org
12386
#
12387
-# $Revision: 1.268 $
12388
-# $Date: 2005/07/24 00:22:25 $
12389
+# $Revision: 1.277 $
12390
+# $Date: 2006/04/21 17:24:27 $
12391
#
12392
# The original header is preserved below for reference. It is noted that there
12393
# is a "newer" version which differs in some cosmetic details (but actually
12394
@@ -2658,9 +2658,11 @@ putty|PuTTY terminal emulator,
12395
smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
12396
tbc=\E[3g, tsl=\E]0;, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c,
12397
u9=\E[c, vpa=\E[%i%p1%dd,
12398
-vt100-putty|Reset Putty to pure vt100,
12399
+vt100-putty|Reset PuTTY to pure vt100,
12400
rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
12401
use=vt100,
12402
+putty-256color|PuTTY 0.58 with xterm 256-colors,
12403
+ use=xterm+256color, use=putty,
12404
12405
# This entry is for Tera Term Pro version 2.3, for MS-Windows 95/NT written by
12406
# T. Teranishi dated Mar 10, 1998. It is a free software terminal emulator
12407
@@ -2981,8 +2983,9 @@ xterm-new|modern xterm terminal emulator
12408
kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
12409
kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
12410
kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
12411
- kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
12412
- rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm-basic,
12413
+ kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
12414
+ kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
12415
+ use=xterm-basic,
12416
#
12417
# This fragment describes as much of XFree86 xterm's "pc-style" function
12418
# keys as will fit into terminfo's 60 function keys.
12419
@@ -3057,18 +3060,21 @@ xterm-xi|xterm on XI Graphics Accelerate
12420
12421
# This is one of the variants of XFree86 3.3 xterm, updated for 4.0 (T.Dickey)
12422
xterm-16color|xterm with 16 colors like aixterm,
12423
- ncv#32, use=ibm+16color, use=xterm-new,
12424
+ use=ibm+16color, use=xterm-new,
12425
12426
-# These variants of XFree86 3.9.16 xterm are built as a configure option.
12427
-xterm-256color|xterm with 256 colors,
12428
+xterm+256color|xterm 256-color feature,
12429
ccc,
12430
colors#256, pairs#32767,
12431
initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
12432
setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
12433
- setb=\E[48;5;%p1%dm, setf=\E[38;5;%p1%dm,
12434
- use=xterm-new,
12435
+xterm+88color|xterm 88-color feature,
12436
+ colors#88, pairs#7744, use=xterm+256color,
12437
+
12438
+# These variants of XFree86 3.9.16 xterm are built as a configure option.
12439
+xterm-256color|xterm with 256 colors,
12440
+ use=xterm+256color, use=xterm-new,
12441
xterm-88color|xterm with 88 colors,
12442
- colors#88, pairs#7744, use=xterm-256color,
12443
+ use=xterm+88color, use=xterm-256color,
12444
12445
# These two are used to demonstrate the any-event mouse support, i.e., by
12446
# using an extended name "XM" which tells ncurses to put the terminal into
12447
@@ -3330,6 +3336,9 @@ gnome|GNOME Terminal,
12448
rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
12449
use=gnome-rh90,
12450
12451
+gnome-256color|GNOME Terminal with xterm 256-colors,
12452
+ use=xterm+256color, use=gnome,
12453
+
12454
# This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
12455
# or not is debatable).
12456
kvt|KDE terminal,
12457
@@ -3410,20 +3419,20 @@ konsole-16color|klone of xterm-16color,
12458
konsole|KDE console window,
12459
use=konsole-xf4x,
12460
12461
-# Based on mlterm 2.8.0's mlterm.ti, with corrections/additions from reading
12462
+# Based on mlterm 2.9.2's mlterm.ti, with corrections/additions from reading
12463
# the source code and running tack -TD
12464
#
12465
# This is nominally a vt102 emulator, with features borrowed from rxvt and
12466
# xterm.
12467
#
12468
# There are some problems with vttest:
12469
-# save/restore cursor doesn't restore character
12470
# test of character sets leaves it in line-drawing mode.
12471
mlterm|multi lingual terminal emulator,
12472
am, eslok, km, mc5i, mir, msgr, npc, xenl,
12473
colors#8, cols#80, it#8, lines#24, pairs#64,
12474
acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
12475
- bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=^M,
12476
+ bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
12477
+ clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
12478
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
12479
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
12480
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
12481
@@ -3441,7 +3450,7 @@ mlterm|multi lingual terminal emulator,
12482
nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
12483
rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l,
12484
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>,
12485
- rmso=\E[m, rmul=\E[m,
12486
+ rmso=\E[27m, rmul=\E[24m,
12487
rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
12488
sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
12489
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
12490
@@ -3493,7 +3502,7 @@ rxvt-basic|rxvt terminal base (X Window
12491
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
12492
sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
12493
smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
12494
- use=vt220+keypad, use=rxvt+pcfkeys,
12495
+ use=rxvt+pcfkeys, use=vt220+keypad,
12496
# Key Codes from rxvt reference:
12497
#
12498
# Note: Shift + F1-F10 generates F11-F20
12499
@@ -3586,6 +3595,8 @@ rxvt|rxvt terminal emulator (X Window Sy
12500
vpa=\E[%i%p1%dd, use=rxvt-basic, use=ecma+color,
12501
rxvt-color|rxvt terminal emulator (X Window System),
12502
use=rxvt,
12503
+rxvt-256color|rxvt 2.7.9 with xterm 256-colors,
12504
+ use=xterm+256color, use=rxvt,
12505
rxvt-xpm|rxvt terminal emulator (X Window System),
12506
use=rxvt,
12507
rxvt-cygwin|rxvt terminal emulator (X Window System) on cygwin,
12508
@@ -4730,32 +4741,35 @@ cygwinB19|ansi emulation for cygwin32,
12509
# civis [make cursor invisible] causes everything to stackdump? \E[?25l\E[?1c
12510
# ech [erase characters param] broken \E[%p1%dX
12511
# kcbt [back-tab key] not implemented in cygwin? \E[Z
12512
+#
12513
+# 2005/11/12 -TD
12514
+# Remove cbt since it does not work in current cygwin
12515
+# Add 'mir' and 'in' flags based on tack
12516
cygwin|ansi emulation for Cygwin,
12517
- am, hs, in, msgr, xon,
12518
+ am, hs, mir, msgr, xon,
12519
colors#8, it#8, pairs#64,
12520
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
12521
- bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, cr=^M,
12522
- cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
12523
- cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
12524
- cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
12525
- dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, fsl=^G,
12526
- home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
12527
- ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m,
12528
- kb2=\E[G, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
12529
- kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A,
12530
- kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
12531
- kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
12532
- kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~,
12533
- kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
12534
- kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
12535
- knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=^M^J, op=\E[39;49m,
12536
- rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m,
12537
- rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmpch=\E[10m,
12538
- rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
12539
- setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
12540
+ bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, cub=\E[%p1%dD,
12541
+ cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC,
12542
+ cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
12543
+ cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
12544
+ dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, fsl=^G, home=\E[H,
12545
+ hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
12546
+ il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kb2=\E[G,
12547
+ kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
12548
+ kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
12549
+ kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
12550
+ kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
12551
+ kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
12552
+ kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
12553
+ khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kspd=^Z,
12554
+ nel=^M^J, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
12555
+ rmacs=\E[10m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
12556
+ rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
12557
+ sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
12558
sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
12559
- sgr0=\E[0;10m, smacs=\E11m, smcup=\E7\E[?47h, smir=\E[4h,
12560
- smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
12561
+ sgr0=\E[0;10m, smacs=\E[11m, smcup=\E7\E[?47h,
12562
+ smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
12563
u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\E[c,
12564
vpa=\E[%i%p1%dd,
12565
12566
@@ -9115,13 +9129,13 @@ rbcomm-w|IBM PC with RBcomm in 132 colum
12567
# NOTE: calling 'beep' turns on the backlight (bell)
12568
# NOTE: calling 'flash' turns it on and back off (visual bell)
12569
#
12570
-MtxOrb| Generic Matrix Orbital LCD display,
12571
+MtxOrb|Generic Matrix Orbital LCD display,
12572
bel=\376B^A, clear=\376X\376C\376R\376K\376T,
12573
cnorm=\376K\376T, cub1=\376L, cuf1=\376M,
12574
flash=\376B\001$<200>\376F, home=\376H,
12575
-MtxOrb204| 20x4 Matrix Orbital LCD display,
12576
+MtxOrb204|20x4 Matrix Orbital LCD display,
12577
cols#20, lines#4, use=MtxOrb,
12578
-MtxOrb162| 16x2 Matrix Orbital LCD display,
12579
+MtxOrb162|16x2 Matrix Orbital LCD display,
12580
cols#16, lines#2, use=MtxOrb,
12581
# The end
12582
12583
@@ -16213,6 +16227,18 @@ nsterm-s|AppKit Terminal.app v41+ w/MacR
12584
nsterm-c-s|AppKit Terminal.app v51+ w/MacRoman charset (full color w/statusline),
12585
use=nsterm+s, use=nsterm+c, use=nsterm+mac,
12586
12587
+
12588
+# This entry is based on newsgroup comments by Alain Bench, Christian Ebert,
12589
+# and D P Schreber comparing to nsterm-c-s-acs.
12590
+#
12591
+# D P Schreber notes that $TERM can be set in Terminal.app, e.g.,
12592
+# defaults write com.apple.Terminal TermCapString nsterm-c-s-acs
12593
+# and that it is not set in Terminal's preferences dialog.
12594
+nsterm-16color|AppKit Terminal.app v100.1.8 with MacOS X 10.3.9,
12595
+ kdch1=\E[3~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
12596
+ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
12597
+ knp=\E[6~, kpp=\E[5~, use=nsterm-c-s-acs,
12598
+
12599
# xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
12600
#
12601
# On PowerPC platforms, Apple's Darwin operating system uses a
12602
@@ -21009,6 +21035,29 @@ v3220|LANPAR Vision II model 3220/3221/3
12603
# * modify sgr string of prism9 to better match the individual
12604
# attributes -TD
12605
#
12606
+# 2005-10-15
12607
+# * correct order of use= in rxvt-basic -TD
12608
+#
12609
+# 2005-10-26
12610
+# * use kind/kri as shifted up/down cursor keys for xterm-new -TD
12611
+#
12612
+# 2005-11-12
12613
+# * other minor fixes to cygwin based on tack -TD
12614
+# * correct smacs in cygwin (report by Baurzhan Ismagulov).
12615
+#
12616
+# 2006-02-18
12617
+# * add nsterm-16color entry -TD
12618
+# * remove ncv flag from xterm-16color -TD
12619
+# * remove setf/setb from xterm-256color to match xterm #209 -TD
12620
+# * update mlterm entry to 2.9.2 -TD
12621
+#
12622
+# 2006-02-25
12623
+# * fixes to make nsterm-16color match report
12624
+# by Christian Ebert -Alain Bench
12625
+#
12626
+# 2006-04-22
12627
+# * add gnome-256color, putty-256color, rxvt-256color -TD
12628
+#
12629
# The following sets edit modes for GNU EMACS.
12630
# Local Variables:
12631
# fill-prefix:"\t"
12632
Index: ncurses-5.5/ncurses/base/MKkeyname.awk
12633
===================================================================
12634
--- ncurses-5.5.orig/ncurses/base/MKkeyname.awk 2005-04-30 15:26:25.000000000 -0400
12635
+++ ncurses-5.5/ncurses/base/MKkeyname.awk 2006-04-18 15:47:22.000000000 -0400
12636
@@ -1,4 +1,4 @@
12637
-# $Id: MKkeyname.awk,v 1.28 2005/04/30 19:26:25 tom Exp $
12638
+# $Id: MKkeyname.awk,v 1.29 2005/10/22 19:01:23 tom Exp $
12639
##############################################################################
12640
# Copyright (c) 1999-2002,2005 Free Software Foundation, Inc. #
12641
# #
12642
@@ -97,6 +97,7 @@ END {
12643
print " break;"
12644
print " }"
12645
print " }"
12646
+ print " free(bound);"
12647
print " if (result != 0)"
12648
print " break;"
12649
print " }"
12650
Index: ncurses-5.5/ncurses/base/MKlib_gen.sh
12651
===================================================================
12652
--- ncurses-5.5.orig/ncurses/base/MKlib_gen.sh 2005-06-11 15:26:05.000000000 -0400
12653
+++ ncurses-5.5/ncurses/base/MKlib_gen.sh 2006-04-18 15:47:22.000000000 -0400
12654
@@ -2,7 +2,7 @@
12655
#
12656
# MKlib_gen.sh -- generate sources from curses.h macro definitions
12657
#
12658
-# ($Id: MKlib_gen.sh,v 1.24 2005/06/11 19:26:05 tom Exp $)
12659
+# ($Id: MKlib_gen.sh,v 1.25 2005/12/17 17:52:14 tom Exp $)
12660
#
12661
##############################################################################
12662
# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. #
12663
@@ -407,7 +407,10 @@ sed -n -f $ED1 \
12664
| sed -e 's/^\([a-z_][a-z_]*[ *]*\)/\1 gen_/' -e 's/ / /g' >>$TMP
12665
12666
$preprocessor $TMP 2>/dev/null \
12667
-| sed -e 's/ / /g' -e 's/^ //' \
12668
+| sed \
12669
+ -e 's/ / /g' \
12670
+ -e 's/^ //' \
12671
+ -e 's/^_Bool/bool/' \
12672
| $AWK -f $AW2 \
12673
| sed -f $ED3 \
12674
| sed \
12675
Index: ncurses-5.5/ncurses/base/MKunctrl.awk
12676
===================================================================
12677
--- ncurses-5.5.orig/ncurses/base/MKunctrl.awk 2004-04-03 17:50:37.000000000 -0500
12678
+++ ncurses-5.5/ncurses/base/MKunctrl.awk 2006-04-18 15:47:22.000000000 -0400
12679
@@ -1,6 +1,6 @@
12680
-# $Id: MKunctrl.awk,v 1.10 2004/04/03 22:50:37 tom Exp $
12681
+# $Id: MKunctrl.awk,v 1.11 2005/12/17 22:48:37 tom Exp $
12682
##############################################################################
12683
-# Copyright (c) 1998,2001,2004 Free Software Foundation, Inc. #
12684
+# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. #
12685
# #
12686
# Permission is hereby granted, free of charge, to any person obtaining a #
12687
# copy of this software and associated documentation files (the "Software"), #
12688
@@ -41,6 +41,7 @@ BEGIN {
12689
END {
12690
print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)"
12691
print "{"
12692
+
12693
printf "static const char* const table[] = {"
12694
for ( ch = 0; ch < 256; ch++ ) {
12695
gap = ","
12696
@@ -63,10 +64,44 @@ END {
12697
printf "%s", gap
12698
}
12699
print "};"
12700
- print "int check = ChCharOf(ch);"
12701
+
12702
+ print ""
12703
+ print "#if NCURSES_EXT_FUNCS"
12704
+ printf "static const char* const table2[] = {"
12705
+ for ( ch = 128; ch < 160; ch++ ) {
12706
+ gap = ","
12707
+ if ((ch % 8) == 0)
12708
+ printf "\n "
12709
+ if (ch >= 128 && ch < 160) {
12710
+ printf "\"\\%03o\"", ch
12711
+ gap = gap " "
12712
+ }
12713
+ if (ch == 255)
12714
+ gap = "\n"
12715
+ else if (((ch + 1) % 8) != 0)
12716
+ gap = gap " "
12717
+ printf "%s", gap
12718
+ }
12719
+ print "};"
12720
+ print "#endif /* NCURSES_EXT_FUNCS */"
12721
+
12722
print ""
12723
- print "\tif (check < 0 || check >= (int)SIZEOF(table)) return 0;"
12724
+ print "\tint check = ChCharOf(ch);"
12725
+ print "\tconst char *result;"
12726
print ""
12727
- print "\treturn (NCURSES_CONST char *)table[check];"
12728
+ print "\tif (check >= 0 && check < (int)SIZEOF(table)) {"
12729
+ print "#if NCURSES_EXT_FUNCS"
12730
+ print "\t\tif ((SP != 0)"
12731
+ print "\t\t && (SP->_legacy_coding > 1)"
12732
+ print "\t\t && (check >= 128)"
12733
+ print "\t\t && (check < 160))"
12734
+ print "\t\t\tresult = table2[check - 128];"
12735
+ print "\t\telse"
12736
+ print "#endif /* NCURSES_EXT_FUNCS */"
12737
+ print "\t\t\tresult = table[check];"
12738
+ print "\t} else {"
12739
+ print "\t\tresult = 0;"
12740
+ print "\t}"
12741
+ print "\treturn (NCURSES_CONST char *)result;"
12742
print "}"
12743
}
12744
Index: ncurses-5.5/ncurses/base/keybound.c
12745
===================================================================
12746
--- ncurses-5.5.orig/ncurses/base/keybound.c 2005-04-30 12:53:42.000000000 -0400
12747
+++ ncurses-5.5/ncurses/base/keybound.c 2006-04-18 15:47:22.000000000 -0400
12748
@@ -32,20 +32,19 @@
12749
12750
#include <curses.priv.h>
12751
12752
-MODULE_ID("$Id: keybound.c,v 1.5 2005/04/30 16:53:42 tom Exp $")
12753
+MODULE_ID("$Id: keybound.c,v 1.6 2005/11/26 20:08:50 tom Exp $")
12754
12755
/*
12756
* Returns the count'th string definition which is associated with the
12757
* given keycode. The result is malloc'd, must be freed by the caller.
12758
*/
12759
-
12760
NCURSES_EXPORT(char *)
12761
keybound(int code, int count)
12762
{
12763
char *result = 0;
12764
12765
T((T_CALLED("keybound(%d,%d)"), code, count));
12766
- if (SP != 0) {
12767
+ if (SP != 0 && code >= 0) {
12768
result = _nc_expand_try(SP->_keytry, code, &count, 0);
12769
}
12770
returnPtr(result);
12771
Index: ncurses-5.5/ncurses/base/legacy_coding.c
12772
===================================================================
12773
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
12774
+++ ncurses-5.5/ncurses/base/legacy_coding.c 2006-04-18 15:47:22.000000000 -0400
12775
@@ -0,0 +1,48 @@
12776
+/****************************************************************************
12777
+ * Copyright (c) 2005 Free Software Foundation, Inc. *
12778
+ * *
12779
+ * Permission is hereby granted, free of charge, to any person obtaining a *
12780
+ * copy of this software and associated documentation files (the *
12781
+ * "Software"), to deal in the Software without restriction, including *
12782
+ * without limitation the rights to use, copy, modify, merge, publish, *
12783
+ * distribute, distribute with modifications, sublicense, and/or sell *
12784
+ * copies of the Software, and to permit persons to whom the Software is *
12785
+ * furnished to do so, subject to the following conditions: *
12786
+ * *
12787
+ * The above copyright notice and this permission notice shall be included *
12788
+ * in all copies or substantial portions of the Software. *
12789
+ * *
12790
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
12791
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
12792
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
12793
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
12794
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
12795
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
12796
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
12797
+ * *
12798
+ * Except as contained in this notice, the name(s) of the above copyright *
12799
+ * holders shall not be used in advertising or otherwise to promote the *
12800
+ * sale, use or other dealings in this Software without prior written *
12801
+ * authorization. *
12802
+ ****************************************************************************/
12803
+
12804
+/****************************************************************************
12805
+ * Author: Thomas E. Dickey *
12806
+ ****************************************************************************/
12807
+
12808
+#include <curses.priv.h>
12809
+
12810
+MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $")
12811
+
12812
+NCURSES_EXPORT(int)
12813
+use_legacy_coding(int level)
12814
+{
12815
+ int result = ERR;
12816
+
12817
+ T((T_CALLED("use_legacy_coding(%d)"), level));
12818
+ if (level >= 0 && level <= 2 && SP != 0) {
12819
+ result = SP->_legacy_coding;
12820
+ SP->_legacy_coding = level;
12821
+ }
12822
+ returnCode(result);
12823
+}
12824
Index: ncurses-5.5/ncurses/base/lib_addch.c
12825
===================================================================
12826
--- ncurses-5.5.orig/ncurses/base/lib_addch.c 2005-03-27 11:52:16.000000000 -0500
12827
+++ ncurses-5.5/ncurses/base/lib_addch.c 2006-04-18 15:48:07.000000000 -0400
12828
@@ -1,5 +1,5 @@
12829
/****************************************************************************
12830
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
12831
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
12832
* *
12833
* Permission is hereby granted, free of charge, to any person obtaining a *
12834
* copy of this software and associated documentation files (the *
12835
@@ -36,7 +36,9 @@
12836
#include <curses.priv.h>
12837
#include <ctype.h>
12838
12839
-MODULE_ID("$Id: lib_addch.c,v 1.95 2005/03/27 16:52:16 tom Exp $")
12840
+MODULE_ID("$Id: lib_addch.c,v 1.101 2006/03/12 17:07:08 tom Exp $")
12841
+
12842
+static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
12843
12844
/*
12845
* Ugly microtweaking alert. Everything from here to end of module is
12846
@@ -51,7 +53,7 @@ MODULE_ID("$Id: lib_addch.c,v 1.95 2005/
12847
/* Return bit mask for clearing color pair number if given ch has color */
12848
#define COLOR_MASK(ch) (~(attr_t)((ch) & A_COLOR ? A_COLOR : 0))
12849
12850
-static inline NCURSES_CH_T
12851
+static NCURSES_INLINE NCURSES_CH_T
12852
render_char(WINDOW *win, NCURSES_CH_T ch)
12853
/* compute a rendition of the given char correct for the current context */
12854
{
12855
@@ -120,6 +122,20 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch)
12856
#define CHECK_POSITION(win, x, y) /* nothing */
12857
#endif
12858
12859
+static bool
12860
+newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
12861
+{
12862
+ bool result = FALSE;
12863
+
12864
+ if (*ypos >= win->_regtop && *ypos == win->_regbottom) {
12865
+ *ypos = win->_regbottom;
12866
+ result = TRUE;
12867
+ } else {
12868
+ *ypos += 1;
12869
+ }
12870
+ return result;
12871
+}
12872
+
12873
/*
12874
* The _WRAPPED flag is useful only for telling an application that we've just
12875
* wrapped the cursor. We don't do anything with this flag except set it when
12876
@@ -133,8 +149,7 @@ static int
12877
wrap_to_next_line(WINDOW *win)
12878
{
12879
win->_flags |= _WRAPPED;
12880
- if (++win->_cury > win->_regbottom) {
12881
- win->_cury = win->_regbottom;
12882
+ if (newline_forces_scroll(win, &(win->_cury))) {
12883
win->_curx = win->_maxx;
12884
if (!win->_scroll)
12885
return (ERR);
12886
@@ -153,7 +168,7 @@ static int waddch_literal(WINDOW *, NCUR
12887
static void
12888
fill_cells(WINDOW *win, int count)
12889
{
12890
- NCURSES_CH_T blank = NewChar2(BLANK_TEXT, BLANK_ATTR);
12891
+ NCURSES_CH_T blank = blankchar;
12892
int save_x = win->_curx;
12893
int save_y = win->_cury;
12894
12895
@@ -222,7 +237,7 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
12896
12897
static
12898
#if !USE_WIDEC_SUPPORT /* cannot be inline if it is recursive */
12899
-inline
12900
+NCURSES_INLINE
12901
#endif
12902
int
12903
waddch_literal(WINDOW *win, NCURSES_CH_T ch)
12904
@@ -315,7 +330,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T
12905
* setup though.
12906
*/
12907
for (i = 0; i < len; ++i) {
12908
- if (isWidecBase(win->_line[y].text[i])) {
12909
+ if (isWidecBase(win->_line[y].text[x + i])) {
12910
break;
12911
} else if (isWidecExt(win->_line[y].text[x + i])) {
12912
for (j = i; x + j <= win->_maxx; ++j) {
12913
@@ -334,7 +349,9 @@ waddch_literal(WINDOW *win, NCURSES_CH_T
12914
for (i = 0; i < len; ++i) {
12915
NCURSES_CH_T value = ch;
12916
SetWidecExt(value, i);
12917
- TR(TRACE_VIRTPUT, ("multicolumn %d:%d", i + 1, len));
12918
+ TR(TRACE_VIRTPUT, ("multicolumn %d:%d (%d,%d)",
12919
+ i + 1, len,
12920
+ win->_begy + y, win->_begx + x));
12921
line->text[x] = value;
12922
CHANGED_CELL(line, x);
12923
++x;
12924
@@ -365,11 +382,11 @@ waddch_literal(WINDOW *win, NCURSES_CH_T
12925
return OK;
12926
}
12927
12928
-static inline int
12929
+static NCURSES_INLINE int
12930
waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
12931
/* the workhorse function -- add a character to the given window */
12932
{
12933
- int x, y;
12934
+ NCURSES_SIZE_T x, y;
12935
chtype t = CharOf(ch);
12936
const char *s = unctrl(t);
12937
12938
@@ -412,7 +429,7 @@ waddch_nosync(WINDOW *win, const NCURSES
12939
*/
12940
if ((!win->_scroll && (y == win->_regbottom))
12941
|| (x <= win->_maxx)) {
12942
- NCURSES_CH_T blank = NewChar2(BLANK_TEXT, BLANK_ATTR);
12943
+ NCURSES_CH_T blank = blankchar;
12944
AddAttr(blank, AttrOf(ch));
12945
while (win->_curx < x) {
12946
if (waddch_literal(win, blank) == ERR)
12947
@@ -422,9 +439,8 @@ waddch_nosync(WINDOW *win, const NCURSES
12948
} else {
12949
wclrtoeol(win);
12950
win->_flags |= _WRAPPED;
12951
- if (++y > win->_regbottom) {
12952
+ if (newline_forces_scroll(win, &y)) {
12953
x = win->_maxx;
12954
- y--;
12955
if (win->_scroll) {
12956
scroll(win);
12957
x = 0;
12958
@@ -436,8 +452,7 @@ waddch_nosync(WINDOW *win, const NCURSES
12959
break;
12960
case '\n':
12961
wclrtoeol(win);
12962
- if (++y > win->_regbottom) {
12963
- y--;
12964
+ if (newline_forces_scroll(win, &y)) {
12965
if (win->_scroll)
12966
scroll(win);
12967
else
12968
Index: ncurses-5.5/ncurses/base/lib_bkgd.c
12969
===================================================================
12970
--- ncurses-5.5.orig/ncurses/base/lib_bkgd.c 2005-04-16 14:03:48.000000000 -0400
12971
+++ ncurses-5.5/ncurses/base/lib_bkgd.c 2006-04-18 15:47:22.000000000 -0400
12972
@@ -36,7 +36,7 @@
12973
12974
#include <curses.priv.h>
12975
12976
-MODULE_ID("$Id: lib_bkgd.c,v 1.32 2005/04/16 18:03:48 tom Exp $")
12977
+MODULE_ID("$Id: lib_bkgd.c,v 1.34 2005/11/20 01:23:46 tom Exp $")
12978
12979
/*
12980
* Set the window's background information.
12981
@@ -44,7 +44,7 @@ MODULE_ID("$Id: lib_bkgd.c,v 1.32 2005/0
12982
#if USE_WIDEC_SUPPORT
12983
NCURSES_EXPORT(void)
12984
#else
12985
-static inline void
12986
+static NCURSES_INLINE void
12987
#endif
12988
wbkgrndset(WINDOW *win, const ARG_CH_T ch)
12989
{
12990
@@ -111,7 +111,7 @@ wbkgdset(WINDOW *win, chtype ch)
12991
#if USE_WIDEC_SUPPORT
12992
NCURSES_EXPORT(int)
12993
#else
12994
-static inline int
12995
+static NCURSES_INLINE int
12996
#undef wbkgrnd
12997
#endif
12998
wbkgrnd(WINDOW *win, const ARG_CH_T ch)
12999
@@ -131,11 +131,11 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch)
13000
13001
for (y = 0; y <= win->_maxy; y++) {
13002
for (x = 0; x <= win->_maxx; x++) {
13003
- if (CharEq(win->_line[y].text[x], old_bkgrnd))
13004
+ if (CharEq(win->_line[y].text[x], old_bkgrnd)) {
13005
win->_line[y].text[x] = win->_nc_bkgd;
13006
- else {
13007
+ } else {
13008
NCURSES_CH_T wch = win->_line[y].text[x];
13009
- RemAttr(wch, (~A_ALTCHARSET));
13010
+ RemAttr(wch, (~(A_ALTCHARSET | A_CHARTEXT)));
13011
win->_line[y].text[x] = _nc_render(win, wch);
13012
}
13013
}
13014
Index: ncurses-5.5/ncurses/base/lib_box.c
13015
===================================================================
13016
--- ncurses-5.5.orig/ncurses/base/lib_box.c 2002-09-14 21:04:27.000000000 -0400
13017
+++ ncurses-5.5/ncurses/base/lib_box.c 2006-04-18 15:47:22.000000000 -0400
13018
@@ -1,5 +1,5 @@
13019
/****************************************************************************
13020
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. *
13021
+ * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
13022
* *
13023
* Permission is hereby granted, free of charge, to any person obtaining a *
13024
* copy of this software and associated documentation files (the *
13025
@@ -29,6 +29,8 @@
13026
/****************************************************************************
13027
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
13028
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
13029
+ * and: Thomas E. Dickey 1996-on *
13030
+ * and: Sven Verdoolaege 2001 *
13031
****************************************************************************/
13032
13033
/*
13034
@@ -40,10 +42,10 @@
13035
13036
#include <curses.priv.h>
13037
13038
-MODULE_ID("$Id: lib_box.c,v 1.21 2002/09/15 01:04:27 tom Exp $")
13039
+MODULE_ID("$Id: lib_box.c,v 1.22 2005/11/26 15:39:42 tom Exp $")
13040
13041
#if USE_WIDEC_SUPPORT
13042
-static inline chtype
13043
+static NCURSES_INLINE chtype
13044
_my_render(WINDOW *win, chtype ch)
13045
{
13046
NCURSES_CH_T wch;
13047
Index: ncurses-5.5/ncurses/base/lib_color.c
13048
===================================================================
13049
--- ncurses-5.5.orig/ncurses/base/lib_color.c 2005-06-18 16:19:08.000000000 -0400
13050
+++ ncurses-5.5/ncurses/base/lib_color.c 2006-04-18 15:47:22.000000000 -0400
13051
@@ -42,7 +42,7 @@
13052
#include <term.h>
13053
#include <tic.h>
13054
13055
-MODULE_ID("$Id: lib_color.c,v 1.75 2005/06/18 20:19:08 tom Exp $")
13056
+MODULE_ID("$Id: lib_color.c,v 1.77 2005/11/26 20:05:22 tom Exp $")
13057
13058
/*
13059
* These should be screen structure members. They need to be globals for
13060
@@ -371,13 +371,11 @@ init_pair(short pair, short f, short b)
13061
tp[f].red, tp[f].green, tp[f].blue,
13062
tp[b].red, tp[b].green, tp[b].blue));
13063
13064
- if (initialize_pair) {
13065
- TPUTS_TRACE("initialize_pair");
13066
- putp(tparm(initialize_pair,
13067
- pair,
13068
- tp[f].red, tp[f].green, tp[f].blue,
13069
- tp[b].red, tp[b].green, tp[b].blue));
13070
- }
13071
+ TPUTS_TRACE("initialize_pair");
13072
+ putp(tparm(initialize_pair,
13073
+ pair,
13074
+ tp[f].red, tp[f].green, tp[f].blue,
13075
+ tp[b].red, tp[b].green, tp[b].blue));
13076
}
13077
13078
returnCode(OK);
13079
@@ -499,7 +497,7 @@ pair_content(short pair, short *f, short
13080
}
13081
13082
NCURSES_EXPORT(void)
13083
-_nc_do_color(int old_pair, int pair, bool reverse, int (*outc) (int))
13084
+_nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int))
13085
{
13086
NCURSES_COLOR_T fg = COLOR_DEFAULT;
13087
NCURSES_COLOR_T bg = COLOR_DEFAULT;
13088
@@ -513,7 +511,7 @@ _nc_do_color(int old_pair, int pair, boo
13089
tputs(tparm(set_color_pair, pair), 1, outc);
13090
return;
13091
} else if (SP != 0) {
13092
- pair_content(pair, &fg, &bg);
13093
+ pair_content((short) pair, &fg, &bg);
13094
}
13095
}
13096
13097
Index: ncurses-5.5/ncurses/base/lib_dft_fgbg.c
13098
===================================================================
13099
--- ncurses-5.5.orig/ncurses/base/lib_dft_fgbg.c 2005-01-29 16:42:15.000000000 -0500
13100
+++ ncurses-5.5/ncurses/base/lib_dft_fgbg.c 2006-04-18 15:47:22.000000000 -0400
13101
@@ -33,7 +33,7 @@
13102
#include <curses.priv.h>
13103
#include <term.h>
13104
13105
-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.17 2005/01/29 21:42:15 tom Exp $")
13106
+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $")
13107
13108
/*
13109
* Modify the behavior of color-pair 0 so that the library doesn't assume that
13110
@@ -68,7 +68,7 @@ assume_default_colors(int fg, int bg)
13111
if (SP->_color_pairs != 0) {
13112
bool save = SP->_default_color;
13113
SP->_default_color = TRUE;
13114
- init_pair(0, fg, bg);
13115
+ init_pair(0, (short) fg, (short) bg);
13116
SP->_default_color = save;
13117
}
13118
returnCode(OK);
13119
Index: ncurses-5.5/ncurses/base/lib_erase.c
13120
===================================================================
13121
--- ncurses-5.5.orig/ncurses/base/lib_erase.c 2001-12-18 20:06:13.000000000 -0500
13122
+++ ncurses-5.5/ncurses/base/lib_erase.c 2006-04-18 15:47:22.000000000 -0400
13123
@@ -29,6 +29,7 @@
13124
/****************************************************************************
13125
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
13126
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
13127
+ * and: Thomas E. Dickey 1996-on *
13128
****************************************************************************/
13129
13130
/*
13131
@@ -40,7 +41,7 @@
13132
13133
#include <curses.priv.h>
13134
13135
-MODULE_ID("$Id: lib_erase.c,v 1.15 2001/12/19 01:06:13 tom Exp $")
13136
+MODULE_ID("$Id: lib_erase.c,v 1.16 2005/10/30 00:36:36 tom Exp $")
13137
13138
NCURSES_EXPORT(int)
13139
werase(WINDOW *win)
13140
@@ -58,6 +59,24 @@ werase(WINDOW *win)
13141
start = win->_line[y].text;
13142
end = &start[win->_maxx];
13143
13144
+ /*
13145
+ * If this is a derived window, we have to handle the case where
13146
+ * a multicolumn character extends into the window that we are
13147
+ * erasing.
13148
+ */
13149
+ if_WIDEC({
13150
+ if (isWidecExt(start[0])) {
13151
+ int x = (win->_parent != 0) ? (win->_begx) : 0;
13152
+ while (x-- > 0) {
13153
+ if (isWidecBase(start[-1])) {
13154
+ --start;
13155
+ break;
13156
+ }
13157
+ --start;
13158
+ }
13159
+ }
13160
+ });
13161
+
13162
for (sp = start; sp <= end; sp++)
13163
*sp = blank;
13164
13165
Index: ncurses-5.5/ncurses/base/lib_getch.c
13166
===================================================================
13167
--- ncurses-5.5.orig/ncurses/base/lib_getch.c 2005-06-11 14:08:57.000000000 -0400
13168
+++ ncurses-5.5/ncurses/base/lib_getch.c 2006-04-18 15:48:07.000000000 -0400
13169
@@ -1,5 +1,5 @@
13170
/****************************************************************************
13171
- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
13172
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
13173
* *
13174
* Permission is hereby granted, free of charge, to any person obtaining a *
13175
* copy of this software and associated documentation files (the *
13176
@@ -41,7 +41,7 @@
13177
13178
#include <curses.priv.h>
13179
13180
-MODULE_ID("$Id: lib_getch.c,v 1.73 2005/06/11 18:08:57 tom Exp $")
13181
+MODULE_ID("$Id: lib_getch.c,v 1.75 2006/03/04 20:06:09 tom Exp $")
13182
13183
#include <fifo_defs.h>
13184
13185
@@ -80,7 +80,7 @@ check_mouse_activity(int delay EVENTLIST
13186
return rc;
13187
}
13188
13189
-static inline int
13190
+static NCURSES_INLINE int
13191
fifo_peek(void)
13192
{
13193
int ch = SP->_fifo[peek];
13194
@@ -90,7 +90,7 @@ fifo_peek(void)
13195
return ch;
13196
}
13197
13198
-static inline int
13199
+static NCURSES_INLINE int
13200
fifo_pull(void)
13201
{
13202
int ch;
13203
@@ -110,7 +110,7 @@ fifo_pull(void)
13204
return ch;
13205
}
13206
13207
-static inline int
13208
+static NCURSES_INLINE int
13209
fifo_push(EVENTLIST_0th(_nc_eventlist * evl))
13210
{
13211
int n;
13212
@@ -206,7 +206,7 @@ fifo_push(EVENTLIST_0th(_nc_eventlist *
13213
return ch;
13214
}
13215
13216
-static inline void
13217
+static NCURSES_INLINE void
13218
fifo_clear(void)
13219
{
13220
memset(SP->_fifo, 0, sizeof(SP->_fifo));
13221
@@ -296,23 +296,24 @@ _nc_wgetch(WINDOW *win,
13222
wrefresh(win);
13223
13224
if (!win->_notimeout && (win->_delay >= 0 || SP->_cbreak > 1)) {
13225
- int delay;
13226
+ if (head == -1) { /* fifo is empty */
13227
+ int delay;
13228
+ int rc;
13229
13230
- TR(TRACE_IEVENT, ("timed delay in wgetch()"));
13231
- if (SP->_cbreak > 1)
13232
- delay = (SP->_cbreak - 1) * 100;
13233
- else
13234
- delay = win->_delay;
13235
+ TR(TRACE_IEVENT, ("timed delay in wgetch()"));
13236
+ if (SP->_cbreak > 1)
13237
+ delay = (SP->_cbreak - 1) * 100;
13238
+ else
13239
+ delay = win->_delay;
13240
13241
#ifdef NCURSES_WGETCH_EVENTS
13242
- if (event_delay >= 0 && delay > event_delay)
13243
- delay = event_delay;
13244
+ if (event_delay >= 0 && delay > event_delay)
13245
+ delay = event_delay;
13246
#endif
13247
13248
- TR(TRACE_IEVENT, ("delay is %d milliseconds", delay));
13249
+ TR(TRACE_IEVENT, ("delay is %d milliseconds", delay));
13250
13251
- if (head == -1) { /* fifo is empty */
13252
- int rc = check_mouse_activity(delay EVENTLIST_2nd(evl));
13253
+ rc = check_mouse_activity(delay EVENTLIST_2nd(evl));
13254
13255
#ifdef NCURSES_WGETCH_EVENTS
13256
if (rc & 4) {
13257
@@ -559,7 +560,7 @@ kgetch(EVENTLIST_0th(_nc_eventlist * evl
13258
#ifdef NCURSES_WGETCH_EVENTS
13259
if (rc & 4) {
13260
TR(TRACE_IEVENT, ("interrupted by a user event"));
13261
- /* FIXME Should have preserved remainder timeleft for reusal... */
13262
+ /* FIXME Should have preserved remainder timeleft for reuse... */
13263
peek = head; /* Restart interpreting later */
13264
return KEY_EVENT;
13265
}
13266
Index: ncurses-5.5/ncurses/base/lib_getstr.c
13267
===================================================================
13268
--- ncurses-5.5.orig/ncurses/base/lib_getstr.c 2002-09-01 13:31:12.000000000 -0400
13269
+++ ncurses-5.5/ncurses/base/lib_getstr.c 2006-04-18 15:47:22.000000000 -0400
13270
@@ -1,5 +1,5 @@
13271
/****************************************************************************
13272
- * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc. *
13273
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
13274
* *
13275
* Permission is hereby granted, free of charge, to any person obtaining a *
13276
* copy of this software and associated documentation files (the *
13277
@@ -41,7 +41,7 @@
13278
#include <curses.priv.h>
13279
#include <term.h>
13280
13281
-MODULE_ID("$Id: lib_getstr.c,v 1.24 2002/09/01 17:31:12 tom Exp $")
13282
+MODULE_ID("$Id: lib_getstr.c,v 1.25 2006/01/12 00:33:52 tom Exp $")
13283
13284
/*
13285
* This wipes out the last character, no matter whether it was a tab, control
13286
@@ -129,6 +129,10 @@ wgetnstr_events(WINDOW *win,
13287
if (ch == KEY_EVENT)
13288
break;
13289
#endif
13290
+#ifdef KEY_RESIZE
13291
+ if (ch == KEY_RESIZE)
13292
+ break;
13293
+#endif
13294
if (ch == erasec || ch == KEY_LEFT || ch == KEY_BACKSPACE) {
13295
if (str > oldstr) {
13296
str = WipeOut(win, y, x, oldstr, str, oldecho);
13297
@@ -193,12 +197,17 @@ wgetnstr_events(WINDOW *win,
13298
*str = '\0';
13299
if (ch == ERR)
13300
returnCode(ch);
13301
+
13302
+ T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
13303
+
13304
#ifdef KEY_EVENT
13305
if (ch == KEY_EVENT)
13306
returnCode(ch);
13307
#endif
13308
-
13309
- T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
13310
+#ifdef KEY_RESIZE
13311
+ if (ch == KEY_RESIZE)
13312
+ returnCode(ch);
13313
+#endif
13314
13315
returnCode(OK);
13316
}
13317
Index: ncurses-5.5/ncurses/base/lib_initscr.c
13318
===================================================================
13319
--- ncurses-5.5.orig/ncurses/base/lib_initscr.c 2003-12-27 14:13:51.000000000 -0500
13320
+++ ncurses-5.5/ncurses/base/lib_initscr.c 2006-04-18 15:47:22.000000000 -0400
13321
@@ -1,5 +1,5 @@
13322
/****************************************************************************
13323
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
13324
+ * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
13325
* *
13326
* Permission is hereby granted, free of charge, to any person obtaining a *
13327
* copy of this software and associated documentation files (the *
13328
@@ -45,14 +45,13 @@
13329
#include <sys/termio.h> /* needed for ISC */
13330
#endif
13331
13332
-MODULE_ID("$Id: lib_initscr.c,v 1.33 2003/12/27 19:13:51 tom Exp $")
13333
+MODULE_ID("$Id: lib_initscr.c,v 1.34 2005/10/22 20:30:38 tom Exp $")
13334
13335
NCURSES_EXPORT(WINDOW *)
13336
initscr(void)
13337
{
13338
static bool initialized = FALSE;
13339
NCURSES_CONST char *name;
13340
- int value;
13341
13342
START_TRACE();
13343
T((T_CALLED("initscr()")));
13344
@@ -85,11 +84,6 @@ initscr(void)
13345
exit(EXIT_FAILURE);
13346
}
13347
13348
- /* allow user to set maximum escape delay from the environment */
13349
- if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
13350
- ESCDELAY = value;
13351
- }
13352
-
13353
/* def_shell_mode - done in newterm/_nc_setupscreen */
13354
def_prog_mode();
13355
}
13356
Index: ncurses-5.5/ncurses/base/lib_instr.c
13357
===================================================================
13358
--- ncurses-5.5.orig/ncurses/base/lib_instr.c 2005-04-16 13:51:12.000000000 -0400
13359
+++ ncurses-5.5/ncurses/base/lib_instr.c 2006-04-18 15:47:22.000000000 -0400
13360
@@ -41,7 +41,7 @@
13361
13362
#include <curses.priv.h>
13363
13364
-MODULE_ID("$Id: lib_instr.c,v 1.14 2005/04/16 17:51:12 tom Exp $")
13365
+MODULE_ID("$Id: lib_instr.c,v 1.15 2005/11/20 01:38:03 tom Exp $")
13366
13367
NCURSES_EXPORT(int)
13368
winnstr(WINDOW *win, char *str, int n)
13369
@@ -99,7 +99,7 @@ winnstr(WINDOW *win, char *str, int n)
13370
}
13371
}
13372
#else
13373
- str[i++] = CharOf(win->_line[row].text[col]);
13374
+ str[i++] = (char) CharOf(win->_line[row].text[col]);
13375
#endif
13376
if (++col > win->_maxx) {
13377
col = 0;
13378
Index: ncurses-5.5/ncurses/base/lib_mouse.c
13379
===================================================================
13380
--- ncurses-5.5.orig/ncurses/base/lib_mouse.c 2005-09-10 18:58:57.000000000 -0400
13381
+++ ncurses-5.5/ncurses/base/lib_mouse.c 2006-04-18 15:47:22.000000000 -0400
13382
@@ -79,7 +79,7 @@
13383
13384
#include <curses.priv.h>
13385
13386
-MODULE_ID("$Id: lib_mouse.c,v 1.77 2005/09/10 22:58:57 tom Exp $")
13387
+MODULE_ID("$Id: lib_mouse.c,v 1.79 2005/12/03 20:45:28 tom Exp $")
13388
13389
#include <term.h>
13390
#include <tic.h>
13391
@@ -89,8 +89,11 @@ MODULE_ID("$Id: lib_mouse.c,v 1.77 2005/
13392
#undef buttons /* term.h defines this, and gpm uses it! */
13393
#include <gpm.h>
13394
#include <linux/keyboard.h> /* defines KG_* macros */
13395
+
13396
+#ifdef HAVE_LIBDL
13397
/* use dynamic loader to avoid linkage dependency */
13398
#include <dlfcn.h>
13399
+
13400
#ifdef RTLD_NOW
13401
#define my_RTLD RTLD_NOW
13402
#else
13403
@@ -99,8 +102,10 @@ MODULE_ID("$Id: lib_mouse.c,v 1.77 2005/
13404
#else
13405
make an error
13406
#endif
13407
-#endif
13408
-#endif
13409
+#endif /* RTLD_NOW */
13410
+#endif /* HAVE_LIBDL */
13411
+
13412
+#endif /* !LINT */
13413
#endif /* USE_GPM_SUPPORT */
13414
13415
#if USE_SYSMOUSE
13416
@@ -150,10 +155,10 @@ make an error
13417
#define LIBGPM_SONAME "libgpm.so"
13418
#endif
13419
13420
+#ifdef HAVE_LIBDL
13421
+/* link dynamically to GPM */
13422
#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(obj, #name))
13423
13424
-static Gpm_Connect gpm_connect;
13425
-
13426
typedef int *TYPE_gpm_fd;
13427
typedef int (*TYPE_Gpm_Open) (Gpm_Connect *, int);
13428
typedef int (*TYPE_Gpm_Close) (void);
13429
@@ -163,6 +168,15 @@ static TYPE_gpm_fd my_gpm_fd;
13430
static TYPE_Gpm_Open my_Gpm_Open;
13431
static TYPE_Gpm_Close my_Gpm_Close;
13432
static TYPE_Gpm_GetEvent my_Gpm_GetEvent;
13433
+#else
13434
+/* link statically to GPM */
13435
+#define my_gpm_fd &gpm_fd
13436
+#define my_Gpm_Open Gpm_Open
13437
+#define my_Gpm_Close Gpm_Close
13438
+#define my_Gpm_GetEvent Gpm_GetEvent
13439
+#endif
13440
+
13441
+static Gpm_Connect gpm_connect;
13442
13443
#endif /* LINT */
13444
#endif /* USE_GPM_SUPPORT */
13445
@@ -441,6 +455,7 @@ initialize_mousetype(void)
13446
static bool found = FALSE;
13447
13448
if (first) {
13449
+#ifdef HAVE_LIBDL
13450
void *obj;
13451
first = FALSE;
13452
13453
@@ -455,6 +470,10 @@ initialize_mousetype(void)
13454
found = TRUE;
13455
}
13456
}
13457
+#else /* !HAVE_LIBDL */
13458
+ first = FALSE;
13459
+ found = TRUE;
13460
+#endif
13461
}
13462
13463
/*
13464
@@ -1272,7 +1291,7 @@ mousemask(mmask_t newmask, mmask_t * old
13465
| BUTTON_DOUBLE_CLICKED
13466
| BUTTON_TRIPLE_CLICKED);
13467
13468
- mouse_activate(eventmask != 0);
13469
+ mouse_activate((bool) (eventmask != 0));
13470
13471
result = eventmask;
13472
}
13473
Index: ncurses-5.5/ncurses/base/lib_newterm.c
13474
===================================================================
13475
--- ncurses-5.5.orig/ncurses/base/lib_newterm.c 2004-08-14 16:36:39.000000000 -0400
13476
+++ ncurses-5.5/ncurses/base/lib_newterm.c 2006-04-18 15:47:22.000000000 -0400
13477
@@ -1,5 +1,5 @@
13478
/****************************************************************************
13479
- * Copyright (c) 1998-2002,2004 Free Software Foundation, Inc. *
13480
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
13481
* *
13482
* Permission is hereby granted, free of charge, to any person obtaining a *
13483
* copy of this software and associated documentation files (the *
13484
@@ -48,7 +48,7 @@
13485
#include <term.h> /* clear_screen, cup & friends, cur_term */
13486
#include <tic.h>
13487
13488
-MODULE_ID("$Id: lib_newterm.c,v 1.58 2004/08/14 20:36:39 tom Exp $")
13489
+MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $")
13490
13491
#ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */
13492
#define ONLCR 0
13493
@@ -62,7 +62,7 @@ MODULE_ID("$Id: lib_newterm.c,v 1.58 200
13494
* The newterm function also initializes terminal settings, and since initscr
13495
* is supposed to behave as if it calls newterm, we do it here.
13496
*/
13497
-static inline int
13498
+static NCURSES_INLINE int
13499
_nc_initscr(void)
13500
{
13501
int result = ERR;
13502
@@ -77,8 +77,10 @@ _nc_initscr(void)
13503
buf.c_lflag &= ~(ECHO | ECHONL);
13504
buf.c_iflag &= ~(ICRNL | INLCR | IGNCR);
13505
buf.c_oflag &= ~(ONLCR);
13506
-#else
13507
+#elif HAVE_SGTTY_H
13508
buf.sg_flags &= ~(ECHO | CRMOD);
13509
+#else
13510
+ memset(&buf, 0, sizeof(buf));
13511
#endif
13512
if ((result = _nc_set_tty_mode(&buf)) == OK)
13513
cur_term->Nttyb = buf;
13514
@@ -92,120 +94,123 @@ _nc_initscr(void)
13515
* aside from possibly delaying a filter() call until some terminals have been
13516
* initialized.
13517
*/
13518
-static int filter_mode = FALSE;
13519
+static bool filter_mode = FALSE;
13520
13521
NCURSES_EXPORT(void)
13522
filter(void)
13523
{
13524
+ START_TRACE();
13525
T((T_CALLED("filter")));
13526
filter_mode = TRUE;
13527
returnVoid;
13528
}
13529
13530
+#if NCURSES_EXT_FUNCS
13531
+/*
13532
+ * An extension, allowing the application to open a new screen without
13533
+ * requiring it to also be filtered.
13534
+ */
13535
+NCURSES_EXPORT(void)
13536
+nofilter(void)
13537
+{
13538
+ START_TRACE();
13539
+ T((T_CALLED("nofilter")));
13540
+ filter_mode = FALSE;
13541
+ returnVoid;
13542
+}
13543
+#endif
13544
+
13545
NCURSES_EXPORT(SCREEN *)
13546
newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
13547
{
13548
+ int value;
13549
int errret;
13550
int slk_format = _nc_slk_format;
13551
SCREEN *current;
13552
+ SCREEN *result = 0;
13553
13554
START_TRACE();
13555
T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
13556
13557
- /* this loads the capability entry, then sets LINES and COLS */
13558
- if (setupterm(name, fileno(ofp), &errret) == ERR)
13559
- returnSP(0);
13560
-
13561
- /* implement filter mode */
13562
- if (filter_mode) {
13563
- LINES = 1;
13564
-
13565
- clear_screen = 0;
13566
- cursor_down = parm_down_cursor = 0;
13567
- cursor_address = 0;
13568
- cursor_up = parm_up_cursor = 0;
13569
- row_address = 0;
13570
+ _nc_handle_sigwinch(0);
13571
13572
- cursor_home = carriage_return;
13573
- }
13574
-
13575
- /* If we must simulate soft labels, grab off the line to be used.
13576
- We assume that we must simulate, if it is none of the standard
13577
- formats (4-4 or 3-2-3) for which there may be some hardware
13578
- support. */
13579
- if (num_labels <= 0 || !SLK_STDFMT(slk_format))
13580
- if (slk_format) {
13581
- if (ERR == _nc_ripoffline(-SLK_LINES(slk_format),
13582
- _nc_slk_initialize))
13583
- returnSP(0);
13584
- }
13585
- /* this actually allocates the screen structure, and saves the
13586
- * original terminal settings.
13587
- */
13588
- current = SP;
13589
- _nc_set_screen(0);
13590
- if (_nc_setupscreen(LINES, COLS, ofp) == ERR) {
13591
- _nc_set_screen(current);
13592
- returnSP(0);
13593
+ /* allow user to set maximum escape delay from the environment */
13594
+ if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
13595
+ ESCDELAY = value;
13596
}
13597
13598
- /* if the terminal type has real soft labels, set those up */
13599
- if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format))
13600
- _nc_slk_initialize(stdscr, COLS);
13601
+ /* this loads the capability entry, then sets LINES and COLS */
13602
+ if (setupterm(name, fileno(ofp), &errret) == ERR) {
13603
+ result = 0;
13604
+ } else {
13605
+ /*
13606
+ * This actually allocates the screen structure, and saves the original
13607
+ * terminal settings.
13608
+ */
13609
+ current = SP;
13610
+ _nc_set_screen(0);
13611
+ if (_nc_setupscreen(LINES, COLS, ofp, filter_mode, slk_format) == ERR) {
13612
+ _nc_set_screen(current);
13613
+ result = 0;
13614
+ } else {
13615
+ /* if the terminal type has real soft labels, set those up */
13616
+ if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format))
13617
+ _nc_slk_initialize(stdscr, COLS);
13618
13619
- SP->_ifd = fileno(ifp);
13620
- typeahead(fileno(ifp));
13621
+ SP->_ifd = fileno(ifp);
13622
+ typeahead(fileno(ifp));
13623
#ifdef TERMIOS
13624
- SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
13625
- !(cur_term->Ottyb.c_iflag & ISTRIP));
13626
+ SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
13627
+ !(cur_term->Ottyb.c_iflag & ISTRIP));
13628
#else
13629
- SP->_use_meta = FALSE;
13630
+ SP->_use_meta = FALSE;
13631
#endif
13632
- SP->_endwin = FALSE;
13633
+ SP->_endwin = FALSE;
13634
13635
- /* Check whether we can optimize scrolling under dumb terminals in case
13636
- * we do not have any of these capabilities, scrolling optimization
13637
- * will be useless.
13638
- */
13639
- SP->_scrolling = ((scroll_forward && scroll_reverse) ||
13640
- ((parm_rindex || parm_insert_line || insert_line) &&
13641
- (parm_index || parm_delete_line || delete_line)));
13642
-
13643
- baudrate(); /* sets a field in the SP structure */
13644
-
13645
- SP->_keytry = 0;
13646
-
13647
- /*
13648
- * Check for mismatched graphic-rendition capabilities. Most SVr4
13649
- * terminfo trees contain entries that have rmul or rmso equated to
13650
- * sgr0 (Solaris curses copes with those entries). We do this only for
13651
- * curses, since many termcap applications assume that smso/rmso and
13652
- * smul/rmul are paired, and will not function properly if we remove
13653
- * rmso or rmul. Curses applications shouldn't be looking at this
13654
- * detail.
13655
- */
13656
+ /*
13657
+ * Check whether we can optimize scrolling under dumb terminals in
13658
+ * case we do not have any of these capabilities, scrolling
13659
+ * optimization will be useless.
13660
+ */
13661
+ SP->_scrolling = ((scroll_forward && scroll_reverse) ||
13662
+ ((parm_rindex ||
13663
+ parm_insert_line ||
13664
+ insert_line) &&
13665
+ (parm_index ||
13666
+ parm_delete_line ||
13667
+ delete_line)));
13668
+
13669
+ baudrate(); /* sets a field in the SP structure */
13670
+
13671
+ SP->_keytry = 0;
13672
+
13673
+ /*
13674
+ * Check for mismatched graphic-rendition capabilities. Most SVr4
13675
+ * terminfo trees contain entries that have rmul or rmso equated to
13676
+ * sgr0 (Solaris curses copes with those entries). We do this only
13677
+ * for curses, since many termcap applications assume that
13678
+ * smso/rmso and smul/rmul are paired, and will not function
13679
+ * properly if we remove rmso or rmul. Curses applications
13680
+ * shouldn't be looking at this detail.
13681
+ */
13682
#define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
13683
- SP->_use_rmso = SGR0_TEST(exit_standout_mode);
13684
- SP->_use_rmul = SGR0_TEST(exit_underline_mode);
13685
+ SP->_use_rmso = SGR0_TEST(exit_standout_mode);
13686
+ SP->_use_rmul = SGR0_TEST(exit_underline_mode);
13687
13688
- /* compute movement costs so we can do better move optimization */
13689
- _nc_mvcur_init();
13690
+ /* compute movement costs so we can do better move optimization */
13691
+ _nc_mvcur_init();
13692
13693
- /* initialize terminal to a sane state */
13694
- _nc_screen_init();
13695
+ /* initialize terminal to a sane state */
13696
+ _nc_screen_init();
13697
13698
- /* Initialize the terminal line settings. */
13699
- _nc_initscr();
13700
-
13701
- _nc_signal_handler(TRUE);
13702
-
13703
-#if USE_SIZECHANGE
13704
- /*
13705
- * Pretend we received a SIGWINCH, just in case we're starting up in a
13706
- * terminal that cannot initialize its size properly (Debian #265631).
13707
- */
13708
- SP->_sig_winch = TRUE;
13709
-#endif
13710
+ /* Initialize the terminal line settings. */
13711
+ _nc_initscr();
13712
+
13713
+ _nc_signal_handler(TRUE);
13714
13715
- returnSP(SP);
13716
+ result = SP;
13717
+ }
13718
+ }
13719
+ _nc_handle_sigwinch(1);
13720
+ returnSP(result);
13721
}
13722
Index: ncurses-5.5/ncurses/base/lib_restart.c
13723
===================================================================
13724
--- ncurses-5.5.orig/ncurses/base/lib_restart.c 2002-08-31 18:30:10.000000000 -0400
13725
+++ ncurses-5.5/ncurses/base/lib_restart.c 2006-04-18 15:47:22.000000000 -0400
13726
@@ -1,5 +1,5 @@
13727
/****************************************************************************
13728
- * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc. *
13729
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
13730
* *
13731
* Permission is hereby granted, free of charge, to any person obtaining a *
13732
* copy of this software and associated documentation files (the *
13733
@@ -29,6 +29,7 @@
13734
/****************************************************************************
13735
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
13736
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
13737
+ * and: Thomas E. Dickey 1996-on *
13738
****************************************************************************/
13739
13740
/*
13741
@@ -47,7 +48,7 @@
13742
13743
#include <term.h> /* lines, columns, cur_term */
13744
13745
-MODULE_ID("$Id: lib_restart.c,v 1.5 2002/08/31 22:30:10 Philippe.Blain Exp $")
13746
+MODULE_ID("$Id: lib_restart.c,v 1.6 2006/01/14 15:58:23 tom Exp $")
13747
13748
NCURSES_EXPORT(int)
13749
restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
13750
@@ -56,37 +57,43 @@ restartterm(NCURSES_CONST char *termp, i
13751
int savecbreak = SP->_cbreak;
13752
int saveraw = SP->_raw;
13753
int savenl = SP->_nl;
13754
+ int result;
13755
13756
T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
13757
13758
- if (setupterm(termp, filenum, errret) != OK)
13759
- returnCode(ERR);
13760
-
13761
- if (saveecho)
13762
- echo();
13763
- else
13764
- noecho();
13765
-
13766
- if (savecbreak) {
13767
- cbreak();
13768
- noraw();
13769
- } else if (saveraw) {
13770
- nocbreak();
13771
- raw();
13772
+ _nc_handle_sigwinch(0);
13773
+ if (setupterm(termp, filenum, errret) != OK) {
13774
+ result = ERR;
13775
} else {
13776
- nocbreak();
13777
- noraw();
13778
- }
13779
- if (savenl)
13780
- nl();
13781
- else
13782
- nonl();
13783
13784
- reset_prog_mode();
13785
+ if (saveecho)
13786
+ echo();
13787
+ else
13788
+ noecho();
13789
+
13790
+ if (savecbreak) {
13791
+ cbreak();
13792
+ noraw();
13793
+ } else if (saveraw) {
13794
+ nocbreak();
13795
+ raw();
13796
+ } else {
13797
+ nocbreak();
13798
+ noraw();
13799
+ }
13800
+ if (savenl)
13801
+ nl();
13802
+ else
13803
+ nonl();
13804
+
13805
+ reset_prog_mode();
13806
13807
#if USE_SIZECHANGE
13808
- _nc_update_screensize();
13809
+ _nc_update_screensize();
13810
#endif
13811
13812
- returnCode(OK);
13813
+ result = OK;
13814
+ }
13815
+ _nc_handle_sigwinch(1);
13816
+ returnCode(result);
13817
}
13818
Index: ncurses-5.5/ncurses/base/lib_set_term.c
13819
===================================================================
13820
--- ncurses-5.5.orig/ncurses/base/lib_set_term.c 2005-01-22 12:36:01.000000000 -0500
13821
+++ ncurses-5.5/ncurses/base/lib_set_term.c 2006-04-18 15:47:22.000000000 -0400
13822
@@ -1,5 +1,5 @@
13823
/****************************************************************************
13824
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
13825
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
13826
* *
13827
* Permission is hereby granted, free of charge, to any person obtaining a *
13828
* copy of this software and associated documentation files (the *
13829
@@ -44,7 +44,7 @@
13830
#include <term.h> /* cur_term */
13831
#include <tic.h>
13832
13833
-MODULE_ID("$Id: lib_set_term.c,v 1.85 2005/01/22 17:36:01 tom Exp $")
13834
+MODULE_ID("$Id: lib_set_term.c,v 1.89 2006/01/21 23:45:52 tom Exp $")
13835
13836
NCURSES_EXPORT(SCREEN *)
13837
set_term(SCREEN *screenp)
13838
@@ -211,14 +211,20 @@ extract_fgbg(char *src, int *result)
13839
}
13840
#endif
13841
13842
-NCURSES_EXPORT(int)
13843
-_nc_setupscreen(short slines, short const scolumns, FILE *output)
13844
/* OS-independent screen initializations */
13845
+NCURSES_EXPORT(int)
13846
+_nc_setupscreen(int slines,
13847
+ int scolumns,
13848
+ FILE *output,
13849
+ bool filtered,
13850
+ int slk_format)
13851
{
13852
int bottom_stolen = 0;
13853
int i;
13854
13855
- T((T_CALLED("_nc_setupscreen(%d, %d, %p)"), slines, scolumns, output));
13856
+ T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
13857
+ slines, scolumns, output, filtered, slk_format));
13858
+
13859
assert(SP == 0); /* has been reset in newterm() ! */
13860
if (!_nc_alloc_screen())
13861
returnCode(ERR);
13862
@@ -230,6 +236,33 @@ _nc_setupscreen(short slines, short cons
13863
if ((SP->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0)
13864
returnCode(ERR);
13865
13866
+ SP->_filtered = filtered;
13867
+
13868
+ /* implement filter mode */
13869
+ if (filtered) {
13870
+ slines = LINES = 1;
13871
+
13872
+ clear_screen = 0;
13873
+ cursor_down = parm_down_cursor = 0;
13874
+ cursor_address = 0;
13875
+ cursor_up = parm_up_cursor = 0;
13876
+ row_address = 0;
13877
+
13878
+ cursor_home = carriage_return;
13879
+ T(("filter screensize %dx%d", LINES, COLS));
13880
+ }
13881
+
13882
+ /* If we must simulate soft labels, grab off the line to be used.
13883
+ We assume that we must simulate, if it is none of the standard
13884
+ formats (4-4 or 3-2-3) for which there may be some hardware
13885
+ support. */
13886
+ if (num_labels <= 0 || !SLK_STDFMT(slk_format)) {
13887
+ if (slk_format) {
13888
+ if (ERR == _nc_ripoffline(-SLK_LINES(slk_format),
13889
+ _nc_slk_initialize))
13890
+ returnCode(ERR);
13891
+ }
13892
+ }
13893
#ifdef __DJGPP__
13894
T(("setting output mode to binary"));
13895
fflush(output);
13896
@@ -360,22 +393,45 @@ _nc_setupscreen(short slines, short cons
13897
/*
13898
* If we've no magic cookie support, we suppress attributes that xmc
13899
* would affect, i.e., the attributes that affect the rendition of a
13900
- * space. Note that this impacts the alternate character set mapping
13901
- * as well.
13902
+ * space.
13903
*/
13904
+ SP->_ok_attributes = termattrs();
13905
+ if (has_colors()) {
13906
+ SP->_ok_attributes |= A_COLOR;
13907
+ }
13908
if (magic_cookie_glitch > 0) {
13909
13910
- SP->_xmc_triggers = termattrs() & (
13911
- A_ALTCHARSET |
13912
- A_BLINK |
13913
- A_BOLD |
13914
- A_REVERSE |
13915
- A_STANDOUT |
13916
- A_UNDERLINE
13917
+ SP->_xmc_triggers = SP->_ok_attributes & (
13918
+ A_STANDOUT |
13919
+ A_UNDERLINE |
13920
+ A_REVERSE |
13921
+ A_BLINK |
13922
+ A_DIM |
13923
+ A_BOLD |
13924
+ A_INVIS |
13925
+ A_PROTECT
13926
);
13927
+#if 0
13928
+ /*
13929
+ * We "should" treat colors as an attribute. The wyse350 (and its
13930
+ * clones) appear to be the only ones that have colors and magic
13931
+ * cookies.
13932
+ */
13933
+ if (has_colors()) {
13934
+ SP->_xmc_triggers |= A_COLOR;
13935
+ }
13936
+#endif
13937
SP->_xmc_suppress = SP->_xmc_triggers & (chtype) ~(A_BOLD);
13938
13939
T(("magic cookie attributes %s", _traceattr(SP->_xmc_suppress)));
13940
+ /*
13941
+ * Supporting line-drawing may be possible. But make the regular
13942
+ * video attributes work first.
13943
+ */
13944
+ acs_chars = 0;
13945
+ ena_acs = 0;
13946
+ enter_alt_charset_mode = 0;
13947
+ exit_alt_charset_mode = 0;
13948
#if USE_XMC_SUPPORT
13949
/*
13950
* To keep this simple, suppress all of the optimization hooks
13951
@@ -386,7 +442,6 @@ _nc_setupscreen(short slines, short cons
13952
set_attributes = 0;
13953
#else
13954
magic_cookie_glitch = ABSENT_NUMERIC;
13955
- acs_chars = 0;
13956
#endif
13957
}
13958
13959
Index: ncurses-5.5/ncurses/base/tries.c
13960
===================================================================
13961
--- ncurses-5.5.orig/ncurses/base/tries.c 2005-04-30 15:14:18.000000000 -0400
13962
+++ ncurses-5.5/ncurses/base/tries.c 2006-04-18 15:47:22.000000000 -0400
13963
@@ -39,14 +39,14 @@
13964
13965
#include <curses.priv.h>
13966
13967
-MODULE_ID("$Id: tries.c,v 1.20 2005/04/30 19:14:18 tom Exp $")
13968
+MODULE_ID("$Id: tries.c,v 1.22 2005/11/26 20:09:18 tom Exp $")
13969
13970
/*
13971
* Expand a keycode into the string that it corresponds to, returning null if
13972
* no match was found, otherwise allocating a string of the result.
13973
*/
13974
NCURSES_EXPORT(char *)
13975
-_nc_expand_try(struct tries *tree, unsigned short code, int *count, size_t len)
13976
+_nc_expand_try(struct tries *tree, unsigned code, int *count, size_t len)
13977
{
13978
struct tries *ptr = tree;
13979
char *result = 0;
13980
@@ -83,7 +83,7 @@ _nc_expand_try(struct tries *tree, unsig
13981
* true if the code was found/removed.
13982
*/
13983
NCURSES_EXPORT(int)
13984
-_nc_remove_key(struct tries **tree, unsigned short code)
13985
+_nc_remove_key(struct tries **tree, unsigned code)
13986
{
13987
T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code));
13988
13989
Index: ncurses-5.5/ncurses/curses.priv.h
13990
===================================================================
13991
--- ncurses-5.5.orig/ncurses/curses.priv.h 2005-09-10 18:34:50.000000000 -0400
13992
+++ ncurses-5.5/ncurses/curses.priv.h 2006-04-18 15:48:07.000000000 -0400
13993
@@ -1,5 +1,5 @@
13994
/****************************************************************************
13995
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
13996
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
13997
* *
13998
* Permission is hereby granted, free of charge, to any person obtaining a *
13999
* copy of this software and associated documentation files (the *
14000
@@ -34,7 +34,7 @@
14001
14002
14003
/*
14004
- * $Id: curses.priv.h,v 1.286 2005/09/10 22:34:50 tom Exp $
14005
+ * $Id: curses.priv.h,v 1.297 2006/04/16 21:13:19 tom Exp $
14006
*
14007
* curses.priv.h
14008
*
14009
@@ -374,7 +374,8 @@ struct screen {
14010
int _ifd; /* input file ptr for screen */
14011
FILE *_ofp; /* output file ptr for screen */
14012
char *_setbuf; /* buffered I/O for output */
14013
- int _buffered; /* setvbuf uses _setbuf data */
14014
+ bool _filtered; /* filter() was called */
14015
+ bool _buffered; /* setvbuf uses _setbuf data */
14016
int _checkfd; /* filedesc for typeahead check */
14017
TERMINAL *_term; /* terminal type information */
14018
short _lines; /* screen lines */
14019
@@ -473,6 +474,7 @@ struct screen {
14020
int _default_fg; /* assumed default foreground */
14021
int _default_bg; /* assumed default background */
14022
#endif
14023
+ chtype _ok_attributes; /* valid attributes for terminal */
14024
chtype _xmc_suppress; /* attributes to suppress if xmc */
14025
chtype _xmc_triggers; /* attributes to process if xmc */
14026
chtype _acs_map[ACS_LEN]; /* the real alternate-charset map */
14027
@@ -546,11 +548,12 @@ struct screen {
14028
bool _cleanup; /* cleanup after int/quit signal */
14029
int (*_outch)(int); /* output handler if not putc */
14030
14031
+ int _legacy_coding; /* see use_legacy_coding() */
14032
+
14033
/* recent versions of 'screen' have partially-working support for
14034
* UTF-8, but do not permit ACS at the same time (see tty_update.c).
14035
*/
14036
#if USE_WIDEC_SUPPORT
14037
- bool _legacy_coding;
14038
bool _screen_acs_fix;
14039
#endif
14040
bool _screen_acs_map[ACS_LEN];
14041
@@ -664,17 +667,17 @@ extern NCURSES_EXPORT_VAR(SCREEN *) _nc_
14042
#define NulChar 0,0,0,0 /* FIXME: see CCHARW_MAX */
14043
#define CharOf(c) ((c).chars[0])
14044
#define AttrOf(c) ((c).attr)
14045
-#define AddAttr(c,a) AttrOf(c) |= a
14046
+#define AddAttr(c,a) AttrOf(c) |= (a)
14047
#define RemAttr(c,a) AttrOf(c) &= ~(a)
14048
-#define SetAttr(c,a) AttrOf(c) = a
14049
-#define NewChar(ch) { ChAttrOf(ch), { ChCharOf(ch), NulChar } NulColor }
14050
+#define SetAttr(c,a) AttrOf(c) = (a)
14051
#define NewChar2(c,a) { a, { c, NulChar } NulColor }
14052
-#define CharEq(a,b) (!memcmp(&a, &b, sizeof(a)))
14053
+#define NewChar(ch) NewChar2(ChCharOf(ch), ChAttrOf(ch))
14054
+#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a)))
14055
#define SetChar(ch,c,a) do { \
14056
NCURSES_CH_T *_cp = &ch; \
14057
memset(_cp, 0, sizeof(ch)); \
14058
- _cp->chars[0] = c; \
14059
- _cp->attr = a; \
14060
+ _cp->chars[0] = (c); \
14061
+ _cp->attr = (a); \
14062
if_EXT_COLORS(SetPair(ch, PAIR_NUMBER(a))); \
14063
} while (0)
14064
#define CHREF(wch) (&wch)
14065
@@ -734,13 +737,13 @@ extern NCURSES_EXPORT_VAR(SCREEN *) _nc_
14066
#else /* }{ */
14067
#define CharOf(c) ChCharOf(c)
14068
#define AttrOf(c) ChAttrOf(c)
14069
-#define AddAttr(c,a) c |= a
14070
-#define RemAttr(c,a) c &= ~(a & A_ATTRIBUTES)
14071
-#define SetAttr(c,a) c = (c & ~A_ATTRIBUTES) | a
14072
+#define AddAttr(c,a) c |= (a)
14073
+#define RemAttr(c,a) c &= ~((a) & A_ATTRIBUTES)
14074
+#define SetAttr(c,a) c = ((c) & ~A_ATTRIBUTES) | (a)
14075
#define NewChar(ch) (ch)
14076
-#define NewChar2(c,a) (c | a)
14077
-#define CharEq(a,b) (a == b)
14078
-#define SetChar(ch,c,a) ch = c | a
14079
+#define NewChar2(c,a) ((c) | (a))
14080
+#define CharEq(a,b) ((a) == (b))
14081
+#define SetChar(ch,c,a) ch = (c) | (a)
14082
#define CHREF(wch) wch
14083
#define CHDEREF(wch) wch
14084
#define ARG_CH_T NCURSES_CH_T
14085
@@ -890,6 +893,13 @@ extern NCURSES_EXPORT(const char *) _nc_
14086
14087
#endif /* TRACE/!TRACE */
14088
14089
+/*
14090
+ * Return-codes for tgetent() and friends.
14091
+ */
14092
+#define TGETENT_YES 1 /* entry is found */
14093
+#define TGETENT_NO 0 /* entry is not found */
14094
+#define TGETENT_ERR -1 /* an error occurred */
14095
+
14096
extern NCURSES_EXPORT(const char *) _nc_visbuf2 (int, const char *);
14097
extern NCURSES_EXPORT(const char *) _nc_visbufn (const char *, int);
14098
14099
@@ -1061,7 +1071,14 @@ extern NCURSES_EXPORT(int) _nc_has_mouse
14100
extern NCURSES_EXPORT(char *) _nc_get_locale(void);
14101
extern NCURSES_EXPORT(int) _nc_unicode_locale(void);
14102
extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(void);
14103
-extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int , int *, bool);
14104
+extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
14105
+
14106
+/* lib_tstp.c */
14107
+#if USE_SIGWINCH
14108
+extern NCURSES_EXPORT(int) _nc_handle_sigwinch(int);
14109
+#else
14110
+#define _nc_handle_sigwinch(a) /* nothing */
14111
+#endif
14112
14113
/* lib_wacs.c */
14114
#if USE_WIDEC_SUPPORT
14115
@@ -1091,15 +1108,14 @@ extern NCURSES_EXPORT(char *) _nc_strstr
14116
extern NCURSES_EXPORT(char *) _nc_printf_string (const char *, va_list);
14117
14118
/* tries.c */
14119
-extern NCURSES_EXPORT(void) _nc_add_to_try (struct tries **, const char *, unsigned short);
14120
-extern NCURSES_EXPORT(char *) _nc_expand_try (struct tries *, unsigned short, int *, size_t);
14121
-extern NCURSES_EXPORT(int) _nc_remove_key (struct tries **, unsigned short);
14122
+extern NCURSES_EXPORT(void) _nc_add_to_try (struct tries **, const char *, unsigned);
14123
+extern NCURSES_EXPORT(char *) _nc_expand_try (struct tries *, unsigned, int *, size_t);
14124
+extern NCURSES_EXPORT(int) _nc_remove_key (struct tries **, unsigned);
14125
extern NCURSES_EXPORT(int) _nc_remove_string (struct tries **, const char *);
14126
14127
/* elsewhere ... */
14128
extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry(ENTRY *, TERMTYPE *);
14129
extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int);
14130
-extern NCURSES_EXPORT(char *) _nc_home_terminfo (void);
14131
extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t);
14132
extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *);
14133
extern NCURSES_EXPORT(int) _nc_access (const char *, int);
14134
@@ -1109,9 +1125,9 @@ extern NCURSES_EXPORT(int) _nc_getenv_nu
14135
extern NCURSES_EXPORT(int) _nc_keypad (bool);
14136
extern NCURSES_EXPORT(int) _nc_ospeed (int);
14137
extern NCURSES_EXPORT(int) _nc_outch (int);
14138
-extern NCURSES_EXPORT(int) _nc_setupscreen (short, short const, FILE *);
14139
+extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
14140
extern NCURSES_EXPORT(int) _nc_timed_wait(int, int, int * EVENTLIST_2nd(_nc_eventlist *));
14141
-extern NCURSES_EXPORT(void) _nc_do_color (int, int, bool, int (*)(int));
14142
+extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, int (*)(int));
14143
extern NCURSES_EXPORT(void) _nc_flush (void);
14144
extern NCURSES_EXPORT(void) _nc_free_entry(ENTRY *, TERMTYPE *);
14145
extern NCURSES_EXPORT(void) _nc_freeall (void);
14146
Index: ncurses-5.5/ncurses/llib-lncurses
14147
===================================================================
14148
--- ncurses-5.5.orig/ncurses/llib-lncurses 2005-08-20 14:30:45.000000000 -0400
14149
+++ ncurses-5.5/ncurses/llib-lncurses 2006-04-18 15:47:22.000000000 -0400
14150
@@ -242,8 +242,8 @@ int pair_content(
14151
14152
#undef _nc_do_color
14153
void _nc_do_color(
14154
- int old_pair,
14155
- int pair,
14156
+ short old_pair,
14157
+ short pair,
14158
NCURSES_BOOL reverse,
14159
int (*outc)(
14160
int p1))
14161
@@ -1018,7 +1018,7 @@ int wstandend(
14162
{ return(*(int *)0); }
14163
14164
#undef mouse_trafo
14165
-NCURSES_BOOL mouse_trafo(
14166
+NCURSES_BOOL mouse_trafo(
14167
int *a1,
14168
int *a2,
14169
NCURSES_BOOL z)
14170
@@ -1555,8 +1555,8 @@ void delscreen(
14171
14172
#undef _nc_setupscreen
14173
int _nc_setupscreen(
14174
- short slines,
14175
- short const scolumns,
14176
+ int slines,
14177
+ int const scolumns,
14178
FILE *output)
14179
{ return(*(int *)0); }
14180
14181
@@ -1700,46 +1700,6 @@ int wtouchln(
14182
int changed)
14183
{ return(*(int *)0); }
14184
14185
-/* ./trace/lib_traceatr.c */
14186
-
14187
-#undef _traceattr2
14188
-char *_traceattr2(
14189
- int bufnum,
14190
- attr_t newmode)
14191
- { return(*(char **)0); }
14192
-
14193
-#undef _traceattr
14194
-char *_traceattr(
14195
- attr_t newmode)
14196
- { return(*(char **)0); }
14197
-
14198
-#undef _nc_retrace_attr_t
14199
-attr_t _nc_retrace_attr_t(
14200
- attr_t code)
14201
- { return(*(attr_t *)0); }
14202
-
14203
-#undef _nc_altcharset_name
14204
-const char *_nc_altcharset_name(
14205
- attr_t attr,
14206
- chtype ch)
14207
- { return(*(const char **)0); }
14208
-
14209
-#undef _tracechtype2
14210
-char *_tracechtype2(
14211
- int bufnum,
14212
- chtype ch)
14213
- { return(*(char **)0); }
14214
-
14215
-#undef _tracechtype
14216
-char *_tracechtype(
14217
- chtype ch)
14218
- { return(*(char **)0); }
14219
-
14220
-#undef _nc_retrace_chtype
14221
-chtype _nc_retrace_chtype(
14222
- chtype code)
14223
- { return(*(chtype *)0); }
14224
-
14225
/* ./trace/lib_tracedmp.c */
14226
14227
#undef _tracedump
14228
@@ -1976,6 +1936,13 @@ void _nc_UpdateAttrs(
14229
chtype c)
14230
{ /* void */ }
14231
14232
+/* ./base/legacy_coding.c */
14233
+
14234
+#undef use_legacy_coding
14235
+int use_legacy_coding(
14236
+ int level)
14237
+ { return(*(int *)0); }
14238
+
14239
/* ./base/lib_dft_fgbg.c */
14240
14241
#undef use_default_colors
14242
@@ -2067,7 +2034,7 @@ int _nc_env_access(void)
14243
void _nc_add_to_try(
14244
struct tries **tree,
14245
const char *str,
14246
- unsigned short code)
14247
+ unsigned code)
14248
{ /* void */ }
14249
14250
/* ./tinfo/alloc_entry.c */
14251
@@ -2170,6 +2137,10 @@ int _nc_curr_line;
14252
#undef _nc_curr_col
14253
int _nc_curr_col;
14254
14255
+#undef _nc_get_source
14256
+const char *_nc_get_source(void)
14257
+ { return(*(const char **)0); }
14258
+
14259
#undef _nc_set_source
14260
void _nc_set_source(
14261
const char *const name)
14262
@@ -2721,8 +2692,8 @@ char *tigetstr(
14263
14264
typedef struct {
14265
union {
14266
- int num;
14267
- char *str;
14268
+ int num;
14269
+ char *str;
14270
} data;
14271
NCURSES_BOOL num_type;
14272
} stack_frame;
14273
@@ -2844,6 +2815,46 @@ WINDOW *_nc_retrace_win(
14274
WINDOW *code)
14275
{ return(*(WINDOW **)0); }
14276
14277
+/* ./trace/lib_traceatr.c */
14278
+
14279
+#undef _traceattr2
14280
+char *_traceattr2(
14281
+ int bufnum,
14282
+ attr_t newmode)
14283
+ { return(*(char **)0); }
14284
+
14285
+#undef _traceattr
14286
+char *_traceattr(
14287
+ attr_t newmode)
14288
+ { return(*(char **)0); }
14289
+
14290
+#undef _nc_retrace_attr_t
14291
+attr_t _nc_retrace_attr_t(
14292
+ attr_t code)
14293
+ { return(*(attr_t *)0); }
14294
+
14295
+#undef _nc_altcharset_name
14296
+const char *_nc_altcharset_name(
14297
+ attr_t attr,
14298
+ chtype ch)
14299
+ { return(*(const char **)0); }
14300
+
14301
+#undef _tracechtype2
14302
+char *_tracechtype2(
14303
+ int bufnum,
14304
+ chtype ch)
14305
+ { return(*(char **)0); }
14306
+
14307
+#undef _tracechtype
14308
+char *_tracechtype(
14309
+ chtype ch)
14310
+ { return(*(char **)0); }
14311
+
14312
+#undef _nc_retrace_chtype
14313
+chtype _nc_retrace_chtype(
14314
+ chtype code)
14315
+ { return(*(chtype *)0); }
14316
+
14317
/* ./trace/lib_tracebits.c */
14318
14319
typedef struct {
14320
@@ -3069,7 +3080,7 @@ void _nc_trace_tries(
14321
#undef _nc_expand_try
14322
char *_nc_expand_try(
14323
struct tries *tree,
14324
- unsigned short code,
14325
+ unsigned code,
14326
int *count,
14327
size_t len)
14328
{ return(*(char **)0); }
14329
@@ -3077,7 +3088,7 @@ char *_nc_expand_try(
14330
#undef _nc_remove_key
14331
int _nc_remove_key(
14332
struct tries **tree,
14333
- unsigned short code)
14334
+ unsigned code)
14335
{ return(*(int *)0); }
14336
14337
#undef _nc_remove_string
14338
Index: ncurses-5.5/ncurses/llib-lncursesw
14339
===================================================================
14340
--- ncurses-5.5.orig/ncurses/llib-lncursesw 2005-08-20 14:45:16.000000000 -0400
14341
+++ ncurses-5.5/ncurses/llib-lncursesw 2006-04-18 15:47:22.000000000 -0400
14342
@@ -279,8 +279,8 @@ int pair_content(
14343
14344
#undef _nc_do_color
14345
void _nc_do_color(
14346
- int old_pair,
14347
- int pair,
14348
+ short old_pair,
14349
+ short pair,
14350
NCURSES_BOOL reverse,
14351
int (*outc)(
14352
int p1))
14353
@@ -1520,7 +1520,7 @@ int wins_wstr(
14354
{ return(*(int *)0); }
14355
14356
#undef mouse_trafo
14357
-NCURSES_BOOL mouse_trafo(
14358
+NCURSES_BOOL mouse_trafo(
14359
int *a1,
14360
int *a2,
14361
NCURSES_BOOL z)
14362
@@ -2057,8 +2057,8 @@ void delscreen(
14363
14364
#undef _nc_setupscreen
14365
int _nc_setupscreen(
14366
- short slines,
14367
- short const scolumns,
14368
+ int slines,
14369
+ int const scolumns,
14370
FILE *output)
14371
{ return(*(int *)0); }
14372
14373
@@ -2204,57 +2204,6 @@ int wtouchln(
14374
int changed)
14375
{ return(*(int *)0); }
14376
14377
-/* ./trace/lib_traceatr.c */
14378
-
14379
-#undef _traceattr2
14380
-char *_traceattr2(
14381
- int bufnum,
14382
- attr_t newmode)
14383
- { return(*(char **)0); }
14384
-
14385
-#undef _traceattr
14386
-char *_traceattr(
14387
- attr_t newmode)
14388
- { return(*(char **)0); }
14389
-
14390
-#undef _nc_retrace_attr_t
14391
-attr_t _nc_retrace_attr_t(
14392
- attr_t code)
14393
- { return(*(attr_t *)0); }
14394
-
14395
-#undef _nc_altcharset_name
14396
-const char *_nc_altcharset_name(
14397
- attr_t attr,
14398
- chtype ch)
14399
- { return(*(const char **)0); }
14400
-
14401
-#undef _tracechtype2
14402
-char *_tracechtype2(
14403
- int bufnum,
14404
- chtype ch)
14405
- { return(*(char **)0); }
14406
-
14407
-#undef _tracechtype
14408
-char *_tracechtype(
14409
- chtype ch)
14410
- { return(*(char **)0); }
14411
-
14412
-#undef _nc_retrace_chtype
14413
-chtype _nc_retrace_chtype(
14414
- chtype code)
14415
- { return(*(chtype *)0); }
14416
-
14417
-#undef _tracecchar_t2
14418
-char *_tracecchar_t2(
14419
- int bufnum,
14420
- const cchar_t *ch)
14421
- { return(*(char **)0); }
14422
-
14423
-#undef _tracecchar_t
14424
-char *_tracecchar_t(
14425
- const cchar_t *ch)
14426
- { return(*(char **)0); }
14427
-
14428
/* ./trace/lib_tracedmp.c */
14429
14430
#undef _tracedump
14431
@@ -2720,6 +2669,13 @@ void _nc_UpdateAttrs(
14432
cchar_t c)
14433
{ /* void */ }
14434
14435
+/* ./base/legacy_coding.c */
14436
+
14437
+#undef use_legacy_coding
14438
+int use_legacy_coding(
14439
+ int level)
14440
+ { return(*(int *)0); }
14441
+
14442
/* ./base/lib_dft_fgbg.c */
14443
14444
#undef use_default_colors
14445
@@ -2811,7 +2767,7 @@ int _nc_env_access(void)
14446
void _nc_add_to_try(
14447
struct tries **tree,
14448
const char *str,
14449
- unsigned short code)
14450
+ unsigned code)
14451
{ /* void */ }
14452
14453
/* ./tinfo/alloc_entry.c */
14454
@@ -2914,6 +2870,10 @@ int _nc_curr_line;
14455
#undef _nc_curr_col
14456
int _nc_curr_col;
14457
14458
+#undef _nc_get_source
14459
+const char *_nc_get_source(void)
14460
+ { return(*(const char **)0); }
14461
+
14462
#undef _nc_set_source
14463
void _nc_set_source(
14464
const char *const name)
14465
@@ -3470,8 +3430,8 @@ char *tigetstr(
14466
14467
typedef struct {
14468
union {
14469
- int num;
14470
- char *str;
14471
+ int num;
14472
+ char *str;
14473
} data;
14474
NCURSES_BOOL num_type;
14475
} stack_frame;
14476
@@ -3593,6 +3553,57 @@ WINDOW *_nc_retrace_win(
14477
WINDOW *code)
14478
{ return(*(WINDOW **)0); }
14479
14480
+/* ./trace/lib_traceatr.c */
14481
+
14482
+#undef _traceattr2
14483
+char *_traceattr2(
14484
+ int bufnum,
14485
+ attr_t newmode)
14486
+ { return(*(char **)0); }
14487
+
14488
+#undef _traceattr
14489
+char *_traceattr(
14490
+ attr_t newmode)
14491
+ { return(*(char **)0); }
14492
+
14493
+#undef _nc_retrace_attr_t
14494
+attr_t _nc_retrace_attr_t(
14495
+ attr_t code)
14496
+ { return(*(attr_t *)0); }
14497
+
14498
+#undef _nc_altcharset_name
14499
+const char *_nc_altcharset_name(
14500
+ attr_t attr,
14501
+ chtype ch)
14502
+ { return(*(const char **)0); }
14503
+
14504
+#undef _tracechtype2
14505
+char *_tracechtype2(
14506
+ int bufnum,
14507
+ chtype ch)
14508
+ { return(*(char **)0); }
14509
+
14510
+#undef _tracechtype
14511
+char *_tracechtype(
14512
+ chtype ch)
14513
+ { return(*(char **)0); }
14514
+
14515
+#undef _nc_retrace_chtype
14516
+chtype _nc_retrace_chtype(
14517
+ chtype code)
14518
+ { return(*(chtype *)0); }
14519
+
14520
+#undef _tracecchar_t2
14521
+char *_tracecchar_t2(
14522
+ int bufnum,
14523
+ const cchar_t *ch)
14524
+ { return(*(char **)0); }
14525
+
14526
+#undef _tracecchar_t
14527
+char *_tracecchar_t(
14528
+ const cchar_t *ch)
14529
+ { return(*(char **)0); }
14530
+
14531
/* ./trace/lib_tracebits.c */
14532
14533
typedef struct {
14534
@@ -3818,7 +3829,7 @@ void _nc_trace_tries(
14535
#undef _nc_expand_try
14536
char *_nc_expand_try(
14537
struct tries *tree,
14538
- unsigned short code,
14539
+ unsigned code,
14540
int *count,
14541
size_t len)
14542
{ return(*(char **)0); }
14543
@@ -3826,7 +3837,7 @@ char *_nc_expand_try(
14544
#undef _nc_remove_key
14545
int _nc_remove_key(
14546
struct tries **tree,
14547
- unsigned short code)
14548
+ unsigned code)
14549
{ return(*(int *)0); }
14550
14551
#undef _nc_remove_string
14552
Index: ncurses-5.5/ncurses/modules
14553
===================================================================
14554
--- ncurses-5.5.orig/ncurses/modules 2005-08-20 16:02:44.000000000 -0400
14555
+++ ncurses-5.5/ncurses/modules 2006-04-18 15:47:22.000000000 -0400
14556
@@ -1,4 +1,4 @@
14557
-# $Id: modules,v 1.104 2005/08/20 20:02:44 tom Exp $
14558
+# $Id: modules,v 1.105 2005/12/17 20:14:36 tom Exp $
14559
##############################################################################
14560
# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. #
14561
# #
14562
@@ -146,6 +146,7 @@ lib_wunctrl lib $(wide)
14563
# Extensions to the base library
14564
@ ext_funcs
14565
expanded lib .
14566
+legacy_coding lib $(base) ../include/term.h
14567
lib_dft_fgbg lib $(base) ../include/term.h
14568
lib_print lib $(tinfo) ../include/term.h
14569
resizeterm lib $(base) ../include/term.h
14570
Index: ncurses-5.5/ncurses/tinfo/add_tries.c
14571
===================================================================
14572
--- ncurses-5.5.orig/ncurses/tinfo/add_tries.c 2000-12-09 21:55:07.000000000 -0500
14573
+++ ncurses-5.5/ncurses/tinfo/add_tries.c 2006-04-18 15:47:22.000000000 -0400
14574
@@ -1,5 +1,5 @@
14575
/****************************************************************************
14576
- * Copyright (c) 1998,2000 Free Software Foundation, Inc. *
14577
+ * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. *
14578
* *
14579
* Permission is hereby granted, free of charge, to any person obtaining a *
14580
* copy of this software and associated documentation files (the *
14581
@@ -39,13 +39,13 @@
14582
14583
#include <curses.priv.h>
14584
14585
-MODULE_ID("$Id: add_tries.c,v 1.4 2000/12/10 02:55:07 tom Exp $")
14586
+MODULE_ID("$Id: add_tries.c,v 1.5 2005/11/20 01:32:48 tom Exp $")
14587
14588
#define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
14589
#define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
14590
14591
NCURSES_EXPORT(void)
14592
-_nc_add_to_try(struct tries **tree, const char *str, unsigned short code)
14593
+_nc_add_to_try(struct tries **tree, const char *str, unsigned code)
14594
{
14595
static bool out_of_memory = FALSE;
14596
struct tries *ptr, *savedptr;
14597
Index: ncurses-5.5/ncurses/tinfo/captoinfo.c
14598
===================================================================
14599
--- ncurses-5.5.orig/ncurses/tinfo/captoinfo.c 2005-06-04 18:06:43.000000000 -0400
14600
+++ ncurses-5.5/ncurses/tinfo/captoinfo.c 2006-04-18 15:47:22.000000000 -0400
14601
@@ -1,5 +1,5 @@
14602
/****************************************************************************
14603
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
14604
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
14605
* *
14606
* Permission is hereby granted, free of charge, to any person obtaining a *
14607
* copy of this software and associated documentation files (the *
14608
@@ -93,7 +93,7 @@
14609
#include <ctype.h>
14610
#include <tic.h>
14611
14612
-MODULE_ID("$Id: captoinfo.c,v 1.47 2005/06/04 22:06:43 tom Exp $")
14613
+MODULE_ID("$Id: captoinfo.c,v 1.48 2005/11/26 15:40:31 tom Exp $")
14614
14615
#define MAX_PUSHED 16 /* max # args we can push onto the stack */
14616
14617
@@ -137,7 +137,7 @@ save_string(char *d, const char *const s
14618
return d + strlen(d);
14619
}
14620
14621
-static inline char *
14622
+static NCURSES_INLINE char *
14623
save_char(char *s, int c)
14624
{
14625
static char temp[2];
14626
Index: ncurses-5.5/ncurses/tinfo/comp_error.c
14627
===================================================================
14628
--- ncurses-5.5.orig/ncurses/tinfo/comp_error.c 2005-08-20 15:22:36.000000000 -0400
14629
+++ ncurses-5.5/ncurses/tinfo/comp_error.c 2006-04-18 15:47:22.000000000 -0400
14630
@@ -41,7 +41,7 @@
14631
14632
#include <tic.h>
14633
14634
-MODULE_ID("$Id: comp_error.c,v 1.29 2005/08/20 19:22:36 tom Exp $")
14635
+MODULE_ID("$Id: comp_error.c,v 1.30 2005/11/26 15:28:47 tom Exp $")
14636
14637
NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
14638
NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
14639
@@ -87,7 +87,7 @@ _nc_get_type(char *name)
14640
strcpy(name, termtype != 0 ? termtype : "");
14641
}
14642
14643
-static inline void
14644
+static NCURSES_INLINE void
14645
where_is_problem(void)
14646
{
14647
fprintf(stderr, "\"%s\"", sourcename);
14648
Index: ncurses-5.5/ncurses/tinfo/comp_scan.c
14649
===================================================================
14650
--- ncurses-5.5.orig/ncurses/tinfo/comp_scan.c 2005-06-04 18:04:45.000000000 -0400
14651
+++ ncurses-5.5/ncurses/tinfo/comp_scan.c 2006-04-18 15:47:22.000000000 -0400
14652
@@ -51,7 +51,7 @@
14653
#include <term_entry.h>
14654
#include <tic.h>
14655
14656
-MODULE_ID("$Id: comp_scan.c,v 1.76 2005/06/04 22:04:45 tom Exp $")
14657
+MODULE_ID("$Id: comp_scan.c,v 1.77 2005/11/26 15:28:47 tom Exp $")
14658
14659
/*
14660
* Maximum length of string capability we'll accept before raising an error.
14661
@@ -284,7 +284,7 @@ end_of_stream(void)
14662
}
14663
14664
/* Assume we may be looking at a termcap-style continuation */
14665
-static inline int
14666
+static NCURSES_INLINE int
14667
eat_escaped_newline(int ch)
14668
{
14669
if (ch == '\\')
14670
Index: ncurses-5.5/ncurses/tinfo/init_keytry.c
14671
===================================================================
14672
--- ncurses-5.5.orig/ncurses/tinfo/init_keytry.c 2005-04-30 15:32:03.000000000 -0400
14673
+++ ncurses-5.5/ncurses/tinfo/init_keytry.c 2006-04-18 15:47:22.000000000 -0400
14674
@@ -1,5 +1,5 @@
14675
/****************************************************************************
14676
- * Copyright (c) 1999-2000,2005 Free Software Foundation, Inc. *
14677
+ * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. *
14678
* *
14679
* Permission is hereby granted, free of charge, to any person obtaining a *
14680
* copy of this software and associated documentation files (the *
14681
@@ -36,7 +36,7 @@
14682
14683
#include <term_entry.h>
14684
14685
-MODULE_ID("$Id: init_keytry.c,v 1.7 2005/04/30 19:32:03 tom Exp $")
14686
+MODULE_ID("$Id: init_keytry.c,v 1.8 2006/01/21 23:43:28 tom Exp $")
14687
14688
/*
14689
** _nc_init_keytry()
14690
@@ -90,7 +90,7 @@ _nc_init_keytry(void)
14691
{
14692
TERMTYPE *tp = &(SP->_term->type);
14693
for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
14694
- char *name = ExtStrname(tp, n, strnames);
14695
+ const char *name = ExtStrname(tp, n, strnames);
14696
char *value = tp->Strings[n];
14697
if (name != 0
14698
&& *name == 'k'
14699
Index: ncurses-5.5/ncurses/tinfo/lib_acs.c
14700
===================================================================
14701
--- ncurses-5.5.orig/ncurses/tinfo/lib_acs.c 2004-10-16 11:42:40.000000000 -0400
14702
+++ ncurses-5.5/ncurses/tinfo/lib_acs.c 2006-04-18 15:47:22.000000000 -0400
14703
@@ -1,5 +1,5 @@
14704
/****************************************************************************
14705
- * Copyright (c) 1998-2002,2004 Free Software Foundation, Inc. *
14706
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
14707
* *
14708
* Permission is hereby granted, free of charge, to any person obtaining a *
14709
* copy of this software and associated documentation files (the *
14710
@@ -35,7 +35,7 @@
14711
#include <curses.priv.h>
14712
#include <term.h> /* ena_acs, acs_chars */
14713
14714
-MODULE_ID("$Id: lib_acs.c,v 1.27 2004/10/16 15:42:40 tom Exp $")
14715
+MODULE_ID("$Id: lib_acs.c,v 1.30 2006/01/07 21:27:15 tom Exp $")
14716
14717
#if BROKEN_LINKER
14718
NCURSES_EXPORT_VAR(chtype *)
14719
@@ -131,6 +131,32 @@ _nc_init_acs(void)
14720
TPUTS_TRACE("ena_acs");
14721
putp(ena_acs);
14722
}
14723
+#if NCURSES_EXT_FUNCS
14724
+ /*
14725
+ * Linux console "supports" the "PC ROM" character set by the coincidence
14726
+ * that smpch/rmpch and smacs/rmacs have the same values. ncurses has
14727
+ * no codepage support (see SCO Merge for an example). Outside of the
14728
+ * values defined in acsc, there are no definitions for the "PC ROM"
14729
+ * character set (assumed by some applications to be codepage 437), but we
14730
+ * allow those applications to use those codepoints.
14731
+ *
14732
+ * test/blue.c uses this feature.
14733
+ */
14734
+#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b))
14735
+ if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) &&
14736
+ PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) {
14737
+ size_t i;
14738
+ for (i = 1; i < ACS_LEN; ++i) {
14739
+ if (real_map[i] == 0) {
14740
+ real_map[i] = i;
14741
+ if (real_map != fake_map) {
14742
+ if (SP != 0)
14743
+ SP->_screen_acs_map[i] = TRUE;
14744
+ }
14745
+ }
14746
+ }
14747
+ }
14748
+#endif
14749
14750
if (acs_chars != NULL) {
14751
size_t i = 0;
14752
@@ -151,7 +177,7 @@ _nc_init_acs(void)
14753
*/
14754
if (_nc_tracing & TRACE_CALLS) {
14755
size_t n, m;
14756
- char show[ACS_LEN + 1];
14757
+ char show[ACS_LEN * 2 + 1];
14758
for (n = 1, m = 0; n < ACS_LEN; n++) {
14759
if (real_map[n] != 0) {
14760
show[m++] = (char) n;
14761
Index: ncurses-5.5/ncurses/tinfo/lib_setup.c
14762
===================================================================
14763
--- ncurses-5.5.orig/ncurses/tinfo/lib_setup.c 2005-03-12 14:41:45.000000000 -0500
14764
+++ ncurses-5.5/ncurses/tinfo/lib_setup.c 2006-04-18 15:48:07.000000000 -0400
14765
@@ -1,5 +1,5 @@
14766
/****************************************************************************
14767
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
14768
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
14769
* *
14770
* Permission is hereby granted, free of charge, to any person obtaining a *
14771
* copy of this software and associated documentation files (the *
14772
@@ -53,7 +53,7 @@
14773
14774
#include <term.h> /* lines, columns, cur_term */
14775
14776
-MODULE_ID("$Id: lib_setup.c,v 1.88 2005/03/12 19:41:45 tom Exp $")
14777
+MODULE_ID("$Id: lib_setup.c,v 1.94 2006/04/01 19:31:34 tom Exp $")
14778
14779
/****************************************************************************
14780
*
14781
@@ -106,6 +106,52 @@ NCURSES_EXPORT_VAR(int) TABSIZE = 0;
14782
14783
static int _use_env = TRUE;
14784
14785
+#if USE_SIGWINCH
14786
+int
14787
+_nc_handle_sigwinch(int enable)
14788
+{
14789
+ static int have_sigwinch = 0; /* initially no SIGWINCH's */
14790
+ static int can_resizeall = 1; /* initially enabled */
14791
+ SCREEN *scan;
14792
+ int result;
14793
+
14794
+ switch (enable) {
14795
+ default:
14796
+ /* record a SIGWINCH */
14797
+ have_sigwinch = 1;
14798
+ break;
14799
+ case 0:
14800
+ /* temporarily disable the next block */
14801
+ --can_resizeall;
14802
+ break;
14803
+ case 1:
14804
+ /* temporarily enable the next block */
14805
+ ++can_resizeall;
14806
+ break;
14807
+ }
14808
+
14809
+ /*
14810
+ * If we have a pending SIGWINCH, set the flag in each screen.
14811
+ * But do this only if the block is enabled.
14812
+ */
14813
+ if (can_resizeall-- >= 0) { /* test and disable */
14814
+ if (have_sigwinch) {
14815
+ scan = _nc_screen_chain;
14816
+ while (scan) {
14817
+ scan->_sig_winch = TRUE;
14818
+ scan = scan->_next_screen;
14819
+ }
14820
+ have_sigwinch = 0;
14821
+ }
14822
+ }
14823
+ result = can_resizeall + 1; /* reenable (unless disables are nested) */
14824
+ can_resizeall = result;
14825
+
14826
+ return result;
14827
+}
14828
+
14829
+#endif
14830
+
14831
NCURSES_EXPORT(void)
14832
use_env(bool f)
14833
{
14834
@@ -121,6 +167,7 @@ _nc_get_screensize(int *linep, int *colp
14835
/* figure out the size of the screen */
14836
T(("screen size: terminfo lines = %d columns = %d", lines, columns));
14837
14838
+ _nc_handle_sigwinch(0);
14839
if (!_use_env) {
14840
*linep = (int) lines;
14841
*colp = (int) columns;
14842
@@ -167,7 +214,7 @@ _nc_get_screensize(int *linep, int *colp
14843
* environment variable.
14844
*/
14845
if (*linep <= 0)
14846
- *linep = WINSIZE_ROWS(size);
14847
+ *linep = (SP != 0 && SP->_filtered) ? 1 : WINSIZE_ROWS(size);
14848
if (*colp <= 0)
14849
*colp = WINSIZE_COLS(size);
14850
}
14851
@@ -199,6 +246,7 @@ _nc_get_screensize(int *linep, int *colp
14852
lines = (short) (*linep);
14853
columns = (short) (*colp);
14854
}
14855
+ _nc_handle_sigwinch(1);
14856
14857
T(("screen size is %dx%d", *linep, *colp));
14858
14859
@@ -257,9 +305,12 @@ _nc_update_screensize(void)
14860
}
14861
14862
#if USE_DATABASE || USE_TERMCAP
14863
+/*
14864
+ * Return 1 if entry found, 0 if not found, -1 if database not accessible,
14865
+ * just like tgetent().
14866
+ */
14867
static int
14868
grab_entry(const char *const tn, TERMTYPE *const tp)
14869
-/* return 1 if entry found, 0 if not found, -1 if database not accessible */
14870
{
14871
#if USE_DATABASE
14872
char filename[PATH_MAX];
14873
@@ -270,10 +321,10 @@ grab_entry(const char *const tn, TERMTYP
14874
* $TERM shouldn't contain pathname delimiters.
14875
*/
14876
if (strchr(tn, '/'))
14877
- return 0;
14878
+ return TGETENT_NO;
14879
14880
#if USE_DATABASE
14881
- if ((status = _nc_read_entry(tn, filename, tp)) != 1) {
14882
+ if ((status = _nc_read_entry(tn, filename, tp)) != TGETENT_YES) {
14883
14884
#if !PURE_TERMINFO
14885
/*
14886
@@ -296,7 +347,7 @@ grab_entry(const char *const tn, TERMTYP
14887
* (The terminfo compiler bypasses this logic, since it must know if
14888
* a string is cancelled, for merging entries).
14889
*/
14890
- if (status == 1) {
14891
+ if (status == TGETENT_YES) {
14892
unsigned n;
14893
for_each_boolean(n, tp) {
14894
if (!VALID_BOOLEAN(tp->Booleans[n]))
14895
@@ -316,7 +367,6 @@ grab_entry(const char *const tn, TERMTYP
14896
**
14897
** Take the real command character out of the CC environment variable
14898
** and substitute it in for the prototype given in 'command_character'.
14899
-**
14900
*/
14901
static void
14902
do_prototype(void)
14903
@@ -417,7 +467,7 @@ _nc_locale_breaks_acs(void)
14904
}
14905
14906
/*
14907
- * This entrypoint is called from tgetent() to allow special a case of reusing
14908
+ * This entrypoint is called from tgetent() to allow a special case of reusing
14909
* the same TERMINAL data (see comment).
14910
*/
14911
NCURSES_EXPORT(int)
14912
@@ -431,11 +481,13 @@ _nc_setupterm(NCURSES_CONST char *tname,
14913
if (tname == 0) {
14914
tname = getenv("TERM");
14915
if (tname == 0 || *tname == '\0') {
14916
- ret_error0(-1, "TERM environment variable not set.\n");
14917
+ ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");
14918
}
14919
}
14920
+
14921
if (strlen(tname) > MAX_NAME_SIZE) {
14922
- ret_error(-1, "TERM environment must be <= %d characters.\n",
14923
+ ret_error(TGETENT_ERR,
14924
+ "TERM environment must be <= %d characters.\n",
14925
MAX_NAME_SIZE);
14926
}
14927
14928
@@ -477,31 +529,31 @@ _nc_setupterm(NCURSES_CONST char *tname,
14929
term_ptr = typeCalloc(TERMINAL, 1);
14930
14931
if (term_ptr == 0) {
14932
- ret_error0(-1,
14933
+ ret_error0(TGETENT_ERR,
14934
"Not enough memory to create terminal structure.\n");
14935
}
14936
#if USE_DATABASE || USE_TERMCAP
14937
status = grab_entry(tname, &term_ptr->type);
14938
#else
14939
- status = 0;
14940
+ status = TGETENT_NO;
14941
#endif
14942
14943
/* try fallback list if entry on disk */
14944
- if (status != 1) {
14945
+ if (status != TGETENT_YES) {
14946
const TERMTYPE *fallback = _nc_fallback(tname);
14947
14948
if (fallback) {
14949
term_ptr->type = *fallback;
14950
- status = 1;
14951
+ status = TGETENT_YES;
14952
}
14953
}
14954
14955
- if (status <= 0) {
14956
+ if (status != TGETENT_YES) {
14957
del_curterm(term_ptr);
14958
- if (status == -1) {
14959
- ret_error0(-1, "terminals database is inaccessible\n");
14960
- } else if (status == 0) {
14961
- ret_error(0, "'%s': unknown terminal type.\n", tname);
14962
+ if (status == TGETENT_ERR) {
14963
+ ret_error0(status, "terminals database is inaccessible\n");
14964
+ } else if (status == TGETENT_NO) {
14965
+ ret_error(status, "'%s': unknown terminal type.\n", tname);
14966
}
14967
}
14968
14969
@@ -534,15 +586,15 @@ _nc_setupterm(NCURSES_CONST char *tname,
14970
_nc_get_screensize(&LINES, &COLS);
14971
14972
if (errret)
14973
- *errret = 1;
14974
+ *errret = TGETENT_YES;
14975
14976
T((T_CREATE("screen %s %dx%d"), tname, LINES, COLS));
14977
14978
if (generic_type) {
14979
- ret_error(0, "'%s': I need something more specific.\n", tname);
14980
+ ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
14981
}
14982
if (hard_copy) {
14983
- ret_error(1, "'%s': I can't handle hardcopy terminals.\n", tname);
14984
+ ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
14985
}
14986
returnCode(OK);
14987
}
14988
@@ -552,9 +604,7 @@ _nc_setupterm(NCURSES_CONST char *tname,
14989
*
14990
* Find and read the appropriate object file for the terminal
14991
* Make cur_term point to the structure.
14992
- *
14993
*/
14994
-
14995
NCURSES_EXPORT(int)
14996
setupterm(NCURSES_CONST char *tname, int Filedes, int *errret)
14997
{
14998
Index: ncurses-5.5/ncurses/tinfo/lib_tparm.c
14999
===================================================================
15000
--- ncurses-5.5.orig/ncurses/tinfo/lib_tparm.c 2004-02-07 15:52:51.000000000 -0500
15001
+++ ncurses-5.5/ncurses/tinfo/lib_tparm.c 2006-04-18 15:47:22.000000000 -0400
15002
@@ -1,5 +1,5 @@
15003
/****************************************************************************
15004
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
15005
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
15006
* *
15007
* Permission is hereby granted, free of charge, to any person obtaining a *
15008
* copy of this software and associated documentation files (the *
15009
@@ -43,7 +43,7 @@
15010
#include <term.h>
15011
#include <tic.h>
15012
15013
-MODULE_ID("$Id: lib_tparm.c,v 1.68 2004/02/07 20:52:51 tom Exp $")
15014
+MODULE_ID("$Id: lib_tparm.c,v 1.69 2005/11/26 15:41:24 tom Exp $")
15015
15016
/*
15017
* char *
15018
@@ -146,7 +146,7 @@ _nc_free_tparm(void)
15019
}
15020
#endif
15021
15022
-static inline void
15023
+static NCURSES_INLINE void
15024
get_space(size_t need)
15025
{
15026
need += out_used;
15027
@@ -158,7 +158,7 @@ get_space(size_t need)
15028
}
15029
}
15030
15031
-static inline void
15032
+static NCURSES_INLINE void
15033
save_text(const char *fmt, const char *s, int len)
15034
{
15035
size_t s_len = strlen(s);
15036
@@ -171,7 +171,7 @@ save_text(const char *fmt, const char *s
15037
out_used += strlen(out_buff + out_used);
15038
}
15039
15040
-static inline void
15041
+static NCURSES_INLINE void
15042
save_number(const char *fmt, int number, int len)
15043
{
15044
if (len < 30)
15045
@@ -183,7 +183,7 @@ save_number(const char *fmt, int number,
15046
out_used += strlen(out_buff + out_used);
15047
}
15048
15049
-static inline void
15050
+static NCURSES_INLINE void
15051
save_char(int c)
15052
{
15053
if (c == 0)
15054
@@ -192,7 +192,7 @@ save_char(int c)
15055
out_buff[out_used++] = c;
15056
}
15057
15058
-static inline void
15059
+static NCURSES_INLINE void
15060
npush(int x)
15061
{
15062
if (stack_ptr < STACKSIZE) {
15063
@@ -205,7 +205,7 @@ npush(int x)
15064
}
15065
}
15066
15067
-static inline int
15068
+static NCURSES_INLINE int
15069
npop(void)
15070
{
15071
int result = 0;
15072
@@ -220,7 +220,7 @@ npop(void)
15073
return result;
15074
}
15075
15076
-static inline void
15077
+static NCURSES_INLINE void
15078
spush(char *x)
15079
{
15080
if (stack_ptr < STACKSIZE) {
15081
@@ -233,7 +233,7 @@ spush(char *x)
15082
}
15083
}
15084
15085
-static inline char *
15086
+static NCURSES_INLINE char *
15087
spop(void)
15088
{
15089
static char dummy[] = ""; /* avoid const-cast */
15090
@@ -249,7 +249,7 @@ spop(void)
15091
return result;
15092
}
15093
15094
-static inline const char *
15095
+static NCURSES_INLINE const char *
15096
parse_format(const char *s, char *format, int *len)
15097
{
15098
*len = 0;
15099
@@ -471,7 +471,7 @@ _nc_tparm_analyze(const char *string, ch
15100
return number;
15101
}
15102
15103
-static inline char *
15104
+static NCURSES_INLINE char *
15105
tparam_internal(const char *string, va_list ap)
15106
{
15107
#define NUM_VARS 26
15108
Index: ncurses-5.5/ncurses/tinfo/lib_ttyflags.c
15109
===================================================================
15110
--- ncurses-5.5.orig/ncurses/tinfo/lib_ttyflags.c 2003-05-17 19:50:37.000000000 -0400
15111
+++ ncurses-5.5/ncurses/tinfo/lib_ttyflags.c 2006-04-18 15:47:22.000000000 -0400
15112
@@ -1,5 +1,5 @@
15113
/****************************************************************************
15114
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
15115
+ * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
15116
* *
15117
* Permission is hereby granted, free of charge, to any person obtaining a *
15118
* copy of this software and associated documentation files (the *
15119
@@ -38,7 +38,7 @@
15120
#include <curses.priv.h>
15121
#include <term.h> /* cur_term */
15122
15123
-MODULE_ID("$Id: lib_ttyflags.c,v 1.11 2003/05/17 23:50:37 tom Exp $")
15124
+MODULE_ID("$Id: lib_ttyflags.c,v 1.12 2005/11/19 20:36:23 tom Exp $")
15125
15126
#undef tabs
15127
15128
@@ -59,28 +59,51 @@ MODULE_ID("$Id: lib_ttyflags.c,v 1.11 20
15129
NCURSES_EXPORT(int)
15130
_nc_get_tty_mode(TTY * buf)
15131
{
15132
- if (cur_term == 0
15133
- || GET_TTY(cur_term->Filedes, buf) != 0) {
15134
- memset(buf, 0, sizeof(*buf));
15135
- return (ERR);
15136
+ int result = OK;
15137
+
15138
+ if (cur_term == 0) {
15139
+ result = ERR;
15140
+ } else {
15141
+ for (;;) {
15142
+ if (GET_TTY(cur_term->Filedes, buf) != 0) {
15143
+ if (errno == EINTR)
15144
+ continue;
15145
+ result = ERR;
15146
+ }
15147
+ break;
15148
+ }
15149
}
15150
+
15151
+ if (result == ERR)
15152
+ memset(buf, 0, sizeof(*buf));
15153
+
15154
TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
15155
cur_term->Filedes, _nc_trace_ttymode(buf)));
15156
- return (OK);
15157
+ return (result);
15158
}
15159
15160
NCURSES_EXPORT(int)
15161
_nc_set_tty_mode(TTY * buf)
15162
{
15163
- if (cur_term == 0
15164
- || SET_TTY(cur_term->Filedes, buf) != 0) {
15165
- if ((errno == ENOTTY) && (SP != 0))
15166
- SP->_notty = TRUE;
15167
- return (ERR);
15168
+ int result = OK;
15169
+
15170
+ if (cur_term == 0) {
15171
+ result = ERR;
15172
+ } else {
15173
+ for (;;) {
15174
+ if (SET_TTY(cur_term->Filedes, buf) != 0) {
15175
+ if (errno == EINTR)
15176
+ continue;
15177
+ if ((errno == ENOTTY) && (SP != 0))
15178
+ SP->_notty = TRUE;
15179
+ result = ERR;
15180
+ }
15181
+ break;
15182
+ }
15183
}
15184
TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
15185
cur_term->Filedes, _nc_trace_ttymode(buf)));
15186
- return (OK);
15187
+ return (result);
15188
}
15189
15190
NCURSES_EXPORT(int)
15191
Index: ncurses-5.5/ncurses/tinfo/read_entry.c
15192
===================================================================
15193
--- ncurses-5.5.orig/ncurses/tinfo/read_entry.c 2005-06-02 18:04:32.000000000 -0400
15194
+++ ncurses-5.5/ncurses/tinfo/read_entry.c 2006-04-18 15:47:22.000000000 -0400
15195
@@ -1,5 +1,5 @@
15196
/****************************************************************************
15197
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
15198
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
15199
* *
15200
* Permission is hereby granted, free of charge, to any person obtaining a *
15201
* copy of this software and associated documentation files (the *
15202
@@ -42,7 +42,7 @@
15203
#include <tic.h>
15204
#include <term_entry.h>
15205
15206
-MODULE_ID("$Id: read_entry.c,v 1.81 2005/06/02 22:04:32 tom Exp $")
15207
+MODULE_ID("$Id: read_entry.c,v 1.86 2006/01/21 17:25:55 tom Exp $")
15208
15209
#if !HAVE_TELL
15210
#define tell(fd) lseek(fd, 0, SEEK_CUR) /* lseek() is POSIX, but not tell() */
15211
@@ -170,7 +170,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15212
/* grab the header */
15213
if (!read_shorts(fd, buf, 6)
15214
|| LOW_MSB(buf) != MAGIC) {
15215
- return (0);
15216
+ return (TGETENT_NO);
15217
}
15218
15219
name_size = LOW_MSB(buf + 2);
15220
@@ -188,14 +188,14 @@ read_termtype(int fd, TERMTYPE *ptr)
15221
|| num_count < 0
15222
|| str_count < 0
15223
|| str_size < 0) {
15224
- return (0);
15225
+ return (TGETENT_NO);
15226
}
15227
15228
if (str_size) {
15229
/* try to allocate space for the string table */
15230
if (str_count * 2 >= (int) sizeof(buf)
15231
|| (ptr->str_table = typeMalloc(char, (unsigned) str_size)) == 0) {
15232
- return (0);
15233
+ return (TGETENT_NO);
15234
}
15235
} else {
15236
str_count = 0;
15237
@@ -209,7 +209,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15238
buf[want] = '\0';
15239
ptr->term_names = TYPE_CALLOC(char, strlen(buf) + 1);
15240
if (ptr->term_names == NULL) {
15241
- return (0);
15242
+ return (TGETENT_NO);
15243
}
15244
(void) strcpy(ptr->term_names, buf);
15245
if (have > MAX_NAME_SIZE)
15246
@@ -218,7 +218,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15247
/* grab the booleans */
15248
if ((ptr->Booleans = TYPE_CALLOC(char, max(BOOLCOUNT, bool_count))) == 0
15249
|| read(fd, ptr->Booleans, (unsigned) bool_count) < bool_count) {
15250
- return (0);
15251
+ return (TGETENT_NO);
15252
}
15253
15254
/*
15255
@@ -232,21 +232,21 @@ read_termtype(int fd, TERMTYPE *ptr)
15256
/* grab the numbers */
15257
if ((ptr->Numbers = TYPE_CALLOC(short, max(NUMCOUNT, num_count))) == 0
15258
|| !read_shorts(fd, buf, num_count)) {
15259
- return (0);
15260
+ return (TGETENT_NO);
15261
}
15262
convert_shorts(buf, ptr->Numbers, num_count);
15263
15264
if ((ptr->Strings = TYPE_CALLOC(char *, max(STRCOUNT, str_count))) == 0)
15265
- return (0);
15266
+ return (TGETENT_NO);
15267
15268
if (str_count) {
15269
/* grab the string offsets */
15270
if (!read_shorts(fd, buf, str_count)) {
15271
- return (0);
15272
+ return (TGETENT_NO);
15273
}
15274
/* finally, grab the string table itself */
15275
if (read(fd, ptr->str_table, (unsigned) str_size) != str_size)
15276
- return (0);
15277
+ return (TGETENT_NO);
15278
convert_strings(buf, ptr->Strings, str_count, str_size, ptr->str_table);
15279
}
15280
#if NCURSES_XNAMES
15281
@@ -277,7 +277,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15282
|| ext_str_count < 0
15283
|| ext_str_size < 0
15284
|| ext_str_limit < 0)
15285
- return (0);
15286
+ return (TGETENT_NO);
15287
15288
ptr->num_Booleans = BOOLCOUNT + ext_bool_count;
15289
ptr->num_Numbers = NUMCOUNT + ext_num_count;
15290
@@ -296,7 +296,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15291
if ((ptr->ext_Booleans = ext_bool_count) != 0) {
15292
if (read(fd, ptr->Booleans + BOOLCOUNT, (unsigned)
15293
ext_bool_count) != ext_bool_count)
15294
- return (0);
15295
+ return (TGETENT_NO);
15296
}
15297
even_boundary(ext_bool_count);
15298
15299
@@ -304,7 +304,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15300
ext_num_count, (long) tell(fd)));
15301
if ((ptr->ext_Numbers = ext_num_count) != 0) {
15302
if (!read_shorts(fd, buf, ext_num_count))
15303
- return (0);
15304
+ return (TGETENT_NO);
15305
TR(TRACE_DATABASE, ("Before converting extended-numbers"));
15306
convert_shorts(buf, ptr->Numbers + NUMCOUNT, ext_num_count);
15307
}
15308
@@ -312,16 +312,16 @@ read_termtype(int fd, TERMTYPE *ptr)
15309
TR(TRACE_DATABASE, ("READ extended-offsets @%ld", (long) tell(fd)));
15310
if ((ext_str_count || need)
15311
&& !read_shorts(fd, buf, ext_str_count + need))
15312
- return (0);
15313
+ return (TGETENT_NO);
15314
15315
TR(TRACE_DATABASE, ("READ %d bytes of extended-strings @%ld",
15316
ext_str_limit, (long) tell(fd)));
15317
15318
if (ext_str_limit) {
15319
if ((ptr->ext_str_table = typeMalloc(char, ext_str_limit)) == 0)
15320
- return (0);
15321
+ return (TGETENT_NO);
15322
if (read(fd, ptr->ext_str_table, (unsigned) ext_str_limit) != ext_str_limit)
15323
- return (0);
15324
+ return (TGETENT_NO);
15325
TR(TRACE_DATABASE, ("first extended-string is %s", _nc_visbuf(ptr->ext_str_table)));
15326
}
15327
15328
@@ -346,7 +346,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15329
15330
if (need) {
15331
if ((ptr->ext_Names = TYPE_CALLOC(char *, need)) == 0)
15332
- return (0);
15333
+ return (TGETENT_NO);
15334
TR(TRACE_DATABASE,
15335
("ext_NAMES starting @%d in extended_strings, first = %s",
15336
base, _nc_visbuf(ptr->ext_str_table + base)));
15337
@@ -379,7 +379,7 @@ read_termtype(int fd, TERMTYPE *ptr)
15338
for (i = str_count; i < STRCOUNT; i++)
15339
ptr->Strings[i] = ABSENT_STRING;
15340
15341
- return (1);
15342
+ return (TGETENT_YES);
15343
}
15344
15345
NCURSES_EXPORT(int)
15346
@@ -391,7 +391,7 @@ _nc_read_file_entry(const char *const fi
15347
if (_nc_access(filename, R_OK) < 0
15348
|| (fd = open(filename, O_RDONLY | O_BINARY)) < 0) {
15349
T(("cannot open terminfo %s (errno=%d)", filename, errno));
15350
- code = 0;
15351
+ code = TGETENT_NO;
15352
} else {
15353
T(("read terminfo %s", filename));
15354
if ((code = read_termtype(fd, ptr)) == 0) {
15355
@@ -408,14 +408,18 @@ _nc_read_file_entry(const char *const fi
15356
* 0 on failure.
15357
*/
15358
static int
15359
-_nc_read_tic_entry(char *const filename,
15360
- const char *const dir, const char *ttn, TERMTYPE *const tp)
15361
+_nc_read_tic_entry(char *filename,
15362
+ unsigned limit,
15363
+ const char *const dir,
15364
+ const char *name,
15365
+ TERMTYPE *const tp)
15366
{
15367
- int need = 2 + strlen(dir) + strlen(ttn);
15368
+ unsigned need = 4 + strlen(dir) + strlen(name);
15369
15370
- if (need > PATH_MAX)
15371
- return 0;
15372
- (void) sprintf(filename, "%s/%s", dir, ttn);
15373
+ if (need > limit)
15374
+ return TGETENT_NO;
15375
+
15376
+ (void) sprintf(filename, "%s/%c/%s", dir, *name, name);
15377
return _nc_read_file_entry(filename, tp);
15378
}
15379
15380
@@ -423,41 +427,131 @@ _nc_read_tic_entry(char *const filename,
15381
* Process the list of :-separated directories, looking for the terminal type.
15382
* We don't use strtok because it does not show us empty tokens.
15383
*/
15384
-static int
15385
-_nc_read_terminfo_dirs(const char *dirs, char *const filename, const char *const
15386
- ttn, TERMTYPE *const tp)
15387
+
15388
+static char *this_db_list = 0;
15389
+static int size_db_list;
15390
+
15391
+/*
15392
+ * Cleanup.
15393
+ */
15394
+NCURSES_EXPORT(void)
15395
+_nc_last_db(void)
15396
+{
15397
+ FreeAndNull(this_db_list);
15398
+ size_db_list = 0;
15399
+}
15400
+
15401
+/* The TERMINFO_DIRS value, if defined by the configure script, begins with a
15402
+ * ":", which will be interpreted as TERMINFO.
15403
+ */
15404
+static const char *
15405
+next_list_item(const char *source, int *offset)
15406
+{
15407
+ if (source != 0) {
15408
+ FreeIfNeeded(this_db_list);
15409
+ this_db_list = strdup(source);
15410
+ size_db_list = strlen(source);
15411
+ }
15412
+
15413
+ if (this_db_list != 0 && size_db_list && *offset < size_db_list) {
15414
+ static char system_db[] = TERMINFO;
15415
+ char *result = this_db_list + *offset;
15416
+ char *marker = strchr(result, NCURSES_PATHSEP);
15417
+
15418
+ /*
15419
+ * Put a null on the marker if a separator was found. Set the offset
15420
+ * to the next position after the marker so we can call this function
15421
+ * again, using the data at the offset.
15422
+ */
15423
+ if (marker == 0) {
15424
+ *offset += strlen(result) + 1;
15425
+ marker = result + *offset;
15426
+ } else {
15427
+ *marker++ = 0;
15428
+ *offset = marker - this_db_list;
15429
+ }
15430
+ if (*result == 0 && result != (this_db_list + size_db_list))
15431
+ result = system_db;
15432
+ return result;
15433
+ }
15434
+ return 0;
15435
+}
15436
+
15437
+#define NEXT_DBD(var, offset) next_list_item((*offset == 0) ? var : 0, offset)
15438
+
15439
+/*
15440
+ * This is a simple iterator which allows the caller to step through the
15441
+ * possible locations for a terminfo directory. ncurses uses this to find
15442
+ * terminfo files to read.
15443
+ */
15444
+NCURSES_EXPORT(const char *)
15445
+_nc_next_db(DBDIRS * state, int *offset)
15446
{
15447
- char *list, *a;
15448
- const char *b;
15449
- int code = 0;
15450
-
15451
- /* we'll modify the argument, so we must copy */
15452
- if ((b = a = list = strdup(dirs)) == NULL)
15453
- return (0);
15454
-
15455
- for (;;) {
15456
- int c = *a;
15457
- if (c == 0 || c == NCURSES_PATHSEP) {
15458
- *a = 0;
15459
- if ((b + 1) >= a)
15460
- b = TERMINFO;
15461
- if (_nc_read_tic_entry(filename, b, ttn, tp) == 1) {
15462
- code = 1;
15463
- break;
15464
+ const char *result;
15465
+ char *envp;
15466
+
15467
+ while (*state < dbdLAST) {
15468
+ DBDIRS next = *state + 1;
15469
+
15470
+ result = 0;
15471
+
15472
+ switch (*state) {
15473
+ case dbdTIC:
15474
+ if (have_tic_directory)
15475
+ result = _nc_tic_dir(0);
15476
+ break;
15477
+ case dbdEnvOnce:
15478
+ if (use_terminfo_vars()) {
15479
+ if ((envp = getenv("TERMINFO")) != 0)
15480
+ result = _nc_tic_dir(envp);
15481
+ }
15482
+ break;
15483
+ case dbdHome:
15484
+ if (use_terminfo_vars()) {
15485
+ result = _nc_home_terminfo();
15486
+ }
15487
+ break;
15488
+ case dbdEnvList:
15489
+ if (use_terminfo_vars()) {
15490
+ if ((result = NEXT_DBD(getenv("TERMINFO_DIRS"), offset)) != 0)
15491
+ next = *state;
15492
}
15493
- b = a + 1;
15494
- if (c == 0)
15495
- break;
15496
+ break;
15497
+ case dbdCfgList:
15498
+#ifdef TERMINFO_DIRS
15499
+ if ((result = NEXT_DBD(TERMINFO_DIRS, offset)) != 0)
15500
+ next = *state;
15501
+#endif
15502
+ break;
15503
+ case dbdCfgOnce:
15504
+#ifndef TERMINFO_DIRS
15505
+ result = TERMINFO;
15506
+#endif
15507
+ break;
15508
+ case dbdLAST:
15509
+ break;
15510
+ }
15511
+ if (*state != next) {
15512
+ *state = next;
15513
+ *offset = 0;
15514
+ _nc_last_db();
15515
+ }
15516
+ if (result != 0) {
15517
+ return result;
15518
}
15519
- a++;
15520
}
15521
+ return 0;
15522
+}
15523
15524
- free(list);
15525
- return (code);
15526
+NCURSES_EXPORT(void)
15527
+_nc_first_db(DBDIRS * state, int *offset)
15528
+{
15529
+ *state = dbdTIC;
15530
+ *offset = 0;
15531
}
15532
15533
/*
15534
- * _nc_read_entry(char *tn, char *filename, TERMTYPE *tp)
15535
+ * _nc_read_entry(char *name, char *filename, TERMTYPE *tp)
15536
*
15537
* Find and read the compiled entry for a given terminal type,
15538
* if it exists. We take pains here to make sure no combination
15539
@@ -466,53 +560,25 @@ _nc_read_terminfo_dirs(const char *dirs,
15540
*/
15541
15542
NCURSES_EXPORT(int)
15543
-_nc_read_entry(const char *const tn, char *const filename, TERMTYPE *const tp)
15544
+_nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp)
15545
{
15546
- char *envp;
15547
- char ttn[PATH_MAX];
15548
-
15549
- if (strlen(tn) == 0
15550
- || strcmp(tn, ".") == 0
15551
- || strcmp(tn, "..") == 0
15552
- || _nc_pathlast(tn) != 0) {
15553
- T(("illegal or missing entry name '%s'", tn));
15554
- return 0;
15555
- }
15556
-
15557
- /* truncate the terminal name to prevent buffer overflow */
15558
- (void) sprintf(ttn, "%c/%.*s", *tn, (int) sizeof(ttn) - 3, tn);
15559
-
15560
- /* This is System V behavior, in conjunction with our requirements for
15561
- * writing terminfo entries.
15562
- */
15563
- if (have_tic_directory
15564
- && _nc_read_tic_entry(filename, _nc_tic_dir(0), ttn, tp) == 1)
15565
- return 1;
15566
-
15567
- if (use_terminfo_vars()) {
15568
- if ((envp = getenv("TERMINFO")) != 0
15569
- && _nc_read_tic_entry(filename, _nc_tic_dir(envp), ttn, tp) == 1)
15570
- return 1;
15571
-
15572
- /* this is an ncurses extension */
15573
- if ((envp = _nc_home_terminfo()) != 0) {
15574
- if (_nc_read_tic_entry(filename, envp, ttn, tp) == 1) {
15575
- return 1;
15576
+ if (strlen(name) == 0
15577
+ || strcmp(name, ".") == 0
15578
+ || strcmp(name, "..") == 0
15579
+ || _nc_pathlast(name) != 0) {
15580
+ T(("illegal or missing entry name '%s'", name));
15581
+ return TGETENT_NO;
15582
+ } else {
15583
+ DBDIRS state = dbdTIC;
15584
+ int offset = 0;
15585
+ const char *path;
15586
+
15587
+ while ((path = _nc_next_db(&state, &offset)) != 0) {
15588
+ if (_nc_read_tic_entry(filename, PATH_MAX, path, name, tp) == 1) {
15589
+ _nc_last_db();
15590
+ return TGETENT_YES;
15591
}
15592
}
15593
-
15594
- /* this is an ncurses extension */
15595
- if ((envp = getenv("TERMINFO_DIRS")) != 0)
15596
- return _nc_read_terminfo_dirs(envp, filename, ttn, tp);
15597
}
15598
-
15599
- /* Try the system directory. Note that the TERMINFO_DIRS value, if
15600
- * defined by the configure script, begins with a ":", which will be
15601
- * interpreted as TERMINFO.
15602
- */
15603
-#ifdef TERMINFO_DIRS
15604
- return _nc_read_terminfo_dirs(TERMINFO_DIRS, filename, ttn, tp);
15605
-#else
15606
- return _nc_read_tic_entry(filename, TERMINFO, ttn, tp);
15607
-#endif
15608
+ return TGETENT_NO;
15609
}
15610
Index: ncurses-5.5/ncurses/tinfo/read_termcap.c
15611
===================================================================
15612
--- ncurses-5.5.orig/ncurses/tinfo/read_termcap.c 2006-04-18 15:40:42.000000000 -0400
15613
+++ ncurses-5.5/ncurses/tinfo/read_termcap.c 2006-04-18 15:47:22.000000000 -0400
15614
@@ -58,7 +58,7 @@
15615
#include <tic.h>
15616
#include <term_entry.h>
15617
15618
-MODULE_ID("$Id: read_termcap.c,v 1.67 2005/06/04 21:49:20 tom Exp $")
15619
+MODULE_ID("$Id: read_termcap.c,v 1.69 2005/12/24 19:33:25 tom Exp $")
15620
15621
#if !PURE_TERMINFO
15622
15623
@@ -70,10 +70,10 @@ MODULE_ID("$Id: read_termcap.c,v 1.67 20
15624
#endif
15625
15626
#define TC_SUCCESS 0
15627
-#define TC_UNRESOLVED -1
15628
-#define TC_NOT_FOUND -2
15629
-#define TC_SYS_ERR -3
15630
-#define TC_REF_LOOP -4
15631
+#define TC_NOT_FOUND -1
15632
+#define TC_SYS_ERR -2
15633
+#define TC_REF_LOOP -3
15634
+#define TC_UNRESOLVED -4 /* this is not returned by BSD cgetent */
15635
15636
static NCURSES_CONST char *
15637
get_termpath(void)
15638
@@ -232,10 +232,10 @@ _nc_cgetcap(char *buf, const char *cap,
15639
* Returns:
15640
*
15641
* positive # on success (i.e., the index in db_array)
15642
- * TC_UNRESOLVED if we had too many recurrences to resolve
15643
* TC_NOT_FOUND if the requested record couldn't be found
15644
* TC_SYS_ERR if a system error was encountered (e.g.,couldn't open a file)
15645
* TC_REF_LOOP if a potential reference loop is detected
15646
+ * TC_UNRESOLVED if we had too many recurrences to resolve
15647
*/
15648
static int
15649
_nc_cgetent(char **buf, int *oline, char **db_array, const char *name)
15650
@@ -935,13 +935,14 @@ add_tc(char *termpaths[], char *path, in
15651
NCURSES_EXPORT(int)
15652
_nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
15653
{
15654
- int found = FALSE;
15655
+ int found = TGETENT_NO;
15656
ENTRY *ep;
15657
#if USE_GETCAP_CACHE
15658
char cwd_buf[PATH_MAX];
15659
#endif
15660
#if USE_GETCAP
15661
char *p, tc[TBUFSIZ];
15662
+ int status;
15663
static char *source;
15664
static int lineno;
15665
15666
@@ -952,7 +953,7 @@ _nc_read_termcap_entry(const char *const
15667
|| strcmp(tn, "..") == 0
15668
|| _nc_pathlast(tn) != 0) {
15669
T(("illegal or missing entry name '%s'", tn));
15670
- return 0;
15671
+ return TGETENT_NO;
15672
}
15673
15674
if (use_terminfo_vars() && (p = getenv("TERMCAP")) != 0
15675
@@ -963,8 +964,8 @@ _nc_read_termcap_entry(const char *const
15676
_nc_set_source("TERMCAP");
15677
} else {
15678
/* we're using getcap(3) */
15679
- if (_nc_tgetent(tc, &source, &lineno, tn) < 0)
15680
- return (ERR);
15681
+ if ((status = _nc_tgetent(tc, &source, &lineno, tn)) < 0)
15682
+ return (status == TC_NOT_FOUND ? TGETENT_NO : TGETENT_ERR);
15683
15684
_nc_curr_line = lineno;
15685
_nc_set_source(source);
15686
@@ -1110,7 +1111,7 @@ _nc_read_termcap_entry(const char *const
15687
#endif /* USE_GETCAP */
15688
15689
if (_nc_head == 0)
15690
- return (ERR);
15691
+ return (TGETENT_ERR);
15692
15693
/* resolve all use references */
15694
_nc_resolve_uses2(TRUE, FALSE);
15695
@@ -1145,7 +1146,7 @@ _nc_read_termcap_entry(const char *const
15696
#if USE_GETCAP_CACHE
15697
(void) _nc_write_entry(tp);
15698
#endif
15699
- found = TRUE;
15700
+ found = TGETENT_YES;
15701
break;
15702
}
15703
}
15704
Index: ncurses-5.5/ncurses/tinfo/trim_sgr0.c
15705
===================================================================
15706
--- ncurses-5.5.orig/ncurses/tinfo/trim_sgr0.c 2005-07-16 20:13:24.000000000 -0400
15707
+++ ncurses-5.5/ncurses/tinfo/trim_sgr0.c 2006-04-18 15:47:22.000000000 -0400
15708
@@ -37,7 +37,7 @@
15709
#include <tic.h>
15710
#include <term_entry.h>
15711
15712
-MODULE_ID("$Id: trim_sgr0.c,v 1.5 2005/07/17 00:13:24 tom Exp $")
15713
+MODULE_ID("$Id: trim_sgr0.c,v 1.6 2005/12/17 17:05:05 tom Exp $")
15714
15715
#undef CUR
15716
#define CUR tp->
15717
@@ -83,7 +83,7 @@ skip_delay(const char *s)
15718
{
15719
if (s[0] == '$' && s[1] == '<') {
15720
s += 2;
15721
- while ((*s != '\0') && (isdigit(*s) || *s == '/'))
15722
+ while ((*s != '\0') && (isdigit(UChar(*s)) || *s == '/'))
15723
++s;
15724
if (*s == '>')
15725
++s;
15726
Index: ncurses-5.5/ncurses/tty/hashmap.c
15727
===================================================================
15728
--- ncurses-5.5.orig/ncurses/tty/hashmap.c 2005-01-29 16:27:58.000000000 -0500
15729
+++ ncurses-5.5/ncurses/tty/hashmap.c 2006-04-18 15:48:07.000000000 -0400
15730
@@ -1,5 +1,5 @@
15731
/****************************************************************************
15732
- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
15733
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
15734
* *
15735
* Permission is hereby granted, free of charge, to any person obtaining a *
15736
* copy of this software and associated documentation files (the *
15737
@@ -70,7 +70,7 @@ AUTHOR
15738
#include <curses.priv.h>
15739
#include <term.h> /* for back_color_erase */
15740
15741
-MODULE_ID("$Id: hashmap.c,v 1.47 2005/01/29 21:27:58 tom Exp $")
15742
+MODULE_ID("$Id: hashmap.c,v 1.49 2006/03/11 19:33:49 tom Exp $")
15743
15744
#ifdef HASHDEBUG
15745
15746
@@ -108,7 +108,9 @@ static chtype oldtext[MAXLINES][TEXTWIDT
15747
#define HASH_VAL(ch) (ch)
15748
#endif
15749
15750
-static inline unsigned long
15751
+static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
15752
+
15753
+static NCURSES_INLINE unsigned long
15754
hash(NCURSES_CH_T * text)
15755
{
15756
int i;
15757
@@ -140,7 +142,7 @@ update_cost_from_blank(NCURSES_CH_T * to
15758
{
15759
int cost = 0;
15760
int i;
15761
- NCURSES_CH_T blank = NewChar2(BLANK_TEXT, BLANK_ATTR);
15762
+ NCURSES_CH_T blank = blankchar;
15763
15764
if (back_color_erase)
15765
SetPair(blank, GetPair(stdscr->_nc_bkgd));
15766
@@ -156,7 +158,7 @@ update_cost_from_blank(NCURSES_CH_T * to
15767
* Returns true when moving line 'from' to line 'to' seems to be cost
15768
* effective. 'blank' indicates whether the line 'to' would become blank.
15769
*/
15770
-static inline bool
15771
+static NCURSES_INLINE bool
15772
cost_effective(const int from, const int to, const bool blank)
15773
{
15774
int new_from;
15775
Index: ncurses-5.5/ncurses/tty/lib_mvcur.c
15776
===================================================================
15777
--- ncurses-5.5.orig/ncurses/tty/lib_mvcur.c 2005-06-11 15:30:15.000000000 -0400
15778
+++ ncurses-5.5/ncurses/tty/lib_mvcur.c 2006-04-18 15:47:22.000000000 -0400
15779
@@ -1,5 +1,5 @@
15780
/****************************************************************************
15781
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
15782
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
15783
* *
15784
* Permission is hereby granted, free of charge, to any person obtaining a *
15785
* copy of this software and associated documentation files (the *
15786
@@ -155,7 +155,7 @@
15787
#include <term.h>
15788
#include <ctype.h>
15789
15790
-MODULE_ID("$Id: lib_mvcur.c,v 1.103 2005/06/11 19:30:15 tom Exp $")
15791
+MODULE_ID("$Id: lib_mvcur.c,v 1.105 2006/01/11 23:58:53 tom Exp $")
15792
15793
#define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */
15794
#define BAUDRATE cur_term->_baudrate /* bits per second */
15795
@@ -448,7 +448,7 @@ _nc_mvcur_wrap(void)
15796
/*
15797
* Perform repeated-append, returning cost
15798
*/
15799
-static inline int
15800
+static NCURSES_INLINE int
15801
repeated_append(string_desc * target, int total, int num, int repeat, const char *src)
15802
{
15803
size_t need = repeat * strlen(src);
15804
@@ -695,7 +695,7 @@ relative_move(string_desc * target, int
15805
* the simpler method below.
15806
*/
15807
15808
-static inline int
15809
+static NCURSES_INLINE int
15810
onscreen_mvcur(int yold, int xold, int ynew, int xnew, bool ovw)
15811
/* onscreen move from (yold, xold) to (ynew, xnew) */
15812
{
15813
@@ -1014,7 +1014,7 @@ main(int argc GCC_UNUSED, char *argv[]GC
15814
{
15815
(void) strcpy(tname, termname());
15816
load_term();
15817
- _nc_setupscreen(lines, columns, stdout);
15818
+ _nc_setupscreen(lines, columns, stdout, FALSE, 0);
15819
baudrate();
15820
15821
_nc_mvcur_init();
15822
Index: ncurses-5.5/ncurses/tty/lib_tstp.c
15823
===================================================================
15824
--- ncurses-5.5.orig/ncurses/tty/lib_tstp.c 2002-05-18 15:55:38.000000000 -0400
15825
+++ ncurses-5.5/ncurses/tty/lib_tstp.c 2006-04-18 15:48:07.000000000 -0400
15826
@@ -1,5 +1,5 @@
15827
/****************************************************************************
15828
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. *
15829
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
15830
* *
15831
* Permission is hereby granted, free of charge, to any person obtaining a *
15832
* copy of this software and associated documentation files (the *
15833
@@ -29,7 +29,7 @@
15834
/****************************************************************************
15835
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
15836
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
15837
- * and: Thomas Dickey 1995-2001 *
15838
+ * and: Thomas E. Dickey 1995-on *
15839
****************************************************************************/
15840
15841
/*
15842
@@ -46,7 +46,7 @@
15843
#define _POSIX_SOURCE
15844
#endif
15845
15846
-MODULE_ID("$Id: lib_tstp.c,v 1.30 2002/05/18 19:55:38 tom Exp $")
15847
+MODULE_ID("$Id: lib_tstp.c,v 1.32 2006/04/01 19:31:34 tom Exp $")
15848
15849
#if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
15850
#define USE_SIGTSTP 1
15851
@@ -277,11 +277,7 @@ cleanup(int sig)
15852
static void
15853
sigwinch(int sig GCC_UNUSED)
15854
{
15855
- SCREEN *scan = _nc_screen_chain;
15856
- while (scan) {
15857
- scan->_sig_winch = TRUE;
15858
- scan = scan->_next_screen;
15859
- }
15860
+ _nc_handle_sigwinch(-1);
15861
}
15862
#endif /* USE_SIGWINCH */
15863
15864
Index: ncurses-5.5/ncurses/tty/lib_vidattr.c
15865
===================================================================
15866
--- ncurses-5.5.orig/ncurses/tty/lib_vidattr.c 2005-01-22 17:15:44.000000000 -0500
15867
+++ ncurses-5.5/ncurses/tty/lib_vidattr.c 2006-04-18 15:47:22.000000000 -0400
15868
@@ -1,5 +1,5 @@
15869
/****************************************************************************
15870
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
15871
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
15872
* *
15873
* Permission is hereby granted, free of charge, to any person obtaining a *
15874
* copy of this software and associated documentation files (the *
15875
@@ -65,7 +65,7 @@
15876
#include <curses.priv.h>
15877
#include <term.h>
15878
15879
-MODULE_ID("$Id: lib_vidattr.c,v 1.44 2005/01/22 22:15:44 tom Exp $")
15880
+MODULE_ID("$Id: lib_vidattr.c,v 1.46 2006/01/21 23:39:40 tom Exp $")
15881
15882
#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
15883
15884
@@ -109,11 +109,47 @@ vidputs(chtype newmode, int (*outc) (int
15885
15886
TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(previous_attr)));
15887
15888
-#if !USE_XMC_SUPPORT
15889
if ((SP != 0)
15890
- && (magic_cookie_glitch > 0))
15891
+ && (magic_cookie_glitch > 0)) {
15892
+#if USE_XMC_SUPPORT
15893
+ static chtype table[] =
15894
+ {
15895
+ A_STANDOUT,
15896
+ A_UNDERLINE,
15897
+ A_REVERSE,
15898
+ A_BLINK,
15899
+ A_DIM,
15900
+ A_BOLD,
15901
+ A_INVIS,
15902
+ A_PROTECT,
15903
+ };
15904
+ unsigned n;
15905
+ int used = 0;
15906
+ int limit = (max_attributes <= 0) ? 1 : max_attributes;
15907
+ chtype retain = 0;
15908
+
15909
+ /*
15910
+ * Limit the number of attribute bits set in the newmode according to
15911
+ * the terminfo max_attributes value.
15912
+ */
15913
+ for (n = 0; n < SIZEOF(table); ++n) {
15914
+ if ((table[n] & SP->_ok_attributes) == 0) {
15915
+ newmode &= ~table[n];
15916
+ } else if ((table[n] & newmode) != 0) {
15917
+ if (used++ >= limit) {
15918
+ newmode &= ~table[n];
15919
+ if (newmode == retain)
15920
+ break;
15921
+ } else {
15922
+ retain = newmode;
15923
+ }
15924
+ }
15925
+ }
15926
+#else
15927
newmode &= ~(SP->_xmc_suppress);
15928
#endif
15929
+ TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode)));
15930
+ }
15931
15932
/*
15933
* If we have a terminal that cannot combine color with video
15934
Index: ncurses-5.5/ncurses/tty/tty_update.c
15935
===================================================================
15936
--- ncurses-5.5.orig/ncurses/tty/tty_update.c 2005-08-13 13:12:32.000000000 -0400
15937
+++ ncurses-5.5/ncurses/tty/tty_update.c 2006-04-29 10:41:13.000000000 -0400
15938
@@ -1,5 +1,5 @@
15939
/****************************************************************************
15940
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
15941
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
15942
* *
15943
* Permission is hereby granted, free of charge, to any person obtaining a *
15944
* copy of this software and associated documentation files (the *
15945
@@ -74,7 +74,7 @@
15946
#include <ctype.h>
15947
#include <term.h>
15948
15949
-MODULE_ID("$Id: tty_update.c,v 1.220 2005/08/13 17:12:32 tom Exp $")
15950
+MODULE_ID("$Id: tty_update.c,v 1.231 2006/04/22 20:15:02 tom Exp $")
15951
15952
/*
15953
* This define controls the line-breakout optimization. Every once in a
15954
@@ -89,7 +89,8 @@ MODULE_ID("$Id: tty_update.c,v 1.220 200
15955
15956
#define FILL_BCE() (SP->_coloron && !SP->_default_color && !back_color_erase)
15957
15958
-static const NCURSES_CH_T normal = NewChar2(BLANK_TEXT, BLANK_ATTR);
15959
+static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
15960
+static NCURSES_CH_T normal = NewChar(BLANK_TEXT);
15961
15962
/*
15963
* Enable checking to see if doupdate and friends are tracking the true
15964
@@ -98,7 +99,7 @@ static const NCURSES_CH_T normal = NewCh
15965
*/
15966
/* #define POSITION_DEBUG */
15967
15968
-static inline NCURSES_CH_T ClrBlank(WINDOW *win);
15969
+static NCURSES_INLINE NCURSES_CH_T ClrBlank(WINDOW *win);
15970
static int ClrBottom(int total);
15971
static void ClearScreen(NCURSES_CH_T blank);
15972
static void ClrUpdate(void);
15973
@@ -166,7 +167,7 @@ position_check(int expected_y, int expec
15974
*
15975
****************************************************************************/
15976
15977
-static inline void
15978
+static NCURSES_INLINE void
15979
GoTo(int const row, int const col)
15980
{
15981
TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)",
15982
@@ -178,7 +179,7 @@ GoTo(int const row, int const col)
15983
position_check(SP->_cursrow, SP->_curscol, "GoTo2");
15984
}
15985
15986
-static inline void
15987
+static NCURSES_INLINE void
15988
PutAttrChar(CARG_CH_T ch)
15989
{
15990
int chlen = 1;
15991
@@ -203,11 +204,29 @@ PutAttrChar(CARG_CH_T ch)
15992
* on the screen. It should be at least one.
15993
*/
15994
if ((chlen = wcwidth(CharOf(CHDEREF(ch)))) <= 0) {
15995
- static NCURSES_CH_T blank = NewChar(BLANK_TEXT);
15996
+ static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
15997
15998
+ /*
15999
+ * If the character falls into any of these special cases, do
16000
+ * not force the result to a blank:
16001
+ *
16002
+ * a) it is printable (this works around a bug in wcwidth()).
16003
+ * b) use_legacy_coding() has been called to modify the treatment
16004
+ * of codes 128-255.
16005
+ * c) the acs_map[] has been initialized to allow codes 0-31
16006
+ * to be rendered. This supports Linux console's "PC"
16007
+ * characters. Codes 128-255 are allowed though this is
16008
+ * not checked.
16009
+ */
16010
if (is8bits(CharOf(CHDEREF(ch)))
16011
&& (isprint(CharOf(CHDEREF(ch)))
16012
- || (SP->_legacy_coding && CharOf(CHDEREF(ch)) >= 160))) {
16013
+ || (SP->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160)
16014
+ || (SP->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
16015
+ || (AttrOf(attr) & A_ALTCHARSET
16016
+ && ((CharOfD(ch) < ACS_LEN
16017
+ && SP->_acs_map != 0
16018
+ && SP->_acs_map[CharOfD(ch)] != 0)
16019
+ || (CharOfD(ch) >= 128))))) {
16020
;
16021
} else {
16022
ch = CHREF(blank);
16023
@@ -244,8 +263,11 @@ PutAttrChar(CARG_CH_T ch)
16024
int j = CharOfD(ch);
16025
chtype temp = UChar(SP->_acs_map[j]);
16026
16027
- if (!(SP->_screen_acs_map[j]))
16028
+ if (!(SP->_screen_acs_map[j])) {
16029
RemAttr(attr, A_ALTCHARSET);
16030
+ if (temp == 0)
16031
+ temp = ' ';
16032
+ }
16033
if (temp != 0)
16034
SetChar(my_ch, temp, AttrOf(attr));
16035
}
16036
@@ -392,7 +414,7 @@ wrap_cursor(void)
16037
position_check(SP->_cursrow, SP->_curscol, "wrap_cursor");
16038
}
16039
16040
-static inline void
16041
+static NCURSES_INLINE void
16042
PutChar(const ARG_CH_T ch)
16043
/* insert character, handling automargin stuff */
16044
{
16045
@@ -413,7 +435,7 @@ PutChar(const ARG_CH_T ch)
16046
* as A_REVERSE. All attribute flags which don't affect appearance of a space
16047
* or can be output by clearing (A_COLOR in case of bce-terminal) are excluded.
16048
*/
16049
-static inline bool
16050
+static NCURSES_INLINE bool
16051
can_clear_with(ARG_CH_T ch)
16052
{
16053
if (!back_color_erase && SP->_coloron) {
16054
@@ -637,17 +659,15 @@ doupdate(void)
16055
#endif /* USE_TRACE_TIMES */
16056
16057
/*
16058
- * This is the support for magic-cookie terminals. The
16059
- * theory: we scan the virtual screen looking for attribute
16060
- * turnons. Where we find one, check to make sure it's
16061
- * realizable by seeing if the required number of
16062
- * un-attributed blanks are present before and after the
16063
- * attributed range; try to shift the range boundaries over
16064
- * blanks (not changing the screen display) so this becomes
16065
- * true. If it is, shift the beginning attribute change
16066
- * appropriately (the end one, if we've gotten this far, is
16067
- * guaranteed room for its cookie). If not, nuke the added
16068
- * attributes out of the span.
16069
+ * This is the support for magic-cookie terminals. The theory: we scan
16070
+ * the virtual screen looking for attribute turnons. Where we find one,
16071
+ * check to make sure it's realizable by seeing if the required number of
16072
+ * un-attributed blanks are present before and after the attributed range;
16073
+ * try to shift the range boundaries over blanks (not changing the screen
16074
+ * display) so this becomes true. If it is, shift the beginning attribute
16075
+ * change appropriately (the end one, if we've gotten this far, is
16076
+ * guaranteed room for its cookie). If not, nuke the added attributes out
16077
+ * of the span.
16078
*/
16079
#if USE_XMC_SUPPORT
16080
if (magic_cookie_glitch > 0) {
16081
@@ -657,11 +677,13 @@ doupdate(void)
16082
for (i = 0; i < screen_lines; i++) {
16083
for (j = 0; j < screen_columns; j++) {
16084
bool failed = FALSE;
16085
- attr_t turnon = AttrOf(newscr->_line[i].text[j]) & ~rattr;
16086
+ NCURSES_CH_T *thisline = newscr->_line[i].text;
16087
+ attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers;
16088
+ attr_t turnon = thisattr & ~rattr;
16089
16090
/* is an attribute turned on here? */
16091
if (turnon == 0) {
16092
- rattr = AttrOf(newscr->_line[i].text[j]);
16093
+ rattr = thisattr;
16094
continue;
16095
}
16096
16097
@@ -669,23 +691,33 @@ doupdate(void)
16098
TR(TRACE_ATTRS, ("...to %s", _traceattr(turnon)));
16099
16100
/*
16101
- * If the attribute change location is a blank with a
16102
- * "safe" attribute, undo the attribute turnon. This may
16103
- * ensure there's enough room to set the attribute before
16104
- * the first non-blank in the run.
16105
+ * If the attribute change location is a blank with a "safe"
16106
+ * attribute, undo the attribute turnon. This may ensure
16107
+ * there's enough room to set the attribute before the first
16108
+ * non-blank in the run.
16109
*/
16110
-#define SAFE(a) (!((a) & (attr_t)~NONBLANK_ATTR))
16111
- if (ISBLANK(newscr->_line[i].text[j]) && SAFE(turnon)) {
16112
- RemAttr(newscr->_line[i].text[j], turnon);
16113
+#define SAFE(a) (!((a) & SP->_xmc_triggers))
16114
+ if (ISBLANK(thisline[j]) && SAFE(turnon)) {
16115
+ RemAttr(thisline[j], turnon);
16116
continue;
16117
}
16118
16119
/* check that there's enough room at start of span */
16120
for (k = 1; k <= magic_cookie_glitch; k++) {
16121
if (j - k < 0
16122
- || !ISBLANK(newscr->_line[i].text[j - k])
16123
- || !SAFE(AttrOf(newscr->_line[i].text[j - k])))
16124
+ || !ISBLANK(thisline[j - k])
16125
+ || !SAFE(AttrOf(thisline[j - k]))) {
16126
failed = TRUE;
16127
+ TR(TRACE_ATTRS, ("No room at start in %d,%d%s%s",
16128
+ i, j - k,
16129
+ (ISBLANK(thisline[j - k])
16130
+ ? ""
16131
+ : ":nonblank"),
16132
+ (SAFE(AttrOf(thisline[j - k]))
16133
+ ? ""
16134
+ : ":unsafe")));
16135
+ break;
16136
+ }
16137
}
16138
if (!failed) {
16139
bool end_onscreen = FALSE;
16140
@@ -694,7 +726,8 @@ doupdate(void)
16141
/* find end of span, if it's onscreen */
16142
for (m = i; m < screen_lines; m++) {
16143
for (; n < screen_columns; n++) {
16144
- if (AttrOf(newscr->_line[m].text[n]) == rattr) {
16145
+ attr_t testattr = AttrOf(newscr->_line[m].text[n]);
16146
+ if ((testattr & SP->_xmc_triggers) == rattr) {
16147
end_onscreen = TRUE;
16148
TR(TRACE_ATTRS,
16149
("Range attributed with %s ends at (%d, %d)",
16150
@@ -713,22 +746,34 @@ doupdate(void)
16151
NCURSES_CH_T *lastline = newscr->_line[m].text;
16152
16153
/*
16154
- * If there are safely-attributed blanks at the
16155
- * end of the range, shorten the range. This will
16156
- * help ensure that there is enough room at end
16157
- * of span.
16158
+ * If there are safely-attributed blanks at the end of
16159
+ * the range, shorten the range. This will help ensure
16160
+ * that there is enough room at end of span.
16161
*/
16162
while (n >= 0
16163
&& ISBLANK(lastline[n])
16164
- && SAFE(AttrOf(lastline[n])))
16165
+ && SAFE(AttrOf(lastline[n]))) {
16166
RemAttr(lastline[n--], turnon);
16167
+ }
16168
16169
/* check that there's enough room at end of span */
16170
- for (k = 1; k <= magic_cookie_glitch; k++)
16171
+ for (k = 1; k <= magic_cookie_glitch; k++) {
16172
if (n + k >= screen_columns
16173
|| !ISBLANK(lastline[n + k])
16174
- || !SAFE(AttrOf(lastline[n + k])))
16175
+ || !SAFE(AttrOf(lastline[n + k]))) {
16176
failed = TRUE;
16177
+ TR(TRACE_ATTRS,
16178
+ ("No room at end in %d,%d%s%s",
16179
+ i, j - k,
16180
+ (ISBLANK(lastline[n + k])
16181
+ ? ""
16182
+ : ":nonblank"),
16183
+ (SAFE(AttrOf(lastline[n + k]))
16184
+ ? ""
16185
+ : ":unsafe")));
16186
+ break;
16187
+ }
16188
+ }
16189
}
16190
}
16191
16192
@@ -742,7 +787,8 @@ doupdate(void)
16193
/* turn off new attributes over span */
16194
for (p = i; p < screen_lines; p++) {
16195
for (; q < screen_columns; q++) {
16196
- if (AttrOf(newscr->_line[p].text[q]) == rattr)
16197
+ attr_t testattr = AttrOf(newscr->_line[p].text[q]);
16198
+ if ((testattr & SP->_xmc_triggers) == rattr)
16199
goto foundend;
16200
RemAttr(newscr->_line[p].text[q], turnon);
16201
}
16202
@@ -755,14 +801,14 @@ doupdate(void)
16203
_traceattr(turnon), i, j));
16204
16205
/*
16206
- * back up the start of range so there's room
16207
- * for cookies before the first nonblank character
16208
+ * Back up the start of range so there's room for cookies
16209
+ * before the first nonblank character.
16210
*/
16211
for (k = 1; k <= magic_cookie_glitch; k++)
16212
- AddAttr(newscr->_line[i].text[j - k], turnon);
16213
+ AddAttr(thisline[j - k], turnon);
16214
}
16215
16216
- rattr = AttrOf(newscr->_line[i].text[j]);
16217
+ rattr = thisattr;
16218
}
16219
}
16220
16221
@@ -846,10 +892,15 @@ doupdate(void)
16222
16223
cleanup:
16224
/*
16225
- * Keep the physical screen in normal mode in case we get other
16226
- * processes writing to the screen.
16227
+ * We would like to keep the physical screen in normal mode in case we get
16228
+ * other processes writing to the screen. This goal cannot be met for
16229
+ * magic cookies since it interferes with attributes that may propagate
16230
+ * past the current position.
16231
*/
16232
- UpdateAttrs(normal);
16233
+#if USE_XMC_SUPPORT
16234
+ if (magic_cookie_glitch != 0)
16235
+#endif
16236
+ UpdateAttrs(normal);
16237
16238
_nc_flush();
16239
curscr->_attrs = newscr->_attrs;
16240
@@ -881,10 +932,10 @@ doupdate(void)
16241
#define BCE_ATTRS (A_NORMAL|A_COLOR)
16242
#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_nc_bkgd)
16243
16244
-static inline NCURSES_CH_T
16245
+static NCURSES_INLINE NCURSES_CH_T
16246
ClrBlank(WINDOW *win)
16247
{
16248
- NCURSES_CH_T blank = NewChar(BLANK_TEXT);
16249
+ NCURSES_CH_T blank = blankchar;
16250
if (back_color_erase)
16251
AddAttr(blank, (AttrOf(BCE_BKGD(win)) & BCE_ATTRS));
16252
return blank;
16253
@@ -1031,7 +1082,7 @@ ClrBottom(int total)
16254
16255
#if USE_XMC_SUPPORT
16256
#if USE_WIDEC_SUPPORT
16257
-static inline bool
16258
+static NCURSES_INLINE bool
16259
check_xmc_transition(NCURSES_CH_T * a, NCURSES_CH_T * b)
16260
{
16261
if (((a->attr ^ b->attr) & ~(a->attr) & SP->_xmc_triggers) != 0) {
16262
@@ -1751,7 +1802,7 @@ _nc_scrolln(int n, int top, int bot, int
16263
*/
16264
if (res != ERR
16265
&& (non_dest_scroll_region || (memory_below && bot == maxy))) {
16266
- NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
16267
+ static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
16268
if (bot == maxy && clr_eos) {
16269
GoTo(bot - n + 1, 0);
16270
ClrToEOS(blank2);
16271
@@ -1797,7 +1848,7 @@ _nc_scrolln(int n, int top, int bot, int
16272
*/
16273
if (res != ERR
16274
&& (non_dest_scroll_region || (memory_above && top == 0))) {
16275
- NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
16276
+ static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
16277
for (i = 0; i < -n; i++) {
16278
GoTo(i + top, 0);
16279
ClrToEOL(blank2, FALSE);
16280
@@ -1872,7 +1923,7 @@ _nc_screen_wrap(void)
16281
#if NCURSES_EXT_FUNCS
16282
if (SP->_coloron
16283
&& !SP->_default_color) {
16284
- NCURSES_CH_T blank = NewChar(BLANK_TEXT);
16285
+ static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
16286
SP->_default_color = TRUE;
16287
_nc_do_color(-1, 0, FALSE, _nc_outch);
16288
SP->_default_color = FALSE;
16289
Index: ncurses-5.5/ncurses/widechar/lib_ins_wch.c
16290
===================================================================
16291
--- ncurses-5.5.orig/ncurses/widechar/lib_ins_wch.c 2005-09-17 15:25:13.000000000 -0400
16292
+++ ncurses-5.5/ncurses/widechar/lib_ins_wch.c 2006-04-18 15:47:22.000000000 -0400
16293
@@ -39,7 +39,7 @@
16294
16295
#include <curses.priv.h>
16296
16297
-MODULE_ID("$Id: lib_ins_wch.c,v 1.7 2005/09/17 19:25:13 tom Exp $")
16298
+MODULE_ID("$Id: lib_ins_wch.c,v 1.8 2005/12/03 20:24:19 tom Exp $")
16299
16300
/*
16301
* Insert the given character, updating the current location to simplify
16302
@@ -117,7 +117,7 @@ wins_nwstr(WINDOW *win, const wchar_t *w
16303
for (cp = wstr; *cp && ((cp - wstr) < n); cp++) {
16304
int len = wcwidth(*cp);
16305
16306
- if (len != 1) {
16307
+ if (len != 1 || !is8bits(*cp)) {
16308
cchar_t tmp_cchar;
16309
wchar_t tmp_wchar = *cp;
16310
memset(&tmp_cchar, 0, sizeof(tmp_cchar));
16311
Index: ncurses-5.5/panel/panel.priv.h
16312
===================================================================
16313
--- ncurses-5.5.orig/panel/panel.priv.h 2005-02-19 12:16:54.000000000 -0500
16314
+++ ncurses-5.5/panel/panel.priv.h 2006-04-18 15:47:22.000000000 -0400
16315
@@ -26,7 +26,7 @@
16316
* authorization. *
16317
****************************************************************************/
16318
16319
-/* $Id: panel.priv.h,v 1.20 2005/02/19 17:16:54 tom Exp $ */
16320
+/* $Id: panel.priv.h,v 1.21 2005/11/26 15:27:00 tom Exp $ */
16321
16322
#ifndef NCURSES_PANEL_PRIV_H
16323
#define NCURSES_PANEL_PRIV_H 1
16324
@@ -51,12 +51,6 @@
16325
#include "panel.h"
16326
#include <nc_panel.h>
16327
16328
-#if ( CC_HAS_INLINE_FUNCS && !defined(TRACE) )
16329
-# define INLINE inline
16330
-#else
16331
-# define INLINE
16332
-#endif
16333
-
16334
#if USE_RCS_IDS
16335
# define MODULE_ID(id) static const char Ident[] = id;
16336
#else
16337
Index: ncurses-5.5/progs/Makefile.in
16338
===================================================================
16339
--- ncurses-5.5.orig/progs/Makefile.in 2005-09-24 20:42:08.000000000 -0400
16340
+++ ncurses-5.5/progs/Makefile.in 2006-04-18 15:48:07.000000000 -0400
16341
@@ -1,6 +1,6 @@
16342
-# $Id: Makefile.in,v 1.65 2005/09/25 00:42:08 tom Exp $
16343
+# $Id: Makefile.in,v 1.67 2006/03/11 21:18:22 tom Exp $
16344
##############################################################################
16345
-# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. #
16346
+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
16347
# #
16348
# Permission is hereby granted, free of charge, to any person obtaining a #
16349
# copy of this software and associated documentation files (the "Software"), #
16350
@@ -27,7 +27,7 @@
16351
# authorization. #
16352
##############################################################################
16353
#
16354
-# Author: Thomas E. Dickey 1996-2003
16355
+# Author: Thomas E. Dickey 1996-on
16356
#
16357
# Makefile for ncurses source code.
16358
#
16359
@@ -119,8 +119,6 @@ GET_PROGS = infocmp$x clear$x tput$x tse
16360
PUT_PROGS = @MAKE_TERMINFO@ tic$x toe$x
16361
PROGS = $(PUT_PROGS) $(GET_PROGS)
16362
16363
-TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
16364
-
16365
# Default library, for linking applications
16366
DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
16367
16368
@@ -145,6 +143,7 @@ uninstall.libs:
16369
16370
TRANSFORM = sed 's/$x$$//'|sed '$(transform)'|sed 's/$$/$x/'
16371
16372
+# transformed names for installing files
16373
actual_captoinfo = `echo captoinfo$x| $(TRANSFORM)`
16374
actual_clear = `echo clear$x| $(TRANSFORM)`
16375
actual_infocmp = `echo infocmp$x| $(TRANSFORM)`
16376
@@ -156,11 +155,17 @@ actual_toe = `echo toe$x| $(
16377
actual_tput = `echo tput$x| $(TRANSFORM)`
16378
actual_tset = `echo tset$x| $(TRANSFORM)`
16379
16380
+# transformed names for comparing at runtime
16381
+define_captoinfo = `echo captoinfo| $(TRANSFORM)`
16382
+define_infotocap = `echo infotocap| $(TRANSFORM)`
16383
+define_init = `echo init| $(TRANSFORM)`
16384
+define_reset = `echo reset| $(TRANSFORM)`
16385
+
16386
transform.h :
16387
- echo "#define PROG_CAPTOINFO \"$(actual_captoinfo)\"" >$@
16388
- echo "#define PROG_INFOTOCAP \"$(actual_infotocap)\"" >>$@
16389
- echo "#define PROG_RESET \"$(actual_reset)\"" >>$@
16390
- echo "#define PROG_INIT \"$(actual_init)\"" >>$@
16391
+ echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\"" >$@
16392
+ echo "#define PROG_INFOTOCAP \"$(define_infotocap)\"" >>$@
16393
+ echo "#define PROG_RESET \"$(define_reset)\"" >>$@
16394
+ echo "#define PROG_INIT \"$(define_init)\"" >>$@
16395
16396
install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
16397
@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
16398
@@ -252,7 +257,6 @@ tags:
16399
16400
mostlyclean ::
16401
-rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
16402
- -rm -f $(TESTPROGS)
16403
16404
clean :: mostlyclean
16405
-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
16406
Index: ncurses-5.5/progs/dump_entry.c
16407
===================================================================
16408
--- ncurses-5.5.orig/progs/dump_entry.c 2005-07-23 16:03:30.000000000 -0400
16409
+++ ncurses-5.5/progs/dump_entry.c 2006-04-18 15:48:07.000000000 -0400
16410
@@ -1,5 +1,5 @@
16411
/****************************************************************************
16412
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
16413
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
16414
* *
16415
* Permission is hereby granted, free of charge, to any person obtaining a *
16416
* copy of this software and associated documentation files (the *
16417
@@ -39,7 +39,7 @@
16418
#include "termsort.c" /* this C file is generated */
16419
#include <parametrized.h> /* so is this */
16420
16421
-MODULE_ID("$Id: dump_entry.c,v 1.70 2005/07/23 20:03:30 tom Exp $")
16422
+MODULE_ID("$Id: dump_entry.c,v 1.76 2006/04/15 22:43:02 tom Exp $")
16423
16424
#define INDENT 8
16425
#define DISCARD(string) string = ABSENT_STRING
16426
@@ -60,7 +60,6 @@ static int oldcol; /* last value of col
16427
static bool pretty; /* true if we format if-then-else strings */
16428
16429
static char *save_sgr;
16430
-static char *save_acsc;
16431
16432
static DYNBUF outbuf;
16433
static DYNBUF tmpbuf;
16434
@@ -740,7 +739,7 @@ fmt_entry(TERMTYPE *tterm,
16435
16436
/*
16437
* This piece of code should be an effective inverse of the functions
16438
- * postprocess_terminfo and postprocess_terminfo in parse_entry.c.
16439
+ * postprocess_terminfo() and postprocess_terminfo() in parse_entry.c.
16440
* Much more work should be done on this to support dumping termcaps.
16441
*/
16442
if (tversion == V_HPUX) {
16443
@@ -902,23 +901,66 @@ kill_fkeys(TERMTYPE *tterm, int target)
16444
return result;
16445
}
16446
16447
+/*
16448
+ * Check if the given acsc string is a 1-1 mapping, i.e., just-like-vt100.
16449
+ * Also, since this is for termcap, we only care about the line-drawing map.
16450
+ */
16451
+#define isLine(c) (strchr("lmkjtuvwqxn", c) != 0)
16452
+
16453
+static bool
16454
+one_one_mapping(const char *mapping)
16455
+{
16456
+ bool result = TRUE;
16457
+
16458
+ if (mapping != ABSENT_STRING) {
16459
+ int n = 0;
16460
+ while (mapping[n] != '\0') {
16461
+ if (isLine(mapping[n]) &&
16462
+ mapping[n] != mapping[n + 1]) {
16463
+ result = FALSE;
16464
+ break;
16465
+ }
16466
+ n += 2;
16467
+ }
16468
+ }
16469
+ return result;
16470
+}
16471
+
16472
#define FMT_ENTRY() \
16473
fmt_entry(tterm, pred, \
16474
- (already_used > 0), \
16475
+ 0, \
16476
suppress_untranslatable, \
16477
infodump, numbers)
16478
16479
-#define SHOW_WHY if (!already_used) PRINTF
16480
+#define SHOW_WHY PRINTF
16481
16482
+static bool
16483
+purged_acs(TERMTYPE *tterm)
16484
+{
16485
+ bool result = FALSE;
16486
+
16487
+ if (VALID_STRING(acs_chars)) {
16488
+ if (!one_one_mapping(acs_chars)) {
16489
+ enter_alt_charset_mode = ABSENT_STRING;
16490
+ exit_alt_charset_mode = ABSENT_STRING;
16491
+ SHOW_WHY("# (rmacs/smacs removed for consistency)\n");
16492
+ }
16493
+ result = TRUE;
16494
+ }
16495
+ return result;
16496
+}
16497
+
16498
+/*
16499
+ * Dump a single entry.
16500
+ */
16501
int
16502
dump_entry(TERMTYPE *tterm,
16503
bool suppress_untranslatable,
16504
bool limited,
16505
- int already_used,
16506
int numbers,
16507
PredFunc pred)
16508
-/* dump a single entry */
16509
{
16510
+ TERMTYPE save_tterm;
16511
int len, critlen;
16512
const char *legend;
16513
bool infodump;
16514
@@ -933,13 +975,13 @@ dump_entry(TERMTYPE *tterm,
16515
legend = "terminfo";
16516
infodump = TRUE;
16517
}
16518
- critlen -= already_used;
16519
16520
save_sgr = set_attributes;
16521
- save_acsc = acs_chars;
16522
16523
if (((len = FMT_ENTRY()) > critlen)
16524
&& limited) {
16525
+
16526
+ save_tterm = *tterm;
16527
if (!suppress_untranslatable) {
16528
SHOW_WHY("# (untranslatable capabilities removed to fit entry within %d bytes)\n",
16529
critlen);
16530
@@ -960,7 +1002,7 @@ dump_entry(TERMTYPE *tterm,
16531
*/
16532
int n;
16533
for (n = STRCOUNT; n < NUM_STRINGS(tterm); n++) {
16534
- char *name = ExtStrname(tterm, n, strnames);
16535
+ const char *name = ExtStrname(tterm, n, strnames);
16536
16537
if (VALID_STRING(tterm->Strings[n])) {
16538
set_attributes = ABSENT_STRING;
16539
@@ -983,7 +1025,7 @@ dump_entry(TERMTYPE *tterm,
16540
changed = TRUE;
16541
}
16542
if (!changed || ((len = FMT_ENTRY()) > critlen)) {
16543
- if (VALID_STRING(acs_chars)) {
16544
+ if (purged_acs(tterm)) {
16545
acs_chars = ABSENT_STRING;
16546
SHOW_WHY("# (acsc removed to fit entry within %d bytes)\n",
16547
critlen);
16548
@@ -1010,19 +1052,25 @@ dump_entry(TERMTYPE *tterm,
16549
critlen);
16550
len = FMT_ENTRY();
16551
}
16552
- if (len > critlen && !already_used) {
16553
+ if (len > critlen) {
16554
(void) fprintf(stderr,
16555
"warning: %s entry is %d bytes long\n",
16556
_nc_first_name(tterm->term_names),
16557
len);
16558
SHOW_WHY("# WARNING: this entry, %d bytes long, may core-dump %s libraries!\n",
16559
- already_used + len, legend);
16560
+ len, legend);
16561
}
16562
tversion = oldversion;
16563
}
16564
set_attributes = save_sgr;
16565
- acs_chars = save_acsc;
16566
+ *tterm = save_tterm;
16567
+ }
16568
+ } else if (!version_filter(STRING, STR_IDX(acs_chars))) {
16569
+ save_tterm = *tterm;
16570
+ if (purged_acs(tterm)) {
16571
+ len = FMT_ENTRY();
16572
}
16573
+ *tterm = save_tterm;
16574
}
16575
16576
(void) fputs(outbuf.text, stdout);
16577
Index: ncurses-5.5/progs/toe.c
16578
===================================================================
16579
--- ncurses-5.5.orig/progs/toe.c 2005-09-24 20:39:43.000000000 -0400
16580
+++ ncurses-5.5/progs/toe.c 2006-04-18 15:47:22.000000000 -0400
16581
@@ -1,5 +1,5 @@
16582
/****************************************************************************
16583
- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
16584
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
16585
* *
16586
* Permission is hereby granted, free of charge, to any person obtaining a *
16587
* copy of this software and associated documentation files (the *
16588
@@ -34,7 +34,6 @@
16589
16590
/*
16591
* toe.c --- table of entries report generator
16592
- *
16593
*/
16594
16595
#include <progs.priv.h>
16596
@@ -43,21 +42,17 @@
16597
16598
#include <dump_entry.h>
16599
16600
-MODULE_ID("$Id: toe.c,v 1.29 2005/09/25 00:39:43 tom Exp $")
16601
+MODULE_ID("$Id: toe.c,v 1.34 2006/01/21 16:59:36 tom Exp $")
16602
16603
#define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
16604
16605
const char *_nc_progname;
16606
16607
-static int typelist(int eargc, char *eargv[], bool,
16608
- void (*)(const char *, TERMTYPE *));
16609
-static void deschook(const char *, TERMTYPE *);
16610
-
16611
#if NO_LEAKS
16612
#undef ExitProgram
16613
+static void ExitProgram(int code) GCC_NORETURN;
16614
static void
16615
-ExitProgram(int code) GCC_NORETURN;
16616
- static void ExitProgram(int code)
16617
+ExitProgram(int code)
16618
{
16619
_nc_free_entries(_nc_head);
16620
_nc_leaks_dump_entry();
16621
@@ -92,19 +87,142 @@ get_directory(char *path)
16622
return path;
16623
}
16624
16625
+static void
16626
+deschook(const char *cn, TERMTYPE *tp)
16627
+/* display a description for the type */
16628
+{
16629
+ const char *desc;
16630
+
16631
+ if ((desc = strrchr(tp->term_names, '|')) == 0)
16632
+ desc = "(No description)";
16633
+ else
16634
+ ++desc;
16635
+
16636
+ (void) printf("%-10s\t%s\n", cn, desc);
16637
+}
16638
+
16639
+static int
16640
+typelist(int eargc, char *eargv[],
16641
+ bool verbosity,
16642
+ void (*hook) (const char *, TERMTYPE *tp))
16643
+/* apply a function to each entry in given terminfo directories */
16644
+{
16645
+ int i;
16646
+
16647
+ for (i = 0; i < eargc; i++) {
16648
+ DIR *termdir;
16649
+ DIRENT *subdir;
16650
+
16651
+ if ((termdir = opendir(eargv[i])) == 0) {
16652
+ (void) fflush(stdout);
16653
+ (void) fprintf(stderr,
16654
+ "%s: can't open terminfo directory %s\n",
16655
+ _nc_progname, eargv[i]);
16656
+ return (EXIT_FAILURE);
16657
+ } else if (verbosity)
16658
+ (void) printf("#\n#%s:\n#\n", eargv[i]);
16659
+
16660
+ while ((subdir = readdir(termdir)) != 0) {
16661
+ size_t len = NAMLEN(subdir);
16662
+ char buf[PATH_MAX];
16663
+ char name_1[PATH_MAX];
16664
+ DIR *entrydir;
16665
+ DIRENT *entry;
16666
+
16667
+ strncpy(name_1, subdir->d_name, len)[len] = '\0';
16668
+ if (isDotname(name_1))
16669
+ continue;
16670
+
16671
+ (void) sprintf(buf, "%s/%s/", eargv[i], name_1);
16672
+ if (chdir(buf) != 0)
16673
+ continue;
16674
+
16675
+ entrydir = opendir(".");
16676
+ while ((entry = readdir(entrydir)) != 0) {
16677
+ char name_2[PATH_MAX];
16678
+ TERMTYPE lterm;
16679
+ char *cn;
16680
+ int status;
16681
+
16682
+ len = NAMLEN(entry);
16683
+ strncpy(name_2, entry->d_name, len)[len] = '\0';
16684
+ if (isDotname(name_2) || !is_a_file(name_2))
16685
+ continue;
16686
+
16687
+ status = _nc_read_file_entry(name_2, <erm);
16688
+ if (status <= 0) {
16689
+ (void) fflush(stdout);
16690
+ (void) fprintf(stderr,
16691
+ "toe: couldn't open terminfo file %s.\n",
16692
+ name_2);
16693
+ return (EXIT_FAILURE);
16694
+ }
16695
+
16696
+ /* only visit things once, by primary name */
16697
+ cn = _nc_first_name(lterm.term_names);
16698
+ if (!strcmp(cn, name_2)) {
16699
+ /* apply the selected hook function */
16700
+ (*hook) (cn, <erm);
16701
+ }
16702
+ if (lterm.term_names) {
16703
+ free(lterm.term_names);
16704
+ lterm.term_names = 0;
16705
+ }
16706
+ if (lterm.str_table) {
16707
+ free(lterm.str_table);
16708
+ lterm.str_table = 0;
16709
+ }
16710
+ }
16711
+ closedir(entrydir);
16712
+ }
16713
+ closedir(termdir);
16714
+ }
16715
+
16716
+ return (EXIT_SUCCESS);
16717
+}
16718
+
16719
+static void
16720
+usage(void)
16721
+{
16722
+ (void) fprintf(stderr, "usage: toe [-ahuUV] [-v n] [file...]\n");
16723
+ ExitProgram(EXIT_FAILURE);
16724
+}
16725
+
16726
int
16727
main(int argc, char *argv[])
16728
{
16729
+ bool all_dirs = FALSE;
16730
bool direct_dependencies = FALSE;
16731
bool invert_dependencies = FALSE;
16732
bool header = FALSE;
16733
- int i, c;
16734
+ int i;
16735
int code;
16736
+ int this_opt, last_opt = '?';
16737
+ int v_opt = 0;
16738
16739
_nc_progname = _nc_rootname(argv[0]);
16740
16741
- while ((c = getopt(argc, argv, "huv:UV")) != EOF)
16742
- switch (c) {
16743
+ while ((this_opt = getopt(argc, argv, "0123456789ahuvUV")) != EOF) {
16744
+ /* handle optional parameter */
16745
+ if (isdigit(this_opt)) {
16746
+ switch (last_opt) {
16747
+ case 'v':
16748
+ v_opt = (this_opt - '0');
16749
+ break;
16750
+ default:
16751
+ if (isdigit(last_opt))
16752
+ v_opt *= 10;
16753
+ else
16754
+ v_opt = 0;
16755
+ v_opt += (this_opt - '0');
16756
+ last_opt = this_opt;
16757
+ }
16758
+ continue;
16759
+ }
16760
+ switch (this_opt) {
16761
+ case 'a':
16762
+ all_dirs = TRUE;
16763
+ break;
16764
case 'h':
16765
header = TRUE;
16766
break;
16767
@@ -112,7 +230,7 @@ main(int argc, char *argv[])
16768
direct_dependencies = TRUE;
16769
break;
16770
case 'v':
16771
- set_trace_level(atoi(optarg));
16772
+ v_opt = 1;
16773
break;
16774
case 'U':
16775
invert_dependencies = TRUE;
16776
@@ -121,9 +239,10 @@ main(int argc, char *argv[])
16777
puts(curses_version());
16778
ExitProgram(EXIT_SUCCESS);
16779
default:
16780
- (void) fprintf(stderr, "usage: toe [-huUV] [-v n] [file...]\n");
16781
- ExitProgram(EXIT_FAILURE);
16782
+ usage();
16783
}
16784
+ }
16785
+ set_trace_level(v_opt);
16786
16787
if (direct_dependencies || invert_dependencies) {
16788
if (freopen(argv[optind], "r", stdin) == 0) {
16789
@@ -188,21 +307,55 @@ main(int argc, char *argv[])
16790
*/
16791
if (optind < argc) {
16792
code = typelist(argc - optind, argv + optind, header, deschook);
16793
+ } else if (all_dirs) {
16794
+ DBDIRS state;
16795
+ int offset;
16796
+ int pass;
16797
+ const char *path;
16798
+ char **eargv = 0;
16799
+
16800
+ code = EXIT_FAILURE;
16801
+ for (pass = 0; pass < 2; ++pass) {
16802
+ int count = 0;
16803
+
16804
+ _nc_first_db(&state, &offset);
16805
+ while ((path = _nc_next_db(&state, &offset)) != 0) {
16806
+ if (eargv != 0) {
16807
+ int n, found = FALSE;
16808
+
16809
+ /* eliminate duplicates */
16810
+ for (n = 0; n < count; ++n) {
16811
+ if (!strcmp(path, eargv[n])) {
16812
+ found = TRUE;
16813
+ break;
16814
+ }
16815
+ }
16816
+ if (!found) {
16817
+ eargv[count] = strdup(path);
16818
+ ++count;
16819
+ }
16820
+ } else {
16821
+ ++count;
16822
+ }
16823
+ }
16824
+ if (!pass) {
16825
+ eargv = typeCalloc(char *, count + 1);
16826
+ } else {
16827
+ code = typelist(count, eargv, header, deschook);
16828
+ }
16829
+ }
16830
} else {
16831
- char *home, *eargv[3];
16832
- char personal[PATH_MAX];
16833
+ static char system_db[] = TERMINFO;
16834
+ char *eargv[3];
16835
int j;
16836
16837
j = 0;
16838
if ((eargv[j] = get_directory(getenv("TERMINFO"))) != 0) {
16839
j++;
16840
} else {
16841
- if ((home = getenv("HOME")) != 0) {
16842
- (void) sprintf(personal, PRIVATE_INFO, home);
16843
- if ((eargv[j] = get_directory(personal)) != 0)
16844
- j++;
16845
- }
16846
- if ((eargv[j] = get_directory(strcpy(personal, TERMINFO))) != 0)
16847
+ if ((eargv[j] = get_directory(_nc_home_terminfo())) != 0)
16848
+ j++;
16849
+ if ((eargv[j] = get_directory(system_db)) != 0)
16850
j++;
16851
}
16852
eargv[j] = 0;
16853
@@ -212,97 +365,3 @@ main(int argc, char *argv[])
16854
16855
ExitProgram(code);
16856
}
16857
-
16858
-static void
16859
-deschook(const char *cn, TERMTYPE * tp)
16860
-/* display a description for the type */
16861
-{
16862
- const char *desc;
16863
-
16864
- if ((desc = strrchr(tp->term_names, '|')) == 0)
16865
- desc = "(No description)";
16866
- else
16867
- ++desc;
16868
-
16869
- (void) printf("%-10s\t%s\n", cn, desc);
16870
-}
16871
-
16872
-static int
16873
-typelist(int eargc, char *eargv[],
16874
- bool verbosity,
16875
- void (*hook) (const char *, TERMTYPE * tp))
16876
-/* apply a function to each entry in given terminfo directories */
16877
-{
16878
- int i;
16879
-
16880
- for (i = 0; i < eargc; i++) {
16881
- DIR *termdir;
16882
- DIRENT *subdir;
16883
-
16884
- if ((termdir = opendir(eargv[i])) == 0) {
16885
- (void) fflush(stdout);
16886
- (void) fprintf(stderr,
16887
- "%s: can't open terminfo directory %s\n",
16888
- _nc_progname, eargv[i]);
16889
- return (EXIT_FAILURE);
16890
- } else if (verbosity)
16891
- (void) printf("#\n#%s:\n#\n", eargv[i]);
16892
-
16893
- while ((subdir = readdir(termdir)) != 0) {
16894
- size_t len = NAMLEN(subdir);
16895
- char buf[PATH_MAX];
16896
- char name_1[PATH_MAX];
16897
- DIR *entrydir;
16898
- DIRENT *entry;
16899
-
16900
- strncpy(name_1, subdir->d_name, len)[len] = '\0';
16901
- if (isDotname(name_1))
16902
- continue;
16903
-
16904
- (void) sprintf(buf, "%s/%s/", eargv[i], name_1);
16905
- if (chdir(buf) != 0)
16906
- continue;
16907
-
16908
- entrydir = opendir(".");
16909
- while ((entry = readdir(entrydir)) != 0) {
16910
- char name_2[PATH_MAX];
16911
- TERMTYPE lterm;
16912
- char *cn;
16913
- int status;
16914
-
16915
- len = NAMLEN(entry);
16916
- strncpy(name_2, entry->d_name, len)[len] = '\0';
16917
- if (isDotname(name_2) || !is_a_file(name_2))
16918
- continue;
16919
-
16920
- status = _nc_read_file_entry(name_2, <erm);
16921
- if (status <= 0) {
16922
- (void) fflush(stdout);
16923
- (void) fprintf(stderr,
16924
- "toe: couldn't open terminfo file %s.\n",
16925
- name_2);
16926
- return (EXIT_FAILURE);
16927
- }
16928
-
16929
- /* only visit things once, by primary name */
16930
- cn = _nc_first_name(lterm.term_names);
16931
- if (!strcmp(cn, name_2)) {
16932
- /* apply the selected hook function */
16933
- (*hook) (cn, <erm);
16934
- }
16935
- if (lterm.term_names) {
16936
- free(lterm.term_names);
16937
- lterm.term_names = 0;
16938
- }
16939
- if (lterm.str_table) {
16940
- free(lterm.str_table);
16941
- lterm.str_table = 0;
16942
- }
16943
- }
16944
- closedir(entrydir);
16945
- }
16946
- closedir(termdir);
16947
- }
16948
-
16949
- return (EXIT_SUCCESS);
16950
-}
16951
Index: ncurses-5.5/test/Makefile.in
16952
===================================================================
16953
--- ncurses-5.5.orig/test/Makefile.in 2005-09-24 19:05:14.000000000 -0400
16954
+++ ncurses-5.5/test/Makefile.in 2006-04-18 15:48:06.000000000 -0400
16955
@@ -1,4 +1,4 @@
16956
-# $Id: Makefile.in,v 1.84 2005/09/24 23:05:14 tom Exp $
16957
+# $Id: Makefile.in,v 1.87 2006/02/11 19:15:57 tom Exp $
16958
##############################################################################
16959
# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. #
16960
# #
16961
@@ -56,7 +56,7 @@ LIBTOOL_LINK = @LIB_LINK@
16962
CC = @CC@
16963
CPP = @CPP@
16964
16965
-CFLAGS = @CFLAGS@
16966
+CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
16967
CPPFLAGS = -I../test -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
16968
16969
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
16970
@@ -111,6 +111,7 @@ TESTS = \
16971
bs$x \
16972
cardfile$x \
16973
color_set$x \
16974
+ demo_altkeys$x \
16975
demo_defkey$x \
16976
demo_forms$x \
16977
demo_keyok$x \
16978
@@ -132,8 +133,10 @@ TESTS = \
16979
lrtest$x \
16980
ncurses$x \
16981
newdemo$x \
16982
+ movewindow$x \
16983
railroad$x \
16984
rain$x \
16985
+ savescreen$x \
16986
tclock$x \
16987
testaddch$x \
16988
testcurs$x \
16989
@@ -164,6 +167,9 @@ cardfile$x: $(MODEL)/cardfile$o $(LOCAL_
16990
color_set$x: $(MODEL)/color_set$o $(LOCAL_LIBS)
16991
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/color_set$o $(LDFLAGS_CURSES)
16992
16993
+demo_altkeys$x: $(MODEL)/demo_altkeys$o $(LOCAL_LIBS)
16994
+ @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_altkeys$o $(LDFLAGS_CURSES)
16995
+
16996
demo_defkey$x: $(MODEL)/demo_defkey$o $(LOCAL_LIBS)
16997
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_defkey$o $(LDFLAGS_CURSES)
16998
16999
@@ -227,12 +233,18 @@ ncurses$x: $(MODEL)/ncurses$o $(LOCAL_LI
17000
newdemo$x: $(MODEL)/newdemo$o $(LOCAL_LIBS)
17001
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/newdemo$o $(LDFLAGS_CURSES)
17002
17003
+movewindow$x: $(MODEL)/movewindow$o $(LOCAL_LIBS)
17004
+ @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/movewindow$o $(LDFLAGS_CURSES)
17005
+
17006
rain$x: $(MODEL)/rain$o $(LOCAL_LIBS)
17007
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/rain$o $(LDFLAGS_CURSES)
17008
17009
railroad$x: $(MODEL)/railroad$o $(LOCAL_LIBS)
17010
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/railroad$o $(LDFLAGS_TINFO)
17011
17012
+savescreen$x: $(MODEL)/savescreen$o $(LOCAL_LIBS)
17013
+ @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/savescreen$o $(LDFLAGS_CURSES) $(MATH_LIB)
17014
+
17015
tclock$x: $(MODEL)/tclock$o $(LOCAL_LIBS)
17016
@ECHO_LINK@ $(LINK) -o $@ $(MODEL)/tclock$o $(LDFLAGS_CURSES) $(MATH_LIB)
17017
17018
Index: ncurses-5.5/test/README
17019
===================================================================
17020
--- ncurses-5.5.orig/test/README 2005-10-01 18:01:07.000000000 -0400
17021
+++ ncurses-5.5/test/README 2006-04-29 10:41:13.000000000 -0400
17022
@@ -1,4 +1,31 @@
17023
--- $Id: README,v 1.24 2005/10/01 22:01:07 tom Exp $
17024
+-------------------------------------------------------------------------------
17025
+-- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
17026
+-- --
17027
+-- Permission is hereby granted, free of charge, to any person obtaining a --
17028
+-- copy of this software and associated documentation files (the --
17029
+-- "Software"), to deal in the Software without restriction, including --
17030
+-- without limitation the rights to use, copy, modify, merge, publish, --
17031
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
17032
+-- of the Software, and to permit persons to whom the Software is furnished --
17033
+-- to do so, subject to the following conditions: --
17034
+-- --
17035
+-- The above copyright notice and this permission notice shall be included --
17036
+-- in all copies or substantial portions of the Software. --
17037
+-- --
17038
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
17039
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
17040
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
17041
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
17042
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
17043
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
17044
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
17045
+-- --
17046
+-- Except as contained in this notice, the name(s) of the above copyright --
17047
+-- holders shall not be used in advertising or otherwise to promote the --
17048
+-- sale, use or other dealings in this Software without prior written --
17049
+-- authorization. --
17050
+-------------------------------------------------------------------------------
17051
+-- $Id: README,v 1.27 2006/04/22 22:19:37 tom Exp $
17052
-------------------------------------------------------------------------------
17053
17054
The programs in this directory are designed to test your newest toy :-)
17055
@@ -137,16 +164,16 @@ menu_format -
17056
menu_grey -
17057
menu_init -
17058
menu_items test: demo_menus ncurses
17059
-menu_mark -
17060
+menu_mark test: demo_menus
17061
menu_opts -
17062
menu_opts_off test: demo_menus ncurses
17063
menu_opts_on test: demo_menus
17064
menu_pad -
17065
-menu_pattern -
17066
+menu_pattern test: demo_menus
17067
menu_request_by_name -
17068
menu_request_name -
17069
menu_spacing test: demo_menus
17070
-menu_sub -
17071
+menu_sub test: demo_menus
17072
menu_term -
17073
menu_userptr -
17074
menu_win test: demo_menus ncurses
17075
@@ -186,15 +213,15 @@ BC -
17076
COLORS test: ncurses xmas
17077
COLOR_PAIR test: background blue bs cardfile demo_forms demo_menus filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
17078
COLOR_PAIRS test: ncurses newdemo
17079
-COLS test: cardfile demo_defkey demo_forms demo_keyok demo_menus edit_field firework hashtest ins_wide inserts lrtest ncurses newdemo rain tclock testcurs view worm
17080
+COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field firework hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm
17081
ESCDELAY lib: ncurses
17082
-LINES test: cardfile demo_defkey demo_keyok demo_menus edit_field firework hanoi hashtest ins_wide inserts lrtest ncurses newdemo rain tclock testcurs view worm xmas
17083
+LINES test: cardfile demo_defkey demo_keyok demo_menus edit_field firework hanoi hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm xmas
17084
PAIR_NUMBER test: ncurses
17085
PC lib: ncurses
17086
SP lib: ncurses
17087
TABSIZE lib: menu
17088
UP -
17089
-acs_map test: gdc ins_wide inserts knight ncurses newdemo testcurs
17090
+acs_map test: gdc ins_wide inserts knight movewindow ncurses newdemo testcurs
17091
add_wch test: ncurses
17092
add_wchnstr test: ncurses
17093
add_wchstr test: view
17094
@@ -214,7 +241,7 @@ attroff test: filter gdc ncurses tclo
17095
attron test: bs filter gdc ncurses
17096
attrset test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
17097
baudrate lib: ncurses
17098
-beep test: blue bs cardfile demo_forms demo_menus edit_field hanoi ins_wide inserts knight ncurses tclock testcurs view xmas
17099
+beep test: blue bs cardfile demo_forms demo_menus edit_field hanoi ins_wide inserts knight movewindow ncurses tclock testcurs view xmas
17100
bkgd test: background cardfile demo_forms ncurses tclock view
17101
bkgdset test: background ncurses testaddch
17102
bkgrnd test: ncurses
17103
@@ -227,36 +254,36 @@ border_set -
17104
box test: cardfile demo_forms demo_menus edit_field ins_wide inserts lrtest ncurses newdemo testcurs
17105
box_set test: ncurses
17106
can_change_color test: ncurses
17107
-cbreak test: background blue bs cardfile color_set demo_defkey demo_forms demo_keyok demo_menus ditto filter firework gdc hanoi hashtest ins_wide inserts knight lrtest ncurses newdemo tclock testcurs view worm xmas
17108
+cbreak test: background blue bs cardfile color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto filter firework gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo tclock testcurs view worm xmas
17109
chgat -
17110
clear test: blue bs gdc ncurses testcurs xmas
17111
clearok test: bs knight
17112
clrtobot test: demo_menus ncurses
17113
-clrtoeol test: blue bs hanoi hashtest ncurses view
17114
+clrtoeol test: blue bs demo_altkeys demo_menus hanoi hashtest movewindow ncurses view
17115
color_content test: ncurses
17116
color_set test: color_set ncurses
17117
-copywin test: testcurs
17118
+copywin test: ncurses testcurs
17119
cur_term test: dots lrtest progs: clear tic tput tset
17120
-curs_set test: firework gdc hanoi lrtest newdemo rain tclock testcurs worm xmas
17121
+curs_set test: firework gdc hanoi lrtest ncurses newdemo rain tclock testcurs worm xmas
17122
curscr test: edit_field knight lrtest ncurses tclock view
17123
curses_version test: ncurses progs: infocmp tic toe tput tset
17124
def_prog_mode test: bs ncurses
17125
def_shell_mode lib: ncurses
17126
-define_key test: demo_defkey
17127
+define_key test: demo_altkeys demo_defkey
17128
del_curterm lib: ncurses
17129
delay_output -
17130
delch -
17131
deleteln -
17132
delscreen -
17133
-delwin test: cardfile demo_forms demo_menus edit_field ins_wide inserts ncurses newdemo testcurs
17134
-derwin test: cardfile demo_forms demo_menus ins_wide inserts ncurses
17135
-doupdate test: cardfile edit_field ins_wide inserts knight ncurses
17136
+delwin test: cardfile demo_forms demo_menus edit_field ins_wide inserts movewindow ncurses newdemo testcurs
17137
+derwin test: cardfile demo_forms demo_menus ins_wide inserts movewindow ncurses
17138
+doupdate test: cardfile demo_menus edit_field ins_wide inserts knight movewindow ncurses
17139
dupwin test: edit_field
17140
echo test: bs hanoi ncurses testcurs testscanw
17141
echo_wchar test: ncurses
17142
echochar test: ncurses
17143
-endwin test: background blue bs cardfile color_set demo_defkey demo_forms demo_keyok demo_menus ditto filter firework firstlast gdc hanoi hashtest ins_wide inserts keynames knight lrtest ncurses newdemo rain tclock testaddch testcurs testscanw view worm xmas
17144
-erase test: cardfile filter firework firstlast hanoi lrtest ncurses tclock testcurs
17145
+endwin test: background blue bs cardfile color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto filter firework firstlast gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses newdemo rain tclock testaddch testcurs testscanw view worm xmas
17146
+erase test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock testcurs
17147
erasechar lib: ncurses
17148
erasewchar -
17149
filter test: filter
17150
@@ -267,8 +294,8 @@ get_wstr -
17151
getbkgd test: ncurses
17152
getbkgrnd test: ncurses
17153
getcchar test: ncurses view
17154
-getch test: background blue bs color_set ditto firework firstlast hanoi hashtest lrtest rain tclock testaddch testcurs view worm xmas
17155
-getmouse test: bs knight ncurses
17156
+getch test: background blue bs color_set demo_altkeys ditto filter firework firstlast hanoi hashtest lrtest rain tclock testaddch testcurs view worm xmas
17157
+getmouse test: bs knight movewindow ncurses
17158
getn_wstr -
17159
getnstr test: filter ncurses
17160
getstr -
17161
@@ -291,7 +318,7 @@ inchnstr -
17162
inchstr -
17163
init_color test: ncurses
17164
init_pair test: background blue bs cardfile color_set demo_forms demo_menus filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
17165
-initscr test: background blue bs cardfile color_set demo_defkey demo_forms demo_keyok demo_menus firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest ncurses newdemo rain tclock testaddch testcurs testscanw view worm xmas
17166
+initscr test: background blue bs cardfile color_set demo_defkey demo_forms demo_keyok demo_menus firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo rain tclock testaddch testcurs testscanw view worm xmas
17167
innstr -
17168
innwstr -
17169
ins_nwstr test: ins_wide
17170
@@ -303,7 +330,7 @@ insertln -
17171
insnstr test: inserts
17172
insstr test: inserts
17173
instr -
17174
-intrflush test: demo_forms
17175
+intrflush test: demo_forms movewindow
17176
inwstr -
17177
is_linetouched lib: form
17178
is_term_resized -
17179
@@ -311,10 +338,10 @@ is_wintouched lib: ncurses
17180
isendwin -
17181
key_defined test: demo_defkey
17182
key_name test: ncurses
17183
-keybound test: demo_defkey
17184
-keyname test: demo_defkey demo_keyok edit_field keynames ncurses testcurs view progs: tic
17185
+keybound test: demo_altkeys demo_defkey
17186
+keyname test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field keynames movewindow ncurses testcurs view progs: tic
17187
keyok test: demo_keyok
17188
-keypad test: bs cardfile demo_defkey demo_forms demo_keyok demo_menus edit_field filter firework hashtest ins_wide inserts keynames knight lrtest ncurses tclock testcurs testscanw view
17189
+keypad test: bs cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field filter firework hashtest ins_wide inserts keynames knight lrtest movewindow ncurses tclock testcurs testscanw view
17190
killchar lib: ncurses
17191
killwchar -
17192
leaveok test: hanoi
17193
@@ -324,7 +351,7 @@ meta test: ncurses
17194
mouse_trafo lib: menu
17195
mouseinterval -
17196
mousemask test: bs demo_menus knight ncurses
17197
-move test: blue bs cardfile demo_menus gdc hanoi hashtest ins_wide inserts knight lrtest ncurses testscanw view worm xmas
17198
+move test: blue bs cardfile demo_altkeys demo_menus gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses testscanw view worm xmas
17199
mvadd_wch test: ncurses
17200
mvadd_wchnstr -
17201
mvadd_wchstr -
17202
@@ -338,7 +365,7 @@ mvaddwstr -
17203
mvchgat -
17204
mvcur lib: ncurses
17205
mvdelch -
17206
-mvderwin lib: menu
17207
+mvderwin test: movewindow
17208
mvget_wch -
17209
mvget_wstr -
17210
mvgetch -
17211
@@ -370,7 +397,7 @@ mvvline_set test: ncurses
17212
mvwadd_wch -
17213
mvwadd_wchnstr lib: form
17214
mvwadd_wchstr -
17215
-mvwaddch test: newdemo testcurs xmas
17216
+mvwaddch test: movewindow newdemo testcurs xmas
17217
mvwaddchnstr -
17218
mvwaddchstr -
17219
mvwaddnstr test: newdemo testcurs
17220
@@ -385,9 +412,9 @@ mvwgetch -
17221
mvwgetn_wstr -
17222
mvwgetnstr -
17223
mvwgetstr -
17224
-mvwhline lib: ncurses
17225
+mvwhline test: movewindow
17226
mvwhline_set -
17227
-mvwin test: cardfile testcurs xmas
17228
+mvwin test: cardfile demo_menus movewindow testcurs xmas
17229
mvwin_wch -
17230
mvwin_wchnstr lib: form
17231
mvwin_wchstr -
17232
@@ -406,18 +433,19 @@ mvwinstr -
17233
mvwinwstr -
17234
mvwprintw test: ncurses testcurs
17235
mvwscanw test: testcurs
17236
-mvwvline test: ins_wide inserts
17237
+mvwvline test: ins_wide inserts movewindow
17238
mvwvline_set -
17239
napms test: dots firework gdc hanoi lrtest ncurses newdemo railroad rain tclock testcurs view worm xmas progs: tset
17240
newpad test: edit_field ncurses testcurs
17241
newscr lib: ncurses
17242
-newterm test: ditto filter gdc keynames
17243
-newwin test: cardfile demo_defkey demo_forms demo_keyok demo_menus edit_field firstlast ins_wide inserts knight ncurses newdemo testcurs xmas
17244
+newterm test: demo_altkeys ditto filter gdc keynames
17245
+newwin test: cardfile demo_defkey demo_forms demo_keyok demo_menus edit_field firstlast ins_wide inserts knight movewindow ncurses newdemo testcurs xmas
17246
nl test: demo_forms ncurses rain testcurs
17247
nocbreak test: testcurs
17248
nodelay test: firework gdc lrtest ncurses newdemo rain tclock view xmas
17249
-noecho test: background bs cardfile color_set demo_defkey demo_forms demo_keyok demo_menus ditto firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest ncurses rain tclock testcurs view worm xmas
17250
-nonl test: bs demo_forms hashtest ncurses view worm xmas
17251
+noecho test: background bs cardfile color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses rain tclock testcurs view worm xmas
17252
+nofilter -
17253
+nonl test: bs demo_forms hashtest movewindow ncurses view worm xmas
17254
noqiflush -
17255
noraw test: demo_forms demo_menus ncurses testcurs
17256
notimeout -
17257
@@ -425,20 +453,20 @@ numcodes progs: dump_entry
17258
numfnames progs: dump_entry
17259
numnames progs: dump_entry infocmp
17260
ospeed progs: tset
17261
-overlay test: testcurs xmas
17262
+overlay test: ncurses testcurs xmas
17263
overwrite test: ncurses
17264
pair_content test: background color_set
17265
pecho_wchar -
17266
pechochar -
17267
pnoutrefresh test: edit_field ncurses
17268
prefresh test: testcurs
17269
-printw test: background blue bs color_set demo_defkey demo_keyok filter ncurses testcurs testscanw view
17270
+printw test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter ncurses testcurs testscanw view
17271
putp progs: tput
17272
putwin test: ncurses
17273
qiflush -
17274
raw test: demo_forms ncurses testcurs
17275
redrawwin -
17276
-refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus ditto filter firstlast gdc hanoi hashtest lrtest ncurses tclock testcurs view worm xmas
17277
+refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus ditto filter firstlast gdc hanoi hashtest lrtest movewindow ncurses tclock testcurs view worm xmas
17278
reset_prog_mode test: filter ncurses
17279
reset_shell_mode test: bs filter
17280
resetty -
17281
@@ -454,7 +482,7 @@ scr_restore -
17282
scr_set -
17283
scrl -
17284
scroll test: testcurs
17285
-scrollok test: demo_defkey demo_keyok ditto hashtest knight ncurses testcurs testscanw view
17286
+scrollok test: demo_altkeys demo_defkey demo_keyok ditto hashtest knight ncurses testcurs testscanw view
17287
set_curterm lib: ncurses
17288
set_term test: ditto
17289
setcchar test: ins_wide ncurses view
17290
@@ -480,12 +508,12 @@ slk_wset test: ncurses
17291
standend test: blue gdc ncurses worm
17292
standout test: blue ncurses
17293
start_color test: background blue bs cardfile color_set demo_forms demo_menus filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
17294
-stdscr test: bs demo_forms ditto filter firework gdc hanoi hashtest ins_wide inserts keynames knight lrtest ncurses rain tclock testcurs testscanw view xmas
17295
+stdscr test: bs demo_altkeys demo_forms demo_menus ditto filter firework gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses rain tclock testcurs testscanw view xmas
17296
strcodes progs: dump_entry
17297
strfnames progs: dump_entry
17298
strnames progs: dump_entry infocmp tic
17299
subpad test: testcurs
17300
-subwin test: ncurses newdemo testcurs
17301
+subwin test: movewindow ncurses newdemo testcurs
17302
syncok -
17303
term_attrs test: ncurses
17304
termattrs test: ncurses testcurs
17305
@@ -500,7 +528,7 @@ tigetnum test: ncurses progs: tput
17306
tigetstr test: blue demo_defkey testcurs progs: tput
17307
timeout test: rain
17308
touchline lib: ncurses
17309
-touchwin test: demo_menus edit_field filter firstlast ins_wide inserts ncurses xmas
17310
+touchwin test: demo_menus edit_field filter firstlast ins_wide inserts movewindow ncurses xmas
17311
tparm test: dots progs: tic tput
17312
tputs test: dots railroad progs: clear tset
17313
trace test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
17314
@@ -514,6 +542,7 @@ untouchwin lib: form
17315
use_default_colors test: filter firework gdc hanoi knight ncurses rain tclock worm xmas
17316
use_env progs: tput
17317
use_extended_names progs: infocmp tic
17318
+use_legacy_coding -
17319
vid_attr -
17320
vid_puts -
17321
vidattr lib: ncurses
17322
@@ -522,7 +551,7 @@ vline test: gdc ncurses
17323
vline_set -
17324
vw_printw -
17325
vw_scanw -
17326
-vwprintw lib: ncurses
17327
+vwprintw test: movewindow
17328
vwscanw lib: ncurses
17329
wadd_wch lib: ncurses
17330
wadd_wchnstr lib: form
17331
@@ -561,7 +590,7 @@ wenclose lib: menu
17332
werase test: cardfile demo_forms edit_field firstlast knight ncurses newdemo testcurs xmas
17333
wget_wch test: ins_wide ncurses
17334
wget_wstr -
17335
-wgetch test: cardfile demo_defkey demo_keyok demo_menus edit_field gdc inserts knight ncurses newdemo testcurs
17336
+wgetch test: cardfile demo_defkey demo_keyok demo_menus edit_field gdc inserts knight movewindow ncurses newdemo testcurs
17337
wgetn_wstr test: ncurses
17338
wgetnstr test: ncurses
17339
wgetstr -
17340
@@ -573,7 +602,7 @@ win_wchstr -
17341
winch test: knight testcurs
17342
winchnstr lib: ncurses
17343
winchstr -
17344
-winnstr test: demo_defkey
17345
+winnstr test: demo_altkeys demo_defkey
17346
winnwstr lib: ncurses
17347
wins_nwstr test: ins_wide
17348
wins_wch test: ins_wide
17349
@@ -586,18 +615,18 @@ winsstr test: inserts
17350
winstr -
17351
winwstr lib: ncurses
17352
wmouse_trafo lib: menu
17353
-wmove test: demo_defkey demo_keyok firstlast ins_wide inserts knight ncurses newdemo testcurs
17354
-wnoutrefresh test: edit_field ins_wide inserts knight ncurses
17355
-wprintw test: demo_defkey demo_forms demo_keyok edit_field ins_wide inserts knight ncurses testcurs
17356
+wmove test: demo_altkeys demo_defkey demo_keyok firstlast ins_wide inserts knight movewindow ncurses newdemo testcurs
17357
+wnoutrefresh test: demo_menus edit_field ins_wide inserts knight movewindow ncurses
17358
+wprintw test: demo_defkey demo_forms demo_keyok edit_field ins_wide inserts knight movewindow ncurses testcurs
17359
wredrawln lib: ncurses
17360
-wrefresh test: demo_forms demo_keyok demo_menus edit_field firstlast knight lrtest ncurses newdemo tclock testcurs view xmas
17361
+wrefresh test: demo_forms demo_keyok demo_menus edit_field firstlast knight lrtest movewindow ncurses newdemo tclock testcurs view xmas
17362
wresize test: cardfile ncurses
17363
wscanw test: testcurs
17364
wscrl test: ncurses testcurs view
17365
wsetscrreg test: ncurses testcurs
17366
wstandend test: xmas
17367
wstandout test: xmas
17368
-wsyncdown lib: ncurses
17369
+wsyncdown test: movewindow
17370
wsyncup lib: form
17371
wtimeout test: ncurses
17372
wtouchln lib: ncurses
17373
Index: ncurses-5.5/test/aclocal.m4
17374
===================================================================
17375
--- ncurses-5.5.orig/test/aclocal.m4 2005-02-26 19:02:01.000000000 -0500
17376
+++ ncurses-5.5/test/aclocal.m4 2006-04-29 10:41:13.000000000 -0400
17377
@@ -1,4 +1,39 @@
17378
-dnl $Id: aclocal.m4,v 1.8 2005/02/27 00:02:01 tom Exp $
17379
+dnl***************************************************************************
17380
+dnl Copyright (c) 2003-2005,2006 Free Software Foundation, Inc. *
17381
+dnl *
17382
+dnl Permission is hereby granted, free of charge, to any person obtaining a *
17383
+dnl copy of this software and associated documentation files (the *
17384
+dnl "Software"), to deal in the Software without restriction, including *
17385
+dnl without limitation the rights to use, copy, modify, merge, publish, *
17386
+dnl distribute, distribute with modifications, sublicense, and/or sell *
17387
+dnl copies of the Software, and to permit persons to whom the Software is *
17388
+dnl furnished to do so, subject to the following conditions: *
17389
+dnl *
17390
+dnl The above copyright notice and this permission notice shall be included *
17391
+dnl in all copies or substantial portions of the Software. *
17392
+dnl *
17393
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
17394
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
17395
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
17396
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
17397
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
17398
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
17399
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
17400
+dnl *
17401
+dnl Except as contained in this notice, the name(s) of the above copyright *
17402
+dnl holders shall not be used in advertising or otherwise to promote the *
17403
+dnl sale, use or other dealings in this Software without prior written *
17404
+dnl authorization. *
17405
+dnl***************************************************************************
17406
+dnl
17407
+dnl $Id: aclocal.m4,v 1.14 2006/04/22 22:05:25 tom Exp $
17408
+dnl
17409
+dnl Author: Thomas E. Dickey
17410
+dnl
17411
+dnl Macros used in NCURSES test programs auto-configuration script.
17412
+dnl
17413
+dnl See http://invisible-island.net/autoconf/ for additional information.
17414
+dnl
17415
dnl ---------------------------------------------------------------------------
17416
dnl ---------------------------------------------------------------------------
17417
dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30
17418
@@ -191,6 +226,35 @@ You have the following choices:
17419
fi
17420
])dnl
17421
dnl ---------------------------------------------------------------------------
17422
+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
17423
+dnl -------------
17424
+dnl Allow user to enable a normally-off option.
17425
+AC_DEFUN([CF_ARG_ENABLE],
17426
+[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
17427
+dnl ---------------------------------------------------------------------------
17428
+dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
17429
+dnl -------------
17430
+dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
17431
+dnl values.
17432
+dnl
17433
+dnl Parameters:
17434
+dnl $1 = option name
17435
+dnl $2 = help-string
17436
+dnl $3 = action to perform if option is not default
17437
+dnl $4 = action if perform if option is default
17438
+dnl $5 = default option value (either 'yes' or 'no')
17439
+AC_DEFUN([CF_ARG_OPTION],
17440
+[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes)
17441
+ if test "$enableval" != "$5" ; then
17442
+ifelse($3,,[ :]dnl
17443
+,[ $3]) ifelse($4,,,[
17444
+ else
17445
+ $4])
17446
+ fi],[enableval=$5 ifelse($4,,,[
17447
+ $4
17448
+])dnl
17449
+ ])])dnl
17450
+dnl ---------------------------------------------------------------------------
17451
dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31
17452
dnl --------------
17453
dnl Check if we're accidentally using a cache from a different machine.
17454
@@ -226,6 +290,28 @@ if test ".$system_name" != ".$cf_cv_syst
17455
fi
17456
])dnl
17457
dnl ---------------------------------------------------------------------------
17458
+dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
17459
+dnl ---------------
17460
+dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
17461
+dnl a build-configuration such as imake. These have the pitfall that they
17462
+dnl often contain compiler-specific options which we cannot use, mixed with
17463
+dnl preprocessor options that we usually can.
17464
+AC_DEFUN([CF_CHECK_CFLAGS],
17465
+[
17466
+CF_VERBOSE(checking additions to CFLAGS)
17467
+cf_check_cflags="$CFLAGS"
17468
+cf_check_cppflags="$CPPFLAGS"
17469
+CF_ADD_CFLAGS($1,yes)
17470
+if test "$cf_check_cflags" != "$CFLAGS" ; then
17471
+AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
17472
+ [CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS)
17473
+ if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
17474
+ CF_VERBOSE(but keeping change to \$CPPFLAGS)
17475
+ fi
17476
+ CFLAGS="$cf_check_flags"])
17477
+fi
17478
+])dnl
17479
+dnl ---------------------------------------------------------------------------
17480
dnl CF_CURSES_ACS_MAP version: 3 updated: 2003/05/17 22:19:02
17481
dnl -----------------
17482
dnl Check for likely values of acs_map[]:
17483
@@ -268,7 +354,7 @@ else
17484
fi
17485
])dnl
17486
dnl ---------------------------------------------------------------------------
17487
-dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
17488
+dnl CF_CURSES_CPPFLAGS version: 9 updated: 2006/02/04 19:44:43
17489
dnl ------------------
17490
dnl Look for the curses headers.
17491
AC_DEFUN([CF_CURSES_CPPFLAGS],[
17492
@@ -276,7 +362,7 @@ AC_DEFUN([CF_CURSES_CPPFLAGS],[
17493
AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
17494
cf_cv_curses_incdir=no
17495
case $host_os in #(vi
17496
-hpux10.*|hpux11.*) #(vi
17497
+hpux10.*) #(vi
17498
test -d /usr/include/curses_colr && \
17499
cf_cv_curses_incdir="-I/usr/include/curses_colr"
17500
;;
17501
@@ -289,6 +375,17 @@ esac
17502
])
17503
test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
17504
17505
+CF_CURSES_HEADER
17506
+CF_TERM_HEADER
17507
+])dnl
17508
+dnl ---------------------------------------------------------------------------
17509
+dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25
17510
+dnl ----------------
17511
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
17512
+dnl variations of ncurses' installs.
17513
+dnl
17514
+dnl See also CF_NCURSES_HEADER, which sets the same cache variable.
17515
+AC_DEFUN([CF_CURSES_HEADER],[
17516
AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
17517
cf_cv_ncurses_header=none
17518
for cf_header in \
17519
@@ -309,10 +406,9 @@ fi
17520
17521
# cheat, to get the right #define's for HAVE_NCURSES_H, etc.
17522
AC_CHECK_HEADERS($cf_cv_ncurses_header)
17523
-
17524
])dnl
17525
dnl ---------------------------------------------------------------------------
17526
-dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57
17527
+dnl CF_CURSES_LIBS version: 24 updated: 2006/02/04 19:44:43
17528
dnl --------------
17529
dnl Look for the curses libraries. Older curses implementations may require
17530
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
17531
@@ -331,7 +427,7 @@ case $host_os in #(vi
17532
freebsd*) #(vi
17533
AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
17534
;;
17535
-hpux10.*|hpux11.*) #(vi
17536
+hpux10.*) #(vi
17537
AC_CHECK_LIB(cur_colr,initscr,[
17538
LIBS="-lcur_colr $LIBS"
17539
ac_cv_func_initscr=yes
17540
@@ -437,6 +533,25 @@ dnl ----------
17541
dnl "dirname" is not portable, so we fake it with a shell script.
17542
AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
17543
dnl ---------------------------------------------------------------------------
17544
+dnl CF_ENABLE_WARNINGS version: 3 updated: 2003/05/24 14:24:29
17545
+dnl ------------------
17546
+dnl Configure-option to enable gcc warnings
17547
+AC_DEFUN([CF_ENABLE_WARNINGS],[
17548
+if ( test "$GCC" = yes || test "$GXX" = yes )
17549
+then
17550
+AC_MSG_CHECKING(if you want to turn on gcc warnings)
17551
+CF_ARG_ENABLE(warnings,
17552
+ [ --enable-warnings test: turn on gcc compiler warnings],
17553
+ [with_warnings=yes],
17554
+ [with_warnings=no])
17555
+AC_MSG_RESULT($with_warnings)
17556
+if test "$with_warnings" = "yes"
17557
+then
17558
+ CF_GCC_WARNINGS
17559
+fi
17560
+fi
17561
+])dnl
17562
+dnl ---------------------------------------------------------------------------
17563
dnl CF_FIND_LIBRARY version: 8 updated: 2004/11/23 20:14:58
17564
dnl ---------------
17565
dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We
17566
@@ -509,7 +624,207 @@ rm -f core])
17567
test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION)
17568
])
17569
dnl ---------------------------------------------------------------------------
17570
-dnl CF_GNU_SOURCE version: 4 updated: 2004/12/03 20:43:00
17571
+dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
17572
+dnl -----------------
17573
+dnl Test for availability of useful gcc __attribute__ directives to quiet
17574
+dnl compiler warnings. Though useful, not all are supported -- and contrary
17575
+dnl to documentation, unrecognized directives cause older compilers to barf.
17576
+AC_DEFUN([CF_GCC_ATTRIBUTES],
17577
+[
17578
+if test "$GCC" = yes
17579
+then
17580
+cat > conftest.i <<EOF
17581
+#ifndef GCC_PRINTF
17582
+#define GCC_PRINTF 0
17583
+#endif
17584
+#ifndef GCC_SCANF
17585
+#define GCC_SCANF 0
17586
+#endif
17587
+#ifndef GCC_NORETURN
17588
+#define GCC_NORETURN /* nothing */
17589
+#endif
17590
+#ifndef GCC_UNUSED
17591
+#define GCC_UNUSED /* nothing */
17592
+#endif
17593
+EOF
17594
+if test "$GCC" = yes
17595
+then
17596
+ AC_CHECKING([for $CC __attribute__ directives])
17597
+cat > conftest.$ac_ext <<EOF
17598
+#line __oline__ "configure"
17599
+#include "confdefs.h"
17600
+#include "conftest.h"
17601
+#include "conftest.i"
17602
+#if GCC_PRINTF
17603
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
17604
+#else
17605
+#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
17606
+#endif
17607
+#if GCC_SCANF
17608
+#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
17609
+#else
17610
+#define GCC_SCANFLIKE(fmt,var) /*nothing*/
17611
+#endif
17612
+extern void wow(char *,...) GCC_SCANFLIKE(1,2);
17613
+extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
17614
+extern void foo(void) GCC_NORETURN;
17615
+int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
17616
+EOF
17617
+ for cf_attribute in scanf printf unused noreturn
17618
+ do
17619
+ CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
17620
+ cf_directive="__attribute__(($cf_attribute))"
17621
+ echo "checking for $CC $cf_directive" 1>&AC_FD_CC
17622
+ case $cf_attribute in
17623
+ scanf|printf)
17624
+ cat >conftest.h <<EOF
17625
+#define GCC_$cf_ATTRIBUTE 1
17626
+EOF
17627
+ ;;
17628
+ *)
17629
+ cat >conftest.h <<EOF
17630
+#define GCC_$cf_ATTRIBUTE $cf_directive
17631
+EOF
17632
+ ;;
17633
+ esac
17634
+ if AC_TRY_EVAL(ac_compile); then
17635
+ test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
17636
+ cat conftest.h >>confdefs.h
17637
+ fi
17638
+ done
17639
+else
17640
+ fgrep define conftest.i >>confdefs.h
17641
+fi
17642
+rm -rf conftest*
17643
+fi
17644
+])dnl
17645
+dnl ---------------------------------------------------------------------------
17646
+dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42
17647
+dnl --------------
17648
+dnl Find version of gcc
17649
+AC_DEFUN([CF_GCC_VERSION],[
17650
+AC_REQUIRE([AC_PROG_CC])
17651
+GCC_VERSION=none
17652
+if test "$GCC" = yes ; then
17653
+ AC_MSG_CHECKING(version of $CC)
17654
+ GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
17655
+ test -z "$GCC_VERSION" && GCC_VERSION=unknown
17656
+ AC_MSG_RESULT($GCC_VERSION)
17657
+fi
17658
+])dnl
17659
+dnl ---------------------------------------------------------------------------
17660
+dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
17661
+dnl ---------------
17662
+dnl Check if the compiler supports useful warning options. There's a few that
17663
+dnl we don't use, simply because they're too noisy:
17664
+dnl
17665
+dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
17666
+dnl -Wredundant-decls (system headers make this too noisy)
17667
+dnl -Wtraditional (combines too many unrelated messages, only a few useful)
17668
+dnl -Wwrite-strings (too noisy, but should review occasionally). This
17669
+dnl is enabled for ncurses using "--enable-const".
17670
+dnl -pedantic
17671
+dnl
17672
+dnl Parameter:
17673
+dnl $1 is an optional list of gcc warning flags that a particular
17674
+dnl application might want to use, e.g., "no-unused" for
17675
+dnl -Wno-unused
17676
+dnl Special:
17677
+dnl If $with_ext_const is "yes", add a check for -Wwrite-strings
17678
+dnl
17679
+AC_DEFUN([CF_GCC_WARNINGS],
17680
+[
17681
+AC_REQUIRE([CF_GCC_VERSION])
17682
+CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
17683
+
17684
+cat > conftest.$ac_ext <<EOF
17685
+#line __oline__ "configure"
17686
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
17687
+EOF
17688
+
17689
+if test "$INTEL_COMPILER" = yes
17690
+then
17691
+# The "-wdXXX" options suppress warnings:
17692
+# remark #1419: external declaration in primary source file
17693
+# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
17694
+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
17695
+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
17696
+# remark #193: zero used for undefined preprocessing identifier
17697
+# remark #593: variable "curs_sb_left_arrow" was set but never used
17698
+# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
17699
+# remark #869: parameter "tw" was never referenced
17700
+# remark #981: operands are evaluated in unspecified order
17701
+# warning #269: invalid format string conversion
17702
+
17703
+ AC_CHECKING([for $CC warning options])
17704
+ cf_save_CFLAGS="$CFLAGS"
17705
+ EXTRA_CFLAGS="-Wall"
17706
+ for cf_opt in $1 \
17707
+ wd1419 \
17708
+ wd1682 \
17709
+ wd1683 \
17710
+ wd1684 \
17711
+ wd193 \
17712
+ wd279 \
17713
+ wd593 \
17714
+ wd810 \
17715
+ wd869 \
17716
+ wd981
17717
+ do
17718
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
17719
+ if AC_TRY_EVAL(ac_compile); then
17720
+ test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
17721
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
17722
+ fi
17723
+ done
17724
+ CFLAGS="$cf_save_CFLAGS"
17725
+
17726
+elif test "$GCC" = yes
17727
+then
17728
+ AC_CHECKING([for $CC warning options])
17729
+ cf_save_CFLAGS="$CFLAGS"
17730
+ EXTRA_CFLAGS="-W -Wall"
17731
+ cf_warn_CONST=""
17732
+ test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
17733
+ for cf_opt in \
17734
+ Wbad-function-cast \
17735
+ Wcast-align \
17736
+ Wcast-qual \
17737
+ Winline \
17738
+ Wmissing-declarations \
17739
+ Wmissing-prototypes \
17740
+ Wnested-externs \
17741
+ Wpointer-arith \
17742
+ Wshadow \
17743
+ Wstrict-prototypes \
17744
+ Wundef $cf_warn_CONST $1
17745
+ do
17746
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
17747
+ if AC_TRY_EVAL(ac_compile); then
17748
+ test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
17749
+ case $cf_opt in #(vi
17750
+ Wcast-qual) #(vi
17751
+ CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
17752
+ ;;
17753
+ Winline) #(vi
17754
+ case $GCC_VERSION in
17755
+ 3.3*)
17756
+ CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
17757
+ continue;;
17758
+ esac
17759
+ ;;
17760
+ esac
17761
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
17762
+ fi
17763
+ done
17764
+ CFLAGS="$cf_save_CFLAGS"
17765
+fi
17766
+rm -f conftest*
17767
+
17768
+AC_SUBST(EXTRA_CFLAGS)
17769
+])dnl
17770
+dnl ---------------------------------------------------------------------------
17771
+dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
17772
dnl -------------
17773
dnl Check if we must define _GNU_SOURCE to get a reasonable value for
17774
dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect
17775
@@ -519,9 +834,6 @@ dnl
17776
dnl Well, yes we could work around it...
17777
AC_DEFUN([CF_GNU_SOURCE],
17778
[
17779
-AC_REQUIRE([CF_INTEL_COMPILER])
17780
-
17781
-if test "$INTEL_COMPILER" = no ; then
17782
AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
17783
AC_TRY_COMPILE([#include <sys/types.h>],[
17784
#ifndef _XOPEN_SOURCE
17785
@@ -540,7 +852,6 @@ make an error
17786
])
17787
])
17788
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
17789
-fi
17790
])dnl
17791
dnl ---------------------------------------------------------------------------
17792
dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
17793
@@ -572,35 +883,38 @@ AC_DEFUN([CF_INHERIT_SCRIPT],
17794
test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
17795
])dnl
17796
dnl ---------------------------------------------------------------------------
17797
-dnl CF_INTEL_COMPILER version: 1 updated: 2004/12/03 20:27:48
17798
+dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29
17799
dnl -----------------
17800
-dnl Check if the given compiler is really the Intel compiler for Linux.
17801
-dnl It tries to imitate gcc, but does not return an error when it finds a
17802
-dnl mismatch between prototypes, e.g., as exercised by CF_MISSING_CHECK.
17803
+dnl Check if the given compiler is really the Intel compiler for Linux. It
17804
+dnl tries to imitate gcc, but does not return an error when it finds a mismatch
17805
+dnl between prototypes, e.g., as exercised by CF_MISSING_CHECK.
17806
dnl
17807
-dnl This macro should be run "soon" after AC_PROG_CC, to ensure that it is
17808
-dnl not mistaken for gcc.
17809
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
17810
+dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from
17811
+dnl the wrappers for gcc and g++ warnings.
17812
+dnl
17813
+dnl $1 = GCC (default) or GXX
17814
+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
17815
+dnl $3 = CFLAGS (default) or CXXFLAGS
17816
AC_DEFUN([CF_INTEL_COMPILER],[
17817
-AC_REQUIRE([AC_PROG_CC])
17818
-
17819
-INTEL_COMPILER=no
17820
+ifelse($2,,INTEL_COMPILER,[$2])=no
17821
17822
-if test "$GCC" = yes ; then
17823
+if test "$ifelse($1,,[$1],GCC)" = yes ; then
17824
case $host_os in
17825
linux*|gnu*)
17826
- AC_MSG_CHECKING(if this is really Intel compiler)
17827
- cf_save_CFLAGS="$CFLAGS"
17828
- CFLAGS="$CFLAGS -no-gcc"
17829
+ AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler)
17830
+ cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])"
17831
+ ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc"
17832
AC_TRY_COMPILE([],[
17833
#ifdef __INTEL_COMPILER
17834
#else
17835
make an error
17836
#endif
17837
-],[INTEL_COMPILER=yes
17838
+],[ifelse($2,,INTEL_COMPILER,[$2])=yes
17839
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
17840
],[])
17841
- CFLAGS="$cf_save_CFLAGS"
17842
- AC_MSG_RESULT($INTEL_COMPILER)
17843
+ ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS"
17844
+ AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2]))
17845
;;
17846
esac
17847
fi
17848
@@ -653,7 +967,7 @@ printf("old\n");
17849
,[$1=no])
17850
])dnl
17851
dnl ---------------------------------------------------------------------------
17852
-dnl CF_NCURSES_CPPFLAGS version: 17 updated: 2003/11/06 19:59:57
17853
+dnl CF_NCURSES_CPPFLAGS version: 18 updated: 2005/12/31 13:26:39
17854
dnl -------------------
17855
dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
17856
dnl the CPPFLAGS variable so we can include its header.
17857
@@ -694,9 +1008,27 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root heade
17858
done
17859
])
17860
17861
+CF_NCURSES_HEADER
17862
+CF_TERM_HEADER
17863
+
17864
+# some applications need this, but should check for NCURSES_VERSION
17865
+AC_DEFINE(NCURSES)
17866
+
17867
+CF_NCURSES_VERSION
17868
+])dnl
17869
+dnl ---------------------------------------------------------------------------
17870
+dnl CF_NCURSES_HEADER version: 1 updated: 2005/12/31 13:28:37
17871
+dnl -----------------
17872
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
17873
+dnl variations of ncurses' installs.
17874
+dnl
17875
+dnl See also CF_CURSES_HEADER, which sets the same cache variable.
17876
+AC_DEFUN([CF_NCURSES_HEADER],[
17877
+
17878
if test "$cf_cv_ncurses_h" != no ; then
17879
cf_cv_ncurses_header=$cf_cv_ncurses_h
17880
else
17881
+
17882
AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
17883
test -n "$verbose" && echo
17884
CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
17885
@@ -732,7 +1064,7 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root inclu
17886
17887
fi
17888
17889
-AC_DEFINE(NCURSES)
17890
+# Set definitions to allow ifdef'ing for ncurses.h
17891
17892
case $cf_cv_ncurses_header in # (vi
17893
*ncurses.h)
17894
@@ -749,7 +1081,6 @@ ncursesw/curses.h|ncursesw/ncurses.h)
17895
;;
17896
esac
17897
17898
-CF_NCURSES_VERSION
17899
])dnl
17900
dnl ---------------------------------------------------------------------------
17901
dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05
17902
@@ -882,7 +1213,7 @@ EOF
17903
test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
17904
])dnl
17905
dnl ---------------------------------------------------------------------------
17906
-dnl CF_PATH_SYNTAX version: 9 updated: 2002/09/17 23:03:38
17907
+dnl CF_PATH_SYNTAX version: 10 updated: 2006/01/02 19:36:00
17908
dnl --------------
17909
dnl Check the argument to see that it looks like a pathname. Rewrite it if it
17910
dnl begins with one of the prefix/exec_prefix variables, and then again if the
17911
@@ -904,7 +1235,7 @@ case ".[$]$1" in #(vi
17912
;;
17913
esac
17914
;; #(vi
17915
-.NONE/*)
17916
+.no|.NONE/*)
17917
$1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
17918
;;
17919
*)
17920
@@ -913,7 +1244,35 @@ case ".[$]$1" in #(vi
17921
esac
17922
])dnl
17923
dnl ---------------------------------------------------------------------------
17924
-dnl CF_POSIX_C_SOURCE version: 3 updated: 2005/02/04 06:56:22
17925
+dnl CF_PDCURSES_X11 version: 6 updated: 2002/10/27 18:21:42
17926
+dnl ---------------
17927
+dnl Configure for PDCurses' X11 library
17928
+AC_DEFUN([CF_PDCURSES_X11],[
17929
+AC_REQUIRE([CF_X_ATHENA])
17930
+LDFLAGS="$LDFLAGS $X_LIBS"
17931
+CF_CHECK_CFLAGS($X_CFLAGS)
17932
+AC_CHECK_LIB(X11,XOpenDisplay,
17933
+ [LIBS="-lX11 $LIBS"],,
17934
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
17935
+AC_CACHE_CHECK(for XCurses library,cf_cv_lib_XCurses,[
17936
+LIBS="-lXCurses $LIBS"
17937
+AC_TRY_LINK([
17938
+#include <xcurses.h>
17939
+char *XCursesProgramName = "test";
17940
+],[XCursesExit();],
17941
+[cf_cv_lib_XCurses=yes],
17942
+[cf_cv_lib_XCurses=no])
17943
+])
17944
+if test $cf_cv_lib_XCurses = yes ; then
17945
+ AC_DEFINE(UNIX)
17946
+ AC_DEFINE(XCURSES)
17947
+ AC_DEFINE(HAVE_XCURSES)
17948
+else
17949
+ AC_ERROR(Cannot link with XCurses)
17950
+fi
17951
+])dnl
17952
+dnl ---------------------------------------------------------------------------
17953
+dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
17954
dnl -----------------
17955
dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
17956
dnl
17957
@@ -930,6 +1289,13 @@ dnl $1 is the nominal value for _POSIX_C
17958
AC_DEFUN([CF_POSIX_C_SOURCE],
17959
[
17960
cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1)
17961
+
17962
+cf_save_CFLAGS="$CFLAGS"
17963
+cf_save_CPPFLAGS="$CPPFLAGS"
17964
+
17965
+CF_REMOVE_DEFINE(cf_trim_CFLAGS,$cf_save_CFLAGS,_POSIX_C_SOURCE)
17966
+CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE)
17967
+
17968
AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
17969
CF_MSG_LOG(if the symbol is already defined go no further)
17970
AC_TRY_COMPILE([#include <sys/types.h>],[
17971
@@ -938,12 +1304,12 @@ make an error
17972
#endif],
17973
[cf_cv_posix_c_source=no],
17974
[cf_want_posix_source=no
17975
- case .$cf_POSIX_C_SOURCE in
17976
- .[[12]]??*)
17977
- cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
17978
+ case .$cf_POSIX_C_SOURCE in #(vi
17979
+ .[[12]]??*) #(vi
17980
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
17981
;;
17982
- .2)
17983
- cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
17984
+ .2) #(vi
17985
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
17986
cf_want_posix_source=yes
17987
;;
17988
.*)
17989
@@ -955,21 +1321,76 @@ make an error
17990
#ifdef _POSIX_SOURCE
17991
make an error
17992
#endif],[],
17993
- cf_cv_posix_c_source="$cf_cv_posix_c_source -U_POSIX_SOURCE -D_POSIX_SOURCE")
17994
+ cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
17995
fi
17996
CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
17997
- cf_save="$CPPFLAGS"
17998
- CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
17999
+ CFLAGS="$cf_trim_CFLAGS"
18000
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
18001
CF_MSG_LOG(if the second compile does not leave our definition intact error)
18002
AC_TRY_COMPILE([#include <sys/types.h>],[
18003
#ifndef _POSIX_C_SOURCE
18004
make an error
18005
#endif],,
18006
- [cf_cv_posix_c_source=no])
18007
- CPPFLAGS="$cf_save"
18008
+ [cf_cv_posix_c_source=no])
18009
+ CFLAGS="$cf_save_CFLAGS"
18010
+ CPPFLAGS="$cf_save_CPPFLAGS"
18011
])
18012
])
18013
-test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
18014
+
18015
+if test "$cf_cv_posix_c_source" != no ; then
18016
+ CFLAGS="$cf_trim_CFLAGS"
18017
+ CPPFLAGS="$cf_trim_CPPFLAGS"
18018
+ if test "$cf_cv_cc_u_d_options" = yes ; then
18019
+ cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
18020
+ sed -e 's/-D/-U/g' -e 's/=[[^ ]]*//g'`
18021
+ CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
18022
+ fi
18023
+ CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
18024
+fi
18025
+
18026
+])dnl
18027
+dnl ---------------------------------------------------------------------------
18028
+dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
18029
+dnl --------------
18030
+dnl Check if C (preprocessor) -U and -D options are processed in the order
18031
+dnl given rather than by type of option. Some compilers insist on apply all
18032
+dnl of the -U options after all of the -D options. Others allow mixing them,
18033
+dnl and may predefine symbols that conflict with those we define.
18034
+AC_DEFUN([CF_PROG_CC_U_D],
18035
+[
18036
+AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
18037
+ cf_save_CPPFLAGS="$CPPFLAGS"
18038
+ CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
18039
+ AC_TRY_COMPILE([],[
18040
+#ifndef U_D_OPTIONS
18041
+make an undefined-error
18042
+#endif
18043
+#ifdef D_U_OPTIONS
18044
+make a defined-error
18045
+#endif
18046
+ ],[
18047
+ cf_cv_cc_u_d_options=yes],[
18048
+ cf_cv_cc_u_d_options=no])
18049
+ CPPFLAGS="$cf_save_CPPFLAGS"
18050
+])
18051
+])dnl
18052
+dnl ---------------------------------------------------------------------------
18053
+dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18
18054
+dnl ----------------
18055
+dnl Remove all -U and -D options that refer to the given symbol from a list
18056
+dnl of C compiler options. This works around the problem that not all
18057
+dnl compilers process -U and -D options from left-to-right, so a -U option
18058
+dnl cannot be used to cancel the effect of a preceding -D option.
18059
+dnl
18060
+dnl $1 = target (which could be the same as the source variable)
18061
+dnl $2 = source (including '$')
18062
+dnl $3 = symbol to remove
18063
+define([CF_REMOVE_DEFINE],
18064
+[
18065
+# remove $3 symbol from $2
18066
+$1=`echo "$2" | \
18067
+ sed -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[[ ]]/ /g' \
18068
+ -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'`
18069
])dnl
18070
dnl ---------------------------------------------------------------------------
18071
dnl CF_SUBDIR_PATH version: 3 updated: 2002/12/29 18:30:46
18072
@@ -1059,6 +1480,53 @@ AC_MSG_RESULT($cf_cv_sys_time_select)
18073
test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT)
18074
])dnl
18075
dnl ---------------------------------------------------------------------------
18076
+dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39
18077
+dnl --------------
18078
+dnl Look for term.h, which is part of X/Open curses. It defines the interface
18079
+dnl to terminfo database. Usually it is in the same include-path as curses.h,
18080
+dnl but some packagers change this, breaking various applications.
18081
+AC_DEFUN([CF_TERM_HEADER],[
18082
+AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
18083
+case ${cf_cv_ncurses_header} in #(vi
18084
+*/ncurses.h|*/ncursesw.h) #(vi
18085
+ cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
18086
+ ;;
18087
+*)
18088
+ cf_term_header=term.h
18089
+ ;;
18090
+esac
18091
+
18092
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
18093
+do
18094
+AC_TRY_COMPILE([#include <stdio.h>
18095
+#include <${cf_cv_ncurses_header-curses.h}>
18096
+#include <$cf_test>
18097
+],[int x = auto_left_margin],[
18098
+ cf_cv_term_header="$cf_test"],[
18099
+ cf_cv_term_header=unknown
18100
+ ])
18101
+ test "$cf_cv_term_header" != unknown && break
18102
+done
18103
+])
18104
+
18105
+# Set definitions to allow ifdef'ing to accommodate subdirectories
18106
+
18107
+case $cf_cv_term_header in # (vi
18108
+*term.h)
18109
+ AC_DEFINE(HAVE_TERM_H)
18110
+ ;;
18111
+esac
18112
+
18113
+case $cf_cv_term_header in # (vi
18114
+ncurses/term.h) #(vi
18115
+ AC_DEFINE(HAVE_NCURSES_TERM_H)
18116
+ ;;
18117
+ncursesw/term.h)
18118
+ AC_DEFINE(HAVE_NCURSESW_TERM_H)
18119
+ ;;
18120
+esac
18121
+])dnl
18122
+dnl ---------------------------------------------------------------------------
18123
dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
18124
dnl --------
18125
dnl Make an uppercase version of a variable
18126
@@ -1113,7 +1581,7 @@ AC_ARG_WITH(curses-dir,
18127
[cf_cv_curses_dir=no])
18128
])dnl
18129
dnl ---------------------------------------------------------------------------
18130
-dnl CF_XOPEN_SOURCE version: 17 updated: 2005/02/06 12:07:45
18131
+dnl CF_XOPEN_SOURCE version: 23 updated: 2005/10/15 16:39:05
18132
dnl ---------------
18133
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
18134
dnl or adapt to the vendor's definitions to get equivalent functionality.
18135
@@ -1123,6 +1591,8 @@ dnl $1 is the nominal value for _XOPEN_S
18136
dnl $2 is the nominal value for _POSIX_C_SOURCE
18137
AC_DEFUN([CF_XOPEN_SOURCE],[
18138
18139
+AC_REQUIRE([CF_PROG_CC_U_D])
18140
+
18141
cf_XOPEN_SOURCE=ifelse($1,,500,$1)
18142
cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
18143
18144
@@ -1159,6 +1629,9 @@ openbsd*) #(vi
18145
osf[[45]]*) #(vi
18146
CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
18147
;;
18148
+nto-qnx*) #(vi
18149
+ CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
18150
+ ;;
18151
sco*) #(vi
18152
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
18153
;;
18154
@@ -1183,8 +1656,204 @@ make an error
18155
CPPFLAGS="$cf_save"
18156
])
18157
])
18158
-test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source"
18159
+ if test "$cf_cv_xopen_source" != no ; then
18160
+ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
18161
+ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
18162
+ test "$cf_cv_cc_u_d_options" = yes && \
18163
+ CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
18164
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
18165
+ fi
18166
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
18167
;;
18168
esac
18169
])
18170
+dnl ---------------------------------------------------------------------------
18171
+dnl CF_X_ATHENA version: 12 updated: 2004/06/15 21:14:41
18172
+dnl -----------
18173
+dnl Check for Xaw (Athena) libraries
18174
+dnl
18175
+dnl Sets $cf_x_athena according to the flavor of Xaw which is used.
18176
+AC_DEFUN([CF_X_ATHENA],
18177
+[AC_REQUIRE([CF_X_TOOLKIT])
18178
+cf_x_athena=${cf_x_athena-Xaw}
18179
+
18180
+AC_MSG_CHECKING(if you want to link with Xaw 3d library)
18181
+withval=
18182
+AC_ARG_WITH(Xaw3d,
18183
+ [ --with-Xaw3d link with Xaw 3d library])
18184
+if test "$withval" = yes ; then
18185
+ cf_x_athena=Xaw3d
18186
+ AC_MSG_RESULT(yes)
18187
+else
18188
+ AC_MSG_RESULT(no)
18189
+fi
18190
+
18191
+AC_MSG_CHECKING(if you want to link with neXT Athena library)
18192
+withval=
18193
+AC_ARG_WITH(neXtaw,
18194
+ [ --with-neXtaw link with neXT Athena library])
18195
+if test "$withval" = yes ; then
18196
+ cf_x_athena=neXtaw
18197
+ AC_MSG_RESULT(yes)
18198
+else
18199
+ AC_MSG_RESULT(no)
18200
+fi
18201
+
18202
+AC_MSG_CHECKING(if you want to link with Athena-Plus library)
18203
+withval=
18204
+AC_ARG_WITH(XawPlus,
18205
+ [ --with-XawPlus link with Athena-Plus library])
18206
+if test "$withval" = yes ; then
18207
+ cf_x_athena=XawPlus
18208
+ AC_MSG_RESULT(yes)
18209
+else
18210
+ AC_MSG_RESULT(no)
18211
+fi
18212
+
18213
+AC_CHECK_LIB(Xext,XextCreateExtension,
18214
+ [LIBS="-lXext $LIBS"])
18215
+
18216
+cf_x_athena_lib=""
18217
+
18218
+CF_X_ATHENA_CPPFLAGS($cf_x_athena)
18219
+CF_X_ATHENA_LIBS($cf_x_athena)
18220
+])dnl
18221
+dnl ---------------------------------------------------------------------------
18222
+dnl CF_X_ATHENA_CPPFLAGS version: 2 updated: 2002/10/09 20:00:37
18223
+dnl --------------------
18224
+dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
18225
+dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
18226
+AC_DEFUN([CF_X_ATHENA_CPPFLAGS],
18227
+[
18228
+cf_x_athena_root=ifelse($1,,Xaw,$1)
18229
+cf_x_athena_include=""
18230
+
18231
+for cf_path in default \
18232
+ /usr/contrib/X11R6 \
18233
+ /usr/contrib/X11R5 \
18234
+ /usr/lib/X11R5 \
18235
+ /usr/local
18236
+do
18237
+ if test -z "$cf_x_athena_include" ; then
18238
+ cf_save="$CPPFLAGS"
18239
+ cf_test=X11/$cf_x_athena_root/SimpleMenu.h
18240
+ if test $cf_path != default ; then
18241
+ CPPFLAGS="-I$cf_path/include $cf_save"
18242
+ AC_MSG_CHECKING(for $cf_test in $cf_path)
18243
+ else
18244
+ AC_MSG_CHECKING(for $cf_test)
18245
+ fi
18246
+ AC_TRY_COMPILE([
18247
+#include <X11/Intrinsic.h>
18248
+#include <$cf_test>],[],
18249
+ [cf_result=yes],
18250
+ [cf_result=no])
18251
+ AC_MSG_RESULT($cf_result)
18252
+ if test "$cf_result" = yes ; then
18253
+ cf_x_athena_include=$cf_path
18254
+ break
18255
+ else
18256
+ CPPFLAGS="$cf_save"
18257
+ fi
18258
+ fi
18259
+done
18260
+
18261
+if test -z "$cf_x_athena_include" ; then
18262
+ AC_MSG_WARN(
18263
+[Unable to successfully find Athena header files with test program])
18264
+elif test "$cf_x_athena_include" != default ; then
18265
+ CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
18266
+fi
18267
+])
18268
+dnl ---------------------------------------------------------------------------
18269
+dnl CF_X_ATHENA_LIBS version: 3 updated: 2003/02/16 15:24:54
18270
+dnl ----------------
18271
+dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
18272
+dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
18273
+AC_DEFUN([CF_X_ATHENA_LIBS],
18274
+[AC_REQUIRE([CF_X_TOOLKIT])
18275
+cf_x_athena_root=ifelse($1,,Xaw,$1)
18276
+cf_x_athena_lib=""
18277
+
18278
+for cf_path in default \
18279
+ /usr/contrib/X11R6 \
18280
+ /usr/contrib/X11R5 \
18281
+ /usr/lib/X11R5 \
18282
+ /usr/local
18283
+do
18284
+ for cf_lib in \
18285
+ "-l$cf_x_athena_root -lXmu" \
18286
+ "-l$cf_x_athena_root -lXpm -lXmu" \
18287
+ "-l${cf_x_athena_root}_s -lXmu_s"
18288
+ do
18289
+ if test -z "$cf_x_athena_lib" ; then
18290
+ cf_save="$LIBS"
18291
+ cf_test=XawSimpleMenuAddGlobalActions
18292
+ if test $cf_path != default ; then
18293
+ LIBS="-L$cf_path/lib $cf_lib $LIBS"
18294
+ AC_MSG_CHECKING(for $cf_lib in $cf_path)
18295
+ else
18296
+ LIBS="$cf_lib $LIBS"
18297
+ AC_MSG_CHECKING(for $cf_test in $cf_lib)
18298
+ fi
18299
+ cf_SAVE="$LIBS"
18300
+ LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
18301
+ AC_TRY_LINK([],[$cf_test()],
18302
+ [cf_result=yes],
18303
+ [cf_result=no])
18304
+ AC_MSG_RESULT($cf_result)
18305
+ if test "$cf_result" = yes ; then
18306
+ cf_x_athena_lib="$cf_lib"
18307
+ LIBS="$cf_SAVE"
18308
+ break
18309
+ else
18310
+ LIBS="$cf_save"
18311
+ fi
18312
+ fi
18313
+ done
18314
+done
18315
+
18316
+if test -z "$cf_x_athena_lib" ; then
18317
+ AC_ERROR(
18318
+[Unable to successfully link Athena library (-l$cf_x_athena_root) with test program])
18319
+fi
18320
+
18321
+CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
18322
+AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
18323
+])
18324
+dnl ---------------------------------------------------------------------------
18325
+dnl CF_X_TOOLKIT version: 10 updated: 2004/04/25 15:37:17
18326
+dnl ------------
18327
+dnl Check for X Toolkit libraries
18328
+dnl
18329
+AC_DEFUN([CF_X_TOOLKIT],
18330
+[
18331
+AC_REQUIRE([AC_PATH_XTRA])
18332
+AC_REQUIRE([CF_CHECK_CACHE])
18333
+
18334
+# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
18335
+
18336
+cf_have_X_LIBS=no
18337
+
18338
+LDFLAGS="$X_LIBS $LDFLAGS"
18339
+CF_CHECK_CFLAGS($X_CFLAGS)
18340
+
18341
+AC_CHECK_FUNC(XOpenDisplay,,[
18342
+AC_CHECK_LIB(X11,XOpenDisplay,
18343
+ [LIBS="-lX11 $LIBS"],,
18344
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
18345
+
18346
+AC_CHECK_FUNC(XtAppInitialize,,[
18347
+AC_CHECK_LIB(Xt, XtAppInitialize,
18348
+ [AC_DEFINE(HAVE_LIBXT)
18349
+ cf_have_X_LIBS=Xt
18350
+ LIBS="-lXt $X_PRE_LIBS $LIBS"],,
18351
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
18352
+
18353
+if test $cf_have_X_LIBS = no ; then
18354
+ AC_WARN(
18355
+[Unable to successfully link X Toolkit library (-lXt) with
18356
+test program. You will have to check and add the proper libraries by hand
18357
+to makefile.])
18358
+fi
18359
+])dnl
18360
Index: ncurses-5.5/test/blue.c
18361
===================================================================
18362
--- ncurses-5.5.orig/test/blue.c 2005-05-28 17:38:03.000000000 -0400
18363
+++ ncurses-5.5/test/blue.c 2006-04-29 10:41:13.000000000 -0400
18364
@@ -1,3 +1,30 @@
18365
+/****************************************************************************
18366
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
18367
+ * *
18368
+ * Permission is hereby granted, free of charge, to any person obtaining a *
18369
+ * copy of this software and associated documentation files (the *
18370
+ * "Software"), to deal in the Software without restriction, including *
18371
+ * without limitation the rights to use, copy, modify, merge, publish, *
18372
+ * distribute, distribute with modifications, sublicense, and/or sell *
18373
+ * copies of the Software, and to permit persons to whom the Software is *
18374
+ * furnished to do so, subject to the following conditions: *
18375
+ * *
18376
+ * The above copyright notice and this permission notice shall be included *
18377
+ * in all copies or substantial portions of the Software. *
18378
+ * *
18379
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
18380
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
18381
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
18382
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
18383
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
18384
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
18385
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
18386
+ * *
18387
+ * Except as contained in this notice, the name(s) of the above copyright *
18388
+ * holders shall not be used in advertising or otherwise to promote the *
18389
+ * sale, use or other dealings in this Software without prior written *
18390
+ * authorization. *
18391
+ ****************************************************************************/
18392
/*****************************************************************************
18393
* *
18394
* B l u e M o o n *
18395
@@ -13,7 +40,7 @@
18396
* results, use the ncurses(3) library. On non-Intel machines, SVr4 curses is
18397
* just as good.
18398
*
18399
- * $Id: blue.c,v 1.25 2005/05/28 21:38:03 tom Exp $
18400
+ * $Id: blue.c,v 1.28 2006/04/22 22:41:22 tom Exp $
18401
*/
18402
18403
#include <test.priv.h>
18404
@@ -90,7 +117,7 @@ static chtype letters[4] =
18405
OR_COLORS('c', BLACK_ON_WHITE), /* clubs */
18406
};
18407
18408
-#if defined(__i386__)
18409
+#if defined(__i386__) && defined(A_ALTCHARSET) && HAVE_TIGETSTR
18410
static chtype glyphs[] =
18411
{
18412
PC_COLORS('\003', RED_ON_WHITE), /* hearts */
18413
@@ -98,6 +125,9 @@ static chtype glyphs[] =
18414
PC_COLORS('\004', RED_ON_WHITE), /* diamonds */
18415
PC_COLORS('\005', BLACK_ON_WHITE), /* clubs */
18416
};
18417
+#define USE_CP437 1
18418
+#else
18419
+#define USE_CP437 0
18420
#endif /* __i386__ */
18421
18422
static chtype *suits = letters; /* this may change to glyphs below */
18423
@@ -391,7 +421,7 @@ main(int argc, char *argv[])
18424
letters[1] = OR_COLORS('s', BLACK_ON_WHITE); /* spades */
18425
letters[2] = OR_COLORS('d', RED_ON_WHITE); /* diamonds */
18426
letters[3] = OR_COLORS('c', BLACK_ON_WHITE); /* clubs */
18427
-#if defined(__i386__) && defined(A_ALTCHARSET)
18428
+#if USE_CP437
18429
glyphs[0] = PC_COLORS('\003', RED_ON_WHITE); /* hearts */
18430
glyphs[1] = PC_COLORS('\006', BLACK_ON_WHITE); /* spades */
18431
glyphs[2] = PC_COLORS('\004', RED_ON_WHITE); /* diamonds */
18432
@@ -399,10 +429,10 @@ main(int argc, char *argv[])
18433
#endif
18434
#endif
18435
18436
-#if defined(__i386__) && defined(A_ALTCHARSET)
18437
+#if USE_CP437
18438
if (tigetstr("smpch"))
18439
suits = glyphs;
18440
-#endif /* __i386__ && A_ALTCHARSET */
18441
+#endif /* USE_CP437 */
18442
18443
cbreak();
18444
18445
Index: ncurses-5.5/test/bs.c
18446
===================================================================
18447
--- ncurses-5.5.orig/test/bs.c 2005-05-28 17:38:24.000000000 -0400
18448
+++ ncurses-5.5/test/bs.c 2006-04-29 10:41:13.000000000 -0400
18449
@@ -1,3 +1,30 @@
18450
+/****************************************************************************
18451
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
18452
+ * *
18453
+ * Permission is hereby granted, free of charge, to any person obtaining a *
18454
+ * copy of this software and associated documentation files (the *
18455
+ * "Software"), to deal in the Software without restriction, including *
18456
+ * without limitation the rights to use, copy, modify, merge, publish, *
18457
+ * distribute, distribute with modifications, sublicense, and/or sell *
18458
+ * copies of the Software, and to permit persons to whom the Software is *
18459
+ * furnished to do so, subject to the following conditions: *
18460
+ * *
18461
+ * The above copyright notice and this permission notice shall be included *
18462
+ * in all copies or substantial portions of the Software. *
18463
+ * *
18464
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
18465
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
18466
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
18467
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
18468
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
18469
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
18470
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
18471
+ * *
18472
+ * Except as contained in this notice, the name(s) of the above copyright *
18473
+ * holders shall not be used in advertising or otherwise to promote the *
18474
+ * sale, use or other dealings in this Software without prior written *
18475
+ * authorization. *
18476
+ ****************************************************************************/
18477
/*
18478
* bs.c - original author: Bruce Holloway
18479
* salvo option by: Chuck A DeGaul
18480
@@ -7,7 +34,7 @@
18481
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
18482
* v2.1 with ncurses mouse support, September 1995
18483
*
18484
- * $Id: bs.c,v 1.41 2005/05/28 21:38:24 tom Exp $
18485
+ * $Id: bs.c,v 1.43 2006/04/22 22:41:22 tom Exp $
18486
*/
18487
18488
#include <test.priv.h>
18489
@@ -149,7 +176,8 @@ static int salvo, blitz, closepack;
18490
18491
static RETSIGTYPE uninitgame(int sig) GCC_NORETURN;
18492
18493
-static RETSIGTYPE uninitgame(int sig GCC_UNUSED)
18494
+static RETSIGTYPE
18495
+uninitgame(int sig GCC_UNUSED)
18496
/* end the game, either normally or due to signal */
18497
{
18498
clear();
18499
@@ -839,7 +867,6 @@ plyturn(void)
18500
}
18501
(void) printw(m, ss->name);
18502
(void) beep();
18503
- return (awinna() == -1);
18504
}
18505
return (hit);
18506
}
18507
@@ -949,13 +976,17 @@ cpufire(int x, int y)
18508
attrset(0);
18509
#endif /* A_COLOR */
18510
18511
- return ((hit ? (sunk ? S_SUNK : S_HIT) : S_MISS) ? TRUE : FALSE);
18512
+ return hit ? (sunk ? S_SUNK : S_HIT) : S_MISS;
18513
}
18514
18515
/*
18516
* This code implements a fairly irregular FSM, so please forgive the rampant
18517
* unstructuredness below. The five labels are states which need to be held
18518
* between computer turns.
18519
+ *
18520
+ * The FSM is not externally reset to RANDOM_FIRE if the player wins. Instead,
18521
+ * the other states check for "impossible" conditions which signify a new
18522
+ * game, then if found transition to RANDOM_FIRE.
18523
*/
18524
static bool
18525
cputurn(void)
18526
@@ -1003,13 +1034,17 @@ cputurn(void)
18527
if (navail == 0) /* no valid places for shots adjacent... */
18528
goto refire; /* ...so we must random-fire */
18529
else {
18530
- for (d = 0, n = rnd(navail) + 1; n; n--)
18531
- while (used[d])
18532
- d++;
18533
+ n = rnd(navail) + 1;
18534
+ for (d = 0; used[d]; d++) ;
18535
+ /* used[d] is first that == 0 */
18536
+ for (; n > 1; n--)
18537
+ while (used[++d]) ;
18538
+ /* used[d] is next that == 0 */
18539
18540
- assert(d <= 4);
18541
+ assert(d < 4);
18542
+ assert(used[d] == FALSE);
18543
18544
- used[d] = FALSE;
18545
+ used[d] = TRUE;
18546
x = ts.x + xincr[d * 2];
18547
y = ts.y + yincr[d * 2];
18548
18549
@@ -1040,7 +1075,7 @@ cputurn(void)
18550
break;
18551
18552
case REVERSE_JUMP: /* nail down the ship's other end */
18553
- d = ts.dir + 4;
18554
+ d = (ts.dir + 4) % 8;
18555
x = ts.x + ts.hits * xincr[d];
18556
y = ts.y + ts.hits * yincr[d];
18557
if (POSSIBLE(x, y) && (hit = cpufire(x, y))) {
18558
@@ -1053,7 +1088,7 @@ cputurn(void)
18559
next = RANDOM_FIRE;
18560
break;
18561
18562
- case SECOND_PASS: /* kill squares not caught on first pass */
18563
+ case SECOND_PASS: /* continue shooting after reversing */
18564
x = ts.x + xincr[ts.dir];
18565
y = ts.y + yincr[ts.dir];
18566
if (POSSIBLE(x, y) && (hit = cpufire(x, y))) {
18567
@@ -1067,14 +1102,11 @@ cputurn(void)
18568
break;
18569
}
18570
18571
- /* check for continuation and/or winner */
18572
+ /* pause between shots in salvo */
18573
if (salvo) {
18574
(void) refresh();
18575
(void) sleep(1);
18576
}
18577
- if (awinna() != -1)
18578
- return (FALSE);
18579
-
18580
#ifdef DEBUG
18581
(void) mvprintw(PROMPTLINE + 2, 0,
18582
"New state %d, x=%d, y=%d, d=%d",
18583
@@ -1213,7 +1245,7 @@ main(int argc, char *argv[])
18584
}
18585
}
18586
} else
18587
- while (turn ? cputurn() : plyturn())
18588
+ while ((turn ? cputurn() : plyturn()) && awinna() == -1)
18589
continue;
18590
turn = OTHER;
18591
}
18592
Index: ncurses-5.5/test/bulgarian-utf8.txt
18593
===================================================================
18594
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
18595
+++ ncurses-5.5/test/bulgarian-utf8.txt 2006-04-18 15:47:22.000000000 -0400
18596
@@ -0,0 +1,6 @@
18597
+Показване на помощна информация -- 1
18598
+Създаване на дялове -- 2
18599
+Избор на дял и форматиране -- 3
18600
+Записване в избрания дял -- 4
18601
+Инсталиране на LILO -- 5
18602
+Изход от програмата -- 6
18603
Index: ncurses-5.5/test/configure
18604
===================================================================
18605
--- ncurses-5.5.orig/test/configure 2005-02-26 19:02:25.000000000 -0500
18606
+++ ncurses-5.5/test/configure 2006-04-18 15:48:06.000000000 -0400
18607
@@ -183,10 +183,16 @@ Features and packages:
18608
EOF
18609
cat <<\EOF
18610
--enable and --with options recognized:
18611
+ --enable-warnings test: turn on gcc compiler warnings
18612
--with-curses-dir=DIR directory in which (n)curses is installed
18613
--with-5lib use SunOS sysv-libraries
18614
--with-ncursesw use wide ncurses-libraries (installed)
18615
--with-ncurses use ncurses-libraries (installed)
18616
+ --with-pdcurses compile/link with pdcurses X11 library
18617
+ --with-x use the X Window System
18618
+ --with-Xaw3d link with Xaw 3d library
18619
+ --with-neXtaw link with neXT Athena library
18620
+ --with-XawPlus link with Athena-Plus library
18621
EOF
18622
exit 0 ;;
18623
18624
@@ -524,6 +530,241 @@ else
18625
ac_n= ac_c='\c' ac_t=
18626
fi
18627
18628
+# If we find X, set shell vars x_includes and x_libraries to the
18629
+# paths, otherwise set no_x=yes.
18630
+# Uses ac_ vars as temps to allow command line to override cache and checks.
18631
+# --without-x overrides everything else, but does not touch the cache.
18632
+echo $ac_n "checking for X""... $ac_c" 1>&6
18633
+echo "configure:539: checking for X" >&5
18634
+
18635
+
18636
+# Check whether --with-x or --without-x was given.
18637
+if test "${with_x+set}" = set; then
18638
+ withval="$with_x"
18639
+ :
18640
+fi
18641
+
18642
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
18643
+if test "x$with_x" = xno; then
18644
+ # The user explicitly disabled X.
18645
+ have_x=disabled
18646
+else
18647
+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
18648
+ # Both variables are already set.
18649
+ have_x=yes
18650
+ else
18651
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
18652
+ echo $ac_n "(cached) $ac_c" 1>&6
18653
+else
18654
+ # One or both of the vars are not set, and there is no cached value.
18655
+ac_x_includes=NO ac_x_libraries=NO
18656
+rm -fr conftestdir
18657
+if mkdir conftestdir; then
18658
+ cd conftestdir
18659
+ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
18660
+ cat > Imakefile <<'EOF'
18661
+acfindx:
18662
+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
18663
+EOF
18664
+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
18665
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
18666
+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
18667
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
18668
+ for ac_extension in a so sl; do
18669
+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
18670
+ test -f $ac_im_libdir/libX11.$ac_extension; then
18671
+ ac_im_usrlibdir=$ac_im_libdir; break
18672
+ fi
18673
+ done
18674
+ # Screen out bogus values from the imake configuration. They are
18675
+ # bogus both because they are the default anyway, and because
18676
+ # using them would break gcc on systems where it needs fixed includes.
18677
+ case "$ac_im_incroot" in
18678
+ /usr/include) ;;
18679
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
18680
+ esac
18681
+ case "$ac_im_usrlibdir" in
18682
+ /usr/lib | /lib) ;;
18683
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
18684
+ esac
18685
+ fi
18686
+ cd ..
18687
+ rm -fr conftestdir
18688
+fi
18689
+
18690
+if test "$ac_x_includes" = NO; then
18691
+ # Guess where to find include files, by looking for this one X11 .h file.
18692
+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
18693
+
18694
+ # First, try using that file with no special directory specified.
18695
+cat > conftest.$ac_ext <<EOF
18696
+#line 602 "configure"
18697
+#include "confdefs.h"
18698
+#include <$x_direct_test_include>
18699
+EOF
18700
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
18701
+{ (eval echo configure:607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
18702
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
18703
+if test -z "$ac_err"; then
18704
+ rm -rf conftest*
18705
+ # We can compile using X headers with no special include directory.
18706
+ac_x_includes=
18707
+else
18708
+ echo "$ac_err" >&5
18709
+ echo "configure: failed program was:" >&5
18710
+ cat conftest.$ac_ext >&5
18711
+ rm -rf conftest*
18712
+ # Look for the header file in a standard set of common directories.
18713
+# Check X11 before X11Rn because it is often a symlink to the current release.
18714
+ for ac_dir in \
18715
+ /usr/X11/include \
18716
+ /usr/X11R6/include \
18717
+ /usr/X11R5/include \
18718
+ /usr/X11R4/include \
18719
+ \
18720
+ /usr/include/X11 \
18721
+ /usr/include/X11R6 \
18722
+ /usr/include/X11R5 \
18723
+ /usr/include/X11R4 \
18724
+ \
18725
+ /usr/local/X11/include \
18726
+ /usr/local/X11R6/include \
18727
+ /usr/local/X11R5/include \
18728
+ /usr/local/X11R4/include \
18729
+ \
18730
+ /usr/local/include/X11 \
18731
+ /usr/local/include/X11R6 \
18732
+ /usr/local/include/X11R5 \
18733
+ /usr/local/include/X11R4 \
18734
+ \
18735
+ /usr/X386/include \
18736
+ /usr/x386/include \
18737
+ /usr/XFree86/include/X11 \
18738
+ \
18739
+ /usr/include \
18740
+ /usr/local/include \
18741
+ /usr/unsupported/include \
18742
+ /usr/athena/include \
18743
+ /usr/local/x11r5/include \
18744
+ /usr/lpp/Xamples/include \
18745
+ \
18746
+ /usr/openwin/include \
18747
+ /usr/openwin/share/include \
18748
+ ; \
18749
+ do
18750
+ if test -r "$ac_dir/$x_direct_test_include"; then
18751
+ ac_x_includes=$ac_dir
18752
+ break
18753
+ fi
18754
+ done
18755
+fi
18756
+rm -f conftest*
18757
+fi # $ac_x_includes = NO
18758
+
18759
+if test "$ac_x_libraries" = NO; then
18760
+ # Check for the libraries.
18761
+
18762
+ test -z "$x_direct_test_library" && x_direct_test_library=Xt
18763
+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
18764
+
18765
+ # See if we find them without any special options.
18766
+ # Don't add to $LIBS permanently.
18767
+ ac_save_LIBS="$LIBS"
18768
+ LIBS="-l$x_direct_test_library $LIBS"
18769
+cat > conftest.$ac_ext <<EOF
18770
+#line 676 "configure"
18771
+#include "confdefs.h"
18772
+
18773
+int main() {
18774
+${x_direct_test_function}()
18775
+; return 0; }
18776
+EOF
18777
+if { (eval echo configure:683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18778
+ rm -rf conftest*
18779
+ LIBS="$ac_save_LIBS"
18780
+# We can link X programs with no special library path.
18781
+ac_x_libraries=
18782
+else
18783
+ echo "configure: failed program was:" >&5
18784
+ cat conftest.$ac_ext >&5
18785
+ rm -rf conftest*
18786
+ LIBS="$ac_save_LIBS"
18787
+# First see if replacing the include by lib works.
18788
+# Check X11 before X11Rn because it is often a symlink to the current release.
18789
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
18790
+ /usr/X11/lib \
18791
+ /usr/X11R6/lib \
18792
+ /usr/X11R5/lib \
18793
+ /usr/X11R4/lib \
18794
+ \
18795
+ /usr/lib/X11 \
18796
+ /usr/lib/X11R6 \
18797
+ /usr/lib/X11R5 \
18798
+ /usr/lib/X11R4 \
18799
+ \
18800
+ /usr/local/X11/lib \
18801
+ /usr/local/X11R6/lib \
18802
+ /usr/local/X11R5/lib \
18803
+ /usr/local/X11R4/lib \
18804
+ \
18805
+ /usr/local/lib/X11 \
18806
+ /usr/local/lib/X11R6 \
18807
+ /usr/local/lib/X11R5 \
18808
+ /usr/local/lib/X11R4 \
18809
+ \
18810
+ /usr/X386/lib \
18811
+ /usr/x386/lib \
18812
+ /usr/XFree86/lib/X11 \
18813
+ \
18814
+ /usr/lib \
18815
+ /usr/local/lib \
18816
+ /usr/unsupported/lib \
18817
+ /usr/athena/lib \
18818
+ /usr/local/x11r5/lib \
18819
+ /usr/lpp/Xamples/lib \
18820
+ /lib/usr/lib/X11 \
18821
+ \
18822
+ /usr/openwin/lib \
18823
+ /usr/openwin/share/lib \
18824
+ ; \
18825
+do
18826
+ for ac_extension in a so sl; do
18827
+ if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
18828
+ ac_x_libraries=$ac_dir
18829
+ break 2
18830
+ fi
18831
+ done
18832
+done
18833
+fi
18834
+rm -f conftest*
18835
+fi # $ac_x_libraries = NO
18836
+
18837
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
18838
+ # Didn't find X anywhere. Cache the known absence of X.
18839
+ ac_cv_have_x="have_x=no"
18840
+else
18841
+ # Record where we found X for the cache.
18842
+ ac_cv_have_x="have_x=yes \
18843
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
18844
+fi
18845
+fi
18846
+ fi
18847
+ eval "$ac_cv_have_x"
18848
+fi # $with_x != no
18849
+
18850
+if test "$have_x" != yes; then
18851
+ echo "$ac_t""$have_x" 1>&6
18852
+ no_x=yes
18853
+else
18854
+ # If each of the values was on the command line, it overrides each guess.
18855
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
18856
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
18857
+ # Update the cache value to reflect the command line values.
18858
+ ac_cv_have_x="have_x=yes \
18859
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
18860
+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
18861
+fi
18862
+
18863
18864
18865
18866
@@ -561,7 +802,7 @@ else { echo "configure: error: can not r
18867
fi
18868
18869
echo $ac_n "checking host system type""... $ac_c" 1>&6
18870
-echo "configure:565: checking host system type" >&5
18871
+echo "configure:806: checking host system type" >&5
18872
18873
host_alias=$host
18874
case "$host_alias" in
18875
@@ -609,7 +850,7 @@ fi
18876
18877
18878
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
18879
-echo "configure:613: checking whether ${MAKE-make} sets \${MAKE}" >&5
18880
+echo "configure:854: checking whether ${MAKE-make} sets \${MAKE}" >&5
18881
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
18882
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
18883
echo $ac_n "(cached) $ac_c" 1>&6
18884
@@ -638,7 +879,7 @@ fi
18885
# Extract the first word of "gcc", so it can be a program name with args.
18886
set dummy gcc; ac_word=$2
18887
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18888
-echo "configure:642: checking for $ac_word" >&5
18889
+echo "configure:883: checking for $ac_word" >&5
18890
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
18891
echo $ac_n "(cached) $ac_c" 1>&6
18892
else
18893
@@ -668,7 +909,7 @@ if test -z "$CC"; then
18894
# Extract the first word of "cc", so it can be a program name with args.
18895
set dummy cc; ac_word=$2
18896
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18897
-echo "configure:672: checking for $ac_word" >&5
18898
+echo "configure:913: checking for $ac_word" >&5
18899
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
18900
echo $ac_n "(cached) $ac_c" 1>&6
18901
else
18902
@@ -719,7 +960,7 @@ fi
18903
# Extract the first word of "cl", so it can be a program name with args.
18904
set dummy cl; ac_word=$2
18905
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18906
-echo "configure:723: checking for $ac_word" >&5
18907
+echo "configure:964: checking for $ac_word" >&5
18908
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
18909
echo $ac_n "(cached) $ac_c" 1>&6
18910
else
18911
@@ -751,7 +992,7 @@ fi
18912
fi
18913
18914
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
18915
-echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
18916
+echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
18917
18918
ac_ext=c
18919
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
18920
@@ -762,12 +1003,12 @@ cross_compiling=$ac_cv_prog_cc_cross
18921
18922
cat > conftest.$ac_ext << EOF
18923
18924
-#line 766 "configure"
18925
+#line 1007 "configure"
18926
#include "confdefs.h"
18927
18928
main(){return(0);}
18929
EOF
18930
-if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18931
+if { (eval echo configure:1012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18932
ac_cv_prog_cc_works=yes
18933
# If we can't run a trivial program, we are probably using a cross compiler.
18934
if (./conftest; exit) 2>/dev/null; then
18935
@@ -793,12 +1034,12 @@ if test $ac_cv_prog_cc_works = no; then
18936
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
18937
fi
18938
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
18939
-echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
18940
+echo "configure:1038: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
18941
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
18942
cross_compiling=$ac_cv_prog_cc_cross
18943
18944
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
18945
-echo "configure:802: checking whether we are using GNU C" >&5
18946
+echo "configure:1043: checking whether we are using GNU C" >&5
18947
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
18948
echo $ac_n "(cached) $ac_c" 1>&6
18949
else
18950
@@ -807,7 +1048,7 @@ else
18951
yes;
18952
#endif
18953
EOF
18954
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
18955
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
18956
ac_cv_prog_gcc=yes
18957
else
18958
ac_cv_prog_gcc=no
18959
@@ -826,7 +1067,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
18960
ac_save_CFLAGS="$CFLAGS"
18961
CFLAGS=
18962
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
18963
-echo "configure:830: checking whether ${CC-cc} accepts -g" >&5
18964
+echo "configure:1071: checking whether ${CC-cc} accepts -g" >&5
18965
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
18966
echo $ac_n "(cached) $ac_c" 1>&6
18967
else
18968
@@ -858,7 +1099,7 @@ else
18969
fi
18970
18971
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
18972
-echo "configure:862: checking how to run the C preprocessor" >&5
18973
+echo "configure:1103: checking how to run the C preprocessor" >&5
18974
# On Suns, sometimes $CPP names a directory.
18975
if test -n "$CPP" && test -d "$CPP"; then
18976
CPP=
18977
@@ -873,13 +1114,13 @@ else
18978
# On the NeXT, cc -E runs the code through the compiler's parser,
18979
# not just through cpp.
18980
cat > conftest.$ac_ext <<EOF
18981
-#line 877 "configure"
18982
+#line 1118 "configure"
18983
#include "confdefs.h"
18984
#include <assert.h>
18985
Syntax Error
18986
EOF
18987
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
18988
-{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
18989
+{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
18990
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
18991
if test -z "$ac_err"; then
18992
:
18993
@@ -890,13 +1131,13 @@ else
18994
rm -rf conftest*
18995
CPP="${CC-cc} -E -traditional-cpp"
18996
cat > conftest.$ac_ext <<EOF
18997
-#line 894 "configure"
18998
+#line 1135 "configure"
18999
#include "confdefs.h"
19000
#include <assert.h>
19001
Syntax Error
19002
EOF
19003
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
19004
-{ (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19005
+{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19006
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
19007
if test -z "$ac_err"; then
19008
:
19009
@@ -907,13 +1148,13 @@ else
19010
rm -rf conftest*
19011
CPP="${CC-cc} -nologo -E"
19012
cat > conftest.$ac_ext <<EOF
19013
-#line 911 "configure"
19014
+#line 1152 "configure"
19015
#include "confdefs.h"
19016
#include <assert.h>
19017
Syntax Error
19018
EOF
19019
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
19020
-{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19021
+{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19022
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
19023
if test -z "$ac_err"; then
19024
:
19025
@@ -953,8 +1194,6 @@ LIBTOOL=""
19026
LIB_CLEAN=""
19027
LIB_COMPILE=""
19028
LIB_LINK=""
19029
-LIB_NAME=curses
19030
-LIB_PREFIX="-l"
19031
LINK_TESTS=""
19032
LINT=lint
19033
LINT_OPTS=""
19034
@@ -970,12 +1209,12 @@ cf_cv_screen=curses
19035
cf_cv_libtype=
19036
19037
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
19038
-echo "configure:974: checking for Cygwin environment" >&5
19039
+echo "configure:1213: checking for Cygwin environment" >&5
19040
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
19041
echo $ac_n "(cached) $ac_c" 1>&6
19042
else
19043
cat > conftest.$ac_ext <<EOF
19044
-#line 979 "configure"
19045
+#line 1218 "configure"
19046
#include "confdefs.h"
19047
19048
int main() {
19049
@@ -986,7 +1225,7 @@ int main() {
19050
return __CYGWIN__;
19051
; return 0; }
19052
EOF
19053
-if { (eval echo configure:990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19054
+if { (eval echo configure:1229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19055
rm -rf conftest*
19056
ac_cv_cygwin=yes
19057
else
19058
@@ -1003,19 +1242,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
19059
CYGWIN=
19060
test "$ac_cv_cygwin" = yes && CYGWIN=yes
19061
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
19062
-echo "configure:1007: checking for mingw32 environment" >&5
19063
+echo "configure:1246: checking for mingw32 environment" >&5
19064
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
19065
echo $ac_n "(cached) $ac_c" 1>&6
19066
else
19067
cat > conftest.$ac_ext <<EOF
19068
-#line 1012 "configure"
19069
+#line 1251 "configure"
19070
#include "confdefs.h"
19071
19072
int main() {
19073
return __MINGW32__;
19074
; return 0; }
19075
EOF
19076
-if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19077
+if { (eval echo configure:1258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19078
rm -rf conftest*
19079
ac_cv_mingw32=yes
19080
else
19081
@@ -1034,7 +1273,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
19082
19083
19084
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
19085
-echo "configure:1038: checking for executable suffix" >&5
19086
+echo "configure:1277: checking for executable suffix" >&5
19087
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
19088
echo $ac_n "(cached) $ac_c" 1>&6
19089
else
19090
@@ -1044,7 +1283,7 @@ else
19091
rm -f conftest*
19092
echo 'int main () { return 0; }' > conftest.$ac_ext
19093
ac_cv_exeext=
19094
- if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
19095
+ if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
19096
for file in conftest.*; do
19097
case $file in
19098
*.c | *.o | *.obj) ;;
19099
@@ -1065,13 +1304,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
19100
ac_exeext=$EXEEXT
19101
19102
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
19103
-echo "configure:1069: checking for object suffix" >&5
19104
+echo "configure:1308: checking for object suffix" >&5
19105
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
19106
echo $ac_n "(cached) $ac_c" 1>&6
19107
else
19108
rm -f conftest*
19109
echo 'int i = 1;' > conftest.$ac_ext
19110
-if { (eval echo configure:1075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19111
+if { (eval echo configure:1314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19112
for ac_file in conftest.*; do
19113
case $ac_file in
19114
*.c) ;;
19115
@@ -1091,7 +1330,7 @@ ac_objext=$ac_cv_objext
19116
19117
19118
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
19119
-echo "configure:1095: checking for ${CC-cc} option to accept ANSI C" >&5
19120
+echo "configure:1334: checking for ${CC-cc} option to accept ANSI C" >&5
19121
if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
19122
echo $ac_n "(cached) $ac_c" 1>&6
19123
else
19124
@@ -1187,7 +1426,7 @@ fi
19125
19126
19127
cat > conftest.$ac_ext <<EOF
19128
-#line 1191 "configure"
19129
+#line 1430 "configure"
19130
#include "confdefs.h"
19131
19132
#ifndef CC_HAS_PROTOS
19133
@@ -1203,7 +1442,7 @@ int main() {
19134
struct s2 {int (*f) (double a);};
19135
; return 0; }
19136
EOF
19137
-if { (eval echo configure:1207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19138
+if { (eval echo configure:1446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19139
rm -rf conftest*
19140
cf_cv_ansi_cc="$cf_arg"; break
19141
else
19142
@@ -1312,18 +1551,53 @@ fi
19143
19144
19145
19146
+GCC_VERSION=none
19147
+if test "$GCC" = yes ; then
19148
+ echo $ac_n "checking version of $CC""... $ac_c" 1>&6
19149
+echo "configure:1558: checking version of $CC" >&5
19150
+ GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
19151
+ test -z "$GCC_VERSION" && GCC_VERSION=unknown
19152
+ echo "$ac_t""$GCC_VERSION" 1>&6
19153
+fi
19154
+
19155
+
19156
+if ( test "$GCC" = yes || test "$GXX" = yes )
19157
+then
19158
+echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
19159
+echo "configure:1568: checking if you want to turn on gcc warnings" >&5
19160
+
19161
+# Check whether --enable-warnings or --disable-warnings was given.
19162
+if test "${enable_warnings+set}" = set; then
19163
+ enableval="$enable_warnings"
19164
+ test "$enableval" != yes && enableval=no
19165
+ if test "$enableval" != "no" ; then
19166
+ with_warnings=yes
19167
+ else
19168
+ with_warnings=no
19169
+ fi
19170
+else
19171
+ enableval=no
19172
+ with_warnings=no
19173
+
19174
+fi
19175
+
19176
+echo "$ac_t""$with_warnings" 1>&6
19177
+if test "$with_warnings" = "yes"
19178
+then
19179
+
19180
+
19181
19182
INTEL_COMPILER=no
19183
19184
if test "$GCC" = yes ; then
19185
case $host_os in
19186
linux*|gnu*)
19187
- echo $ac_n "checking if this is really Intel compiler""... $ac_c" 1>&6
19188
-echo "configure:1323: checking if this is really Intel compiler" >&5
19189
+ echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6
19190
+echo "configure:1597: checking if this is really Intel C compiler" >&5
19191
cf_save_CFLAGS="$CFLAGS"
19192
CFLAGS="$CFLAGS -no-gcc"
19193
cat > conftest.$ac_ext <<EOF
19194
-#line 1327 "configure"
19195
+#line 1601 "configure"
19196
#include "confdefs.h"
19197
19198
int main() {
19199
@@ -1335,7 +1609,7 @@ make an error
19200
19201
; return 0; }
19202
EOF
19203
-if { (eval echo configure:1339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19204
+if { (eval echo configure:1613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19205
rm -rf conftest*
19206
INTEL_COMPILER=yes
19207
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
19208
@@ -1352,6 +1626,214 @@ rm -f conftest*
19209
fi
19210
19211
19212
+cat > conftest.$ac_ext <<EOF
19213
+#line 1631 "configure"
19214
+int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
19215
+EOF
19216
+
19217
+if test "$INTEL_COMPILER" = yes
19218
+then
19219
+# The "-wdXXX" options suppress warnings:
19220
+# remark #1419: external declaration in primary source file
19221
+# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
19222
+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
19223
+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
19224
+# remark #193: zero used for undefined preprocessing identifier
19225
+# remark #593: variable "curs_sb_left_arrow" was set but never used
19226
+# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
19227
+# remark #869: parameter "tw" was never referenced
19228
+# remark #981: operands are evaluated in unspecified order
19229
+# warning #269: invalid format string conversion
19230
+
19231
+ echo "checking for $CC warning options" 1>&6
19232
+echo "configure:1650: checking for $CC warning options" >&5
19233
+ cf_save_CFLAGS="$CFLAGS"
19234
+ EXTRA_CFLAGS="-Wall"
19235
+ for cf_opt in \
19236
+ wd1419 \
19237
+ wd1682 \
19238
+ wd1683 \
19239
+ wd1684 \
19240
+ wd193 \
19241
+ wd279 \
19242
+ wd593 \
19243
+ wd810 \
19244
+ wd869 \
19245
+ wd981
19246
+ do
19247
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
19248
+ if { (eval echo configure:1666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19249
+ test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
19250
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
19251
+ fi
19252
+ done
19253
+ CFLAGS="$cf_save_CFLAGS"
19254
+
19255
+elif test "$GCC" = yes
19256
+then
19257
+ echo "checking for $CC warning options" 1>&6
19258
+echo "configure:1676: checking for $CC warning options" >&5
19259
+ cf_save_CFLAGS="$CFLAGS"
19260
+ EXTRA_CFLAGS="-W -Wall"
19261
+ cf_warn_CONST=""
19262
+ test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
19263
+ for cf_opt in \
19264
+ Wbad-function-cast \
19265
+ Wcast-align \
19266
+ Wcast-qual \
19267
+ Winline \
19268
+ Wmissing-declarations \
19269
+ Wmissing-prototypes \
19270
+ Wnested-externs \
19271
+ Wpointer-arith \
19272
+ Wshadow \
19273
+ Wstrict-prototypes \
19274
+ Wundef $cf_warn_CONST
19275
+ do
19276
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
19277
+ if { (eval echo configure:1695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19278
+ test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
19279
+ case $cf_opt in #(vi
19280
+ Wcast-qual) #(vi
19281
+ CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
19282
+ ;;
19283
+ Winline) #(vi
19284
+ case $GCC_VERSION in
19285
+ 3.3*)
19286
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
19287
+
19288
+ continue;;
19289
+ esac
19290
+ ;;
19291
+ esac
19292
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
19293
+ fi
19294
+ done
19295
+ CFLAGS="$cf_save_CFLAGS"
19296
+fi
19297
+rm -f conftest*
19298
+
19299
+
19300
+
19301
+fi
19302
+fi
19303
+
19304
+
19305
+if test "$GCC" = yes
19306
+then
19307
+cat > conftest.i <<EOF
19308
+#ifndef GCC_PRINTF
19309
+#define GCC_PRINTF 0
19310
+#endif
19311
+#ifndef GCC_SCANF
19312
+#define GCC_SCANF 0
19313
+#endif
19314
+#ifndef GCC_NORETURN
19315
+#define GCC_NORETURN /* nothing */
19316
+#endif
19317
+#ifndef GCC_UNUSED
19318
+#define GCC_UNUSED /* nothing */
19319
+#endif
19320
+EOF
19321
+if test "$GCC" = yes
19322
+then
19323
+ echo "checking for $CC __attribute__ directives" 1>&6
19324
+echo "configure:1742: checking for $CC __attribute__ directives" >&5
19325
+cat > conftest.$ac_ext <<EOF
19326
+#line 1744 "configure"
19327
+#include "confdefs.h"
19328
+#include "conftest.h"
19329
+#include "conftest.i"
19330
+#if GCC_PRINTF
19331
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
19332
+#else
19333
+#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
19334
+#endif
19335
+#if GCC_SCANF
19336
+#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
19337
+#else
19338
+#define GCC_SCANFLIKE(fmt,var) /*nothing*/
19339
+#endif
19340
+extern void wow(char *,...) GCC_SCANFLIKE(1,2);
19341
+extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
19342
+extern void foo(void) GCC_NORETURN;
19343
+int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { return 0; }
19344
+EOF
19345
+ for cf_attribute in scanf printf unused noreturn
19346
+ do
19347
+
19348
+cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
19349
+
19350
+ cf_directive="__attribute__(($cf_attribute))"
19351
+ echo "checking for $CC $cf_directive" 1>&5
19352
+ case $cf_attribute in
19353
+ scanf|printf)
19354
+ cat >conftest.h <<EOF
19355
+#define GCC_$cf_ATTRIBUTE 1
19356
+EOF
19357
+ ;;
19358
+ *)
19359
+ cat >conftest.h <<EOF
19360
+#define GCC_$cf_ATTRIBUTE $cf_directive
19361
+EOF
19362
+ ;;
19363
+ esac
19364
+ if { (eval echo configure:1782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19365
+ test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
19366
+ cat conftest.h >>confdefs.h
19367
+ fi
19368
+ done
19369
+else
19370
+ fgrep define conftest.i >>confdefs.h
19371
+fi
19372
+rm -rf conftest*
19373
+fi
19374
+
19375
+
19376
+echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6
19377
+echo "configure:1795: checking if $CC -U and -D options work together" >&5
19378
+if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then
19379
+ echo $ac_n "(cached) $ac_c" 1>&6
19380
+else
19381
+
19382
+ cf_save_CPPFLAGS="$CPPFLAGS"
19383
+ CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
19384
+ cat > conftest.$ac_ext <<EOF
19385
+#line 1803 "configure"
19386
+#include "confdefs.h"
19387
+
19388
+int main() {
19389
+
19390
+#ifndef U_D_OPTIONS
19391
+make an undefined-error
19392
+#endif
19393
+#ifdef D_U_OPTIONS
19394
+make a defined-error
19395
+#endif
19396
+
19397
+; return 0; }
19398
+EOF
19399
+if { (eval echo configure:1817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19400
+ rm -rf conftest*
19401
+
19402
+ cf_cv_cc_u_d_options=yes
19403
+else
19404
+ echo "configure: failed program was:" >&5
19405
+ cat conftest.$ac_ext >&5
19406
+ rm -rf conftest*
19407
+
19408
+ cf_cv_cc_u_d_options=no
19409
+fi
19410
+rm -f conftest*
19411
+ CPPFLAGS="$cf_save_CPPFLAGS"
19412
+
19413
+fi
19414
+
19415
+echo "$ac_t""$cf_cv_cc_u_d_options" 1>&6
19416
+
19417
+
19418
+
19419
+
19420
19421
cf_XOPEN_SOURCE=500
19422
cf_POSIX_C_SOURCE=199506L
19423
@@ -1376,17 +1858,14 @@ irix[56].*) #(vi
19424
;;
19425
linux*|gnu*) #(vi
19426
19427
-
19428
-
19429
-if test "$INTEL_COMPILER" = no ; then
19430
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
19431
-echo "configure:1384: checking if we must define _GNU_SOURCE" >&5
19432
+echo "configure:1863: checking if we must define _GNU_SOURCE" >&5
19433
if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
19434
echo $ac_n "(cached) $ac_c" 1>&6
19435
else
19436
19437
cat > conftest.$ac_ext <<EOF
19438
-#line 1390 "configure"
19439
+#line 1869 "configure"
19440
#include "confdefs.h"
19441
#include <sys/types.h>
19442
int main() {
19443
@@ -1396,7 +1875,7 @@ make an error
19444
#endif
19445
; return 0; }
19446
EOF
19447
-if { (eval echo configure:1400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19448
+if { (eval echo configure:1879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19449
rm -rf conftest*
19450
cf_cv_gnu_source=no
19451
else
19452
@@ -1406,7 +1885,7 @@ else
19453
cf_save="$CPPFLAGS"
19454
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
19455
cat > conftest.$ac_ext <<EOF
19456
-#line 1410 "configure"
19457
+#line 1889 "configure"
19458
#include "confdefs.h"
19459
#include <sys/types.h>
19460
int main() {
19461
@@ -1416,7 +1895,7 @@ make an error
19462
#endif
19463
; return 0; }
19464
EOF
19465
-if { (eval echo configure:1420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19466
+if { (eval echo configure:1899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19467
rm -rf conftest*
19468
cf_cv_gnu_source=no
19469
else
19470
@@ -1435,7 +1914,6 @@ fi
19471
19472
echo "$ac_t""$cf_cv_gnu_source" 1>&6
19473
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
19474
-fi
19475
19476
;;
19477
mirbsd*) #(vi
19478
@@ -1450,6 +1928,9 @@ openbsd*) #(vi
19479
osf[45]*) #(vi
19480
CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
19481
;;
19482
+nto-qnx*) #(vi
19483
+ CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
19484
+ ;;
19485
sco*) #(vi
19486
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
19487
;;
19488
@@ -1458,13 +1939,13 @@ solaris*) #(vi
19489
;;
19490
*)
19491
echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6
19492
-echo "configure:1462: checking if we should define _XOPEN_SOURCE" >&5
19493
+echo "configure:1943: checking if we should define _XOPEN_SOURCE" >&5
19494
if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then
19495
echo $ac_n "(cached) $ac_c" 1>&6
19496
else
19497
19498
cat > conftest.$ac_ext <<EOF
19499
-#line 1468 "configure"
19500
+#line 1949 "configure"
19501
#include "confdefs.h"
19502
#include <sys/types.h>
19503
int main() {
19504
@@ -1474,7 +1955,7 @@ make an error
19505
#endif
19506
; return 0; }
19507
EOF
19508
-if { (eval echo configure:1478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19509
+if { (eval echo configure:1959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19510
rm -rf conftest*
19511
cf_cv_xopen_source=no
19512
else
19513
@@ -1484,7 +1965,7 @@ else
19514
cf_save="$CPPFLAGS"
19515
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
19516
cat > conftest.$ac_ext <<EOF
19517
-#line 1488 "configure"
19518
+#line 1969 "configure"
19519
#include "confdefs.h"
19520
#include <sys/types.h>
19521
int main() {
19522
@@ -1494,7 +1975,7 @@ make an error
19523
#endif
19524
; return 0; }
19525
EOF
19526
-if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19527
+if { (eval echo configure:1979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19528
rm -rf conftest*
19529
cf_cv_xopen_source=no
19530
else
19531
@@ -1512,20 +1993,53 @@ rm -f conftest*
19532
fi
19533
19534
echo "$ac_t""$cf_cv_xopen_source" 1>&6
19535
-test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source"
19536
+ if test "$cf_cv_xopen_source" != no ; then
19537
+
19538
+# remove _XOPEN_SOURCE symbol from $CFLAGS
19539
+CFLAGS=`echo "$CFLAGS" | \
19540
+ sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
19541
+ -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'`
19542
+
19543
+
19544
+# remove _XOPEN_SOURCE symbol from $CPPFLAGS
19545
+CPPFLAGS=`echo "$CPPFLAGS" | \
19546
+ sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
19547
+ -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'`
19548
+
19549
+ test "$cf_cv_cc_u_d_options" = yes && \
19550
+ CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
19551
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
19552
+ fi
19553
19554
cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
19555
+
19556
+cf_save_CFLAGS="$CFLAGS"
19557
+cf_save_CPPFLAGS="$CPPFLAGS"
19558
+
19559
+
19560
+# remove _POSIX_C_SOURCE symbol from $cf_save_CFLAGS
19561
+cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
19562
+ sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
19563
+ -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'`
19564
+
19565
+
19566
+# remove _POSIX_C_SOURCE symbol from $cf_save_CPPFLAGS
19567
+cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
19568
+ sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
19569
+ -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'`
19570
+
19571
+
19572
echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6
19573
-echo "configure:1520: checking if we should define _POSIX_C_SOURCE" >&5
19574
+echo "configure:2034: checking if we should define _POSIX_C_SOURCE" >&5
19575
if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then
19576
echo $ac_n "(cached) $ac_c" 1>&6
19577
else
19578
19579
19580
-echo "(line 1526) testing if the symbol is already defined go no further ..." 1>&5
19581
+echo "(line 2040) testing if the symbol is already defined go no further ..." 1>&5
19582
19583
cat > conftest.$ac_ext <<EOF
19584
-#line 1529 "configure"
19585
+#line 2043 "configure"
19586
#include "confdefs.h"
19587
#include <sys/types.h>
19588
int main() {
19589
@@ -1535,7 +2049,7 @@ make an error
19590
#endif
19591
; return 0; }
19592
EOF
19593
-if { (eval echo configure:1539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19594
+if { (eval echo configure:2053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19595
rm -rf conftest*
19596
cf_cv_posix_c_source=no
19597
else
19598
@@ -1543,12 +2057,12 @@ else
19599
cat conftest.$ac_ext >&5
19600
rm -rf conftest*
19601
cf_want_posix_source=no
19602
- case .$cf_POSIX_C_SOURCE in
19603
- .[12]??*)
19604
- cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
19605
+ case .$cf_POSIX_C_SOURCE in #(vi
19606
+ .[12]??*) #(vi
19607
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
19608
;;
19609
- .2)
19610
- cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
19611
+ .2) #(vi
19612
+ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
19613
cf_want_posix_source=yes
19614
;;
19615
.*)
19616
@@ -1557,7 +2071,7 @@ else
19617
esac
19618
if test "$cf_want_posix_source" = yes ; then
19619
cat > conftest.$ac_ext <<EOF
19620
-#line 1561 "configure"
19621
+#line 2075 "configure"
19622
#include "confdefs.h"
19623
#include <sys/types.h>
19624
int main() {
19625
@@ -1567,26 +2081,26 @@ make an error
19626
#endif
19627
; return 0; }
19628
EOF
19629
-if { (eval echo configure:1571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19630
+if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19631
:
19632
else
19633
echo "configure: failed program was:" >&5
19634
cat conftest.$ac_ext >&5
19635
rm -rf conftest*
19636
- cf_cv_posix_c_source="$cf_cv_posix_c_source -U_POSIX_SOURCE -D_POSIX_SOURCE"
19637
+ cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
19638
fi
19639
rm -f conftest*
19640
fi
19641
19642
-echo "(line 1582) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
19643
+echo "(line 2096) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
19644
19645
- cf_save="$CPPFLAGS"
19646
- CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
19647
+ CFLAGS="$cf_trim_CFLAGS"
19648
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
19649
19650
-echo "(line 1587) testing if the second compile does not leave our definition intact error ..." 1>&5
19651
+echo "(line 2101) testing if the second compile does not leave our definition intact error ..." 1>&5
19652
19653
cat > conftest.$ac_ext <<EOF
19654
-#line 1590 "configure"
19655
+#line 2104 "configure"
19656
#include "confdefs.h"
19657
#include <sys/types.h>
19658
int main() {
19659
@@ -1596,7 +2110,7 @@ make an error
19660
#endif
19661
; return 0; }
19662
EOF
19663
-if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19664
+if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19665
:
19666
else
19667
echo "configure: failed program was:" >&5
19668
@@ -1605,7 +2119,8 @@ else
19669
cf_cv_posix_c_source=no
19670
fi
19671
rm -f conftest*
19672
- CPPFLAGS="$cf_save"
19673
+ CFLAGS="$cf_save_CFLAGS"
19674
+ CPPFLAGS="$cf_save_CPPFLAGS"
19675
19676
fi
19677
rm -f conftest*
19678
@@ -1613,7 +2128,18 @@ rm -f conftest*
19679
fi
19680
19681
echo "$ac_t""$cf_cv_posix_c_source" 1>&6
19682
-test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
19683
+
19684
+if test "$cf_cv_posix_c_source" != no ; then
19685
+ CFLAGS="$cf_trim_CFLAGS"
19686
+ CPPFLAGS="$cf_trim_CPPFLAGS"
19687
+ if test "$cf_cv_cc_u_d_options" = yes ; then
19688
+ cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
19689
+ sed -e 's/-D/-U/g' -e 's/=[^ ]*//g'`
19690
+ CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
19691
+ fi
19692
+ CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
19693
+fi
19694
+
19695
19696
;;
19697
esac
19698
@@ -1640,7 +2166,7 @@ case ".$withval" in #(vi
19699
;;
19700
esac
19701
;; #(vi
19702
-.NONE/*)
19703
+.no|.NONE/*)
19704
withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
19705
;;
19706
*)
19707
@@ -1669,14 +2195,26 @@ fi
19708
if test "${with_ncursesw+set}" = set; then
19709
withval="$with_ncursesw"
19710
cf_cv_screen=ncursesw
19711
-fi
19712
-
19713
+else
19714
+
19715
19716
19717
# Check whether --with-ncurses or --without-ncurses was given.
19718
if test "${with_ncurses+set}" = set; then
19719
withval="$with_ncurses"
19720
cf_cv_screen=ncurses
19721
+else
19722
+
19723
+
19724
+
19725
+# Check whether --with-pdcurses or --without-pdcurses was given.
19726
+if test "${with_pdcurses+set}" = set; then
19727
+ withval="$with_pdcurses"
19728
+ cf_cv_screen=pdcurses
19729
+fi
19730
+
19731
+fi
19732
+
19733
fi
19734
19735
19736
@@ -1685,14 +2223,14 @@ curses)
19737
19738
19739
echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
19740
-echo "configure:1689: checking for extra include directories" >&5
19741
+echo "configure:2227: checking for extra include directories" >&5
19742
if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
19743
echo $ac_n "(cached) $ac_c" 1>&6
19744
else
19745
19746
cf_cv_curses_incdir=no
19747
case $host_os in #(vi
19748
-hpux10.*|hpux11.*) #(vi
19749
+hpux10.*) #(vi
19750
test -d /usr/include/curses_colr && \
19751
cf_cv_curses_incdir="-I/usr/include/curses_colr"
19752
;;
19753
@@ -1708,8 +2246,9 @@ fi
19754
echo "$ac_t""$cf_cv_curses_incdir" 1>&6
19755
test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
19756
19757
+
19758
echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
19759
-echo "configure:1713: checking if we have identified curses headers" >&5
19760
+echo "configure:2252: checking if we have identified curses headers" >&5
19761
if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
19762
echo $ac_n "(cached) $ac_c" 1>&6
19763
else
19764
@@ -1722,14 +2261,14 @@ for cf_header in \
19765
ncurses/ncurses.h
19766
do
19767
cat > conftest.$ac_ext <<EOF
19768
-#line 1726 "configure"
19769
+#line 2265 "configure"
19770
#include "confdefs.h"
19771
#include <${cf_header}>
19772
int main() {
19773
initscr(); tgoto("?", 0,0)
19774
; return 0; }
19775
EOF
19776
-if { (eval echo configure:1733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19777
+if { (eval echo configure:2272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19778
rm -rf conftest*
19779
cf_cv_ncurses_header=$cf_header; break
19780
else
19781
@@ -1752,17 +2291,17 @@ for ac_hdr in $cf_cv_ncurses_header
19782
do
19783
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
19784
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
19785
-echo "configure:1756: checking for $ac_hdr" >&5
19786
+echo "configure:2295: checking for $ac_hdr" >&5
19787
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
19788
echo $ac_n "(cached) $ac_c" 1>&6
19789
else
19790
cat > conftest.$ac_ext <<EOF
19791
-#line 1761 "configure"
19792
+#line 2300 "configure"
19793
#include "confdefs.h"
19794
#include <$ac_hdr>
19795
EOF
19796
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
19797
-{ (eval echo configure:1766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19798
+{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19799
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
19800
if test -z "$ac_err"; then
19801
rm -rf conftest*
19802
@@ -1790,9 +2329,84 @@ done
19803
19804
19805
19806
+echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
19807
+echo "configure:2334: checking for terminfo header" >&5
19808
+if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
19809
+ echo $ac_n "(cached) $ac_c" 1>&6
19810
+else
19811
+
19812
+case ${cf_cv_ncurses_header} in #(vi
19813
+*/ncurses.h|*/ncursesw.h) #(vi
19814
+ cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
19815
+ ;;
19816
+*)
19817
+ cf_term_header=term.h
19818
+ ;;
19819
+esac
19820
+
19821
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
19822
+do
19823
+cat > conftest.$ac_ext <<EOF
19824
+#line 2351 "configure"
19825
+#include "confdefs.h"
19826
+#include <stdio.h>
19827
+#include <${cf_cv_ncurses_header-curses.h}>
19828
+#include <$cf_test>
19829
+
19830
+int main() {
19831
+int x = auto_left_margin
19832
+; return 0; }
19833
+EOF
19834
+if { (eval echo configure:2361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19835
+ rm -rf conftest*
19836
+
19837
+ cf_cv_term_header="$cf_test"
19838
+else
19839
+ echo "configure: failed program was:" >&5
19840
+ cat conftest.$ac_ext >&5
19841
+ rm -rf conftest*
19842
+
19843
+ cf_cv_term_header=unknown
19844
+
19845
+fi
19846
+rm -f conftest*
19847
+ test "$cf_cv_term_header" != unknown && break
19848
+done
19849
+
19850
+fi
19851
+
19852
+echo "$ac_t""$cf_cv_term_header" 1>&6
19853
+
19854
+# Set definitions to allow ifdef'ing to accommodate subdirectories
19855
+
19856
+case $cf_cv_term_header in # (vi
19857
+*term.h)
19858
+ cat >> confdefs.h <<\EOF
19859
+#define HAVE_TERM_H 1
19860
+EOF
19861
+
19862
+ ;;
19863
+esac
19864
+
19865
+case $cf_cv_term_header in # (vi
19866
+ncurses/term.h) #(vi
19867
+ cat >> confdefs.h <<\EOF
19868
+#define HAVE_NCURSES_TERM_H 1
19869
+EOF
19870
+
19871
+ ;;
19872
+ncursesw/term.h)
19873
+ cat >> confdefs.h <<\EOF
19874
+#define HAVE_NCURSESW_TERM_H 1
19875
+EOF
19876
+
19877
+ ;;
19878
+esac
19879
+
19880
+
19881
19882
echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
19883
-echo "configure:1796: checking for ncurses version" >&5
19884
+echo "configure:2410: checking for ncurses version" >&5
19885
if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
19886
echo $ac_n "(cached) $ac_c" 1>&6
19887
else
19888
@@ -1818,7 +2432,7 @@ Autoconf "old"
19889
#endif
19890
EOF
19891
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
19892
- { (eval echo configure:1822: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
19893
+ { (eval echo configure:2436: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
19894
if test -f conftest.out ; then
19895
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
19896
test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
19897
@@ -1827,7 +2441,7 @@ EOF
19898
19899
else
19900
cat > conftest.$ac_ext <<EOF
19901
-#line 1831 "configure"
19902
+#line 2445 "configure"
19903
#include "confdefs.h"
19904
19905
#include <${cf_cv_ncurses_header-curses.h}>
19906
@@ -1851,7 +2465,7 @@ int main()
19907
exit(0);
19908
}
19909
EOF
19910
-if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
19911
+if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
19912
then
19913
19914
cf_cv_ncurses_version=`cat $cf_tempfile`
19915
@@ -1875,16 +2489,16 @@ EOF
19916
19917
19918
echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
19919
-echo "configure:1879: checking if we have identified curses libraries" >&5
19920
+echo "configure:2493: checking if we have identified curses libraries" >&5
19921
cat > conftest.$ac_ext <<EOF
19922
-#line 1881 "configure"
19923
+#line 2495 "configure"
19924
#include "confdefs.h"
19925
#include <${cf_cv_ncurses_header-curses.h}>
19926
int main() {
19927
initscr(); tgoto("?", 0,0)
19928
; return 0; }
19929
EOF
19930
-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19931
+if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19932
rm -rf conftest*
19933
cf_result=yes
19934
else
19935
@@ -1900,7 +2514,7 @@ if test "$cf_result" = no ; then
19936
case $host_os in #(vi
19937
freebsd*) #(vi
19938
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
19939
-echo "configure:1904: checking for tgoto in -lmytinfo" >&5
19940
+echo "configure:2518: checking for tgoto in -lmytinfo" >&5
19941
ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
19942
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19943
echo $ac_n "(cached) $ac_c" 1>&6
19944
@@ -1908,7 +2522,7 @@ else
19945
ac_save_LIBS="$LIBS"
19946
LIBS="-lmytinfo $LIBS"
19947
cat > conftest.$ac_ext <<EOF
19948
-#line 1912 "configure"
19949
+#line 2526 "configure"
19950
#include "confdefs.h"
19951
/* Override any gcc2 internal prototype to avoid an error. */
19952
/* We use char because int might match the return type of a gcc2
19953
@@ -1919,7 +2533,7 @@ int main() {
19954
tgoto()
19955
; return 0; }
19956
EOF
19957
-if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19958
+if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19959
rm -rf conftest*
19960
eval "ac_cv_lib_$ac_lib_var=yes"
19961
else
19962
@@ -1940,9 +2554,9 @@ else
19963
fi
19964
19965
;;
19966
-hpux10.*|hpux11.*) #(vi
19967
+hpux10.*) #(vi
19968
echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
19969
-echo "configure:1946: checking for initscr in -lcur_colr" >&5
19970
+echo "configure:2560: checking for initscr in -lcur_colr" >&5
19971
ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
19972
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19973
echo $ac_n "(cached) $ac_c" 1>&6
19974
@@ -1950,7 +2564,7 @@ else
19975
ac_save_LIBS="$LIBS"
19976
LIBS="-lcur_colr $LIBS"
19977
cat > conftest.$ac_ext <<EOF
19978
-#line 1954 "configure"
19979
+#line 2568 "configure"
19980
#include "confdefs.h"
19981
/* Override any gcc2 internal prototype to avoid an error. */
19982
/* We use char because int might match the return type of a gcc2
19983
@@ -1961,7 +2575,7 @@ int main() {
19984
initscr()
19985
; return 0; }
19986
EOF
19987
-if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19988
+if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19989
rm -rf conftest*
19990
eval "ac_cv_lib_$ac_lib_var=yes"
19991
else
19992
@@ -1984,7 +2598,7 @@ else
19993
echo "$ac_t""no" 1>&6
19994
19995
echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
19996
-echo "configure:1988: checking for initscr in -lHcurses" >&5
19997
+echo "configure:2602: checking for initscr in -lHcurses" >&5
19998
ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
19999
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20000
echo $ac_n "(cached) $ac_c" 1>&6
20001
@@ -1992,7 +2606,7 @@ else
20002
ac_save_LIBS="$LIBS"
20003
LIBS="-lHcurses $LIBS"
20004
cat > conftest.$ac_ext <<EOF
20005
-#line 1996 "configure"
20006
+#line 2610 "configure"
20007
#include "confdefs.h"
20008
/* Override any gcc2 internal prototype to avoid an error. */
20009
/* We use char because int might match the return type of a gcc2
20010
@@ -2003,7 +2617,7 @@ int main() {
20011
initscr()
20012
; return 0; }
20013
EOF
20014
-if { (eval echo configure:2007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20015
+if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20016
rm -rf conftest*
20017
eval "ac_cv_lib_$ac_lib_var=yes"
20018
else
20019
@@ -2056,12 +2670,12 @@ if test ".$ac_cv_func_initscr" != .yes ;
20020
# Check for library containing tgoto. Do this before curses library
20021
# because it may be needed to link the test-case for initscr.
20022
echo $ac_n "checking for tgoto""... $ac_c" 1>&6
20023
-echo "configure:2060: checking for tgoto" >&5
20024
+echo "configure:2674: checking for tgoto" >&5
20025
if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
20026
echo $ac_n "(cached) $ac_c" 1>&6
20027
else
20028
cat > conftest.$ac_ext <<EOF
20029
-#line 2065 "configure"
20030
+#line 2679 "configure"
20031
#include "confdefs.h"
20032
/* System header to define __stub macros and hopefully few prototypes,
20033
which can conflict with char tgoto(); below. */
20034
@@ -2084,7 +2698,7 @@ tgoto();
20035
20036
; return 0; }
20037
EOF
20038
-if { (eval echo configure:2088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20039
+if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20040
rm -rf conftest*
20041
eval "ac_cv_func_tgoto=yes"
20042
else
20043
@@ -2105,7 +2719,7 @@ else
20044
for cf_term_lib in $cf_check_list termcap termlib unknown
20045
do
20046
echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
20047
-echo "configure:2109: checking for tgoto in -l$cf_term_lib" >&5
20048
+echo "configure:2723: checking for tgoto in -l$cf_term_lib" >&5
20049
ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
20050
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20051
echo $ac_n "(cached) $ac_c" 1>&6
20052
@@ -2113,7 +2727,7 @@ else
20053
ac_save_LIBS="$LIBS"
20054
LIBS="-l$cf_term_lib $LIBS"
20055
cat > conftest.$ac_ext <<EOF
20056
-#line 2117 "configure"
20057
+#line 2731 "configure"
20058
#include "confdefs.h"
20059
/* Override any gcc2 internal prototype to avoid an error. */
20060
/* We use char because int might match the return type of a gcc2
20061
@@ -2124,7 +2738,7 @@ int main() {
20062
tgoto()
20063
; return 0; }
20064
EOF
20065
-if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20066
+if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20067
rm -rf conftest*
20068
eval "ac_cv_lib_$ac_lib_var=yes"
20069
else
20070
@@ -2154,7 +2768,7 @@ fi
20071
for cf_curs_lib in $cf_check_list xcurses jcurses unknown
20072
do
20073
echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
20074
-echo "configure:2158: checking for initscr in -l$cf_curs_lib" >&5
20075
+echo "configure:2772: checking for initscr in -l$cf_curs_lib" >&5
20076
ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
20077
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20078
echo $ac_n "(cached) $ac_c" 1>&6
20079
@@ -2162,7 +2776,7 @@ else
20080
ac_save_LIBS="$LIBS"
20081
LIBS="-l$cf_curs_lib $LIBS"
20082
cat > conftest.$ac_ext <<EOF
20083
-#line 2166 "configure"
20084
+#line 2780 "configure"
20085
#include "confdefs.h"
20086
/* Override any gcc2 internal prototype to avoid an error. */
20087
/* We use char because int might match the return type of a gcc2
20088
@@ -2173,7 +2787,7 @@ int main() {
20089
initscr()
20090
; return 0; }
20091
EOF
20092
-if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20093
+if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20094
rm -rf conftest*
20095
eval "ac_cv_lib_$ac_lib_var=yes"
20096
else
20097
@@ -2199,16 +2813,16 @@ fi
20098
LIBS="-l$cf_curs_lib $cf_save_LIBS"
20099
if test "$cf_term_lib" = unknown ; then
20100
echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
20101
-echo "configure:2203: checking if we can link with $cf_curs_lib library" >&5
20102
+echo "configure:2817: checking if we can link with $cf_curs_lib library" >&5
20103
cat > conftest.$ac_ext <<EOF
20104
-#line 2205 "configure"
20105
+#line 2819 "configure"
20106
#include "confdefs.h"
20107
#include <${cf_cv_ncurses_header-curses.h}>
20108
int main() {
20109
initscr()
20110
; return 0; }
20111
EOF
20112
-if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20113
+if { (eval echo configure:2826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20114
rm -rf conftest*
20115
cf_result=yes
20116
else
20117
@@ -2224,16 +2838,16 @@ rm -f conftest*
20118
:
20119
elif test "$cf_term_lib" != predefined ; then
20120
echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
20121
-echo "configure:2228: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
20122
+echo "configure:2842: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
20123
cat > conftest.$ac_ext <<EOF
20124
-#line 2230 "configure"
20125
+#line 2844 "configure"
20126
#include "confdefs.h"
20127
#include <${cf_cv_ncurses_header-curses.h}>
20128
int main() {
20129
initscr(); tgoto((char *)0, 0, 0);
20130
; return 0; }
20131
EOF
20132
-if { (eval echo configure:2237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20133
+if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20134
rm -rf conftest*
20135
cf_result=no
20136
else
20137
@@ -2243,14 +2857,14 @@ else
20138
20139
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
20140
cat > conftest.$ac_ext <<EOF
20141
-#line 2247 "configure"
20142
+#line 2861 "configure"
20143
#include "confdefs.h"
20144
#include <${cf_cv_ncurses_header-curses.h}>
20145
int main() {
20146
initscr()
20147
; return 0; }
20148
EOF
20149
-if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20150
+if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20151
rm -rf conftest*
20152
cf_result=yes
20153
else
20154
@@ -2280,7 +2894,7 @@ test "$cf_cv_curses_dir" != "no" && \
20155
CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
20156
20157
echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
20158
-echo "configure:2284: checking for $cf_ncuhdr_root header in include-path" >&5
20159
+echo "configure:2898: checking for $cf_ncuhdr_root header in include-path" >&5
20160
if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
20161
echo $ac_n "(cached) $ac_c" 1>&6
20162
else
20163
@@ -2291,7 +2905,7 @@ else
20164
do
20165
20166
cat > conftest.$ac_ext <<EOF
20167
-#line 2295 "configure"
20168
+#line 2909 "configure"
20169
#include "confdefs.h"
20170
20171
20172
@@ -2312,7 +2926,7 @@ printf("old\n");
20173
20174
; return 0; }
20175
EOF
20176
-if { (eval echo configure:2316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20177
+if { (eval echo configure:2930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20178
rm -rf conftest*
20179
cf_cv_ncurses_h=$cf_header
20180
20181
@@ -2331,11 +2945,14 @@ fi
20182
20183
echo "$ac_t""$cf_cv_ncurses_h" 1>&6
20184
20185
+
20186
+
20187
if test "$cf_cv_ncurses_h" != no ; then
20188
cf_cv_ncurses_header=$cf_cv_ncurses_h
20189
else
20190
+
20191
echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
20192
-echo "configure:2339: checking for $cf_ncuhdr_root include-path" >&5
20193
+echo "configure:2956: checking for $cf_ncuhdr_root include-path" >&5
20194
if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
20195
echo $ac_n "(cached) $ac_c" 1>&6
20196
else
20197
@@ -2430,14 +3047,14 @@ do
20198
cf_save_CPPFLAGS="$CPPFLAGS"
20199
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
20200
cat > conftest.$ac_ext <<EOF
20201
-#line 2434 "configure"
20202
+#line 3051 "configure"
20203
#include "confdefs.h"
20204
#include <stdio.h>
20205
int main() {
20206
printf("Hello")
20207
; return 0; }
20208
EOF
20209
-if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20210
+if { (eval echo configure:3058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20211
:
20212
else
20213
echo "configure: failed program was:" >&5
20214
@@ -2464,7 +3081,7 @@ done
20215
do
20216
20217
cat > conftest.$ac_ext <<EOF
20218
-#line 2468 "configure"
20219
+#line 3085 "configure"
20220
#include "confdefs.h"
20221
20222
20223
@@ -2485,7 +3102,7 @@ printf("old\n");
20224
20225
; return 0; }
20226
EOF
20227
-if { (eval echo configure:2489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20228
+if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20229
rm -rf conftest*
20230
cf_cv_ncurses_h2=$cf_header
20231
20232
@@ -2532,14 +3149,14 @@ do
20233
cf_save_CPPFLAGS="$CPPFLAGS"
20234
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
20235
cat > conftest.$ac_ext <<EOF
20236
-#line 2536 "configure"
20237
+#line 3153 "configure"
20238
#include "confdefs.h"
20239
#include <stdio.h>
20240
int main() {
20241
printf("Hello")
20242
; return 0; }
20243
EOF
20244
-if { (eval echo configure:2543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20245
+if { (eval echo configure:3160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20246
:
20247
else
20248
echo "configure: failed program was:" >&5
20249
@@ -2563,10 +3180,7 @@ done
20250
20251
fi
20252
20253
-cat >> confdefs.h <<\EOF
20254
-#define NCURSES 1
20255
-EOF
20256
-
20257
+# Set definitions to allow ifdef'ing for ncurses.h
20258
20259
case $cf_cv_ncurses_header in # (vi
20260
*ncurses.h)
20261
@@ -2593,16 +3207,99 @@ EOF
20262
esac
20263
20264
20265
-echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
20266
-echo "configure:2598: checking for ncurses version" >&5
20267
-if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
20268
+
20269
+echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
20270
+echo "configure:3213: checking for terminfo header" >&5
20271
+if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
20272
echo $ac_n "(cached) $ac_c" 1>&6
20273
else
20274
20275
- cf_cv_ncurses_version=no
20276
- cf_tempfile=out$$
20277
- rm -f $cf_tempfile
20278
- if test "$cross_compiling" = yes; then
20279
+case ${cf_cv_ncurses_header} in #(vi
20280
+*/ncurses.h|*/ncursesw.h) #(vi
20281
+ cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
20282
+ ;;
20283
+*)
20284
+ cf_term_header=term.h
20285
+ ;;
20286
+esac
20287
+
20288
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
20289
+do
20290
+cat > conftest.$ac_ext <<EOF
20291
+#line 3230 "configure"
20292
+#include "confdefs.h"
20293
+#include <stdio.h>
20294
+#include <${cf_cv_ncurses_header-curses.h}>
20295
+#include <$cf_test>
20296
+
20297
+int main() {
20298
+int x = auto_left_margin
20299
+; return 0; }
20300
+EOF
20301
+if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20302
+ rm -rf conftest*
20303
+
20304
+ cf_cv_term_header="$cf_test"
20305
+else
20306
+ echo "configure: failed program was:" >&5
20307
+ cat conftest.$ac_ext >&5
20308
+ rm -rf conftest*
20309
+
20310
+ cf_cv_term_header=unknown
20311
+
20312
+fi
20313
+rm -f conftest*
20314
+ test "$cf_cv_term_header" != unknown && break
20315
+done
20316
+
20317
+fi
20318
+
20319
+echo "$ac_t""$cf_cv_term_header" 1>&6
20320
+
20321
+# Set definitions to allow ifdef'ing to accommodate subdirectories
20322
+
20323
+case $cf_cv_term_header in # (vi
20324
+*term.h)
20325
+ cat >> confdefs.h <<\EOF
20326
+#define HAVE_TERM_H 1
20327
+EOF
20328
+
20329
+ ;;
20330
+esac
20331
+
20332
+case $cf_cv_term_header in # (vi
20333
+ncurses/term.h) #(vi
20334
+ cat >> confdefs.h <<\EOF
20335
+#define HAVE_NCURSES_TERM_H 1
20336
+EOF
20337
+
20338
+ ;;
20339
+ncursesw/term.h)
20340
+ cat >> confdefs.h <<\EOF
20341
+#define HAVE_NCURSESW_TERM_H 1
20342
+EOF
20343
+
20344
+ ;;
20345
+esac
20346
+
20347
+
20348
+# some applications need this, but should check for NCURSES_VERSION
20349
+cat >> confdefs.h <<\EOF
20350
+#define NCURSES 1
20351
+EOF
20352
+
20353
+
20354
+
20355
+echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
20356
+echo "configure:3295: checking for ncurses version" >&5
20357
+if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
20358
+ echo $ac_n "(cached) $ac_c" 1>&6
20359
+else
20360
+
20361
+ cf_cv_ncurses_version=no
20362
+ cf_tempfile=out$$
20363
+ rm -f $cf_tempfile
20364
+ if test "$cross_compiling" = yes; then
20365
20366
20367
# This will not work if the preprocessor splits the line after the
20368
@@ -2620,7 +3317,7 @@ Autoconf "old"
20369
#endif
20370
EOF
20371
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
20372
- { (eval echo configure:2624: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
20373
+ { (eval echo configure:3321: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
20374
if test -f conftest.out ; then
20375
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
20376
test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
20377
@@ -2629,7 +3326,7 @@ EOF
20378
20379
else
20380
cat > conftest.$ac_ext <<EOF
20381
-#line 2633 "configure"
20382
+#line 3330 "configure"
20383
#include "confdefs.h"
20384
20385
#include <${cf_cv_ncurses_header-curses.h}>
20386
@@ -2653,7 +3350,7 @@ int main()
20387
exit(0);
20388
}
20389
EOF
20390
-if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
20391
+if { (eval echo configure:3354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
20392
then
20393
20394
cf_cv_ncurses_version=`cat $cf_tempfile`
20395
@@ -2684,7 +3381,7 @@ cf_nculib_root=ncurses
20396
cf_ncurses_LIBS=""
20397
cf_ncurses_SAVE="$LIBS"
20398
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
20399
-echo "configure:2688: checking for Gpm_Open in -lgpm" >&5
20400
+echo "configure:3385: checking for Gpm_Open in -lgpm" >&5
20401
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
20402
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20403
echo $ac_n "(cached) $ac_c" 1>&6
20404
@@ -2692,7 +3389,7 @@ else
20405
ac_save_LIBS="$LIBS"
20406
LIBS="-lgpm $LIBS"
20407
cat > conftest.$ac_ext <<EOF
20408
-#line 2696 "configure"
20409
+#line 3393 "configure"
20410
#include "confdefs.h"
20411
/* Override any gcc2 internal prototype to avoid an error. */
20412
/* We use char because int might match the return type of a gcc2
20413
@@ -2703,7 +3400,7 @@ int main() {
20414
Gpm_Open()
20415
; return 0; }
20416
EOF
20417
-if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20418
+if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20419
rm -rf conftest*
20420
eval "ac_cv_lib_$ac_lib_var=yes"
20421
else
20422
@@ -2719,7 +3416,7 @@ fi
20423
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20424
echo "$ac_t""yes" 1>&6
20425
echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
20426
-echo "configure:2723: checking for initscr in -lgpm" >&5
20427
+echo "configure:3420: checking for initscr in -lgpm" >&5
20428
ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
20429
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20430
echo $ac_n "(cached) $ac_c" 1>&6
20431
@@ -2727,7 +3424,7 @@ else
20432
ac_save_LIBS="$LIBS"
20433
LIBS="-lgpm $LIBS"
20434
cat > conftest.$ac_ext <<EOF
20435
-#line 2731 "configure"
20436
+#line 3428 "configure"
20437
#include "confdefs.h"
20438
/* Override any gcc2 internal prototype to avoid an error. */
20439
/* We use char because int might match the return type of a gcc2
20440
@@ -2738,7 +3435,7 @@ int main() {
20441
initscr()
20442
; return 0; }
20443
EOF
20444
-if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20445
+if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20446
rm -rf conftest*
20447
eval "ac_cv_lib_$ac_lib_var=yes"
20448
else
20449
@@ -2770,7 +3467,7 @@ freebsd*)
20450
# version of ncurses (but it should do no harm, since it's static).
20451
if test "$cf_nculib_root" = ncurses ; then
20452
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
20453
-echo "configure:2774: checking for tgoto in -lmytinfo" >&5
20454
+echo "configure:3471: checking for tgoto in -lmytinfo" >&5
20455
ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
20456
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20457
echo $ac_n "(cached) $ac_c" 1>&6
20458
@@ -2778,7 +3475,7 @@ else
20459
ac_save_LIBS="$LIBS"
20460
LIBS="-lmytinfo $LIBS"
20461
cat > conftest.$ac_ext <<EOF
20462
-#line 2782 "configure"
20463
+#line 3479 "configure"
20464
#include "confdefs.h"
20465
/* Override any gcc2 internal prototype to avoid an error. */
20466
/* We use char because int might match the return type of a gcc2
20467
@@ -2789,7 +3486,7 @@ int main() {
20468
tgoto()
20469
; return 0; }
20470
EOF
20471
-if { (eval echo configure:2793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20472
+if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20473
rm -rf conftest*
20474
eval "ac_cv_lib_$ac_lib_var=yes"
20475
else
20476
@@ -2823,12 +3520,12 @@ else
20477
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
20478
cf_libdir=""
20479
echo $ac_n "checking for initscr""... $ac_c" 1>&6
20480
-echo "configure:2827: checking for initscr" >&5
20481
+echo "configure:3524: checking for initscr" >&5
20482
if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
20483
echo $ac_n "(cached) $ac_c" 1>&6
20484
else
20485
cat > conftest.$ac_ext <<EOF
20486
-#line 2832 "configure"
20487
+#line 3529 "configure"
20488
#include "confdefs.h"
20489
/* System header to define __stub macros and hopefully few prototypes,
20490
which can conflict with char initscr(); below. */
20491
@@ -2851,7 +3548,7 @@ initscr();
20492
20493
; return 0; }
20494
EOF
20495
-if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20496
+if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20497
rm -rf conftest*
20498
eval "ac_cv_func_initscr=yes"
20499
else
20500
@@ -2871,17 +3568,17 @@ else
20501
20502
cf_save_LIBS="$LIBS"
20503
echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
20504
-echo "configure:2875: checking for initscr in -l$cf_nculib_root" >&5
20505
+echo "configure:3572: checking for initscr in -l$cf_nculib_root" >&5
20506
LIBS="-l$cf_nculib_root $LIBS"
20507
cat > conftest.$ac_ext <<EOF
20508
-#line 2878 "configure"
20509
+#line 3575 "configure"
20510
#include "confdefs.h"
20511
#include <${cf_cv_ncurses_header-curses.h}>
20512
int main() {
20513
initscr()
20514
; return 0; }
20515
EOF
20516
-if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20517
+if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20518
rm -rf conftest*
20519
echo "$ac_t""yes" 1>&6
20520
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
20521
@@ -2950,17 +3647,17 @@ test -d /usr && {
20522
for cf_libdir in $cf_search
20523
do
20524
echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
20525
-echo "configure:2954: checking for -l$cf_nculib_root in $cf_libdir" >&5
20526
+echo "configure:3651: checking for -l$cf_nculib_root in $cf_libdir" >&5
20527
LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
20528
cat > conftest.$ac_ext <<EOF
20529
-#line 2957 "configure"
20530
+#line 3654 "configure"
20531
#include "confdefs.h"
20532
#include <${cf_cv_ncurses_header-curses.h}>
20533
int main() {
20534
initscr()
20535
; return 0; }
20536
EOF
20537
-if { (eval echo configure:2964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20538
+if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20539
rm -rf conftest*
20540
echo "$ac_t""yes" 1>&6
20541
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
20542
@@ -2991,7 +3688,7 @@ fi
20543
20544
if test -n "$cf_ncurses_LIBS" ; then
20545
echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
20546
-echo "configure:2995: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
20547
+echo "configure:3692: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
20548
cf_ncurses_SAVE="$LIBS"
20549
for p in $cf_ncurses_LIBS ; do
20550
q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
20551
@@ -3000,14 +3697,14 @@ echo "configure:2995: checking if we can
20552
fi
20553
done
20554
cat > conftest.$ac_ext <<EOF
20555
-#line 3004 "configure"
20556
+#line 3701 "configure"
20557
#include "confdefs.h"
20558
#include <${cf_cv_ncurses_header-curses.h}>
20559
int main() {
20560
initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
20561
; return 0; }
20562
EOF
20563
-if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20564
+if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20565
rm -rf conftest*
20566
echo "$ac_t""yes" 1>&6
20567
else
20568
@@ -3028,20 +3725,19 @@ cat >> confdefs.h <<EOF
20569
EOF
20570
20571
20572
- LIB_NAME=ncurses
20573
;;
20574
ncursesw)
20575
cf_cv_libtype=w
20576
20577
echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6
20578
-echo "configure:3038: checking for multibyte character support" >&5
20579
+echo "configure:3734: checking for multibyte character support" >&5
20580
if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then
20581
echo $ac_n "(cached) $ac_c" 1>&6
20582
else
20583
20584
cf_save_LIBS="$LIBS"
20585
cat > conftest.$ac_ext <<EOF
20586
-#line 3045 "configure"
20587
+#line 3741 "configure"
20588
#include "confdefs.h"
20589
20590
#include <stdlib.h>
20591
@@ -3049,7 +3745,7 @@ int main() {
20592
putwc(0,0);
20593
; return 0; }
20594
EOF
20595
-if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20596
+if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20597
rm -rf conftest*
20598
cf_cv_utf8_lib=yes
20599
else
20600
@@ -3058,7 +3754,7 @@ else
20601
rm -rf conftest*
20602
LIBS="-lutf8 $LIBS"
20603
cat > conftest.$ac_ext <<EOF
20604
-#line 3062 "configure"
20605
+#line 3758 "configure"
20606
#include "confdefs.h"
20607
20608
#include <libutf8.h>
20609
@@ -3066,7 +3762,7 @@ int main() {
20610
putwc(0,0);
20611
; return 0; }
20612
EOF
20613
-if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20614
+if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20615
rm -rf conftest*
20616
cf_cv_utf8_lib=add-on
20617
else
20618
@@ -3103,7 +3799,7 @@ test "$cf_cv_curses_dir" != "no" && \
20619
CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
20620
20621
echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
20622
-echo "configure:3107: checking for $cf_ncuhdr_root header in include-path" >&5
20623
+echo "configure:3803: checking for $cf_ncuhdr_root header in include-path" >&5
20624
if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
20625
echo $ac_n "(cached) $ac_c" 1>&6
20626
else
20627
@@ -3114,7 +3810,7 @@ else
20628
do
20629
20630
cat > conftest.$ac_ext <<EOF
20631
-#line 3118 "configure"
20632
+#line 3814 "configure"
20633
#include "confdefs.h"
20634
20635
20636
@@ -3143,7 +3839,7 @@ printf("old\n");
20637
20638
; return 0; }
20639
EOF
20640
-if { (eval echo configure:3147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20641
+if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20642
rm -rf conftest*
20643
cf_cv_ncurses_h=$cf_header
20644
20645
@@ -3162,11 +3858,14 @@ fi
20646
20647
echo "$ac_t""$cf_cv_ncurses_h" 1>&6
20648
20649
+
20650
+
20651
if test "$cf_cv_ncurses_h" != no ; then
20652
cf_cv_ncurses_header=$cf_cv_ncurses_h
20653
else
20654
+
20655
echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
20656
-echo "configure:3170: checking for $cf_ncuhdr_root include-path" >&5
20657
+echo "configure:3869: checking for $cf_ncuhdr_root include-path" >&5
20658
if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
20659
echo $ac_n "(cached) $ac_c" 1>&6
20660
else
20661
@@ -3261,14 +3960,14 @@ do
20662
cf_save_CPPFLAGS="$CPPFLAGS"
20663
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
20664
cat > conftest.$ac_ext <<EOF
20665
-#line 3265 "configure"
20666
+#line 3964 "configure"
20667
#include "confdefs.h"
20668
#include <stdio.h>
20669
int main() {
20670
printf("Hello")
20671
; return 0; }
20672
EOF
20673
-if { (eval echo configure:3272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20674
+if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20675
:
20676
else
20677
echo "configure: failed program was:" >&5
20678
@@ -3295,23 +3994,15 @@ done
20679
do
20680
20681
cat > conftest.$ac_ext <<EOF
20682
-#line 3299 "configure"
20683
+#line 3998 "configure"
20684
#include "confdefs.h"
20685
20686
20687
-#define _XOPEN_SOURCE_EXTENDED
20688
-#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */
20689
-#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */
20690
-
20691
#include <$cf_header>
20692
int main() {
20693
20694
#ifdef NCURSES_VERSION
20695
20696
-#ifndef WACS_BSSB
20697
- make an error
20698
-#endif
20699
-
20700
printf("%s\n", NCURSES_VERSION);
20701
#else
20702
#ifdef __NCURSES_H
20703
@@ -3324,7 +4015,7 @@ printf("old\n");
20704
20705
; return 0; }
20706
EOF
20707
-if { (eval echo configure:3328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20708
+if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20709
rm -rf conftest*
20710
cf_cv_ncurses_h2=$cf_header
20711
20712
@@ -3371,14 +4062,14 @@ do
20713
cf_save_CPPFLAGS="$CPPFLAGS"
20714
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
20715
cat > conftest.$ac_ext <<EOF
20716
-#line 3375 "configure"
20717
+#line 4066 "configure"
20718
#include "confdefs.h"
20719
#include <stdio.h>
20720
int main() {
20721
printf("Hello")
20722
; return 0; }
20723
EOF
20724
-if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20725
+if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20726
:
20727
else
20728
echo "configure: failed program was:" >&5
20729
@@ -3402,10 +4093,7 @@ done
20730
20731
fi
20732
20733
-cat >> confdefs.h <<\EOF
20734
-#define NCURSES 1
20735
-EOF
20736
-
20737
+# Set definitions to allow ifdef'ing for ncurses.h
20738
20739
case $cf_cv_ncurses_header in # (vi
20740
*ncurses.h)
20741
@@ -3432,8 +4120,91 @@ EOF
20742
esac
20743
20744
20745
+
20746
+echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
20747
+echo "configure:4126: checking for terminfo header" >&5
20748
+if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
20749
+ echo $ac_n "(cached) $ac_c" 1>&6
20750
+else
20751
+
20752
+case ${cf_cv_ncurses_header} in #(vi
20753
+*/ncurses.h|*/ncursesw.h) #(vi
20754
+ cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
20755
+ ;;
20756
+*)
20757
+ cf_term_header=term.h
20758
+ ;;
20759
+esac
20760
+
20761
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
20762
+do
20763
+cat > conftest.$ac_ext <<EOF
20764
+#line 4143 "configure"
20765
+#include "confdefs.h"
20766
+#include <stdio.h>
20767
+#include <${cf_cv_ncurses_header-curses.h}>
20768
+#include <$cf_test>
20769
+
20770
+int main() {
20771
+int x = auto_left_margin
20772
+; return 0; }
20773
+EOF
20774
+if { (eval echo configure:4153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
20775
+ rm -rf conftest*
20776
+
20777
+ cf_cv_term_header="$cf_test"
20778
+else
20779
+ echo "configure: failed program was:" >&5
20780
+ cat conftest.$ac_ext >&5
20781
+ rm -rf conftest*
20782
+
20783
+ cf_cv_term_header=unknown
20784
+
20785
+fi
20786
+rm -f conftest*
20787
+ test "$cf_cv_term_header" != unknown && break
20788
+done
20789
+
20790
+fi
20791
+
20792
+echo "$ac_t""$cf_cv_term_header" 1>&6
20793
+
20794
+# Set definitions to allow ifdef'ing to accommodate subdirectories
20795
+
20796
+case $cf_cv_term_header in # (vi
20797
+*term.h)
20798
+ cat >> confdefs.h <<\EOF
20799
+#define HAVE_TERM_H 1
20800
+EOF
20801
+
20802
+ ;;
20803
+esac
20804
+
20805
+case $cf_cv_term_header in # (vi
20806
+ncurses/term.h) #(vi
20807
+ cat >> confdefs.h <<\EOF
20808
+#define HAVE_NCURSES_TERM_H 1
20809
+EOF
20810
+
20811
+ ;;
20812
+ncursesw/term.h)
20813
+ cat >> confdefs.h <<\EOF
20814
+#define HAVE_NCURSESW_TERM_H 1
20815
+EOF
20816
+
20817
+ ;;
20818
+esac
20819
+
20820
+
20821
+# some applications need this, but should check for NCURSES_VERSION
20822
+cat >> confdefs.h <<\EOF
20823
+#define NCURSES 1
20824
+EOF
20825
+
20826
+
20827
+
20828
echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
20829
-echo "configure:3437: checking for ncurses version" >&5
20830
+echo "configure:4208: checking for ncurses version" >&5
20831
if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
20832
echo $ac_n "(cached) $ac_c" 1>&6
20833
else
20834
@@ -3459,7 +4230,7 @@ Autoconf "old"
20835
#endif
20836
EOF
20837
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
20838
- { (eval echo configure:3463: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
20839
+ { (eval echo configure:4234: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
20840
if test -f conftest.out ; then
20841
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
20842
test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
20843
@@ -3468,7 +4239,7 @@ EOF
20844
20845
else
20846
cat > conftest.$ac_ext <<EOF
20847
-#line 3472 "configure"
20848
+#line 4243 "configure"
20849
#include "confdefs.h"
20850
20851
#include <${cf_cv_ncurses_header-curses.h}>
20852
@@ -3492,7 +4263,7 @@ int main()
20853
exit(0);
20854
}
20855
EOF
20856
-if { (eval echo configure:3496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
20857
+if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
20858
then
20859
20860
cf_cv_ncurses_version=`cat $cf_tempfile`
20861
@@ -3523,7 +4294,7 @@ cf_nculib_root=ncursesw
20862
cf_ncurses_LIBS=""
20863
cf_ncurses_SAVE="$LIBS"
20864
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
20865
-echo "configure:3527: checking for Gpm_Open in -lgpm" >&5
20866
+echo "configure:4298: checking for Gpm_Open in -lgpm" >&5
20867
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
20868
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20869
echo $ac_n "(cached) $ac_c" 1>&6
20870
@@ -3531,7 +4302,7 @@ else
20871
ac_save_LIBS="$LIBS"
20872
LIBS="-lgpm $LIBS"
20873
cat > conftest.$ac_ext <<EOF
20874
-#line 3535 "configure"
20875
+#line 4306 "configure"
20876
#include "confdefs.h"
20877
/* Override any gcc2 internal prototype to avoid an error. */
20878
/* We use char because int might match the return type of a gcc2
20879
@@ -3542,7 +4313,7 @@ int main() {
20880
Gpm_Open()
20881
; return 0; }
20882
EOF
20883
-if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20884
+if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20885
rm -rf conftest*
20886
eval "ac_cv_lib_$ac_lib_var=yes"
20887
else
20888
@@ -3558,7 +4329,7 @@ fi
20889
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20890
echo "$ac_t""yes" 1>&6
20891
echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
20892
-echo "configure:3562: checking for initscr in -lgpm" >&5
20893
+echo "configure:4333: checking for initscr in -lgpm" >&5
20894
ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
20895
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20896
echo $ac_n "(cached) $ac_c" 1>&6
20897
@@ -3566,7 +4337,7 @@ else
20898
ac_save_LIBS="$LIBS"
20899
LIBS="-lgpm $LIBS"
20900
cat > conftest.$ac_ext <<EOF
20901
-#line 3570 "configure"
20902
+#line 4341 "configure"
20903
#include "confdefs.h"
20904
/* Override any gcc2 internal prototype to avoid an error. */
20905
/* We use char because int might match the return type of a gcc2
20906
@@ -3577,7 +4348,7 @@ int main() {
20907
initscr()
20908
; return 0; }
20909
EOF
20910
-if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20911
+if { (eval echo configure:4352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20912
rm -rf conftest*
20913
eval "ac_cv_lib_$ac_lib_var=yes"
20914
else
20915
@@ -3609,7 +4380,7 @@ freebsd*)
20916
# version of ncurses (but it should do no harm, since it's static).
20917
if test "$cf_nculib_root" = ncurses ; then
20918
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
20919
-echo "configure:3613: checking for tgoto in -lmytinfo" >&5
20920
+echo "configure:4384: checking for tgoto in -lmytinfo" >&5
20921
ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
20922
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20923
echo $ac_n "(cached) $ac_c" 1>&6
20924
@@ -3617,7 +4388,7 @@ else
20925
ac_save_LIBS="$LIBS"
20926
LIBS="-lmytinfo $LIBS"
20927
cat > conftest.$ac_ext <<EOF
20928
-#line 3621 "configure"
20929
+#line 4392 "configure"
20930
#include "confdefs.h"
20931
/* Override any gcc2 internal prototype to avoid an error. */
20932
/* We use char because int might match the return type of a gcc2
20933
@@ -3628,7 +4399,7 @@ int main() {
20934
tgoto()
20935
; return 0; }
20936
EOF
20937
-if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20938
+if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20939
rm -rf conftest*
20940
eval "ac_cv_lib_$ac_lib_var=yes"
20941
else
20942
@@ -3662,12 +4433,12 @@ else
20943
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
20944
cf_libdir=""
20945
echo $ac_n "checking for initscr""... $ac_c" 1>&6
20946
-echo "configure:3666: checking for initscr" >&5
20947
+echo "configure:4437: checking for initscr" >&5
20948
if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
20949
echo $ac_n "(cached) $ac_c" 1>&6
20950
else
20951
cat > conftest.$ac_ext <<EOF
20952
-#line 3671 "configure"
20953
+#line 4442 "configure"
20954
#include "confdefs.h"
20955
/* System header to define __stub macros and hopefully few prototypes,
20956
which can conflict with char initscr(); below. */
20957
@@ -3690,7 +4461,7 @@ initscr();
20958
20959
; return 0; }
20960
EOF
20961
-if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20962
+if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20963
rm -rf conftest*
20964
eval "ac_cv_func_initscr=yes"
20965
else
20966
@@ -3710,17 +4481,17 @@ else
20967
20968
cf_save_LIBS="$LIBS"
20969
echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
20970
-echo "configure:3714: checking for initscr in -l$cf_nculib_root" >&5
20971
+echo "configure:4485: checking for initscr in -l$cf_nculib_root" >&5
20972
LIBS="-l$cf_nculib_root $LIBS"
20973
cat > conftest.$ac_ext <<EOF
20974
-#line 3717 "configure"
20975
+#line 4488 "configure"
20976
#include "confdefs.h"
20977
#include <${cf_cv_ncurses_header-curses.h}>
20978
int main() {
20979
initscr()
20980
; return 0; }
20981
EOF
20982
-if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20983
+if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20984
rm -rf conftest*
20985
echo "$ac_t""yes" 1>&6
20986
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
20987
@@ -3789,17 +4560,17 @@ test -d /usr && {
20988
for cf_libdir in $cf_search
20989
do
20990
echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
20991
-echo "configure:3793: checking for -l$cf_nculib_root in $cf_libdir" >&5
20992
+echo "configure:4564: checking for -l$cf_nculib_root in $cf_libdir" >&5
20993
LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
20994
cat > conftest.$ac_ext <<EOF
20995
-#line 3796 "configure"
20996
+#line 4567 "configure"
20997
#include "confdefs.h"
20998
#include <${cf_cv_ncurses_header-curses.h}>
20999
int main() {
21000
initscr()
21001
; return 0; }
21002
EOF
21003
-if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21004
+if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21005
rm -rf conftest*
21006
echo "$ac_t""yes" 1>&6
21007
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
21008
@@ -3830,7 +4601,7 @@ fi
21009
21010
if test -n "$cf_ncurses_LIBS" ; then
21011
echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
21012
-echo "configure:3834: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
21013
+echo "configure:4605: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
21014
cf_ncurses_SAVE="$LIBS"
21015
for p in $cf_ncurses_LIBS ; do
21016
q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
21017
@@ -3839,14 +4610,14 @@ echo "configure:3834: checking if we can
21018
fi
21019
done
21020
cat > conftest.$ac_ext <<EOF
21021
-#line 3843 "configure"
21022
+#line 4614 "configure"
21023
#include "confdefs.h"
21024
#include <${cf_cv_ncurses_header-curses.h}>
21025
int main() {
21026
initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
21027
; return 0; }
21028
EOF
21029
-if { (eval echo configure:3850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21030
+if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21031
rm -rf conftest*
21032
echo "$ac_t""yes" 1>&6
21033
else
21034
@@ -3867,33 +4638,113 @@ cat >> confdefs.h <<EOF
21035
EOF
21036
21037
21038
- LIB_NAME=ncursesw
21039
;;
21040
-esac
21041
+pdcurses) #(vi
21042
+ if test "$no_x" = yes; then
21043
+ # Not all programs may use this symbol, but it does not hurt to define it.
21044
+ cat >> confdefs.h <<\EOF
21045
+#define X_DISPLAY_MISSING 1
21046
+EOF
21047
21048
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
21049
+else
21050
+ if test -n "$x_includes"; then
21051
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
21052
+ fi
21053
21054
+ # It would also be nice to do this for all -L options, not just this one.
21055
+ if test -n "$x_libraries"; then
21056
+ X_LIBS="$X_LIBS -L$x_libraries"
21057
+ # For Solaris; some versions of Sun CC require a space after -R and
21058
+ # others require no space. Words are not sufficient . . . .
21059
+ case "`(uname -sr) 2>/dev/null`" in
21060
+ "SunOS 5"*)
21061
+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
21062
+echo "configure:4664: checking whether -R must be followed by a space" >&5
21063
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
21064
+ cat > conftest.$ac_ext <<EOF
21065
+#line 4667 "configure"
21066
+#include "confdefs.h"
21067
21068
-echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6
21069
-echo "configure:3878: checking for new_panel in -lpanel$cf_cv_libtype" >&5
21070
-ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'`
21071
+int main() {
21072
+
21073
+; return 0; }
21074
+EOF
21075
+if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21076
+ rm -rf conftest*
21077
+ ac_R_nospace=yes
21078
+else
21079
+ echo "configure: failed program was:" >&5
21080
+ cat conftest.$ac_ext >&5
21081
+ rm -rf conftest*
21082
+ ac_R_nospace=no
21083
+fi
21084
+rm -f conftest*
21085
+ if test $ac_R_nospace = yes; then
21086
+ echo "$ac_t""no" 1>&6
21087
+ X_LIBS="$X_LIBS -R$x_libraries"
21088
+ else
21089
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
21090
+ cat > conftest.$ac_ext <<EOF
21091
+#line 4690 "configure"
21092
+#include "confdefs.h"
21093
+
21094
+int main() {
21095
+
21096
+; return 0; }
21097
+EOF
21098
+if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21099
+ rm -rf conftest*
21100
+ ac_R_space=yes
21101
+else
21102
+ echo "configure: failed program was:" >&5
21103
+ cat conftest.$ac_ext >&5
21104
+ rm -rf conftest*
21105
+ ac_R_space=no
21106
+fi
21107
+rm -f conftest*
21108
+ if test $ac_R_space = yes; then
21109
+ echo "$ac_t""yes" 1>&6
21110
+ X_LIBS="$X_LIBS -R $x_libraries"
21111
+ else
21112
+ echo "$ac_t""neither works" 1>&6
21113
+ fi
21114
+ fi
21115
+ LIBS="$ac_xsave_LIBS"
21116
+ esac
21117
+ fi
21118
+
21119
+ # Check for system-dependent libraries X programs must link with.
21120
+ # Do this before checking for the system-independent R6 libraries
21121
+ # (-lICE), since we may need -lsocket or whatever for X linking.
21122
+
21123
+ if test "$ISC" = yes; then
21124
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
21125
+ else
21126
+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
21127
+ # libraries were built with DECnet support. And karl@cs.umb.edu says
21128
+ # the Alpha needs dnet_stub (dnet does not exist).
21129
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
21130
+echo "configure:4729: checking for dnet_ntoa in -ldnet" >&5
21131
+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
21132
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21133
echo $ac_n "(cached) $ac_c" 1>&6
21134
else
21135
ac_save_LIBS="$LIBS"
21136
-LIBS="-lpanel$cf_cv_libtype $LIBS"
21137
+LIBS="-ldnet $LIBS"
21138
cat > conftest.$ac_ext <<EOF
21139
-#line 3886 "configure"
21140
+#line 4737 "configure"
21141
#include "confdefs.h"
21142
/* Override any gcc2 internal prototype to avoid an error. */
21143
/* We use char because int might match the return type of a gcc2
21144
builtin and then its argument prototype would still apply. */
21145
-char new_panel();
21146
+char dnet_ntoa();
21147
21148
int main() {
21149
-new_panel()
21150
+dnet_ntoa()
21151
; return 0; }
21152
EOF
21153
-if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21154
+if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21155
rm -rf conftest*
21156
eval "ac_cv_lib_$ac_lib_var=yes"
21157
else
21158
@@ -3908,39 +4759,33 @@ LIBS="$ac_save_LIBS"
21159
fi
21160
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21161
echo "$ac_t""yes" 1>&6
21162
- ac_tr_lib=HAVE_LIB`echo panel$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
21163
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
21164
- cat >> confdefs.h <<EOF
21165
-#define $ac_tr_lib 1
21166
-EOF
21167
-
21168
- LIBS="-lpanel$cf_cv_libtype $LIBS"
21169
-
21170
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
21171
else
21172
echo "$ac_t""no" 1>&6
21173
fi
21174
21175
-echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6
21176
-echo "configure:3925: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
21177
-ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'`
21178
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
21179
+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
21180
+echo "configure:4770: checking for dnet_ntoa in -ldnet_stub" >&5
21181
+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
21182
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21183
echo $ac_n "(cached) $ac_c" 1>&6
21184
else
21185
ac_save_LIBS="$LIBS"
21186
-LIBS="-lmenu$cf_cv_libtype $LIBS"
21187
+LIBS="-ldnet_stub $LIBS"
21188
cat > conftest.$ac_ext <<EOF
21189
-#line 3933 "configure"
21190
+#line 4778 "configure"
21191
#include "confdefs.h"
21192
/* Override any gcc2 internal prototype to avoid an error. */
21193
/* We use char because int might match the return type of a gcc2
21194
builtin and then its argument prototype would still apply. */
21195
-char menu_driver();
21196
+char dnet_ntoa();
21197
21198
int main() {
21199
-menu_driver()
21200
+dnet_ntoa()
21201
; return 0; }
21202
EOF
21203
-if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21204
+if { (eval echo configure:4789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21205
rm -rf conftest*
21206
eval "ac_cv_lib_$ac_lib_var=yes"
21207
else
21208
@@ -3955,39 +4800,89 @@ LIBS="$ac_save_LIBS"
21209
fi
21210
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21211
echo "$ac_t""yes" 1>&6
21212
- ac_tr_lib=HAVE_LIB`echo menu$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
21213
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
21214
- cat >> confdefs.h <<EOF
21215
-#define $ac_tr_lib 1
21216
-EOF
21217
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
21218
+else
21219
+ echo "$ac_t""no" 1>&6
21220
+fi
21221
21222
- LIBS="-lmenu$cf_cv_libtype $LIBS"
21223
+ fi
21224
+
21225
+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
21226
+ # to get the SysV transport functions.
21227
+ # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
21228
+ # needs -lnsl.
21229
+ # The nsl library prevents programs from opening the X display
21230
+ # on Irix 5.2, according to dickey@clark.net.
21231
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
21232
+echo "configure:4818: checking for gethostbyname" >&5
21233
+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
21234
+ echo $ac_n "(cached) $ac_c" 1>&6
21235
+else
21236
+ cat > conftest.$ac_ext <<EOF
21237
+#line 4823 "configure"
21238
+#include "confdefs.h"
21239
+/* System header to define __stub macros and hopefully few prototypes,
21240
+ which can conflict with char gethostbyname(); below. */
21241
+#include <assert.h>
21242
+/* Override any gcc2 internal prototype to avoid an error. */
21243
+/* We use char because int might match the return type of a gcc2
21244
+ builtin and then its argument prototype would still apply. */
21245
+char gethostbyname();
21246
+
21247
+int main() {
21248
+
21249
+/* The GNU C library defines this for functions which it implements
21250
+ to always fail with ENOSYS. Some functions are actually named
21251
+ something starting with __ and the normal name is an alias. */
21252
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
21253
+choke me
21254
+#else
21255
+gethostbyname();
21256
+#endif
21257
+
21258
+; return 0; }
21259
+EOF
21260
+if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21261
+ rm -rf conftest*
21262
+ eval "ac_cv_func_gethostbyname=yes"
21263
+else
21264
+ echo "configure: failed program was:" >&5
21265
+ cat conftest.$ac_ext >&5
21266
+ rm -rf conftest*
21267
+ eval "ac_cv_func_gethostbyname=no"
21268
+fi
21269
+rm -f conftest*
21270
+fi
21271
21272
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
21273
+ echo "$ac_t""yes" 1>&6
21274
+ :
21275
else
21276
echo "$ac_t""no" 1>&6
21277
fi
21278
21279
-echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6
21280
-echo "configure:3972: checking for form_driver in -lform$cf_cv_libtype" >&5
21281
-ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'`
21282
+ if test $ac_cv_func_gethostbyname = no; then
21283
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
21284
+echo "configure:4867: checking for gethostbyname in -lnsl" >&5
21285
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
21286
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21287
echo $ac_n "(cached) $ac_c" 1>&6
21288
else
21289
ac_save_LIBS="$LIBS"
21290
-LIBS="-lform$cf_cv_libtype $LIBS"
21291
+LIBS="-lnsl $LIBS"
21292
cat > conftest.$ac_ext <<EOF
21293
-#line 3980 "configure"
21294
+#line 4875 "configure"
21295
#include "confdefs.h"
21296
/* Override any gcc2 internal prototype to avoid an error. */
21297
/* We use char because int might match the return type of a gcc2
21298
builtin and then its argument prototype would still apply. */
21299
-char form_driver();
21300
+char gethostbyname();
21301
21302
int main() {
21303
-form_driver()
21304
+gethostbyname()
21305
; return 0; }
21306
EOF
21307
-if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21308
+if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21309
rm -rf conftest*
21310
eval "ac_cv_lib_$ac_lib_var=yes"
21311
else
21312
@@ -4002,26 +4897,1289 @@ LIBS="$ac_save_LIBS"
21313
fi
21314
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21315
echo "$ac_t""yes" 1>&6
21316
- ac_tr_lib=HAVE_LIB`echo form$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
21317
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
21318
- cat >> confdefs.h <<EOF
21319
-#define $ac_tr_lib 1
21320
-EOF
21321
-
21322
- LIBS="-lform$cf_cv_libtype $LIBS"
21323
-
21324
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
21325
else
21326
echo "$ac_t""no" 1>&6
21327
fi
21328
21329
+ fi
21330
+
21331
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
21332
+ # socket/setsockopt and other routines are undefined under SCO ODT
21333
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
21334
+ # on later versions), says simon@lia.di.epfl.ch: it contains
21335
+ # gethostby* variants that don't use the nameserver (or something).
21336
+ # -lsocket must be given before -lnsl if both are needed.
21337
+ # We assume that if connect needs -lnsl, so does gethostbyname.
21338
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
21339
+echo "configure:4916: checking for connect" >&5
21340
+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
21341
+ echo $ac_n "(cached) $ac_c" 1>&6
21342
+else
21343
+ cat > conftest.$ac_ext <<EOF
21344
+#line 4921 "configure"
21345
+#include "confdefs.h"
21346
+/* System header to define __stub macros and hopefully few prototypes,
21347
+ which can conflict with char connect(); below. */
21348
+#include <assert.h>
21349
+/* Override any gcc2 internal prototype to avoid an error. */
21350
+/* We use char because int might match the return type of a gcc2
21351
+ builtin and then its argument prototype would still apply. */
21352
+char connect();
21353
+
21354
+int main() {
21355
+
21356
+/* The GNU C library defines this for functions which it implements
21357
+ to always fail with ENOSYS. Some functions are actually named
21358
+ something starting with __ and the normal name is an alias. */
21359
+#if defined (__stub_connect) || defined (__stub___connect)
21360
+choke me
21361
+#else
21362
+connect();
21363
+#endif
21364
+
21365
+; return 0; }
21366
+EOF
21367
+if { (eval echo configure:4944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21368
+ rm -rf conftest*
21369
+ eval "ac_cv_func_connect=yes"
21370
+else
21371
+ echo "configure: failed program was:" >&5
21372
+ cat conftest.$ac_ext >&5
21373
+ rm -rf conftest*
21374
+ eval "ac_cv_func_connect=no"
21375
+fi
21376
+rm -f conftest*
21377
+fi
21378
+
21379
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
21380
+ echo "$ac_t""yes" 1>&6
21381
+ :
21382
+else
21383
+ echo "$ac_t""no" 1>&6
21384
+fi
21385
+
21386
+ if test $ac_cv_func_connect = no; then
21387
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
21388
+echo "configure:4965: checking for connect in -lsocket" >&5
21389
+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
21390
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21391
+ echo $ac_n "(cached) $ac_c" 1>&6
21392
+else
21393
+ ac_save_LIBS="$LIBS"
21394
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
21395
+cat > conftest.$ac_ext <<EOF
21396
+#line 4973 "configure"
21397
+#include "confdefs.h"
21398
+/* Override any gcc2 internal prototype to avoid an error. */
21399
+/* We use char because int might match the return type of a gcc2
21400
+ builtin and then its argument prototype would still apply. */
21401
+char connect();
21402
+
21403
+int main() {
21404
+connect()
21405
+; return 0; }
21406
+EOF
21407
+if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21408
+ rm -rf conftest*
21409
+ eval "ac_cv_lib_$ac_lib_var=yes"
21410
+else
21411
+ echo "configure: failed program was:" >&5
21412
+ cat conftest.$ac_ext >&5
21413
+ rm -rf conftest*
21414
+ eval "ac_cv_lib_$ac_lib_var=no"
21415
+fi
21416
+rm -f conftest*
21417
+LIBS="$ac_save_LIBS"
21418
+
21419
+fi
21420
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21421
+ echo "$ac_t""yes" 1>&6
21422
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
21423
+else
21424
+ echo "$ac_t""no" 1>&6
21425
+fi
21426
+
21427
+ fi
21428
+
21429
+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
21430
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
21431
+echo "configure:5008: checking for remove" >&5
21432
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
21433
+ echo $ac_n "(cached) $ac_c" 1>&6
21434
+else
21435
+ cat > conftest.$ac_ext <<EOF
21436
+#line 5013 "configure"
21437
+#include "confdefs.h"
21438
+/* System header to define __stub macros and hopefully few prototypes,
21439
+ which can conflict with char remove(); below. */
21440
+#include <assert.h>
21441
+/* Override any gcc2 internal prototype to avoid an error. */
21442
+/* We use char because int might match the return type of a gcc2
21443
+ builtin and then its argument prototype would still apply. */
21444
+char remove();
21445
+
21446
+int main() {
21447
+
21448
+/* The GNU C library defines this for functions which it implements
21449
+ to always fail with ENOSYS. Some functions are actually named
21450
+ something starting with __ and the normal name is an alias. */
21451
+#if defined (__stub_remove) || defined (__stub___remove)
21452
+choke me
21453
+#else
21454
+remove();
21455
+#endif
21456
+
21457
+; return 0; }
21458
+EOF
21459
+if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21460
+ rm -rf conftest*
21461
+ eval "ac_cv_func_remove=yes"
21462
+else
21463
+ echo "configure: failed program was:" >&5
21464
+ cat conftest.$ac_ext >&5
21465
+ rm -rf conftest*
21466
+ eval "ac_cv_func_remove=no"
21467
+fi
21468
+rm -f conftest*
21469
+fi
21470
+
21471
+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
21472
+ echo "$ac_t""yes" 1>&6
21473
+ :
21474
+else
21475
+ echo "$ac_t""no" 1>&6
21476
+fi
21477
+
21478
+ if test $ac_cv_func_remove = no; then
21479
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
21480
+echo "configure:5057: checking for remove in -lposix" >&5
21481
+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
21482
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21483
+ echo $ac_n "(cached) $ac_c" 1>&6
21484
+else
21485
+ ac_save_LIBS="$LIBS"
21486
+LIBS="-lposix $LIBS"
21487
+cat > conftest.$ac_ext <<EOF
21488
+#line 5065 "configure"
21489
+#include "confdefs.h"
21490
+/* Override any gcc2 internal prototype to avoid an error. */
21491
+/* We use char because int might match the return type of a gcc2
21492
+ builtin and then its argument prototype would still apply. */
21493
+char remove();
21494
+
21495
+int main() {
21496
+remove()
21497
+; return 0; }
21498
+EOF
21499
+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21500
+ rm -rf conftest*
21501
+ eval "ac_cv_lib_$ac_lib_var=yes"
21502
+else
21503
+ echo "configure: failed program was:" >&5
21504
+ cat conftest.$ac_ext >&5
21505
+ rm -rf conftest*
21506
+ eval "ac_cv_lib_$ac_lib_var=no"
21507
+fi
21508
+rm -f conftest*
21509
+LIBS="$ac_save_LIBS"
21510
+
21511
+fi
21512
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21513
+ echo "$ac_t""yes" 1>&6
21514
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
21515
+else
21516
+ echo "$ac_t""no" 1>&6
21517
+fi
21518
+
21519
+ fi
21520
+
21521
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
21522
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
21523
+echo "configure:5100: checking for shmat" >&5
21524
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
21525
+ echo $ac_n "(cached) $ac_c" 1>&6
21526
+else
21527
+ cat > conftest.$ac_ext <<EOF
21528
+#line 5105 "configure"
21529
+#include "confdefs.h"
21530
+/* System header to define __stub macros and hopefully few prototypes,
21531
+ which can conflict with char shmat(); below. */
21532
+#include <assert.h>
21533
+/* Override any gcc2 internal prototype to avoid an error. */
21534
+/* We use char because int might match the return type of a gcc2
21535
+ builtin and then its argument prototype would still apply. */
21536
+char shmat();
21537
+
21538
+int main() {
21539
+
21540
+/* The GNU C library defines this for functions which it implements
21541
+ to always fail with ENOSYS. Some functions are actually named
21542
+ something starting with __ and the normal name is an alias. */
21543
+#if defined (__stub_shmat) || defined (__stub___shmat)
21544
+choke me
21545
+#else
21546
+shmat();
21547
+#endif
21548
+
21549
+; return 0; }
21550
+EOF
21551
+if { (eval echo configure:5128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21552
+ rm -rf conftest*
21553
+ eval "ac_cv_func_shmat=yes"
21554
+else
21555
+ echo "configure: failed program was:" >&5
21556
+ cat conftest.$ac_ext >&5
21557
+ rm -rf conftest*
21558
+ eval "ac_cv_func_shmat=no"
21559
+fi
21560
+rm -f conftest*
21561
+fi
21562
+
21563
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
21564
+ echo "$ac_t""yes" 1>&6
21565
+ :
21566
+else
21567
+ echo "$ac_t""no" 1>&6
21568
+fi
21569
+
21570
+ if test $ac_cv_func_shmat = no; then
21571
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
21572
+echo "configure:5149: checking for shmat in -lipc" >&5
21573
+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
21574
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21575
+ echo $ac_n "(cached) $ac_c" 1>&6
21576
+else
21577
+ ac_save_LIBS="$LIBS"
21578
+LIBS="-lipc $LIBS"
21579
+cat > conftest.$ac_ext <<EOF
21580
+#line 5157 "configure"
21581
+#include "confdefs.h"
21582
+/* Override any gcc2 internal prototype to avoid an error. */
21583
+/* We use char because int might match the return type of a gcc2
21584
+ builtin and then its argument prototype would still apply. */
21585
+char shmat();
21586
+
21587
+int main() {
21588
+shmat()
21589
+; return 0; }
21590
+EOF
21591
+if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21592
+ rm -rf conftest*
21593
+ eval "ac_cv_lib_$ac_lib_var=yes"
21594
+else
21595
+ echo "configure: failed program was:" >&5
21596
+ cat conftest.$ac_ext >&5
21597
+ rm -rf conftest*
21598
+ eval "ac_cv_lib_$ac_lib_var=no"
21599
+fi
21600
+rm -f conftest*
21601
+LIBS="$ac_save_LIBS"
21602
+
21603
+fi
21604
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21605
+ echo "$ac_t""yes" 1>&6
21606
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
21607
+else
21608
+ echo "$ac_t""no" 1>&6
21609
+fi
21610
+
21611
+ fi
21612
+ fi
21613
+
21614
+ # Check for libraries that X11R6 Xt/Xaw programs need.
21615
+ ac_save_LDFLAGS="$LDFLAGS"
21616
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
21617
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
21618
+ # check for ICE first), but we must link in the order -lSM -lICE or
21619
+ # we get undefined symbols. So assume we have SM if we have ICE.
21620
+ # These have to be linked with before -lX11, unlike the other
21621
+ # libraries we check for below, so use a different variable.
21622
+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
21623
+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
21624
+echo "configure:5201: checking for IceConnectionNumber in -lICE" >&5
21625
+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
21626
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21627
+ echo $ac_n "(cached) $ac_c" 1>&6
21628
+else
21629
+ ac_save_LIBS="$LIBS"
21630
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
21631
+cat > conftest.$ac_ext <<EOF
21632
+#line 5209 "configure"
21633
+#include "confdefs.h"
21634
+/* Override any gcc2 internal prototype to avoid an error. */
21635
+/* We use char because int might match the return type of a gcc2
21636
+ builtin and then its argument prototype would still apply. */
21637
+char IceConnectionNumber();
21638
+
21639
+int main() {
21640
+IceConnectionNumber()
21641
+; return 0; }
21642
+EOF
21643
+if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21644
+ rm -rf conftest*
21645
+ eval "ac_cv_lib_$ac_lib_var=yes"
21646
+else
21647
+ echo "configure: failed program was:" >&5
21648
+ cat conftest.$ac_ext >&5
21649
+ rm -rf conftest*
21650
+ eval "ac_cv_lib_$ac_lib_var=no"
21651
+fi
21652
+rm -f conftest*
21653
+LIBS="$ac_save_LIBS"
21654
+
21655
+fi
21656
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21657
+ echo "$ac_t""yes" 1>&6
21658
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
21659
+else
21660
+ echo "$ac_t""no" 1>&6
21661
+fi
21662
+
21663
+ LDFLAGS="$ac_save_LDFLAGS"
21664
+
21665
+fi
21666
+
21667
+
21668
+
21669
+
21670
+
21671
+# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
21672
+
21673
+cf_have_X_LIBS=no
21674
+
21675
+LDFLAGS="$X_LIBS $LDFLAGS"
21676
+
21677
+test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
21678
+
21679
+cf_check_cflags="$CFLAGS"
21680
+cf_check_cppflags="$CPPFLAGS"
21681
+
21682
+cf_fix_cppflags=no
21683
+cf_new_cflags=
21684
+cf_new_cppflags=
21685
+cf_new_extra_cppflags=
21686
+
21687
+for cf_add_cflags in $X_CFLAGS
21688
+do
21689
+case $cf_fix_cppflags in
21690
+no)
21691
+ case $cf_add_cflags in #(vi
21692
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
21693
+ case $cf_add_cflags in
21694
+ -D*)
21695
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
21696
+
21697
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
21698
+ && test -z "${cf_tst_cflags}" \
21699
+ && cf_fix_cppflags=yes
21700
+
21701
+ if test $cf_fix_cppflags = yes ; then
21702
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
21703
+ continue
21704
+ elif test "${cf_tst_cflags}" = "\"'" ; then
21705
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
21706
+ continue
21707
+ fi
21708
+ ;;
21709
+ esac
21710
+ case "$CPPFLAGS" in
21711
+ *$cf_add_cflags) #(vi
21712
+ ;;
21713
+ *) #(vi
21714
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
21715
+ ;;
21716
+ esac
21717
+ ;;
21718
+ *)
21719
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
21720
+ ;;
21721
+ esac
21722
+ ;;
21723
+yes)
21724
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
21725
+
21726
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
21727
+
21728
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
21729
+ && test -z "${cf_tst_cflags}" \
21730
+ && cf_fix_cppflags=no
21731
+ ;;
21732
+esac
21733
+done
21734
+
21735
+if test -n "$cf_new_cflags" ; then
21736
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
21737
+
21738
+ CFLAGS="$CFLAGS $cf_new_cflags"
21739
+fi
21740
+
21741
+if test -n "$cf_new_cppflags" ; then
21742
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
21743
+
21744
+ CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
21745
+fi
21746
+
21747
+if test -n "$cf_new_extra_cppflags" ; then
21748
+ test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
21749
+
21750
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
21751
+fi
21752
+
21753
+
21754
+
21755
+
21756
+if test "$cf_check_cflags" != "$CFLAGS" ; then
21757
+cat > conftest.$ac_ext <<EOF
21758
+#line 5335 "configure"
21759
+#include "confdefs.h"
21760
+#include <stdio.h>
21761
+int main() {
21762
+printf("Hello world");
21763
+; return 0; }
21764
+EOF
21765
+if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21766
+ :
21767
+else
21768
+ echo "configure: failed program was:" >&5
21769
+ cat conftest.$ac_ext >&5
21770
+ rm -rf conftest*
21771
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
21772
+
21773
+ if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
21774
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
21775
+
21776
+ fi
21777
+ CFLAGS="$cf_check_flags"
21778
+fi
21779
+rm -f conftest*
21780
+fi
21781
+
21782
+
21783
+echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6
21784
+echo "configure:5361: checking for XOpenDisplay" >&5
21785
+if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then
21786
+ echo $ac_n "(cached) $ac_c" 1>&6
21787
+else
21788
+ cat > conftest.$ac_ext <<EOF
21789
+#line 5366 "configure"
21790
+#include "confdefs.h"
21791
+/* System header to define __stub macros and hopefully few prototypes,
21792
+ which can conflict with char XOpenDisplay(); below. */
21793
+#include <assert.h>
21794
+/* Override any gcc2 internal prototype to avoid an error. */
21795
+/* We use char because int might match the return type of a gcc2
21796
+ builtin and then its argument prototype would still apply. */
21797
+char XOpenDisplay();
21798
+
21799
+int main() {
21800
+
21801
+/* The GNU C library defines this for functions which it implements
21802
+ to always fail with ENOSYS. Some functions are actually named
21803
+ something starting with __ and the normal name is an alias. */
21804
+#if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay)
21805
+choke me
21806
+#else
21807
+XOpenDisplay();
21808
+#endif
21809
+
21810
+; return 0; }
21811
+EOF
21812
+if { (eval echo configure:5389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21813
+ rm -rf conftest*
21814
+ eval "ac_cv_func_XOpenDisplay=yes"
21815
+else
21816
+ echo "configure: failed program was:" >&5
21817
+ cat conftest.$ac_ext >&5
21818
+ rm -rf conftest*
21819
+ eval "ac_cv_func_XOpenDisplay=no"
21820
+fi
21821
+rm -f conftest*
21822
+fi
21823
+
21824
+if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then
21825
+ echo "$ac_t""yes" 1>&6
21826
+ :
21827
+else
21828
+ echo "$ac_t""no" 1>&6
21829
+
21830
+echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
21831
+echo "configure:5408: checking for XOpenDisplay in -lX11" >&5
21832
+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
21833
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21834
+ echo $ac_n "(cached) $ac_c" 1>&6
21835
+else
21836
+ ac_save_LIBS="$LIBS"
21837
+LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
21838
+cat > conftest.$ac_ext <<EOF
21839
+#line 5416 "configure"
21840
+#include "confdefs.h"
21841
+/* Override any gcc2 internal prototype to avoid an error. */
21842
+/* We use char because int might match the return type of a gcc2
21843
+ builtin and then its argument prototype would still apply. */
21844
+char XOpenDisplay();
21845
+
21846
+int main() {
21847
+XOpenDisplay()
21848
+; return 0; }
21849
+EOF
21850
+if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21851
+ rm -rf conftest*
21852
+ eval "ac_cv_lib_$ac_lib_var=yes"
21853
+else
21854
+ echo "configure: failed program was:" >&5
21855
+ cat conftest.$ac_ext >&5
21856
+ rm -rf conftest*
21857
+ eval "ac_cv_lib_$ac_lib_var=no"
21858
+fi
21859
+rm -f conftest*
21860
+LIBS="$ac_save_LIBS"
21861
+
21862
+fi
21863
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21864
+ echo "$ac_t""yes" 1>&6
21865
+ LIBS="-lX11 $LIBS"
21866
+else
21867
+ echo "$ac_t""no" 1>&6
21868
+fi
21869
+
21870
+fi
21871
+
21872
+
21873
+echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6
21874
+echo "configure:5451: checking for XtAppInitialize" >&5
21875
+if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then
21876
+ echo $ac_n "(cached) $ac_c" 1>&6
21877
+else
21878
+ cat > conftest.$ac_ext <<EOF
21879
+#line 5456 "configure"
21880
+#include "confdefs.h"
21881
+/* System header to define __stub macros and hopefully few prototypes,
21882
+ which can conflict with char XtAppInitialize(); below. */
21883
+#include <assert.h>
21884
+/* Override any gcc2 internal prototype to avoid an error. */
21885
+/* We use char because int might match the return type of a gcc2
21886
+ builtin and then its argument prototype would still apply. */
21887
+char XtAppInitialize();
21888
+
21889
+int main() {
21890
+
21891
+/* The GNU C library defines this for functions which it implements
21892
+ to always fail with ENOSYS. Some functions are actually named
21893
+ something starting with __ and the normal name is an alias. */
21894
+#if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize)
21895
+choke me
21896
+#else
21897
+XtAppInitialize();
21898
+#endif
21899
+
21900
+; return 0; }
21901
+EOF
21902
+if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21903
+ rm -rf conftest*
21904
+ eval "ac_cv_func_XtAppInitialize=yes"
21905
+else
21906
+ echo "configure: failed program was:" >&5
21907
+ cat conftest.$ac_ext >&5
21908
+ rm -rf conftest*
21909
+ eval "ac_cv_func_XtAppInitialize=no"
21910
+fi
21911
+rm -f conftest*
21912
+fi
21913
+
21914
+if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then
21915
+ echo "$ac_t""yes" 1>&6
21916
+ :
21917
+else
21918
+ echo "$ac_t""no" 1>&6
21919
+
21920
+echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
21921
+echo "configure:5498: checking for XtAppInitialize in -lXt" >&5
21922
+ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
21923
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21924
+ echo $ac_n "(cached) $ac_c" 1>&6
21925
+else
21926
+ ac_save_LIBS="$LIBS"
21927
+LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
21928
+cat > conftest.$ac_ext <<EOF
21929
+#line 5506 "configure"
21930
+#include "confdefs.h"
21931
+/* Override any gcc2 internal prototype to avoid an error. */
21932
+/* We use char because int might match the return type of a gcc2
21933
+ builtin and then its argument prototype would still apply. */
21934
+char XtAppInitialize();
21935
+
21936
+int main() {
21937
+XtAppInitialize()
21938
+; return 0; }
21939
+EOF
21940
+if { (eval echo configure:5517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21941
+ rm -rf conftest*
21942
+ eval "ac_cv_lib_$ac_lib_var=yes"
21943
+else
21944
+ echo "configure: failed program was:" >&5
21945
+ cat conftest.$ac_ext >&5
21946
+ rm -rf conftest*
21947
+ eval "ac_cv_lib_$ac_lib_var=no"
21948
+fi
21949
+rm -f conftest*
21950
+LIBS="$ac_save_LIBS"
21951
+
21952
+fi
21953
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21954
+ echo "$ac_t""yes" 1>&6
21955
+ cat >> confdefs.h <<\EOF
21956
+#define HAVE_LIBXT 1
21957
+EOF
21958
+
21959
+ cf_have_X_LIBS=Xt
21960
+ LIBS="-lXt $X_PRE_LIBS $LIBS"
21961
+else
21962
+ echo "$ac_t""no" 1>&6
21963
+fi
21964
+
21965
+fi
21966
+
21967
+
21968
+if test $cf_have_X_LIBS = no ; then
21969
+ echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with
21970
+test program. You will have to check and add the proper libraries by hand
21971
+to makefile." 1>&2
21972
+fi
21973
+
21974
+
21975
+cf_x_athena=${cf_x_athena-Xaw}
21976
+
21977
+echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6
21978
+echo "configure:5555: checking if you want to link with Xaw 3d library" >&5
21979
+withval=
21980
+
21981
+# Check whether --with-Xaw3d or --without-Xaw3d was given.
21982
+if test "${with_Xaw3d+set}" = set; then
21983
+ withval="$with_Xaw3d"
21984
+ :
21985
+fi
21986
+
21987
+if test "$withval" = yes ; then
21988
+ cf_x_athena=Xaw3d
21989
+ echo "$ac_t""yes" 1>&6
21990
+else
21991
+ echo "$ac_t""no" 1>&6
21992
+fi
21993
+
21994
+echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6
21995
+echo "configure:5572: checking if you want to link with neXT Athena library" >&5
21996
+withval=
21997
+
21998
+# Check whether --with-neXtaw or --without-neXtaw was given.
21999
+if test "${with_neXtaw+set}" = set; then
22000
+ withval="$with_neXtaw"
22001
+ :
22002
+fi
22003
+
22004
+if test "$withval" = yes ; then
22005
+ cf_x_athena=neXtaw
22006
+ echo "$ac_t""yes" 1>&6
22007
+else
22008
+ echo "$ac_t""no" 1>&6
22009
+fi
22010
+
22011
+echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6
22012
+echo "configure:5589: checking if you want to link with Athena-Plus library" >&5
22013
+withval=
22014
+
22015
+# Check whether --with-XawPlus or --without-XawPlus was given.
22016
+if test "${with_XawPlus+set}" = set; then
22017
+ withval="$with_XawPlus"
22018
+ :
22019
+fi
22020
+
22021
+if test "$withval" = yes ; then
22022
+ cf_x_athena=XawPlus
22023
+ echo "$ac_t""yes" 1>&6
22024
+else
22025
+ echo "$ac_t""no" 1>&6
22026
+fi
22027
+
22028
+echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
22029
+echo "configure:5606: checking for XextCreateExtension in -lXext" >&5
22030
+ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
22031
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22032
+ echo $ac_n "(cached) $ac_c" 1>&6
22033
+else
22034
+ ac_save_LIBS="$LIBS"
22035
+LIBS="-lXext $LIBS"
22036
+cat > conftest.$ac_ext <<EOF
22037
+#line 5614 "configure"
22038
+#include "confdefs.h"
22039
+/* Override any gcc2 internal prototype to avoid an error. */
22040
+/* We use char because int might match the return type of a gcc2
22041
+ builtin and then its argument prototype would still apply. */
22042
+char XextCreateExtension();
22043
+
22044
+int main() {
22045
+XextCreateExtension()
22046
+; return 0; }
22047
+EOF
22048
+if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22049
+ rm -rf conftest*
22050
+ eval "ac_cv_lib_$ac_lib_var=yes"
22051
+else
22052
+ echo "configure: failed program was:" >&5
22053
+ cat conftest.$ac_ext >&5
22054
+ rm -rf conftest*
22055
+ eval "ac_cv_lib_$ac_lib_var=no"
22056
+fi
22057
+rm -f conftest*
22058
+LIBS="$ac_save_LIBS"
22059
+
22060
+fi
22061
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22062
+ echo "$ac_t""yes" 1>&6
22063
+ LIBS="-lXext $LIBS"
22064
+else
22065
+ echo "$ac_t""no" 1>&6
22066
+fi
22067
+
22068
+
22069
+cf_x_athena_lib=""
22070
+
22071
+
22072
+cf_x_athena_root=$cf_x_athena
22073
+cf_x_athena_include=""
22074
+
22075
+for cf_path in default \
22076
+ /usr/contrib/X11R6 \
22077
+ /usr/contrib/X11R5 \
22078
+ /usr/lib/X11R5 \
22079
+ /usr/local
22080
+do
22081
+ if test -z "$cf_x_athena_include" ; then
22082
+ cf_save="$CPPFLAGS"
22083
+ cf_test=X11/$cf_x_athena_root/SimpleMenu.h
22084
+ if test $cf_path != default ; then
22085
+ CPPFLAGS="-I$cf_path/include $cf_save"
22086
+ echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
22087
+echo "configure:5664: checking for $cf_test in $cf_path" >&5
22088
+ else
22089
+ echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
22090
+echo "configure:5667: checking for $cf_test" >&5
22091
+ fi
22092
+ cat > conftest.$ac_ext <<EOF
22093
+#line 5670 "configure"
22094
+#include "confdefs.h"
22095
+
22096
+#include <X11/Intrinsic.h>
22097
+#include <$cf_test>
22098
+int main() {
22099
+
22100
+; return 0; }
22101
+EOF
22102
+if { (eval echo configure:5679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22103
+ rm -rf conftest*
22104
+ cf_result=yes
22105
+else
22106
+ echo "configure: failed program was:" >&5
22107
+ cat conftest.$ac_ext >&5
22108
+ rm -rf conftest*
22109
+ cf_result=no
22110
+fi
22111
+rm -f conftest*
22112
+ echo "$ac_t""$cf_result" 1>&6
22113
+ if test "$cf_result" = yes ; then
22114
+ cf_x_athena_include=$cf_path
22115
+ break
22116
+ else
22117
+ CPPFLAGS="$cf_save"
22118
+ fi
22119
+ fi
22120
+done
22121
+
22122
+if test -z "$cf_x_athena_include" ; then
22123
+ echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2
22124
+elif test "$cf_x_athena_include" != default ; then
22125
+ CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
22126
+fi
22127
+
22128
+
22129
+cf_x_athena_root=$cf_x_athena
22130
+cf_x_athena_lib=""
22131
+
22132
+for cf_path in default \
22133
+ /usr/contrib/X11R6 \
22134
+ /usr/contrib/X11R5 \
22135
+ /usr/lib/X11R5 \
22136
+ /usr/local
22137
+do
22138
+ for cf_lib in \
22139
+ "-l$cf_x_athena_root -lXmu" \
22140
+ "-l$cf_x_athena_root -lXpm -lXmu" \
22141
+ "-l${cf_x_athena_root}_s -lXmu_s"
22142
+ do
22143
+ if test -z "$cf_x_athena_lib" ; then
22144
+ cf_save="$LIBS"
22145
+ cf_test=XawSimpleMenuAddGlobalActions
22146
+ if test $cf_path != default ; then
22147
+ LIBS="-L$cf_path/lib $cf_lib $LIBS"
22148
+ echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
22149
+echo "configure:5726: checking for $cf_lib in $cf_path" >&5
22150
+ else
22151
+ LIBS="$cf_lib $LIBS"
22152
+ echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
22153
+echo "configure:5730: checking for $cf_test in $cf_lib" >&5
22154
+ fi
22155
+ cf_SAVE="$LIBS"
22156
+ LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
22157
+ cat > conftest.$ac_ext <<EOF
22158
+#line 5735 "configure"
22159
+#include "confdefs.h"
22160
+
22161
+int main() {
22162
+$cf_test()
22163
+; return 0; }
22164
+EOF
22165
+if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22166
+ rm -rf conftest*
22167
+ cf_result=yes
22168
+else
22169
+ echo "configure: failed program was:" >&5
22170
+ cat conftest.$ac_ext >&5
22171
+ rm -rf conftest*
22172
+ cf_result=no
22173
+fi
22174
+rm -f conftest*
22175
+ echo "$ac_t""$cf_result" 1>&6
22176
+ if test "$cf_result" = yes ; then
22177
+ cf_x_athena_lib="$cf_lib"
22178
+ LIBS="$cf_SAVE"
22179
+ break
22180
+ else
22181
+ LIBS="$cf_save"
22182
+ fi
22183
+ fi
22184
+ done
22185
+done
22186
+
22187
+if test -z "$cf_x_athena_lib" ; then
22188
+ { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; }
22189
+fi
22190
+
22191
+
22192
+cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
22193
+
22194
+cat >> confdefs.h <<EOF
22195
+#define $cf_x_athena_LIBS 1
22196
+EOF
22197
+
22198
+
22199
+
22200
+
22201
+
22202
+LDFLAGS="$LDFLAGS $X_LIBS"
22203
+
22204
+test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
22205
+
22206
+cf_check_cflags="$CFLAGS"
22207
+cf_check_cppflags="$CPPFLAGS"
22208
+
22209
+cf_fix_cppflags=no
22210
+cf_new_cflags=
22211
+cf_new_cppflags=
22212
+cf_new_extra_cppflags=
22213
+
22214
+for cf_add_cflags in $X_CFLAGS
22215
+do
22216
+case $cf_fix_cppflags in
22217
+no)
22218
+ case $cf_add_cflags in #(vi
22219
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
22220
+ case $cf_add_cflags in
22221
+ -D*)
22222
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
22223
+
22224
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
22225
+ && test -z "${cf_tst_cflags}" \
22226
+ && cf_fix_cppflags=yes
22227
+
22228
+ if test $cf_fix_cppflags = yes ; then
22229
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
22230
+ continue
22231
+ elif test "${cf_tst_cflags}" = "\"'" ; then
22232
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
22233
+ continue
22234
+ fi
22235
+ ;;
22236
+ esac
22237
+ case "$CPPFLAGS" in
22238
+ *$cf_add_cflags) #(vi
22239
+ ;;
22240
+ *) #(vi
22241
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
22242
+ ;;
22243
+ esac
22244
+ ;;
22245
+ *)
22246
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
22247
+ ;;
22248
+ esac
22249
+ ;;
22250
+yes)
22251
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
22252
+
22253
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
22254
+
22255
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
22256
+ && test -z "${cf_tst_cflags}" \
22257
+ && cf_fix_cppflags=no
22258
+ ;;
22259
+esac
22260
+done
22261
+
22262
+if test -n "$cf_new_cflags" ; then
22263
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
22264
+
22265
+ CFLAGS="$CFLAGS $cf_new_cflags"
22266
+fi
22267
+
22268
+if test -n "$cf_new_cppflags" ; then
22269
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
22270
+
22271
+ CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
22272
+fi
22273
+
22274
+if test -n "$cf_new_extra_cppflags" ; then
22275
+ test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
22276
+
22277
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
22278
+fi
22279
+
22280
+
22281
+
22282
+
22283
+if test "$cf_check_cflags" != "$CFLAGS" ; then
22284
+cat > conftest.$ac_ext <<EOF
22285
+#line 5862 "configure"
22286
+#include "confdefs.h"
22287
+#include <stdio.h>
22288
+int main() {
22289
+printf("Hello world");
22290
+; return 0; }
22291
+EOF
22292
+if { (eval echo configure:5869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22293
+ :
22294
+else
22295
+ echo "configure: failed program was:" >&5
22296
+ cat conftest.$ac_ext >&5
22297
+ rm -rf conftest*
22298
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
22299
+
22300
+ if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
22301
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
22302
+
22303
+ fi
22304
+ CFLAGS="$cf_check_flags"
22305
+fi
22306
+rm -f conftest*
22307
+fi
22308
+
22309
+echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
22310
+echo "configure:5887: checking for XOpenDisplay in -lX11" >&5
22311
+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
22312
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22313
+ echo $ac_n "(cached) $ac_c" 1>&6
22314
+else
22315
+ ac_save_LIBS="$LIBS"
22316
+LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
22317
+cat > conftest.$ac_ext <<EOF
22318
+#line 5895 "configure"
22319
+#include "confdefs.h"
22320
+/* Override any gcc2 internal prototype to avoid an error. */
22321
+/* We use char because int might match the return type of a gcc2
22322
+ builtin and then its argument prototype would still apply. */
22323
+char XOpenDisplay();
22324
+
22325
+int main() {
22326
+XOpenDisplay()
22327
+; return 0; }
22328
+EOF
22329
+if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22330
+ rm -rf conftest*
22331
+ eval "ac_cv_lib_$ac_lib_var=yes"
22332
+else
22333
+ echo "configure: failed program was:" >&5
22334
+ cat conftest.$ac_ext >&5
22335
+ rm -rf conftest*
22336
+ eval "ac_cv_lib_$ac_lib_var=no"
22337
+fi
22338
+rm -f conftest*
22339
+LIBS="$ac_save_LIBS"
22340
+
22341
+fi
22342
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22343
+ echo "$ac_t""yes" 1>&6
22344
+ LIBS="-lX11 $LIBS"
22345
+else
22346
+ echo "$ac_t""no" 1>&6
22347
+fi
22348
+
22349
+echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
22350
+echo "configure:5927: checking for XCurses library" >&5
22351
+if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
22352
+ echo $ac_n "(cached) $ac_c" 1>&6
22353
+else
22354
+
22355
+LIBS="-lXCurses $LIBS"
22356
+cat > conftest.$ac_ext <<EOF
22357
+#line 5934 "configure"
22358
+#include "confdefs.h"
22359
+
22360
+#include <xcurses.h>
22361
+char *XCursesProgramName = "test";
22362
+
22363
+int main() {
22364
+XCursesExit();
22365
+; return 0; }
22366
+EOF
22367
+if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22368
+ rm -rf conftest*
22369
+ cf_cv_lib_XCurses=yes
22370
+else
22371
+ echo "configure: failed program was:" >&5
22372
+ cat conftest.$ac_ext >&5
22373
+ rm -rf conftest*
22374
+ cf_cv_lib_XCurses=no
22375
+fi
22376
+rm -f conftest*
22377
+
22378
+fi
22379
+
22380
+echo "$ac_t""$cf_cv_lib_XCurses" 1>&6
22381
+if test $cf_cv_lib_XCurses = yes ; then
22382
+ cat >> confdefs.h <<\EOF
22383
+#define UNIX 1
22384
+EOF
22385
+
22386
+ cat >> confdefs.h <<\EOF
22387
+#define XCURSES 1
22388
+EOF
22389
+
22390
+ cat >> confdefs.h <<\EOF
22391
+#define HAVE_XCURSES 1
22392
+EOF
22393
+
22394
+else
22395
+ { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; }
22396
+fi
22397
+
22398
+ ;;
22399
+esac
22400
+
22401
+
22402
+
22403
+case $cf_cv_screen in #(vi
22404
+pdcurses) #(vi
22405
+ ;;
22406
+*)
22407
+ # look for curses-related libraries
22408
+ echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6
22409
+echo "configure:5986: checking for new_panel in -lpanel$cf_cv_libtype" >&5
22410
+ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'`
22411
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22412
+ echo $ac_n "(cached) $ac_c" 1>&6
22413
+else
22414
+ ac_save_LIBS="$LIBS"
22415
+LIBS="-lpanel$cf_cv_libtype $LIBS"
22416
+cat > conftest.$ac_ext <<EOF
22417
+#line 5994 "configure"
22418
+#include "confdefs.h"
22419
+/* Override any gcc2 internal prototype to avoid an error. */
22420
+/* We use char because int might match the return type of a gcc2
22421
+ builtin and then its argument prototype would still apply. */
22422
+char new_panel();
22423
+
22424
+int main() {
22425
+new_panel()
22426
+; return 0; }
22427
+EOF
22428
+if { (eval echo configure:6005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22429
+ rm -rf conftest*
22430
+ eval "ac_cv_lib_$ac_lib_var=yes"
22431
+else
22432
+ echo "configure: failed program was:" >&5
22433
+ cat conftest.$ac_ext >&5
22434
+ rm -rf conftest*
22435
+ eval "ac_cv_lib_$ac_lib_var=no"
22436
+fi
22437
+rm -f conftest*
22438
+LIBS="$ac_save_LIBS"
22439
+
22440
+fi
22441
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22442
+ echo "$ac_t""yes" 1>&6
22443
+ ac_tr_lib=HAVE_LIB`echo panel$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
22444
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
22445
+ cat >> confdefs.h <<EOF
22446
+#define $ac_tr_lib 1
22447
+EOF
22448
+
22449
+ LIBS="-lpanel$cf_cv_libtype $LIBS"
22450
+
22451
+else
22452
+ echo "$ac_t""no" 1>&6
22453
+fi
22454
+
22455
+ echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6
22456
+echo "configure:6033: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
22457
+ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'`
22458
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22459
+ echo $ac_n "(cached) $ac_c" 1>&6
22460
+else
22461
+ ac_save_LIBS="$LIBS"
22462
+LIBS="-lmenu$cf_cv_libtype $LIBS"
22463
+cat > conftest.$ac_ext <<EOF
22464
+#line 6041 "configure"
22465
+#include "confdefs.h"
22466
+/* Override any gcc2 internal prototype to avoid an error. */
22467
+/* We use char because int might match the return type of a gcc2
22468
+ builtin and then its argument prototype would still apply. */
22469
+char menu_driver();
22470
+
22471
+int main() {
22472
+menu_driver()
22473
+; return 0; }
22474
+EOF
22475
+if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22476
+ rm -rf conftest*
22477
+ eval "ac_cv_lib_$ac_lib_var=yes"
22478
+else
22479
+ echo "configure: failed program was:" >&5
22480
+ cat conftest.$ac_ext >&5
22481
+ rm -rf conftest*
22482
+ eval "ac_cv_lib_$ac_lib_var=no"
22483
+fi
22484
+rm -f conftest*
22485
+LIBS="$ac_save_LIBS"
22486
+
22487
+fi
22488
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22489
+ echo "$ac_t""yes" 1>&6
22490
+ ac_tr_lib=HAVE_LIB`echo menu$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
22491
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
22492
+ cat >> confdefs.h <<EOF
22493
+#define $ac_tr_lib 1
22494
+EOF
22495
+
22496
+ LIBS="-lmenu$cf_cv_libtype $LIBS"
22497
+
22498
+else
22499
+ echo "$ac_t""no" 1>&6
22500
+fi
22501
+
22502
+ echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6
22503
+echo "configure:6080: checking for form_driver in -lform$cf_cv_libtype" >&5
22504
+ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'`
22505
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22506
+ echo $ac_n "(cached) $ac_c" 1>&6
22507
+else
22508
+ ac_save_LIBS="$LIBS"
22509
+LIBS="-lform$cf_cv_libtype $LIBS"
22510
+cat > conftest.$ac_ext <<EOF
22511
+#line 6088 "configure"
22512
+#include "confdefs.h"
22513
+/* Override any gcc2 internal prototype to avoid an error. */
22514
+/* We use char because int might match the return type of a gcc2
22515
+ builtin and then its argument prototype would still apply. */
22516
+char form_driver();
22517
+
22518
+int main() {
22519
+form_driver()
22520
+; return 0; }
22521
+EOF
22522
+if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22523
+ rm -rf conftest*
22524
+ eval "ac_cv_lib_$ac_lib_var=yes"
22525
+else
22526
+ echo "configure: failed program was:" >&5
22527
+ cat conftest.$ac_ext >&5
22528
+ rm -rf conftest*
22529
+ eval "ac_cv_lib_$ac_lib_var=no"
22530
+fi
22531
+rm -f conftest*
22532
+LIBS="$ac_save_LIBS"
22533
+
22534
+fi
22535
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22536
+ echo "$ac_t""yes" 1>&6
22537
+ ac_tr_lib=HAVE_LIB`echo form$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \
22538
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
22539
+ cat >> confdefs.h <<EOF
22540
+#define $ac_tr_lib 1
22541
+EOF
22542
+
22543
+ LIBS="-lform$cf_cv_libtype $LIBS"
22544
+
22545
+else
22546
+ echo "$ac_t""no" 1>&6
22547
+fi
22548
+
22549
+
22550
+ # look for curses-related headers
22551
+ for ac_hdr in \
22552
+ nc_alloc.h \
22553
+ nomacros.h \
22554
+ form.h \
22555
+ menu.h \
22556
+ panel.h \
22557
+
22558
+do
22559
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
22560
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
22561
+echo "configure:6138: checking for $ac_hdr" >&5
22562
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
22563
+ echo $ac_n "(cached) $ac_c" 1>&6
22564
+else
22565
+ cat > conftest.$ac_ext <<EOF
22566
+#line 6143 "configure"
22567
+#include "confdefs.h"
22568
+#include <$ac_hdr>
22569
+EOF
22570
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
22571
+{ (eval echo configure:6148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22572
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
22573
+if test -z "$ac_err"; then
22574
+ rm -rf conftest*
22575
+ eval "ac_cv_header_$ac_safe=yes"
22576
+else
22577
+ echo "$ac_err" >&5
22578
+ echo "configure: failed program was:" >&5
22579
+ cat conftest.$ac_ext >&5
22580
+ rm -rf conftest*
22581
+ eval "ac_cv_header_$ac_safe=no"
22582
+fi
22583
+rm -f conftest*
22584
+fi
22585
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
22586
+ echo "$ac_t""yes" 1>&6
22587
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
22588
+ cat >> confdefs.h <<EOF
22589
+#define $ac_tr_hdr 1
22590
+EOF
22591
+
22592
+else
22593
+ echo "$ac_t""no" 1>&6
22594
+fi
22595
+done
22596
+
22597
+ ;;
22598
+esac
22599
22600
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
22601
-echo "configure:4020: checking return type of signal handlers" >&5
22602
+echo "configure:6178: checking return type of signal handlers" >&5
22603
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
22604
echo $ac_n "(cached) $ac_c" 1>&6
22605
else
22606
cat > conftest.$ac_ext <<EOF
22607
-#line 4025 "configure"
22608
+#line 6183 "configure"
22609
#include "confdefs.h"
22610
#include <sys/types.h>
22611
#include <signal.h>
22612
@@ -4038,7 +6196,7 @@ int main() {
22613
int i;
22614
; return 0; }
22615
EOF
22616
-if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22617
+if { (eval echo configure:6200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22618
rm -rf conftest*
22619
ac_cv_type_signal=void
22620
else
22621
@@ -4058,12 +6216,12 @@ EOF
22622
22623
22624
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
22625
-echo "configure:4062: checking for ANSI C header files" >&5
22626
+echo "configure:6220: checking for ANSI C header files" >&5
22627
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
22628
echo $ac_n "(cached) $ac_c" 1>&6
22629
else
22630
cat > conftest.$ac_ext <<EOF
22631
-#line 4067 "configure"
22632
+#line 6225 "configure"
22633
#include "confdefs.h"
22634
#include <stdlib.h>
22635
#include <stdarg.h>
22636
@@ -4071,7 +6229,7 @@ else
22637
#include <float.h>
22638
EOF
22639
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
22640
-{ (eval echo configure:4075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22641
+{ (eval echo configure:6233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22642
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
22643
if test -z "$ac_err"; then
22644
rm -rf conftest*
22645
@@ -4088,7 +6246,7 @@ rm -f conftest*
22646
if test $ac_cv_header_stdc = yes; then
22647
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
22648
cat > conftest.$ac_ext <<EOF
22649
-#line 4092 "configure"
22650
+#line 6250 "configure"
22651
#include "confdefs.h"
22652
#include <string.h>
22653
EOF
22654
@@ -4106,7 +6264,7 @@ fi
22655
if test $ac_cv_header_stdc = yes; then
22656
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
22657
cat > conftest.$ac_ext <<EOF
22658
-#line 4110 "configure"
22659
+#line 6268 "configure"
22660
#include "confdefs.h"
22661
#include <stdlib.h>
22662
EOF
22663
@@ -4127,7 +6285,7 @@ if test "$cross_compiling" = yes; then
22664
:
22665
else
22666
cat > conftest.$ac_ext <<EOF
22667
-#line 4131 "configure"
22668
+#line 6289 "configure"
22669
#include "confdefs.h"
22670
#include <ctype.h>
22671
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
22672
@@ -4138,7 +6296,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
22673
exit (0); }
22674
22675
EOF
22676
-if { (eval echo configure:4142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22677
+if { (eval echo configure:6300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22678
then
22679
:
22680
else
22681
@@ -4162,12 +6320,12 @@ EOF
22682
fi
22683
22684
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
22685
-echo "configure:4166: checking whether time.h and sys/time.h may both be included" >&5
22686
+echo "configure:6324: checking whether time.h and sys/time.h may both be included" >&5
22687
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
22688
echo $ac_n "(cached) $ac_c" 1>&6
22689
else
22690
cat > conftest.$ac_ext <<EOF
22691
-#line 4171 "configure"
22692
+#line 6329 "configure"
22693
#include "confdefs.h"
22694
#include <sys/types.h>
22695
#include <sys/time.h>
22696
@@ -4176,7 +6334,7 @@ int main() {
22697
struct tm *tp;
22698
; return 0; }
22699
EOF
22700
-if { (eval echo configure:4180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22701
+if { (eval echo configure:6338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22702
rm -rf conftest*
22703
ac_cv_header_time=yes
22704
else
22705
@@ -4197,13 +6355,9 @@ EOF
22706
fi
22707
22708
for ac_hdr in \
22709
-form.h \
22710
getopt.h \
22711
locale.h \
22712
-menu.h \
22713
-nc_alloc.h \
22714
-nomacros.h \
22715
-panel.h \
22716
+stdarg.h \
22717
sys/ioctl.h \
22718
sys/select.h \
22719
sys/time.h \
22720
@@ -4213,17 +6367,17 @@ unistd.h \
22721
do
22722
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
22723
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
22724
-echo "configure:4217: checking for $ac_hdr" >&5
22725
+echo "configure:6371: checking for $ac_hdr" >&5
22726
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
22727
echo $ac_n "(cached) $ac_c" 1>&6
22728
else
22729
cat > conftest.$ac_ext <<EOF
22730
-#line 4222 "configure"
22731
+#line 6376 "configure"
22732
#include "confdefs.h"
22733
#include <$ac_hdr>
22734
EOF
22735
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
22736
-{ (eval echo configure:4227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22737
+{ (eval echo configure:6381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22738
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
22739
if test -z "$ac_err"; then
22740
rm -rf conftest*
22741
@@ -4252,26 +6406,43 @@ done
22742
22743
for ac_func in \
22744
color_set \
22745
+filter \
22746
+getbegx \
22747
+getcurx \
22748
+getmaxx \
22749
getnstr \
22750
gettimeofday \
22751
+getwin \
22752
+mvvline \
22753
+mvwvline \
22754
napms \
22755
+putwin \
22756
resize_term \
22757
resizeterm \
22758
+ripoffline \
22759
+setupterm \
22760
slk_color \
22761
+slk_init \
22762
strdup \
22763
+termattrs \
22764
+tgetent \
22765
+tigetnum \
22766
+tigetstr \
22767
+typeahead \
22768
use_default_colors \
22769
vsscanf \
22770
wchgat \
22771
+winsstr \
22772
wresize \
22773
22774
do
22775
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
22776
-echo "configure:4270: checking for $ac_func" >&5
22777
+echo "configure:6441: checking for $ac_func" >&5
22778
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
22779
echo $ac_n "(cached) $ac_c" 1>&6
22780
else
22781
cat > conftest.$ac_ext <<EOF
22782
-#line 4275 "configure"
22783
+#line 6446 "configure"
22784
#include "confdefs.h"
22785
/* System header to define __stub macros and hopefully few prototypes,
22786
which can conflict with char $ac_func(); below. */
22787
@@ -4294,7 +6465,7 @@ $ac_func();
22788
22789
; return 0; }
22790
EOF
22791
-if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22792
+if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22793
rm -rf conftest*
22794
eval "ac_cv_func_$ac_func=yes"
22795
else
22796
@@ -4320,7 +6491,7 @@ done
22797
22798
22799
cat > conftest.$ac_ext <<EOF
22800
-#line 4324 "configure"
22801
+#line 6495 "configure"
22802
#include "confdefs.h"
22803
22804
#include <${cf_cv_ncurses_header-curses.h}>
22805
@@ -4341,7 +6512,7 @@ int main() {
22806
22807
; return 0; }
22808
EOF
22809
-if { (eval echo configure:4345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22810
+if { (eval echo configure:6516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22811
rm -rf conftest*
22812
cat >> confdefs.h <<\EOF
22813
#define NCURSES_EXT_FUNCS 1
22814
@@ -4355,13 +6526,13 @@ rm -f conftest*
22815
22816
22817
echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6
22818
-echo "configure:4359: checking if sys/time.h works with sys/select.h" >&5
22819
+echo "configure:6530: checking if sys/time.h works with sys/select.h" >&5
22820
if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then
22821
echo $ac_n "(cached) $ac_c" 1>&6
22822
else
22823
22824
cat > conftest.$ac_ext <<EOF
22825
-#line 4365 "configure"
22826
+#line 6536 "configure"
22827
#include "confdefs.h"
22828
22829
#include <sys/types.h>
22830
@@ -4376,7 +6547,7 @@ int main() {
22831
22832
; return 0; }
22833
EOF
22834
-if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22835
+if { (eval echo configure:6551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22836
rm -rf conftest*
22837
cf_cv_sys_time_select=yes
22838
else
22839
@@ -4397,7 +6568,7 @@ EOF
22840
22841
22842
echo $ac_n "checking for function curses_version""... $ac_c" 1>&6
22843
-echo "configure:4401: checking for function curses_version" >&5
22844
+echo "configure:6572: checking for function curses_version" >&5
22845
if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then
22846
echo $ac_n "(cached) $ac_c" 1>&6
22847
else
22848
@@ -4406,7 +6577,7 @@ if test "$cross_compiling" = yes; then
22849
cf_cv_func_curses_version=unknown
22850
else
22851
cat > conftest.$ac_ext <<EOF
22852
-#line 4410 "configure"
22853
+#line 6581 "configure"
22854
#include "confdefs.h"
22855
22856
#include <${cf_cv_ncurses_header-curses.h}>
22857
@@ -4418,7 +6589,7 @@ int main()
22858
}
22859
22860
EOF
22861
-if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22862
+if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22863
then
22864
cf_cv_func_curses_version=yes
22865
22866
@@ -4443,7 +6614,7 @@ EOF
22867
22868
22869
echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6
22870
-echo "configure:4447: checking for alternate character set array" >&5
22871
+echo "configure:6618: checking for alternate character set array" >&5
22872
if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then
22873
echo $ac_n "(cached) $ac_c" 1>&6
22874
else
22875
@@ -4452,7 +6623,7 @@ cf_cv_curses_acs_map=unknown
22876
for name in acs_map _acs_map __acs_map _nc_acs_map
22877
do
22878
cat > conftest.$ac_ext <<EOF
22879
-#line 4456 "configure"
22880
+#line 6627 "configure"
22881
#include "confdefs.h"
22882
22883
#include <${cf_cv_ncurses_header-curses.h}>
22884
@@ -4463,7 +6634,7 @@ $name['k'] = ACS_PLUS
22885
22886
; return 0; }
22887
EOF
22888
-if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22889
+if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22890
rm -rf conftest*
22891
cf_cv_curses_acs_map=$name; break
22892
else
22893
@@ -4484,7 +6655,7 @@ EOF
22894
22895
22896
echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6
22897
-echo "configure:4488: checking for wide alternate character set array" >&5
22898
+echo "configure:6659: checking for wide alternate character set array" >&5
22899
if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then
22900
echo $ac_n "(cached) $ac_c" 1>&6
22901
else
22902
@@ -4493,7 +6664,7 @@ else
22903
for name in wacs_map _wacs_map __wacs_map _nc_wacs
22904
do
22905
cat > conftest.$ac_ext <<EOF
22906
-#line 4497 "configure"
22907
+#line 6668 "configure"
22908
#include "confdefs.h"
22909
22910
#ifndef _XOPEN_SOURCE_EXTENDED
22911
@@ -4504,7 +6675,7 @@ int main() {
22912
$name['k'] = *WACS_PLUS
22913
; return 0; }
22914
EOF
22915
-if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22916
+if { (eval echo configure:6679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22917
rm -rf conftest*
22918
cf_cv_curses_wacs_map=$name
22919
break
22920
@@ -4520,9 +6691,9 @@ echo "$ac_t""$cf_cv_curses_wacs_map" 1>&
22921
22922
22923
echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
22924
-echo "configure:4524: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
22925
+echo "configure:6695: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
22926
cat > conftest.$ac_ext <<EOF
22927
-#line 4526 "configure"
22928
+#line 6697 "configure"
22929
#include "confdefs.h"
22930
22931
#ifndef _XOPEN_SOURCE_EXTENDED
22932
@@ -4535,7 +6706,7 @@ attr_t foo
22933
22934
; return 0; }
22935
EOF
22936
-if { (eval echo configure:4539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22937
+if { (eval echo configure:6710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22938
rm -rf conftest*
22939
cf_result=yes
22940
else
22941
@@ -4563,9 +6734,9 @@ fi
22942
22943
22944
echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
22945
-echo "configure:4567: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
22946
+echo "configure:6738: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
22947
cat > conftest.$ac_ext <<EOF
22948
-#line 4569 "configure"
22949
+#line 6740 "configure"
22950
#include "confdefs.h"
22951
22952
#ifndef _XOPEN_SOURCE_EXTENDED
22953
@@ -4578,7 +6749,7 @@ mbstate_t foo
22954
22955
; return 0; }
22956
EOF
22957
-if { (eval echo configure:4582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22958
+if { (eval echo configure:6753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
22959
rm -rf conftest*
22960
cf_result=yes
22961
else
22962
@@ -4763,8 +6934,6 @@ s%@LIBTOOL@%$LIBTOOL%g
22963
s%@LIB_CLEAN@%$LIB_CLEAN%g
22964
s%@LIB_COMPILE@%$LIB_COMPILE%g
22965
s%@LIB_LINK@%$LIB_LINK%g
22966
-s%@LIB_NAME@%$LIB_NAME%g
22967
-s%@LIB_PREFIX@%$LIB_PREFIX%g
22968
s%@LINK_TESTS@%$LINK_TESTS%g
22969
s%@LINT@%$LINT%g
22970
s%@LINT_OPTS@%$LINT_OPTS%g
22971
@@ -4778,6 +6947,11 @@ s%@cf_cv_rel_version@%$cf_cv_rel_version
22972
s%@EXEEXT@%$EXEEXT%g
22973
s%@OBJEXT@%$OBJEXT%g
22974
s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g
22975
+s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
22976
+s%@X_CFLAGS@%$X_CFLAGS%g
22977
+s%@X_PRE_LIBS@%$X_PRE_LIBS%g
22978
+s%@X_LIBS@%$X_LIBS%g
22979
+s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
22980
22981
CEOF
22982
EOF
22983
Index: ncurses-5.5/test/configure.in
22984
===================================================================
22985
--- ncurses-5.5.orig/test/configure.in 2005-02-26 18:58:27.000000000 -0500
22986
+++ ncurses-5.5/test/configure.in 2006-04-18 15:48:06.000000000 -0400
22987
@@ -28,7 +28,7 @@ dnl*************************************
22988
dnl
22989
dnl Author: Thomas E. Dickey 1996, etc.
22990
dnl
22991
-dnl $Id: configure.in,v 1.51 2005/02/26 23:58:27 tom Exp $
22992
+dnl $Id: configure.in,v 1.56 2006/02/11 17:02:31 tom Exp $
22993
dnl This is a simple configuration-script for the ncurses test programs that
22994
dnl allows the test-directory to be separately configured against a reference
22995
dnl system (i.e., sysvr4 curses)
22996
@@ -66,8 +66,6 @@ LIBTOOL="" AC_SUBST(LIBTOOL)
22997
LIB_CLEAN="" AC_SUBST(LIB_CLEAN)
22998
LIB_COMPILE="" AC_SUBST(LIB_COMPILE)
22999
LIB_LINK="" AC_SUBST(LIB_LINK)
23000
-LIB_NAME=curses AC_SUBST(LIB_NAME)
23001
-LIB_PREFIX="-l" AC_SUBST(LIB_PREFIX)
23002
LINK_TESTS="" AC_SUBST(LINK_TESTS)
23003
LINT=lint AC_SUBST(LINT)
23004
LINT_OPTS="" AC_SUBST(LINT_OPTS)
23005
@@ -86,6 +84,8 @@ AC_EXEEXT
23006
AC_OBJEXT
23007
23008
CF_ANSI_CC_REQD
23009
+CF_ENABLE_WARNINGS
23010
+CF_GCC_ATTRIBUTES
23011
CF_XOPEN_SOURCE
23012
23013
CF_WITH_CURSES_DIR
23014
@@ -100,12 +100,16 @@ dnl ------------------------------------
23015
dnl NcursesW, installed in conventional location
23016
AC_ARG_WITH(ncursesw,
23017
[ --with-ncursesw use wide ncurses-libraries (installed)],
23018
- [cf_cv_screen=ncursesw])
23019
+ [cf_cv_screen=ncursesw],[
23020
23021
dnl Ncurses, installed in conventional location
23022
AC_ARG_WITH(ncurses,
23023
[ --with-ncurses use ncurses-libraries (installed)],
23024
- [cf_cv_screen=ncurses])
23025
+ [cf_cv_screen=ncurses],[
23026
+
23027
+AC_ARG_WITH(pdcurses,
23028
+ [ --with-pdcurses compile/link with pdcurses X11 library],
23029
+ [cf_cv_screen=pdcurses])])])
23030
23031
case $cf_cv_screen in
23032
curses)
23033
@@ -116,14 +120,15 @@ curses)
23034
ncurses)
23035
CF_NCURSES_CPPFLAGS
23036
CF_NCURSES_LIBS
23037
- LIB_NAME=ncurses
23038
;;
23039
ncursesw)
23040
cf_cv_libtype=w
23041
CF_UTF8_LIB
23042
CF_NCURSES_CPPFLAGS(ncursesw)
23043
CF_NCURSES_LIBS(ncursesw)
23044
- LIB_NAME=ncursesw
23045
+ ;;
23046
+pdcurses) #(vi
23047
+ CF_PDCURSES_X11
23048
;;
23049
esac
23050
23051
@@ -132,22 +137,34 @@ dnl installed conventionally (e.g., SunO
23052
23053
dnl Autoconf builds up the $LIBS in reverse order
23054
23055
-AC_CHECK_LIB(panel$cf_cv_libtype,new_panel)
23056
-AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver)
23057
-AC_CHECK_LIB(form$cf_cv_libtype,form_driver)
23058
+case $cf_cv_screen in #(vi
23059
+pdcurses) #(vi
23060
+ ;;
23061
+*)
23062
+ # look for curses-related libraries
23063
+ AC_CHECK_LIB(panel$cf_cv_libtype,new_panel)
23064
+ AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver)
23065
+ AC_CHECK_LIB(form$cf_cv_libtype,form_driver)
23066
+
23067
+ # look for curses-related headers
23068
+ AC_CHECK_HEADERS( \
23069
+ nc_alloc.h \
23070
+ nomacros.h \
23071
+ form.h \
23072
+ menu.h \
23073
+ panel.h \
23074
+ )
23075
+ ;;
23076
+esac
23077
23078
AC_TYPE_SIGNAL
23079
23080
AC_STDC_HEADERS
23081
AC_HEADER_TIME
23082
AC_CHECK_HEADERS( \
23083
-form.h \
23084
getopt.h \
23085
locale.h \
23086
-menu.h \
23087
-nc_alloc.h \
23088
-nomacros.h \
23089
-panel.h \
23090
+stdarg.h \
23091
sys/ioctl.h \
23092
sys/select.h \
23093
sys/time.h \
23094
@@ -157,16 +174,33 @@ unistd.h \
23095
23096
AC_CHECK_FUNCS( \
23097
color_set \
23098
+filter \
23099
+getbegx \
23100
+getcurx \
23101
+getmaxx \
23102
getnstr \
23103
gettimeofday \
23104
+getwin \
23105
+mvvline \
23106
+mvwvline \
23107
napms \
23108
+putwin \
23109
resize_term \
23110
resizeterm \
23111
+ripoffline \
23112
+setupterm \
23113
slk_color \
23114
+slk_init \
23115
strdup \
23116
+termattrs \
23117
+tgetent \
23118
+tigetnum \
23119
+tigetstr \
23120
+typeahead \
23121
use_default_colors \
23122
vsscanf \
23123
wchgat \
23124
+winsstr \
23125
wresize \
23126
)
23127
23128
Index: ncurses-5.5/test/demo_altkeys.c
23129
===================================================================
23130
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23131
+++ ncurses-5.5/test/demo_altkeys.c 2006-04-18 15:48:07.000000000 -0400
23132
@@ -0,0 +1,167 @@
23133
+/****************************************************************************
23134
+ * Copyright (c) 2005,2006 Free Software Foundation, Inc. *
23135
+ * *
23136
+ * Permission is hereby granted, free of charge, to any person obtaining a *
23137
+ * copy of this software and associated documentation files (the *
23138
+ * "Software"), to deal in the Software without restriction, including *
23139
+ * without limitation the rights to use, copy, modify, merge, publish, *
23140
+ * distribute, distribute with modifications, sublicense, and/or sell *
23141
+ * copies of the Software, and to permit persons to whom the Software is *
23142
+ * furnished to do so, subject to the following conditions: *
23143
+ * *
23144
+ * The above copyright notice and this permission notice shall be included *
23145
+ * in all copies or substantial portions of the Software. *
23146
+ * *
23147
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
23148
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
23149
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
23150
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
23151
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
23152
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
23153
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23154
+ * *
23155
+ * Except as contained in this notice, the name(s) of the above copyright *
23156
+ * holders shall not be used in advertising or otherwise to promote the *
23157
+ * sale, use or other dealings in this Software without prior written *
23158
+ * authorization. *
23159
+ ****************************************************************************/
23160
+/*
23161
+ * $Id: demo_altkeys.c,v 1.4 2006/04/01 19:08:03 tom Exp $
23162
+ *
23163
+ * Demonstrate the define_key() function.
23164
+ * Thomas Dickey - 2005/10/22
23165
+ */
23166
+
23167
+#include <test.priv.h>
23168
+
23169
+#if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
23170
+
23171
+#if TIME_WITH_SYS_TIME
23172
+# include <sys/time.h>
23173
+# include <time.h>
23174
+#else
23175
+# if HAVE_SYS_TIME_H
23176
+# include <sys/time.h>
23177
+# else
23178
+# include <time.h>
23179
+# endif
23180
+#endif
23181
+
23182
+#define MY_LOGFILE "demo_altkeys.log"
23183
+#define MY_KEYS (KEY_MAX + 1)
23184
+
23185
+/*
23186
+ * Log the most recently-written line to our logfile
23187
+ */
23188
+static void
23189
+log_last_line(WINDOW *win)
23190
+{
23191
+ FILE *fp;
23192
+ int y, x, n;
23193
+ char temp[256];
23194
+
23195
+ if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
23196
+ int need = sizeof(temp) - 1;
23197
+ if (need > COLS)
23198
+ need = COLS;
23199
+ getyx(win, y, x);
23200
+ wmove(win, y - 1, 0);
23201
+ n = winnstr(win, temp, need);
23202
+ while (n-- > 0) {
23203
+ if (isspace(UChar(temp[n])))
23204
+ temp[n] = '\0';
23205
+ else
23206
+ break;
23207
+ }
23208
+ wmove(win, y, x);
23209
+ fprintf(fp, "%s\n", temp);
23210
+ fclose(fp);
23211
+ }
23212
+}
23213
+
23214
+int
23215
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
23216
+{
23217
+ int n;
23218
+ int ch;
23219
+ SCREEN *sp;
23220
+#if HAVE_GETTIMEOFDAY
23221
+ int secs, msecs;
23222
+ struct timeval current, previous;
23223
+#endif
23224
+
23225
+ unlink(MY_LOGFILE);
23226
+
23227
+ sp = newterm(0, stdout, stdin);
23228
+ (void) cbreak(); /* take input chars one at a time, no wait for \n */
23229
+ (void) noecho(); /* don't echo input */
23230
+
23231
+ scrollok(stdscr, TRUE);
23232
+ keypad(stdscr, TRUE);
23233
+ move(0, 0);
23234
+
23235
+ /* we do the define_key() calls after keypad(), since the first call to
23236
+ * keypad() initializes the corresponding data.
23237
+ */
23238
+ for (n = 0; n < 255; ++n) {
23239
+ char temp[10];
23240
+ sprintf(temp, "\033%c", n);
23241
+ define_key(temp, n + MY_KEYS);
23242
+ }
23243
+ for (n = KEY_MIN; n < KEY_MAX; ++n) {
23244
+ char *value;
23245
+ if ((value = keybound(n, 0)) != 0) {
23246
+ char *temp = malloc(strlen(value) + 2);
23247
+ sprintf(temp, "\033%s", value);
23248
+ define_key(temp, n + MY_KEYS);
23249
+ free(temp);
23250
+ free(value);
23251
+ }
23252
+ }
23253
+
23254
+#if HAVE_GETTIMEOFDAY
23255
+ gettimeofday(&previous, 0);
23256
+#endif
23257
+
23258
+ while ((ch = getch()) != ERR) {
23259
+ bool escaped = (ch >= MY_KEYS);
23260
+ const char *name = keyname(escaped ? (ch - MY_KEYS) : ch);
23261
+
23262
+#if HAVE_GETTIMEOFDAY
23263
+ gettimeofday(¤t, 0);
23264
+ secs = current.tv_sec - previous.tv_sec;
23265
+ msecs = (current.tv_usec - previous.tv_usec) / 1000;
23266
+ if (msecs < 0) {
23267
+ msecs += 1000;
23268
+ --secs;
23269
+ }
23270
+ if (msecs >= 1000) {
23271
+ secs += msecs / 1000;
23272
+ msecs %= 1000;
23273
+ }
23274
+ printw("%6d.%03d ", secs, msecs);
23275
+ previous = current;
23276
+#endif
23277
+ printw("Keycode %d, name %s%s\n",
23278
+ ch,
23279
+ escaped ? "ESC-" : "",
23280
+ name != 0 ? name : "<null>");
23281
+ log_last_line(stdscr);
23282
+ clrtoeol();
23283
+ if (ch == 'q')
23284
+ break;
23285
+ }
23286
+ endwin();
23287
+#if NO_LEAKS
23288
+ delscreen(sp);
23289
+#endif
23290
+ ExitProgram(EXIT_FAILURE);
23291
+}
23292
+#else
23293
+int
23294
+main(void)
23295
+{
23296
+ printf("This program requires the ncurses library\n");
23297
+ ExitProgram(EXIT_FAILURE);
23298
+}
23299
+#endif
23300
Index: ncurses-5.5/test/demo_defkey.c
23301
===================================================================
23302
--- ncurses-5.5.orig/test/demo_defkey.c 2004-01-03 19:01:13.000000000 -0500
23303
+++ ncurses-5.5/test/demo_defkey.c 2006-04-18 15:48:07.000000000 -0400
23304
@@ -1,5 +1,32 @@
23305
+/****************************************************************************
23306
+ * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. *
23307
+ * *
23308
+ * Permission is hereby granted, free of charge, to any person obtaining a *
23309
+ * copy of this software and associated documentation files (the *
23310
+ * "Software"), to deal in the Software without restriction, including *
23311
+ * without limitation the rights to use, copy, modify, merge, publish, *
23312
+ * distribute, distribute with modifications, sublicense, and/or sell *
23313
+ * copies of the Software, and to permit persons to whom the Software is *
23314
+ * furnished to do so, subject to the following conditions: *
23315
+ * *
23316
+ * The above copyright notice and this permission notice shall be included *
23317
+ * in all copies or substantial portions of the Software. *
23318
+ * *
23319
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
23320
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
23321
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
23322
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
23323
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
23324
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
23325
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23326
+ * *
23327
+ * Except as contained in this notice, the name(s) of the above copyright *
23328
+ * holders shall not be used in advertising or otherwise to promote the *
23329
+ * sale, use or other dealings in this Software without prior written *
23330
+ * authorization. *
23331
+ ****************************************************************************/
23332
/*
23333
- * $Id: demo_defkey.c,v 1.13 2004/01/04 00:01:13 tom Exp $
23334
+ * $Id: demo_defkey.c,v 1.16 2006/04/01 19:08:03 tom Exp $
23335
*
23336
* Demonstrate the define_key() function.
23337
* Thomas Dickey - 2002/11/23
23338
@@ -9,8 +36,6 @@
23339
23340
#if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
23341
23342
-#include <term.h>
23343
-
23344
#define MY_LOGFILE "demo_defkey.log"
23345
23346
/*
23347
@@ -24,9 +49,12 @@ log_last_line(WINDOW *win)
23348
char temp[256];
23349
23350
if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
23351
+ int need = sizeof(temp) - 1;
23352
+ if (need > COLS)
23353
+ need = COLS;
23354
getyx(win, y, x);
23355
wmove(win, y - 1, 0);
23356
- n = winnstr(win, temp, sizeof(temp));
23357
+ n = winnstr(win, temp, need);
23358
while (n-- > 0) {
23359
if (isspace(UChar(temp[n])))
23360
temp[n] = '\0';
23361
@@ -120,6 +148,8 @@ really_define_key(WINDOW *win, const cha
23362
vis_string = 0;
23363
}
23364
23365
+ if (vis_string != 0)
23366
+ free(vis_string);
23367
vis_string = visible(new_string);
23368
if ((rc = key_defined(new_string)) > 0) {
23369
wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
23370
@@ -141,7 +171,7 @@ really_define_key(WINDOW *win, const cha
23371
wprintw(win, "%s deleted\n", code_name);
23372
log_last_line(win);
23373
}
23374
- if (vis_string != 0 && *vis_string != 0)
23375
+ if (vis_string != 0)
23376
free(vis_string);
23377
if (old_string != 0)
23378
free(old_string);
23379
@@ -236,9 +266,11 @@ main(int argc GCC_UNUSED, char *argv[]GC
23380
name != 0 ? name : "<null>");
23381
log_last_line(win);
23382
wclrtoeol(win);
23383
+ if (ch == 'q')
23384
+ break;
23385
}
23386
endwin();
23387
- return EXIT_SUCCESS;
23388
+ ExitProgram(EXIT_FAILURE);
23389
}
23390
#else
23391
int
23392
Index: ncurses-5.5/test/demo_forms.c
23393
===================================================================
23394
--- ncurses-5.5.orig/test/demo_forms.c 2005-10-08 17:54:20.000000000 -0400
23395
+++ ncurses-5.5/test/demo_forms.c 2006-04-18 15:47:22.000000000 -0400
23396
@@ -1,5 +1,32 @@
23397
+/****************************************************************************
23398
+ * Copyright (c) 1993-2004,2005 Free Software Foundation, Inc. *
23399
+ * *
23400
+ * Permission is hereby granted, free of charge, to any person obtaining a *
23401
+ * copy of this software and associated documentation files (the *
23402
+ * "Software"), to deal in the Software without restriction, including *
23403
+ * without limitation the rights to use, copy, modify, merge, publish, *
23404
+ * distribute, distribute with modifications, sublicense, and/or sell *
23405
+ * copies of the Software, and to permit persons to whom the Software is *
23406
+ * furnished to do so, subject to the following conditions: *
23407
+ * *
23408
+ * The above copyright notice and this permission notice shall be included *
23409
+ * in all copies or substantial portions of the Software. *
23410
+ * *
23411
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
23412
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
23413
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
23414
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
23415
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
23416
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
23417
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23418
+ * *
23419
+ * Except as contained in this notice, the name(s) of the above copyright *
23420
+ * holders shall not be used in advertising or otherwise to promote the *
23421
+ * sale, use or other dealings in this Software without prior written *
23422
+ * authorization. *
23423
+ ****************************************************************************/
23424
/*
23425
- * $Id: demo_forms.c,v 1.18 2005/10/08 21:54:20 tom Exp $
23426
+ * $Id: demo_forms.c,v 1.19 2005/12/31 16:55:09 tom Exp $
23427
*
23428
* Demonstrate a variety of functions from the form library.
23429
* Thomas Dickey - 2003/4/26
23430
Index: ncurses-5.5/test/demo_termcap.c
23431
===================================================================
23432
--- ncurses-5.5.orig/test/demo_termcap.c 2005-04-30 10:57:54.000000000 -0400
23433
+++ ncurses-5.5/test/demo_termcap.c 2006-04-18 15:47:22.000000000 -0400
23434
@@ -1,5 +1,5 @@
23435
/****************************************************************************
23436
- * Copyright (c) 2005 Free Software Foundation, Inc. *
23437
+ * Copyright (c) 2005,2006 Free Software Foundation, Inc. *
23438
* *
23439
* Permission is hereby granted, free of charge, to any person obtaining a *
23440
* copy of this software and associated documentation files (the *
23441
@@ -29,12 +29,14 @@
23442
/*
23443
* Author: Thomas E. Dickey
23444
*
23445
- * $Id: demo_termcap.c,v 1.2 2005/04/30 14:57:54 tom Exp $
23446
+ * $Id: demo_termcap.c,v 1.4 2006/01/21 23:43:53 tom Exp $
23447
*
23448
* A simple demo of the termcap interface.
23449
*/
23450
#include <test.priv.h>
23451
23452
+#if HAVE_TGETENT
23453
+
23454
#define isCapName(c) (isgraph(c) && strchr("^#=:\\", c) == 0)
23455
23456
static void
23457
@@ -113,7 +115,7 @@ dumpit(char *cap)
23458
}
23459
23460
static void
23461
-demo_termcap(char *name)
23462
+demo_termcap(const char *name)
23463
{
23464
char buffer[1024];
23465
23466
@@ -155,3 +157,12 @@ main(int argc, char *argv[])
23467
23468
ExitProgram(EXIT_SUCCESS);
23469
}
23470
+#else
23471
+int
23472
+main(int argc GCC_UNUSED,
23473
+ char *argv[]GCC_UNUSED)
23474
+{
23475
+ printf("This program requires termcap\n");
23476
+ exit(EXIT_FAILURE);
23477
+}
23478
+#endif
23479
Index: ncurses-5.5/test/dots.c
23480
===================================================================
23481
--- ncurses-5.5.orig/test/dots.c 2005-05-28 17:38:45.000000000 -0400
23482
+++ ncurses-5.5/test/dots.c 2006-04-18 15:47:22.000000000 -0400
23483
@@ -1,5 +1,5 @@
23484
/****************************************************************************
23485
- * Copyright (c) 1999-2002,2004 Free Software Foundation, Inc. *
23486
+ * Copyright (c) 1999-2004,2005 Free Software Foundation, Inc. *
23487
* *
23488
* Permission is hereby granted, free of charge, to any person obtaining a *
23489
* copy of this software and associated documentation files (the *
23490
@@ -29,12 +29,14 @@
23491
/*
23492
* Author: Thomas E. Dickey <dickey@clark.net> 1999
23493
*
23494
- * $Id: dots.c,v 1.11 2005/05/28 21:38:45 tom Exp $
23495
+ * $Id: dots.c,v 1.12 2005/12/31 17:02:15 tom Exp $
23496
*
23497
* A simple demo of the terminfo interface.
23498
*/
23499
#include <test.priv.h>
23500
23501
+#if HAVE_SETUPTERM
23502
+
23503
#include <time.h>
23504
23505
#define valid(s) ((s != 0) && s != (char *)-1)
23506
@@ -142,3 +144,12 @@ main(
23507
fflush(stdout);
23508
}
23509
}
23510
+#else
23511
+int
23512
+main(int argc GCC_UNUSED,
23513
+ char *argv[]GCC_UNUSED)
23514
+{
23515
+ fprintf(stderr, "This program requires terminfo\n");
23516
+ exit(EXIT_FAILURE);
23517
+}
23518
+#endif
23519
Index: ncurses-5.5/test/filter.c
23520
===================================================================
23521
--- ncurses-5.5.orig/test/filter.c 2004-06-05 17:57:30.000000000 -0400
23522
+++ ncurses-5.5/test/filter.c 2006-04-18 15:47:22.000000000 -0400
23523
@@ -1,5 +1,5 @@
23524
/****************************************************************************
23525
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. *
23526
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
23527
* *
23528
* Permission is hereby granted, free of charge, to any person obtaining a *
23529
* copy of this software and associated documentation files (the *
23530
@@ -29,10 +29,12 @@
23531
/*
23532
* Author: Thomas E. Dickey <dickey@clark.net> 1998
23533
*
23534
- * $Id: filter.c,v 1.8 2004/06/05 21:57:30 tom Exp $
23535
+ * $Id: filter.c,v 1.10 2006/01/12 00:24:13 tom Exp $
23536
*/
23537
#include <test.priv.h>
23538
23539
+#if HAVE_FILTER
23540
+
23541
/*
23542
* An example of the 'filter()' function in ncurses, this program prompts
23543
* for commands and executes them (like a command shell). It illustrates
23544
@@ -54,6 +56,21 @@ new_command(char *buffer, int length, at
23545
printw("Command: ");
23546
attron(underline);
23547
code = getnstr(buffer, length);
23548
+ /*
23549
+ * If this returns anything except ERR/OK, it would be one of ncurses's
23550
+ * extensions. Fill the buffer with something harmless that the shell
23551
+ * will execute as a comment.
23552
+ */
23553
+#ifdef KEY_EVENT
23554
+ if (code == KEY_EVENT)
23555
+ strcpy(buffer, "# event!");
23556
+#endif
23557
+#ifdef KEY_RESIZE
23558
+ if (code == KEY_RESIZE) {
23559
+ strcpy(buffer, "# resize!");
23560
+ getch();
23561
+ }
23562
+#endif
23563
attroff(underline);
23564
attroff(A_BOLD);
23565
printw("\n");
23566
@@ -66,6 +83,7 @@ main(int argc GCC_UNUSED, char *argv[]GC
23567
{
23568
char buffer[80];
23569
attr_t underline;
23570
+ int code;
23571
23572
setlocale(LC_ALL, "");
23573
23574
@@ -87,7 +105,7 @@ main(int argc GCC_UNUSED, char *argv[]GC
23575
underline = A_UNDERLINE;
23576
}
23577
23578
- while (new_command(buffer, sizeof(buffer) - 1, underline) != ERR
23579
+ while ((code = new_command(buffer, sizeof(buffer) - 1, underline)) != ERR
23580
&& strlen(buffer) != 0) {
23581
reset_shell_mode();
23582
printf("\n");
23583
@@ -103,3 +121,11 @@ main(int argc GCC_UNUSED, char *argv[]GC
23584
endwin();
23585
ExitProgram(EXIT_SUCCESS);
23586
}
23587
+#else
23588
+int
23589
+main(void)
23590
+{
23591
+ printf("This program requires the filter function\n");
23592
+ ExitProgram(EXIT_FAILURE);
23593
+}
23594
+#endif /* HAVE_FILTER */
23595
Index: ncurses-5.5/test/inserts.c
23596
===================================================================
23597
--- ncurses-5.5.orig/test/inserts.c 2005-04-16 11:56:42.000000000 -0400
23598
+++ ncurses-5.5/test/inserts.c 2006-04-18 15:47:22.000000000 -0400
23599
@@ -1,5 +1,32 @@
23600
+/****************************************************************************
23601
+ * Copyright (c) 2002-2004,2005 Free Software Foundation, Inc. *
23602
+ * *
23603
+ * Permission is hereby granted, free of charge, to any person obtaining a *
23604
+ * copy of this software and associated documentation files (the *
23605
+ * "Software"), to deal in the Software without restriction, including *
23606
+ * without limitation the rights to use, copy, modify, merge, publish, *
23607
+ * distribute, distribute with modifications, sublicense, and/or sell *
23608
+ * copies of the Software, and to permit persons to whom the Software is *
23609
+ * furnished to do so, subject to the following conditions: *
23610
+ * *
23611
+ * The above copyright notice and this permission notice shall be included *
23612
+ * in all copies or substantial portions of the Software. *
23613
+ * *
23614
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
23615
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
23616
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
23617
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
23618
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
23619
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
23620
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23621
+ * *
23622
+ * Except as contained in this notice, the name(s) of the above copyright *
23623
+ * holders shall not be used in advertising or otherwise to promote the *
23624
+ * sale, use or other dealings in this Software without prior written *
23625
+ * authorization. *
23626
+ ****************************************************************************/
23627
/*
23628
- * $Id: inserts.c,v 1.13 2005/04/16 15:56:42 tom Exp $
23629
+ * $Id: inserts.c,v 1.14 2005/12/31 16:56:41 tom Exp $
23630
*
23631
* Demonstrate the winsstr() and winsch functions.
23632
* Thomas Dickey - 2002/10/19
23633
@@ -7,6 +34,8 @@
23634
23635
#include <test.priv.h>
23636
23637
+#if HAVE_WINSSTR
23638
+
23639
#define InsNStr insnstr
23640
#define InsStr insstr
23641
#define MvInsNStr mvinsnstr
23642
@@ -397,3 +426,11 @@ main(int argc GCC_UNUSED, char *argv[]GC
23643
endwin();
23644
ExitProgram(EXIT_SUCCESS);
23645
}
23646
+#else
23647
+int
23648
+main(void)
23649
+{
23650
+ printf("This program requires the winsstr function\n");
23651
+ ExitProgram(EXIT_FAILURE);
23652
+}
23653
+#endif /* HAVE_WINSSTR */
23654
Index: ncurses-5.5/test/lrtest.c
23655
===================================================================
23656
--- ncurses-5.5.orig/test/lrtest.c 2004-08-07 12:08:01.000000000 -0400
23657
+++ ncurses-5.5/test/lrtest.c 2006-04-18 15:47:22.000000000 -0400
23658
@@ -1,3 +1,30 @@
23659
+/****************************************************************************
23660
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
23661
+ * *
23662
+ * Permission is hereby granted, free of charge, to any person obtaining a *
23663
+ * copy of this software and associated documentation files (the *
23664
+ * "Software"), to deal in the Software without restriction, including *
23665
+ * without limitation the rights to use, copy, modify, merge, publish, *
23666
+ * distribute, distribute with modifications, sublicense, and/or sell *
23667
+ * copies of the Software, and to permit persons to whom the Software is *
23668
+ * furnished to do so, subject to the following conditions: *
23669
+ * *
23670
+ * The above copyright notice and this permission notice shall be included *
23671
+ * in all copies or substantial portions of the Software. *
23672
+ * *
23673
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
23674
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
23675
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
23676
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
23677
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
23678
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
23679
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23680
+ * *
23681
+ * Except as contained in this notice, the name(s) of the above copyright *
23682
+ * holders shall not be used in advertising or otherwise to promote the *
23683
+ * sale, use or other dealings in this Software without prior written *
23684
+ * authorization. *
23685
+ ****************************************************************************/
23686
/*
23687
* Test lower-right-hand corner access
23688
*
23689
@@ -7,7 +34,7 @@
23690
* This can't be part of the ncurses test-program, because ncurses rips off the
23691
* bottom line to do labels.
23692
*
23693
- * $Id: lrtest.c,v 1.20 2004/08/07 16:08:01 tom Exp $
23694
+ * $Id: lrtest.c,v 1.21 2005/12/31 16:51:53 tom Exp $
23695
*/
23696
23697
#include <test.priv.h>
23698
@@ -84,9 +111,12 @@ main(
23699
#endif
23700
move(LINES / 2 - 1, 4);
23701
if (!(has_ic()
23702
+#if HAVE_SETUPTERM
23703
/* see PutCharLR() */
23704
|| auto_right_margin
23705
- || (enter_am_mode && exit_am_mode))) {
23706
+ || (enter_am_mode && exit_am_mode)
23707
+#endif
23708
+ )) {
23709
addstr("Your terminal lacks the capabilities needed to address the\n");
23710
move(LINES / 2, 4);
23711
addstr("lower-right-hand corner of the screen.\n");
23712
Index: ncurses-5.5/test/modules
23713
===================================================================
23714
--- ncurses-5.5.orig/test/modules 2005-09-24 20:56:17.000000000 -0400
23715
+++ ncurses-5.5/test/modules 2006-04-18 15:48:06.000000000 -0400
23716
@@ -1,5 +1,5 @@
23717
# Test-Program modules
23718
-# $Id: modules,v 1.23 2005/09/25 00:56:17 tom Exp $
23719
+# $Id: modules,v 1.25 2006/02/11 19:15:30 tom Exp $
23720
##############################################################################
23721
# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. #
23722
# #
23723
@@ -37,6 +37,7 @@ blue progs $(srcdir) $(HEADER_DEPS)
23724
bs progs $(srcdir) $(HEADER_DEPS)
23725
cardfile progs $(srcdir) $(HEADER_DEPS) ../include/panel.h ../include/form.h
23726
color_set progs $(srcdir) $(HEADER_DEPS)
23727
+demo_altkeys progs $(srcdir) $(HEADER_DEPS)
23728
demo_defkey progs $(srcdir) $(HEADER_DEPS)
23729
demo_keyok progs $(srcdir) $(HEADER_DEPS)
23730
demo_forms progs $(srcdir) $(HEADER_DEPS) ../include/form.h $(srcdir)/edit_field.h
23731
@@ -58,9 +59,11 @@ keynames progs $(srcdir) $(HEADER_DEPS)
23732
knight progs $(srcdir) $(HEADER_DEPS)
23733
lrtest progs $(srcdir) $(HEADER_DEPS)
23734
ncurses progs $(srcdir) $(HEADER_DEPS) ../include/panel.h ../include/menu.h ../include/form.h
23735
+movewindow progs $(srcdir) $(HEADER_DEPS)
23736
newdemo progs $(srcdir) $(HEADER_DEPS)
23737
railroad progs $(srcdir) $(HEADER_DEPS)
23738
rain progs $(srcdir) $(HEADER_DEPS)
23739
+savescreen progs $(srcdir) $(HEADER_DEPS)
23740
tclock progs $(srcdir) $(HEADER_DEPS)
23741
testaddch progs $(srcdir) $(HEADER_DEPS)
23742
testcurs progs $(srcdir) $(HEADER_DEPS)
23743
Index: ncurses-5.5/test/ncurses.c
23744
===================================================================
23745
--- ncurses-5.5.orig/test/ncurses.c 2005-10-01 12:00:56.000000000 -0400
23746
+++ ncurses-5.5/test/ncurses.c 2006-04-18 15:48:07.000000000 -0400
23747
@@ -1,5 +1,5 @@
23748
/****************************************************************************
23749
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
23750
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
23751
* *
23752
* Permission is hereby granted, free of charge, to any person obtaining a *
23753
* copy of this software and associated documentation files (the *
23754
@@ -40,7 +40,7 @@ AUTHOR
23755
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
23756
Thomas E. Dickey (beginning revision 1.27 in 1996).
23757
23758
-$Id: ncurses.c,v 1.253 2005/10/01 16:00:56 tom Exp $
23759
+$Id: ncurses.c,v 1.274 2006/04/08 16:14:15 tom Exp $
23760
23761
***************************************************************************/
23762
23763
@@ -69,6 +69,8 @@ $Id: ncurses.c,v 1.253 2005/10/01 16:00:
23764
23765
#ifdef NCURSES_VERSION
23766
23767
+#define NCURSES_CONST_PARAM const void
23768
+
23769
#ifdef TRACE
23770
static unsigned save_trace = TRACE_ORDINARY | TRACE_CALLS;
23771
extern unsigned _nc_tracing;
23772
@@ -76,8 +78,11 @@ extern unsigned _nc_tracing;
23773
23774
#else
23775
23776
+#define NCURSES_CONST_PARAM char
23777
+
23778
#define mmask_t chtype /* not specified in XSI */
23779
23780
+#ifndef ACS_S3
23781
#ifdef CURSES_ACS_ARRAY
23782
#define ACS_S3 (CURSES_ACS_ARRAY['p']) /* scan line 3 */
23783
#define ACS_S7 (CURSES_ACS_ARRAY['r']) /* scan line 7 */
23784
@@ -95,6 +100,7 @@ extern unsigned _nc_tracing;
23785
#define ACS_NEQUAL (A_ALTCHARSET + '|') /* not equal */
23786
#define ACS_STERLING (A_ALTCHARSET + '}') /* UK pound sign */
23787
#endif
23788
+#endif /* ACS_S3 */
23789
23790
#ifdef CURSES_WACS_ARRAY
23791
#define WACS_S3 (&(CURSES_WACS_ARRAY['p'])) /* scan line 3 */
23792
@@ -154,6 +160,13 @@ Repaint(void)
23793
wrefresh(curscr);
23794
}
23795
23796
+static bool
23797
+isQuit(int c)
23798
+{
23799
+ return ((c) == QUIT || (c) == ESCAPE);
23800
+}
23801
+#define case_QUIT case QUIT: case ESCAPE
23802
+
23803
/* Common function to allow ^T to toggle trace-mode in the middle of a test
23804
* so that trace-files can be made smaller.
23805
*/
23806
@@ -507,15 +520,15 @@ wgetch_help(WINDOW *win, bool flags[])
23807
{
23808
static const char *help[] =
23809
{
23810
- "e -- toggle echo mode"
23811
- ,"g -- triggers a getstr test"
23812
- ,"k -- toggle keypad/literal mode"
23813
- ,"m -- toggle meta (7-bit/8-bit) mode"
23814
- ,"q -- quit (x also exits)"
23815
- ,"s -- shell out\n"
23816
- ,"w -- create a new window"
23817
+ "e -- toggle echo mode"
23818
+ ,"g -- triggers a getstr test"
23819
+ ,"k -- toggle keypad/literal mode"
23820
+ ,"m -- toggle meta (7-bit/8-bit) mode"
23821
+ ,"^q -- quit"
23822
+ ,"s -- shell out\n"
23823
+ ,"w -- create a new window"
23824
#ifdef SIGTSTP
23825
- ,"z -- suspend this process"
23826
+ ,"z -- suspend this process"
23827
#endif
23828
};
23829
int y, x;
23830
@@ -565,6 +578,16 @@ static WINSTACK *winstack = 0;
23831
static unsigned len_winstack = 0;
23832
23833
static void
23834
+forget_boxes(void)
23835
+{
23836
+ if (winstack != 0) {
23837
+ free(winstack);
23838
+ }
23839
+ winstack = 0;
23840
+ len_winstack = 0;
23841
+}
23842
+
23843
+static void
23844
remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win)
23845
{
23846
unsigned need = (level + 1) * 2;
23847
@@ -595,10 +618,12 @@ resize_boxes(unsigned level, WINDOW *win
23848
touchwin(stdscr);
23849
wnoutrefresh(stdscr);
23850
23851
+#if USE_SOFTKEYS
23852
/* FIXME: this chunk should be done in resizeterm() */
23853
slk_touch();
23854
slk_clear();
23855
slk_noutrefresh();
23856
+#endif
23857
23858
for (n = 0; n < level; ++n) {
23859
wresize(winstack[n].frame, high, wide);
23860
@@ -619,6 +644,7 @@ resize_boxes(unsigned level, WINDOW *win
23861
doupdate();
23862
}
23863
#else
23864
+#define forget_boxes() /* nothing */
23865
#define remember_boxes(level,text,frame) /* nothing */
23866
#endif
23867
23868
@@ -657,7 +683,7 @@ wgetch_test(unsigned level, WINDOW *win,
23869
if (c == ERR && blocking) {
23870
wprintw(win, "ERR");
23871
wgetch_wrap(win, first_y);
23872
- } else if (c == 'x' || c == 'q') {
23873
+ } else if (isQuit(c)) {
23874
break;
23875
} else if (c == 'e') {
23876
flags[UChar('e')] = !flags[UChar('e')];
23877
@@ -799,6 +825,7 @@ getch_test(void)
23878
{
23879
int delay = begin_getch_test();
23880
wgetch_test(0, stdscr, delay);
23881
+ forget_boxes();
23882
finish_getch_test();
23883
}
23884
23885
@@ -819,10 +846,12 @@ resize_wide_boxes(unsigned level, WINDOW
23886
touchwin(stdscr);
23887
wnoutrefresh(stdscr);
23888
23889
+#if USE_SOFTKEYS
23890
/* FIXME: this chunk should be done in resizeterm() */
23891
slk_touch();
23892
slk_clear();
23893
slk_noutrefresh();
23894
+#endif
23895
23896
for (n = 0; n < level; ++n) {
23897
wresize(winstack[n].frame, high, wide);
23898
@@ -903,7 +932,7 @@ wget_wch_test(unsigned level, WINDOW *wi
23899
if (code == ERR && blocking) {
23900
wprintw(win, "ERR");
23901
wgetch_wrap(win, first_y);
23902
- } else if (c == 'x' || c == 'q') {
23903
+ } else if (isQuit(c)) {
23904
break;
23905
} else if (c == 'e') {
23906
flags[UChar('e')] = !flags[UChar('e')];
23907
@@ -1011,6 +1040,7 @@ get_wch_test(void)
23908
{
23909
int delay = begin_getch_test();
23910
wget_wch_test(0, stdscr, delay);
23911
+ forget_boxes();
23912
finish_getch_test();
23913
}
23914
#endif
23915
@@ -1021,6 +1051,52 @@ get_wch_test(void)
23916
*
23917
****************************************************************************/
23918
23919
+#if HAVE_SETUPTERM || HAVE_TGETENT
23920
+#define get_ncv() TIGETNUM("ncv","NC")
23921
+#define get_xmc() TIGETNUM("xmc","sg")
23922
+#else
23923
+#define get_ncv() -1
23924
+#define get_xmc() -1
23925
+#endif
23926
+
23927
+#if !HAVE_TERMATTRS
23928
+static chtype
23929
+my_termattrs(void)
23930
+{
23931
+ static int first = TRUE;
23932
+ static chtype result = 0;
23933
+
23934
+ if (first) {
23935
+#if !HAVE_TIGETSTR
23936
+ char buffer[4096];
23937
+ char parsed[4096];
23938
+ char *area_pointer = parsed;
23939
+
23940
+ tgetent(buffer, getenv("TERM"));
23941
+#endif
23942
+
23943
+ if (TIGETSTR("smso", "so"))
23944
+ result |= A_STANDOUT;
23945
+ if (TIGETSTR("smul", "us"))
23946
+ result |= A_UNDERLINE;
23947
+ if (TIGETSTR("rev", "mr"))
23948
+ result |= A_REVERSE;
23949
+ if (TIGETSTR("blink", "mb"))
23950
+ result |= A_BLINK;
23951
+ if (TIGETSTR("dim", "mh"))
23952
+ result |= A_DIM;
23953
+ if (TIGETSTR("bold", "md"))
23954
+ result |= A_BOLD;
23955
+ if (TIGETSTR("smacs", "ac"))
23956
+ result |= A_ALTCHARSET;
23957
+
23958
+ first = FALSE;
23959
+ }
23960
+ return result;
23961
+}
23962
+#define termattrs() my_termattrs()
23963
+#endif
23964
+
23965
#define MAX_ATTRSTRING 31
23966
#define LEN_ATTRSTRING 26
23967
23968
@@ -1033,7 +1109,7 @@ attr_legend(WINDOW *helpwin)
23969
int col = 1;
23970
23971
mvwprintw(helpwin, row++, col,
23972
- "q or ESC to exit.");
23973
+ "CTL/q or ESC to exit.");
23974
mvwprintw(helpwin, row++, col,
23975
"^L repaints.");
23976
++row;
23977
@@ -1070,7 +1146,7 @@ show_color_attr(int fg, int bg, int tx)
23978
}
23979
23980
static bool
23981
-cycle_color_attr(int ch, int *fg, int *bg, int *tx)
23982
+cycle_color_attr(int ch, short *fg, short *bg, short *tx)
23983
{
23984
bool error = FALSE;
23985
23986
@@ -1152,7 +1228,7 @@ init_attr_string(void)
23987
static int
23988
show_attr(int row, int skip, bool arrow, chtype attr, const char *name)
23989
{
23990
- int ncv = tigetnum("ncv");
23991
+ int ncv = get_ncv();
23992
chtype test = attr & (chtype) (~A_ALTCHARSET);
23993
23994
if (arrow)
23995
@@ -1195,7 +1271,9 @@ show_attr(int row, int skip, bool arrow,
23996
A_BLINK,
23997
A_DIM,
23998
A_BOLD,
23999
+#ifdef A_INVIS
24000
A_INVIS,
24001
+#endif
24002
A_PROTECT,
24003
A_ALTCHARSET
24004
};
24005
@@ -1229,13 +1307,15 @@ static const struct {
24006
{ A_DIM, "DIM" },
24007
{ A_BLINK, "BLINK" },
24008
{ A_PROTECT, "PROTECT" },
24009
+#ifdef A_INVIS
24010
{ A_INVIS, "INVISIBLE" },
24011
+#endif
24012
{ A_NORMAL, "NORMAL" },
24013
};
24014
/* *INDENT-ON* */
24015
24016
static bool
24017
-attr_getc(int *skip, int *fg, int *bg, int *tx, int *ac, unsigned *kc)
24018
+attr_getc(int *skip, short *fg, short *bg, short *tx, int *ac, unsigned *kc)
24019
{
24020
bool result = TRUE;
24021
bool error = FALSE;
24022
@@ -1283,8 +1363,7 @@ attr_getc(int *skip, int *fg, int *bg, i
24023
case '>':
24024
adjust_attr_string(1);
24025
break;
24026
- case 'q':
24027
- case ESCAPE:
24028
+ case_QUIT:
24029
result = FALSE;
24030
break;
24031
default:
24032
@@ -1301,10 +1380,10 @@ attr_test(void)
24033
/* test text attributes */
24034
{
24035
int n;
24036
- int skip = tigetnum("xmc");
24037
- int fg = COLOR_BLACK; /* color pair 0 is special */
24038
- int bg = COLOR_BLACK;
24039
- int tx = -1;
24040
+ int skip = get_xmc();
24041
+ short fg = COLOR_BLACK; /* color pair 0 is special */
24042
+ short bg = COLOR_BLACK;
24043
+ short tx = -1;
24044
int ac = 0;
24045
unsigned j, k;
24046
24047
@@ -1321,7 +1400,7 @@ attr_test(void)
24048
chtype extras = ac;
24049
24050
if (has_colors()) {
24051
- int pair = (fg != COLOR_BLACK || bg != COLOR_BLACK);
24052
+ short pair = (fg != COLOR_BLACK || bg != COLOR_BLACK);
24053
if (pair != 0) {
24054
pair = 1;
24055
if (init_pair(pair, fg, bg) == ERR) {
24056
@@ -1347,7 +1426,8 @@ attr_test(void)
24057
mvaddstr(0, 20, "Character attribute test display");
24058
24059
for (j = 0; j < SIZEOF(attrs_to_test); ++j) {
24060
- row = show_attr(row, n, j == k,
24061
+ bool arrow = (j == k);
24062
+ row = show_attr(row, n, arrow,
24063
extras |
24064
attrs_to_test[j].attr |
24065
attrs_to_test[k].attr,
24066
@@ -1356,7 +1436,7 @@ attr_test(void)
24067
24068
mvprintw(row, 8,
24069
"This terminal does %shave the magic-cookie glitch",
24070
- tigetnum("xmc") > -1 ? "" : "not ");
24071
+ get_xmc() > -1 ? "" : "not ");
24072
mvprintw(row + 1, 8, "Enter '?' for help.");
24073
show_color_attr(fg, bg, tx);
24074
printw(" ACS (%d)", ac != 0);
24075
@@ -1423,10 +1503,10 @@ get_wide_background(void)
24076
attr_t attr;
24077
cchar_t ch;
24078
short pair;
24079
- wchar_t wch;
24080
+ wchar_t wch[10];
24081
24082
if (getbkgrnd(&ch) != ERR) {
24083
- if (getcchar(&ch, &wch, &attr, &pair, 0) != ERR) {
24084
+ if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) {
24085
result = attr;
24086
}
24087
}
24088
@@ -1436,7 +1516,7 @@ get_wide_background(void)
24089
static int
24090
wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const char *name)
24091
{
24092
- int ncv = tigetnum("ncv");
24093
+ int ncv = get_ncv();
24094
chtype test = attr & ~WA_ALTCHARSET;
24095
24096
if (arrow)
24097
@@ -1511,7 +1591,7 @@ wide_show_attr(int row, int skip, bool a
24098
}
24099
24100
static bool
24101
-wide_attr_getc(int *skip, int *fg, int *bg, int *tx, int *ac, unsigned *kc)
24102
+wide_attr_getc(int *skip, short *fg, short *bg, short *tx, int *ac, unsigned *kc)
24103
{
24104
bool result = TRUE;
24105
bool error = FALSE;
24106
@@ -1559,8 +1639,7 @@ wide_attr_getc(int *skip, int *fg, int *
24107
case '>':
24108
wide_adjust_attr_string(1);
24109
break;
24110
- case 'q':
24111
- case ESCAPE:
24112
+ case_QUIT:
24113
result = FALSE;
24114
break;
24115
default:
24116
@@ -1577,10 +1656,10 @@ wide_attr_test(void)
24117
/* test text attributes using wide-character calls */
24118
{
24119
int n;
24120
- int skip = tigetnum("xmc");
24121
- int fg = COLOR_BLACK; /* color pair 0 is special */
24122
- int bg = COLOR_BLACK;
24123
- int tx = -1;
24124
+ int skip = get_xmc();
24125
+ short fg = COLOR_BLACK; /* color pair 0 is special */
24126
+ short bg = COLOR_BLACK;
24127
+ short tx = -1;
24128
int ac = 0;
24129
unsigned j, k;
24130
24131
@@ -1629,7 +1708,7 @@ wide_attr_test(void)
24132
24133
mvprintw(row, 8,
24134
"This terminal does %shave the magic-cookie glitch",
24135
- tigetnum("xmc") > -1 ? "" : "not ");
24136
+ get_xmc() > -1 ? "" : "not ");
24137
mvprintw(row + 1, 8, "Enter '?' for help.");
24138
show_color_attr(fg, bg, tx);
24139
printw(" ACS (%d)", ac != 0);
24140
@@ -1695,7 +1774,7 @@ color_legend(WINDOW *helpwin)
24141
int col = 1;
24142
24143
mvwprintw(helpwin, row++, col,
24144
- "q or ESC to exit.");
24145
+ "CTL/q or ESC to exit.");
24146
++row;
24147
mvwprintw(helpwin, row++, col,
24148
"Use up/down arrow to scroll through the display if it is");
24149
@@ -1723,7 +1802,7 @@ static void
24150
color_test(void)
24151
{
24152
int c;
24153
- int i;
24154
+ short i;
24155
int top = 0, width;
24156
int base_row = 0;
24157
int grid_top = top + 3;
24158
@@ -1777,10 +1856,13 @@ color_test(void)
24159
for (i = (base_row * per_row); i < pairs_max; i++) {
24160
int row = grid_top + (i / per_row) - base_row;
24161
int col = (i % per_row + 1) * width;
24162
- int pair = i;
24163
+ short pair = i;
24164
24165
if (row >= 0 && move(row, col) != ERR) {
24166
- init_pair(pair, i % COLORS, i / COLORS);
24167
+ short fg = i % COLORS;
24168
+ short bg = i / COLORS;
24169
+
24170
+ init_pair(pair, fg, bg);
24171
attron((attr_t) COLOR_PAIR(pair));
24172
if (opt_bold)
24173
attron((attr_t) A_BOLD);
24174
@@ -1814,8 +1896,7 @@ color_test(void)
24175
case 'N':
24176
opt_nums = TRUE;
24177
break;
24178
- case ESCAPE:
24179
- case 'q':
24180
+ case_QUIT:
24181
done = TRUE;
24182
continue;
24183
case 'w':
24184
@@ -1975,8 +2056,7 @@ wide_color_test(void)
24185
case 'N':
24186
opt_nums = TRUE;
24187
break;
24188
- case ESCAPE:
24189
- case 'q':
24190
+ case_QUIT:
24191
done = TRUE;
24192
continue;
24193
case 'w':
24194
@@ -2044,24 +2124,21 @@ wide_color_test(void)
24195
#endif /* USE_WIDEC_SUPPORT */
24196
24197
static void
24198
-change_color(int current, int field, int value, int usebase)
24199
+change_color(short current, int field, int value, int usebase)
24200
{
24201
short red, green, blue;
24202
24203
- if (usebase)
24204
- color_content(current, &red, &green, &blue);
24205
- else
24206
- red = green = blue = 0;
24207
+ color_content(current, &red, &green, &blue);
24208
24209
switch (field) {
24210
case 0:
24211
- red += value;
24212
+ red = usebase ? red + value : value;
24213
break;
24214
case 1:
24215
- green += value;
24216
+ green = usebase ? green + value : value;
24217
break;
24218
case 2:
24219
- blue += value;
24220
+ blue = usebase ? blue + value : value;
24221
break;
24222
}
24223
24224
@@ -2072,7 +2149,8 @@ change_color(int current, int field, int
24225
static void
24226
init_all_colors(void)
24227
{
24228
- int c;
24229
+ short c;
24230
+
24231
for (c = 0; c < COLORS; ++c)
24232
init_color(c,
24233
all_colors[c].red,
24234
@@ -2086,7 +2164,9 @@ static void
24235
color_edit(void)
24236
/* display the color test pattern, without trying to edit colors */
24237
{
24238
- int i, this_c = 0, value = 0, current = 0, field = 0;
24239
+ short i;
24240
+ short current = 0;
24241
+ int this_c = 0, value = 0, field = 0;
24242
int last_c;
24243
int top_color = 0;
24244
int page_size = (LINES - 6);
24245
@@ -2110,6 +2190,7 @@ color_edit(void)
24246
(i - top_color < page_size)
24247
&& (i < max_colors); i++) {
24248
char numeric[80];
24249
+
24250
sprintf(numeric, "[%d]", i);
24251
mvprintw(2 + i - top_color, 0, "%c %-8s:",
24252
(i == current ? '>' : ' '),
24253
@@ -2231,7 +2312,7 @@ color_edit(void)
24254
P("with a `+' or `-'.");
24255
P("");
24256
P("Press 'm' to invoke the top-level menu with the current color settings.");
24257
- P("To quit, do `x' or 'q'");
24258
+ P("To quit, do CTL/Q or ESC");
24259
24260
Pause();
24261
erase();
24262
@@ -2243,8 +2324,7 @@ color_edit(void)
24263
refresh();
24264
break;
24265
24266
- case 'x':
24267
- case 'q':
24268
+ case_QUIT:
24269
break;
24270
24271
default:
24272
@@ -2264,7 +2344,7 @@ color_edit(void)
24273
mvprintw(LINES - 1, 0, "Number: %d", value);
24274
clrtoeol();
24275
} while
24276
- (this_c != 'x' && this_c != 'q');
24277
+ (!isQuit(this_c));
24278
24279
erase();
24280
24281
@@ -2282,6 +2362,8 @@ color_edit(void)
24282
*
24283
****************************************************************************/
24284
24285
+#if USE_SOFTKEYS
24286
+
24287
#define SLK_HELP 17
24288
#define SLK_WORK (SLK_HELP + 3)
24289
24290
@@ -2303,7 +2385,7 @@ slk_help(void)
24291
#if HAVE_SLK_COLOR
24292
,"F/B -- cycle through foreground/background colors"
24293
#endif
24294
- ,"x, q -- return to main menu"
24295
+ ,"CTL/q, ESC -- return to main menu"
24296
,""
24297
,"Note: if activating the soft keys causes your terminal to scroll up"
24298
,"one line, your terminal auto-scrolls when anything is written to the"
24299
@@ -2319,6 +2401,18 @@ slk_help(void)
24300
refresh();
24301
}
24302
24303
+#if HAVE_SLK_COLOR
24304
+static void
24305
+call_slk_color(short fg, short bg)
24306
+{
24307
+ init_pair(1, bg, fg);
24308
+ slk_color(1);
24309
+ mvprintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg);
24310
+ clrtoeol();
24311
+ refresh();
24312
+}
24313
+#endif
24314
+
24315
static void
24316
slk_test(void)
24317
/* exercise the soft keys */
24318
@@ -2329,26 +2423,16 @@ slk_test(void)
24319
#if HAVE_SLK_COLOR
24320
short fg = COLOR_BLACK;
24321
short bg = COLOR_WHITE;
24322
- bool new_color = FALSE;
24323
#endif
24324
24325
c = CTRL('l');
24326
#if HAVE_SLK_COLOR
24327
if (has_colors()) {
24328
- new_color = TRUE;
24329
+ call_slk_color(fg, bg);
24330
}
24331
#endif
24332
24333
do {
24334
-#if HAVE_SLK_COLOR
24335
- if (new_color) {
24336
- init_pair(1, bg, fg);
24337
- slk_color(1);
24338
- new_color = FALSE;
24339
- mvprintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg);
24340
- refresh();
24341
- }
24342
-#endif
24343
move(0, 0);
24344
switch (c) {
24345
case CTRL('l'):
24346
@@ -2410,21 +2494,20 @@ slk_test(void)
24347
clrtobot();
24348
break;
24349
24350
- case 'x':
24351
- case 'q':
24352
+ case_QUIT:
24353
goto done;
24354
24355
#if HAVE_SLK_COLOR
24356
case 'F':
24357
if (has_colors()) {
24358
fg = (fg + 1) % COLORS;
24359
- new_color = TRUE;
24360
+ call_slk_color(fg, bg);
24361
}
24362
break;
24363
case 'B':
24364
if (has_colors()) {
24365
bg = (bg + 1) % COLORS;
24366
- new_color = TRUE;
24367
+ call_slk_color(fg, bg);
24368
}
24369
break;
24370
#endif
24371
@@ -2436,6 +2519,7 @@ slk_test(void)
24372
((c = Getchar()) != EOF);
24373
24374
done:
24375
+ slk_clear();
24376
erase();
24377
endwin();
24378
}
24379
@@ -2451,20 +2535,12 @@ wide_slk_test(void)
24380
char *s;
24381
short fg = COLOR_BLACK;
24382
short bg = COLOR_WHITE;
24383
- bool new_color = FALSE;
24384
24385
c = CTRL('l');
24386
if (has_colors()) {
24387
- new_color = TRUE;
24388
+ call_slk_color(fg, bg);
24389
}
24390
do {
24391
- if (new_color) {
24392
- init_pair(1, bg, fg);
24393
- slk_color(1);
24394
- new_color = FALSE;
24395
- mvprintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg);
24396
- refresh();
24397
- }
24398
move(0, 0);
24399
switch (c) {
24400
case CTRL('l'):
24401
@@ -2547,20 +2623,19 @@ wide_slk_test(void)
24402
clrtobot();
24403
break;
24404
24405
- case 'x':
24406
- case 'q':
24407
+ case_QUIT:
24408
goto done;
24409
24410
case 'F':
24411
if (has_colors()) {
24412
fg = (fg + 1) % COLORS;
24413
- new_color = TRUE;
24414
+ call_slk_color(fg, bg);
24415
}
24416
break;
24417
case 'B':
24418
if (has_colors()) {
24419
bg = (bg + 1) % COLORS;
24420
- new_color = TRUE;
24421
+ call_slk_color(fg, bg);
24422
}
24423
break;
24424
24425
@@ -2571,10 +2646,12 @@ wide_slk_test(void)
24426
((c = Getchar()) != EOF);
24427
24428
done:
24429
+ slk_clear();
24430
erase();
24431
endwin();
24432
}
24433
#endif
24434
+#endif /* SLK_INIT */
24435
24436
/****************************************************************************
24437
*
24438
@@ -2601,7 +2678,7 @@ show_upper_chars(unsigned first)
24439
refresh();
24440
24441
for (code = first; code <= last; code++) {
24442
- int row = 4 + ((code - first) % 16);
24443
+ int row = 2 + ((code - first) % 16);
24444
int col = ((code - first) / 16) * COLS / 2;
24445
char tmp[80];
24446
sprintf(tmp, "%3u (0x%x)", code, code);
24447
@@ -2621,6 +2698,44 @@ show_upper_chars(unsigned first)
24448
}
24449
24450
static void
24451
+show_pc_chars(void)
24452
+{
24453
+ unsigned code;
24454
+
24455
+ erase();
24456
+ attron(A_BOLD);
24457
+ mvprintw(0, 20, "Display of PC Character Codes");
24458
+ attroff(A_BOLD);
24459
+ refresh();
24460
+
24461
+ for (code = 0; code < 16; ++code) {
24462
+ mvprintw(2, code * 3 + 8, "%X", code);
24463
+ }
24464
+ for (code = 0; code < 256; code++) {
24465
+ int row = 3 + (code / 16) + (code >= 128);
24466
+ int col = 8 + (code % 16) * 3;
24467
+ if ((code % 16) == 0)
24468
+ mvprintw(row, 0, "0x%02x:", code);
24469
+ move(row, col);
24470
+ switch (code) {
24471
+ case '\n':
24472
+ case '\r':
24473
+ case '\b':
24474
+ case '\f':
24475
+ case '\033':
24476
+ case 0x9b:
24477
+ /*
24478
+ * Skip the ones that do not work.
24479
+ */
24480
+ break;
24481
+ default:
24482
+ addch(code | A_ALTCHARSET);
24483
+ break;
24484
+ }
24485
+ }
24486
+}
24487
+
24488
+static void
24489
show_box_chars(void)
24490
{
24491
erase();
24492
@@ -2645,7 +2760,7 @@ static int
24493
show_1_acs(int n, const char *name, chtype code)
24494
{
24495
const int height = 16;
24496
- int row = 4 + (n % height);
24497
+ int row = 2 + (n % height);
24498
int col = (n / height) * COLS / 2;
24499
mvprintw(row, col, "%*s : ", COLS / 4, name);
24500
addch(code);
24501
@@ -2679,6 +2794,10 @@ show_acs_chars(void)
24502
n = show_1_acs(n, BOTH(ACS_HLINE));
24503
n = show_1_acs(n, BOTH(ACS_VLINE));
24504
24505
+ /*
24506
+ * HPUX's ACS definitions are broken here. Just give up.
24507
+ */
24508
+#if !(defined(__hpux) && !defined(NCURSES_VERSION))
24509
n = show_1_acs(n, BOTH(ACS_LARROW));
24510
n = show_1_acs(n, BOTH(ACS_RARROW));
24511
n = show_1_acs(n, BOTH(ACS_UARROW));
24512
@@ -2704,12 +2823,17 @@ show_acs_chars(void)
24513
n = show_1_acs(n, BOTH(ACS_S3));
24514
n = show_1_acs(n, BOTH(ACS_S7));
24515
n = show_1_acs(n, BOTH(ACS_S9));
24516
+#endif
24517
}
24518
24519
static void
24520
acs_display(void)
24521
{
24522
int c = 'a';
24523
+ char *term = getenv("TERM");
24524
+ const char *pch_kludge = ((term != 0 && strstr(term, "linux"))
24525
+ ? "p=PC, "
24526
+ : "");
24527
24528
do {
24529
switch (c) {
24530
@@ -2719,7 +2843,7 @@ acs_display(void)
24531
case 'a':
24532
show_acs_chars();
24533
break;
24534
- case 'b':
24535
+ case 'x':
24536
show_box_chars();
24537
break;
24538
case '0':
24539
@@ -2728,13 +2852,20 @@ acs_display(void)
24540
case '3':
24541
show_upper_chars((unsigned) ((c - '0') * 32 + 128));
24542
break;
24543
+ case 'p':
24544
+ show_pc_chars();
24545
+ break;
24546
+ default:
24547
+ beep();
24548
+ break;
24549
}
24550
mvprintw(LINES - 3, 0,
24551
"Note: ANSI terminals may not display C1 characters.");
24552
mvprintw(LINES - 2, 0,
24553
- "Select: a=ACS, b=box, 0=C1, 1,2,3=GR characters, q=quit");
24554
+ "Select: a=ACS, x=box, %s0=C1, 1,2,3=GR characters, CTL/q=quit",
24555
+ pch_kludge);
24556
refresh();
24557
- } while ((c = Getchar()) != 'x' && c != 'q');
24558
+ } while (!isQuit(c = Getchar()));
24559
24560
Pause();
24561
erase();
24562
@@ -2742,8 +2873,29 @@ acs_display(void)
24563
}
24564
24565
#if USE_WIDEC_SUPPORT
24566
+static cchar_t *
24567
+merge_wide_attr(cchar_t *dst, cchar_t *src, attr_t attr, short pair)
24568
+{
24569
+ int count = getcchar(src, NULL, NULL, NULL, 0);
24570
+ wchar_t *wch = 0;
24571
+ attr_t ignore_attr;
24572
+ short ignore_pair;
24573
+
24574
+ *dst = *src;
24575
+ if (count > 0) {
24576
+ if ((wch = typeMalloc(wchar_t, count)) != 0) {
24577
+ if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) {
24578
+ attr |= (ignore_attr & A_ALTCHARSET);
24579
+ setcchar(dst, wch, attr, pair, 0);
24580
+ }
24581
+ free(wch);
24582
+ }
24583
+ }
24584
+ return dst;
24585
+}
24586
+
24587
static void
24588
-show_upper_widechars(int first, int repeat, int space)
24589
+show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair)
24590
{
24591
cchar_t temp;
24592
wchar_t code;
24593
@@ -2755,18 +2907,18 @@ show_upper_widechars(int first, int repe
24594
attroff(A_BOLD);
24595
24596
for (code = first; code <= last; code++) {
24597
- int row = 4 + ((code - first) % 16);
24598
+ int row = 2 + ((code - first) % 16);
24599
int col = ((code - first) / 16) * COLS / 2;
24600
wchar_t codes[10];
24601
- attr_t attrs = A_NORMAL;
24602
char tmp[80];
24603
int count = repeat;
24604
+ int y, x;
24605
24606
memset(&codes, 0, sizeof(codes));
24607
codes[0] = code;
24608
sprintf(tmp, "%3ld (0x%lx)", (long) code, (long) code);
24609
mvprintw(row, col, "%*s: ", COLS / 4, tmp);
24610
- setcchar(&temp, codes, attrs, 0, 0);
24611
+ setcchar(&temp, codes, attr, pair, 0);
24612
do {
24613
/*
24614
* Give non-spacing characters something to combine with. If we
24615
@@ -2783,6 +2935,12 @@ show_upper_widechars(int first, int repe
24616
* function is met by the builtin refresh() in echo_wchar().
24617
*/
24618
echo_wchar(&temp);
24619
+ /*
24620
+ * The repeat-count may make text wrap - avoid that.
24621
+ */
24622
+ getyx(stdscr, y, x);
24623
+ if (x >= col + (COLS / 2) - 2)
24624
+ break;
24625
} while (--count > 0);
24626
}
24627
}
24628
@@ -2791,21 +2949,25 @@ static int
24629
show_1_wacs(int n, const char *name, const cchar_t *code)
24630
{
24631
const int height = 16;
24632
- int row = 4 + (n % height);
24633
+ int row = 2 + (n % height);
24634
int col = (n / height) * COLS / 2;
24635
mvprintw(row, col, "%*s : ", COLS / 4, name);
24636
add_wchnstr(code, 1);
24637
return n + 1;
24638
}
24639
24640
+#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
24641
+
24642
static void
24643
-show_wacs_chars(void)
24644
+show_wacs_chars(attr_t attr, short pair)
24645
/* display the wide-ACS character set */
24646
{
24647
+ cchar_t temp;
24648
+
24649
int n;
24650
24651
/*#define BOTH2(name) #name, &(name) */
24652
-#define BOTH2(name) #name, name
24653
+#define BOTH2(name) #name, MERGE_ATTR(name)
24654
24655
erase();
24656
attron(A_BOLD);
24657
@@ -2855,43 +3017,57 @@ show_wacs_chars(void)
24658
#endif
24659
}
24660
24661
+#undef MERGE_ATTR
24662
+
24663
+#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
24664
+
24665
static void
24666
-show_wbox_chars(void)
24667
+show_wbox_chars(attr_t attr, short pair)
24668
{
24669
+ cchar_t temp;
24670
+
24671
erase();
24672
attron(A_BOLD);
24673
mvaddstr(0, 20, "Display of the Wide-ACS Line-Drawing Set");
24674
attroff(A_BOLD);
24675
refresh();
24676
+
24677
+ attr_set(attr, pair, 0);
24678
box_set(stdscr, 0, 0);
24679
+ attr_set(A_NORMAL, 0, 0);
24680
/* *INDENT-OFF* */
24681
- mvhline_set(LINES / 2, 0, WACS_HLINE, COLS);
24682
- mvvline_set(0, COLS / 2, WACS_VLINE, LINES);
24683
- mvadd_wch(0, COLS / 2, WACS_TTEE);
24684
- mvadd_wch(LINES / 2, COLS / 2, WACS_PLUS);
24685
- mvadd_wch(LINES - 1, COLS / 2, WACS_BTEE);
24686
- mvadd_wch(LINES / 2, 0, WACS_LTEE);
24687
- mvadd_wch(LINES / 2, COLS - 1, WACS_RTEE);
24688
+ mvhline_set(LINES / 2, 0, MERGE_ATTR(WACS_HLINE), COLS);
24689
+ mvvline_set(0, COLS / 2, MERGE_ATTR(WACS_VLINE), LINES);
24690
+ mvadd_wch(0, COLS / 2, MERGE_ATTR(WACS_TTEE));
24691
+ mvadd_wch(LINES / 2, COLS / 2, MERGE_ATTR(WACS_PLUS));
24692
+ mvadd_wch(LINES - 1, COLS / 2, MERGE_ATTR(WACS_BTEE));
24693
+ mvadd_wch(LINES / 2, 0, MERGE_ATTR(WACS_LTEE));
24694
+ mvadd_wch(LINES / 2, COLS - 1, MERGE_ATTR(WACS_RTEE));
24695
/* *INDENT-ON* */
24696
24697
}
24698
24699
+#undef MERGE_ATTR
24700
+
24701
static int
24702
-show_2_wacs(int n, const char *name, const char *code)
24703
+show_2_wacs(int n, const char *name, const char *code, attr_t attr, short pair)
24704
{
24705
const int height = 16;
24706
- int row = 4 + (n % height);
24707
+ int row = 2 + (n % height);
24708
int col = (n / height) * COLS / 2;
24709
char temp[80];
24710
24711
mvprintw(row, col, "%*s : ", COLS / 4, name);
24712
+ attr_set(attr, pair, 0);
24713
addstr(strcpy(temp, code));
24714
+ attr_set(A_NORMAL, 0, 0);
24715
return n + 1;
24716
}
24717
24718
+#define SHOW_UTF8(n, name, code) show_2_wacs(n, name, code, attr, pair)
24719
+
24720
static void
24721
-show_utf8_chars(void)
24722
-/* display the wide-ACS character set */
24723
+show_utf8_chars(attr_t attr, short pair)
24724
{
24725
int n;
24726
24727
@@ -2901,47 +3077,125 @@ show_utf8_chars(void)
24728
attroff(A_BOLD);
24729
refresh();
24730
/* *INDENT-OFF* */
24731
- n = show_2_wacs(0, "WACS_ULCORNER", "\342\224\214");
24732
- n = show_2_wacs(n, "WACS_URCORNER", "\342\224\220");
24733
- n = show_2_wacs(n, "WACS_LLCORNER", "\342\224\224");
24734
- n = show_2_wacs(n, "WACS_LRCORNER", "\342\224\230");
24735
-
24736
- n = show_2_wacs(n, "WACS_LTEE", "\342\224\234");
24737
- n = show_2_wacs(n, "WACS_RTEE", "\342\224\244");
24738
- n = show_2_wacs(n, "WACS_TTEE", "\342\224\254");
24739
- n = show_2_wacs(n, "WACS_BTEE", "\342\224\264");
24740
-
24741
- n = show_2_wacs(n, "WACS_HLINE", "\342\224\200");
24742
- n = show_2_wacs(n, "WACS_VLINE", "\342\224\202");
24743
-
24744
- n = show_2_wacs(n, "WACS_LARROW", "\342\206\220");
24745
- n = show_2_wacs(n, "WACS_RARROW", "\342\206\222");
24746
- n = show_2_wacs(n, "WACS_UARROW", "\342\206\221");
24747
- n = show_2_wacs(n, "WACS_DARROW", "\342\206\223");
24748
-
24749
- n = show_2_wacs(n, "WACS_BLOCK", "\342\226\256");
24750
- n = show_2_wacs(n, "WACS_BOARD", "\342\226\222");
24751
- n = show_2_wacs(n, "WACS_LANTERN", "\342\230\203");
24752
- n = show_2_wacs(n, "WACS_BULLET", "\302\267");
24753
- n = show_2_wacs(n, "WACS_CKBOARD", "\342\226\222");
24754
- n = show_2_wacs(n, "WACS_DEGREE", "\302\260");
24755
- n = show_2_wacs(n, "WACS_DIAMOND", "\342\227\206");
24756
- n = show_2_wacs(n, "WACS_PLMINUS", "\302\261");
24757
- n = show_2_wacs(n, "WACS_PLUS", "\342\224\274");
24758
- n = show_2_wacs(n, "WACS_GEQUAL", "\342\211\245");
24759
- n = show_2_wacs(n, "WACS_NEQUAL", "\342\211\240");
24760
- n = show_2_wacs(n, "WACS_LEQUAL", "\342\211\244");
24761
-
24762
- n = show_2_wacs(n, "WACS_STERLING", "\302\243");
24763
- n = show_2_wacs(n, "WACS_PI", "\317\200");
24764
- n = show_2_wacs(n, "WACS_S1", "\342\216\272");
24765
- n = show_2_wacs(n, "WACS_S3", "\342\216\273");
24766
- n = show_2_wacs(n, "WACS_S7", "\342\216\274");
24767
- n = show_2_wacs(n, "WACS_S9", "\342\216\275");
24768
+ n = SHOW_UTF8(0, "WACS_ULCORNER", "\342\224\214");
24769
+ n = SHOW_UTF8(n, "WACS_URCORNER", "\342\224\220");
24770
+ n = SHOW_UTF8(n, "WACS_LLCORNER", "\342\224\224");
24771
+ n = SHOW_UTF8(n, "WACS_LRCORNER", "\342\224\230");
24772
+
24773
+ n = SHOW_UTF8(n, "WACS_LTEE", "\342\224\234");
24774
+ n = SHOW_UTF8(n, "WACS_RTEE", "\342\224\244");
24775
+ n = SHOW_UTF8(n, "WACS_TTEE", "\342\224\254");
24776
+ n = SHOW_UTF8(n, "WACS_BTEE", "\342\224\264");
24777
+
24778
+ n = SHOW_UTF8(n, "WACS_HLINE", "\342\224\200");
24779
+ n = SHOW_UTF8(n, "WACS_VLINE", "\342\224\202");
24780
+
24781
+ n = SHOW_UTF8(n, "WACS_LARROW", "\342\206\220");
24782
+ n = SHOW_UTF8(n, "WACS_RARROW", "\342\206\222");
24783
+ n = SHOW_UTF8(n, "WACS_UARROW", "\342\206\221");
24784
+ n = SHOW_UTF8(n, "WACS_DARROW", "\342\206\223");
24785
+
24786
+ n = SHOW_UTF8(n, "WACS_BLOCK", "\342\226\256");
24787
+ n = SHOW_UTF8(n, "WACS_BOARD", "\342\226\222");
24788
+ n = SHOW_UTF8(n, "WACS_LANTERN", "\342\230\203");
24789
+ n = SHOW_UTF8(n, "WACS_BULLET", "\302\267");
24790
+ n = SHOW_UTF8(n, "WACS_CKBOARD", "\342\226\222");
24791
+ n = SHOW_UTF8(n, "WACS_DEGREE", "\302\260");
24792
+ n = SHOW_UTF8(n, "WACS_DIAMOND", "\342\227\206");
24793
+ n = SHOW_UTF8(n, "WACS_PLMINUS", "\302\261");
24794
+ n = SHOW_UTF8(n, "WACS_PLUS", "\342\224\274");
24795
+ n = SHOW_UTF8(n, "WACS_GEQUAL", "\342\211\245");
24796
+ n = SHOW_UTF8(n, "WACS_NEQUAL", "\342\211\240");
24797
+ n = SHOW_UTF8(n, "WACS_LEQUAL", "\342\211\244");
24798
+
24799
+ n = SHOW_UTF8(n, "WACS_STERLING", "\302\243");
24800
+ n = SHOW_UTF8(n, "WACS_PI", "\317\200");
24801
+ n = SHOW_UTF8(n, "WACS_S1", "\342\216\272");
24802
+ n = SHOW_UTF8(n, "WACS_S3", "\342\216\273");
24803
+ n = SHOW_UTF8(n, "WACS_S7", "\342\216\274");
24804
+ n = SHOW_UTF8(n, "WACS_S9", "\342\216\275");
24805
/* *INDENT-ON* */
24806
24807
}
24808
+/* *INDENT-OFF* */
24809
+static struct {
24810
+ attr_t attr;
24811
+ char *name;
24812
+} attrs_to_cycle[] = {
24813
+ { A_NORMAL, "normal" },
24814
+ { A_BOLD, "bold" },
24815
+ { A_REVERSE, "reverse" },
24816
+ { A_UNDERLINE, "underline" },
24817
+};
24818
+/* *INDENT-ON* */
24819
+
24820
+static bool
24821
+cycle_attr(int ch, unsigned *at_code, attr_t *attr)
24822
+{
24823
+ bool result = TRUE;
24824
+
24825
+ switch (ch) {
24826
+ case 'v':
24827
+ if ((*at_code += 1) >= SIZEOF(attrs_to_cycle))
24828
+ *at_code = 0;
24829
+ break;
24830
+ case 'V':
24831
+ if (*at_code == 1)
24832
+ *at_code = SIZEOF(attrs_to_cycle) - 1;
24833
+ else
24834
+ *at_code -= 1;
24835
+ break;
24836
+ default:
24837
+ result = FALSE;
24838
+ break;
24839
+ }
24840
+ if (result)
24841
+ *attr = attrs_to_cycle[*at_code].attr;
24842
+ return result;
24843
+}
24844
+
24845
+static bool
24846
+cycle_colors(int ch, int *fg, int *bg, short *pair)
24847
+{
24848
+ bool result = FALSE;
24849
+
24850
+ if (has_colors()) {
24851
+ result = TRUE;
24852
+ switch (ch) {
24853
+ case 'F':
24854
+ if ((*fg -= 1) < 0)
24855
+ *fg = COLORS - 1;
24856
+ break;
24857
+ case 'f':
24858
+ if ((*fg += 1) >= COLORS)
24859
+ *fg = 0;
24860
+ break;
24861
+ case 'B':
24862
+ if ((*bg -= 1) < 0)
24863
+ *bg = COLORS - 1;
24864
+ break;
24865
+ case 'b':
24866
+ if ((*bg += 1) < 0)
24867
+ *bg = 0;
24868
+ break;
24869
+ default:
24870
+ result = FALSE;
24871
+ break;
24872
+ }
24873
+ if (result) {
24874
+ *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK);
24875
+ if (*pair != 0) {
24876
+ *pair = 1;
24877
+ if (init_pair(*pair, *fg, *bg) == ERR) {
24878
+ result = FALSE;
24879
+ }
24880
+ }
24881
+ }
24882
+ }
24883
+ return result;
24884
+}
24885
24886
+/* display the wide-ACS character set */
24887
static void
24888
wide_acs_display(void)
24889
{
24890
@@ -2949,6 +3203,12 @@ wide_acs_display(void)
24891
int digit = 0;
24892
int repeat = 0;
24893
int space = ' ';
24894
+ chtype attr = A_NORMAL;
24895
+ int fg = COLOR_BLACK;
24896
+ int bg = COLOR_BLACK;
24897
+ unsigned at_code = 0;
24898
+ short pair = 0;
24899
+ void (*last_show_wacs) (attr_t, short) = 0;
24900
24901
do {
24902
switch (c) {
24903
@@ -2956,38 +3216,56 @@ wide_acs_display(void)
24904
Repaint();
24905
break;
24906
case 'a':
24907
- show_wacs_chars();
24908
+ last_show_wacs = show_wacs_chars;
24909
break;
24910
- case 'b':
24911
- show_wbox_chars();
24912
+ case 'x':
24913
+ last_show_wacs = show_wbox_chars;
24914
break;
24915
case 'u':
24916
- show_utf8_chars();
24917
+ last_show_wacs = show_utf8_chars;
24918
break;
24919
default:
24920
- if (c < 256 && isdigit(c))
24921
+ if (c < 256 && isdigit(c)) {
24922
digit = (c - '0');
24923
- else if (c == '+')
24924
+ } else if (c == '+') {
24925
++digit;
24926
- else if (c == '-' && digit > 0)
24927
+ } else if (c == '-' && digit > 0) {
24928
--digit;
24929
- else if (c == '>')
24930
+ } else if (c == '>' && repeat < (COLS / 4)) {
24931
++repeat;
24932
- else if (c == '<' && repeat > 0)
24933
+ } else if (c == '<' && repeat > 0) {
24934
--repeat;
24935
- else if (c == '_')
24936
+ } else if (c == '_') {
24937
space = (space == ' ') ? '_' : ' ';
24938
- else {
24939
+ } else if (cycle_attr(c, &at_code, &attr)
24940
+ || cycle_colors(c, &fg, &bg, &pair)) {
24941
+ if (last_show_wacs != 0)
24942
+ break;
24943
+ } else {
24944
beep();
24945
break;
24946
}
24947
- show_upper_widechars(digit * 32 + 128, repeat, space);
24948
+ last_show_wacs = 0;
24949
+ show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
24950
break;
24951
}
24952
- mvprintw(LINES - 2, 0,
24953
- "Select: a WACS, b box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, q=quit");
24954
+ if (last_show_wacs != 0)
24955
+ last_show_wacs(attr, pair);
24956
+
24957
+ mvprintw(LINES - 3, 0,
24958
+ "Select: a WACS, x box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, CTL/q=quit");
24959
+ if (has_colors()) {
24960
+ mvprintw(LINES - 2, 0,
24961
+ "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.",
24962
+ attrs_to_cycle[at_code].name,
24963
+ fg, bg);
24964
+ } else {
24965
+ mvprintw(LINES - 2, 0,
24966
+ "v/V cycles through video attributes (%s).",
24967
+ attrs_to_cycle[at_code].name);
24968
+ }
24969
refresh();
24970
- } while ((c = Getchar()) != 'x' && c != 'q');
24971
+ } while (!isQuit(c = Getchar()));
24972
24973
Pause();
24974
erase();
24975
@@ -3258,8 +3536,7 @@ selectcell(int uli, int ulj, int lri, in
24976
case KEY_RIGHT:
24977
j++;
24978
break;
24979
- case QUIT:
24980
- case ESCAPE:
24981
+ case_QUIT:
24982
return ((pair *) 0);
24983
#ifdef NCURSES_MOUSE_VERSION
24984
case KEY_MOUSE:
24985
@@ -3385,9 +3662,11 @@ acs_and_scroll(void)
24986
/* Demonstrate windows */
24987
{
24988
int c, i;
24989
- FILE *fp;
24990
FRAME *current = (FRAME *) 0, *neww;
24991
WINDOW *usescr = stdscr;
24992
+#if HAVE_PUTWIN && HAVE_GETWIN
24993
+ FILE *fp;
24994
+#endif
24995
24996
#define DUMPFILE "screendump"
24997
24998
@@ -3457,6 +3736,7 @@ acs_and_scroll(void)
24999
}
25000
break;
25001
25002
+#if HAVE_PUTWIN && HAVE_GETWIN
25003
case CTRL('W'): /* save and delete window */
25004
if (current == current->next) {
25005
transient(current, "Will not save/delete ONLY window");
25006
@@ -3488,6 +3768,7 @@ acs_and_scroll(void)
25007
wrefresh(neww->wind);
25008
}
25009
break;
25010
+#endif
25011
25012
#if HAVE_WRESIZE
25013
case CTRL('X'): /* resize window */
25014
@@ -3596,8 +3877,7 @@ acs_and_scroll(void)
25015
usescr = (current ? current->wind : stdscr);
25016
wrefresh(usescr);
25017
} while
25018
- ((c = wGetchar(usescr)) != QUIT
25019
- && !((c == ESCAPE) && (keypad_active(usescr)))
25020
+ (!isQuit(c = wGetchar(usescr))
25021
&& (c != ERR));
25022
25023
breakout:
25024
@@ -3668,7 +3948,7 @@ saywhat(NCURSES_CONST char *text)
25025
mkpanel(rows,cols,tly,tlx) - alloc a win and panel and associate them
25026
--------------------------------------------------------------------------*/
25027
static PANEL *
25028
-mkpanel(unsigned color, int rows, int cols, int tly, int tlx)
25029
+mkpanel(short color, int rows, int cols, int tly, int tlx)
25030
{
25031
WINDOW *win;
25032
PANEL *pan = 0;
25033
@@ -3677,8 +3957,9 @@ mkpanel(unsigned color, int rows, int co
25034
if ((pan = new_panel(win)) == 0) {
25035
delwin(win);
25036
} else if (has_colors()) {
25037
- int fg = (color == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK;
25038
- int bg = color;
25039
+ short fg = (color == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK;
25040
+ short bg = color;
25041
+
25042
init_pair(color, fg, bg);
25043
wbkgdset(win, COLOR_PAIR(color) | ' ');
25044
} else {
25045
@@ -3950,6 +4231,7 @@ demo_panels(void)
25046
erase();
25047
endwin();
25048
}
25049
+#endif /* USE_LIBPANEL */
25050
25051
/****************************************************************************
25052
*
25053
@@ -3967,7 +4249,7 @@ panner_legend(int line)
25054
{
25055
static const char *const legend[] =
25056
{
25057
- "Use arrow keys (or U,D,L,R) to pan, q to quit, ! to shell-out.",
25058
+ "Use arrow keys (or U,D,L,R) to pan, CTL/q to quit, ! to shell-out.",
25059
"Use +,- (or j,k) to grow/shrink the panner vertically.",
25060
"Use <,> (or h,l) to grow/shrink the panner horizontally.",
25061
"Number repeats. Toggle legend:? filler:a timer:t scrollmark:s."
25062
@@ -4339,7 +4621,7 @@ padgetch(WINDOW *win)
25063
c = KEY_DC;
25064
break;
25065
case ERR: /* FALLTHRU */
25066
- case 'q':
25067
+ case_QUIT:
25068
count = 0;
25069
c = KEY_EXIT;
25070
break;
25071
@@ -4392,7 +4674,6 @@ demo_pad(void)
25072
endwin();
25073
erase();
25074
}
25075
-#endif /* USE_LIBPANEL */
25076
25077
/****************************************************************************
25078
*
25079
@@ -4902,122 +5183,50 @@ edit_secure(FIELD * me, int c)
25080
static int
25081
form_virtualize(FORM * f, WINDOW *w)
25082
{
25083
+ /* *INDENT-OFF* */
25084
static const struct {
25085
int code;
25086
int result;
25087
} lookup[] = {
25088
- {
25089
- CTRL('A'), REQ_NEXT_CHOICE
25090
- },
25091
- {
25092
- CTRL('B'), REQ_PREV_WORD
25093
- },
25094
- {
25095
- CTRL('C'), REQ_CLR_EOL
25096
- },
25097
- {
25098
- CTRL('D'), REQ_DOWN_FIELD
25099
- },
25100
- {
25101
- CTRL('E'), REQ_END_FIELD
25102
- },
25103
- {
25104
- CTRL('F'), REQ_NEXT_PAGE
25105
- },
25106
- {
25107
- CTRL('G'), REQ_DEL_WORD
25108
- },
25109
- {
25110
- CTRL('H'), REQ_DEL_PREV
25111
- },
25112
- {
25113
- CTRL('I'), REQ_INS_CHAR
25114
- },
25115
- {
25116
- CTRL('K'), REQ_CLR_EOF
25117
- },
25118
- {
25119
- CTRL('L'), REQ_LEFT_FIELD
25120
- },
25121
- {
25122
- CTRL('M'), REQ_NEW_LINE
25123
- },
25124
- {
25125
- CTRL('N'), REQ_NEXT_FIELD
25126
- },
25127
- {
25128
- CTRL('O'), REQ_INS_LINE
25129
- },
25130
- {
25131
- CTRL('P'), REQ_PREV_FIELD
25132
- },
25133
- {
25134
- CTRL('R'), REQ_RIGHT_FIELD
25135
- },
25136
- {
25137
- CTRL('S'), REQ_BEG_FIELD
25138
- },
25139
- {
25140
- CTRL('U'), REQ_UP_FIELD
25141
- },
25142
- {
25143
- CTRL('V'), REQ_DEL_CHAR
25144
- },
25145
- {
25146
- CTRL('W'), REQ_NEXT_WORD
25147
- },
25148
- {
25149
- CTRL('X'), REQ_CLR_FIELD
25150
- },
25151
- {
25152
- CTRL('Y'), REQ_DEL_LINE
25153
- },
25154
- {
25155
- CTRL('Z'), REQ_PREV_CHOICE
25156
- },
25157
- {
25158
- ESCAPE, MAX_FORM_COMMAND + 1
25159
- },
25160
- {
25161
- KEY_BACKSPACE, REQ_DEL_PREV
25162
- },
25163
- {
25164
- KEY_DOWN, REQ_DOWN_CHAR
25165
- },
25166
- {
25167
- KEY_END, REQ_LAST_FIELD
25168
- },
25169
- {
25170
- KEY_HOME, REQ_FIRST_FIELD
25171
- },
25172
- {
25173
- KEY_LEFT, REQ_LEFT_CHAR
25174
- },
25175
- {
25176
- KEY_LL, REQ_LAST_FIELD
25177
- },
25178
- {
25179
- KEY_NEXT, REQ_NEXT_FIELD
25180
- },
25181
- {
25182
- KEY_NPAGE, REQ_NEXT_PAGE
25183
- },
25184
- {
25185
- KEY_PPAGE, REQ_PREV_PAGE
25186
- },
25187
- {
25188
- KEY_PREVIOUS, REQ_PREV_FIELD
25189
- },
25190
- {
25191
- KEY_RIGHT, REQ_RIGHT_CHAR
25192
- },
25193
- {
25194
- KEY_UP, REQ_UP_CHAR
25195
- },
25196
- {
25197
- QUIT, MAX_FORM_COMMAND + 1
25198
- }
25199
+ { CTRL('A'), REQ_NEXT_CHOICE },
25200
+ { CTRL('B'), REQ_PREV_WORD },
25201
+ { CTRL('C'), REQ_CLR_EOL },
25202
+ { CTRL('D'), REQ_DOWN_FIELD },
25203
+ { CTRL('E'), REQ_END_FIELD },
25204
+ { CTRL('F'), REQ_NEXT_PAGE },
25205
+ { CTRL('G'), REQ_DEL_WORD },
25206
+ { CTRL('H'), REQ_DEL_PREV },
25207
+ { CTRL('I'), REQ_INS_CHAR },
25208
+ { CTRL('K'), REQ_CLR_EOF },
25209
+ { CTRL('L'), REQ_LEFT_FIELD },
25210
+ { CTRL('M'), REQ_NEW_LINE },
25211
+ { CTRL('N'), REQ_NEXT_FIELD },
25212
+ { CTRL('O'), REQ_INS_LINE },
25213
+ { CTRL('P'), REQ_PREV_FIELD },
25214
+ { CTRL('R'), REQ_RIGHT_FIELD },
25215
+ { CTRL('S'), REQ_BEG_FIELD },
25216
+ { CTRL('U'), REQ_UP_FIELD },
25217
+ { CTRL('V'), REQ_DEL_CHAR },
25218
+ { CTRL('W'), REQ_NEXT_WORD },
25219
+ { CTRL('X'), REQ_CLR_FIELD },
25220
+ { CTRL('Y'), REQ_DEL_LINE },
25221
+ { CTRL('Z'), REQ_PREV_CHOICE },
25222
+ { ESCAPE, MAX_FORM_COMMAND + 1 },
25223
+ { KEY_BACKSPACE, REQ_DEL_PREV },
25224
+ { KEY_DOWN, REQ_DOWN_CHAR },
25225
+ { KEY_END, REQ_LAST_FIELD },
25226
+ { KEY_HOME, REQ_FIRST_FIELD },
25227
+ { KEY_LEFT, REQ_LEFT_CHAR },
25228
+ { KEY_LL, REQ_LAST_FIELD },
25229
+ { KEY_NEXT, REQ_NEXT_FIELD },
25230
+ { KEY_NPAGE, REQ_NEXT_PAGE },
25231
+ { KEY_PPAGE, REQ_PREV_PAGE },
25232
+ { KEY_PREVIOUS, REQ_PREV_FIELD },
25233
+ { KEY_RIGHT, REQ_RIGHT_CHAR },
25234
+ { KEY_UP, REQ_UP_CHAR },
25235
+ { QUIT, MAX_FORM_COMMAND + 1 }
25236
};
25237
+ /* *INDENT-ON* */
25238
25239
static int mode = REQ_INS_MODE;
25240
int c = wGetchar(w);
25241
@@ -5090,11 +5299,19 @@ my_form_driver(FORM * form, int c)
25242
}
25243
}
25244
25245
+#ifdef NCURSES_VERSION
25246
+#define FIELDCHECK_CB(func) bool func(FIELD * fld, const void * data GCC_UNUSED)
25247
+#define CHAR_CHECK_CB(func) bool func(int ch, const void *data GCC_UNUSED)
25248
+#else
25249
+#define FIELDCHECK_CB(func) int func(FIELD * fld, char * data GCC_UNUSED)
25250
+#define CHAR_CHECK_CB(func) int func(int ch, char *data GCC_UNUSED)
25251
+#endif
25252
+
25253
/*
25254
* Allow a middle initial, optionally with a '.' to end it.
25255
*/
25256
-static bool
25257
-mi_field_check(FIELD * fld, const void *data GCC_UNUSED)
25258
+static
25259
+FIELDCHECK_CB(mi_field_check)
25260
{
25261
char *s = field_buffer(fld, 0);
25262
int state = 0;
25263
@@ -5126,8 +5343,8 @@ mi_field_check(FIELD * fld, const void *
25264
return TRUE;
25265
}
25266
25267
-static bool
25268
-mi_char_check(int ch, const void *data GCC_UNUSED)
25269
+static
25270
+CHAR_CHECK_CB(mi_char_check)
25271
{
25272
return ((isalpha(ch) || ch == '.') ? TRUE : FALSE);
25273
}
25274
@@ -5135,8 +5352,8 @@ mi_char_check(int ch, const void *data G
25275
/*
25276
* Passwords should be at least 6 characters.
25277
*/
25278
-static bool
25279
-pw_field_check(FIELD * fld, const void *data GCC_UNUSED)
25280
+static
25281
+FIELDCHECK_CB(pw_field_check)
25282
{
25283
char *s = field_buffer(fld, 0);
25284
int n;
25285
@@ -5150,8 +5367,8 @@ pw_field_check(FIELD * fld, const void *
25286
return TRUE;
25287
}
25288
25289
-static bool
25290
-pw_char_check(int ch, const void *data GCC_UNUSED)
25291
+static
25292
+CHAR_CHECK_CB(pw_char_check)
25293
{
25294
return (isgraph(ch) ? TRUE : FALSE);
25295
}
25296
@@ -5280,15 +5497,226 @@ crosswin(WINDOW *win, char ch)
25297
}
25298
}
25299
25300
+#define OVERLAP_FLAVORS 5
25301
+
25302
static void
25303
-overlap_test(void)
25304
+overlap_helpitem(int state, int item, char *message)
25305
+{
25306
+ int row = (item / 2);
25307
+ int col = ((item % 2) ? COLS / 2 : 0);
25308
+
25309
+ move(LINES - 6 + row, col);
25310
+ printw("%c%c = %s", state == row ? '>' : ' ', 'a' + item, message);
25311
+ clrtoeol();
25312
+}
25313
+
25314
+static void
25315
+overlap_test_1_attr(WINDOW *win, int flavor, int col)
25316
+{
25317
+ short cpair = 1 + (flavor * 2) + col;
25318
+
25319
+ switch (flavor) {
25320
+ case 0:
25321
+ wattrset(win, A_NORMAL);
25322
+ break;
25323
+ case 1:
25324
+ wattrset(win, A_BOLD);
25325
+ break;
25326
+ case 2:
25327
+ init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
25328
+ wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
25329
+ break;
25330
+ case 3:
25331
+ init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
25332
+ wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
25333
+ break;
25334
+ }
25335
+}
25336
+
25337
+static void
25338
+overlap_test_2_attr(WINDOW *win, int flavor, int col)
25339
+{
25340
+ short cpair = 9 + (flavor * 2) + col;
25341
+
25342
+ switch (flavor) {
25343
+ case 0:
25344
+ /* no effect */
25345
+ break;
25346
+ case 1:
25347
+ /* no effect */
25348
+ break;
25349
+ case 2:
25350
+ init_pair(cpair, COLOR_RED, COLOR_GREEN);
25351
+ wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair));
25352
+ break;
25353
+ case 3:
25354
+ wbkgdset(win, ' ' | A_NORMAL);
25355
+ break;
25356
+ }
25357
+}
25358
+
25359
+static int
25360
+overlap_help(int state, int flavors[OVERLAP_FLAVORS])
25361
+{
25362
+ int row;
25363
+ int col;
25364
+ int item;
25365
+ const char *ths, *tht;
25366
+ char msg[80];
25367
+
25368
+ if (state < 0)
25369
+ state += OVERLAP_FLAVORS;
25370
+ state = state % OVERLAP_FLAVORS;
25371
+
25372
+ for (item = 0; item < (2 * OVERLAP_FLAVORS); ++item) {
25373
+ row = item / 2;
25374
+ col = item % 2;
25375
+ ths = col ? "B" : "A";
25376
+ tht = col ? "A" : "B";
25377
+
25378
+ switch (row) {
25379
+ case 0:
25380
+ flavors[row] = 0;
25381
+ sprintf(msg, "refresh %s, then %s, then doupdate.", ths, tht);
25382
+ break;
25383
+ case 1:
25384
+ if (has_colors()) {
25385
+ flavors[row] %= 4;
25386
+ } else {
25387
+ flavors[row] %= 2;
25388
+ }
25389
+ overlap_test_1_attr(stdscr, flavors[row], col);
25390
+ sprintf(msg, "fill window %s with letter %s.", ths, ths);
25391
+ break;
25392
+ case 2:
25393
+ if (has_colors()) {
25394
+ flavors[row] %= 4;
25395
+ } else {
25396
+ flavors[row] %= 2;
25397
+ }
25398
+ switch (flavors[row]) {
25399
+ case 0:
25400
+ sprintf(msg, "cross pattern in window %s.", ths);
25401
+ break;
25402
+ case 1:
25403
+ sprintf(msg, "draw box in window %s.", ths);
25404
+ break;
25405
+ case 2:
25406
+ sprintf(msg, "set background of window %s.", ths);
25407
+ break;
25408
+ case 3:
25409
+ sprintf(msg, "reset background of window %s.", ths);
25410
+ break;
25411
+ }
25412
+ break;
25413
+ case 3:
25414
+ flavors[row] = 0;
25415
+ sprintf(msg, "clear window %s.", ths);
25416
+ break;
25417
+ case 4:
25418
+ flavors[row] %= 4;
25419
+ switch (flavors[row]) {
25420
+ case 0:
25421
+ sprintf(msg, "overwrite %s onto %s.", ths, tht);
25422
+ break;
25423
+ case 1:
25424
+ sprintf(msg, "copywin(FALSE) %s onto %s.", ths, tht);
25425
+ break;
25426
+ case 2:
25427
+ sprintf(msg, "copywin(TRUE) %s onto %s.", ths, tht);
25428
+ break;
25429
+ case 3:
25430
+ sprintf(msg, "overlay %s onto %s.", ths, tht);
25431
+ break;
25432
+ }
25433
+ break;
25434
+ }
25435
+ overlap_helpitem(state, item, msg);
25436
+ wattrset(stdscr, A_NORMAL);
25437
+ wbkgdset(stdscr, ' ' | A_NORMAL);
25438
+ }
25439
+ move(LINES - 1, 0);
25440
+ printw("^Q/ESC = terminate test. Up/down/space select test variations (%d %d).",
25441
+ state, flavors[state]);
25442
+
25443
+ return state;
25444
+}
25445
+
25446
+static void
25447
+overlap_test_0(WINDOW *a, WINDOW *b)
25448
+{
25449
+ touchwin(a);
25450
+ touchwin(b);
25451
+ wnoutrefresh(a);
25452
+ wnoutrefresh(b);
25453
+ doupdate();
25454
+}
25455
+
25456
+static void
25457
+overlap_test_1(int flavor, int col, WINDOW *a, char fill)
25458
+{
25459
+ overlap_test_1_attr(a, flavor, col);
25460
+ fillwin(a, fill);
25461
+ wattrset(a, A_NORMAL);
25462
+}
25463
+
25464
+static void
25465
+overlap_test_2(int flavor, int col, WINDOW *a, char fill)
25466
+{
25467
+ overlap_test_2_attr(a, flavor, col);
25468
+ switch (flavor) {
25469
+ case 0:
25470
+ crosswin(a, fill);
25471
+ break;
25472
+ case 1:
25473
+ box(a, 0, 0);
25474
+ break;
25475
+ case 2:
25476
+ /* done in overlap_test_2_attr */
25477
+ break;
25478
+ case 3:
25479
+ /* done in overlap_test_2_attr */
25480
+ break;
25481
+ }
25482
+}
25483
+
25484
+static void
25485
+overlap_test_3(WINDOW *a)
25486
+{
25487
+ wclear(a);
25488
+ wmove(a, 0, 0);
25489
+}
25490
+
25491
+static void
25492
+overlap_test_4(int flavor, WINDOW *a, WINDOW *b)
25493
+{
25494
+ switch (flavor) {
25495
+ case 0:
25496
+ overwrite(a, b);
25497
+ break;
25498
+ case 1:
25499
+ copywin(a, b, 0, 0, 0, 0, getmaxy(b), getmaxx(b), FALSE);
25500
+ break;
25501
+ case 2:
25502
+ copywin(a, b, 0, 0, 0, 0, getmaxy(b), getmaxx(b), TRUE);
25503
+ break;
25504
+ case 3:
25505
+ overlay(a, b);
25506
+ break;
25507
+ }
25508
+}
25509
+
25510
/* test effects of overlapping windows */
25511
+static void
25512
+overlap_test(void)
25513
{
25514
int ch;
25515
+ int state, flavor[OVERLAP_FLAVORS];
25516
25517
WINDOW *win1 = newwin(9, 20, 3, 3);
25518
WINDOW *win2 = newwin(9, 20, 9, 16);
25519
25520
+ curs_set(0);
25521
raw();
25522
refresh();
25523
move(0, 0);
25524
@@ -5296,66 +5724,79 @@ overlap_test(void)
25525
printw("the shared region of two overlapping windows A and B. The cross\n");
25526
printw("pattern in each window does not overlap the other.\n");
25527
25528
- move(18, 0);
25529
- printw("a = refresh A, then B, then doupdate. b = refresh B, then A, then doupdaute\n");
25530
- printw("c = fill window A with letter A. d = fill window B with letter B.\n");
25531
- printw("e = cross pattern in window A. f = cross pattern in window B.\n");
25532
- printw("g = clear window A. h = clear window B.\n");
25533
- printw("i = overwrite A onto B. j = overwrite B onto A.\n");
25534
- printw("^Q/ESC = terminate test.");
25535
+ memset(flavor, 0, sizeof(flavor));
25536
+ state = overlap_help(0, flavor);
25537
25538
- while ((ch = Getchar()) != QUIT && ch != ESCAPE)
25539
+ while (!isQuit(ch = Getchar()))
25540
switch (ch) {
25541
case 'a': /* refresh window A first, then B */
25542
- wnoutrefresh(win1);
25543
- wnoutrefresh(win2);
25544
- doupdate();
25545
+ overlap_test_0(win1, win2);
25546
break;
25547
25548
case 'b': /* refresh window B first, then A */
25549
- wnoutrefresh(win2);
25550
- wnoutrefresh(win1);
25551
- doupdate();
25552
+ overlap_test_0(win2, win1);
25553
break;
25554
25555
case 'c': /* fill window A so it's visible */
25556
- fillwin(win1, 'A');
25557
+ overlap_test_1(flavor[1], 0, win1, 'A');
25558
break;
25559
25560
case 'd': /* fill window B so it's visible */
25561
- fillwin(win2, 'B');
25562
+ overlap_test_1(flavor[1], 1, win2, 'B');
25563
break;
25564
25565
case 'e': /* cross test pattern in window A */
25566
- crosswin(win1, 'A');
25567
+ overlap_test_2(flavor[2], 0, win1, 'A');
25568
break;
25569
25570
case 'f': /* cross test pattern in window A */
25571
- crosswin(win2, 'B');
25572
+ overlap_test_2(flavor[2], 1, win2, 'B');
25573
break;
25574
25575
case 'g': /* clear window A */
25576
- wclear(win1);
25577
- wmove(win1, 0, 0);
25578
+ overlap_test_3(win1);
25579
break;
25580
25581
case 'h': /* clear window B */
25582
- wclear(win2);
25583
- wmove(win2, 0, 0);
25584
+ overlap_test_3(win2);
25585
break;
25586
25587
case 'i': /* overwrite A onto B */
25588
- overwrite(win1, win2);
25589
+ overlap_test_4(flavor[4], win1, win2);
25590
break;
25591
25592
case 'j': /* overwrite B onto A */
25593
- overwrite(win2, win1);
25594
+ overlap_test_4(flavor[4], win2, win1);
25595
+ break;
25596
+
25597
+ case CTRL('n'):
25598
+ case KEY_DOWN:
25599
+ state = overlap_help(state + 1, flavor);
25600
+ break;
25601
+
25602
+ case CTRL('p'):
25603
+ case KEY_UP:
25604
+ state = overlap_help(state - 1, flavor);
25605
+ break;
25606
+
25607
+ case ' ':
25608
+ flavor[state] += 1;
25609
+ state = overlap_help(state, flavor);
25610
+ break;
25611
+
25612
+ case '?':
25613
+ state = overlap_help(state, flavor);
25614
+ break;
25615
+
25616
+ default:
25617
+ beep();
25618
break;
25619
}
25620
25621
delwin(win2);
25622
delwin(win1);
25623
erase();
25624
+ curs_set(1);
25625
endwin();
25626
}
25627
25628
@@ -5415,9 +5856,11 @@ do_single_test(const char c)
25629
color_edit();
25630
break;
25631
25632
+#if USE_SOFTKEYS
25633
case 'e':
25634
slk_test();
25635
break;
25636
+#endif
25637
25638
#if USE_WIDEC_SUPPORT
25639
case 'E':
25640
@@ -5458,11 +5901,9 @@ do_single_test(const char c)
25641
break;
25642
#endif
25643
25644
-#if USE_LIBPANEL
25645
case 'p':
25646
demo_pad();
25647
break;
25648
-#endif
25649
25650
#if USE_LIBFORM
25651
case 'r':
25652
@@ -5502,7 +5943,9 @@ usage(void)
25653
," -a f,b set default-colors (assumed white-on-black)"
25654
," -d use default-colors if terminal supports them"
25655
#endif
25656
+#if USE_SOFTKEYS
25657
," -e fmt specify format for soft-keys test (e)"
25658
+#endif
25659
," -f rip-off footer line (can repeat)"
25660
," -h rip-off header line (can repeat)"
25661
," -p file rgb values to use in 'd' rather than ncurses's builtin"
25662
@@ -5538,6 +5981,7 @@ announce_sig(int sig)
25663
}
25664
#endif
25665
25666
+#if HAVE_RIPOFFLINE
25667
static int
25668
rip_footer(WINDOW *win, int cols)
25669
{
25670
@@ -5559,11 +6003,12 @@ rip_header(WINDOW *win, int cols)
25671
wnoutrefresh(win);
25672
return OK;
25673
}
25674
+#endif /* HAVE_RIPOFFLINE */
25675
25676
static void
25677
main_menu(bool top)
25678
{
25679
- int command;
25680
+ char command;
25681
25682
do {
25683
(void) puts("This is the ncurses main menu");
25684
@@ -5581,10 +6026,12 @@ main_menu(bool top)
25685
#endif
25686
if (top)
25687
(void) puts("d = edit RGB color values");
25688
+#if USE_SOFTKEYS
25689
(void) puts("e = exercise soft keys");
25690
#if USE_WIDEC_SUPPORT
25691
(void) puts("E = exercise soft keys using wide-characters");
25692
#endif
25693
+#endif
25694
(void) puts("f = display ACS characters");
25695
#if USE_WIDEC_SUPPORT
25696
(void) puts("F = display Wide-ACS characters");
25697
@@ -5657,7 +6104,7 @@ main_menu(bool top)
25698
(void)
25699
puts("key letter of the choice (the letter to left of the =)");
25700
(void)
25701
- puts("at the > prompt. The commands `x' or `q' will exit.");
25702
+ puts("at the > prompt. Type `q' to exit.");
25703
}
25704
continue;
25705
}
25706
@@ -5708,12 +6155,14 @@ main(int argc, char *argv[])
25707
usage();
25708
#endif
25709
break;
25710
+#if HAVE_RIPOFFLINE
25711
case 'f':
25712
ripoffline(-1, rip_footer);
25713
break;
25714
case 'h':
25715
ripoffline(1, rip_header);
25716
break;
25717
+#endif /* HAVE_RIPOFFLINE */
25718
case 'p':
25719
palette_file = optarg;
25720
break;
25721
@@ -5747,8 +6196,10 @@ main(int argc, char *argv[])
25722
#endif /* USE_LIBMENU */
25723
#endif /* TRACE */
25724
25725
+#if USE_SOFTKEYS
25726
/* tell it we're going to play with soft keys */
25727
slk_init(my_e_param);
25728
+#endif
25729
25730
#ifdef SIGUSR1
25731
/* set up null signal catcher so we can see what interrupts to getch do */
25732
@@ -5780,12 +6231,13 @@ main(int argc, char *argv[])
25733
max_pairs = COLOR_PAIRS; /* was > 256 ? 256 : COLOR_PAIRS */
25734
25735
if (can_change_color()) {
25736
+ short cp;
25737
all_colors = (RGB_DATA *) malloc(max_colors * sizeof(RGB_DATA));
25738
- for (c = 0; c < max_colors; ++c) {
25739
- color_content(c,
25740
- &all_colors[c].red,
25741
- &all_colors[c].green,
25742
- &all_colors[c].blue);
25743
+ for (cp = 0; cp < max_colors; ++cp) {
25744
+ color_content(cp,
25745
+ &all_colors[cp].red,
25746
+ &all_colors[cp].green,
25747
+ &all_colors[cp].blue);
25748
}
25749
if (palette_file != 0) {
25750
FILE *fp = fopen(palette_file, "r");
25751
Index: ncurses-5.5/test/railroad.c
25752
===================================================================
25753
--- ncurses-5.5.orig/test/railroad.c 2002-10-19 18:11:24.000000000 -0400
25754
+++ ncurses-5.5/test/railroad.c 2006-04-18 15:47:22.000000000 -0400
25755
@@ -1,5 +1,5 @@
25756
/****************************************************************************
25757
- * Copyright (c) 2000-2001,2002 Free Software Foundation, Inc. *
25758
+ * Copyright (c) 2000-2002,2005 Free Software Foundation, Inc. *
25759
* *
25760
* Permission is hereby granted, free of charge, to any person obtaining a *
25761
* copy of this software and associated documentation files (the *
25762
@@ -27,14 +27,16 @@
25763
****************************************************************************/
25764
25765
/*
25766
- * Author: Thomas E. Dickey <dickey@clark.net> 2000
25767
+ * Author: Thomas E. Dickey - 2000
25768
*
25769
- * $Id: railroad.c,v 1.11 2002/10/19 22:11:24 tom Exp $
25770
+ * $Id: railroad.c,v 1.12 2005/12/31 19:38:14 tom Exp $
25771
*
25772
* A simple demo of the termcap interface.
25773
*/
25774
#include <test.priv.h>
25775
25776
+#if HAVE_TGETENT
25777
+
25778
static char *wipeit;
25779
static char *moveit;
25780
static int length;
25781
@@ -238,3 +240,13 @@ main(int argc, char *argv[])
25782
}
25783
ExitProgram(EXIT_SUCCESS);
25784
}
25785
+
25786
+#else
25787
+int
25788
+main(int argc GCC_UNUSED,
25789
+ char *argv[]GCC_UNUSED)
25790
+{
25791
+ printf("This program requires termcap\n");
25792
+ exit(EXIT_FAILURE);
25793
+}
25794
+#endif
25795
Index: ncurses-5.5/test/test.priv.h
25796
===================================================================
25797
--- ncurses-5.5.orig/test/test.priv.h 2004-04-10 16:11:37.000000000 -0400
25798
+++ ncurses-5.5/test/test.priv.h 2006-04-18 15:48:06.000000000 -0400
25799
@@ -1,5 +1,5 @@
25800
/****************************************************************************
25801
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
25802
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
25803
* *
25804
* Permission is hereby granted, free of charge, to any person obtaining a *
25805
* copy of this software and associated documentation files (the *
25806
@@ -27,9 +27,9 @@
25807
****************************************************************************/
25808
25809
/****************************************************************************
25810
- * Author: Thomas E. Dickey <dickey@clark.net> 1996 *
25811
+ * Author: Thomas E. Dickey 1996-on *
25812
****************************************************************************/
25813
-/* $Id: test.priv.h,v 1.48 2004/04/10 20:11:37 tom Exp $ */
25814
+/* $Id: test.priv.h,v 1.59 2006/02/25 23:47:34 tom Exp $ */
25815
25816
#ifndef __TEST_PRIV_H
25817
#define __TEST_PRIV_H 1
25818
@@ -41,28 +41,52 @@
25819
* with wide-character ncurses.
25820
*/
25821
#ifdef HAVE_LIBFORMW
25822
-#define HAVE_LIBFORM 1
25823
+#define HAVE_LIBFORMW 1
25824
#endif
25825
25826
#ifdef HAVE_LIBMENUW
25827
-#define HAVE_LIBMENU 1
25828
+#define HAVE_LIBMENUW 1
25829
#endif
25830
25831
#ifdef HAVE_LIBPANELW
25832
-#define HAVE_LIBPANEL 1
25833
+#define HAVE_LIBPANELW 1
25834
#endif
25835
25836
/*
25837
- * Fallback definitions to accommodate broken compilers
25838
+ * Fallback definitions to accommodate broken compilers.
25839
*/
25840
#ifndef HAVE_CURSES_VERSION
25841
#define HAVE_CURSES_VERSION 0
25842
#endif
25843
25844
+#ifndef HAVE_FILTER
25845
+#define HAVE_FILTER 0
25846
+#endif
25847
+
25848
#ifndef HAVE_FORM_H
25849
#define HAVE_FORM_H 0
25850
#endif
25851
25852
+#ifndef HAVE_GETBEGX
25853
+#define HAVE_GETBEGX 0
25854
+#endif
25855
+
25856
+#ifndef HAVE_GETCURX
25857
+#define HAVE_GETCURX 0
25858
+#endif
25859
+
25860
+#ifndef HAVE_GETMAXX
25861
+#define HAVE_GETMAXX 0
25862
+#endif
25863
+
25864
+#ifndef HAVE_GETOPT_H
25865
+#define HAVE_GETOPT_H 0
25866
+#endif
25867
+
25868
+#ifndef HAVE_GETWIN
25869
+#define HAVE_GETWIN 0
25870
+#endif
25871
+
25872
#ifndef HAVE_LIBFORM
25873
#define HAVE_LIBFORM 0
25874
#endif
25875
@@ -83,6 +107,14 @@
25876
#define HAVE_MENU_H 0
25877
#endif
25878
25879
+#ifndef HAVE_MVVLINE
25880
+#define HAVE_MVVLINE 0
25881
+#endif
25882
+
25883
+#ifndef HAVE_MVWVLINE
25884
+#define HAVE_MVWVLINE 0
25885
+#endif
25886
+
25887
#ifndef HAVE_NAPMS
25888
#define HAVE_NAPMS 1
25889
#endif
25890
@@ -95,10 +127,62 @@
25891
#define HAVE_PANEL_H 0
25892
#endif
25893
25894
+#ifndef HAVE_PUTWIN
25895
+#define HAVE_PUTWIN 0
25896
+#endif
25897
+
25898
+#ifndef HAVE_RESIZE_TERM
25899
+#define HAVE_RESIZE_TERM 0
25900
+#endif
25901
+
25902
+#ifndef HAVE_RIPOFFLINE
25903
+#define HAVE_RIPOFFLINE 0
25904
+#endif
25905
+
25906
+#ifndef HAVE_SETUPTERM
25907
+#define HAVE_SETUPTERM 0
25908
+#endif
25909
+
25910
#ifndef HAVE_SLK_COLOR
25911
#define HAVE_SLK_COLOR 0
25912
#endif
25913
25914
+#ifndef HAVE_SLK_INIT
25915
+#define HAVE_SLK_INIT 0
25916
+#endif
25917
+
25918
+#ifndef HAVE_TERMATTRS
25919
+#define HAVE_TERMATTRS 0
25920
+#endif
25921
+
25922
+#ifndef HAVE_TERMNAME
25923
+#define HAVE_TERMNAME 0
25924
+#endif
25925
+
25926
+#ifndef HAVE_TGETENT
25927
+#define HAVE_TGETENT 0
25928
+#endif
25929
+
25930
+#ifndef HAVE_TIGETNUM
25931
+#define HAVE_TIGETNUM 0
25932
+#endif
25933
+
25934
+#ifndef HAVE_TYPEAHEAD
25935
+#define HAVE_TYPEAHEAD 0
25936
+#endif
25937
+
25938
+#ifndef HAVE_TIGETSTR
25939
+#define HAVE_TIGETSTR 0
25940
+#endif
25941
+
25942
+#ifndef HAVE_WINSSTR
25943
+#define HAVE_WINSSTR 0
25944
+#endif
25945
+
25946
+#ifndef HAVE_USE_DEFAULT_COLORS
25947
+#define HAVE_USE_DEFAULT_COLORS 0
25948
+#endif
25949
+
25950
#ifndef HAVE_WRESIZE
25951
#define HAVE_WRESIZE 0
25952
#endif
25953
@@ -115,6 +199,10 @@
25954
#define NEED_PTEM_H 0
25955
#endif
25956
25957
+#ifndef NO_LEAKS
25958
+#define NO_LEAKS 0
25959
+#endif
25960
+
25961
#include <stdlib.h>
25962
#include <string.h>
25963
#include <sys/types.h>
25964
@@ -125,14 +213,29 @@
25965
25966
#include <signal.h> /* include before curses.h to work around glibc bug */
25967
25968
-#if defined(HAVE_NCURSESW_NCURSES_H)
25969
+#if defined(HAVE_XCURSES)
25970
+#include <xcurses.h>
25971
+#elif defined(HAVE_NCURSESW_NCURSES_H)
25972
#include <ncursesw/curses.h>
25973
-#include <ncursesw/term.h>
25974
#elif defined(HAVE_NCURSES_NCURSES_H)
25975
#include <ncurses/curses.h>
25976
-#include <ncurses/term.h>
25977
#else
25978
#include <curses.h>
25979
+#endif
25980
+
25981
+#if defined(HAVE_XCURSES)
25982
+/* no other headers */
25983
+#undef HAVE_SETUPTERM /* nonfunctional */
25984
+#define HAVE_SETUPTERM 0
25985
+#undef HAVE_TGETENT /* nonfunctional */
25986
+#define HAVE_TGETENT 0
25987
+#undef HAVE_TIGETSTR /* nonfunctional */
25988
+#define HAVE_TIGETSTR 0
25989
+#elif defined(HAVE_NCURSESW_TERM_H)
25990
+#include <ncursesw/term.h>
25991
+#elif defined(HAVE_NCURSES_TERM_H)
25992
+#include <ncurses/term.h>
25993
+#elif defined(HAVE_TERM_H)
25994
#include <term.h>
25995
#endif
25996
25997
@@ -166,6 +269,9 @@ extern int optind;
25998
#ifndef GCC_NORETURN
25999
#define GCC_NORETURN /* nothing */
26000
#endif
26001
+#ifndef GCC_PRINTFLIKE
26002
+#define GCC_PRINTFLIKE(a,b) /* nothing */
26003
+#endif
26004
#ifndef GCC_UNUSED
26005
#define GCC_UNUSED /* nothing */
26006
#endif
26007
@@ -174,6 +280,14 @@ extern int optind;
26008
#define getnstr(s,n) getstr(s)
26009
#endif
26010
26011
+#ifndef USE_SOFTKEYS
26012
+#if HAVE_SLK_INIT
26013
+#define USE_SOFTKEYS 1
26014
+#else
26015
+#define USE_SOFTKEYS 0
26016
+#endif
26017
+#endif
26018
+
26019
#ifndef USE_WIDEC_SUPPORT
26020
#if defined(_XOPEN_SOURCE_EXTENDED) && defined(WACS_ULCORNER)
26021
#define USE_WIDEC_SUPPORT 1
26022
@@ -228,21 +342,61 @@ extern int optind;
26023
#define KEY_MIN 256 /* not defined in Solaris 8 */
26024
#endif
26025
26026
-#ifndef getcurx
26027
+/*
26028
+ * Workaround for HPUX
26029
+ */
26030
+#if defined(__hpux) && !defined(NCURSES_VERSION)
26031
+#define getbegx(w) __getbegx(w)
26032
+#define getbegy(w) __getbegy(w)
26033
+#define getmaxx(w) __getmaxx(w)
26034
+#define getmaxy(w) __getmaxy(w)
26035
+#define getcurx(w) __getcurx(w)
26036
+#define getcury(w) __getcury(w)
26037
+#endif
26038
+
26039
+/*
26040
+ * These usually are implemented as macros, but may be functions.
26041
+ */
26042
+#if !defined(getcurx) && !HAVE_GETCURX
26043
#define getcurx(win) ((win)?(win)->_curx:ERR)
26044
#define getcury(win) ((win)?(win)->_cury:ERR)
26045
#endif
26046
26047
-#ifndef getbegx
26048
+#if !defined(getbegx) && !HAVE_GETBEGX
26049
#define getbegx(win) ((win)?(win)->_begx:ERR)
26050
#define getbegy(win) ((win)?(win)->_begy:ERR)
26051
#endif
26052
26053
-#ifndef getmaxx
26054
+#if !defined(getmaxx) && !HAVE_GETMAXX
26055
#define getmaxx(win) ((win)?((win)->_maxx + 1):ERR)
26056
#define getmaxy(win) ((win)?((win)->_maxy + 1):ERR)
26057
#endif
26058
26059
+#if !defined(mvwvline) && !HAVE_MVWVLINE
26060
+#define mvwvline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : wvline(w,ch,n))
26061
+#define mvwhline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : whline(w,ch,n))
26062
+#endif
26063
+
26064
+#if !defined(mvvline) && !HAVE_MVVLINE
26065
+#define mvvline(y,x,ch,n) (move(y,x) == ERR ? ERR : vline(ch,n))
26066
+#define mvhline(y,x,ch,n) (move(y,x) == ERR ? ERR : hline(ch,n))
26067
+#endif
26068
+
26069
+/*
26070
+ * Try to accommodate curses implementations that have no terminfo support.
26071
+ */
26072
+#if HAVE_TIGETNUM
26073
+#define TIGETNUM(ti,tc) tigetnum(ti)
26074
+#else
26075
+#define TIGETNUM(ti,tc) tgetnum(tc)
26076
+#endif
26077
+
26078
+#if HAVE_TIGETSTR
26079
+#define TIGETSTR(ti,tc) tigetstr(ti)
26080
+#else
26081
+#define TIGETSTR(ti,tc) tgetstr(tc,&area_pointer)
26082
+#endif
26083
+
26084
/* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list
26085
* (which is incompatible with legacy usage, doesn't solve any problems).
26086
*/
26087
Index: ncurses-5.5/test/testcurs.c
26088
===================================================================
26089
--- ncurses-5.5.orig/test/testcurs.c 2005-04-16 12:19:12.000000000 -0400
26090
+++ ncurses-5.5/test/testcurs.c 2006-04-18 15:47:22.000000000 -0400
26091
@@ -7,7 +7,7 @@
26092
* wrs(5/28/93) -- modified to be consistent (perform identically) with either
26093
* PDCurses or under Unix System V, R4
26094
*
26095
- * $Id: testcurs.c,v 1.34 2005/04/16 16:19:12 tom Exp $
26096
+ * $Id: testcurs.c,v 1.37 2005/12/31 20:23:09 tom Exp $
26097
*/
26098
26099
#include <test.priv.h>
26100
@@ -342,13 +342,19 @@ inputTest(WINDOW *win)
26101
mvwaddstr(win, 1, 1, "Press keys (or mouse buttons) to show their names");
26102
mvwaddstr(win, 2, 1, "Press spacebar to finish");
26103
wrefresh(win);
26104
+
26105
keypad(win, TRUE);
26106
raw();
26107
noecho();
26108
+
26109
+#if HAVE_TYPEAHEAD
26110
typeahead(-1);
26111
+#endif
26112
+
26113
#if defined(PDCURSES)
26114
mouse_set(ALL_MOUSE_EVENTS);
26115
#endif
26116
+
26117
for (;;) {
26118
wmove(win, 3, 5);
26119
c = wgetch(win);
26120
@@ -440,6 +446,17 @@ outputTest(WINDOW *win)
26121
chtype ch;
26122
int by, bx;
26123
26124
+#if !HAVE_TIGETSTR
26125
+#if HAVE_TGETENT
26126
+ char tc_buffer[4096];
26127
+ char tc_parsed[4096];
26128
+ char *area_pointer = tc_parsed;
26129
+ tgetent(tc_buffer, getenv("TERM"));
26130
+#else
26131
+#define tgetstr(a,b) 0
26132
+#endif
26133
+#endif /* !HAVE_TIGETSTR */
26134
+
26135
nl();
26136
wclear(win);
26137
mvwaddstr(win, 1, 1,
26138
@@ -530,8 +547,10 @@ outputTest(WINDOW *win)
26139
winsch(win, ch);
26140
Continue(win);
26141
26142
+#if HAVE_WINSSTR
26143
mvwinsstr(win, 6, 2, "A1B2C3D4E5");
26144
Continue(win);
26145
+#endif
26146
26147
wmove(win, 5, 1);
26148
winsertln(win);
26149
@@ -554,14 +573,14 @@ outputTest(WINDOW *win)
26150
*Buffer = 0;
26151
scanw("%s", Buffer);
26152
26153
- if (tigetstr("cvvis") != 0) {
26154
+ if (TIGETSTR("cvvis", "vs") != 0) {
26155
wclear(win);
26156
curs_set(2);
26157
mvwaddstr(win, 1, 1, "The cursor should appear as a block (visible)");
26158
Continue(win);
26159
}
26160
26161
- if (tigetstr("civis") != 0) {
26162
+ if (TIGETSTR("civis", "vi") != 0) {
26163
wclear(win);
26164
curs_set(0);
26165
mvwaddstr(win, 1, 1,
26166
@@ -569,7 +588,7 @@ outputTest(WINDOW *win)
26167
Continue(win);
26168
}
26169
26170
- if (tigetstr("cnorm") != 0) {
26171
+ if (TIGETSTR("cnorm", "ve") != 0) {
26172
wclear(win);
26173
curs_set(1);
26174
mvwaddstr(win, 1, 1, "The cursor should be an underline (normal)");
26175
@@ -586,6 +605,8 @@ outputTest(WINDOW *win)
26176
#endif
26177
26178
werase(win);
26179
+
26180
+#if HAVE_TERMNAME
26181
mvwaddstr(win, 1, 1, "Information About Your Terminal");
26182
mvwaddstr(win, 3, 1, termname());
26183
mvwaddstr(win, 4, 1, longname());
26184
@@ -593,6 +614,7 @@ outputTest(WINDOW *win)
26185
mvwaddstr(win, 5, 1, "This terminal supports blinking.");
26186
else
26187
mvwaddstr(win, 5, 1, "This terminal does NOT support blinking.");
26188
+#endif
26189
26190
mvwaddnstr(win, 7, 5, "Have a nice day!ok", 16);
26191
wrefresh(win);
26192
Index: ncurses-5.5/test/widechars-utf8.txt
26193
===================================================================
26194
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26195
+++ ncurses-5.5/test/widechars-utf8.txt 2006-04-18 15:47:22.000000000 -0400
26196
@@ -0,0 +1,7 @@
26197
+ＡＰＰＬＥ -- It's an ＡＰＰＬＥ.
26198
+ＤＯＧ -- No, that's not my ＤＯＧ.
26199
+ＯＲＡＮＧＥ -- Yeah, that's ＪＵＩＣＹ.
26200
+ＣＨＩＣＫＥＮ -- Normally not a ＰＥＴ.
26201
+ＣＡＴ -- No, never put a ＤＯＧ and a ＣＡＴ together!
26202
+ＦＩＳＨ -- Cats like ＦＩＳＨ.
26203
+ＬＥＭＯＮ -- You ＫＮＯＷ how it ＴＡＳＴＥＳ.
26204
Index: ncurses-5.5/man/captoinfo.1m
26205
===================================================================
26206
--- ncurses-5.5.orig/man/captoinfo.1m 2004-07-05 09:16:08.000000000 -0400
26207
+++ ncurses-5.5/man/captoinfo.1m 2006-04-18 15:48:06.000000000 -0400
26208
@@ -1,6 +1,6 @@
26209
'\" t
26210
.\"***************************************************************************
26211
-.\" Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
26212
+.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
26213
.\" *
26214
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26215
.\" copy of this software and associated documentation files (the *
26216
@@ -27,7 +27,7 @@
26217
.\" authorization. *
26218
.\"***************************************************************************
26219
.\"
26220
-.\" $Id: captoinfo.1m,v 1.18 2004/07/05 13:16:08 tom Exp $
26221
+.\" $Id: captoinfo.1m,v 1.19 2006/02/25 21:49:19 tom Exp $
26222
.TH captoinfo 1M ""
26223
.ds n 5
26224
.ds d @TERMINFO@
26225
@@ -40,7 +40,7 @@
26226
one found, an equivalent \fBterminfo\fR description is written to standard
26227
output. Termcap \fBtc\fR capabilities are translated directly to terminfo
26228
\fBuse\fR capabilities.
26229
-
26230
+.PP
26231
If no \fIfile\fR is given, then the environment variable \fBTERMCAP\fR is used
26232
for the filename or entry. If \fBTERMCAP\fR is a full pathname to a file, only
26233
the terminal whose name is specified in the environment variable \fBTERM\fR is
26234
@@ -151,7 +151,6 @@ be composed into an \fBacsc\fR string.
26235
IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
26236
with the SVr4 format. The following AIX extensions are automatically
26237
translated:
26238
-.PP
26239
.TS
26240
c c
26241
l l.
26242
@@ -174,11 +173,13 @@ These will be discarded with a warning m
26243
.SH NOTES
26244
This utility is actually a link to \fItic\fR(1M), running in \fI-I\fR mode.
26245
You can use other \fItic\fR options such as \fB-f\fR and \fB-x\fR.
26246
-
26247
+.PP
26248
The trace option isn't identical to SVr4's. Under SVr4, instead of following
26249
the \fB-v\fR with a trace level n, you repeat it n times.
26250
.SH SEE ALSO
26251
-\fBcurses\fR(3X), \fB@INFOCMP@\fR(1M), \fBterminfo\fR(\*n)
26252
+\fB@INFOCMP@\fR(1M),
26253
+\fBcurses\fR(3X),
26254
+\fBterminfo\fR(\*n)
26255
.SH AUTHOR
26256
Eric S. Raymond <esr@snark.thyrsus.com>
26257
.\"#
26258
Index: ncurses-5.5/man/curs_addwstr.3x
26259
===================================================================
26260
--- ncurses-5.5.orig/man/curs_addwstr.3x 2005-05-15 13:02:54.000000000 -0400
26261
+++ ncurses-5.5/man/curs_addwstr.3x 2006-04-18 15:48:06.000000000 -0400
26262
@@ -1,5 +1,5 @@
26263
.\"***************************************************************************
26264
-.\" Copyright (c) 2002-2004,2005 Free Software Foundation, Inc. *
26265
+.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. *
26266
.\" *
26267
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26268
.\" copy of this software and associated documentation files (the *
26269
@@ -26,7 +26,7 @@
26270
.\" authorization. *
26271
.\"***************************************************************************
26272
.\"
26273
-.\" $Id: curs_addwstr.3x,v 1.6 2005/05/15 17:02:54 tom Exp $
26274
+.\" $Id: curs_addwstr.3x,v 1.7 2006/02/25 20:59:08 tom Exp $
26275
.TH curs_addwstr 3X ""
26276
.na
26277
.hy 0
26278
@@ -84,8 +84,6 @@ Note that all of these routines except \
26279
.SH PORTABILITY
26280
All these entry points are described in the XSI Curses standard, Issue 4.
26281
.SH SEE ALSO
26282
-.PP
26283
-Functions:
26284
\fBcurses\fR(3X),
26285
\fBcurs_add_wch\fR(3X)
26286
.\"#
26287
Index: ncurses-5.5/man/curs_bkgrnd.3x
26288
===================================================================
26289
--- ncurses-5.5.orig/man/curs_bkgrnd.3x 2004-03-13 14:39:10.000000000 -0500
26290
+++ ncurses-5.5/man/curs_bkgrnd.3x 2006-04-18 15:48:06.000000000 -0400
26291
@@ -1,5 +1,5 @@
26292
.\"***************************************************************************
26293
-.\" Copyright (c) 2002,2004 Free Software Foundation, Inc. *
26294
+.\" Copyright (c) 2002-2004,2006 Free Software Foundation, Inc. *
26295
.\" *
26296
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26297
.\" copy of this software and associated documentation files (the *
26298
@@ -26,7 +26,7 @@
26299
.\" authorization. *
26300
.\"***************************************************************************
26301
.\"
26302
-.\" $Id: curs_bkgrnd.3x,v 1.2 2004/03/13 19:39:10 tom Exp $
26303
+.\" $Id: curs_bkgrnd.3x,v 1.3 2006/02/25 21:49:19 tom Exp $
26304
.TH curs_bkgrnd 3X ""
26305
.SH NAME
26306
\fBbkgrnd\fR,
26307
@@ -38,7 +38,7 @@
26308
.SH SYNOPSIS
26309
.PP
26310
.B #include <curses.h>
26311
-
26312
+.sp
26313
\fBint bkgrnd(\fR\fB const cchar_t *\fR\fIwch\fR\fB);\fR
26314
.br
26315
\fBint wbkgrnd(\fR\fB WINDOW *\fR\fIwin\fR\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
26316
@@ -63,26 +63,26 @@ the blank characters.
26317
The background becomes a property of the
26318
character and moves with the character through any scrolling and
26319
insert/delete line/character operations.
26320
-
26321
+.PP
26322
To the extent possible on a
26323
particular terminal, the attribute part of the background is displayed
26324
as the graphic rendition of the character put on the screen.
26325
-
26326
+.PP
26327
The \fBbkgrnd\fR and \fBwbkgrnd\fR functions
26328
set the background property of the current or specified window
26329
and then apply this setting to every character position in that window:
26330
-
26331
.RS
26332
+.PP
26333
The rendition of every character on the screen is changed to
26334
the new background rendition.
26335
-
26336
+.PP
26337
Wherever the former background character
26338
appears, it is changed to the new background character.
26339
.RE
26340
-
26341
+.PP
26342
The \fBgetbkgrnd\fR function returns the given window's current background
26343
character/attribute pair via the \fBwch\fR pointer.
26344
-
26345
+.
26346
.SH NOTES
26347
Note that
26348
\fBbkgrnd\fR,
26349
Index: ncurses-5.5/man/curs_border.3x
26350
===================================================================
26351
--- ncurses-5.5.orig/man/curs_border.3x 2005-05-15 12:17:31.000000000 -0400
26352
+++ ncurses-5.5/man/curs_border.3x 2006-04-18 15:48:06.000000000 -0400
26353
@@ -1,5 +1,5 @@
26354
.\"***************************************************************************
26355
-.\" Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
26356
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26357
.\" *
26358
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26359
.\" copy of this software and associated documentation files (the *
26360
@@ -26,7 +26,7 @@
26361
.\" authorization. *
26362
.\"***************************************************************************
26363
.\"
26364
-.\" $Id: curs_border.3x,v 1.17 2005/05/15 16:17:31 tom Exp $
26365
+.\" $Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp $
26366
.TH curs_border 3X ""
26367
.na
26368
.hy 0
26369
@@ -76,6 +76,7 @@
26370
The \fBborder\fR, \fBwborder\fR and \fBbox\fR routines
26371
draw a box around the edges of a window.
26372
Other than the window, each argument is a character with attributes:
26373
+.sp
26374
.RS
26375
\fIls\fR - left side,
26376
.br
26377
@@ -93,8 +94,10 @@ Other than the window, each argument is
26378
.br
26379
\fIbr\fR - bottom right-hand corner.
26380
.RE
26381
+.PP
26382
If any of these arguments is zero, then the corresponding
26383
default values (defined in \fBcurses.h\fR) are used instead:
26384
+.sp
26385
.RS
26386
\fBACS_VLINE\fR,
26387
.br
26388
@@ -112,16 +115,16 @@ default values (defined in \fBcurses.h\f
26389
.br
26390
\fBACS_LRCORNER\fR.
26391
.RE
26392
-
26393
+.PP
26394
\fBbox(\fR\fIwin\fR\fB, \fR\fIverch\fR\fB, \fR\fIhorch\fR\fB)\fR is a shorthand
26395
for the following call: \fBwborder(\fR\fIwin\fR\fB,\fR \fIverch\fR\fB,\fR
26396
\fIverch\fR\fB,\fR \fIhorch\fR\fB,\fR \fIhorch\fR\fB, 0, 0, 0, 0)\fR.
26397
-
26398
+.PP
26399
The \fBhline\fR and \fBwhline\fR functions draw a horizontal (left to right)
26400
line using \fIch\fR starting at the current cursor position in the window. The
26401
current cursor position is not changed. The line is at most \fIn\fR characters
26402
long, or as many as fit into the window.
26403
-
26404
+.PP
26405
The \fBvline\fR and \fBwvline\fR functions draw a vertical (top to bottom) line
26406
using \fIch\fR starting at the current cursor position in the window. The
26407
current cursor position is not changed. The line is at most \fIn\fR characters
26408
@@ -136,7 +139,7 @@ if the window pointer is null.
26409
.SH NOTES
26410
The borders generated by these functions are \fIinside\fR borders (this
26411
is also true of SVr4 curses, though the fact is not documented).
26412
-
26413
+.PP
26414
Note that \fBborder\fR and \fBbox\fR may be macros.
26415
.SH PORTABILITY
26416
These functions are described in the XSI Curses standard, Issue 4.
26417
Index: ncurses-5.5/man/curs_delch.3x
26418
===================================================================
26419
--- ncurses-5.5.orig/man/curs_delch.3x 2000-07-01 15:55:37.000000000 -0400
26420
+++ ncurses-5.5/man/curs_delch.3x 2006-04-18 15:48:06.000000000 -0400
26421
@@ -1,5 +1,5 @@
26422
.\"***************************************************************************
26423
-.\" Copyright (c) 1998,2000 Free Software Foundation, Inc. *
26424
+.\" Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. *
26425
.\" *
26426
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26427
.\" copy of this software and associated documentation files (the *
26428
@@ -26,7 +26,7 @@
26429
.\" authorization. *
26430
.\"***************************************************************************
26431
.\"
26432
-.\" $Id: curs_delch.3x,v 1.7 2000/07/01 19:55:37 tom Exp $
26433
+.\" $Id: curs_delch.3x,v 1.8 2006/02/25 21:42:57 tom Exp $
26434
.TH curs_delch 3X ""
26435
.SH NAME
26436
\fBdelch\fR,
26437
@@ -35,7 +35,7 @@
26438
\fBmvwdelch\fR - delete character under the cursor in a \fBcurses\fR window
26439
.SH SYNOPSIS
26440
\fB#include <curses.h>\fR
26441
-
26442
+.sp
26443
\fBint delch(void);\fR
26444
.br
26445
\fBint wdelch(WINDOW *win);\fR
26446
Index: ncurses-5.5/man/curs_deleteln.3x
26447
===================================================================
26448
--- ncurses-5.5.orig/man/curs_deleteln.3x 2005-05-15 12:53:35.000000000 -0400
26449
+++ ncurses-5.5/man/curs_deleteln.3x 2006-04-18 15:48:06.000000000 -0400
26450
@@ -1,5 +1,5 @@
26451
.\"***************************************************************************
26452
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
26453
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26454
.\" *
26455
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26456
.\" copy of this software and associated documentation files (the *
26457
@@ -26,7 +26,7 @@
26458
.\" authorization. *
26459
.\"***************************************************************************
26460
.\"
26461
-.\" $Id: curs_deleteln.3x,v 1.9 2005/05/15 16:53:35 tom Exp $
26462
+.\" $Id: curs_deleteln.3x,v 1.10 2006/02/25 21:49:19 tom Exp $
26463
.TH curs_deleteln 3X ""
26464
.SH NAME
26465
\fBdeleteln\fR,
26466
@@ -37,7 +37,7 @@
26467
\fBwinsertln\fR - delete and insert lines in a \fBcurses\fR window
26468
.SH SYNOPSIS
26469
\fB#include <curses.h>\fR
26470
-
26471
+.sp
26472
\fBint deleteln(void);\fR
26473
.br
26474
\fBint wdeleteln(WINDOW *win);\fR
26475
@@ -54,13 +54,13 @@
26476
The \fBdeleteln\fR and \fBwdeleteln\fR routines delete the line under the
26477
cursor in the window; all lines below the current line are moved up one line.
26478
The bottom line of the window is cleared. The cursor position does not change.
26479
-
26480
+.PP
26481
The \fBinsdelln\fR and \fBwinsdelln\fR routines, for positive \fIn\fR, insert
26482
\fIn\fR lines into the specified window above the current line. The \fIn\fR
26483
bottom lines are lost. For negative \fIn\fR, delete \fIn\fR lines (starting
26484
with the one under the cursor), and move the remaining lines up. The bottom
26485
\fIn\fR lines are cleared. The current cursor position remains the same.
26486
-
26487
+.PP
26488
The \fBinsertln\fR and \fBwinsertln\fR routines insert a blank line above the
26489
current line and the bottom line is lost.
26490
.SH RETURN VALUE
26491
@@ -77,7 +77,7 @@ standard specifies that they return \fBE
26492
error conditions.
26493
.SH NOTES
26494
Note that all but \fBwinsdelln\fR may be macros.
26495
-
26496
+.PP
26497
These routines do not require a hardware line delete or insert feature in the
26498
terminal. In fact, they won't use hardware line delete/insert unless
26499
\fBidlok(..., TRUE)\fR has been set on the current window.
26500
Index: ncurses-5.5/man/curs_get_wch.3x
26501
===================================================================
26502
--- ncurses-5.5.orig/man/curs_get_wch.3x 2003-05-10 16:33:49.000000000 -0400
26503
+++ ncurses-5.5/man/curs_get_wch.3x 2006-04-18 15:48:06.000000000 -0400
26504
@@ -1,5 +1,5 @@
26505
.\"***************************************************************************
26506
-.\" Copyright (c) 2002,2003 Free Software Foundation, Inc. *
26507
+.\" Copyright (c) 2002-2003,2006 Free Software Foundation, Inc. *
26508
.\" *
26509
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26510
.\" copy of this software and associated documentation files (the *
26511
@@ -26,7 +26,7 @@
26512
.\" authorization. *
26513
.\"***************************************************************************
26514
.\"
26515
-.\" $Id: curs_get_wch.3x,v 1.5 2003/05/10 20:33:49 jmc Exp $
26516
+.\" $Id: curs_get_wch.3x,v 1.6 2006/02/25 21:47:06 tom Exp $
26517
.TH curs_get_wch 3X ""
26518
.SH NAME
26519
\fBget_wch\fR,
26520
@@ -64,14 +64,14 @@ or after the first newline (nocbreak mod
26521
In half-delay mode,
26522
the program waits until the user types a character or the specified
26523
timeout interval has elapsed.
26524
-
26525
+.PP
26526
Unless \fBnoecho\fR has been set,
26527
these routines echo the character into the designated window.
26528
-
26529
+.PP
26530
If the window is not a pad and has been moved or modified since the
26531
last call to \fBwrefresh\fR,
26532
\fBwrefresh\fR will be called before another character is read.
26533
-
26534
+.PP
26535
If \fBkeypad\fR is enabled,
26536
these functions respond to
26537
the pressing of a function key by setting the object pointed to by
26538
Index: ncurses-5.5/man/curs_get_wstr.3x
26539
===================================================================
26540
--- ncurses-5.5.orig/man/curs_get_wstr.3x 2005-05-15 12:17:44.000000000 -0400
26541
+++ ncurses-5.5/man/curs_get_wstr.3x 2006-04-18 15:48:06.000000000 -0400
26542
@@ -1,5 +1,5 @@
26543
.\"***************************************************************************
26544
-.\" Copyright (c) 2002-2003,2005 Free Software Foundation, Inc. *
26545
+.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. *
26546
.\" *
26547
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26548
.\" copy of this software and associated documentation files (the *
26549
@@ -26,7 +26,7 @@
26550
.\" authorization. *
26551
.\"***************************************************************************
26552
.\"
26553
-.\" $Id: curs_get_wstr.3x,v 1.5 2005/05/15 16:17:44 tom Exp $
26554
+.\" $Id: curs_get_wstr.3x,v 1.6 2006/02/25 21:49:19 tom Exp $
26555
.TH curs_get_wstr 3X ""
26556
.na
26557
.hy 0
26558
@@ -44,7 +44,7 @@
26559
.SH SYNOPSIS
26560
.nf
26561
\fB#include <curses.h>\fR
26562
-
26563
+.sp
26564
\fBint get_wstr(wint_t *\fR\fIwstr\fR\fB);\fR
26565
.br
26566
\fBint getn_wstr(wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
26567
@@ -72,22 +72,22 @@ An end-of-file condition is represented
26568
The newline and end-of-line conditions are represented by the \fB\\n\fR \fBwchar_t\fR value.
26569
In all instances, the end of the string is terminated by a null \fBwchar_t\fR.
26570
The routine places resulting values in the area pointed to by \fIwstr\fR.
26571
-
26572
+.PP
26573
The user's erase and kill characters are interpreted. If keypad
26574
mode is on for the window, \fBKEY_LEFT\fR and \fBKEY_BACKSPACE\fR
26575
are both considered equivalent to the user's kill character.
26576
-
26577
+.PP
26578
Characters input are echoed only if \fBecho\fR is currently on. In that case,
26579
backspace is echoed as deletion of the previous character (typically a left
26580
motion).
26581
-
26582
+.PP
26583
The effect of
26584
\fBwget_wstr\fR
26585
is as though a series of
26586
calls to
26587
\fBwget_wch\fR
26588
were made.
26589
-
26590
+.PP
26591
The effect of
26592
\fBmvget_wstr\fR
26593
is as though a call to
26594
@@ -96,7 +96,7 @@ and then a series of calls to
26595
\fBget_wch\fR
26596
were
26597
made.
26598
-
26599
+.PP
26600
The effect of
26601
\fBmvwget_wstr\fR
26602
is as though a call to
26603
@@ -104,7 +104,7 @@ is as though a call to
26604
and then a series of calls to
26605
\fBwget_wch\fR
26606
were made.
26607
-
26608
+.PP
26609
The
26610
\fBgetn_wstr\fR,
26611
\fBmvgetn_wstr\fR,
26612
@@ -139,10 +139,10 @@ The use of
26613
\fBmvgetn_wstr\fR,
26614
\fBmvwgetn_wstr\fR, or
26615
\fBwgetn_wstr\fR, respectively, is recommended.
26616
-
26617
+.PP
26618
These functions cannot return \fBKEY_\fR values because there
26619
is no way to distinguish a \fBKEY_\fR value from a valid \fBwchar_t\fR value.
26620
-
26621
+.PP
26622
All of these routines except \fBwgetn_wstr\fR may be macros.
26623
.SH RETURN VALUES
26624
All of these functions return \fBOK\fR upon successful completion.
26625
Index: ncurses-5.5/man/curs_getyx.3x
26626
===================================================================
26627
--- ncurses-5.5.orig/man/curs_getyx.3x 2003-05-10 16:33:49.000000000 -0400
26628
+++ ncurses-5.5/man/curs_getyx.3x 2006-04-18 15:48:06.000000000 -0400
26629
@@ -1,5 +1,5 @@
26630
.\"***************************************************************************
26631
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
26632
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
26633
.\" *
26634
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26635
.\" copy of this software and associated documentation files (the *
26636
@@ -26,7 +26,7 @@
26637
.\" authorization. *
26638
.\"***************************************************************************
26639
.\"
26640
-.\" $Id: curs_getyx.3x,v 1.10 2003/05/10 20:33:49 jmc Exp $
26641
+.\" $Id: curs_getyx.3x,v 1.12 2006/02/25 22:51:11 tom Exp $
26642
.TH curs_getyx 3X ""
26643
.SH NAME
26644
\fBgetyx\fR,
26645
@@ -35,7 +35,7 @@
26646
\fBgetmaxyx\fR - get \fBcurses\fR cursor and window coordinates
26647
.SH SYNOPSIS
26648
\fB#include <curses.h>\fR
26649
-
26650
+.sp
26651
\fBvoid getyx(WINDOW *win, int y, int x);\fR
26652
.br
26653
\fBvoid getparyx(WINDOW *win, int y, int x);\fR
26654
@@ -47,12 +47,12 @@
26655
.SH DESCRIPTION
26656
The \fBgetyx\fR macro places the current cursor position of the given window in
26657
the two integer variables \fIy\fR and \fIx\fR.
26658
-
26659
+.PP
26660
If \fIwin\fR is a subwindow, the \fBgetparyx\fR macro places the beginning
26661
coordinates of the subwindow relative to the parent window into two integer
26662
variables \fIy\fR and \fIx\fR.
26663
Otherwise, \fB-1\fR is placed into \fIy\fR and \fIx\fR.
26664
-
26665
+.PP
26666
Like \fBgetyx\fR, the \fBgetbegyx\fR and \fBgetmaxyx\fR macros store
26667
the current beginning coordinates and size of the specified window.
26668
.SH RETURN VALUE
26669
@@ -67,7 +67,7 @@ The
26670
\fBgetparyx\fR,
26671
\fBgetbegyx\fR and
26672
\fBgetmaxyx\fR
26673
-functions are described in the XSI Curses standard, Issue 4.
26674
+macros are described in the XSI Curses standard, Issue 4.
26675
.PP
26676
This implementation also provides
26677
\fBgetbegx\fR,
26678
Index: ncurses-5.5/man/curs_in_wch.3x
26679
===================================================================
26680
--- ncurses-5.5.orig/man/curs_in_wch.3x 2002-03-10 10:08:57.000000000 -0500
26681
+++ ncurses-5.5/man/curs_in_wch.3x 2006-04-18 15:48:06.000000000 -0400
26682
@@ -1,5 +1,5 @@
26683
.\"***************************************************************************
26684
-.\" Copyright (c) 2002 Free Software Foundation, Inc. *
26685
+.\" Copyright (c) 2002,2006 Free Software Foundation, Inc. *
26686
.\" *
26687
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26688
.\" copy of this software and associated documentation files (the *
26689
@@ -26,7 +26,7 @@
26690
.\" authorization. *
26691
.\"***************************************************************************
26692
.\"
26693
-.\" $Id: curs_in_wch.3x,v 1.1 2002/03/10 15:08:57 tom Exp $
26694
+.\" $Id: curs_in_wch.3x,v 1.2 2006/02/25 21:42:22 tom Exp $
26695
.TH curs_in_wch 3X ""
26696
.SH NAME
26697
\fBin_wch\fR,
26698
@@ -35,7 +35,7 @@
26699
\fBwin_wch\fR - extract a complex character and rendition from a window
26700
.SH SYNOPSIS
26701
\fB#include <curses.h>\fR
26702
-
26703
+.sp
26704
\fBint in_wch(cchar_t *\fR\fIwcval\fR\fB);\fR
26705
.br
26706
\fBint mvin_wch(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
26707
Index: ncurses-5.5/man/curs_inch.3x
26708
===================================================================
26709
--- ncurses-5.5.orig/man/curs_inch.3x 1998-11-28 20:04:34.000000000 -0500
26710
+++ ncurses-5.5/man/curs_inch.3x 2006-04-18 15:48:06.000000000 -0400
26711
@@ -1,6 +1,6 @@
26712
'\" t
26713
.\"***************************************************************************
26714
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
26715
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
26716
.\" *
26717
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26718
.\" copy of this software and associated documentation files (the *
26719
@@ -27,14 +27,14 @@
26720
.\" authorization. *
26721
.\"***************************************************************************
26722
.\"
26723
-.\" $Id: curs_inch.3x,v 1.11 1998/11/29 01:04:34 Rick.Ohnemus Exp $
26724
+.\" $Id: curs_inch.3x,v 1.12 2006/02/25 21:38:26 tom Exp $
26725
.TH curs_inch 3X ""
26726
.SH NAME
26727
\fBinch\fR, \fBwinch\fR, \fBmvinch\fR, \fBmvwinch\fR
26728
- get a character and attributes from a \fBcurses\fR window
26729
.SH SYNOPSIS
26730
\fB#include <curses.h>\fR
26731
-
26732
+.sp
26733
\fBchtype inch(void);\fR
26734
.br
26735
\fBchtype winch(WINDOW *win);\fR
26736
@@ -49,10 +49,10 @@ position in the named window. If any at
26737
their values are OR'ed into the value returned. Constants defined in
26738
\fB<curses.h>\fR can be used with the \fB&\fR (logical AND) operator to
26739
extract the character or attributes alone.
26740
-
26741
+.
26742
.SS Attributes
26743
The following bit-masks may be AND-ed with characters returned by \fBwinch\fR.
26744
-
26745
+.
26746
.TS
26747
l l .
26748
\fBA_CHARTEXT\fR Bit-mask to extract character
26749
Index: ncurses-5.5/man/curs_inchstr.3x
26750
===================================================================
26751
--- ncurses-5.5.orig/man/curs_inchstr.3x 2005-05-15 12:54:53.000000000 -0400
26752
+++ ncurses-5.5/man/curs_inchstr.3x 2006-04-18 15:48:06.000000000 -0400
26753
@@ -1,5 +1,5 @@
26754
.\"***************************************************************************
26755
-.\" Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. *
26756
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26757
.\" *
26758
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26759
.\" copy of this software and associated documentation files (the *
26760
@@ -26,7 +26,7 @@
26761
.\" authorization. *
26762
.\"***************************************************************************
26763
.\"
26764
-.\" $Id: curs_inchstr.3x,v 1.10 2005/05/15 16:54:53 tom Exp $
26765
+.\" $Id: curs_inchstr.3x,v 1.11 2006/02/25 21:49:19 tom Exp $
26766
.TH curs_inchstr 3X ""
26767
.na
26768
.hy 0
26769
@@ -43,7 +43,7 @@
26770
.hy
26771
.SH SYNOPSIS
26772
\fB#include <curses.h>\fR
26773
-
26774
+.sp
26775
\fBint inchstr(chtype *chstr);\fR
26776
.br
26777
\fBint inchnstr(chtype *chstr, int n);\fR
26778
Index: ncurses-5.5/man/curs_ins_wch.3x
26779
===================================================================
26780
--- ncurses-5.5.orig/man/curs_ins_wch.3x 2002-03-10 18:43:27.000000000 -0500
26781
+++ ncurses-5.5/man/curs_ins_wch.3x 2006-04-18 15:48:06.000000000 -0400
26782
@@ -1,5 +1,5 @@
26783
.\"***************************************************************************
26784
-.\" Copyright (c) 2002 Free Software Foundation, Inc. *
26785
+.\" Copyright (c) 2002,2006 Free Software Foundation, Inc. *
26786
.\" *
26787
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26788
.\" copy of this software and associated documentation files (the *
26789
@@ -26,7 +26,7 @@
26790
.\" authorization. *
26791
.\"***************************************************************************
26792
.\"
26793
-.\" $Id: curs_ins_wch.3x,v 1.2 2002/03/10 23:43:27 tom Exp $
26794
+.\" $Id: curs_ins_wch.3x,v 1.3 2006/02/25 21:42:22 tom Exp $
26795
.TH curs_ins_wch 3X ""
26796
.SH NAME
26797
\fBins_wch\fR,
26798
@@ -35,7 +35,7 @@
26799
\fBwins_wch\fR \- insert a complex character and rendition into a window
26800
.SH SYNOPSIS
26801
#include <curses.h>
26802
-
26803
+.sp
26804
\fBint ins_wch(const cchar_t *\fR\fIwch\fR\fB);\fR
26805
.br
26806
\fBint wins_wch(WINDOW *\fR\fIwin, const cchar_t *\fR\fIwch\fR\fB);\fR
26807
Index: ncurses-5.5/man/curs_insch.3x
26808
===================================================================
26809
--- ncurses-5.5.orig/man/curs_insch.3x 2003-05-10 16:33:49.000000000 -0400
26810
+++ ncurses-5.5/man/curs_insch.3x 2006-04-18 15:48:06.000000000 -0400
26811
@@ -1,5 +1,5 @@
26812
.\"***************************************************************************
26813
-.\" Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. *
26814
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
26815
.\" *
26816
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26817
.\" copy of this software and associated documentation files (the *
26818
@@ -26,7 +26,7 @@
26819
.\" authorization. *
26820
.\"***************************************************************************
26821
.\"
26822
-.\" $Id: curs_insch.3x,v 1.8 2003/05/10 20:33:49 jmc Exp $
26823
+.\" $Id: curs_insch.3x,v 1.9 2006/02/25 21:47:06 tom Exp $
26824
.TH curs_insch 3X ""
26825
.SH NAME
26826
\fBinsch\fR,
26827
@@ -35,7 +35,7 @@
26828
\fBmvwinsch\fR - insert a character before cursor in a \fBcurses\fR window
26829
.SH SYNOPSIS
26830
\fB#include <curses.h>\fR
26831
-
26832
+.sp
26833
\fBint insch(chtype ch);\fR
26834
.br
26835
\fBint winsch(WINDOW *win, chtype ch);\fR
26836
@@ -56,7 +56,7 @@ completion, unless otherwise noted in th
26837
.SH NOTES
26838
These routines do not necessarily imply use of a hardware insert character
26839
feature.
26840
-
26841
+.PP
26842
Note that \fBinsch\fR, \fBmvinsch\fR, and \fBmvwinsch\fR may be macros.
26843
.SH PORTABILITY
26844
These functions are described in the XSI Curses standard, Issue 4.
26845
Index: ncurses-5.5/man/curs_insstr.3x
26846
===================================================================
26847
--- ncurses-5.5.orig/man/curs_insstr.3x 2005-05-15 13:48:33.000000000 -0400
26848
+++ ncurses-5.5/man/curs_insstr.3x 2006-04-18 15:48:06.000000000 -0400
26849
@@ -1,5 +1,5 @@
26850
.\"***************************************************************************
26851
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
26852
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26853
.\" *
26854
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26855
.\" copy of this software and associated documentation files (the *
26856
@@ -26,7 +26,7 @@
26857
.\" authorization. *
26858
.\"***************************************************************************
26859
.\"
26860
-.\" $Id: curs_insstr.3x,v 1.16 2005/05/15 17:48:33 tom Exp $
26861
+.\" $Id: curs_insstr.3x,v 1.17 2006/02/25 21:49:19 tom Exp $
26862
.TH curs_insstr 3X ""
26863
.SH NAME
26864
\fBinsstr\fR,
26865
@@ -67,7 +67,7 @@ The cursor position does not change
26866
The functions with \fIn\fR as the last argument
26867
insert a leading substring of at most \fIn\fR characters.
26868
If \fIn\fR<=0, then the entire string is inserted.
26869
-
26870
+.PP
26871
Special characters are handled as in \fBaddch\fP.
26872
.SH RETURN VALUE
26873
All routines that return an integer return \fBERR\fR upon failure and OK (SVr4
26874
Index: ncurses-5.5/man/curs_instr.3x
26875
===================================================================
26876
--- ncurses-5.5.orig/man/curs_instr.3x 2005-05-15 13:48:23.000000000 -0400
26877
+++ ncurses-5.5/man/curs_instr.3x 2006-04-18 15:48:06.000000000 -0400
26878
@@ -1,5 +1,5 @@
26879
.\"***************************************************************************
26880
-.\" Copyright (c) 1998,2001,2005 Free Software Foundation, Inc. *
26881
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26882
.\" *
26883
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26884
.\" copy of this software and associated documentation files (the *
26885
@@ -26,7 +26,7 @@
26886
.\" authorization. *
26887
.\"***************************************************************************
26888
.\"
26889
-.\" $Id: curs_instr.3x,v 1.12 2005/05/15 17:48:23 tom Exp $
26890
+.\" $Id: curs_instr.3x,v 1.13 2006/02/25 21:49:19 tom Exp $
26891
.TH curs_instr 3X ""
26892
.SH NAME
26893
\fBinstr\fR,
26894
@@ -39,7 +39,7 @@
26895
\fBmvwinnstr\fR - get a string of characters from a \fBcurses\fR window
26896
.SH SYNOPSIS
26897
\fB#include <curses.h>\fR
26898
-
26899
+.sp
26900
\fBint instr(char *str);\fR
26901
.br
26902
\fBint innstr(char *str, int n);\fR
26903
@@ -87,4 +87,3 @@ In this case, the functions return the s
26904
.\"# mode:nroff
26905
.\"# fill-column:79
26906
.\"# End:
26907
-
26908
Index: ncurses-5.5/man/curs_inwstr.3x
26909
===================================================================
26910
--- ncurses-5.5.orig/man/curs_inwstr.3x 2005-06-25 14:31:26.000000000 -0400
26911
+++ ncurses-5.5/man/curs_inwstr.3x 2006-04-18 15:48:06.000000000 -0400
26912
@@ -1,5 +1,5 @@
26913
.\"***************************************************************************
26914
-.\" Copyright (c) 2002-2004,2005 Free Software Foundation, Inc. *
26915
+.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. *
26916
.\" *
26917
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26918
.\" copy of this software and associated documentation files (the *
26919
@@ -26,7 +26,7 @@
26920
.\" authorization. *
26921
.\"***************************************************************************
26922
.\"
26923
-.\" $Id: curs_inwstr.3x,v 1.4 2005/06/25 18:31:26 Daniel.Jacobowitz Exp $
26924
+.\" $Id: curs_inwstr.3x,v 1.5 2006/02/25 21:20:20 tom Exp $
26925
.TH curs_inwstr 3X ""
26926
.SH NAME
26927
\fBinwstr\fR,
26928
@@ -40,7 +40,7 @@
26929
.SH SYNOPSIS
26930
.nf
26931
\fB#include <curses.h> \fR
26932
-
26933
+.sp
26934
\fBint inwstr(\fR\fBwchar_t *\fR\fIstr\fR\fB);\fR
26935
.br
26936
\fBint innwstr(\fR\fBwchar_t *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
26937
@@ -82,7 +82,6 @@ routines return
26938
routines return the
26939
number of characters read into the string.
26940
.SH SEE ALSO
26941
-Functions:
26942
\fBcurses\fR(3X),
26943
\fBcurs_instr\fR(3X),
26944
\fBcurs_in_wchstr\fR(3X)
26945
Index: ncurses-5.5/man/curs_move.3x
26946
===================================================================
26947
--- ncurses-5.5.orig/man/curs_move.3x 2005-05-15 13:36:19.000000000 -0400
26948
+++ ncurses-5.5/man/curs_move.3x 2006-04-18 15:48:06.000000000 -0400
26949
@@ -1,5 +1,5 @@
26950
.\"***************************************************************************
26951
-.\" Copyright (c) 1998-2001,2005 Free Software Foundation, Inc. *
26952
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26953
.\" *
26954
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26955
.\" copy of this software and associated documentation files (the *
26956
@@ -26,7 +26,7 @@
26957
.\" authorization. *
26958
.\"***************************************************************************
26959
.\"
26960
-.\" $Id: curs_move.3x,v 1.11 2005/05/15 17:36:19 tom Exp $
26961
+.\" $Id: curs_move.3x,v 1.12 2006/02/25 21:49:19 tom Exp $
26962
.TH curs_move 3X ""
26963
.na
26964
.hy 0
26965
@@ -37,7 +37,7 @@
26966
.hy
26967
.SH SYNOPSIS
26968
\fB#include <curses.h>\fR
26969
-
26970
+.sp
26971
\fBint move(int y, int x);\fR
26972
.br
26973
\fBint wmove(WINDOW *win, int y, int x);\fR
26974
Index: ncurses-5.5/man/curs_overlay.3x
26975
===================================================================
26976
--- ncurses-5.5.orig/man/curs_overlay.3x 2005-05-15 12:18:38.000000000 -0400
26977
+++ ncurses-5.5/man/curs_overlay.3x 2006-04-18 15:48:06.000000000 -0400
26978
@@ -1,5 +1,5 @@
26979
.\"***************************************************************************
26980
-.\" Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
26981
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
26982
.\" *
26983
.\" Permission is hereby granted, free of charge, to any person obtaining a *
26984
.\" copy of this software and associated documentation files (the *
26985
@@ -26,7 +26,7 @@
26986
.\" authorization. *
26987
.\"***************************************************************************
26988
.\"
26989
-.\" $Id: curs_overlay.3x,v 1.13 2005/05/15 16:18:38 tom Exp $
26990
+.\" $Id: curs_overlay.3x,v 1.14 2006/02/25 21:49:19 tom Exp $
26991
.TH curs_overlay 3X ""
26992
.na
26993
.hy 0
26994
@@ -38,7 +38,7 @@
26995
.hy
26996
.SH SYNOPSIS
26997
\fB#include <curses.h>\fR
26998
-
26999
+.sp
27000
\fBint overlay(const WINDOW *srcwin, WINDOW *dstwin);\fR
27001
.br
27002
\fBint overwrite(const WINDOW *srcwin, WINDOW *dstwin);\fR
27003
@@ -52,7 +52,7 @@ top of \fIdstwin\fR. \fIscrwin\fR and \
27004
to be the same size; only text where the two windows overlap is
27005
copied. The difference is that \fBoverlay\fR is non-destructive
27006
(blanks are not copied) whereas \fBoverwrite\fR is destructive.
27007
-
27008
+.PP
27009
The \fBcopywin\fR routine provides a finer granularity of control over the
27010
\fBoverlay\fR and \fBoverwrite\fR routines. Like in the \fBprefresh\fR
27011
routine, a rectangle is specified in the destination window, (\fIdminrow\fR,
27012
Index: ncurses-5.5/man/curs_print.3x
27013
===================================================================
27014
--- ncurses-5.5.orig/man/curs_print.3x 2005-05-15 11:59:36.000000000 -0400
27015
+++ ncurses-5.5/man/curs_print.3x 2006-04-18 15:48:06.000000000 -0400
27016
@@ -1,5 +1,5 @@
27017
.\"***************************************************************************
27018
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27019
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27020
.\" *
27021
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27022
.\" copy of this software and associated documentation files (the *
27023
@@ -26,25 +26,25 @@
27024
.\" authorization. *
27025
.\"***************************************************************************
27026
.\"
27027
-.\" $Id: curs_print.3x,v 1.7 2005/05/15 15:59:36 tom Exp $
27028
+.\" $Id: curs_print.3x,v 1.8 2006/02/25 21:49:19 tom Exp $
27029
.TH curs_print 3X ""
27030
.SH NAME
27031
\fBmcprint\fR - ship binary data to printer
27032
.SH SYNOPSIS
27033
\fB#include <curses.h>\fR
27034
-
27035
+.sp
27036
\fBint mcprint(char *data, int len);\fR
27037
.SH DESCRIPTION
27038
This function uses the \fBmc5p\fR or \fBmc4\fR and \fBmc5\fR capabilities,
27039
if they are present, to ship given data to a printer attached to the terminal.
27040
-
27041
+.PP
27042
Note that the \fBmcprint\fR code has no way to do flow control with the printer
27043
or to know how much buffering it has. Your application is responsible for
27044
keeping the rate of writes to the printer below its continuous throughput rate
27045
(typically about half of its nominal cps rating). Dot-matrix printers and
27046
6-page-per-minute lasers can typically handle 80cps, so a good conservative
27047
rule of thumb is to sleep for a second after shipping each 80-character line.
27048
-
27049
+.
27050
.SH RETURN VALUE
27051
The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
27052
for some reason. In this case, errno will contain either an error associated
27053
@@ -55,7 +55,7 @@ Capabilities for printer redirection do
27054
.TP 5
27055
ENOMEM
27056
Couldn't allocate sufficient memory to buffer the printer write.
27057
-
27058
+.PP
27059
When \fBmcprint\fR succeeds, it returns the number of characters actually
27060
sent to the printer.
27061
.SH PORTABILITY
27062
Index: ncurses-5.5/man/curs_printw.3x
27063
===================================================================
27064
--- ncurses-5.5.orig/man/curs_printw.3x 2005-05-15 12:55:16.000000000 -0400
27065
+++ ncurses-5.5/man/curs_printw.3x 2006-04-18 15:48:06.000000000 -0400
27066
@@ -1,5 +1,5 @@
27067
.\"***************************************************************************
27068
-.\" Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. *
27069
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27070
.\" *
27071
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27072
.\" copy of this software and associated documentation files (the *
27073
@@ -26,7 +26,7 @@
27074
.\" authorization. *
27075
.\"***************************************************************************
27076
.\"
27077
-.\" $Id: curs_printw.3x,v 1.15 2005/05/15 16:55:16 tom Exp $
27078
+.\" $Id: curs_printw.3x,v 1.16 2006/02/25 21:49:19 tom Exp $
27079
.TH curs_printw 3X ""
27080
.na
27081
.hy 0
27082
@@ -40,7 +40,7 @@
27083
.hy
27084
.SH SYNOPSIS
27085
\fB#include <curses.h>\fR
27086
-
27087
+.sp
27088
\fBint printw(const char *fmt, ...);\fR
27089
.br
27090
\fBint wprintw(WINDOW *win, const char *fmt, ...);\fR
27091
@@ -58,7 +58,7 @@ The \fBprintw\fR, \fBwprintw\fR, \fBmvpr
27092
routines are analogous to \fBprintf\fR [see \fBprintf\fR(3S)]. In
27093
effect, the string that would be output by \fBprintf\fR is output
27094
instead as though \fBwaddstr\fR were used on the given window.
27095
-
27096
+.PP
27097
The \fBvwprintw\fR and \fBwv_printw\fR routines are analogous
27098
to \fBvprintf\fR [see \fBprintf\fR(3S)]
27099
and perform a \fBwprintw\fR using a variable argument list.
27100
Index: ncurses-5.5/man/curs_scanw.3x
27101
===================================================================
27102
--- ncurses-5.5.orig/man/curs_scanw.3x 2002-07-20 11:48:09.000000000 -0400
27103
+++ ncurses-5.5/man/curs_scanw.3x 2006-04-18 15:48:06.000000000 -0400
27104
@@ -1,5 +1,5 @@
27105
.\"***************************************************************************
27106
-.\" Copyright (c) 1998,2000 Free Software Foundation, Inc. *
27107
+.\" Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. *
27108
.\" *
27109
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27110
.\" copy of this software and associated documentation files (the *
27111
@@ -26,7 +26,7 @@
27112
.\" authorization. *
27113
.\"***************************************************************************
27114
.\"
27115
-.\" $Id: curs_scanw.3x,v 1.12 2002/07/20 15:48:09 tom Exp $
27116
+.\" $Id: curs_scanw.3x,v 1.13 2006/02/25 21:42:22 tom Exp $
27117
.TH curs_scanw 3X ""
27118
.SH NAME
27119
\fBscanw\fR,
27120
@@ -36,7 +36,7 @@
27121
\fBvwscanw\fR, \fBvw_scanw\fR - convert formatted input from a \fBcurses\fR window
27122
.SH SYNOPSIS
27123
\fB#include <curses.h>\fR
27124
-
27125
+.sp
27126
\fBint scanw(char *fmt, ...);\fR
27127
.br
27128
\fBint wscanw(WINDOW *win, char *fmt, ...);\fR
27129
@@ -54,7 +54,7 @@ The \fBscanw\fR, \fBwscanw\fR and \fBmvs
27130
\fBwgetstr\fR were called on the window, and the resulting line used as input
27131
for \fBsscanf\fR(3). Fields which do not map to a variable in the \fIfmt\fR
27132
field are lost.
27133
-
27134
+.PP
27135
The \fBvwscanw\fR and \fBvw_scanw\fR routines are analogous to \fBvscanf\fR.
27136
They perform a \fBwscanw\fR using a variable argument list.
27137
The third argument is a \fIva_list\fR,
27138
@@ -62,7 +62,7 @@ a pointer to a list of arguments, as def
27139
.SH RETURN VALUE
27140
\fBvwscanw\fR returns \fBERR\fR on failure and an integer equal to the
27141
number of fields scanned on success.
27142
-
27143
+.PP
27144
Applications may use the return value from the \fBscanw\fR, \fBwscanw\fR,
27145
\fBmvscanw\fR and \fBmvwscanw\fR routines to determine the number of fields
27146
which were mapped in the call.
27147
Index: ncurses-5.5/man/curs_scr_dump.3x
27148
===================================================================
27149
--- ncurses-5.5.orig/man/curs_scr_dump.3x 2005-05-15 12:18:55.000000000 -0400
27150
+++ ncurses-5.5/man/curs_scr_dump.3x 2006-04-18 15:48:06.000000000 -0400
27151
@@ -1,5 +1,5 @@
27152
.\"***************************************************************************
27153
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27154
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27155
.\" *
27156
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27157
.\" copy of this software and associated documentation files (the *
27158
@@ -26,7 +26,7 @@
27159
.\" authorization. *
27160
.\"***************************************************************************
27161
.\"
27162
-.\" $Id: curs_scr_dump.3x,v 1.5 2005/05/15 16:18:55 tom Exp $
27163
+.\" $Id: curs_scr_dump.3x,v 1.6 2006/02/25 21:49:19 tom Exp $
27164
.TH curs_scr_dump 3X ""
27165
.na
27166
.hy 0
27167
@@ -39,7 +39,7 @@
27168
.hy
27169
.SH SYNOPSIS
27170
\fB#include <curses.h>\fR
27171
-
27172
+.sp
27173
\fBint scr_dump(const char *filename);\fR
27174
.br
27175
\fBint scr_restore(const char *filename);\fR
27176
@@ -51,12 +51,12 @@
27177
.SH DESCRIPTION
27178
The \fBscr_dump\fR routine dumps the current contents of the virtual screen
27179
to the file \fIfilename\fR.
27180
-
27181
+.PP
27182
The \fBscr_restore\fR routine sets the virtual screen to the contents
27183
of \fIfilename\fR, which must have been written using \fBscr_dump\fR. The next
27184
call to \fBdoupdate\fR restores the screen to the way it looked in the dump
27185
file.
27186
-
27187
+.PP
27188
The \fBscr_init\fR routine reads in the contents of \fIfilename\fR and uses
27189
them to initialize the \fBcurses\fR data structures about what the terminal
27190
currently has on its screen. If the data is determined to be valid,
27191
@@ -67,12 +67,12 @@ the screen with another process which ha
27192
\fBendwin\fR call. The data is declared invalid if the terminfo capabilities
27193
\fBrmcup\fR and \fBnrrmc\fR exist; also if the terminal has been written to
27194
since the preceding \fBscr_dump\fR call.
27195
-
27196
+.PP
27197
The \fBscr_set\fR routine is a combination of \fBscr_restore\fR and
27198
\fBscr_init\fR. It tells the program that the information in \fIfilename\fR is
27199
what is currently on the screen, and also what the program wants on the screen.
27200
This can be thought of as a screen inheritance function.
27201
-
27202
+.PP
27203
To read (write) a window from (to) a file, use the \fBgetwin\fR and
27204
\fBputwin\fR routines [see \fBcurs_util\fR(3X)].
27205
.SH RETURN VALUE
27206
@@ -87,7 +87,7 @@ Note that \fBscr_init\fR, \fBscr_set\fR,
27207
.SH PORTABILITY
27208
The XSI Curses standard, Issue 4, describes these functions (adding the const
27209
qualifiers).
27210
-
27211
+.PP
27212
The SVr4 docs merely say under \fBscr_init\fR that the dump data is also
27213
considered invalid "if the time-stamp of the tty is old" but do not define
27214
"old".
27215
Index: ncurses-5.5/man/curs_scroll.3x
27216
===================================================================
27217
--- ncurses-5.5.orig/man/curs_scroll.3x 2005-05-15 12:19:01.000000000 -0400
27218
+++ ncurses-5.5/man/curs_scroll.3x 2006-04-18 15:48:06.000000000 -0400
27219
@@ -1,5 +1,5 @@
27220
.\"***************************************************************************
27221
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27222
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27223
.\" *
27224
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27225
.\" copy of this software and associated documentation files (the *
27226
@@ -26,7 +26,7 @@
27227
.\" authorization. *
27228
.\"***************************************************************************
27229
.\"
27230
-.\" $Id: curs_scroll.3x,v 1.12 2005/05/15 16:19:01 tom Exp $
27231
+.\" $Id: curs_scroll.3x,v 1.13 2006/02/25 21:49:19 tom Exp $
27232
.TH curs_scroll 3X ""
27233
.na
27234
.hy 0
27235
@@ -38,7 +38,7 @@
27236
.hy
27237
.SH SYNOPSIS
27238
\fB#include <curses.h>\fR
27239
-
27240
+.sp
27241
\fBint scroll(WINDOW *win);\fR
27242
.br
27243
\fBint scrl(int n);\fR
27244
@@ -52,14 +52,14 @@ the lines in the window data structure.
27245
As an optimization, if the scrolling
27246
region of the window is the entire screen, the physical screen may be scrolled
27247
at the same time.
27248
-
27249
+.PP
27250
For positive \fIn\fR, the \fBscrl\fR and \fBwscrl\fR routines scroll the
27251
window up \fIn\fR lines (line \fIi\fR+\fIn\fR becomes \fIi\fR); otherwise
27252
scroll the window down \fIn\fR lines.
27253
This involves moving the lines in the
27254
window character image structure.
27255
The current cursor position is not changed.
27256
-
27257
+.PP
27258
For these functions to work, scrolling must be enabled via \fBscrollok\fR.
27259
.SH RETURN VALUE
27260
These routines return \fBERR\fR upon failure, and \fBOK\fR (SVr4 only specifies
27261
@@ -72,14 +72,14 @@ if the window pointer is null, or
27262
if scrolling is not enabled in the window, e.g., with \fBscrollok\fP.
27263
.SH NOTES
27264
Note that \fBscrl\fR and \fBscroll\fR may be macros.
27265
-
27266
+.PP
27267
The SVr4 documentation says that the optimization of physically scrolling
27268
immediately if the scroll region is the entire screen "is" performed, not
27269
"may be" performed.
27270
This implementation deliberately does not guarantee
27271
that this will occur, to leave open the possibility of smarter
27272
optimization of multiple scroll actions on the next update.
27273
-
27274
+.PP
27275
Neither the SVr4 nor the XSI documentation specify whether the current
27276
attribute or
27277
current color-pair of blanks generated by the scroll function is zeroed.
27278
Index: ncurses-5.5/man/curs_slk.3x
27279
===================================================================
27280
--- ncurses-5.5.orig/man/curs_slk.3x 2005-05-15 12:19:06.000000000 -0400
27281
+++ ncurses-5.5/man/curs_slk.3x 2006-04-18 15:48:06.000000000 -0400
27282
@@ -1,5 +1,5 @@
27283
.\"***************************************************************************
27284
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27285
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27286
.\" *
27287
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27288
.\" copy of this software and associated documentation files (the *
27289
@@ -26,7 +26,7 @@
27290
.\" authorization. *
27291
.\"***************************************************************************
27292
.\"
27293
-.\" $Id: curs_slk.3x,v 1.14 2005/05/15 16:19:06 tom Exp $
27294
+.\" $Id: curs_slk.3x,v 1.15 2006/02/25 21:49:19 tom Exp $
27295
.TH curs_slk 3X ""
27296
.na
27297
.hy 0
27298
@@ -51,7 +51,7 @@
27299
.hy
27300
.SH SYNOPSIS
27301
\fB#include <curses.h>\fR
27302
-
27303
+.sp
27304
\fBint slk_init(int fmt);\fR
27305
.br
27306
\fBint slk_set(int labnum, const char *label, int fmt);\fR
27307
@@ -97,7 +97,7 @@ characters each. This is most common for
27308
Please note that ncurses simulates this mode by taking over up to two lines at
27309
the bottom of the screen, it doesn't try to use any hardware support for this
27310
mode.
27311
-
27312
+.PP
27313
The \fBslk_init\fR routine must be called before \fBinitscr\fR or \fBnewterm\fR
27314
is called. If \fBinitscr\fR eventually uses a line from \fBstdscr\fR to
27315
emulate the soft labels, then \fIfmt\fR determines how the labels are arranged
27316
@@ -106,7 +106,7 @@ the labels, \fB1\fR indicates a 4-4 arra
27317
PC like 4-4-4 mode. If \fBfmt\fR is set to \fB3\fR, it is again the PC like
27318
4-4-4 mode, but in addition an index line is generated, helping the user to
27319
identify the key numbers easily.
27320
-
27321
+.PP
27322
The \fBslk_set\fR routine requires \fIlabnum\fR to be a label number,
27323
from \fB1\fR to \fB8\fR (resp. \fB12\fR); \fIlabel\fR must be the string
27324
to be put on the label, up to eight (resp. five) characters in length.
27325
@@ -114,30 +114,30 @@ A null string or a null pointer sets up
27326
\fB0\fR, \fB1\fR, or \fB2\fR, indicating whether the label is to be
27327
left-justified, centered, or right-justified, respectively, within the
27328
label.
27329
-
27330
+.PP
27331
The \fBslk_refresh\fR and \fBslk_noutrefresh\fR routines correspond to
27332
the \fBwrefresh\fR and \fBwnoutrefresh\fR routines.
27333
-
27334
+.PP
27335
The \fBslk_label\fR routine returns the current label for label number
27336
\fIlabnum\fR, with leading and trailing blanks stripped.
27337
-
27338
+.PP
27339
The \fBslk_clear\fR routine clears the soft labels from the screen.
27340
-
27341
+.PP
27342
The \fBslk_restore\fR routine restores the soft labels to the screen
27343
after a \fBslk_clear\fR has been performed.
27344
-
27345
+.PP
27346
The \fBslk_touch\fR routine forces all the soft labels to be output
27347
the next time a \fBslk_noutrefresh\fR is performed.
27348
-
27349
+.PP
27350
The \fBslk_attron\fR, \fBslk_attrset\fR, \fBslk_attroff\fR and \fBslk_attr\fR
27351
routines correspond to \fBattron\fR, \fBattrset\fR, \fBattroff\fR and \fBattr_get\fR.
27352
They have an effect only if soft labels are simulated on the bottom line of
27353
the screen. The default highlight for soft keys is A_STANDOUT (as in
27354
System V curses, which does not document this fact).
27355
-
27356
+.PP
27357
The \fBslk_color\fR routine corresponds to \fBcolor_set\fR. It has an effect only
27358
if soft labels are simulated on the bottom line of the screen.
27359
-
27360
+.
27361
.SH RETURN VALUE
27362
These routines return \fBERR\fR upon failure and OK (SVr4 specifies only "an
27363
integer value other than \fBERR\fR") upon successful completion.
27364
Index: ncurses-5.5/man/curs_terminfo.3x
27365
===================================================================
27366
--- ncurses-5.5.orig/man/curs_terminfo.3x 2005-05-15 12:19:13.000000000 -0400
27367
+++ ncurses-5.5/man/curs_terminfo.3x 2006-04-18 15:48:06.000000000 -0400
27368
@@ -1,5 +1,5 @@
27369
.\"***************************************************************************
27370
-.\" Copyright (c) 1999-2003,2005 Free Software Foundation, Inc. *
27371
+.\" Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. *
27372
.\" *
27373
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27374
.\" copy of this software and associated documentation files (the *
27375
@@ -26,7 +26,7 @@
27376
.\" authorization. *
27377
.\"***************************************************************************
27378
.\"
27379
-.\" $Id: curs_terminfo.3x,v 1.20 2005/05/15 16:19:13 tom Exp $
27380
+.\" $Id: curs_terminfo.3x,v 1.21 2006/02/25 21:49:19 tom Exp $
27381
.TH curs_terminfo 3X ""
27382
.ds n 5
27383
.na
27384
@@ -154,15 +154,15 @@ means that the \fBterminfo\fR database c
27385
If \fIerrret\fR is
27386
null, \fBsetupterm\fR prints an error message upon finding an error
27387
and exits. Thus, the simplest call is:
27388
-
27389
+.sp
27390
\fBsetupterm((char *)0, 1, (int *)0);\fR,
27391
-
27392
+.sp
27393
which uses all the defaults and sends the output to \fBstdout\fR.
27394
.PP
27395
The \fBsetterm\fR routine is being replaced by \fBsetupterm\fR. The call:
27396
-
27397
+.sp
27398
\fBsetupterm(\fR\fIterm\fR\fB, 1, (int *)0)\fR
27399
-
27400
+.sp
27401
provides the same functionality as \fBsetterm(\fR\fIterm\fR\fB)\fR.
27402
The \fBsetterm\fR routine is included here for BSD compatibility, and
27403
is not recommended for new programs.
27404
@@ -240,13 +240,15 @@ or \fB0\fR if it is canceled or absent f
27405
.PP
27406
The \fIcapname\fR for each capability is given in the table column entitled
27407
\fIcapname\fR code in the capabilities section of \fBterminfo\fR(\*n).
27408
-
27409
+.sp
27410
+.RS
27411
\fBchar *boolnames\fR, \fB*boolcodes\fR, \fB*boolfnames\fR
27412
-
27413
+.sp
27414
\fBchar *numnames\fR, \fB*numcodes\fR, \fB*numfnames\fR
27415
-
27416
+.sp
27417
\fBchar *strnames\fR, \fB*strcodes\fR, \fB*strfnames\fR
27418
-
27419
+.RE
27420
+.PP
27421
These null-terminated arrays contain the \fIcapnames\fR, the
27422
\fBtermcap\fR codes, and the full C names, for each of the
27423
\fBterminfo\fR variables.
27424
Index: ncurses-5.5/man/curs_touch.3x
27425
===================================================================
27426
--- ncurses-5.5.orig/man/curs_touch.3x 2005-05-15 12:19:19.000000000 -0400
27427
+++ ncurses-5.5/man/curs_touch.3x 2006-04-18 15:48:06.000000000 -0400
27428
@@ -1,5 +1,5 @@
27429
.\"***************************************************************************
27430
-.\" Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. *
27431
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27432
.\" *
27433
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27434
.\" copy of this software and associated documentation files (the *
27435
@@ -26,7 +26,7 @@
27436
.\" authorization. *
27437
.\"***************************************************************************
27438
.\"
27439
-.\" $Id: curs_touch.3x,v 1.10 2005/05/15 16:19:19 tom Exp $
27440
+.\" $Id: curs_touch.3x,v 1.11 2006/02/25 21:49:19 tom Exp $
27441
.TH curs_touch 3X ""
27442
.na
27443
.hy 0
27444
@@ -63,15 +63,15 @@ to one window affects the other window,
27445
have been changed in the other window do not reflect the change. The
27446
routine \fBtouchline\fR only pretends that \fIcount\fR lines have been
27447
changed, beginning with line \fIstart\fR.
27448
-
27449
+.PP
27450
The \fBuntouchwin\fR routine marks all lines in the window as unchanged since
27451
the last call to \fBwrefresh\fR.
27452
-
27453
+.PP
27454
The \fBwtouchln\fR routine makes \fIn\fR lines in the window, starting
27455
at line \fIy\fR, look as if they have (\fIchanged\fR\fB=1\fR) or have
27456
not (\fIchanged\fR\fB=0\fR) been changed since the last call to
27457
\fBwrefresh\fR.
27458
-
27459
+.PP
27460
The \fBis_linetouched\fR and \fBis_wintouched\fR routines return
27461
\fBTRUE\fR if the specified line/window was modified since the last
27462
call to \fBwrefresh\fR; otherwise they return \fBFALSE\fR. In
27463
@@ -99,7 +99,7 @@ if the line number is outside the window
27464
.RE
27465
.SH PORTABILITY
27466
The XSI Curses standard, Issue 4 describes these functions.
27467
-
27468
+.PP
27469
Some historic curses implementations had, as an undocumented feature, the
27470
ability to do the equivalent of \fBclearok(..., 1)\fR by saying
27471
\fBtouchwin(stdscr)\fR or \fBclear(stdscr)\fR. This will not work under
27472
Index: ncurses-5.5/man/curs_window.3x
27473
===================================================================
27474
--- ncurses-5.5.orig/man/curs_window.3x 2005-05-15 12:32:02.000000000 -0400
27475
+++ ncurses-5.5/man/curs_window.3x 2006-04-18 15:48:06.000000000 -0400
27476
@@ -1,5 +1,5 @@
27477
.\"***************************************************************************
27478
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27479
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27480
.\" *
27481
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27482
.\" copy of this software and associated documentation files (the *
27483
@@ -26,7 +26,7 @@
27484
.\" authorization. *
27485
.\"***************************************************************************
27486
.\"
27487
-.\" $Id: curs_window.3x,v 1.13 2005/05/15 16:32:02 tom Exp $
27488
+.\" $Id: curs_window.3x,v 1.14 2006/02/25 21:49:19 tom Exp $
27489
.TH curs_window 3X ""
27490
.na
27491
.hy 0
27492
@@ -46,7 +46,7 @@
27493
.hy
27494
.SH SYNOPSIS
27495
\fB#include <curses.h>\fR
27496
-
27497
+.sp
27498
\fBWINDOW *newwin(int nlines, int ncols, int begin_y,\fR
27499
\fBint begin_x);\fR
27500
.br
27501
@@ -79,17 +79,17 @@ at line \fIbegin\fR_\fIy\fR, column \fIb
27502
\fInlines\fR or \fIncols\fR is zero, they default to \fBLINES -\fR
27503
\fIbegin\fR_\fIy\fR and \fBCOLS -\fR \fIbegin\fR_\fIx\fR. A new full-screen
27504
window is created by calling \fBnewwin(0,0,0,0)\fR.
27505
-
27506
+.PP
27507
Calling \fBdelwin\fR deletes the named window, freeing all memory
27508
associated with it (it does not actually erase the window's screen
27509
image). Subwindows must be deleted before the main window can be
27510
deleted.
27511
-
27512
+.PP
27513
Calling \fBmvwin\fR moves the window so that the upper left-hand
27514
corner is at position (\fIx\fR, \fIy\fR). If the move would cause the
27515
window to be off the screen, it is an error and the window is not
27516
moved. Moving subwindows is allowed, but should be avoided.
27517
-
27518
+.PP
27519
Calling \fBsubwin\fR creates and returns a pointer to a new window
27520
with the given number of lines, \fInlines\fR, and columns,
27521
\fIncols\fR. The window is at position (\fIbegin\fR_\fIy\fR,
27522
@@ -100,29 +100,29 @@ will affect both windows. The subwindow
27523
\fIorig\fR. When using this routine, it is necessary to call
27524
\fBtouchwin\fR or \fBtouchline\fR on \fIorig\fR before calling
27525
\fBwrefresh\fR on the subwindow.
27526
-
27527
+.PP
27528
Calling \fBderwin\fR is the same as calling \fBsubwin,\fR except that
27529
\fIbegin\fR_\fIy\fR and \fIbegin\fR_\fIx\fR are relative to the origin
27530
of the window \fIorig\fR rather than the screen. There is no
27531
difference between the subwindows and the derived windows.
27532
-
27533
+.PP
27534
Calling \fBmvderwin\fR moves a derived window (or subwindow)
27535
inside its parent window. The screen-relative parameters of the
27536
window are not changed. This routine is used to display different
27537
parts of the parent window at the same physical position on the
27538
screen.
27539
-
27540
+.PP
27541
Calling \fBdupwin\fR creates an exact duplicate of the window \fIwin\fR.
27542
-
27543
+.PP
27544
Calling \fBwsyncup\fR touches all locations in ancestors of \fIwin\fR that are
27545
changed in \fIwin\fR. If \fBsyncok\fR is called with second argument
27546
\fBTRUE\fR then \fBwsyncup\fR is called automatically whenever there is a
27547
change in the window.
27548
-
27549
+.PP
27550
The \fBwsyncdown\fR routine touches each location in \fIwin\fR that has been
27551
touched in any of its ancestor windows. This routine is called by
27552
\fBwrefresh\fR, so it should almost never be necessary to call it manually.
27553
-
27554
+.PP
27555
The routine \fBwcursyncup\fR updates the current cursor position of all the
27556
ancestors of the window to reflect the current cursor position of the
27557
window.
27558
@@ -163,13 +163,13 @@ if the window pointer is null.
27559
.SH NOTES
27560
If many small changes are made to the window, the \fBwsyncup\fR option could
27561
degrade performance.
27562
-
27563
+.PP
27564
Note that \fBsyncok\fR may be a macro.
27565
.SH BUGS
27566
The subwindow functions (\fIsubwin\fR, \fIderwin\fR, \fImvderwin\fR,
27567
\fBwsyncup\fR, \fBwsyncdown\fR, \fBwcursyncup\fR, \fBsyncok\fR) are flaky,
27568
incompletely implemented, and not well tested.
27569
-
27570
+.PP
27571
The System V curses documentation is very unclear about what \fBwsyncup\fR
27572
and \fBwsyncdown\fR actually do. It seems to imply that they are only
27573
supposed to touch exactly those lines that are affected by ancestor changes.
27574
Index: ncurses-5.5/man/default_colors.3x
27575
===================================================================
27576
--- ncurses-5.5.orig/man/default_colors.3x 2005-02-19 15:25:44.000000000 -0500
27577
+++ ncurses-5.5/man/default_colors.3x 2006-04-18 15:48:06.000000000 -0400
27578
@@ -1,5 +1,5 @@
27579
.\"***************************************************************************
27580
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
27581
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27582
.\" *
27583
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27584
.\" copy of this software and associated documentation files (the *
27585
@@ -28,14 +28,14 @@
27586
.\"
27587
.\" Author: Thomas E. Dickey 1997,1999,2000,2005
27588
.\"
27589
-.\" $Id: default_colors.3x,v 1.18 2005/02/19 20:25:44 tom Exp $
27590
+.\" $Id: default_colors.3x,v 1.19 2006/02/25 21:49:19 tom Exp $
27591
.TH default_colors 3X ""
27592
.SH NAME
27593
\fBuse_default_colors\fR,
27594
\fBassume_default_colors\fR \- use terminal's default colors
27595
.SH SYNOPSIS
27596
\fB#include <curses.h>\fP
27597
-
27598
+.sp
27599
\fBint use_default_colors(void);\fP
27600
.br
27601
\fBint assume_default_colors(int fg, int bg);\fP
27602
Index: ncurses-5.5/man/define_key.3x
27603
===================================================================
27604
--- ncurses-5.5.orig/man/define_key.3x 2004-06-05 15:20:03.000000000 -0400
27605
+++ ncurses-5.5/man/define_key.3x 2006-04-18 15:48:06.000000000 -0400
27606
@@ -1,5 +1,5 @@
27607
.\"***************************************************************************
27608
-.\" Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
27609
+.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
27610
.\" *
27611
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27612
.\" copy of this software and associated documentation files (the *
27613
@@ -28,13 +28,13 @@
27614
.\"
27615
.\" Author: Thomas E. Dickey 1997
27616
.\"
27617
-.\" $Id: define_key.3x,v 1.11 2004/06/05 19:20:03 tom Exp $
27618
+.\" $Id: define_key.3x,v 1.12 2006/02/25 21:49:19 tom Exp $
27619
.TH define_key 3X ""
27620
.SH NAME
27621
\fBdefine_key\fP \- define a keycode
27622
.SH SYNOPSIS
27623
\fB#include <curses.h>\fP
27624
-
27625
+.sp
27626
\fBint define_key(const char *definition, int keycode);\fP
27627
.SH DESCRIPTION
27628
This is an extension to the curses library.
27629
Index: ncurses-5.5/man/form.3x
27630
===================================================================
27631
--- ncurses-5.5.orig/man/form.3x 2002-01-19 17:48:05.000000000 -0500
27632
+++ ncurses-5.5/man/form.3x 2006-04-18 15:48:06.000000000 -0400
27633
@@ -1,6 +1,6 @@
27634
'\" t
27635
.\"***************************************************************************
27636
-.\" Copyright (c) 1998,2002 Free Software Foundation, Inc. *
27637
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
27638
.\" *
27639
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27640
.\" copy of this software and associated documentation files (the *
27641
@@ -27,7 +27,7 @@
27642
.\" authorization. *
27643
.\"***************************************************************************
27644
.\"
27645
-.\" $Id: form.3x,v 1.15 2002/01/19 22:48:05 tom Exp $
27646
+.\" $Id: form.3x,v 1.16 2006/02/25 21:40:44 tom Exp $
27647
.TH form 3X ""
27648
.SH NAME
27649
\fBform\fR - curses extension for programming forms
27650
@@ -40,26 +40,26 @@ form screens on character-cell terminals
27651
routines, which create and modify form fields; and form routines, which group
27652
fields into forms, display forms on the screen, and handle interaction with the
27653
user.
27654
-
27655
+.PP
27656
The \fBform\fR library uses the \fBcurses\fR libraries, and a curses
27657
initialization routine such as \fBinitscr\fR must be called before using any of
27658
these functions. To use the \fBform\fR library, link with the options
27659
\fB-lform -lcurses\fR.
27660
-
27661
+.
27662
.SS Current Default Values for Field Attributes
27663
-
27664
+.
27665
The \fBform\fR library maintains a default value for field attributes. You
27666
can get or set this default by calling the appropriate \fBset_\fR
27667
or retrieval
27668
routine with a \fBNULL\fR field pointer. Changing this default with a
27669
\fBset_\fR function affects future field creations, but does not change the
27670
rendering of fields already created.
27671
-
27672
+.
27673
.SS Routine Name Index
27674
-
27675
+.
27676
The following table lists each \fBform\fR routine and the name of
27677
the manual page on which it is described.
27678
-
27679
+.
27680
.TS
27681
l l
27682
l l .
27683
@@ -182,10 +182,10 @@ descriptions of the entry points.
27684
.SH NOTES
27685
The header file \fB<form.h>\fR automatically includes the header files
27686
\fB<curses.h>\fR and \fB<eti.h>\fR.
27687
-
27688
+.PP
27689
In your library list, libform.a should be before libncurses.a; that is,
27690
you want to say `-lform -lncurses', not the other way around (which would
27691
-give you a link error using GNU \fBld\fR(1) and many other linkers).
27692
+give you a link error using most linkers).
27693
.SH PORTABILITY
27694
These routines emulate the System V forms library. They were not supported on
27695
Version 7 or BSD versions.
27696
Index: ncurses-5.5/man/form_data.3x
27697
===================================================================
27698
--- ncurses-5.5.orig/man/form_data.3x 1998-11-28 20:13:22.000000000 -0500
27699
+++ ncurses-5.5/man/form_data.3x 2006-04-18 15:48:06.000000000 -0400
27700
@@ -1,6 +1,6 @@
27701
'\" t
27702
.\"***************************************************************************
27703
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
27704
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
27705
.\" *
27706
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27707
.\" copy of this software and associated documentation files (the *
27708
@@ -27,7 +27,7 @@
27709
.\" authorization. *
27710
.\"***************************************************************************
27711
.\"
27712
-.\" $Id: form_data.3x,v 1.7 1998/11/29 01:13:22 Rick.Ohnemus Exp $
27713
+.\" $Id: form_data.3x,v 1.8 2006/02/25 21:38:26 tom Exp $
27714
.TH form_data 3X ""
27715
.SH NAME
27716
\fBform_data\fR - test for off-screen data in given forms
27717
@@ -41,7 +41,7 @@ bool data_behind(const FORM *form);
27718
.SH DESCRIPTION
27719
The function \fBdata_ahead\fR tests whether there is off-screen data
27720
ahead in the given form. It returns TRUE (1) or FALSE (0).
27721
-
27722
+.PP
27723
The function \fBdata_behind\fR tests whether there is off-screen data
27724
behind in the given form. It returns TRUE (1) or FALSE (0).
27725
.SH SEE ALSO
27726
Index: ncurses-5.5/man/form_driver.3x
27727
===================================================================
27728
--- ncurses-5.5.orig/man/form_driver.3x 2002-02-16 17:39:52.000000000 -0500
27729
+++ ncurses-5.5/man/form_driver.3x 2006-04-18 15:48:06.000000000 -0400
27730
@@ -1,5 +1,5 @@
27731
.\"***************************************************************************
27732
-.\" Copyright (c) 1998,2002 Free Software Foundation, Inc. *
27733
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
27734
.\" *
27735
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27736
.\" copy of this software and associated documentation files (the *
27737
@@ -26,7 +26,7 @@
27738
.\" authorization. *
27739
.\"***************************************************************************
27740
.\"
27741
-.\" $Id: form_driver.3x,v 1.9 2002/02/16 22:39:52 tom Exp $
27742
+.\" $Id: form_driver.3x,v 1.10 2006/02/25 21:42:22 tom Exp $
27743
.TH form_driver 3X ""
27744
.SH NAME
27745
\fBform_driver\fR - command-processing loop of the form system
27746
@@ -52,7 +52,7 @@ Move to the first page.
27747
.TP 5
27748
REQ_LAST_PAGE
27749
Move to the last field.
27750
-
27751
+.sp
27752
.TP 5
27753
REQ_NEXT_FIELD
27754
Move to the next field.
27755
@@ -89,7 +89,7 @@ Move up to a field.
27756
.TP 5
27757
REQ_DOWN_FIELD
27758
Move down to a field.
27759
-
27760
+.sp
27761
.TP 5
27762
REQ_NEXT_CHAR
27763
Move to the next char.
27764
@@ -132,7 +132,7 @@ Move up in the field.
27765
.TP 5
27766
REQ_DOWN_CHAR
27767
Move down in the field.
27768
-
27769
+.sp
27770
.TP 5
27771
REQ_NEW_LINE
27772
Insert or overlay a new line.
27773
@@ -169,7 +169,7 @@ Enter overlay mode.
27774
.TP 5
27775
REQ_INS_MODE
27776
Enter insert mode.
27777
-
27778
+.sp
27779
.TP 5
27780
REQ_SCR_FLINE
27781
Scroll the field forward a line.
27782
@@ -188,7 +188,7 @@ Scroll the field forward half a page.
27783
.TP 5
27784
REQ_SCR_BHPAGE
27785
Scroll the field backward half a page.
27786
-
27787
+.sp
27788
.TP 5
27789
REQ_SCR_FCHAR
27790
Scroll the field forward a character.
27791
@@ -207,7 +207,7 @@ Horizontal scroll the field forward half
27792
.TP 5
27793
REQ_SCR_HBHALF
27794
Horizontal scroll the field backward half a line.
27795
-
27796
+.sp
27797
.TP
27798
REQ_VALIDATION
27799
Validate field.
27800
Index: ncurses-5.5/man/form_field.3x
27801
===================================================================
27802
--- ncurses-5.5.orig/man/form_field.3x 2003-05-10 16:33:49.000000000 -0400
27803
+++ ncurses-5.5/man/form_field.3x 2006-04-18 15:48:06.000000000 -0400
27804
@@ -1,6 +1,6 @@
27805
'\" t
27806
.\"***************************************************************************
27807
-.\" Copyright (c) 1998,2003 Free Software Foundation, Inc. *
27808
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
27809
.\" *
27810
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27811
.\" copy of this software and associated documentation files (the *
27812
@@ -27,7 +27,7 @@
27813
.\" authorization. *
27814
.\"***************************************************************************
27815
.\"
27816
-.\" $Id: form_field.3x,v 1.6 2003/05/10 20:33:49 jmc Exp $
27817
+.\" $Id: form_field.3x,v 1.7 2006/02/25 21:47:06 tom Exp $
27818
.TH form_field 3X ""
27819
.SH NAME
27820
\fBform_field\fR - make and break connections between fields and forms
27821
@@ -45,19 +45,19 @@ int move_field(FIELD *field, int frow, i
27822
.SH DESCRIPTION
27823
The function \fBset_form_fields\fR changes the field pointer array of
27824
the given \fIform\fR. The array must be terminated by a \fBNULL\fR.
27825
-
27826
+.PP
27827
The function \fBform_fields\fR returns the field array of the given form.
27828
-
27829
+.PP
27830
The function \fBfield_count\fR returns the count of fields in \fIform\fR.
27831
-
27832
+.PP
27833
The function \fBmove_field\fR moves the given field (which must be disconnected)
27834
to a specified location on the screen.
27835
.SH RETURN VALUES
27836
The function \fBform_fields\fR returns \fBNULL\fR on error.
27837
-
27838
+.PP
27839
The function \fBfield_count\fR returns \fBERR\fR (the general
27840
\fBcurses\fR error return value) on error.
27841
-
27842
+.PP
27843
The functions \fBset_form_fields\fR and \fBmove_field\fR return one of
27844
the following codes on error:
27845
.TP 5
27846
@@ -83,7 +83,7 @@ The header file \fB<form.h>\fR automatic
27847
.SH PORTABILITY
27848
These routines emulate the System V forms library. They were not supported on
27849
Version 7 or BSD versions.
27850
-
27851
+.PP
27852
The SVr4 forms library documentation specifies the \fBfield_count\fR error value
27853
as -1 (which is the value of \fBERR\fR).
27854
.SH AUTHORS
27855
Index: ncurses-5.5/man/form_field_attributes.3x
27856
===================================================================
27857
--- ncurses-5.5.orig/man/form_field_attributes.3x 2002-01-19 17:48:14.000000000 -0500
27858
+++ ncurses-5.5/man/form_field_attributes.3x 2006-04-18 15:48:06.000000000 -0400
27859
@@ -1,6 +1,6 @@
27860
'\" t
27861
.\"***************************************************************************
27862
-.\" Copyright (c) 1998,2001,2002 Free Software Foundation, Inc. *
27863
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
27864
.\" *
27865
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27866
.\" copy of this software and associated documentation files (the *
27867
@@ -27,7 +27,7 @@
27868
.\" authorization. *
27869
.\"***************************************************************************
27870
.\"
27871
-.\" $Id: form_field_attributes.3x,v 1.7 2002/01/19 22:48:14 tom Exp $
27872
+.\" $Id: form_field_attributes.3x,v 1.8 2006/02/25 21:40:44 tom Exp $
27873
.TH form_field_attributes 3X ""
27874
.SH NAME
27875
\fBform_field_attributes\fR - color and attribute control for form fields
27876
@@ -51,12 +51,12 @@ The function \fBset_field_fore\fR sets t
27877
\fIfield\fR. This is the highlight used to display the field contents. The
27878
function \fBfield_fore\fR returns the foreground attribute. The default is
27879
\fBA_STANDOUT\fR.
27880
-
27881
+.PP
27882
The function \fBset_field_back\fR sets the background attribute of
27883
\fIform\fR. This is the highlight used to display the extent fields in the
27884
form. The function \fBfield_back\fR returns the background attribute. The
27885
default is \fBA_NORMAL\fR.
27886
-
27887
+.PP
27888
The function \fBset_field_pad\fR sets the character used to fill the field.
27889
The function \fBfield_pad\fR returns the given form's pad character. The
27890
default is a blank.
27891
Index: ncurses-5.5/man/form_field_buffer.3x
27892
===================================================================
27893
--- ncurses-5.5.orig/man/form_field_buffer.3x 2005-05-15 11:59:55.000000000 -0400
27894
+++ ncurses-5.5/man/form_field_buffer.3x 2006-04-18 15:48:06.000000000 -0400
27895
@@ -1,6 +1,6 @@
27896
'\" t
27897
.\"***************************************************************************
27898
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
27899
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
27900
.\" *
27901
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27902
.\" copy of this software and associated documentation files (the *
27903
@@ -27,7 +27,7 @@
27904
.\" authorization. *
27905
.\"***************************************************************************
27906
.\"
27907
-.\" $Id: form_field_buffer.3x,v 1.12 2005/05/15 15:59:55 tom Exp $
27908
+.\" $Id: form_field_buffer.3x,v 1.13 2006/02/25 21:49:19 tom Exp $
27909
.TH form_field_buffer 3X ""
27910
.SH NAME
27911
\fBform_field_buffer\fR - field buffer control
27912
@@ -57,18 +57,18 @@ own routine that copies the value out of
27913
and trailing spaces. Please note also, that subsequent operations on the form
27914
will probably change the content of the buffer. So do not use it for long term
27915
storage of the entered form data.
27916
-
27917
+.PP
27918
The function \fBset_field_status\fR sets the associated status flag of
27919
\fIfield\fR; \fBfield_status\fR gets the current value. The status flag
27920
is set to a nonzero value whenever the field changes.
27921
-
27922
+.PP
27923
The function \fBset_max_field\fR sets the maximum size for a dynamic field.
27924
An argument of 0 turns off any maximum size threshold for that field.
27925
.SH RETURN VALUE
27926
The \fBfield_buffer\fR function returns NULL on error.
27927
-
27928
+.PP
27929
The \fBfield_status\fR function returns \fBTRUE\fR or \fBFALSE\fR.
27930
-
27931
+.PP
27932
The remaining routines return one of the following:
27933
.TP 5
27934
\fBE_OK\fR
27935
@@ -84,7 +84,7 @@ Routine detected an incorrect or out-of-
27936
descriptions of the entry points.
27937
.SH NOTES
27938
The header file \fB<form.h>\fR automatically includes the header file
27939
-
27940
+.PP
27941
When configured for wide-characters, \fBfield_buffer\fP returns a pointer
27942
to temporary storage (allocated and freed by the library).
27943
The application should not attempt to modify the data.
27944
Index: ncurses-5.5/man/form_field_just.3x
27945
===================================================================
27946
--- ncurses-5.5.orig/man/form_field_just.3x 2003-05-10 16:33:49.000000000 -0400
27947
+++ ncurses-5.5/man/form_field_just.3x 2006-04-18 15:48:06.000000000 -0400
27948
@@ -1,6 +1,6 @@
27949
'\" t
27950
.\"***************************************************************************
27951
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
27952
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
27953
.\" *
27954
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27955
.\" copy of this software and associated documentation files (the *
27956
@@ -27,7 +27,7 @@
27957
.\" authorization. *
27958
.\"***************************************************************************
27959
.\"
27960
-.\" $Id: form_field_just.3x,v 1.7 2003/05/10 20:33:49 jmc Exp $
27961
+.\" $Id: form_field_just.3x,v 1.8 2006/02/25 21:47:06 tom Exp $
27962
.TH form_field_just 3X ""
27963
.SH NAME
27964
\fBform_field_just\fR - retrieve field characteristics
27965
@@ -43,11 +43,11 @@ The function \fBset_field_just\fR sets t
27966
a field; \fBfield_just\fR returns a field's justification attribute.
27967
The attribute may be one of NO_JUSTIFICATION, JUSTIFY_RIGHT,
27968
JUSTIFY_LEFT, or JUSTIFY_CENTER.
27969
-
27970
+.
27971
.SH RETURN VALUE
27972
The function \fBfield_just\fR returns one of: NO_JUSTIFICATION,
27973
JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
27974
-
27975
+.PP
27976
The function \fBset_field_just\fR returns one of the following:
27977
.TP 5
27978
\fBE_OK\fR
27979
Index: ncurses-5.5/man/form_field_new.3x
27980
===================================================================
27981
--- ncurses-5.5.orig/man/form_field_new.3x 2003-05-10 16:33:49.000000000 -0400
27982
+++ ncurses-5.5/man/form_field_new.3x 2006-04-18 15:48:06.000000000 -0400
27983
@@ -1,6 +1,6 @@
27984
'\" t
27985
.\"***************************************************************************
27986
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
27987
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
27988
.\" *
27989
.\" Permission is hereby granted, free of charge, to any person obtaining a *
27990
.\" copy of this software and associated documentation files (the *
27991
@@ -27,7 +27,7 @@
27992
.\" authorization. *
27993
.\"***************************************************************************
27994
.\"
27995
-.\" $Id: form_field_new.3x,v 1.12 2003/05/10 20:33:49 jmc Exp $
27996
+.\" $Id: form_field_new.3x,v 1.13 2006/02/25 21:47:06 tom Exp $
27997
.TH form_field_new 3X ""
27998
.SH NAME
27999
\fBform_field_new\fR - create and destroy form fields
28000
@@ -48,21 +48,21 @@ int free_field(FIELD *field);
28001
The function \fBnew_field\fR allocates a new field and initializes it from the
28002
parameters given: height, width, row of upper-left corner, column of upper-left
28003
corner, number off-screen rows, and number of additional working buffers.
28004
-
28005
+.PP
28006
The function \fBdup_field\fR duplicates a field at a new location. Most
28007
attributes (including current contents, size, validation type, buffer count,
28008
growth threshold, justification, foreground, background, pad character,
28009
options, and user pointer) are copied. Field status and the field page bit are
28010
not copied.
28011
-
28012
+.PP
28013
The function \fBlink_field\fR acts like \fBdup_field\fR, but the new field
28014
shares buffers with its parent. Attribute data is separate.
28015
-
28016
+.PP
28017
The function \fBfree_field\fR de-allocates storage associated with a field.
28018
.SH RETURN VALUE
28019
The function, \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
28020
\fBNULL\fR on error.
28021
-
28022
+.PP
28023
The function \fBfree_field\fR returns one of the following:
28024
.TP 5
28025
\fBE_OK\fR
28026
@@ -81,7 +81,7 @@ The header file \fB<form.h>\fR automatic
28027
.SH PORTABILITY
28028
These routines emulate the System V forms library. They were not supported on
28029
Version 7 or BSD versions.
28030
-
28031
+.PP
28032
It may be unwise to count on the set of attributes copied by
28033
\fBdup_field\fR(3X) being portable; the System V forms library documents are
28034
not very explicit about what gets copied and what doesn't.
28035
Index: ncurses-5.5/man/form_field_opts.3x
28036
===================================================================
28037
--- ncurses-5.5.orig/man/form_field_opts.3x 2005-10-08 18:16:18.000000000 -0400
28038
+++ ncurses-5.5/man/form_field_opts.3x 2006-04-18 15:48:06.000000000 -0400
28039
@@ -1,6 +1,6 @@
28040
'\" t
28041
.\"***************************************************************************
28042
-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
28043
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
28044
.\" *
28045
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28046
.\" copy of this software and associated documentation files (the *
28047
@@ -27,7 +27,7 @@
28048
.\" authorization. *
28049
.\"***************************************************************************
28050
.\"
28051
-.\" $Id: form_field_opts.3x,v 1.10 2005/10/08 22:16:18 tom Exp $
28052
+.\" $Id: form_field_opts.3x,v 1.11 2006/02/25 21:50:01 tom Exp $
28053
.TH form_field_opts 3X ""
28054
.SH NAME
28055
\fBform_field_opts\fR - set and get field options
28056
@@ -45,15 +45,15 @@ OPTIONS field_opts(const FIELD *field);
28057
.SH DESCRIPTION
28058
The function \fBset_field_opts\fR sets all the given field's option bits (field
28059
option bits may be logically-OR'ed together).
28060
-
28061
+.PP
28062
The function \fBfield_opts_on\fR turns on the given option bits, and leaves
28063
others alone.
28064
-
28065
+.PP
28066
The function \fBfield_opts_off\fR turns off the given option bits, and leaves
28067
others alone.
28068
-
28069
+.PP
28070
The function \fBfield_opts\fR returns the field's current option bits.
28071
-
28072
+.PP
28073
The following options are defined (all are on by default):
28074
.TP 5
28075
O_VISIBLE
28076
Index: ncurses-5.5/man/form_field_userptr.3x
28077
===================================================================
28078
--- ncurses-5.5.orig/man/form_field_userptr.3x 1998-11-28 20:07:05.000000000 -0500
28079
+++ ncurses-5.5/man/form_field_userptr.3x 2006-04-18 15:48:06.000000000 -0400
28080
@@ -1,6 +1,6 @@
28081
'\" t
28082
.\"***************************************************************************
28083
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28084
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28085
.\" *
28086
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28087
.\" copy of this software and associated documentation files (the *
28088
@@ -27,7 +27,7 @@
28089
.\" authorization. *
28090
.\"***************************************************************************
28091
.\"
28092
-.\" $Id: form_field_userptr.3x,v 1.6 1998/11/29 01:07:05 Rick.Ohnemus Exp $
28093
+.\" $Id: form_field_userptr.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
28094
.TH form_field_userptr 3X ""
28095
.SH NAME
28096
\fBform_field_userptr\fR - associate application data with a form field
28097
@@ -59,7 +59,7 @@ The header file \fB<form.h>\fR automatic
28098
.SH PORTABILITY
28099
These routines emulate the System V forms library. They were not supported on
28100
Version 7 or BSD versions.
28101
-
28102
+.PP
28103
The user pointer should be a void pointer. We leave it as a char pointer for
28104
SVr4 compatibility.
28105
.SH AUTHORS
28106
Index: ncurses-5.5/man/form_fieldtype.3x
28107
===================================================================
28108
--- ncurses-5.5.orig/man/form_fieldtype.3x 2003-05-10 16:33:49.000000000 -0400
28109
+++ ncurses-5.5/man/form_fieldtype.3x 2006-04-18 15:48:06.000000000 -0400
28110
@@ -1,6 +1,6 @@
28111
'\" t
28112
.\"***************************************************************************
28113
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
28114
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
28115
.\" *
28116
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28117
.\" copy of this software and associated documentation files (the *
28118
@@ -27,7 +27,7 @@
28119
.\" authorization. *
28120
.\"***************************************************************************
28121
.\"
28122
-.\" $Id: form_fieldtype.3x,v 1.12 2003/05/10 20:33:49 jmc Exp $
28123
+.\" $Id: form_fieldtype.3x,v 1.13 2006/02/25 21:47:06 tom Exp $
28124
.TH form_fieldtype 3X ""
28125
.SH NAME
28126
\fBform_fieldtype\fR - define validation-field types
28127
@@ -61,14 +61,14 @@ validity of an entered data string whene
28128
The (FIELD *) argument is passed in so the validation predicate can see the
28129
field's buffer, sizes and other attributes; the second argument is an
28130
argument-block structure, about which more below.
28131
-
28132
+.PP
28133
You also supply \fBnew_fieldtype\fR with \fIchar_check\fR,
28134
a function to validate input characters as they are entered; it will be passed
28135
the character to be checked and a pointer to an argument-block structure.
28136
-
28137
+.PP
28138
The function \fBfree_fieldtype\fR frees the space allocated for a given
28139
validation type.
28140
-
28141
+.PP
28142
The function \fBset_fieldtype_arg\fR associates three storage-management functions
28143
with a field type.
28144
The \fImake_arg\fR function is automatically applied to the
28145
@@ -82,11 +82,11 @@ the other two are optional, you may supp
28146
In this case it is assumed
28147
that \fImake_arg\fR does not allocate memory but simply loads the
28148
argument into a single scalar value.
28149
-
28150
+.PP
28151
The function \fBlink_fieldtype\fR creates
28152
a new field type from the two given types.
28153
They are connected by an logical 'OR'.
28154
-
28155
+.PP
28156
The form driver requests \fBREQ_NEXT_CHOICE\fR and \fBREQ_PREV_CHOICE\fR assume
28157
that the possible values of a field form an ordered set, and provide the forms
28158
user with a way to move through the set.
28159
@@ -97,7 +97,7 @@ These functions take the field pointer a
28160
argument-block structure as arguments.
28161
.SH RETURN VALUE
28162
The pointer-valued routines return NULL on error.
28163
-
28164
+.PP
28165
The integer-valued routines return one of the following codes on
28166
error:
28167
.TP 5
28168
@@ -117,7 +117,7 @@ The field is already connected to a form
28169
.SH NOTES
28170
The header file \fB<form.h>\fR automatically includes the header file
28171
\fB<curses.h>\fR.
28172
-
28173
+.PP
28174
All of the \fB(char *)\fR arguments of these functions should actually be
28175
\fB(void *)\fR. The type has been left uncorrected for strict compatibility
28176
with System V.
28177
Index: ncurses-5.5/man/form_hook.3x
28178
===================================================================
28179
--- ncurses-5.5.orig/man/form_hook.3x 1999-03-20 17:37:15.000000000 -0500
28180
+++ ncurses-5.5/man/form_hook.3x 2006-04-18 15:48:06.000000000 -0400
28181
@@ -1,6 +1,6 @@
28182
'\" t
28183
.\"***************************************************************************
28184
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28185
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28186
.\" *
28187
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28188
.\" copy of this software and associated documentation files (the *
28189
@@ -27,7 +27,7 @@
28190
.\" authorization. *
28191
.\"***************************************************************************
28192
.\"
28193
-.\" $Id: form_hook.3x,v 1.6 1999/03/20 22:37:15 Todd.Miller Exp $
28194
+.\" $Id: form_hook.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
28195
.TH form_hook 3X ""
28196
.SH NAME
28197
\fBform_hook\fR - set hooks for automatic invocation by applications
28198
@@ -53,21 +53,21 @@ void (*)(FORM *) form_term(const FORM *f
28199
.SH DESCRIPTION
28200
These functions make it possible to set hook functions to be called at various
28201
points in the automatic processing of input event codes by \fBform_driver\fR.
28202
-
28203
+.PP
28204
The function \fBset_field_init\fR sets a hook to be called at form-post time
28205
and each time the selected field changes (after the change). \fBfield_init\fR
28206
returns the current field init hook, if any (\fBNULL\fR if there is no such
28207
hook).
28208
-
28209
+.PP
28210
The function \fBset_field_term\fR sets a hook to be called at form-unpost time
28211
and each time the selected field changes (before the change). \fBfield_term\fR
28212
returns the current field term hook, if any (\fBNULL\fR if there is no such
28213
hook).
28214
-
28215
+.PP
28216
The function \fBset_form_init\fR sets a hook to be called at form-post time and
28217
just after a page change once it is posted. \fBform_init\fR returns the
28218
current form init hook, if any (\fBNULL\fR if there is no such hook).
28219
-
28220
+.PP
28221
The function \fBset_form_term\fR sets a hook to be called at form-unpost time
28222
and just before a page change once it is posted. \fBform_init\fR
28223
returns the current form term hook, if any (\fBNULL\fR if there is no such
28224
Index: ncurses-5.5/man/form_new.3x
28225
===================================================================
28226
--- ncurses-5.5.orig/man/form_new.3x 1998-11-28 20:07:37.000000000 -0500
28227
+++ ncurses-5.5/man/form_new.3x 2006-04-18 15:48:06.000000000 -0400
28228
@@ -1,6 +1,6 @@
28229
'\" t
28230
.\"***************************************************************************
28231
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28232
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28233
.\" *
28234
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28235
.\" copy of this software and associated documentation files (the *
28236
@@ -27,7 +27,7 @@
28237
.\" authorization. *
28238
.\"***************************************************************************
28239
.\"
28240
-.\" $Id: form_new.3x,v 1.5 1998/11/29 01:07:37 Rick.Ohnemus Exp $
28241
+.\" $Id: form_new.3x,v 1.6 2006/02/25 21:38:26 tom Exp $
28242
.TH form_new 3X ""
28243
.SH NAME
28244
\fBform_new\fR - create and destroy forms
28245
@@ -41,12 +41,12 @@ int free_form(FORM *form);
28246
.SH DESCRIPTION
28247
The function \fBnew_form\fR creates a new form connected to a specified field
28248
pointer array (which must be \fBNULL\fR-terminated).
28249
-
28250
+.PP
28251
The function \fBfree_form\fR disconnects \fIform\fR from its field array
28252
and frees the storage allocated for the form.
28253
.SH RETURN VALUE
28254
The function \fBnew_form\fR returns \fBNULL\fR on error.
28255
-
28256
+.PP
28257
The function \fBfree_form\fR returns one of the following:
28258
.TP 5
28259
\fBE_OK\fR
28260
Index: ncurses-5.5/man/form_new_page.3x
28261
===================================================================
28262
--- ncurses-5.5.orig/man/form_new_page.3x 2002-01-19 17:48:51.000000000 -0500
28263
+++ ncurses-5.5/man/form_new_page.3x 2006-04-18 15:48:06.000000000 -0400
28264
@@ -1,6 +1,6 @@
28265
'\" t
28266
.\"***************************************************************************
28267
-.\" Copyright (c) 1998,2002 Free Software Foundation, Inc. *
28268
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
28269
.\" *
28270
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28271
.\" copy of this software and associated documentation files (the *
28272
@@ -27,7 +27,7 @@
28273
.\" authorization. *
28274
.\"***************************************************************************
28275
.\"
28276
-.\" $Id: form_new_page.3x,v 1.6 2002/01/19 22:48:51 tom Exp $
28277
+.\" $Id: form_new_page.3x,v 1.7 2006/02/25 21:40:44 tom Exp $
28278
.TH form_new_page 3X ""
28279
.SH NAME
28280
\fBform_new_page\fR - form pagination functions
28281
@@ -41,12 +41,12 @@ bool new_page(const FIELD *field);
28282
.SH DESCRIPTION
28283
The function \fBset_new_page\fR sets or resets a flag marking the given field
28284
as the beginning of a new page on its form.
28285
-
28286
+.PP
28287
The function \fBnew_page\fR is a predicate which tests if a given field marks
28288
a page beginning on its form.
28289
.SH RETURN VALUE
28290
The function \fBnew_page\fR returns \fBTRUE\fR or \fBFALSE\fR.
28291
-
28292
+.PP
28293
The function \fBset_new_page\fR return one of the following:
28294
.TP 5
28295
\fBE_OK\fR
28296
Index: ncurses-5.5/man/form_opts.3x
28297
===================================================================
28298
--- ncurses-5.5.orig/man/form_opts.3x 1998-11-28 20:07:53.000000000 -0500
28299
+++ ncurses-5.5/man/form_opts.3x 2006-04-18 15:48:06.000000000 -0400
28300
@@ -1,6 +1,6 @@
28301
'\" t
28302
.\"***************************************************************************
28303
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28304
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28305
.\" *
28306
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28307
.\" copy of this software and associated documentation files (the *
28308
@@ -27,7 +27,7 @@
28309
.\" authorization. *
28310
.\"***************************************************************************
28311
.\"
28312
-.\" $Id: form_opts.3x,v 1.6 1998/11/29 01:07:53 Rick.Ohnemus Exp $
28313
+.\" $Id: form_opts.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
28314
.TH form_opts 3X ""
28315
.SH NAME
28316
\fBform_opts\fR - set and get form options
28317
@@ -45,15 +45,15 @@ OPTIONS form_opts(const FORM *form);
28318
.SH DESCRIPTION
28319
The function \fBset_form_opts\fR sets all the given form's option bits (form
28320
option bits may be logically-OR'ed together).
28321
-
28322
+.PP
28323
The function \fBform_opts_on\fR turns on the given option bits, and leaves
28324
others alone.
28325
-
28326
+.PP
28327
The function \fBform_opts_off\fR turns off the given option bits, and leaves
28328
others alone.
28329
-
28330
+.PP
28331
The function \fBform_opts\fR returns the form's current option bits.
28332
-
28333
+.PP
28334
The following options are defined (all are on by default):
28335
.TP 5
28336
O_NL_OVERLOAD
28337
Index: ncurses-5.5/man/form_post.3x
28338
===================================================================
28339
--- ncurses-5.5.orig/man/form_post.3x 1998-11-28 20:08:10.000000000 -0500
28340
+++ ncurses-5.5/man/form_post.3x 2006-04-18 15:48:06.000000000 -0400
28341
@@ -1,6 +1,6 @@
28342
'\" t
28343
.\"***************************************************************************
28344
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28345
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28346
.\" *
28347
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28348
.\" copy of this software and associated documentation files (the *
28349
@@ -27,7 +27,7 @@
28350
.\" authorization. *
28351
.\"***************************************************************************
28352
.\"
28353
-.\" $Id: form_post.3x,v 1.4 1998/11/29 01:08:10 Rick.Ohnemus Exp $
28354
+.\" $Id: form_post.3x,v 1.5 2006/02/25 21:38:26 tom Exp $
28355
.TH form_post 3X ""
28356
.SH NAME
28357
\fBform_post\fR - write or erase forms from associated subwindows
28358
@@ -43,7 +43,7 @@ The function \fBpost_form\fR displays a
28359
trigger physical display of the subwindow, use \fBrefresh\fR or some equivalent
28360
\fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
28361
input request will do).
28362
-
28363
+.PP
28364
The function \fBunpost_form\fR erases form from its associated subwindow.
28365
.SH RETURN VALUE
28366
These routines return one of the following:
28367
Index: ncurses-5.5/man/form_userptr.3x
28368
===================================================================
28369
--- ncurses-5.5.orig/man/form_userptr.3x 1998-11-28 20:08:39.000000000 -0500
28370
+++ ncurses-5.5/man/form_userptr.3x 2006-04-18 15:48:06.000000000 -0400
28371
@@ -1,6 +1,6 @@
28372
'\" t
28373
.\"***************************************************************************
28374
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28375
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28376
.\" *
28377
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28378
.\" copy of this software and associated documentation files (the *
28379
@@ -27,7 +27,7 @@
28380
.\" authorization. *
28381
.\"***************************************************************************
28382
.\"
28383
-.\" $Id: form_userptr.3x,v 1.9 1998/11/29 01:08:39 Rick.Ohnemus Exp $
28384
+.\" $Id: form_userptr.3x,v 1.10 2006/02/25 21:38:26 tom Exp $
28385
.TH form_userptr 3X ""
28386
.SH NAME
28387
\fBform_userptr\fR - associate application data with a form item
28388
@@ -59,7 +59,7 @@ The header file \fB<form.h>\fR automatic
28389
.SH PORTABILITY
28390
These routines emulate the System V forms library. They were not supported on
28391
Version 7 or BSD versions.
28392
-
28393
+.PP
28394
The user pointer should be a void pointer. We leave it as a char pointer for
28395
SVr4 compatibility.
28396
.SH AUTHORS
28397
Index: ncurses-5.5/man/form_win.3x
28398
===================================================================
28399
--- ncurses-5.5.orig/man/form_win.3x 1999-04-10 19:36:08.000000000 -0400
28400
+++ ncurses-5.5/man/form_win.3x 2006-04-18 15:48:06.000000000 -0400
28401
@@ -1,6 +1,6 @@
28402
'\" t
28403
.\"***************************************************************************
28404
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28405
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28406
.\" *
28407
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28408
.\" copy of this software and associated documentation files (the *
28409
@@ -27,7 +27,7 @@
28410
.\" authorization. *
28411
.\"***************************************************************************
28412
.\"
28413
-.\" $Id: form_win.3x,v 1.8 1999/04/10 23:36:08 tom Exp $
28414
+.\" $Id: form_win.3x,v 1.9 2006/02/25 21:38:26 tom Exp $
28415
.TH form_win 3X ""
28416
.SH NAME
28417
\fBform_win\fR - make and break form window and subwindow associations
28418
@@ -48,14 +48,14 @@ int scale_form(const FORM *form, int *ro
28419
Every form has an associated pair of \fBcurses\fR windows. The form window
28420
displays any title and border associated with the window; the form subwindow
28421
displays the items of the form that are currently available for selection.
28422
-
28423
+.PP
28424
The first four functions get and set those windows. It is not necessary to set
28425
either window; by default, the driver code uses \fBstdscr\fR for both.
28426
-
28427
+.PP
28428
In the \fBset_\fR functions, window argument of \fBNULL\fR is treated as though
28429
it were \fBstsdcr\fR. A form argument of \fBNULL\fR is treated as a request
28430
to change the system default form window or subwindow.
28431
-
28432
+.PP
28433
The function \fBscale_form\fR returns the minimum size required for the
28434
subwindow of \fIform\fR.
28435
.SH RETURN VALUE
28436
Index: ncurses-5.5/man/infocmp.1m
28437
===================================================================
28438
--- ncurses-5.5.orig/man/infocmp.1m 2004-08-28 18:43:49.000000000 -0400
28439
+++ ncurses-5.5/man/infocmp.1m 2006-04-18 15:48:07.000000000 -0400
28440
@@ -1,6 +1,6 @@
28441
'\" t
28442
.\"***************************************************************************
28443
-.\" Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
28444
+.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
28445
.\" *
28446
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28447
.\" copy of this software and associated documentation files (the *
28448
@@ -27,7 +27,7 @@
28449
.\" authorization. *
28450
.\"***************************************************************************
28451
.\"
28452
-.\" $Id: infocmp.1m,v 1.39 2004/08/28 22:43:49 tom Exp $
28453
+.\" $Id: infocmp.1m,v 1.42 2006/04/15 20:11:31 tom Exp $
28454
.TH infocmp 1M ""
28455
.ds n 5
28456
.ds d @TERMINFO@
28457
@@ -43,6 +43,7 @@ G\
28458
I\
28459
L\
28460
T\
28461
+U\
28462
V\
28463
c\
28464
d\
28465
@@ -82,15 +83,15 @@ terminal's \fItermnames\fR. If a capabi
28466
terminals, the value returned will depend on the type of the capability:
28467
\fBF\fR for boolean variables, \fB-1\fR for integer variables, and \fBNULL\fR
28468
for string variables.
28469
-
28470
+.PP
28471
The \fB-d\fR option produces a list of each capability that is different
28472
between two entries. This option is useful to show the difference between two
28473
entries, created by different people, for the same or similar terminals.
28474
-
28475
+.PP
28476
The \fB-c\fR option produces a list of each capability that is common between
28477
two entries. Capabilities that are not set are ignored. This option can be
28478
used as a quick check to see if the \fB-u\fR option is worth using.
28479
-
28480
+.PP
28481
The \fB-n\fR option produces a list of each capability that is in neither
28482
entry. If no \fItermnames\fR are given, the environment variable \fBTERM\fR
28483
will be used for both of the \fItermnames\fR. This can be used as a quick
28484
@@ -98,7 +99,7 @@ check to see if anything was left out of
28485
.SS Source Listing Options [-I] [-L] [-C] [-r]
28486
The \fB-I\fR, \fB-L\fR, and \fB-C\fR options will produce a source listing for
28487
each terminal named.
28488
-
28489
+.
28490
.TS
28491
center tab(/) ;
28492
l l .
28493
@@ -107,27 +108,27 @@ l l .
28494
\fB-C\fR/use the \fBtermcap\fR names
28495
\fB-r\fR/when using \fB-C\fR, put out all capabilities in \fBtermcap\fR form
28496
.TE
28497
-
28498
+.PP
28499
If no \fItermnames\fR are given, the environment variable \fBTERM\fR will be
28500
used for the terminal name.
28501
-
28502
+.PP
28503
The source produced by the \fB-C\fR option may be used directly as a
28504
\fBtermcap\fR entry, but not all parameterized strings can be changed to
28505
the \fBtermcap\fR format. \fBinfocmp\fR will attempt to convert most of the
28506
parameterized information, and anything not converted will be plainly marked in
28507
the output and commented out. These should be edited by hand.
28508
-
28509
+.PP
28510
All padding information for strings will be collected together and placed
28511
at the beginning of the string where \fBtermcap\fR expects it. Mandatory
28512
padding (padding information with a trailing '/') will become optional.
28513
-
28514
+.PP
28515
All \fBtermcap\fR variables no longer supported by \fBterminfo\fR, but which
28516
are derivable from other \fBterminfo\fR variables, will be output. Not all
28517
\fBterminfo\fR capabilities will be translated; only those variables which were
28518
part of \fBtermcap\fR will normally be output. Specifying the \fB-r\fR option
28519
will take off this restriction, allowing all capabilities to be output in
28520
\fItermcap\fR form.
28521
-
28522
+.PP
28523
Note that because padding is collected to the beginning of the capability, not
28524
all capabilities are output. Mandatory padding is not supported. Because
28525
\fBtermcap\fR strings are not as flexible, it is not always possible to convert
28526
@@ -135,10 +136,10 @@ a \fBterminfo\fR string capability into
28527
subsequent conversion of the \fBtermcap\fR file back into \fBterminfo\fR format
28528
will not necessarily reproduce the original \fBterminfo\fR
28529
source.
28530
-
28531
+.PP
28532
Some common \fBterminfo\fR parameter sequences, their \fBtermcap\fR
28533
equivalents, and some terminal types which commonly have such sequences, are:
28534
-
28535
+.
28536
.TS
28537
center tab(/) ;
28538
l c l
28539
@@ -163,27 +164,27 @@ entries into a terminal's description.
28540
were coded at different times or by different people so that each description
28541
is a full description, using \fBinfocmp\fR will show what can be done to change
28542
one description to be relative to the other.
28543
-
28544
+.PP
28545
A capability will get printed with an at-sign (@) if it no longer exists in the
28546
first \fItermname\fR, but one of the other \fItermname\fR entries contains a
28547
value for it. A capability's value gets printed if the value in the first
28548
\fItermname\fR is not found in any of the other \fItermname\fR entries, or if
28549
the first of the other \fItermname\fR entries that has this capability gives a
28550
different value for the capability than that in the first \fItermname\fR.
28551
-
28552
+.PP
28553
The order of the other \fItermname\fR entries is significant. Since the
28554
terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities,
28555
specifying two \fBuse=\fR entries that contain differing entries for the same
28556
capabilities will produce different results depending on the order that the
28557
entries are given in. \fBinfocmp\fR will flag any such inconsistencies between
28558
the other \fItermname\fR entries as they are found.
28559
-
28560
+.PP
28561
Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that
28562
contains that capability will cause the second specification to be ignored.
28563
Using \fBinfocmp\fR to recreate a description can be a useful check to make
28564
sure that everything was specified correctly in the original source
28565
description.
28566
-
28567
+.PP
28568
Another error that does not cause incorrect compiled files, but will slow down
28569
the compilation time, is specifying extra \fBuse=\fR fields that are
28570
superfluous. \fBinfocmp\fR will flag any other \fItermname use=\fR fields that
28571
@@ -263,7 +264,7 @@ of the capability name, followed by a co
28572
expansion of the capability string with sections matching recognized actions
28573
translated into {}-bracketed descriptions. Here is a list of the DEC/ANSI
28574
special sequences recognized:
28575
-
28576
+i.
28577
.TS
28578
center tab(/) ;
28579
l l
28580
@@ -275,26 +276,26 @@ SC/save cursor
28581
RC/restore cursor
28582
LL/home-down
28583
RSR/reset scroll region
28584
-
28585
+=
28586
DECSTR/soft reset (VT320)
28587
S7C1T/7-bit controls (VT220)
28588
-
28589
+=
28590
ISO DEC G0/enable DEC graphics for G0
28591
ISO UK G0/enable UK chars for G0
28592
ISO US G0/enable US chars for G0
28593
ISO DEC G1/enable DEC graphics for G1
28594
ISO UK G1/enable UK chars for G1
28595
ISO US G1/enable US chars for G1
28596
-
28597
+=
28598
DECPAM/application keypad mode
28599
DECPNM/normal keypad mode
28600
DECANSI/enter ANSI mode
28601
-
28602
+=
28603
ECMA[+-]AM/keyboard action mode
28604
ECMA[+-]IRM/insert replace mode
28605
ECMA[+-]SRM/send receive mode
28606
ECMA[+-]LNM/linefeed mode
28607
-
28608
+=
28609
DEC[+-]CKM/application cursor keys
28610
DEC[+-]ANM/set VT52 mode
28611
DEC[+-]COLM/132-column mode
28612
@@ -308,7 +309,7 @@ DEC[+-]ARM/auto-repeat mode
28613
It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set
28614
Graphics Rendition, with the values NORMAL, BOLD, UNDERLINE, BLINK, and
28615
REVERSE. All but NORMAL may be prefixed with `+' (turn on) or `-' (turn off).
28616
-
28617
+.PP
28618
An SGR0 designates an empty highlight sequence (equivalent to {SGR:NORMAL}).
28619
.TP 5
28620
\fB-l\fR
28621
@@ -365,6 +366,12 @@ tells \fBtic\fP to discard commented-out
28622
Normally when translating from terminfo to termcap,
28623
untranslatable capabilities are commented-out.
28624
.TP 5
28625
+\fB-U\fR
28626
+tells \fBinfocmp\fP to not post-process the data after parsing the source file.
28627
+This feature helps when comparing the actual contents of two source files,
28628
+since it excludes the inferences that \fBinfocmp\fP makes to fill in missing
28629
+data.
28630
+.TP 5
28631
\fB-V\fR
28632
reports the version of ncurses which was used in this program, and exits.
28633
.TP 5
28634
@@ -401,16 +408,19 @@ The
28635
\fB-q\fR and
28636
\fB-t\fR
28637
options are not supported in SVr4 curses.
28638
-
28639
+.PP
28640
The \fB-r\fR option's notion of `termcap' capabilities is System V Release 4's.
28641
Actual BSD curses versions will have a more restricted set. To see only the
28642
4.4BSD set, use \fB-r\fR \fB-RBSD\fR.
28643
.SH BUGS
28644
The \fB-F\fR option of \fBinfocmp\fR(1M) should be a \fBtoe\fR(1M) mode.
28645
.SH SEE ALSO
28646
-\fBinfocmp\fR(1M), \fBcaptoinfo\fR(1M), \fBinfotocap\fR(1M),
28647
-\fBtic\fR(1M), \fBtoe\fR(1M),
28648
-\fBcurses\fR(3X), \fBterminfo\fR(\*n).
28649
+\fB@CAPTOINFO@\fR(1M),
28650
+\fB@INFOTOCAP@\fR(1M),
28651
+\fB@TIC@\fR(1M),
28652
+\fB@TOE@\fR(1M),
28653
+\fBcurses\fR(3X),
28654
+\fBterminfo\fR(\*n).
28655
.SH AUTHOR
28656
Eric S. Raymond <esr@snark.thyrsus.com>
28657
and
28658
Index: ncurses-5.5/man/key_defined.3x
28659
===================================================================
28660
--- ncurses-5.5.orig/man/key_defined.3x 2004-06-05 15:19:09.000000000 -0400
28661
+++ ncurses-5.5/man/key_defined.3x 2006-04-18 15:48:06.000000000 -0400
28662
@@ -1,5 +1,5 @@
28663
.\"***************************************************************************
28664
-.\" Copyright (c) 2003,2004 Free Software Foundation, Inc. *
28665
+.\" Copyright (c) 2003-2004,2006 Free Software Foundation, Inc. *
28666
.\" *
28667
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28668
.\" copy of this software and associated documentation files (the *
28669
@@ -28,13 +28,13 @@
28670
.\"
28671
.\" Author: Thomas E. Dickey 2003
28672
.\"
28673
-.\" $Id: key_defined.3x,v 1.3 2004/06/05 19:19:09 tom Exp $
28674
+.\" $Id: key_defined.3x,v 1.4 2006/02/25 21:50:01 tom Exp $
28675
.TH key_defined 3X ""
28676
.SH NAME
28677
\fBkey_defined\fP \- check if a keycode is defined
28678
.SH SYNOPSIS
28679
\fB#include <curses.h>\fP
28680
-
28681
+.sp
28682
\fBint key_defined(const char *definition);\fP
28683
.SH DESCRIPTION
28684
This is an extension to the curses library.
28685
Index: ncurses-5.5/man/keybound.3x
28686
===================================================================
28687
--- ncurses-5.5.orig/man/keybound.3x 2003-10-25 16:33:16.000000000 -0400
28688
+++ ncurses-5.5/man/keybound.3x 2006-04-18 15:48:06.000000000 -0400
28689
@@ -1,5 +1,5 @@
28690
.\"***************************************************************************
28691
-.\" Copyright (c) 1999-2002,2003 Free Software Foundation, Inc. *
28692
+.\" Copyright (c) 1999-2003,2006 Free Software Foundation, Inc. *
28693
.\" *
28694
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28695
.\" copy of this software and associated documentation files (the *
28696
@@ -28,13 +28,13 @@
28697
.\"
28698
.\" Author: Thomas E. Dickey 1999
28699
.\"
28700
-.\" $Id: keybound.3x,v 1.5 2003/10/25 20:33:16 tom Exp $
28701
+.\" $Id: keybound.3x,v 1.6 2006/02/25 21:47:06 tom Exp $
28702
.TH keyok 3X ""
28703
.SH NAME
28704
\fBkeybound\fP \- return definition of keycode
28705
.SH SYNOPSIS
28706
\fB#include <curses.h>\fP
28707
-
28708
+.sp
28709
\fBchar * keybound(int keycode, int count);\fP
28710
.SH DESCRIPTION
28711
This is an extension to the curses library.
28712
Index: ncurses-5.5/man/keyok.3x
28713
===================================================================
28714
--- ncurses-5.5.orig/man/keyok.3x 2003-10-25 16:41:08.000000000 -0400
28715
+++ ncurses-5.5/man/keyok.3x 2006-04-18 15:48:06.000000000 -0400
28716
@@ -1,5 +1,5 @@
28717
.\"***************************************************************************
28718
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
28719
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
28720
.\" *
28721
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28722
.\" copy of this software and associated documentation files (the *
28723
@@ -28,13 +28,13 @@
28724
.\"
28725
.\" Author: Thomas E. Dickey 1997
28726
.\"
28727
-.\" $Id: keyok.3x,v 1.8 2003/10/25 20:41:08 tom Exp $
28728
+.\" $Id: keyok.3x,v 1.9 2006/02/25 21:47:06 tom Exp $
28729
.TH keyok 3X ""
28730
.SH NAME
28731
\fBkeyok\fP \- enable or disable a keycode
28732
.SH SYNOPSIS
28733
\fB#include <curses.h>\fP
28734
-
28735
+.sp
28736
\fBint keyok(int keycode, bool enable);\fP
28737
.SH DESCRIPTION
28738
This is an extension to the curses library.
28739
Index: ncurses-5.5/man/menu.3x
28740
===================================================================
28741
--- ncurses-5.5.orig/man/menu.3x 2002-01-19 17:48:58.000000000 -0500
28742
+++ ncurses-5.5/man/menu.3x 2006-04-18 15:48:06.000000000 -0400
28743
@@ -1,6 +1,6 @@
28744
'\" t
28745
.\"***************************************************************************
28746
-.\" Copyright (c) 1998,2000,2002 Free Software Foundation, Inc. *
28747
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
28748
.\" *
28749
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28750
.\" copy of this software and associated documentation files (the *
28751
@@ -27,7 +27,7 @@
28752
.\" authorization. *
28753
.\"***************************************************************************
28754
.\"
28755
-.\" $Id: menu.3x,v 1.15 2002/01/19 22:48:58 tom Exp $
28756
+.\" $Id: menu.3x,v 1.16 2006/02/25 21:40:44 tom Exp $
28757
.TH menu 3X ""
28758
.SH NAME
28759
\fBmenu\fR - curses extension for programming menus
28760
@@ -39,25 +39,25 @@ The \fBmenu\fR library provides terminal
28761
menu systems on character-cell terminals. The library includes: item routines,
28762
which create and modify menu items; and menu routines, which group items into
28763
menus, display menus on the screen, and handle interaction with the user.
28764
-
28765
+.PP
28766
The \fBmenu\fR library uses the \fBcurses\fR libraries, and a curses
28767
initialization routine such as \fBinitscr\fR must be called before using any of
28768
these functions. To use the \fBmenu\fR library, link with the options
28769
\fB-lmenu -lcurses\fR.
28770
-
28771
+.
28772
.SS Current Default Values for Item Attributes
28773
-
28774
+.
28775
The \fBmenu\fR library maintains a default value for item attributes. You can
28776
get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
28777
routine with a \fBNULL\fR item pointer. Changing this default with a
28778
\fBset_\fR function affects future item creations, but does not change the
28779
rendering of items already created.
28780
-
28781
+.
28782
.SS Routine Name Index
28783
-
28784
+.
28785
The following table lists each \fBmenu\fR routine and the name of
28786
the manual page on which it is described.
28787
-
28788
+.
28789
.TS
28790
l l .
28791
\fBcurses\fR Routine Name Manual Page Name
28792
@@ -172,7 +172,7 @@ descriptions of the entry points.
28793
.SH NOTES
28794
The header file \fB<menu.h>\fR automatically includes the header files
28795
\fB<curses.h>\fR and \fB<eti.h>\fR.
28796
-
28797
+.PP
28798
In your library list, libmenu.a should be before libncurses.a; that is,
28799
you want to say `-lmenu -lncurses', not the other way around (which would
28800
give you a link error using GNU \fBld\fR(1) and many other linkers).
28801
Index: ncurses-5.5/man/menu_attributes.3x
28802
===================================================================
28803
--- ncurses-5.5.orig/man/menu_attributes.3x 2002-01-19 17:49:06.000000000 -0500
28804
+++ ncurses-5.5/man/menu_attributes.3x 2006-04-18 15:48:06.000000000 -0400
28805
@@ -1,6 +1,6 @@
28806
'\" t
28807
.\"***************************************************************************
28808
-.\" Copyright (c) 1998,2002 Free Software Foundation, Inc. *
28809
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
28810
.\" *
28811
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28812
.\" copy of this software and associated documentation files (the *
28813
@@ -27,7 +27,7 @@
28814
.\" authorization. *
28815
.\"***************************************************************************
28816
.\"
28817
-.\" $Id: menu_attributes.3x,v 1.7 2002/01/19 22:49:06 tom Exp $
28818
+.\" $Id: menu_attributes.3x,v 1.8 2006/02/25 21:40:44 tom Exp $
28819
.TH menu_attributes 3X ""
28820
.SH NAME
28821
\fBmenu_attributes\fR - color and attribute control for menus
28822
@@ -55,17 +55,17 @@ The function \fBset_menu_fore\fR sets th
28823
\fImenu\fR. This is the highlight used for selected menu items.
28824
\fBmenu_fore\fR returns the foreground attribute. The default
28825
is \fBA_STANDOUT\fR.
28826
-
28827
+.PP
28828
The function \fBset_menu_back\fR sets the background attribute of
28829
\fImenu\fR. This is the highlight used for selectable (but not currently
28830
selected) menu items. The function \fBmenu_back\fR returns the background
28831
attribute. The default is \fBA_NORMAL\fR.
28832
-
28833
+.PP
28834
The function \fBset_menu_grey\fR sets the grey attribute of \fImenu\fR. This is
28835
the highlight used for un-selectable menu items in menus that permit more than
28836
one selection. The function \fBmenu_grey\fR returns the grey attribute.
28837
The default is \fBA_UNDERLINE\fR.
28838
-
28839
+.PP
28840
The function \fBset_menu_pad\fR sets the character used to fill the space
28841
between the name and description parts of a menu item. \fBmenu_pad\fR returns
28842
the given menu's pad character. The default is a blank.
28843
Index: ncurses-5.5/man/menu_format.3x
28844
===================================================================
28845
--- ncurses-5.5.orig/man/menu_format.3x 2001-08-04 16:36:19.000000000 -0400
28846
+++ ncurses-5.5/man/menu_format.3x 2006-04-18 15:48:06.000000000 -0400
28847
@@ -1,6 +1,6 @@
28848
'\" t
28849
.\"***************************************************************************
28850
-.\" Copyright (c) 1998,2001 Free Software Foundation, Inc. *
28851
+.\" Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. *
28852
.\" *
28853
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28854
.\" copy of this software and associated documentation files (the *
28855
@@ -27,7 +27,7 @@
28856
.\" authorization. *
28857
.\"***************************************************************************
28858
.\"
28859
-.\" $Id: menu_format.3x,v 1.8 2001/08/04 20:36:19 William.Setzer Exp $
28860
+.\" $Id: menu_format.3x,v 1.9 2006/02/25 21:40:44 tom Exp $
28861
.TH menu_format 3X ""
28862
.SH NAME
28863
\fBmenu_format\fR - set and get menu sizes
28864
@@ -43,12 +43,12 @@ The function \fBset_menu_format\fR sets
28865
menu. If this size is too small to display all menu items, the menu will be
28866
made scrollable. If this size is larger than the menus subwindow and the
28867
subwindow is too small to display all menu items, \fBpost_menu()\fR will fail.
28868
-
28869
+.PP
28870
The default format is 16 rows, 1 column. Calling \fBset_menu_format\fR with a
28871
null menu pointer will change this default. A zero row or column argument to
28872
\fBset_menu_format\fR is interpreted as a request not to change the current
28873
value.
28874
-
28875
+.PP
28876
The function \fBmenu_format\fR returns the maximum-size constraints for the
28877
given menu into the storage addressed by \fBrows\fR and \fBcols\fR.
28878
.SH RETURN VALUE
28879
Index: ncurses-5.5/man/menu_hook.3x
28880
===================================================================
28881
--- ncurses-5.5.orig/man/menu_hook.3x 1998-11-28 20:09:47.000000000 -0500
28882
+++ ncurses-5.5/man/menu_hook.3x 2006-04-18 15:48:06.000000000 -0400
28883
@@ -1,6 +1,6 @@
28884
'\" t
28885
.\"***************************************************************************
28886
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28887
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28888
.\" *
28889
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28890
.\" copy of this software and associated documentation files (the *
28891
@@ -27,7 +27,7 @@
28892
.\" authorization. *
28893
.\"***************************************************************************
28894
.\"
28895
-.\" $Id: menu_hook.3x,v 1.6 1998/11/29 01:09:47 Rick.Ohnemus Exp $
28896
+.\" $Id: menu_hook.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
28897
.TH menu_hook 3X ""
28898
.SH NAME
28899
\fBmenu_hook\fR - set hooks for automatic invocation by applications
28900
@@ -53,22 +53,22 @@ void (*)(MENU *) menu_term(const MENU *m
28901
.SH DESCRIPTION
28902
These functions make it possible to set hook functions to be called at various
28903
points in the automatic processing of input event codes by \fBmenu_driver\fR.
28904
-
28905
+.PP
28906
The function \fBset_item_init\fR sets a hook to be called at menu-post time and
28907
each time the selected item changes (after the change). \fBitem_init\fR
28908
returns the current item init hook, if any (\fBNULL\fR if there is no such
28909
hook).
28910
-
28911
+.PP
28912
The function \fBset_item_term\fR sets a hook to be called at menu-unpost time
28913
and each time the selected item changes (before the change). \fBitem_term\fR
28914
returns the current item term hook, if any (\fBNULL\fR if there is no such
28915
hook).
28916
-
28917
+.PP
28918
The function \fBset_menu_init\fR sets a hook to be called at menu-post time and
28919
just after the top row on the menu changes once it is posted. \fBmenu_init\fR
28920
returns the current menu init hook, if any (\fBNULL\fR if there is no such
28921
hook).
28922
-
28923
+.PP
28924
The function \fBset_menu_term\fR sets a hook to be called at menu-unpost time
28925
and just before the top row on the menu changes once it is posted.
28926
\fBmenu_term\fR returns the current menu term hook, if any (\fBNULL\fR if there
28927
Index: ncurses-5.5/man/menu_items.3x
28928
===================================================================
28929
--- ncurses-5.5.orig/man/menu_items.3x 1998-11-28 20:09:56.000000000 -0500
28930
+++ ncurses-5.5/man/menu_items.3x 2006-04-18 15:48:06.000000000 -0400
28931
@@ -1,6 +1,6 @@
28932
'\" t
28933
.\"***************************************************************************
28934
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28935
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28936
.\" *
28937
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28938
.\" copy of this software and associated documentation files (the *
28939
@@ -27,7 +27,7 @@
28940
.\" authorization. *
28941
.\"***************************************************************************
28942
.\"
28943
-.\" $Id: menu_items.3x,v 1.5 1998/11/29 01:09:56 Rick.Ohnemus Exp $
28944
+.\" $Id: menu_items.3x,v 1.6 2006/02/25 21:38:26 tom Exp $
28945
.TH menu_items 3X ""
28946
.SH NAME
28947
\fBmenu_items\fR - make and break connections between items and menus
28948
@@ -43,16 +43,16 @@ int item_count(const MENU *menu);
28949
.SH DESCRIPTION
28950
The function \fBset_menu_items\fR changes the item pointer array of the given
28951
\fImenu\fR. The array must be terminated by a \fBNULL\fR.
28952
-
28953
+.PP
28954
The function \fBmenu_items\fR returns the item array of the given menu.
28955
-
28956
+.PP
28957
The function \fBitem_count\fR returns the count of items in \fImenu\fR.
28958
.SH RETURN VALUES
28959
The function \fBmenu_items\fR returns \fBNULL\fR on error.
28960
-
28961
+.PP
28962
The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
28963
return value) on error.
28964
-
28965
+.PP
28966
The function \fBset_menu_items\fR returns one of the following codes on error:
28967
.TP 5
28968
\fBE_OK\fR
28969
@@ -77,7 +77,7 @@ The header file \fB<menu.h>\fR automatic
28970
.SH PORTABILITY
28971
These routines emulate the System V menu library. They were not supported on
28972
Version 7 or BSD versions.
28973
-
28974
+.PP
28975
The SVr4 menu library documentation specifies the \fBitem_count\fR error value
28976
as -1 (which is the value of \fBERR\fR).
28977
.SH AUTHORS
28978
Index: ncurses-5.5/man/menu_mark.3x
28979
===================================================================
28980
--- ncurses-5.5.orig/man/menu_mark.3x 1998-11-28 20:10:03.000000000 -0500
28981
+++ ncurses-5.5/man/menu_mark.3x 2006-04-18 15:48:06.000000000 -0400
28982
@@ -1,6 +1,6 @@
28983
'\" t
28984
.\"***************************************************************************
28985
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
28986
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
28987
.\" *
28988
.\" Permission is hereby granted, free of charge, to any person obtaining a *
28989
.\" copy of this software and associated documentation files (the *
28990
@@ -27,7 +27,7 @@
28991
.\" authorization. *
28992
.\"***************************************************************************
28993
.\"
28994
-.\" $Id: menu_mark.3x,v 1.6 1998/11/29 01:10:03 Rick.Ohnemus Exp $
28995
+.\" $Id: menu_mark.3x,v 1.8 2006/02/25 21:33:48 tom Exp $
28996
.TH menu_mark 3X ""
28997
.SH NAME
28998
\fBmenu_mark\fR - get and set the menu mark string
28999
@@ -42,15 +42,15 @@ const char *menu_mark(const MENU *menu);
29000
In order to make menu selections visible on older terminals without
29001
highlighting or color capability, the menu library marks selected items
29002
in a menu with a prefix string.
29003
-
29004
+.PP
29005
The function \fBset_menu_mark\fR sets the mark string for the given menu.
29006
Calling \fBset_menu_mark\fR with a null menu item will abolish the mark string.
29007
Note that changing the length of the mark string for a menu while the
29008
menu is posted is likely to produce unhelpful behavior.
29009
-
29010
+.PP
29011
The default string is "-" (a dash). Calling \fBset_menu_mark\fR with
29012
-a \fBNULL\fR menu argument will change this default.
29013
-
29014
+a non-\fBNULL\fR menu argument will change this default.
29015
+.PP
29016
The function \fBmenu_mark\fR returns the menu's mark string (or \fBNULL\fR if
29017
there is none).
29018
.SH RETURN VALUE
29019
Index: ncurses-5.5/man/menu_new.3x
29020
===================================================================
29021
--- ncurses-5.5.orig/man/menu_new.3x 1998-11-28 20:10:13.000000000 -0500
29022
+++ ncurses-5.5/man/menu_new.3x 2006-04-18 15:48:06.000000000 -0400
29023
@@ -1,6 +1,6 @@
29024
'\" t
29025
.\"***************************************************************************
29026
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29027
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29028
.\" *
29029
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29030
.\" copy of this software and associated documentation files (the *
29031
@@ -27,7 +27,7 @@
29032
.\" authorization. *
29033
.\"***************************************************************************
29034
.\"
29035
-.\" $Id: menu_new.3x,v 1.7 1998/11/29 01:10:13 Rick.Ohnemus Exp $
29036
+.\" $Id: menu_new.3x,v 1.8 2006/02/25 21:38:26 tom Exp $
29037
.TH menu_new 3X ""
29038
.SH NAME
29039
\fBmenu_new\fR - create and destroy menus
29040
@@ -41,12 +41,12 @@ int free_menu(MENU *menu);
29041
.SH DESCRIPTION
29042
The function \fBnew_menu\fR creates a new menu connected to a specified item
29043
pointer array (which must be \fBNULL\fR-terminated).
29044
-
29045
+.PP
29046
The function \fBfree_menu\fR disconnects \fImenu\fR from its item array
29047
and frees the storage allocated for the menu.
29048
.SH RETURN VALUE
29049
The function \fBnew_menu\fR returns \fBNULL\fR on error.
29050
-
29051
+.PP
29052
The function \fBfree_menu\fR returns one of the following:
29053
.TP 5
29054
\fBE_OK\fR
29055
Index: ncurses-5.5/man/menu_opts.3x
29056
===================================================================
29057
--- ncurses-5.5.orig/man/menu_opts.3x 1998-11-28 20:10:21.000000000 -0500
29058
+++ ncurses-5.5/man/menu_opts.3x 2006-04-18 15:48:06.000000000 -0400
29059
@@ -1,6 +1,6 @@
29060
'\" t
29061
.\"***************************************************************************
29062
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29063
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29064
.\" *
29065
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29066
.\" copy of this software and associated documentation files (the *
29067
@@ -27,7 +27,7 @@
29068
.\" authorization. *
29069
.\"***************************************************************************
29070
.\"
29071
-.\" $Id: menu_opts.3x,v 1.7 1998/11/29 01:10:21 Rick.Ohnemus Exp $
29072
+.\" $Id: menu_opts.3x,v 1.8 2006/02/25 21:38:26 tom Exp $
29073
.TH menu_opts 3X ""
29074
.SH NAME
29075
\fBmenu_opts\fR - set and get menu options
29076
@@ -45,15 +45,15 @@ OPTIONS menu_opts(const MENU *menu);
29077
.SH DESCRIPTION
29078
The function \fBset_menu_opts\fR sets all the given menu's option bits (menu
29079
option bits may be logically-OR'ed together).
29080
-
29081
+.PP
29082
The function \fBmenu_opts_on\fR turns on the given option bits, and leaves
29083
others alone.
29084
-
29085
+.PP
29086
The function \fBmenu_opts_off\fR turns off the given option bits, and leaves
29087
others alone.
29088
-
29089
+.PP
29090
The function \fBmenu_opts\fR returns the menu's current option bits.
29091
-
29092
+.PP
29093
The following options are defined (all are on by default):
29094
.TP 5
29095
O_ONEVALUE
29096
Index: ncurses-5.5/man/menu_pattern.3x
29097
===================================================================
29098
--- ncurses-5.5.orig/man/menu_pattern.3x 2003-05-10 16:22:01.000000000 -0400
29099
+++ ncurses-5.5/man/menu_pattern.3x 2006-04-18 15:48:06.000000000 -0400
29100
@@ -1,5 +1,5 @@
29101
.\"***************************************************************************
29102
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
29103
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
29104
.\" *
29105
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29106
.\" copy of this software and associated documentation files (the *
29107
@@ -26,7 +26,7 @@
29108
.\" authorization. *
29109
.\"***************************************************************************
29110
.\"
29111
-.\" $Id: menu_pattern.3x,v 1.8 2003/05/10 20:22:01 tom Exp $
29112
+.\" $Id: menu_pattern.3x,v 1.9 2006/02/25 21:47:06 tom Exp $
29113
.TH menu_pattern 3X ""
29114
.SH NAME
29115
\fBmenu_pattern\fR - get and set a menu's pattern buffer
29116
@@ -41,11 +41,11 @@ char *menu_pattern(const MENU *menu);
29117
Every menu has an associated pattern match buffer. As input events that are
29118
printable ASCII characters come in, they are appended to this match buffer
29119
and tested for a match, as described in \fBmenu_driver\fR(3X).
29120
-
29121
+.PP
29122
The function \fBset_menu_pattern\fR sets the pattern buffer for the given menu
29123
and tries to find the first matching item. If it succeeds, that item becomes
29124
current; if not, the current item does not change.
29125
-
29126
+.PP
29127
The function \fBmenu_pattern\fR returns the pattern buffer of the given
29128
\fImenu\fR.
29129
.SH RETURN VALUE
29130
Index: ncurses-5.5/man/menu_post.3x
29131
===================================================================
29132
--- ncurses-5.5.orig/man/menu_post.3x 1998-11-28 20:10:33.000000000 -0500
29133
+++ ncurses-5.5/man/menu_post.3x 2006-04-18 15:48:06.000000000 -0400
29134
@@ -1,6 +1,6 @@
29135
'\" t
29136
.\"***************************************************************************
29137
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29138
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29139
.\" *
29140
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29141
.\" copy of this software and associated documentation files (the *
29142
@@ -27,7 +27,7 @@
29143
.\" authorization. *
29144
.\"***************************************************************************
29145
.\"
29146
-.\" $Id: menu_post.3x,v 1.7 1998/11/29 01:10:33 Rick.Ohnemus Exp $
29147
+.\" $Id: menu_post.3x,v 1.8 2006/02/25 21:38:26 tom Exp $
29148
.TH menu_post 3X ""
29149
.SH NAME
29150
\fBmenu_post\fR - write or erase menus from associated subwindows
29151
@@ -43,7 +43,7 @@ The function \fBpost_menu\fR displays a
29152
trigger physical display of the subwindow, use \fBrefresh\fR or some equivalent
29153
\fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
29154
input request will do). \fBpost_menu\fR resets the selection status of all items.
29155
-
29156
+.PP
29157
The function \fBunpost_menu\fR erases menu from its associated subwindow.
29158
.SH RETURN VALUE
29159
These routines return one of the following:
29160
Index: ncurses-5.5/man/menu_userptr.3x
29161
===================================================================
29162
--- ncurses-5.5.orig/man/menu_userptr.3x 1998-11-28 20:11:02.000000000 -0500
29163
+++ ncurses-5.5/man/menu_userptr.3x 2006-04-18 15:48:06.000000000 -0400
29164
@@ -1,6 +1,6 @@
29165
'\" t
29166
.\"***************************************************************************
29167
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29168
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29169
.\" *
29170
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29171
.\" copy of this software and associated documentation files (the *
29172
@@ -27,7 +27,7 @@
29173
.\" authorization. *
29174
.\"***************************************************************************
29175
.\"
29176
-.\" $Id: menu_userptr.3x,v 1.6 1998/11/29 01:11:02 Rick.Ohnemus Exp $
29177
+.\" $Id: menu_userptr.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
29178
.TH menu_userptr 3X ""
29179
.SH NAME
29180
\fBmenu_userptr\fR - associate application data with a menu item
29181
@@ -59,7 +59,7 @@ The header file \fB<menu.h>\fR automatic
29182
.SH PORTABILITY
29183
These routines emulate the System V menu library. They were not supported on
29184
Version 7 or BSD versions.
29185
-
29186
+.PP
29187
The user pointer should be a void pointer. We leave it as a char pointer for
29188
SVr4 compatibility.
29189
.SH AUTHORS
29190
Index: ncurses-5.5/man/menu_win.3x
29191
===================================================================
29192
--- ncurses-5.5.orig/man/menu_win.3x 1998-11-28 20:11:11.000000000 -0500
29193
+++ ncurses-5.5/man/menu_win.3x 2006-04-18 15:48:06.000000000 -0400
29194
@@ -1,6 +1,6 @@
29195
'\" t
29196
.\"***************************************************************************
29197
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29198
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29199
.\" *
29200
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29201
.\" copy of this software and associated documentation files (the *
29202
@@ -27,7 +27,7 @@
29203
.\" authorization. *
29204
.\"***************************************************************************
29205
.\"
29206
-.\" $Id: menu_win.3x,v 1.6 1998/11/29 01:11:11 Rick.Ohnemus Exp $
29207
+.\" $Id: menu_win.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
29208
.TH menu_win 3X ""
29209
.SH NAME
29210
\fBmenu_win\fR - make and break menu window and subwindow associations
29211
@@ -48,14 +48,14 @@ int scale_menu(const MENU *menu, int *ro
29212
Every menu has an associated pair of \fBcurses\fR windows. The menu window
29213
displays any title and border associated with the window; the menu subwindow
29214
displays the items of the menu that are currently available for selection.
29215
-
29216
+.PP
29217
The first four functions get and set those windows. It is not necessary to set
29218
either window; by default, the driver code uses \fBstdscr\fR for both.
29219
-
29220
+.PP
29221
In the \fBset_\fR functions, window argument of \fBNULL\fR is treated as though
29222
it were \fBstsdcr\fR. A menu argument of \fBNULL\fR is treated as a request
29223
to change the system default menu window or subwindow.
29224
-
29225
+.PP
29226
The function \fBscale_menu\fR returns the minimum size required for the
29227
subwindow of \fImenu\fR.
29228
.SH RETURN VALUE
29229
Index: ncurses-5.5/man/mitem_current.3x
29230
===================================================================
29231
--- ncurses-5.5.orig/man/mitem_current.3x 1998-12-26 14:52:34.000000000 -0500
29232
+++ ncurses-5.5/man/mitem_current.3x 2006-04-18 15:48:06.000000000 -0400
29233
@@ -1,6 +1,6 @@
29234
'\" t
29235
.\"***************************************************************************
29236
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29237
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29238
.\" *
29239
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29240
.\" copy of this software and associated documentation files (the *
29241
@@ -27,7 +27,7 @@
29242
.\" authorization. *
29243
.\"***************************************************************************
29244
.\"
29245
-.\" $Id: mitem_current.3x,v 1.9 1998/12/26 19:52:34 tom Exp $
29246
+.\" $Id: mitem_current.3x,v 1.10 2006/02/25 21:38:26 tom Exp $
29247
.TH mitem_current 3X ""
29248
.SH NAME
29249
\fBmitem_current\fR - set and get current_menu_item
29250
@@ -48,21 +48,21 @@ int item_index(const ITEM *item);
29251
The function \fBset_current_item\fR sets the current item (the item on which
29252
the menu cursor is positioned). \fBcurrent_item\fR returns a pointer to the
29253
current item in the given menu.
29254
-
29255
+.PP
29256
The function \fBset_top_row\fR sets the top row of the menu to show the given
29257
row (the top row is initially 0, and is reset to this value whenever the
29258
\fBO_ROWMAJOR\fR option is toggled). The item leftmost on the given row
29259
becomes current. The function \fBtop_row\fR returns the number of the top menu
29260
row being displayed.
29261
-
29262
+.PP
29263
The function \fBitem_index\fR returns the (zero-origin) index of \fIitem\fR in
29264
the menu's item pointer list.
29265
.SH RETURN VALUE
29266
\fBcurrent_item\fR returns \fBNULL\fR on error.
29267
-
29268
+.PP
29269
\fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
29270
error value) on error.
29271
-
29272
+.PP
29273
\fBset_current_item\fR and \fBset_top_row\fR return one of the following:
29274
.TP 5
29275
\fBE_OK\fR
29276
@@ -87,7 +87,7 @@ The header file \fB<menu.h>\fR automatic
29277
.SH PORTABILITY
29278
These routines emulate the System V menu library. They were not supported on
29279
Version 7 or BSD versions.
29280
-
29281
+.PP
29282
The SVr4 menu library documentation specifies the \fBtop_row\fR and
29283
\fBindex_item\fR error value as -1 (which is the value of \fBERR\fR).
29284
.SH AUTHORS
29285
Index: ncurses-5.5/man/mitem_new.3x
29286
===================================================================
29287
--- ncurses-5.5.orig/man/mitem_new.3x 2003-10-25 16:08:57.000000000 -0400
29288
+++ ncurses-5.5/man/mitem_new.3x 2006-04-18 15:48:06.000000000 -0400
29289
@@ -1,6 +1,6 @@
29290
'\" t
29291
.\"***************************************************************************
29292
-.\" Copyright (c) 1998,2003 Free Software Foundation, Inc. *
29293
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
29294
.\" *
29295
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29296
.\" copy of this software and associated documentation files (the *
29297
@@ -27,7 +27,7 @@
29298
.\" authorization. *
29299
.\"***************************************************************************
29300
.\"
29301
-.\" $Id: mitem_new.3x,v 1.8 2003/10/25 20:08:57 Jared.Yanovich Exp $
29302
+.\" $Id: mitem_new.3x,v 1.9 2006/02/25 21:47:06 tom Exp $
29303
.TH mitem_new 3X ""
29304
.SH NAME
29305
\fBmitem_new\fR - create and destroy menu items
29306
@@ -50,7 +50,7 @@ is the responsibility of the application
29307
name or the description of the item.
29308
.SH RETURN VALUE
29309
The function \fBnew_item\fR returns \fBNULL\fR on error.
29310
-
29311
+.PP
29312
The function \fBfree_item\fR returns one of the following:
29313
.TP 5
29314
\fBE_OK\fR
29315
Index: ncurses-5.5/man/mitem_opts.3x
29316
===================================================================
29317
--- ncurses-5.5.orig/man/mitem_opts.3x 1998-11-28 20:12:37.000000000 -0500
29318
+++ ncurses-5.5/man/mitem_opts.3x 2006-04-18 15:48:06.000000000 -0400
29319
@@ -1,6 +1,6 @@
29320
'\" t
29321
.\"***************************************************************************
29322
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29323
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29324
.\" *
29325
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29326
.\" copy of this software and associated documentation files (the *
29327
@@ -27,7 +27,7 @@
29328
.\" authorization. *
29329
.\"***************************************************************************
29330
.\"
29331
-.\" $Id: mitem_opts.3x,v 1.6 1998/11/29 01:12:37 Rick.Ohnemus Exp $
29332
+.\" $Id: mitem_opts.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
29333
.TH mitem_opts 3X ""
29334
.SH NAME
29335
\fBmitem_opts\fR - set and get menu item options
29336
@@ -45,15 +45,15 @@ OPTIONS item_opts(const ITEM *item);
29337
.SH DESCRIPTION
29338
The function \fBset_item_opts\fR sets all the given item's option bits (menu
29339
option bits may be logically-OR'ed together).
29340
-
29341
+.PP
29342
The function \fBitem_opts_on\fR turns on the given option bits, and leaves
29343
others alone.
29344
-
29345
+.PP
29346
The function \fBitem_opts_off\fR turns off the given option bits, and leaves
29347
others alone.
29348
-
29349
+.PP
29350
The function \fBitem_opts\fR returns the item's current option bits.
29351
-
29352
+.PP
29353
There is only one defined option bit mask, \fBO_SELECTABLE\fR. When this is
29354
on, the item may be selected during menu processing. This option defaults
29355
to on.
29356
Index: ncurses-5.5/man/mitem_userptr.3x
29357
===================================================================
29358
--- ncurses-5.5.orig/man/mitem_userptr.3x 1998-11-28 20:12:47.000000000 -0500
29359
+++ ncurses-5.5/man/mitem_userptr.3x 2006-04-18 15:48:06.000000000 -0400
29360
@@ -1,6 +1,6 @@
29361
'\" t
29362
.\"***************************************************************************
29363
-.\" Copyright (c) 1998 Free Software Foundation, Inc. *
29364
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
29365
.\" *
29366
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29367
.\" copy of this software and associated documentation files (the *
29368
@@ -27,7 +27,7 @@
29369
.\" authorization. *
29370
.\"***************************************************************************
29371
.\"
29372
-.\" $Id: mitem_userptr.3x,v 1.6 1998/11/29 01:12:47 Rick.Ohnemus Exp $
29373
+.\" $Id: mitem_userptr.3x,v 1.7 2006/02/25 21:38:26 tom Exp $
29374
.TH mitem_userptr 3X ""
29375
.SH NAME
29376
\fBmitem_userptr\fR - associate application data with a menu item
29377
@@ -58,7 +58,7 @@ The header file \fB<menu.h>\fR automatic
29378
.SH PORTABILITY
29379
These routines emulate the System V menu library. They were not supported on
29380
Version 7 or BSD versions.
29381
-
29382
+.PP
29383
The user pointer should be a void pointer. We leave it as a char pointer for
29384
SVr4 compatibility.
29385
.SH AUTHORS
29386
Index: ncurses-5.5/man/mitem_value.3x
29387
===================================================================
29388
--- ncurses-5.5.orig/man/mitem_value.3x 2002-02-16 17:40:59.000000000 -0500
29389
+++ ncurses-5.5/man/mitem_value.3x 2006-04-18 15:48:06.000000000 -0400
29390
@@ -1,5 +1,5 @@
29391
.\"***************************************************************************
29392
-.\" Copyright (c) 1998,2002 Free Software Foundation, Inc. *
29393
+.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
29394
.\" *
29395
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29396
.\" copy of this software and associated documentation files (the *
29397
@@ -26,7 +26,7 @@
29398
.\" authorization. *
29399
.\"***************************************************************************
29400
.\"
29401
-.\" $Id: mitem_value.3x,v 1.6 2002/02/16 22:40:59 tom Exp $
29402
+.\" $Id: mitem_value.3x,v 1.7 2006/02/25 21:42:22 tom Exp $
29403
.TH mitem_value 3X ""
29404
.SH NAME
29405
\fBmitem_value\fR - set and get menu item values
29406
@@ -42,7 +42,7 @@ If you turn off the menu option \fBO_ONE
29407
\fBset_menu_opts\fR or \fBmenu_opts_off\fR; see \fBmenu_opts\fR(3X)), the menu
29408
becomes multi-valued; that is, more than one item may simultaneously be
29409
selected.
29410
-
29411
+.PP
29412
In a multi_valued menu, you can used \fBset_item_value\fR to select the
29413
given menu item (second argument \fBTRUE\fR) or deselect it (second argument
29414
\fBFALSE\fR).
29415
Index: ncurses-5.5/man/ncurses.3x
29416
===================================================================
29417
--- ncurses-5.5.orig/man/ncurses.3x 2005-09-03 13:42:29.000000000 -0400
29418
+++ ncurses-5.5/man/ncurses.3x 2006-04-18 15:48:06.000000000 -0400
29419
@@ -1,6 +1,6 @@
29420
'\" t
29421
.\"***************************************************************************
29422
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
29423
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
29424
.\" *
29425
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29426
.\" copy of this software and associated documentation files (the *
29427
@@ -27,7 +27,7 @@
29428
.\" authorization. *
29429
.\"***************************************************************************
29430
.\"
29431
-.\" $Id: ncurses.3x,v 1.76 2005/09/03 17:42:29 tom Exp $
29432
+.\" $Id: ncurses.3x,v 1.77 2006/02/05 00:41:45 tom Exp $
29433
.hy 0
29434
.TH ncurses 3X ""
29435
.ds n 5
29436
@@ -46,8 +46,8 @@ implementation is ``new curses'' (ncurse
29437
The \fBncurses\fR routines emulate the \fBcurses\fR(3X) library of System V
29438
Release 4 UNIX, and the XPG4 curses standard (XSI curses) but the \fBncurses\fR
29439
library is freely redistributable in source form. Differences from the SVr4
29440
-curses are summarized under the EXTENSIONS and PORTABILITY sections below and
29441
-described in detail in the respective EXTENSIONS, PORTABILITY and BUGS sections
29442
+curses are summarized under the \fBEXTENSIONS\fP and \fBPORTABILITY\fP sections below and
29443
+described in detail in the respective \fBEXTENSIONS\fP, \fBPORTABILITY\fP and \fBBUGS\fP sections
29444
of individual man pages.
29445
.PP
29446
A program using these routines must be linked with the \fB-lncurses\fR option,
29447
@@ -56,6 +56,7 @@ or (if it has been generated) with the d
29448
the names \fB-lcurses\fR and \fB-lcurses_g\fR.)
29449
The ncurses_g library generates trace logs (in a file called 'trace' in the
29450
current directory) that describe curses actions.
29451
+See also the section on \fBALTERNATE CONFIGURATIONS\fP.
29452
.PP
29453
The \fBncurses\fR package supports: overall screen, window and pad
29454
manipulation; output to windows and pads; reading terminal input; control over
29455
@@ -846,6 +847,76 @@ The library may be configured to disrega
29456
current user is the superuser (root), or if the application uses setuid or
29457
setgid permissions:
29458
$TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
29459
+.SH ALTERNATE CONFIGURATIONS
29460
+Several different configurations are possible,
29461
+depending on the configure script options used when building \fBncurses\fP.
29462
+There are a few main options whose effects are visible to the applications
29463
+developer using \fBncurses\fP:
29464
+.TP 5
29465
+--disable-overwrite
29466
+The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
29467
+.RS
29468
+.sp
29469
+\fB#include <curses.h>\fR
29470
+.RE
29471
+.IP
29472
+This option is used to avoid filename conflicts when \fBncurses\fP
29473
+is not the main implementation of curses of the computer.
29474
+If \fBncurses\fP is installed disabling overwrite, it puts its headers in
29475
+a subdirectory, e.g.,
29476
+.RS
29477
+.sp
29478
+\fB#include <ncurses/curses.h>\fR
29479
+.RE
29480
+.IP
29481
+It also omits a symbolic link which would allow you to use \fB-lcurses\fP
29482
+to build executables.
29483
+.TP 5
29484
+--enable-widec
29485
+The configure script renames the library and (if the \fB--disable-overwrite\fP
29486
+option is used) puts the header files in a different subdirectory.
29487
+All of the library names have a "w" appended to them,
29488
+i.e., instead of
29489
+.RS
29490
+.sp
29491
+\fB-lncurses\fR
29492
+.RE
29493
+.IP
29494
+you link with
29495
+.RS
29496
+.sp
29497
+\fB-lncursesw\fR
29498
+.RE
29499
+.IP
29500
+You must also define \fB_XOPEN_SOURCE_EXTENDED\fP when compiling for the
29501
+wide-character library to use the extended (wide-character) functions.
29502
+The \fBcurses.h\fP file which is installed for the wide-character
29503
+library is designed to be compatible with the normal library's header.
29504
+Only the size of the \fBWINDOW\fP structure differs, and very few
29505
+applications require more than a pointer to \fBWINDOW\fPs.
29506
+If the headers are installed allowing overwrite,
29507
+the wide-character library's headers should be installed last,
29508
+to allow applications to be built using either library
29509
+from the same set of headers.
29510
+.TP 5
29511
+--with-shared
29512
+.TP
29513
+--with-normal
29514
+.TP
29515
+--with-debug
29516
+.TP
29517
+--with-profile
29518
+The shared and normal (static) library names differ by their suffixes,
29519
+e.g., \fBlibncurses.so\fP and \fBlibncurses.a\fP.
29520
+The debug and profiling libraries add a "_g" and a "_p" to the root
29521
+names respectively,
29522
+e.g., \fBlibncurses_g.a\fP and \fBlibncurses_p.a\fP.
29523
+.TP 5
29524
+--with-trace
29525
+The \fBtrace\fP function normally resides in the debug library,
29526
+but it is sometimes useful to configure this in the shared library.
29527
+Configure scripts should check for the function's existence rather
29528
+than assuming it is always in the debug library.
29529
.SH FILES
29530
.TP 5
29531
@DATADIR@/tabset
29532
Index: ncurses-5.5/man/term.7
29533
===================================================================
29534
--- ncurses-5.5.orig/man/term.7 2003-05-10 16:33:49.000000000 -0400
29535
+++ ncurses-5.5/man/term.7 2006-04-18 15:48:06.000000000 -0400
29536
@@ -1,5 +1,5 @@
29537
.\"***************************************************************************
29538
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
29539
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
29540
.\" *
29541
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29542
.\" copy of this software and associated documentation files (the *
29543
@@ -26,7 +26,7 @@
29544
.\" authorization. *
29545
.\"***************************************************************************
29546
.\"
29547
-.\" $Id: term.7,v 1.14 2003/05/10 20:33:49 jmc Exp $
29548
+.\" $Id: term.7,v 1.15 2006/02/25 21:47:06 tom Exp $
29549
.TH TERM 7
29550
.ds n 5
29551
.ds d @TERMINFO@
29552
@@ -65,16 +65,16 @@ which you wish to override the system de
29553
.PP
29554
Terminal type descriptions are stored as files of capability data underneath
29555
\*d. To browse a list of all terminal names recognized by the system, do
29556
-
29557
+.sp
29558
toe | more
29559
-
29560
+.sp
29561
from your shell. These capability files are in a binary format optimized for
29562
retrieval speed (unlike the old text-based \fBtermcap\fR format they replace);
29563
to examine an entry, you must use the \fBinfocmp\fR(1) command. Invoke it as
29564
follows:
29565
-
29566
+.sp
29567
infocmp \fIentry-name\fR
29568
-
29569
+.sp
29570
where \fIentry-name\fR is the name of the type you wish to examine (and the
29571
name of its capability file the subdirectory of \*d named for its first
29572
letter). This command dumps a capability file in the text format described by
29573
Index: ncurses-5.5/man/terminfo.tail
29574
===================================================================
29575
--- ncurses-5.5.orig/man/terminfo.tail 2005-06-25 18:46:03.000000000 -0400
29576
+++ ncurses-5.5/man/terminfo.tail 2006-04-18 15:48:07.000000000 -0400
29577
@@ -1,10 +1,11 @@
29578
-.\" $Id: terminfo.tail,v 1.42 2005/06/25 22:46:03 tom Exp $
29579
+.\" $Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp $
29580
.\" Beginning of terminfo.tail file
29581
+.\" This file is part of ncurses.
29582
.\" See "terminfo.head" for copyright.
29583
.ps +1
29584
-.PP
29585
+..
29586
.SS A Sample Entry
29587
-.PP
29588
+..
29589
The following entry, describing an ANSI-standard terminal, is representative
29590
of what a \fBterminfo\fR entry for a modern terminal typically looks like.
29591
.PP
29592
@@ -995,25 +996,33 @@ option of the
29593
.IR tput
29594
program, each time the user logs in.
29595
They will be printed in the following order:
29596
+.RS
29597
+.TP
29598
run the program
29599
-.BR iprog ;
29600
+.BR iprog
29601
+.TP
29602
output
29603
-.BR is1 ;
29604
-.BR is2 ;
29605
+.BR is1
29606
+.BR is2
29607
+.TP
29608
set the margins using
29609
.BR mgc ,
29610
.BR smgl
29611
and
29612
-.BR smgr ;
29613
+.BR smgr
29614
+.TP
29615
set tabs using
29616
.B tbc
29617
and
29618
-.BR hts ;
29619
+.BR hts
29620
+.TP
29621
print the file
29622
-.BR if ;
29623
+.BR if
29624
+.TP
29625
and finally
29626
output
29627
.BR is3 .
29628
+.RE
29629
.PP
29630
Most initialization is done with
29631
.BR is2 .
29632
@@ -1024,17 +1033,21 @@ and special cases in
29633
.B is1
29634
and
29635
.BR is3 .
29636
-A pair of sequences that does a harder reset from a totally unknown state
29637
-can be analogously given as
29638
+.PP
29639
+A set of sequences that does a harder reset from a totally unknown state
29640
+can be given as
29641
.BR rs1 ,
29642
.BR rs2 ,
29643
-.BR rf ,
29644
+.BR rf
29645
and
29646
.BR rs3 ,
29647
analogous to
29648
-.B is2
29649
+.B is1 ,
29650
+.B is2 ,
29651
+.B if
29652
and
29653
-.BR if .
29654
+.BR is3
29655
+respectively.
29656
These strings are output by the
29657
.IR reset
29658
program, which is used when the terminal gets into a wedged state.
29659
@@ -1052,6 +1065,28 @@ normally be part of
29660
but it causes an annoying glitch of the screen and is not normally
29661
needed since the terminal is usually already in 80 column mode.
29662
.PP
29663
+The
29664
+.IR reset
29665
+program writes strings
29666
+including
29667
+.BR iprog ,
29668
+etc., in the same order as the
29669
+.IR init
29670
+program, using
29671
+.BR rs1 ,
29672
+etc., instead of
29673
+.BR is1 ,
29674
+etc.
29675
+If any of
29676
+.BR rs1 ,
29677
+.BR rs2 ,
29678
+.BR rs3 ,
29679
+or
29680
+.BR rf
29681
+reset capability strings are missing, the
29682
+.IR reset
29683
+program falls back upon the corresponding initialization capability string.
29684
+.PP
29685
If there are commands to set and clear tab stops, they can be given as
29686
.B tbc
29687
(clear all tab stops)
29688
@@ -1650,8 +1685,8 @@ Supports both the SVr4 set and the AIX e
29689
\*d/?/*
29690
files containing terminal descriptions
29691
.SH SEE ALSO
29692
-\fBtic\fR(1M),
29693
-\fBinfocmp\fR(1M),
29694
+\fB@TIC@\fR(1M),
29695
+\fB@INFOCMP@\fR(1M),
29696
\fBcurses\fR(3X),
29697
\fBprintf\fR(3S),
29698
\fBterm\fR(\*n).
29699
Index: ncurses-5.5/man/tset.1
29700
===================================================================
29701
--- ncurses-5.5.orig/man/tset.1 2005-03-20 13:27:09.000000000 -0500
29702
+++ ncurses-5.5/man/tset.1 2006-04-18 15:48:06.000000000 -0400
29703
@@ -1,5 +1,5 @@
29704
.\"***************************************************************************
29705
-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
29706
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
29707
.\" *
29708
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29709
.\" copy of this software and associated documentation files (the *
29710
@@ -26,7 +26,7 @@
29711
.\" authorization. *
29712
.\"***************************************************************************
29713
.\"
29714
-.\" $Id: tset.1,v 1.15 2005/03/20 18:27:09 tom Exp $
29715
+.\" $Id: tset.1,v 1.16 2006/02/25 21:28:13 tom Exp $
29716
.TH tset 1 ""
29717
.SH NAME
29718
\fBtset\fR, \fBreset\fR - terminal initialization
29719
@@ -77,9 +77,9 @@ resets any unset special characters to t
29720
doing the terminal initialization described above. This is useful
29721
after a program dies leaving a terminal in an abnormal state. Note,
29722
you may have to type
29723
-
29724
+.sp
29725
\fB<LF>reset<LF>\fR
29726
-
29727
+.sp
29728
(the line-feed character is normally control-J) to get the terminal
29729
to work, as carriage-return may no longer work in the abnormal state.
29730
Also, the terminal will often not echo the command.
29731
@@ -150,9 +150,9 @@ are for \fBcsh\fR, otherwise, they are f
29732
Note, the \fBcsh\fR commands set and unset the shell variable
29733
\fBnoglob\fR, leaving it unset. The following line in the \fB.login\fR
29734
or \fB.profile\fR files will initialize the environment correctly:
29735
-
29736
+.sp
29737
eval \`tset -s options ... \`
29738
-
29739
+.
29740
.SH TERMINAL TYPE MAPPING
29741
When the terminal is not hardwired into the system (or the current
29742
system information is incorrect) the terminal type derived from the
29743
@@ -259,9 +259,9 @@ terminal capability database
29744
csh(1),
29745
sh(1),
29746
stty(1),
29747
-setupterm(3),
29748
+setupterm(3X),
29749
tty(4),
29750
-termcap(5),
29751
+terminfo(5),
29752
ttys(5),
29753
environ(7)
29754
.\"#
29755
@@ -270,4 +270,3 @@ environ(7)
29756
.\"# mode:nroff
29757
.\"# fill-column:79
29758
.\"# End:
29759
-
29760
Index: ncurses-5.5/man/wresize.3x
29761
===================================================================
29762
--- ncurses-5.5.orig/man/wresize.3x 2003-10-25 16:41:08.000000000 -0400
29763
+++ ncurses-5.5/man/wresize.3x 2006-04-18 15:48:06.000000000 -0400
29764
@@ -1,5 +1,5 @@
29765
.\"***************************************************************************
29766
-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
29767
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
29768
.\" *
29769
.\" Permission is hereby granted, free of charge, to any person obtaining a *
29770
.\" copy of this software and associated documentation files (the *
29771
@@ -28,13 +28,13 @@
29772
.\"
29773
.\" Author: Thomas E. Dickey 1996
29774
.\"
29775
-.\" $Id: wresize.3x,v 1.8 2003/10/25 20:41:08 tom Exp $
29776
+.\" $Id: wresize.3x,v 1.9 2006/02/25 21:47:06 tom Exp $
29777
.TH wresize 3X ""
29778
.SH NAME
29779
\fBwresize\fR - resize a curses window
29780
.SH SYNOPSIS
29781
\fB#include <curses.h>\fR
29782
-
29783
+.sp
29784
\fBint wresize(WINDOW *win, int lines, int columns);\fR
29785
.SH DESCRIPTION
29786
The \fBwresize\fR function reallocates storage for an \fBncurses\fR
29787
Index: ncurses-5.5/ncurses/base/lib_addstr.c
29788
===================================================================
29789
--- ncurses-5.5.orig/ncurses/base/lib_addstr.c 2004-12-11 19:15:31.000000000 -0500
29790
+++ ncurses-5.5/ncurses/base/lib_addstr.c 2006-04-18 15:48:07.000000000 -0400
29791
@@ -1,5 +1,5 @@
29792
/****************************************************************************
29793
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
29794
+ * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
29795
* *
29796
* Permission is hereby granted, free of charge, to any person obtaining a *
29797
* copy of this software and associated documentation files (the *
29798
@@ -44,7 +44,7 @@
29799
29800
#include <curses.priv.h>
29801
29802
-MODULE_ID("$Id: lib_addstr.c,v 1.43 2004/12/12 00:15:31 tom Exp $")
29803
+MODULE_ID("$Id: lib_addstr.c,v 1.45 2006/03/11 21:50:15 tom Exp $")
29804
29805
NCURSES_EXPORT(int)
29806
waddnstr(WINDOW *win, const char *astr, int n)
29807
@@ -82,6 +82,7 @@ waddchnstr(WINDOW *win, const chtype *as
29808
NCURSES_SIZE_T y = win->_cury;
29809
NCURSES_SIZE_T x = win->_curx;
29810
int code = OK;
29811
+ int i;
29812
struct ldat *line;
29813
29814
T((T_CALLED("waddchnstr(%p,%p,%d)"), win, astr, n));
29815
@@ -101,15 +102,9 @@ waddchnstr(WINDOW *win, const chtype *as
29816
returnCode(code);
29817
29818
line = &(win->_line[y]);
29819
-#if USE_WIDEC_SUPPORT
29820
- {
29821
- int i;
29822
- for (i = 0; i < n; ++i)
29823
- SetChar(line->text[i + x], ChCharOf(astr[i]), ChAttrOf(astr[i]));
29824
+ for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
29825
+ SetChar2(line->text[i + x], astr[i]);
29826
}
29827
-#else
29828
- memcpy(line->text + x, astr, n * sizeof(*astr));
29829
-#endif
29830
CHANGED_RANGE(line, x, x + n - 1);
29831
29832
_nc_synchook(win);
29833
@@ -131,7 +126,7 @@ _nc_wchstrlen(const cchar_t *s)
29834
NCURSES_EXPORT(int)
29835
wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
29836
{
29837
- NCURSES_CH_T blank = NewChar(BLANK_TEXT);
29838
+ static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
29839
NCURSES_SIZE_T y = win->_cury;
29840
NCURSES_SIZE_T x = win->_curx;
29841
int code = OK;
29842
@@ -175,7 +170,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
29843
/*
29844
* Copy the new string to the window.
29845
*/
29846
- for (i = 0; i < n && x <= win->_maxx; ++i) {
29847
+ for (i = 0; i < n && CharOf(astr[i]) != L'\0' && x <= win->_maxx; ++i) {
29848
if (isWidecExt(astr[i]))
29849
continue;
29850
29851
Index: ncurses-5.5/ncurses/base/lib_hline.c
29852
===================================================================
29853
--- ncurses-5.5.orig/ncurses/base/lib_hline.c 2001-06-02 20:39:24.000000000 -0400
29854
+++ ncurses-5.5/ncurses/base/lib_hline.c 2006-04-18 15:48:07.000000000 -0400
29855
@@ -1,5 +1,5 @@
29856
/****************************************************************************
29857
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
29858
+ * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. *
29859
* *
29860
* Permission is hereby granted, free of charge, to any person obtaining a *
29861
* copy of this software and associated documentation files (the *
29862
@@ -40,7 +40,7 @@
29863
29864
#include <curses.priv.h>
29865
29866
-MODULE_ID("$Id: lib_hline.c,v 1.10 2001/06/03 00:39:24 skimo Exp $")
29867
+MODULE_ID("$Id: lib_hline.c,v 1.11 2006/03/11 21:52:27 tom Exp $")
29868
29869
NCURSES_EXPORT(int)
29870
whline(WINDOW *win, chtype ch, int n)
29871
@@ -63,9 +63,9 @@ whline(WINDOW *win, chtype ch, int n)
29872
CHANGED_RANGE(line, start, end);
29873
29874
if (ch == 0)
29875
- SetChar(wch, ChCharOf(ACS_HLINE), ChAttrOf(ACS_HLINE));
29876
+ SetChar2(wch, ACS_HLINE);
29877
else
29878
- SetChar(wch, ChCharOf(ch), ChAttrOf(ch));
29879
+ SetChar2(wch, ch);
29880
wch = _nc_render(win, wch);
29881
29882
while (end >= start) {
29883
Index: ncurses-5.5/ncurses/base/lib_mvwin.c
29884
===================================================================
29885
--- ncurses-5.5.orig/ncurses/base/lib_mvwin.c 2001-12-18 20:06:22.000000000 -0500
29886
+++ ncurses-5.5/ncurses/base/lib_mvwin.c 2006-04-18 15:48:06.000000000 -0400
29887
@@ -1,5 +1,5 @@
29888
/****************************************************************************
29889
- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. *
29890
+ * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. *
29891
* *
29892
* Permission is hereby granted, free of charge, to any person obtaining a *
29893
* copy of this software and associated documentation files (the *
29894
@@ -40,7 +40,7 @@
29895
29896
#include <curses.priv.h>
29897
29898
-MODULE_ID("$Id: lib_mvwin.c,v 1.12 2001/12/19 01:06:22 tom Exp $")
29899
+MODULE_ID("$Id: lib_mvwin.c,v 1.14 2006/02/25 22:53:46 tom Exp $")
29900
29901
NCURSES_EXPORT(int)
29902
mvwin(WINDOW *win, int by, int bx)
29903
@@ -50,6 +50,11 @@ mvwin(WINDOW *win, int by, int bx)
29904
if (!win || (win->_flags & _ISPAD))
29905
returnCode(ERR);
29906
29907
+ /*
29908
+ * mvwin() should only modify the indices. See test/demo_menus.c and
29909
+ * test/movewindow.c for examples.
29910
+ */
29911
+#if 0
29912
/* Copying subwindows is allowed, but it is expensive... */
29913
if (win->_flags & _SUBWIN) {
29914
int err = ERR;
29915
@@ -89,6 +94,7 @@ mvwin(WINDOW *win, int by, int bx)
29916
}
29917
returnCode(err);
29918
}
29919
+#endif
29920
29921
if (by + win->_maxy > screen_lines - 1
29922
|| bx + win->_maxx > screen_columns - 1
29923
Index: ncurses-5.5/ncurses/base/lib_vline.c
29924
===================================================================
29925
--- ncurses-5.5.orig/ncurses/base/lib_vline.c 2001-06-02 20:39:24.000000000 -0400
29926
+++ ncurses-5.5/ncurses/base/lib_vline.c 2006-04-18 15:48:07.000000000 -0400
29927
@@ -1,5 +1,5 @@
29928
/****************************************************************************
29929
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
29930
+ * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. *
29931
* *
29932
* Permission is hereby granted, free of charge, to any person obtaining a *
29933
* copy of this software and associated documentation files (the *
29934
@@ -40,7 +40,7 @@
29935
29936
#include <curses.priv.h>
29937
29938
-MODULE_ID("$Id: lib_vline.c,v 1.9 2001/06/03 00:39:24 skimo Exp $")
29939
+MODULE_ID("$Id: lib_vline.c,v 1.10 2006/03/11 21:52:19 tom Exp $")
29940
29941
NCURSES_EXPORT(int)
29942
wvline(WINDOW *win, chtype ch, int n)
29943
@@ -60,9 +60,9 @@ wvline(WINDOW *win, chtype ch, int n)
29944
end = win->_maxy;
29945
29946
if (ch == 0)
29947
- SetChar(wch, ChCharOf(ACS_VLINE), ChAttrOf(ACS_VLINE));
29948
+ SetChar2(wch, ACS_VLINE);
29949
else
29950
- SetChar(wch, ChCharOf(ch), ChAttrOf(ch));
29951
+ SetChar2(wch, ch);
29952
wch = _nc_render(win, wch);
29953
29954
while (end >= row) {
29955
Index: ncurses-5.5/ncurses/tinfo/lib_options.c
29956
===================================================================
29957
--- ncurses-5.5.orig/ncurses/tinfo/lib_options.c 2005-01-22 16:13:34.000000000 -0500
29958
+++ ncurses-5.5/ncurses/tinfo/lib_options.c 2006-04-18 15:48:07.000000000 -0400
29959
@@ -1,5 +1,5 @@
29960
/****************************************************************************
29961
- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. *
29962
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
29963
* *
29964
* Permission is hereby granted, free of charge, to any person obtaining a *
29965
* copy of this software and associated documentation files (the *
29966
@@ -43,7 +43,7 @@
29967
29968
#include <term.h>
29969
29970
-MODULE_ID("$Id: lib_options.c,v 1.48 2005/01/22 21:13:34 tom Exp $")
29971
+MODULE_ID("$Id: lib_options.c,v 1.49 2006/03/04 19:28:25 tom Exp $")
29972
29973
NCURSES_EXPORT(int)
29974
idlok(WINDOW *win, bool flag)
29975
@@ -99,7 +99,7 @@ nodelay(WINDOW *win, bool flag)
29976
NCURSES_EXPORT(int)
29977
notimeout(WINDOW *win, bool f)
29978
{
29979
- T((T_CALLED("notimout(%p,%d)"), win, f));
29980
+ T((T_CALLED("notimeout(%p,%d)"), win, f));
29981
29982
if (win) {
29983
win->_notimeout = f;
29984
Index: ncurses-5.5/ncurses/tinfo/write_entry.c
29985
===================================================================
29986
--- ncurses-5.5.orig/ncurses/tinfo/write_entry.c 2002-04-21 16:35:08.000000000 -0400
29987
+++ ncurses-5.5/ncurses/tinfo/write_entry.c 2006-04-18 15:48:07.000000000 -0400
29988
@@ -1,5 +1,5 @@
29989
/****************************************************************************
29990
- * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc. *
29991
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
29992
* *
29993
* Permission is hereby granted, free of charge, to any person obtaining a *
29994
* copy of this software and associated documentation files (the *
29995
@@ -52,14 +52,14 @@
29996
#define TRACE_OUT(p) /*nothing */
29997
#endif
29998
29999
-MODULE_ID("$Id: write_entry.c,v 1.58 2002/04/21 20:35:08 tom Exp $")
30000
+MODULE_ID("$Id: write_entry.c,v 1.59 2006/04/08 21:04:56 tom Exp $")
30001
30002
static int total_written;
30003
30004
static int write_object(FILE *, TERMTYPE *);
30005
30006
static void
30007
-write_file(char *filename, TERMTYPE * tp)
30008
+write_file(char *filename, TERMTYPE *tp)
30009
{
30010
FILE *fp = (_nc_access(filename, W_OK) == 0) ? fopen(filename, "wb") : 0;
30011
if (fp == 0) {
30012
@@ -204,7 +204,7 @@ check_writeable(int code)
30013
*/
30014
30015
void
30016
-_nc_write_entry(TERMTYPE * const tp)
30017
+_nc_write_entry(TERMTYPE *const tp)
30018
{
30019
struct stat statbuf;
30020
char name_list[MAX_TERMINFO_LENGTH];
30021
@@ -404,8 +404,66 @@ convert_shorts(unsigned char *buf, short
30022
#define even_boundary(value) \
30023
((value) % 2 != 0 && fwrite(&zero, sizeof(char), 1, fp) != 1)
30024
30025
+#if NCURSES_XNAMES
30026
+static unsigned
30027
+extended_Booleans(TERMTYPE *tp)
30028
+{
30029
+ unsigned short result = 0;
30030
+ unsigned short i;
30031
+
30032
+ for (i = 0; i < tp->ext_Booleans; ++i) {
30033
+ if (tp->Booleans[BOOLCOUNT + i] == TRUE)
30034
+ result = (i + 1);
30035
+ }
30036
+ return result;
30037
+}
30038
+
30039
+static unsigned
30040
+extended_Numbers(TERMTYPE *tp)
30041
+{
30042
+ unsigned short result = 0;
30043
+ unsigned short i;
30044
+
30045
+ for (i = 0; i < tp->ext_Numbers; ++i) {
30046
+ if (tp->Numbers[NUMCOUNT + i] != ABSENT_NUMERIC)
30047
+ result = (i + 1);
30048
+ }
30049
+ return result;
30050
+}
30051
+
30052
+static unsigned
30053
+extended_Strings(TERMTYPE *tp)
30054
+{
30055
+ unsigned short result = 0;
30056
+ unsigned short i;
30057
+
30058
+ for (i = 0; i < tp->ext_Strings; ++i) {
30059
+ if (tp->Strings[STRCOUNT + i] != ABSENT_STRING)
30060
+ result = (i + 1);
30061
+ }
30062
+ return result;
30063
+}
30064
+
30065
+/*
30066
+ * _nc_align_termtype() will extend entries that are referenced in a use=
30067
+ * clause - discard the unneeded data.
30068
+ */
30069
+static bool
30070
+extended_object(TERMTYPE *tp)
30071
+{
30072
+ bool result = FALSE;
30073
+
30074
+ if (_nc_user_definable) {
30075
+ result = ((extended_Booleans(tp)
30076
+ + extended_Numbers(tp)
30077
+ + extended_Strings(tp)) != 0);
30078
+ }
30079
+ return result;
30080
+}
30081
+#endif
30082
+
30083
static int
30084
-write_object(FILE * fp, TERMTYPE * tp)
30085
+write_object(FILE *fp, TERMTYPE *tp)
30086
{
30087
char *namelist;
30088
size_t namelen, boolmax, nummax, strmax;
30089
@@ -503,7 +561,7 @@ write_object(FILE * fp, TERMTYPE * tp)
30090
return (ERR);
30091
30092
#if NCURSES_XNAMES
30093
- if (NUM_EXT_NAMES(tp)) {
30094
+ if (extended_object(tp)) {
30095
unsigned extcnt = NUM_EXT_NAMES(tp);
30096
30097
if (even_boundary(nextfree))
30098
Index: ncurses-5.5/progs/dump_entry.h
30099
===================================================================
30100
--- ncurses-5.5.orig/progs/dump_entry.h 2004-12-04 10:37:17.000000000 -0500
30101
+++ ncurses-5.5/progs/dump_entry.h 2006-04-18 15:48:07.000000000 -0400
30102
@@ -34,7 +34,7 @@
30103
30104
30105
/*
30106
- * $Id: dump_entry.h,v 1.27 2004/12/04 15:37:17 tom Exp $
30107
+ * $Id: dump_entry.h,v 1.28 2006/04/15 22:43:02 tom Exp $
30108
*
30109
* Dump control definitions and variables
30110
*/
30111
@@ -69,7 +69,7 @@ typedef int (*PredFunc)(PredType, PredId
30112
extern NCURSES_CONST char *nametrans(const char *);
30113
extern void dump_init(const char *, int, int, int, int, bool);
30114
extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int);
30115
-extern int dump_entry(TERMTYPE *, bool, bool, int, int, PredFunc);
30116
+extern int dump_entry(TERMTYPE *, bool, bool, int, PredFunc);
30117
extern int dump_uses(const char *, bool);
30118
extern void compare_entry(void (*)(PredType, PredIdx, const char *), TERMTYPE *, bool);
30119
extern void repair_acsc(TERMTYPE * tp);
30120
Index: ncurses-5.5/progs/infocmp.c
30121
===================================================================
30122
--- ncurses-5.5.orig/progs/infocmp.c 2005-09-24 20:39:43.000000000 -0400
30123
+++ ncurses-5.5/progs/infocmp.c 2006-04-18 15:48:07.000000000 -0400
30124
@@ -1,5 +1,5 @@
30125
/****************************************************************************
30126
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
30127
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30128
* *
30129
* Permission is hereby granted, free of charge, to any person obtaining a *
30130
* copy of this software and associated documentation files (the *
30131
@@ -41,7 +41,7 @@
30132
30133
#include <dump_entry.h>
30134
30135
-MODULE_ID("$Id: infocmp.c,v 1.79 2005/09/25 00:39:43 tom Exp $")
30136
+MODULE_ID("$Id: infocmp.c,v 1.82 2006/04/15 22:45:44 tom Exp $")
30137
30138
#define L_CURL "{"
30139
#define R_CURL "}"
30140
@@ -555,12 +555,52 @@ skip_csi(const char *cap)
30141
return result;
30142
}
30143
30144
+static bool
30145
+same_param(const char *table, const char *param, unsigned length)
30146
+{
30147
+ bool result = FALSE;
30148
+ if (strncmp(table, param, length) == 0) {
30149
+ result = !isdigit(UChar(param[length]));
30150
+ }
30151
+ return result;
30152
+}
30153
+
30154
+static char *
30155
+lookup_params(const assoc * table, char *dst, char *src)
30156
+{
30157
+ const char *ep = strtok(src, ";");
30158
+ const assoc *ap;
30159
+
30160
+ do {
30161
+ bool found = FALSE;
30162
+
30163
+ for (ap = table; ap->from; ap++) {
30164
+ size_t tlen = strlen(ap->from);
30165
+
30166
+ if (same_param(ap->from, ep, tlen)) {
30167
+ (void) strcat(dst, ap->to);
30168
+ found = TRUE;
30169
+ break;
30170
+ }
30171
+ }
30172
+
30173
+ if (!found)
30174
+ (void) strcat(dst, ep);
30175
+ (void) strcat(dst, ";");
30176
+ } while
30177
+ ((ep = strtok((char *) 0, ";")));
30178
+
30179
+ dst[strlen(dst) - 1] = '\0';
30180
+
30181
+ return dst;
30182
+}
30183
+
30184
static void
30185
analyze_string(const char *name, const char *cap, TERMTYPE *tp)
30186
{
30187
char buf[MAX_TERMINFO_LENGTH];
30188
char buf2[MAX_TERMINFO_LENGTH];
30189
- const char *sp, *ep;
30190
+ const char *sp;
30191
const assoc *ap;
30192
int tp_lines = tp->Numbers[2];
30193
30194
@@ -573,7 +613,9 @@ analyze_string(const char *name, const c
30195
int i;
30196
int csi;
30197
size_t len = 0;
30198
+ size_t next;
30199
const char *expansion = 0;
30200
+ char buf3[MAX_TERMINFO_LENGTH];
30201
30202
/* first, check other capabilities in this entry */
30203
for (i = 0; i < STRCOUNT; i++) {
30204
@@ -617,6 +659,8 @@ analyze_string(const char *name, const c
30205
size_t adj = csi ? 2 : 0;
30206
30207
len = strlen(ap->from);
30208
+ if (csi && skip_csi(ap->from) != csi)
30209
+ continue;
30210
if (len > adj
30211
&& strncmp(ap->from + adj, sp + csi, len - adj) == 0) {
30212
expansion = ap->to;
30213
@@ -631,35 +675,15 @@ analyze_string(const char *name, const c
30214
if (!expansion
30215
&& (csi = skip_csi(sp)) != 0
30216
&& (len = strspn(sp + csi, "0123456789;"))
30217
- && ((sp[csi + len] == 'h') || (sp[csi + len] == 'l'))) {
30218
- char buf3[MAX_TERMINFO_LENGTH];
30219
+ && (next = csi + len)
30220
+ && ((sp[next] == 'h') || (sp[next] == 'l'))) {
30221
30222
- (void) strcpy(buf2, (sp[csi + len] == 'h') ? "ECMA+" : "ECMA-");
30223
+ (void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-");
30224
(void) strncpy(buf3, sp + csi, len);
30225
- len += csi + 1;
30226
buf3[len] = '\0';
30227
+ len += csi + 1;
30228
30229
- ep = strtok(buf3, ";");
30230
- do {
30231
- bool found = FALSE;
30232
-
30233
- for (ap = std_modes; ap->from; ap++) {
30234
- size_t tlen = strlen(ap->from);
30235
-
30236
- if (strncmp(ap->from, ep, tlen) == 0) {
30237
- (void) strcat(buf2, ap->to);
30238
- found = TRUE;
30239
- break;
30240
- }
30241
- }
30242
-
30243
- if (!found)
30244
- (void) strcat(buf2, ep);
30245
- (void) strcat(buf2, ";");
30246
- } while
30247
- ((ep = strtok((char *) 0, ";")));
30248
- buf2[strlen(buf2) - 1] = '\0';
30249
- expansion = buf2;
30250
+ expansion = lookup_params(std_modes, buf2, buf3);
30251
}
30252
30253
/* now check for private-mode sequences */
30254
@@ -667,71 +691,30 @@ analyze_string(const char *name, const c
30255
&& (csi = skip_csi(sp)) != 0
30256
&& sp[csi] == '?'
30257
&& (len = strspn(sp + csi + 1, "0123456789;"))
30258
- && ((sp[csi + 1 + len] == 'h') || (sp[csi + 1 + len] == 'l'))) {
30259
- char buf3[MAX_TERMINFO_LENGTH];
30260
+ && (next = csi + 1 + len)
30261
+ && ((sp[next] == 'h') || (sp[next] == 'l'))) {
30262
30263
- (void) strcpy(buf2, (sp[csi + 1 + len] == 'h') ? "DEC+" : "DEC-");
30264
+ (void) strcpy(buf2, (sp[next] == 'h') ? "DEC+" : "DEC-");
30265
(void) strncpy(buf3, sp + csi + 1, len);
30266
- len += csi + 2;
30267
buf3[len] = '\0';
30268
+ len += csi + 2;
30269
30270
- ep = strtok(buf3, ";");
30271
- do {
30272
- bool found = FALSE;
30273
-
30274
- for (ap = private_modes; ap->from; ap++) {
30275
- size_t tlen = strlen(ap->from);
30276
-
30277
- if (strncmp(ap->from, ep, tlen) == 0) {
30278
- (void) strcat(buf2, ap->to);
30279
- found = TRUE;
30280
- break;
30281
- }
30282
- }
30283
-
30284
- if (!found)
30285
- (void) strcat(buf2, ep);
30286
- (void) strcat(buf2, ";");
30287
- } while
30288
- ((ep = strtok((char *) 0, ";")));
30289
- buf2[strlen(buf2) - 1] = '\0';
30290
- expansion = buf2;
30291
+ expansion = lookup_params(private_modes, buf2, buf3);
30292
}
30293
30294
/* now check for ECMA highlight sequences */
30295
if (!expansion
30296
&& (csi = skip_csi(sp)) != 0
30297
&& (len = strspn(sp + csi, "0123456789;")) != 0
30298
- && sp[csi + len] == 'm') {
30299
- char buf3[MAX_TERMINFO_LENGTH];
30300
+ && (next = csi + len)
30301
+ && sp[next] == 'm') {
30302
30303
(void) strcpy(buf2, "SGR:");
30304
(void) strncpy(buf3, sp + csi, len);
30305
- len += csi + 1;
30306
buf3[len] = '\0';
30307
+ len += csi + 1;
30308
30309
- ep = strtok(buf3, ";");
30310
- do {
30311
- bool found = FALSE;
30312
-
30313
- for (ap = ecma_highlights; ap->from; ap++) {
30314
- size_t tlen = strlen(ap->from);
30315
-
30316
- if (strncmp(ap->from, ep, tlen) == 0) {
30317
- (void) strcat(buf2, ap->to);
30318
- found = TRUE;
30319
- break;
30320
- }
30321
- }
30322
-
30323
- if (!found)
30324
- (void) strcat(buf2, ep);
30325
- (void) strcat(buf2, ";");
30326
- } while
30327
- ((ep = strtok((char *) 0, ";")));
30328
-
30329
- buf2[strlen(buf2) - 1] = '\0';
30330
- expansion = buf2;
30331
+ expansion = lookup_params(ecma_highlights, buf2, buf3);
30332
}
30333
30334
if (!expansion
30335
@@ -1562,7 +1545,6 @@ main(int argc, char *argv[])
30336
len = dump_entry(&entries[0].tterm,
30337
suppress_untranslatable,
30338
limited,
30339
- 0,
30340
numbers,
30341
NULL);
30342
putchar('\n');
30343
@@ -1599,7 +1581,6 @@ main(int argc, char *argv[])
30344
len = dump_entry(&entries[0].tterm,
30345
suppress_untranslatable,
30346
limited,
30347
- 0,
30348
numbers,
30349
use_predicate);
30350
for (i = 1; i < termcount; i++)
30351
Index: ncurses-5.5/progs/tic.c
30352
===================================================================
30353
--- ncurses-5.5.orig/progs/tic.c 2005-09-24 20:39:43.000000000 -0400
30354
+++ ncurses-5.5/progs/tic.c 2006-04-18 15:48:07.000000000 -0400
30355
@@ -1,5 +1,5 @@
30356
/****************************************************************************
30357
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
30358
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30359
* *
30360
* Permission is hereby granted, free of charge, to any person obtaining a *
30361
* copy of this software and associated documentation files (the *
30362
@@ -44,7 +44,7 @@
30363
#include <dump_entry.h>
30364
#include <transform.h>
30365
30366
-MODULE_ID("$Id: tic.c,v 1.125 2005/09/25 00:39:43 tom Exp $")
30367
+MODULE_ID("$Id: tic.c,v 1.128 2006/04/15 22:43:02 tom Exp $")
30368
30369
const char *_nc_progname = "tic";
30370
30371
@@ -731,7 +731,7 @@ main(int argc, char *argv[])
30372
_nc_set_type(_nc_first_name(qp->tterm.term_names));
30373
30374
(void) fseek(tmp_fp, qp->cstart, SEEK_SET);
30375
- while (j--) {
30376
+ while (j-- > 0) {
30377
if (infodump)
30378
(void) putchar(fgetc(tmp_fp));
30379
else
30380
@@ -739,7 +739,7 @@ main(int argc, char *argv[])
30381
}
30382
30383
len = dump_entry(&qp->tterm, suppress_untranslatable,
30384
- limited, 0, numbers, NULL);
30385
+ limited, numbers, NULL);
30386
for (j = 0; j < qp->nuses; j++)
30387
len += dump_uses(qp->uses[j].name, !capdump);
30388
(void) putchar('\n');
30389
@@ -1317,7 +1317,7 @@ check_sgr(TERMTYPE *tp, char *zero, int
30390
static void
30391
show_where(unsigned level)
30392
{
30393
- if (_nc_tracing >= level) {
30394
+ if (_nc_tracing >= DEBUG_LEVEL(level)) {
30395
char my_name[256];
30396
_nc_get_type(my_name);
30397
fprintf(stderr, "\"%s\", line %d, '%s' ",
30398
@@ -1327,7 +1327,7 @@ show_where(unsigned level)
30399
}
30400
30401
#else
30402
-#define show_where(level) /* nothing */
30403
+#define show_where(level) /* nothing */
30404
#endif
30405
30406
/* other sanity-checks (things that we don't want in the normal
30407
Index: ncurses-5.5/progs/tput.c
30408
===================================================================
30409
--- ncurses-5.5.orig/progs/tput.c 2005-04-03 10:25:32.000000000 -0400
30410
+++ ncurses-5.5/progs/tput.c 2006-04-18 15:48:07.000000000 -0400
30411
@@ -1,5 +1,5 @@
30412
/****************************************************************************
30413
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
30414
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30415
* *
30416
* Permission is hereby granted, free of charge, to any person obtaining a *
30417
* copy of this software and associated documentation files (the *
30418
@@ -45,7 +45,7 @@
30419
#endif
30420
#include <transform.h>
30421
30422
-MODULE_ID("$Id: tput.c,v 1.35 2005/04/03 14:25:32 tom Exp $")
30423
+MODULE_ID("$Id: tput.c,v 1.36 2006/04/01 22:12:01 tom Exp $")
30424
30425
#define PUTS(s) fputs(s, stdout)
30426
#define PUTCHAR(c) putchar(c)
30427
@@ -251,8 +251,8 @@ tput(int argc, char *argv[])
30428
30429
if (is_reset && reset_3string != 0) {
30430
PUTS(reset_3string);
30431
- } else if (init_2string != 0) {
30432
- PUTS(init_2string);
30433
+ } else if (init_3string != 0) {
30434
+ PUTS(init_3string);
30435
}
30436
FLUSH;
30437
return 0;
30438
Index: ncurses-5.5/test/background.c
30439
===================================================================
30440
--- ncurses-5.5.orig/test/background.c 2003-12-06 19:06:33.000000000 -0500
30441
+++ ncurses-5.5/test/background.c 2006-04-18 15:48:07.000000000 -0400
30442
@@ -1,5 +1,32 @@
30443
+/****************************************************************************
30444
+ * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
30445
+ * *
30446
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30447
+ * copy of this software and associated documentation files (the *
30448
+ * "Software"), to deal in the Software without restriction, including *
30449
+ * without limitation the rights to use, copy, modify, merge, publish, *
30450
+ * distribute, distribute with modifications, sublicense, and/or sell *
30451
+ * copies of the Software, and to permit persons to whom the Software is *
30452
+ * furnished to do so, subject to the following conditions: *
30453
+ * *
30454
+ * The above copyright notice and this permission notice shall be included *
30455
+ * in all copies or substantial portions of the Software. *
30456
+ * *
30457
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30458
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30459
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30460
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30461
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30462
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30463
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30464
+ * *
30465
+ * Except as contained in this notice, the name(s) of the above copyright *
30466
+ * holders shall not be used in advertising or otherwise to promote the *
30467
+ * sale, use or other dealings in this Software without prior written *
30468
+ * authorization. *
30469
+ ****************************************************************************/
30470
/*
30471
- * $Id: background.c,v 1.1 2003/12/07 00:06:33 tom Exp $
30472
+ * $Id: background.c,v 1.2 2006/04/01 19:08:03 tom Exp $
30473
*/
30474
30475
#include <test.priv.h>
30476
Index: ncurses-5.5/test/color_set.c
30477
===================================================================
30478
--- ncurses-5.5.orig/test/color_set.c 2004-04-10 16:10:28.000000000 -0400
30479
+++ ncurses-5.5/test/color_set.c 2006-04-18 15:48:07.000000000 -0400
30480
@@ -1,5 +1,32 @@
30481
+/****************************************************************************
30482
+ * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
30483
+ * *
30484
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30485
+ * copy of this software and associated documentation files (the *
30486
+ * "Software"), to deal in the Software without restriction, including *
30487
+ * without limitation the rights to use, copy, modify, merge, publish, *
30488
+ * distribute, distribute with modifications, sublicense, and/or sell *
30489
+ * copies of the Software, and to permit persons to whom the Software is *
30490
+ * furnished to do so, subject to the following conditions: *
30491
+ * *
30492
+ * The above copyright notice and this permission notice shall be included *
30493
+ * in all copies or substantial portions of the Software. *
30494
+ * *
30495
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30496
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30497
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30498
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30499
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30500
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30501
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30502
+ * *
30503
+ * Except as contained in this notice, the name(s) of the above copyright *
30504
+ * holders shall not be used in advertising or otherwise to promote the *
30505
+ * sale, use or other dealings in this Software without prior written *
30506
+ * authorization. *
30507
+ ****************************************************************************/
30508
/*
30509
- * $Id: color_set.c,v 1.3 2004/04/10 20:10:28 tom Exp $
30510
+ * $Id: color_set.c,v 1.4 2006/04/01 19:08:03 tom Exp $
30511
*/
30512
30513
#include <test.priv.h>
30514
Index: ncurses-5.5/test/demo_keyok.c
30515
===================================================================
30516
--- ncurses-5.5.orig/test/demo_keyok.c 2003-05-17 19:18:34.000000000 -0400
30517
+++ ncurses-5.5/test/demo_keyok.c 2006-04-18 15:48:07.000000000 -0400
30518
@@ -1,5 +1,32 @@
30519
+/****************************************************************************
30520
+ * Copyright (c) 2002-2003,2006 Free Software Foundation, Inc. *
30521
+ * *
30522
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30523
+ * copy of this software and associated documentation files (the *
30524
+ * "Software"), to deal in the Software without restriction, including *
30525
+ * without limitation the rights to use, copy, modify, merge, publish, *
30526
+ * distribute, distribute with modifications, sublicense, and/or sell *
30527
+ * copies of the Software, and to permit persons to whom the Software is *
30528
+ * furnished to do so, subject to the following conditions: *
30529
+ * *
30530
+ * The above copyright notice and this permission notice shall be included *
30531
+ * in all copies or substantial portions of the Software. *
30532
+ * *
30533
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30534
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30535
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30536
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30537
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30538
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30539
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30540
+ * *
30541
+ * Except as contained in this notice, the name(s) of the above copyright *
30542
+ * holders shall not be used in advertising or otherwise to promote the *
30543
+ * sale, use or other dealings in this Software without prior written *
30544
+ * authorization. *
30545
+ ****************************************************************************/
30546
/*
30547
- * $Id: demo_keyok.c,v 1.3 2003/05/17 23:18:34 tom Exp $
30548
+ * $Id: demo_keyok.c,v 1.4 2006/04/01 19:08:03 tom Exp $
30549
*
30550
* Demonstrate the keyok() function.
30551
* Thomas Dickey - 2002/11/23
30552
Index: ncurses-5.5/test/demo_menus.c
30553
===================================================================
30554
--- ncurses-5.5.orig/test/demo_menus.c 2005-10-01 11:54:31.000000000 -0400
30555
+++ ncurses-5.5/test/demo_menus.c 2006-04-29 10:41:13.000000000 -0400
30556
@@ -1,5 +1,32 @@
30557
+/****************************************************************************
30558
+ * Copyright (c) 2005,2006 Free Software Foundation, Inc. *
30559
+ * *
30560
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30561
+ * copy of this software and associated documentation files (the *
30562
+ * "Software"), to deal in the Software without restriction, including *
30563
+ * without limitation the rights to use, copy, modify, merge, publish, *
30564
+ * distribute, distribute with modifications, sublicense, and/or sell *
30565
+ * copies of the Software, and to permit persons to whom the Software is *
30566
+ * furnished to do so, subject to the following conditions: *
30567
+ * *
30568
+ * The above copyright notice and this permission notice shall be included *
30569
+ * in all copies or substantial portions of the Software. *
30570
+ * *
30571
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30572
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30573
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30574
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30575
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30576
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30577
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30578
+ * *
30579
+ * Except as contained in this notice, the name(s) of the above copyright *
30580
+ * holders shall not be used in advertising or otherwise to promote the *
30581
+ * sale, use or other dealings in this Software without prior written *
30582
+ * authorization. *
30583
+ ****************************************************************************/
30584
/*
30585
- * $Id: demo_menus.c,v 1.13 2005/10/01 15:54:31 tom Exp $
30586
+ * $Id: demo_menus.c,v 1.17 2006/04/21 16:35:24 tom Exp $
30587
*
30588
* Demonstrate a variety of functions from the menu library.
30589
* Thomas Dickey - 2005/4/9
30590
@@ -18,10 +45,8 @@ menu_fore -
30591
menu_format -
30592
menu_grey -
30593
menu_init -
30594
-menu_mark -
30595
menu_opts -
30596
menu_pad -
30597
-menu_pattern -
30598
menu_request_by_name -
30599
menu_request_name -
30600
menu_sub -
30601
@@ -65,14 +90,17 @@ static MENU *mpTrace;
30602
#endif
30603
30604
typedef enum {
30605
- eUnknown = -1
30606
- ,eFile = 0
30607
+ eBanner = -1
30608
+ ,eFile
30609
,eSelect
30610
#ifdef TRACE
30611
,eTrace
30612
#endif
30613
+ ,eMAX
30614
} MenuNo;
30615
30616
+#define okMenuNo(n) (((n) > eBanner) && ((n) < eMAX))
30617
+
30618
#define MENU_Y 1
30619
30620
static MENU *mpBanner;
30621
@@ -162,7 +190,7 @@ menu_offset(MenuNo number)
30622
{
30623
int result = 0;
30624
30625
- if ((int) number >= 0) {
30626
+ if (okMenuNo(number)) {
30627
int spc_desc, spc_rows, spc_cols;
30628
30629
#ifdef NCURSES_VERSION
30630
@@ -172,7 +200,7 @@ menu_offset(MenuNo number)
30631
#endif
30632
30633
/* FIXME: MENU.itemlen seems the only way to get actual width of items */
30634
- result = number * (mpBanner->itemlen + spc_rows);
30635
+ result = (number - (eBanner + 1)) * (mpBanner->itemlen + spc_rows);
30636
}
30637
return result;
30638
}
30639
@@ -183,7 +211,7 @@ menu_create(ITEM ** items, int count, in
30640
MENU *result;
30641
WINDOW *menuwin;
30642
int mrows, mcols;
30643
- int y = ((int) number >= 0) ? MENU_Y : 0;
30644
+ int y = okMenuNo(number) ? MENU_Y : 0;
30645
int x = menu_offset(number);
30646
int margin = (y == MENU_Y) ? 1 : 0;
30647
int maxcol = (ncols + x) < COLS ? ncols : (COLS - x - 1);
30648
@@ -232,6 +260,7 @@ menu_destroy(MENU * m)
30649
int count;
30650
30651
if (m != 0) {
30652
+ delwin(menu_sub(m));
30653
delwin(menu_win(m));
30654
30655
ip = menu_items(m);
30656
@@ -510,7 +539,7 @@ perform_trace_menu(int cmd)
30657
static int
30658
menu_number(void)
30659
{
30660
- return item_index(current_item(mpBanner));
30661
+ return item_index(current_item(mpBanner)) - (eBanner + 1);
30662
}
30663
30664
static MENU *
30665
@@ -558,7 +587,7 @@ build_menus(char *filename)
30666
*ip++ = new_item(*ap, "");
30667
*ip = (ITEM *) 0;
30668
30669
- mpBanner = menu_create(items, SIZEOF(labels) - 1, SIZEOF(labels) - 1, eUnknown);
30670
+ mpBanner = menu_create(items, SIZEOF(labels) - 1, SIZEOF(labels) - 1, eBanner);
30671
set_menu_mark(mpBanner, ">");
30672
30673
build_file_menu(eFile);
30674
@@ -568,12 +597,79 @@ build_menus(char *filename)
30675
#endif
30676
}
30677
30678
+static int
30679
+move_menu(MENU * menu, MENU * current, int by_y, int by_x)
30680
+{
30681
+ WINDOW *top_win = menu_win(menu);
30682
+ WINDOW *sub_win = menu_sub(menu);
30683
+ int y0, x0;
30684
+ int y1, x1;
30685
+ int result;
30686
+
30687
+ getbegyx(top_win, y0, x0);
30688
+ y0 += by_y;
30689
+ x0 += by_x;
30690
+
30691
+ getbegyx(sub_win, y1, x1);
30692
+ y1 += by_y;
30693
+ x1 += by_x;
30694
+
30695
+ if ((result = mvwin(top_win, y0, x0)) != ERR) {
30696
+#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH < 20060218)
30697
+ sub_win->_begy = y1;
30698
+ sub_win->_begx = x1;
30699
+#else
30700
+ mvwin(sub_win, y1, x1);
30701
+#endif
30702
+ if (menu == current) {
30703
+ touchwin(top_win);
30704
+ wnoutrefresh(top_win);
30705
+ }
30706
+ } else {
30707
+ beep();
30708
+ }
30709
+ return result;
30710
+}
30711
+
30712
+/*
30713
+ * Move the menus around on the screen, to test mvwin().
30714
+ */
30715
+static void
30716
+move_menus(MENU * current, int by_y, int by_x)
30717
+{
30718
+ if (move_menu(mpBanner, current, by_y, by_x) != ERR) {
30719
+ erase();
30720
+ wnoutrefresh(stdscr);
30721
+ move_menu(mpFile, current, by_y, by_x);
30722
+ move_menu(mpSelect, current, by_y, by_x);
30723
+#ifdef TRACE
30724
+ move_menu(mpTrace, current, by_y, by_x);
30725
+#endif
30726
+ doupdate();
30727
+ }
30728
+}
30729
+
30730
+static void
30731
+show_status(int ch, MENU * menu)
30732
+{
30733
+ move(LINES - 1, 0);
30734
+ printw("key %s, menu %d, mark %s, match %s",
30735
+ keyname(ch),
30736
+ menu_number(),
30737
+ menu_mark(menu),
30738
+ menu_pattern(menu));
30739
+ clrtoeol();
30740
+ refresh();
30741
+}
30742
+
30743
static void
30744
perform_menus(void)
30745
{
30746
MENU *this_menu;
30747
MENU *last_menu = mpFile;
30748
- int code = E_UNKNOWN_COMMAND, cmd, ch;
30749
+ int code = E_UNKNOWN_COMMAND;
30750
+ int cmd;
30751
+ int ch = ERR;
30752
30753
#ifdef NCURSES_MOUSE_VERSION
30754
mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
30755
@@ -582,7 +678,30 @@ perform_menus(void)
30756
menu_display(last_menu);
30757
30758
for (;;) {
30759
+
30760
+ if (ch != ERR)
30761
+ show_status(ch, last_menu);
30762
+
30763
ch = menu_getc(mpBanner);
30764
+
30765
+ /*
30766
+ * Provide for moving the menu around in the screen using shifted
30767
+ * cursor keys.
30768
+ */
30769
+ switch (ch) {
30770
+ case KEY_SF:
30771
+ move_menus(last_menu, 1, 0);
30772
+ continue;
30773
+ case KEY_SR:
30774
+ move_menus(last_menu, -1, 0);
30775
+ continue;
30776
+ case KEY_SLEFT:
30777
+ move_menus(last_menu, 0, -1);
30778
+ continue;
30779
+ case KEY_SRIGHT:
30780
+ move_menus(last_menu, 0, 1);
30781
+ continue;
30782
+ }
30783
cmd = menu_virtualize(ch);
30784
30785
switch (cmd) {
30786
Index: ncurses-5.5/test/demo_panels.c
30787
===================================================================
30788
--- ncurses-5.5.orig/test/demo_panels.c 2003-04-26 18:11:23.000000000 -0400
30789
+++ ncurses-5.5/test/demo_panels.c 2006-04-18 15:48:07.000000000 -0400
30790
@@ -1,5 +1,32 @@
30791
+/****************************************************************************
30792
+ * Copyright (c) 2003,2006 Free Software Foundation, Inc. *
30793
+ * *
30794
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30795
+ * copy of this software and associated documentation files (the *
30796
+ * "Software"), to deal in the Software without restriction, including *
30797
+ * without limitation the rights to use, copy, modify, merge, publish, *
30798
+ * distribute, distribute with modifications, sublicense, and/or sell *
30799
+ * copies of the Software, and to permit persons to whom the Software is *
30800
+ * furnished to do so, subject to the following conditions: *
30801
+ * *
30802
+ * The above copyright notice and this permission notice shall be included *
30803
+ * in all copies or substantial portions of the Software. *
30804
+ * *
30805
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30806
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30807
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30808
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30809
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30810
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30811
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30812
+ * *
30813
+ * Except as contained in this notice, the name(s) of the above copyright *
30814
+ * holders shall not be used in advertising or otherwise to promote the *
30815
+ * sale, use or other dealings in this Software without prior written *
30816
+ * authorization. *
30817
+ ****************************************************************************/
30818
/*
30819
- * $Id: demo_panels.c,v 1.1 2003/04/26 22:11:23 tom Exp $
30820
+ * $Id: demo_panels.c,v 1.2 2006/04/01 19:08:03 tom Exp $
30821
*
30822
* Demonstrate a variety of functions from the panel library.
30823
* Thomas Dickey - 2003/4/26
30824
Index: ncurses-5.5/test/edit_field.c
30825
===================================================================
30826
--- ncurses-5.5.orig/test/edit_field.c 2005-10-01 12:21:55.000000000 -0400
30827
+++ ncurses-5.5/test/edit_field.c 2006-04-18 15:48:07.000000000 -0400
30828
@@ -1,5 +1,32 @@
30829
+/****************************************************************************
30830
+ * Copyright (c) 2003-2005,2006 Free Software Foundation, Inc. *
30831
+ * *
30832
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30833
+ * copy of this software and associated documentation files (the *
30834
+ * "Software"), to deal in the Software without restriction, including *
30835
+ * without limitation the rights to use, copy, modify, merge, publish, *
30836
+ * distribute, distribute with modifications, sublicense, and/or sell *
30837
+ * copies of the Software, and to permit persons to whom the Software is *
30838
+ * furnished to do so, subject to the following conditions: *
30839
+ * *
30840
+ * The above copyright notice and this permission notice shall be included *
30841
+ * in all copies or substantial portions of the Software. *
30842
+ * *
30843
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30844
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30845
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30846
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30847
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30848
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30849
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30850
+ * *
30851
+ * Except as contained in this notice, the name(s) of the above copyright *
30852
+ * holders shall not be used in advertising or otherwise to promote the *
30853
+ * sale, use or other dealings in this Software without prior written *
30854
+ * authorization. *
30855
+ ****************************************************************************/
30856
/*
30857
- * $Id: edit_field.c,v 1.11 2005/10/01 16:21:55 tom Exp $
30858
+ * $Id: edit_field.c,v 1.12 2006/04/01 19:08:03 tom Exp $
30859
*
30860
* A wrapper for form_driver() which keeps track of the user's editing changes
30861
* for each field, and makes the result available as a null-terminated string
30862
Index: ncurses-5.5/test/firework.c
30863
===================================================================
30864
--- ncurses-5.5.orig/test/firework.c 2005-05-28 17:39:04.000000000 -0400
30865
+++ ncurses-5.5/test/firework.c 2006-04-29 10:41:13.000000000 -0400
30866
@@ -1,5 +1,32 @@
30867
+/****************************************************************************
30868
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30869
+ * *
30870
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30871
+ * copy of this software and associated documentation files (the *
30872
+ * "Software"), to deal in the Software without restriction, including *
30873
+ * without limitation the rights to use, copy, modify, merge, publish, *
30874
+ * distribute, distribute with modifications, sublicense, and/or sell *
30875
+ * copies of the Software, and to permit persons to whom the Software is *
30876
+ * furnished to do so, subject to the following conditions: *
30877
+ * *
30878
+ * The above copyright notice and this permission notice shall be included *
30879
+ * in all copies or substantial portions of the Software. *
30880
+ * *
30881
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30882
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30883
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30884
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30885
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30886
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30887
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30888
+ * *
30889
+ * Except as contained in this notice, the name(s) of the above copyright *
30890
+ * holders shall not be used in advertising or otherwise to promote the *
30891
+ * sale, use or other dealings in this Software without prior written *
30892
+ * authorization. *
30893
+ ****************************************************************************/
30894
/*
30895
- * $Id: firework.c,v 1.21 2005/05/28 21:39:04 tom Exp $
30896
+ * $Id: firework.c,v 1.23 2006/04/22 22:41:22 tom Exp $
30897
*/
30898
#include <test.priv.h>
30899
30900
@@ -43,9 +70,8 @@ showit(void)
30901
}
30902
}
30903
30904
-static
30905
-int
30906
-get_colour(chtype * bold)
30907
+static int
30908
+get_colour(chtype *bold)
30909
{
30910
int attr;
30911
attr = (rand() % 16) + 1;
30912
Index: ncurses-5.5/test/firstlast.c
30913
===================================================================
30914
--- ncurses-5.5.orig/test/firstlast.c 2005-04-16 12:34:05.000000000 -0400
30915
+++ ncurses-5.5/test/firstlast.c 2006-04-18 15:48:07.000000000 -0400
30916
@@ -1,8 +1,35 @@
30917
+/****************************************************************************
30918
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30919
+ * *
30920
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30921
+ * copy of this software and associated documentation files (the *
30922
+ * "Software"), to deal in the Software without restriction, including *
30923
+ * without limitation the rights to use, copy, modify, merge, publish, *
30924
+ * distribute, distribute with modifications, sublicense, and/or sell *
30925
+ * copies of the Software, and to permit persons to whom the Software is *
30926
+ * furnished to do so, subject to the following conditions: *
30927
+ * *
30928
+ * The above copyright notice and this permission notice shall be included *
30929
+ * in all copies or substantial portions of the Software. *
30930
+ * *
30931
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30932
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30933
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30934
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30935
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30936
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30937
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30938
+ * *
30939
+ * Except as contained in this notice, the name(s) of the above copyright *
30940
+ * holders shall not be used in advertising or otherwise to promote the *
30941
+ * sale, use or other dealings in this Software without prior written *
30942
+ * authorization. *
30943
+ ****************************************************************************/
30944
/*
30945
* This test was written by Alexander V. Lukyanov to demonstrate difference
30946
* between ncurses 4.1 and SVR4 curses
30947
*
30948
- * $Id: firstlast.c,v 1.4 2005/04/16 16:34:05 tom Exp $
30949
+ * $Id: firstlast.c,v 1.5 2006/04/01 19:03:18 tom Exp $
30950
*/
30951
30952
#include <test.priv.h>
30953
Index: ncurses-5.5/test/hashtest.c
30954
===================================================================
30955
--- ncurses-5.5.orig/test/hashtest.c 2005-04-16 12:36:54.000000000 -0400
30956
+++ ncurses-5.5/test/hashtest.c 2006-04-18 15:48:07.000000000 -0400
30957
@@ -1,9 +1,36 @@
30958
+/****************************************************************************
30959
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
30960
+ * *
30961
+ * Permission is hereby granted, free of charge, to any person obtaining a *
30962
+ * copy of this software and associated documentation files (the *
30963
+ * "Software"), to deal in the Software without restriction, including *
30964
+ * without limitation the rights to use, copy, modify, merge, publish, *
30965
+ * distribute, distribute with modifications, sublicense, and/or sell *
30966
+ * copies of the Software, and to permit persons to whom the Software is *
30967
+ * furnished to do so, subject to the following conditions: *
30968
+ * *
30969
+ * The above copyright notice and this permission notice shall be included *
30970
+ * in all copies or substantial portions of the Software. *
30971
+ * *
30972
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
30973
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
30974
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
30975
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
30976
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
30977
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
30978
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
30979
+ * *
30980
+ * Except as contained in this notice, the name(s) of the above copyright *
30981
+ * holders shall not be used in advertising or otherwise to promote the *
30982
+ * sale, use or other dealings in this Software without prior written *
30983
+ * authorization. *
30984
+ ****************************************************************************/
30985
/*
30986
* hashtest.c -- test hash mapping
30987
*
30988
* Generate timing statistics for vertical-motion optimization.
30989
*
30990
- * $Id: hashtest.c,v 1.24 2005/04/16 16:36:54 tom Exp $
30991
+ * $Id: hashtest.c,v 1.25 2006/04/01 19:03:18 tom Exp $
30992
*/
30993
30994
#ifdef TRACE
30995
Index: ncurses-5.5/test/ins_wide.c
30996
===================================================================
30997
--- ncurses-5.5.orig/test/ins_wide.c 2005-04-16 13:45:17.000000000 -0400
30998
+++ ncurses-5.5/test/ins_wide.c 2006-04-18 15:48:07.000000000 -0400
30999
@@ -1,5 +1,32 @@
31000
+/****************************************************************************
31001
+ * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. *
31002
+ * *
31003
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31004
+ * copy of this software and associated documentation files (the *
31005
+ * "Software"), to deal in the Software without restriction, including *
31006
+ * without limitation the rights to use, copy, modify, merge, publish, *
31007
+ * distribute, distribute with modifications, sublicense, and/or sell *
31008
+ * copies of the Software, and to permit persons to whom the Software is *
31009
+ * furnished to do so, subject to the following conditions: *
31010
+ * *
31011
+ * The above copyright notice and this permission notice shall be included *
31012
+ * in all copies or substantial portions of the Software. *
31013
+ * *
31014
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31015
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31016
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31017
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31018
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31019
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31020
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31021
+ * *
31022
+ * Except as contained in this notice, the name(s) of the above copyright *
31023
+ * holders shall not be used in advertising or otherwise to promote the *
31024
+ * sale, use or other dealings in this Software without prior written *
31025
+ * authorization. *
31026
+ ****************************************************************************/
31027
/*
31028
- * $Id: ins_wide.c,v 1.6 2005/04/16 17:45:17 tom Exp $
31029
+ * $Id: ins_wide.c,v 1.7 2006/04/01 19:08:03 tom Exp $
31030
*
31031
* Demonstrate the wins_wstr() and wins_wch functions.
31032
* Thomas Dickey - 2002/11/23
31033
Index: ncurses-5.5/test/keynames.c
31034
===================================================================
31035
--- ncurses-5.5.orig/test/keynames.c 2005-04-30 16:13:59.000000000 -0400
31036
+++ ncurses-5.5/test/keynames.c 2006-04-18 15:48:07.000000000 -0400
31037
@@ -1,5 +1,32 @@
31038
+/****************************************************************************
31039
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
31040
+ * *
31041
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31042
+ * copy of this software and associated documentation files (the *
31043
+ * "Software"), to deal in the Software without restriction, including *
31044
+ * without limitation the rights to use, copy, modify, merge, publish, *
31045
+ * distribute, distribute with modifications, sublicense, and/or sell *
31046
+ * copies of the Software, and to permit persons to whom the Software is *
31047
+ * furnished to do so, subject to the following conditions: *
31048
+ * *
31049
+ * The above copyright notice and this permission notice shall be included *
31050
+ * in all copies or substantial portions of the Software. *
31051
+ * *
31052
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31053
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31054
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31055
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31056
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31057
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31058
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31059
+ * *
31060
+ * Except as contained in this notice, the name(s) of the above copyright *
31061
+ * holders shall not be used in advertising or otherwise to promote the *
31062
+ * sale, use or other dealings in this Software without prior written *
31063
+ * authorization. *
31064
+ ****************************************************************************/
31065
/*
31066
- * $Id: keynames.c,v 1.7 2005/04/30 20:13:59 tom Exp $
31067
+ * $Id: keynames.c,v 1.8 2006/04/01 19:03:18 tom Exp $
31068
*/
31069
31070
#include <test.priv.h>
31071
Index: ncurses-5.5/test/movewindow.c
31072
===================================================================
31073
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31074
+++ ncurses-5.5/test/movewindow.c 2006-04-18 15:48:07.000000000 -0400
31075
@@ -0,0 +1,628 @@
31076
+/****************************************************************************
31077
+ * Copyright (c) 2006 Free Software Foundation, Inc. *
31078
+ * *
31079
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31080
+ * copy of this software and associated documentation files (the *
31081
+ * "Software"), to deal in the Software without restriction, including *
31082
+ * without limitation the rights to use, copy, modify, merge, publish, *
31083
+ * distribute, distribute with modifications, sublicense, and/or sell *
31084
+ * copies of the Software, and to permit persons to whom the Software is *
31085
+ * furnished to do so, subject to the following conditions: *
31086
+ * *
31087
+ * The above copyright notice and this permission notice shall be included *
31088
+ * in all copies or substantial portions of the Software. *
31089
+ * *
31090
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31091
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31092
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31093
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31094
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31095
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31096
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31097
+ * *
31098
+ * Except as contained in this notice, the name(s) of the above copyright *
31099
+ * holders shall not be used in advertising or otherwise to promote the *
31100
+ * sale, use or other dealings in this Software without prior written *
31101
+ * authorization. *
31102
+ ****************************************************************************/
31103
+/*
31104
+ * $Id: movewindow.c,v 1.15 2006/04/01 19:08:03 tom Exp $
31105
+ *
31106
+ * Demonstrate move functions for windows and derived windows from the curses
31107
+ * library.
31108
+ *
31109
+ * Thomas Dickey - 2006/2/11
31110
+ */
31111
+/*
31112
+derwin
31113
+mvderwin
31114
+subwin
31115
+mvwin
31116
+ */
31117
+
31118
+#include <test.priv.h>
31119
+#include <stdarg.h>
31120
+
31121
+#ifdef HAVE_XCURSES
31122
+#undef derwin
31123
+#endif
31124
+
31125
+#define LINE_MIN 2
31126
+#define LINE_MAX (LINES - 2)
31127
+#define COL_MIN 2
31128
+#define COL_MAX (COLS - 2)
31129
+
31130
+typedef struct {
31131
+ int y, x;
31132
+} PAIR;
31133
+
31134
+typedef struct {
31135
+ WINDOW *parent; /* need this since WINDOW->_parent is not portable */
31136
+ WINDOW *child; /* the actual value */
31137
+} FRAME;
31138
+
31139
+static void head_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
31140
+static void tail_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
31141
+
31142
+static unsigned num_windows;
31143
+static FRAME *all_windows;
31144
+
31145
+static void
31146
+message(int lineno, char *fmt, va_list argp)
31147
+{
31148
+ int y, x;
31149
+
31150
+ getyx(stdscr, y, x);
31151
+ move(lineno, 0);
31152
+ clrtoeol();
31153
+
31154
+#ifdef HAVE_XCURSES
31155
+ {
31156
+ char buffer[1024];
31157
+ vsprintf(buffer, fmt, argp);
31158
+ addstr(buffer);
31159
+ }
31160
+#else
31161
+ vwprintw(stdscr, fmt, argp);
31162
+#endif
31163
+
31164
+ move(y, x);
31165
+ refresh();
31166
+}
31167
+
31168
+static void
31169
+head_line(char *fmt,...)
31170
+{
31171
+ va_list argp;
31172
+
31173
+ va_start(argp, fmt);
31174
+ message(0, fmt, argp);
31175
+ va_end(argp);
31176
+}
31177
+
31178
+static void
31179
+tail_line(char *fmt,...)
31180
+{
31181
+ va_list argp;
31182
+
31183
+ va_start(argp, fmt);
31184
+ message(LINES - 1, fmt, argp);
31185
+ va_end(argp);
31186
+}
31187
+
31188
+/*
31189
+ * Arrow keys move cursor, return location at current on non-arrow key.
31190
+ */
31191
+static PAIR *
31192
+selectcell(WINDOW *parent, int uli, int ulj, int lri, int lrj)
31193
+{
31194
+ static PAIR res; /* result cell */
31195
+ int si = lri - uli + 1; /* depth of the select area */
31196
+ int sj = lrj - ulj + 1; /* width of the select area */
31197
+ int i = 0, j = 0; /* offsets into the select area */
31198
+
31199
+ res.y = uli;
31200
+ res.x = ulj;
31201
+ for (;;) {
31202
+ tail_line("Upper left [%2d,%2d] Lower right [%2d,%2d] -> %d,%d",
31203
+ uli, ulj,
31204
+ lri, lrj,
31205
+ uli + i, ulj + j);
31206
+ wmove(parent, uli + i, ulj + j);
31207
+
31208
+ switch (wgetch(parent)) {
31209
+ case KEY_UP:
31210
+ i += si - 1;
31211
+ break;
31212
+ case KEY_DOWN:
31213
+ i++;
31214
+ break;
31215
+ case KEY_LEFT:
31216
+ j += sj - 1;
31217
+ break;
31218
+ case KEY_RIGHT:
31219
+ j++;
31220
+ break;
31221
+ case QUIT:
31222
+ case ESCAPE:
31223
+ return ((PAIR *) 0);
31224
+#ifdef NCURSES_MOUSE_VERSION
31225
+ case KEY_MOUSE:
31226
+ {
31227
+ MEVENT event;
31228
+
31229
+ getmouse(&event);
31230
+ if (event.y > uli && event.x > ulj) {
31231
+ i = event.y - uli;
31232
+ j = event.x - ulj;
31233
+ } else {
31234
+ beep();
31235
+ break;
31236
+ }
31237
+ }
31238
+ /* FALLTHRU */
31239
+#endif
31240
+ default:
31241
+ res.y = uli + i;
31242
+ res.x = ulj + j;
31243
+ return (&res);
31244
+ }
31245
+ i %= si;
31246
+ j %= sj;
31247
+ }
31248
+}
31249
+
31250
+/*
31251
+ * Ask user for a window definition.
31252
+ */
31253
+static bool
31254
+getwindow(WINDOW *parent, PAIR * ul, PAIR * lr)
31255
+{
31256
+ int min_col = (parent == stdscr) ? COL_MIN : 0;
31257
+ int max_col = (parent == stdscr) ? COL_MAX : getmaxx(parent);
31258
+ int min_line = (parent == stdscr) ? LINE_MIN : 0;
31259
+ int max_line = (parent == stdscr) ? LINE_MAX : getmaxy(parent);
31260
+ PAIR *tmp;
31261
+ bool result = FALSE;
31262
+
31263
+ head_line("Use arrows to move cursor, anything else to mark corner 1");
31264
+ if ((tmp = selectcell(parent, min_line, min_col, max_line, max_col)) != 0) {
31265
+ *ul = *tmp;
31266
+ mvwaddch(parent, ul->y, ul->x, '*');
31267
+
31268
+ head_line("Use arrows to move cursor, anything else to mark corner 2");
31269
+ if ((tmp = selectcell(parent, ul->y, ul->x, max_line, max_col)) != 0) {
31270
+ *lr = *tmp;
31271
+ mvwaddch(parent, lr->y, lr->x, '*');
31272
+ wmove(parent, lr->y, lr->x);
31273
+ wsyncdown(parent);
31274
+ wrefresh(parent);
31275
+ result = (lr->y != ul->y && lr->x != ul->x);
31276
+ }
31277
+ }
31278
+ head_line("done");
31279
+ return result;
31280
+}
31281
+
31282
+/*
31283
+ * Draw a box inside the given window.
31284
+ */
31285
+static void
31286
+box_inside(WINDOW *win)
31287
+{
31288
+ int y0, x0;
31289
+ int y1, x1;
31290
+
31291
+ getyx(win, y0, x0);
31292
+ getmaxyx(win, y1, x1);
31293
+
31294
+ mvwhline(win, 0, 0, ACS_HLINE, x1);
31295
+ mvwhline(win, y1 - 1, 0, ACS_HLINE, x1);
31296
+
31297
+ mvwvline(win, 0, 0, ACS_VLINE, y1);
31298
+ mvwvline(win, 0, x1 - 1, ACS_VLINE, y1);
31299
+
31300
+ mvwaddch(win, 0, 0, ACS_ULCORNER);
31301
+ mvwaddch(win, y1 - 1, 0, ACS_LLCORNER);
31302
+ mvwaddch(win, 0, x1 - 1, ACS_URCORNER);
31303
+ mvwaddch(win, y1 - 1, x1 - 1, ACS_LRCORNER);
31304
+
31305
+ wsyncdown(win);
31306
+ wmove(win, y0, x0);
31307
+ wrefresh(win);
31308
+}
31309
+
31310
+/*
31311
+ * Add a window to our list.
31312
+ */
31313
+static void
31314
+add_window(WINDOW *parent, WINDOW *child)
31315
+{
31316
+ static unsigned have = 0;
31317
+ unsigned need = ((num_windows + 1) | 31) + 1;
31318
+
31319
+ keypad(child, TRUE);
31320
+ if (need > have) {
31321
+ all_windows = (FRAME *) realloc(all_windows, need * sizeof(FRAME));
31322
+ }
31323
+ all_windows[num_windows].parent = parent;
31324
+ all_windows[num_windows].child = child;
31325
+ num_windows++;
31326
+}
31327
+
31328
+static int
31329
+window2num(WINDOW *win)
31330
+{
31331
+ int n;
31332
+ int result = -1;
31333
+ for (n = 0; n < (int) num_windows; ++n) {
31334
+ if (win == all_windows[n].child) {
31335
+ result = n;
31336
+ break;
31337
+ }
31338
+ }
31339
+ return result;
31340
+}
31341
+
31342
+static WINDOW *
31343
+parent_of(WINDOW *win)
31344
+{
31345
+ WINDOW *result = 0;
31346
+ int n = window2num(win);
31347
+ if (n >= 0)
31348
+ result = all_windows[n].parent;
31349
+ return result;
31350
+}
31351
+
31352
+static void
31353
+repaint_one(WINDOW *win)
31354
+{
31355
+ touchwin(win);
31356
+ wnoutrefresh(win);
31357
+}
31358
+
31359
+static void
31360
+refresh_all(WINDOW *win)
31361
+{
31362
+ unsigned n;
31363
+
31364
+ for (n = 0; n < num_windows; ++n) {
31365
+ if (all_windows[n].child != win) {
31366
+ repaint_one(all_windows[n].child);
31367
+ }
31368
+ }
31369
+
31370
+ repaint_one(win);
31371
+ doupdate();
31372
+}
31373
+
31374
+static WINDOW *
31375
+next_window(WINDOW *win)
31376
+{
31377
+ WINDOW *result = win;
31378
+ int n = window2num(win);
31379
+
31380
+ if (n++ >= 0) {
31381
+ result = all_windows[n % num_windows].child;
31382
+ wmove(result, 0, 0);
31383
+ wrefresh(result);
31384
+ }
31385
+ return result;
31386
+}
31387
+
31388
+static WINDOW *
31389
+prev_window(WINDOW *win)
31390
+{
31391
+ WINDOW *result = win;
31392
+ int n = window2num(win);
31393
+
31394
+ if (n-- >= 0) {
31395
+ if (n < 0)
31396
+ n = num_windows - 1;
31397
+ result = all_windows[n % num_windows].child;
31398
+ wmove(result, 0, 0);
31399
+ wrefresh(result);
31400
+ }
31401
+ return result;
31402
+}
31403
+
31404
+static void
31405
+recur_move_window(WINDOW *parent, int dy, int dx)
31406
+{
31407
+ unsigned n;
31408
+
31409
+ for (n = 0; n < num_windows; ++n) {
31410
+ if (all_windows[n].parent == parent) {
31411
+ int y0, x0;
31412
+
31413
+ getbegyx(all_windows[n].child, y0, x0);
31414
+ mvwin(all_windows[n].child, y0 + dy, x0 + dx);
31415
+ recur_move_window(all_windows[n].child, dy, dx);
31416
+ }
31417
+ }
31418
+}
31419
+
31420
+/*
31421
+ * test mvwin().
31422
+ */
31423
+static bool
31424
+move_window(WINDOW *win, bool recur)
31425
+{
31426
+ WINDOW *parent = parent_of(win);
31427
+ bool result = FALSE;
31428
+
31429
+ if (parent != 0) {
31430
+ bool top = (parent == stdscr);
31431
+ int min_col = top ? COL_MIN : 0;
31432
+ int max_col = top ? COL_MAX : getmaxx(parent);
31433
+ int min_line = top ? LINE_MIN : 0;
31434
+ int max_line = top ? LINE_MAX : getmaxy(parent);
31435
+ PAIR *tmp;
31436
+
31437
+ head_line("Select new position for %swindow", top ? "" : "sub");
31438
+
31439
+ if ((tmp = selectcell(parent,
31440
+ min_line, min_col,
31441
+ max_line, max_col)) != 0) {
31442
+ int y0, x0;
31443
+ getbegyx(parent, y0, x0);
31444
+ /*
31445
+ * Note: Moving a subwindow has the effect of moving a viewport
31446
+ * around the screen. The parent window retains the contents of
31447
+ * the subwindow in the original location, but the viewport will
31448
+ * show the contents (again) at the new location. So it will look
31449
+ * odd when testing.
31450
+ */
31451
+ if (mvwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) {
31452
+ if (recur) {
31453
+ recur_move_window(win, tmp->y, tmp->x);
31454
+ }
31455
+ refresh_all(win);
31456
+ doupdate();
31457
+ result = TRUE;
31458
+ }
31459
+ }
31460
+ }
31461
+ return result;
31462
+}
31463
+
31464
+/*
31465
+ * test mvderwin().
31466
+ */
31467
+static bool
31468
+move_subwin(WINDOW *win)
31469
+{
31470
+ WINDOW *parent = parent_of(win);
31471
+ bool result = FALSE;
31472
+
31473
+ if (parent != 0) {
31474
+ bool top = (parent == stdscr);
31475
+ if (!top) {
31476
+ int min_col = top ? COL_MIN : 0;
31477
+ int max_col = top ? COL_MAX : getmaxx(parent);
31478
+ int min_line = top ? LINE_MIN : 0;
31479
+ int max_line = top ? LINE_MAX : getmaxy(parent);
31480
+ PAIR *tmp;
31481
+
31482
+ head_line("Select new position for subwindow");
31483
+
31484
+ if ((tmp = selectcell(parent,
31485
+ min_line, min_col,
31486
+ max_line, max_col)) != 0) {
31487
+ int y0, x0;
31488
+ getbegyx(parent, y0, x0);
31489
+ if (mvderwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) {
31490
+ refresh_all(win);
31491
+ doupdate();
31492
+ result = TRUE;
31493
+ }
31494
+ }
31495
+ }
31496
+ }
31497
+ return result;
31498
+}
31499
+
31500
+static void
31501
+fill_window(WINDOW *win, char ch)
31502
+{
31503
+ int y, x;
31504
+ int y0, x0;
31505
+ int y1, x1;
31506
+
31507
+ getyx(win, y0, x0);
31508
+ getmaxyx(win, y1, x1);
31509
+ for (y = 0; y < y1; ++y) {
31510
+ for (x = 0; x < x1; ++x) {
31511
+ mvwaddch(win, y, x, ch);
31512
+ }
31513
+ }
31514
+ wsyncdown(win);
31515
+ wmove(win, y0, x0);
31516
+ wrefresh(win);
31517
+}
31518
+
31519
+#define lines_of(ul,lr) (lr.y - ul.y + 1)
31520
+#define cols_of(ul,lr) (lr.x - ul.x + 1)
31521
+#define pair_of(ul) ul.y, ul.x
31522
+
31523
+static WINDOW *
31524
+create_my_window(WINDOW *current)
31525
+{
31526
+ PAIR ul, lr;
31527
+ WINDOW *result = 0;
31528
+
31529
+ if (getwindow(stdscr, &ul, &lr)) {
31530
+ result = newwin(lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
31531
+ if (result != 0) {
31532
+ fill_window(result, 'c');
31533
+ add_window(stdscr, result);
31534
+ }
31535
+ }
31536
+ if (result == 0)
31537
+ result = current;
31538
+ return result;
31539
+}
31540
+
31541
+static WINDOW *
31542
+create_my_derwin(WINDOW *parent)
31543
+{
31544
+ PAIR ul, lr;
31545
+ WINDOW *result = 0;
31546
+
31547
+ if (getwindow(parent, &ul, &lr)) {
31548
+ result = derwin(parent, lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
31549
+ if (result != 0) {
31550
+ fill_window(result, 'd');
31551
+ add_window(parent, result);
31552
+ }
31553
+ }
31554
+ if (result == 0)
31555
+ result = parent;
31556
+ return result;
31557
+}
31558
+
31559
+static WINDOW *
31560
+create_my_subwin(WINDOW *parent)
31561
+{
31562
+ PAIR ul, lr;
31563
+ WINDOW *result = 0;
31564
+
31565
+ if (getwindow(parent, &ul, &lr)) {
31566
+ result = subwin(parent,
31567
+ lines_of(ul, lr),
31568
+ cols_of(ul, lr),
31569
+ ul.y + getbegy(parent),
31570
+ ul.x + getbegx(parent));
31571
+ if (result != 0) {
31572
+ fill_window(result, 's');
31573
+ add_window(parent, result);
31574
+ }
31575
+ }
31576
+ if (result == 0)
31577
+ result = parent;
31578
+ return result;
31579
+}
31580
+
31581
+static void
31582
+show_help(WINDOW *current)
31583
+{
31584
+ /* *INDENT-OFF* */
31585
+ static struct {
31586
+ int key;
31587
+ char * msg;
31588
+ } help[] = {
31589
+ { '?', "Show this screen" },
31590
+ { 'b', "Draw a box inside the current window" },
31591
+ { 'c', "Create a new window" },
31592
+ { 'd', "Create a new derived window" },
31593
+ { 'f', "Fill the current window with the next character" },
31594
+ { 'm', "Move the current window" },
31595
+ { 'M', "Move the current window (and its children)" },
31596
+ { 'q', "Quit" },
31597
+ { 's', "Create a new subwindow" },
31598
+ { 't', "Move the current subwindow (moves content)" },
31599
+ { CTRL('L'), "Repaint all windows, doing current one last" },
31600
+ { CTRL('N'), "Cursor to next window" },
31601
+ { CTRL('P'), "Cursor to previous window" },
31602
+ };
31603
+ /* *INDENT-ON* */
31604
+
31605
+ WINDOW *mywin = newwin(LINES, COLS, 0, 0);
31606
+ int row;
31607
+
31608
+ for (row = 0; row < LINES - 2 && row < (int) SIZEOF(help); ++row) {
31609
+ wmove(mywin, row + 1, 1);
31610
+ wprintw(mywin, "%s", keyname(help[row].key));
31611
+ wmove(mywin, row + 1, 20);
31612
+ wprintw(mywin, "%s", help[row].msg);
31613
+ }
31614
+ box_inside(mywin);
31615
+ wmove(mywin, 1, 1);
31616
+ wgetch(mywin);
31617
+ delwin(mywin);
31618
+ refresh_all(current);
31619
+}
31620
+
31621
+int
31622
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
31623
+{
31624
+ WINDOW *current_win;
31625
+ int ch;
31626
+ bool done = FALSE;
31627
+
31628
+ initscr();
31629
+ cbreak();
31630
+ noecho();
31631
+ nonl();
31632
+ intrflush(stdscr, FALSE);
31633
+
31634
+ add_window(0, current_win = stdscr);
31635
+
31636
+ while (!done && (ch = wgetch(current_win)) != ERR) {
31637
+ switch (ch) {
31638
+ case '?':
31639
+ show_help(current_win);
31640
+ break;
31641
+ case 'b':
31642
+ box_inside(current_win);
31643
+ break;
31644
+ case 'c':
31645
+ current_win = create_my_window(current_win);
31646
+ break;
31647
+ case 'd':
31648
+ current_win = create_my_derwin(current_win);
31649
+ break;
31650
+ case 'f':
31651
+ fill_window(current_win, wgetch(current_win));
31652
+ break;
31653
+ case 'm':
31654
+ case 'M':
31655
+ if (!move_window(current_win, (ch == 'M'))) {
31656
+ tail_line("error");
31657
+ continue;
31658
+ }
31659
+ break;
31660
+ case 'q':
31661
+ done = TRUE;
31662
+ break;
31663
+ case 's':
31664
+ current_win = create_my_subwin(current_win);
31665
+ break;
31666
+ case 't':
31667
+ if (!move_subwin(current_win)) {
31668
+ tail_line("error");
31669
+ continue;
31670
+ }
31671
+ break;
31672
+ case CTRL('L'):
31673
+ refresh_all(current_win);
31674
+ break;
31675
+ case CTRL('N'):
31676
+ current_win = next_window(current_win);
31677
+ break;
31678
+ case CTRL('P'):
31679
+ current_win = prev_window(current_win);
31680
+ break;
31681
+#if 0
31682
+ /* want to allow cursor to move around the current window too */
31683
+ /* want to test the resizing of windows and subwindows too */
31684
+ /* want to allow deleting a window also */
31685
+ /* want to use mouse? */
31686
+#endif
31687
+ default:
31688
+ tail_line("unrecognized key (use '?' for help)");
31689
+ beep();
31690
+ continue;
31691
+ }
31692
+ tail_line("size [%d,%d] begin [%d,%d] parent [%d,%d]",
31693
+ getmaxy(current_win),
31694
+ getmaxx(current_win),
31695
+ getbegy(current_win),
31696
+ getbegx(current_win),
31697
+ getpary(current_win),
31698
+ getparx(current_win));
31699
+ wmove(current_win, 0, 0);
31700
+ }
31701
+ endwin();
31702
+ return EXIT_SUCCESS;
31703
+}
31704
Index: ncurses-5.5/test/rain.c
31705
===================================================================
31706
--- ncurses-5.5.orig/test/rain.c 2002-06-29 19:32:18.000000000 -0400
31707
+++ ncurses-5.5/test/rain.c 2006-04-18 15:48:07.000000000 -0400
31708
@@ -1,5 +1,32 @@
31709
+/****************************************************************************
31710
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
31711
+ * *
31712
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31713
+ * copy of this software and associated documentation files (the *
31714
+ * "Software"), to deal in the Software without restriction, including *
31715
+ * without limitation the rights to use, copy, modify, merge, publish, *
31716
+ * distribute, distribute with modifications, sublicense, and/or sell *
31717
+ * copies of the Software, and to permit persons to whom the Software is *
31718
+ * furnished to do so, subject to the following conditions: *
31719
+ * *
31720
+ * The above copyright notice and this permission notice shall be included *
31721
+ * in all copies or substantial portions of the Software. *
31722
+ * *
31723
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31724
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31725
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31726
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31727
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31728
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31729
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31730
+ * *
31731
+ * Except as contained in this notice, the name(s) of the above copyright *
31732
+ * holders shall not be used in advertising or otherwise to promote the *
31733
+ * sale, use or other dealings in this Software without prior written *
31734
+ * authorization. *
31735
+ ****************************************************************************/
31736
/*
31737
- * $Id: rain.c,v 1.20 2002/06/29 23:32:18 tom Exp $
31738
+ * $Id: rain.c,v 1.21 2006/04/01 19:08:03 tom Exp $
31739
*/
31740
#include <test.priv.h>
31741
31742
Index: ncurses-5.5/test/savescreen.c
31743
===================================================================
31744
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31745
+++ ncurses-5.5/test/savescreen.c 2006-04-18 15:48:07.000000000 -0400
31746
@@ -0,0 +1,48 @@
31747
+/****************************************************************************
31748
+ * Copyright (c) 2006 Free Software Foundation, Inc. *
31749
+ * *
31750
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31751
+ * copy of this software and associated documentation files (the *
31752
+ * "Software"), to deal in the Software without restriction, including *
31753
+ * without limitation the rights to use, copy, modify, merge, publish, *
31754
+ * distribute, distribute with modifications, sublicense, and/or sell *
31755
+ * copies of the Software, and to permit persons to whom the Software is *
31756
+ * furnished to do so, subject to the following conditions: *
31757
+ * *
31758
+ * The above copyright notice and this permission notice shall be included *
31759
+ * in all copies or substantial portions of the Software. *
31760
+ * *
31761
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31762
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31763
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31764
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31765
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31766
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31767
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31768
+ * *
31769
+ * Except as contained in this notice, the name(s) of the above copyright *
31770
+ * holders shall not be used in advertising or otherwise to promote the *
31771
+ * sale, use or other dealings in this Software without prior written *
31772
+ * authorization. *
31773
+ ****************************************************************************/
31774
+/*
31775
+ * $Id: savescreen.c,v 1.2 2006/04/01 19:08:03 tom Exp $
31776
+ *
31777
+ * Demonstrate save/restore functions from the curses library.
31778
+ * Thomas Dickey - 2006/2/11
31779
+ */
31780
+/*
31781
+scr_dump -
31782
+scr_init -
31783
+scr_restore -
31784
+scr_set -
31785
+*/
31786
+
31787
+#include <test.priv.h>
31788
+
31789
+int
31790
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
31791
+{
31792
+ printf("Not implemented - demo for screen save/restore\n");
31793
+ return EXIT_SUCCESS;
31794
+}
31795
Index: ncurses-5.5/test/testaddch.c
31796
===================================================================
31797
--- ncurses-5.5.orig/test/testaddch.c 2002-06-29 19:32:18.000000000 -0400
31798
+++ ncurses-5.5/test/testaddch.c 2006-04-18 15:48:07.000000000 -0400
31799
@@ -1,8 +1,35 @@
31800
+/****************************************************************************
31801
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
31802
+ * *
31803
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31804
+ * copy of this software and associated documentation files (the *
31805
+ * "Software"), to deal in the Software without restriction, including *
31806
+ * without limitation the rights to use, copy, modify, merge, publish, *
31807
+ * distribute, distribute with modifications, sublicense, and/or sell *
31808
+ * copies of the Software, and to permit persons to whom the Software is *
31809
+ * furnished to do so, subject to the following conditions: *
31810
+ * *
31811
+ * The above copyright notice and this permission notice shall be included *
31812
+ * in all copies or substantial portions of the Software. *
31813
+ * *
31814
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31815
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31816
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31817
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31818
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31819
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31820
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31821
+ * *
31822
+ * Except as contained in this notice, the name(s) of the above copyright *
31823
+ * holders shall not be used in advertising or otherwise to promote the *
31824
+ * sale, use or other dealings in this Software without prior written *
31825
+ * authorization. *
31826
+ ****************************************************************************/
31827
/*
31828
* This is an example written by Alexander V. Lukyanov <lav@yars.free.net>,
31829
* to demonstrate an inconsistency between ncurses and SVr4 curses.
31830
*
31831
- * $Id: testaddch.c,v 1.5 2002/06/29 23:32:18 tom Exp $
31832
+ * $Id: testaddch.c,v 1.6 2006/04/01 19:08:03 tom Exp $
31833
*/
31834
#include <test.priv.h>
31835
31836
Index: ncurses-5.5/test/testscanw.c
31837
===================================================================
31838
--- ncurses-5.5.orig/test/testscanw.c 2002-10-19 18:11:24.000000000 -0400
31839
+++ ncurses-5.5/test/testscanw.c 2006-04-18 15:48:07.000000000 -0400
31840
@@ -1,8 +1,35 @@
31841
+/****************************************************************************
31842
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
31843
+ * *
31844
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31845
+ * copy of this software and associated documentation files (the *
31846
+ * "Software"), to deal in the Software without restriction, including *
31847
+ * without limitation the rights to use, copy, modify, merge, publish, *
31848
+ * distribute, distribute with modifications, sublicense, and/or sell *
31849
+ * copies of the Software, and to permit persons to whom the Software is *
31850
+ * furnished to do so, subject to the following conditions: *
31851
+ * *
31852
+ * The above copyright notice and this permission notice shall be included *
31853
+ * in all copies or substantial portions of the Software. *
31854
+ * *
31855
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31856
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31857
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31858
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31859
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31860
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31861
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31862
+ * *
31863
+ * Except as contained in this notice, the name(s) of the above copyright *
31864
+ * holders shall not be used in advertising or otherwise to promote the *
31865
+ * sale, use or other dealings in this Software without prior written *
31866
+ * authorization. *
31867
+ ****************************************************************************/
31868
/* gleaned from a web-search, shows a bug combining scanw and implicit scroll.
31869
* Date: 1997/03/17
31870
* From: bayern@morpheus.cis.yale.edu
31871
*
31872
- * $Id: testscanw.c,v 1.10 2002/10/19 22:11:24 tom Exp $
31873
+ * $Id: testscanw.c,v 1.11 2006/04/01 19:08:03 tom Exp $
31874
*/
31875
#include <test.priv.h>
31876
31877
Index: ncurses-5.5/test/view.c
31878
===================================================================
31879
--- ncurses-5.5.orig/test/view.c 2005-05-28 17:40:25.000000000 -0400
31880
+++ ncurses-5.5/test/view.c 2006-04-18 15:48:07.000000000 -0400
31881
@@ -1,3 +1,30 @@
31882
+/****************************************************************************
31883
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
31884
+ * *
31885
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31886
+ * copy of this software and associated documentation files (the *
31887
+ * "Software"), to deal in the Software without restriction, including *
31888
+ * without limitation the rights to use, copy, modify, merge, publish, *
31889
+ * distribute, distribute with modifications, sublicense, and/or sell *
31890
+ * copies of the Software, and to permit persons to whom the Software is *
31891
+ * furnished to do so, subject to the following conditions: *
31892
+ * *
31893
+ * The above copyright notice and this permission notice shall be included *
31894
+ * in all copies or substantial portions of the Software. *
31895
+ * *
31896
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31897
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31898
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31899
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31900
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31901
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31902
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31903
+ * *
31904
+ * Except as contained in this notice, the name(s) of the above copyright *
31905
+ * holders shall not be used in advertising or otherwise to promote the *
31906
+ * sale, use or other dealings in this Software without prior written *
31907
+ * authorization. *
31908
+ ****************************************************************************/
31909
/*
31910
* view.c -- a silly little viewer program
31911
*
31912
@@ -23,7 +50,7 @@
31913
* scroll operation worked, and the refresh() code only had to do a
31914
* partial repaint.
31915
*
31916
- * $Id: view.c,v 1.62 2005/05/28 21:40:25 tom Exp $
31917
+ * $Id: view.c,v 1.63 2006/04/01 19:00:55 tom Exp $
31918
*/
31919
31920
#include <test.priv.h>
31921
Index: ncurses-5.5/test/worm.c
31922
===================================================================
31923
--- ncurses-5.5.orig/test/worm.c 2005-08-20 16:26:29.000000000 -0400
31924
+++ ncurses-5.5/test/worm.c 2006-04-18 15:48:07.000000000 -0400
31925
@@ -1,3 +1,30 @@
31926
+/****************************************************************************
31927
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
31928
+ * *
31929
+ * Permission is hereby granted, free of charge, to any person obtaining a *
31930
+ * copy of this software and associated documentation files (the *
31931
+ * "Software"), to deal in the Software without restriction, including *
31932
+ * without limitation the rights to use, copy, modify, merge, publish, *
31933
+ * distribute, distribute with modifications, sublicense, and/or sell *
31934
+ * copies of the Software, and to permit persons to whom the Software is *
31935
+ * furnished to do so, subject to the following conditions: *
31936
+ * *
31937
+ * The above copyright notice and this permission notice shall be included *
31938
+ * in all copies or substantial portions of the Software. *
31939
+ * *
31940
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
31941
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
31942
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
31943
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
31944
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
31945
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
31946
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
31947
+ * *
31948
+ * Except as contained in this notice, the name(s) of the above copyright *
31949
+ * holders shall not be used in advertising or otherwise to promote the *
31950
+ * sale, use or other dealings in this Software without prior written *
31951
+ * authorization. *
31952
+ ****************************************************************************/
31953
/*
31954
31955
@@@ @@@ @@@@@@@@@@ @@@@@@@@@@@ @@@@@@@@@@@@
31956
@@ -34,7 +61,7 @@ Options:
31957
traces will be dumped. The program stops and waits for one character of
31958
input at the beginning and end of the interval.
31959
31960
- $Id: worm.c,v 1.39 2005/08/20 20:26:29 tom Exp $
31961
+ $Id: worm.c,v 1.40 2006/04/01 18:59:36 tom Exp $
31962
*/
31963
31964
#include <test.priv.h>
31965
Index: ncurses-5.5/test/xmas.c
31966
===================================================================
31967
--- ncurses-5.5.orig/test/xmas.c 2005-04-16 12:34:38.000000000 -0400
31968
+++ ncurses-5.5/test/xmas.c 2006-04-18 15:48:07.000000000 -0400
31969
@@ -92,7 +92,7 @@
31970
/******************************************************************************/
31971
31972
/*
31973
- * $Id: xmas.c,v 1.20 2005/04/16 16:34:38 tom Exp $
31974
+ * $Id: xmas.c,v 1.21 2006/03/11 18:03:54 tom Exp $
31975
*/
31976
#include <test.priv.h>
31977
31978
@@ -131,6 +131,7 @@ static WINDOW *lookdeer3;
31979
static WINDOW *lookdeer4;
31980
static WINDOW *w_holiday;
31981
static WINDOW *w_del_msg;
31982
+static bool *my_pairs;
31983
31984
static int boxit(void);
31985
static int seas(void);
31986
@@ -153,13 +154,12 @@ static void
31987
set_color(WINDOW *win, chtype color)
31988
{
31989
if (has_colors()) {
31990
- static bool *pairs;
31991
int n = (color + 1);
31992
- if (pairs == 0)
31993
- pairs = (bool *) calloc((unsigned) (COLORS + 1), sizeof(bool));
31994
- if (!pairs[n]) {
31995
+ if (my_pairs == 0)
31996
+ my_pairs = (bool *) calloc((unsigned) (COLORS + 1), sizeof(bool));
31997
+ if (!my_pairs[n]) {
31998
init_pair(n, color, my_bg);
31999
- pairs[n] = TRUE;
32000
+ my_pairs[n] = TRUE;
32001
}
32002
wattroff(win, A_COLOR);
32003
wattron(win, COLOR_PAIR(n));
32004
@@ -1155,5 +1155,11 @@ done(int sig GCC_UNUSED)
32005
refresh();
32006
endwin();
32007
curs_set(1);
32008
+
32009
+#if NO_LEAKS
32010
+ if (my_pairs != 0)
32011
+ free(my_pairs);
32012
+#endif
32013
+
32014
ExitProgram(EXIT_SUCCESS);
32015
}
32016
Index: ncurses-5.5/Ada95/TODO
32017
===================================================================
32018
--- ncurses-5.5.orig/Ada95/TODO 1999-10-20 05:18:58.000000000 -0400
32019
+++ ncurses-5.5/Ada95/TODO 2006-04-29 10:41:13.000000000 -0400
32020
@@ -1,4 +1,32 @@
32021
--- $Id: TODO,v 1.4 1999/10/20 09:18:58 tom Exp $
32022
+-------------------------------------------------------------------------------
32023
+-- Copyright (c) 1998-1999,2006 Free Software Foundation, Inc. --
32024
+-- --
32025
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32026
+-- copy of this software and associated documentation files (the --
32027
+-- "Software"), to deal in the Software without restriction, including --
32028
+-- without limitation the rights to use, copy, modify, merge, publish, --
32029
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32030
+-- of the Software, and to permit persons to whom the Software is furnished --
32031
+-- to do so, subject to the following conditions: --
32032
+-- --
32033
+-- The above copyright notice and this permission notice shall be included --
32034
+-- in all copies or substantial portions of the Software. --
32035
+-- --
32036
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32037
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32038
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32039
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32040
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32041
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32042
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32043
+-- --
32044
+-- Except as contained in this notice, the name(s) of the above copyright --
32045
+-- holders shall not be used in advertising or otherwise to promote the --
32046
+-- sale, use or other dealings in this Software without prior written --
32047
+-- authorization. --
32048
+-------------------------------------------------------------------------------
32049
+-- $Id: TODO,v 1.5 2006/04/22 22:23:21 tom Exp $
32050
+-------------------------------------------------------------------------------
32051
32052
-- Intensive testing
32053
Perhaps the delivery of the Beta will help a bit.
32054
Index: ncurses-5.5/Ada95/gen/html.m4
32055
===================================================================
32056
--- ncurses-5.5.orig/Ada95/gen/html.m4 2000-03-11 22:10:24.000000000 -0500
32057
+++ ncurses-5.5/Ada95/gen/html.m4 2006-04-29 10:41:13.000000000 -0400
32058
@@ -1,3 +1,32 @@
32059
+dnl***************************************************************************
32060
+dnl Copyright (c) 2000,2006 Free Software Foundation, Inc. *
32061
+dnl *
32062
+dnl Permission is hereby granted, free of charge, to any person obtaining a *
32063
+dnl copy of this software and associated documentation files (the *
32064
+dnl "Software"), to deal in the Software without restriction, including *
32065
+dnl without limitation the rights to use, copy, modify, merge, publish, *
32066
+dnl distribute, distribute with modifications, sublicense, and/or sell *
32067
+dnl copies of the Software, and to permit persons to whom the Software is *
32068
+dnl furnished to do so, subject to the following conditions: *
32069
+dnl *
32070
+dnl The above copyright notice and this permission notice shall be included *
32071
+dnl in all copies or substantial portions of the Software. *
32072
+dnl *
32073
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32074
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32075
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32076
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32077
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32078
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32079
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32080
+dnl *
32081
+dnl Except as contained in this notice, the name(s) of the above copyright *
32082
+dnl holders shall not be used in advertising or otherwise to promote the *
32083
+dnl sale, use or other dealings in this Software without prior written *
32084
+dnl authorization. *
32085
+dnl***************************************************************************
32086
+dnl
32087
+dnl $Id: html.m4,v 1.2 2006/04/22 23:16:44 tom Exp $
32088
define(`ANCHORIDX',`0')dnl
32089
define(`MANPAGE',`define(`MANPG',$1)dnl
32090
|=====================================================================
32091
Index: ncurses-5.5/Ada95/gen/normal.m4
32092
===================================================================
32093
--- ncurses-5.5.orig/Ada95/gen/normal.m4 1996-10-24 16:37:00.000000000 -0400
32094
+++ ncurses-5.5/Ada95/gen/normal.m4 2006-04-29 10:41:13.000000000 -0400
32095
@@ -1,3 +1,32 @@
32096
+dnl***************************************************************************
32097
+dnl Copyright (c) 1998,2006 Free Software Foundation, Inc. *
32098
+dnl *
32099
+dnl Permission is hereby granted, free of charge, to any person obtaining a *
32100
+dnl copy of this software and associated documentation files (the *
32101
+dnl "Software"), to deal in the Software without restriction, including *
32102
+dnl without limitation the rights to use, copy, modify, merge, publish, *
32103
+dnl distribute, distribute with modifications, sublicense, and/or sell *
32104
+dnl copies of the Software, and to permit persons to whom the Software is *
32105
+dnl furnished to do so, subject to the following conditions: *
32106
+dnl *
32107
+dnl The above copyright notice and this permission notice shall be included *
32108
+dnl in all copies or substantial portions of the Software. *
32109
+dnl *
32110
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32111
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32112
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32113
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32114
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32115
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32116
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32117
+dnl *
32118
+dnl Except as contained in this notice, the name(s) of the above copyright *
32119
+dnl holders shall not be used in advertising or otherwise to promote the *
32120
+dnl sale, use or other dealings in this Software without prior written *
32121
+dnl authorization. *
32122
+dnl***************************************************************************
32123
+dnl
32124
+dnl $Id: normal.m4,v 1.2 2006/04/22 23:16:14 tom Exp $
32125
define(`MANPAGE',`define(`MANPG',$1)dnl
32126
|=====================================================================
32127
-- | Man page MANPG
32128
Index: ncurses-5.5/Ada95/gen/table.m4
32129
===================================================================
32130
--- ncurses-5.5.orig/Ada95/gen/table.m4 2000-03-11 22:10:24.000000000 -0500
32131
+++ ncurses-5.5/Ada95/gen/table.m4 2006-04-29 10:41:13.000000000 -0400
32132
@@ -1,3 +1,32 @@
32133
+dnl***************************************************************************
32134
+dnl Copyright (c) 2000,2006 Free Software Foundation, Inc. *
32135
+dnl *
32136
+dnl Permission is hereby granted, free of charge, to any person obtaining a *
32137
+dnl copy of this software and associated documentation files (the *
32138
+dnl "Software"), to deal in the Software without restriction, including *
32139
+dnl without limitation the rights to use, copy, modify, merge, publish, *
32140
+dnl distribute, distribute with modifications, sublicense, and/or sell *
32141
+dnl copies of the Software, and to permit persons to whom the Software is *
32142
+dnl furnished to do so, subject to the following conditions: *
32143
+dnl *
32144
+dnl The above copyright notice and this permission notice shall be included *
32145
+dnl in all copies or substantial portions of the Software. *
32146
+dnl *
32147
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32148
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32149
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32150
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32151
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32152
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32153
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32154
+dnl *
32155
+dnl Except as contained in this notice, the name(s) of the above copyright *
32156
+dnl holders shall not be used in advertising or otherwise to promote the *
32157
+dnl sale, use or other dealings in this Software without prior written *
32158
+dnl authorization. *
32159
+dnl***************************************************************************
32160
+dnl
32161
+dnl $Id: table.m4,v 1.2 2006/04/22 23:16:44 tom Exp $
32162
define(`ANCHORIDX',`0')dnl
32163
define(`MANPAGE',`define(`MANPG',$1)')dnl
32164
divert(-1)dnl
32165
Index: ncurses-5.5/Ada95/samples/README
32166
===================================================================
32167
--- ncurses-5.5.orig/Ada95/samples/README 1996-10-04 19:17:12.000000000 -0400
32168
+++ ncurses-5.5/Ada95/samples/README 2006-04-29 10:41:13.000000000 -0400
32169
@@ -1,6 +1,35 @@
32170
+-------------------------------------------------------------------------------
32171
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
32172
+-- --
32173
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32174
+-- copy of this software and associated documentation files (the --
32175
+-- "Software"), to deal in the Software without restriction, including --
32176
+-- without limitation the rights to use, copy, modify, merge, publish, --
32177
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32178
+-- of the Software, and to permit persons to whom the Software is furnished --
32179
+-- to do so, subject to the following conditions: --
32180
+-- --
32181
+-- The above copyright notice and this permission notice shall be included --
32182
+-- in all copies or substantial portions of the Software. --
32183
+-- --
32184
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32185
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32186
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32187
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32188
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32189
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32190
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32191
+-- --
32192
+-- Except as contained in this notice, the name(s) of the above copyright --
32193
+-- holders shall not be used in advertising or otherwise to promote the --
32194
+-- sale, use or other dealings in this Software without prior written --
32195
+-- authorization. --
32196
+-------------------------------------------------------------------------------
32197
+-- $Id: README,v 1.2 2006/04/22 22:24:12 tom Exp $
32198
+-------------------------------------------------------------------------------
32199
+
32200
The intention of the demo at this point in time is not to demonstrate all
32201
-the features of (n)curses and it's subsystems, but to give some sample
32202
+the features of (n)curses and its subsystems, but to give some sample
32203
sources how to use the binding at all.
32204
32205
Ideally in the future we can combine both goals.
32206
-
32207
Index: ncurses-5.5/Makefile.os2
32208
===================================================================
32209
--- ncurses-5.5.orig/Makefile.os2 2000-10-09 19:53:57.000000000 -0400
32210
+++ ncurses-5.5/Makefile.os2 2006-04-29 10:41:13.000000000 -0400
32211
@@ -1,8 +1,33 @@
32212
+##############################################################################
32213
+# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. #
32214
+# #
32215
+# Permission is hereby granted, free of charge, to any person obtaining a #
32216
+# copy of this software and associated documentation files (the "Software"), #
32217
+# to deal in the Software without restriction, including without limitation #
32218
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
32219
+# with modifications, sublicense, and/or sell copies of the Software, and to #
32220
+# permit persons to whom the Software is furnished to do so, subject to the #
32221
+# following conditions: #
32222
+# #
32223
+# The above copyright notice and this permission notice shall be included in #
32224
+# all copies or substantial portions of the Software. #
32225
+# #
32226
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
32227
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
32228
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
32229
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
32230
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
32231
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
32232
+# DEALINGS IN THE SOFTWARE. #
32233
+# #
32234
+# Except as contained in this notice, the name(s) of the above copyright #
32235
+# holders shall not be used in advertising or otherwise to promote the sale, #
32236
+# use or other dealings in this Software without prior written #
32237
+# authorization. #
32238
################################################################################
32239
-# Wrapper Makefile for ncurses library under OS/2.
32240
-################################################################################
32241
-# $Id: Makefile.os2,v 1.10 2000/10/09 23:53:57 Ilya.Zakharevich Exp $
32242
+# $Id: Makefile.os2,v 1.11 2006/04/22 21:46:17 tom Exp $
32243
#
32244
+# Wrapper Makefile for ncurses library under OS/2.
32245
# Author: Juan Jose Garcia Ripoll <worm@arrakis.es>.
32246
# Webpage: http://www.arrakis.es/~worm/
32247
################################################################################
32248
Index: ncurses-5.5/README
32249
===================================================================
32250
--- ncurses-5.5.orig/README 2004-08-07 19:42:43.000000000 -0400
32251
+++ ncurses-5.5/README 2006-04-29 10:41:13.000000000 -0400
32252
@@ -1,4 +1,31 @@
32253
--- $Id: README,v 1.22 2004/08/07 23:42:43 tom Exp $
32254
+-------------------------------------------------------------------------------
32255
+-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. --
32256
+-- --
32257
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32258
+-- copy of this software and associated documentation files (the --
32259
+-- "Software"), to deal in the Software without restriction, including --
32260
+-- without limitation the rights to use, copy, modify, merge, publish, --
32261
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32262
+-- of the Software, and to permit persons to whom the Software is furnished --
32263
+-- to do so, subject to the following conditions: --
32264
+-- --
32265
+-- The above copyright notice and this permission notice shall be included --
32266
+-- in all copies or substantial portions of the Software. --
32267
+-- --
32268
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32269
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32270
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32271
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32272
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32273
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32274
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32275
+-- --
32276
+-- Except as contained in this notice, the name(s) of the above copyright --
32277
+-- holders shall not be used in advertising or otherwise to promote the --
32278
+-- sale, use or other dealings in this Software without prior written --
32279
+-- authorization. --
32280
+-------------------------------------------------------------------------------
32281
+-- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $
32282
-------------------------------------------------------------------------------
32283
README file for the ncurses package
32284
32285
Index: ncurses-5.5/README.emx
32286
===================================================================
32287
--- ncurses-5.5.orig/README.emx 2005-08-27 13:04:26.000000000 -0400
32288
+++ ncurses-5.5/README.emx 2006-04-29 10:41:13.000000000 -0400
32289
@@ -1,4 +1,31 @@
32290
--- $Id: README.emx,v 1.7 2005/08/27 17:04:26 tom Exp $
32291
+-------------------------------------------------------------------------------
32292
+-- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
32293
+-- --
32294
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32295
+-- copy of this software and associated documentation files (the --
32296
+-- "Software"), to deal in the Software without restriction, including --
32297
+-- without limitation the rights to use, copy, modify, merge, publish, --
32298
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32299
+-- of the Software, and to permit persons to whom the Software is furnished --
32300
+-- to do so, subject to the following conditions: --
32301
+-- --
32302
+-- The above copyright notice and this permission notice shall be included --
32303
+-- in all copies or substantial portions of the Software. --
32304
+-- --
32305
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32306
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32307
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32308
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32309
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32310
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32311
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32312
+-- --
32313
+-- Except as contained in this notice, the name(s) of the above copyright --
32314
+-- holders shall not be used in advertising or otherwise to promote the --
32315
+-- sale, use or other dealings in this Software without prior written --
32316
+-- authorization. --
32317
+-------------------------------------------------------------------------------
32318
+-- $Id: README.emx,v 1.8 2006/04/22 22:19:37 tom Exp $
32319
-- Author: Thomas Dickey
32320
-------------------------------------------------------------------------------
32321
32322
Index: ncurses-5.5/TO-DO
32323
===================================================================
32324
--- ncurses-5.5.orig/TO-DO 2005-08-20 16:53:04.000000000 -0400
32325
+++ ncurses-5.5/TO-DO 2006-04-29 10:41:13.000000000 -0400
32326
@@ -1,4 +1,32 @@
32327
--- $Id: TO-DO,v 1.45 2005/08/20 20:53:04 tom Exp $
32328
+-------------------------------------------------------------------------------
32329
+-- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
32330
+-- --
32331
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32332
+-- copy of this software and associated documentation files (the --
32333
+-- "Software"), to deal in the Software without restriction, including --
32334
+-- without limitation the rights to use, copy, modify, merge, publish, --
32335
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32336
+-- of the Software, and to permit persons to whom the Software is furnished --
32337
+-- to do so, subject to the following conditions: --
32338
+-- --
32339
+-- The above copyright notice and this permission notice shall be included --
32340
+-- in all copies or substantial portions of the Software. --
32341
+-- --
32342
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32343
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32344
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32345
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32346
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32347
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32348
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32349
+-- --
32350
+-- Except as contained in this notice, the name(s) of the above copyright --
32351
+-- holders shall not be used in advertising or otherwise to promote the --
32352
+-- sale, use or other dealings in this Software without prior written --
32353
+-- authorization. --
32354
+-------------------------------------------------------------------------------
32355
+-- $Id: TO-DO,v 1.46 2006/04/22 22:19:37 tom Exp $
32356
+-------------------------------------------------------------------------------
32357
32358
SHORT-TERM TO-DO ITEMS:
32359
32360
Index: ncurses-5.5/announce.html.in
32361
===================================================================
32362
--- ncurses-5.5.orig/announce.html.in 2005-10-01 18:07:23.000000000 -0400
32363
+++ ncurses-5.5/announce.html.in 2006-04-29 10:41:13.000000000 -0400
32364
@@ -1,6 +1,33 @@
32365
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
32366
<!--
32367
- $Id: announce.html.in,v 1.57 2005/10/01 22:07:23 tom Exp $
32368
+ $Id: announce.html.in,v 1.58 2006/04/22 22:29:12 tom Exp $
32369
+ ****************************************************************************
32370
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32371
+ * *
32372
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32373
+ * copy of this software and associated documentation files (the *
32374
+ * "Software"), to deal in the Software without restriction, including *
32375
+ * without limitation the rights to use, copy, modify, merge, publish, *
32376
+ * distribute, distribute with modifications, sublicense, and/or sell *
32377
+ * copies of the Software, and to permit persons to whom the Software is *
32378
+ * furnished to do so, subject to the following conditions: *
32379
+ * *
32380
+ * The above copyright notice and this permission notice shall be included *
32381
+ * in all copies or substantial portions of the Software. *
32382
+ * *
32383
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32384
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32385
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32386
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32387
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32388
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32389
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32390
+ * *
32391
+ * Except as contained in this notice, the name(s) of the above copyright *
32392
+ * holders shall not be used in advertising or otherwise to promote the *
32393
+ * sale, use or other dealings in this Software without prior written *
32394
+ * authorization. *
32395
+ ****************************************************************************
32396
-->
32397
<HTML>
32398
<HEAD>
32399
Index: ncurses-5.5/c++/NEWS
32400
===================================================================
32401
--- ncurses-5.5.orig/c++/NEWS 1999-07-31 14:39:36.000000000 -0400
32402
+++ ncurses-5.5/c++/NEWS 2006-04-29 10:41:13.000000000 -0400
32403
@@ -1,3 +1,32 @@
32404
+-------------------------------------------------------------------------------
32405
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
32406
+-- --
32407
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32408
+-- copy of this software and associated documentation files (the --
32409
+-- "Software"), to deal in the Software without restriction, including --
32410
+-- without limitation the rights to use, copy, modify, merge, publish, --
32411
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32412
+-- of the Software, and to permit persons to whom the Software is furnished --
32413
+-- to do so, subject to the following conditions: --
32414
+-- --
32415
+-- The above copyright notice and this permission notice shall be included --
32416
+-- in all copies or substantial portions of the Software. --
32417
+-- --
32418
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32419
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32420
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32421
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32422
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32423
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32424
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32425
+-- --
32426
+-- Except as contained in this notice, the name(s) of the above copyright --
32427
+-- holders shall not be used in advertising or otherwise to promote the --
32428
+-- sale, use or other dealings in this Software without prior written --
32429
+-- authorization. --
32430
+-------------------------------------------------------------------------------
32431
+-- $Id: NEWS,v 1.4 2006/04/22 22:19:37 tom Exp $
32432
+-------------------------------------------------------------------------------
32433
This is a log of changes that the ncurses C++ binding has gone
32434
through starting with the integration of menu and forms integration
32435
into the binding.
32436
Index: ncurses-5.5/c++/PROBLEMS
32437
===================================================================
32438
--- ncurses-5.5.orig/c++/PROBLEMS 1997-09-08 20:14:40.000000000 -0400
32439
+++ ncurses-5.5/c++/PROBLEMS 2006-04-29 10:41:13.000000000 -0400
32440
@@ -1,3 +1,32 @@
32441
+-------------------------------------------------------------------------------
32442
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
32443
+-- --
32444
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32445
+-- copy of this software and associated documentation files (the --
32446
+-- "Software"), to deal in the Software without restriction, including --
32447
+-- without limitation the rights to use, copy, modify, merge, publish, --
32448
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32449
+-- of the Software, and to permit persons to whom the Software is furnished --
32450
+-- to do so, subject to the following conditions: --
32451
+-- --
32452
+-- The above copyright notice and this permission notice shall be included --
32453
+-- in all copies or substantial portions of the Software. --
32454
+-- --
32455
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32456
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32457
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32458
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32459
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32460
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32461
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32462
+-- --
32463
+-- Except as contained in this notice, the name(s) of the above copyright --
32464
+-- holders shall not be used in advertising or otherwise to promote the --
32465
+-- sale, use or other dealings in this Software without prior written --
32466
+-- authorization. --
32467
+-------------------------------------------------------------------------------
32468
+-- $Id: PROBLEMS,v 1.3 2006/04/22 22:19:37 tom Exp $
32469
+-------------------------------------------------------------------------------
32470
This is a list of open problems. This mainly lists known missing pieces
32471
and design flaws.
32472
32473
Index: ncurses-5.5/c++/README-first
32474
===================================================================
32475
--- ncurses-5.5.orig/c++/README-first 2003-10-25 11:13:23.000000000 -0400
32476
+++ ncurses-5.5/c++/README-first 2006-04-29 10:41:13.000000000 -0400
32477
@@ -1,4 +1,31 @@
32478
--- $Id: README-first,v 1.7 2003/10/25 15:13:23 tom Exp $
32479
+-------------------------------------------------------------------------------
32480
+-- Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. --
32481
+-- --
32482
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32483
+-- copy of this software and associated documentation files (the --
32484
+-- "Software"), to deal in the Software without restriction, including --
32485
+-- without limitation the rights to use, copy, modify, merge, publish, --
32486
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32487
+-- of the Software, and to permit persons to whom the Software is furnished --
32488
+-- to do so, subject to the following conditions: --
32489
+-- --
32490
+-- The above copyright notice and this permission notice shall be included --
32491
+-- in all copies or substantial portions of the Software. --
32492
+-- --
32493
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32494
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32495
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32496
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32497
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32498
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32499
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32500
+-- --
32501
+-- Except as contained in this notice, the name(s) of the above copyright --
32502
+-- holders shall not be used in advertising or otherwise to promote the --
32503
+-- sale, use or other dealings in this Software without prior written --
32504
+-- authorization. --
32505
+-------------------------------------------------------------------------------
32506
+-- $Id: README-first,v 1.8 2006/04/22 22:19:37 tom Exp $
32507
-------------------------------------------------------------------------------
32508
C++ interface to ncurses routines
32509
-----------------------------------------------------------------------
32510
Index: ncurses-5.5/convert_configure.pl
32511
===================================================================
32512
--- ncurses-5.5.orig/convert_configure.pl 2000-10-09 19:53:57.000000000 -0400
32513
+++ ncurses-5.5/convert_configure.pl 2006-04-29 10:41:13.000000000 -0400
32514
@@ -1,5 +1,34 @@
32515
extproc perl -S -w
32516
32517
+# $Id: convert_configure.pl,v 1.3 2006/04/22 23:04:06 tom Exp $
32518
+##############################################################################
32519
+# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. #
32520
+# #
32521
+# Permission is hereby granted, free of charge, to any person obtaining a #
32522
+# copy of this software and associated documentation files (the "Software"), #
32523
+# to deal in the Software without restriction, including without limitation #
32524
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
32525
+# with modifications, sublicense, and/or sell copies of the Software, and to #
32526
+# permit persons to whom the Software is furnished to do so, subject to the #
32527
+# following conditions: #
32528
+# #
32529
+# The above copyright notice and this permission notice shall be included in #
32530
+# all copies or substantial portions of the Software. #
32531
+# #
32532
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
32533
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
32534
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
32535
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
32536
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
32537
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
32538
+# DEALINGS IN THE SOFTWARE. #
32539
+# #
32540
+# Except as contained in this notice, the name(s) of the above copyright #
32541
+# holders shall not be used in advertising or otherwise to promote the sale, #
32542
+# use or other dealings in this Software without prior written #
32543
+# authorization. #
32544
+##############################################################################
32545
+
32546
# The converted script is written to stdout, so run this script as
32547
# convert_configure configure > configure.cmd
32548
#
32549
Index: ncurses-5.5/doc/html/announce.html
32550
===================================================================
32551
--- ncurses-5.5.orig/doc/html/announce.html 2005-10-09 10:18:35.000000000 -0400
32552
+++ ncurses-5.5/doc/html/announce.html 2006-04-29 10:41:13.000000000 -0400
32553
@@ -1,6 +1,33 @@
32554
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
32555
<!--
32556
- $Id: announce.html,v 1.49 2005/10/09 14:18:35 tom Exp $
32557
+ $Id: announce.html,v 1.50 2006/04/22 22:29:12 tom Exp $
32558
+ ****************************************************************************
32559
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32560
+ * *
32561
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32562
+ * copy of this software and associated documentation files (the *
32563
+ * "Software"), to deal in the Software without restriction, including *
32564
+ * without limitation the rights to use, copy, modify, merge, publish, *
32565
+ * distribute, distribute with modifications, sublicense, and/or sell *
32566
+ * copies of the Software, and to permit persons to whom the Software is *
32567
+ * furnished to do so, subject to the following conditions: *
32568
+ * *
32569
+ * The above copyright notice and this permission notice shall be included *
32570
+ * in all copies or substantial portions of the Software. *
32571
+ * *
32572
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32573
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32574
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32575
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32576
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32577
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32578
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32579
+ * *
32580
+ * Except as contained in this notice, the name(s) of the above copyright *
32581
+ * holders shall not be used in advertising or otherwise to promote the *
32582
+ * sale, use or other dealings in this Software without prior written *
32583
+ * authorization. *
32584
+ ****************************************************************************
32585
-->
32586
<HTML>
32587
<HEAD>
32588
Index: ncurses-5.5/doc/html/index.html
32589
===================================================================
32590
--- ncurses-5.5.orig/doc/html/index.html 2000-03-05 13:22:05.000000000 -0500
32591
+++ ncurses-5.5/doc/html/index.html 2006-04-29 10:41:13.000000000 -0400
32592
@@ -1,6 +1,33 @@
32593
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
32594
<!--
32595
- $Id: index.html,v 1.1 2000/03/05 18:22:05 juergen Exp $
32596
+ $Id: index.html,v 1.2 2006/04/22 22:29:12 tom Exp $
32597
+ ****************************************************************************
32598
+ * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. *
32599
+ * *
32600
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32601
+ * copy of this software and associated documentation files (the *
32602
+ * "Software"), to deal in the Software without restriction, including *
32603
+ * without limitation the rights to use, copy, modify, merge, publish, *
32604
+ * distribute, distribute with modifications, sublicense, and/or sell *
32605
+ * copies of the Software, and to permit persons to whom the Software is *
32606
+ * furnished to do so, subject to the following conditions: *
32607
+ * *
32608
+ * The above copyright notice and this permission notice shall be included *
32609
+ * in all copies or substantial portions of the Software. *
32610
+ * *
32611
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32612
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32613
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32614
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32615
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32616
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32617
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32618
+ * *
32619
+ * Except as contained in this notice, the name(s) of the above copyright *
32620
+ * holders shall not be used in advertising or otherwise to promote the *
32621
+ * sale, use or other dealings in this Software without prior written *
32622
+ * authorization. *
32623
+ ****************************************************************************
32624
-->
32625
<HTML>
32626
<HEAD>
32627
Index: ncurses-5.5/doc/html/man/index.html
32628
===================================================================
32629
--- ncurses-5.5.orig/doc/html/man/index.html 2001-09-01 20:53:24.000000000 -0400
32630
+++ ncurses-5.5/doc/html/man/index.html 2006-04-29 10:41:13.000000000 -0400
32631
@@ -1,6 +1,33 @@
32632
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
32633
<!--
32634
- $Id: index.html,v 1.1 2001/09/02 00:53:24 tom Exp $
32635
+ $Id: index.html,v 1.2 2006/04/22 22:29:12 tom Exp $
32636
+ ****************************************************************************
32637
+ * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. *
32638
+ * *
32639
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32640
+ * copy of this software and associated documentation files (the *
32641
+ * "Software"), to deal in the Software without restriction, including *
32642
+ * without limitation the rights to use, copy, modify, merge, publish, *
32643
+ * distribute, distribute with modifications, sublicense, and/or sell *
32644
+ * copies of the Software, and to permit persons to whom the Software is *
32645
+ * furnished to do so, subject to the following conditions: *
32646
+ * *
32647
+ * The above copyright notice and this permission notice shall be included *
32648
+ * in all copies or substantial portions of the Software. *
32649
+ * *
32650
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32651
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32652
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32653
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32654
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32655
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32656
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32657
+ * *
32658
+ * Except as contained in this notice, the name(s) of the above copyright *
32659
+ * holders shall not be used in advertising or otherwise to promote the *
32660
+ * sale, use or other dealings in this Software without prior written *
32661
+ * authorization. *
32662
+ ****************************************************************************
32663
-->
32664
<HTML>
32665
<HEAD>
32666
Index: ncurses-5.5/form/READ.ME
32667
===================================================================
32668
--- ncurses-5.5.orig/form/READ.ME 2003-10-25 11:12:53.000000000 -0400
32669
+++ ncurses-5.5/form/READ.ME 2006-04-29 10:41:13.000000000 -0400
32670
@@ -1,5 +1,33 @@
32671
--- $Id: READ.ME,v 0.6 2003/10/25 15:12:53 tom Exp $
32672
-------------------------------------------------------------------------------
32673
+-- Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. --
32674
+-- --
32675
+-- Permission is hereby granted, free of charge, to any person obtaining a --
32676
+-- copy of this software and associated documentation files (the --
32677
+-- "Software"), to deal in the Software without restriction, including --
32678
+-- without limitation the rights to use, copy, modify, merge, publish, --
32679
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
32680
+-- of the Software, and to permit persons to whom the Software is furnished --
32681
+-- to do so, subject to the following conditions: --
32682
+-- --
32683
+-- The above copyright notice and this permission notice shall be included --
32684
+-- in all copies or substantial portions of the Software. --
32685
+-- --
32686
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
32687
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
32688
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
32689
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
32690
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
32691
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
32692
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
32693
+-- --
32694
+-- Except as contained in this notice, the name(s) of the above copyright --
32695
+-- holders shall not be used in advertising or otherwise to promote the --
32696
+-- sale, use or other dealings in this Software without prior written --
32697
+-- authorization. --
32698
+-------------------------------------------------------------------------------
32699
+-- $Id: READ.ME,v 0.7 2006/04/22 23:13:05 tom Exp $
32700
+-------------------------------------------------------------------------------
32701
+
32702
This is a clone of the form library that is available with typical
32703
System V curses implementations (ETI).
32704
32705
Index: ncurses-5.5/form/fty_alnum.c
32706
===================================================================
32707
--- ncurses-5.5.orig/form/fty_alnum.c 2005-08-20 14:26:16.000000000 -0400
32708
+++ ncurses-5.5/form/fty_alnum.c 2006-04-29 10:41:13.000000000 -0400
32709
@@ -1,9 +1,31 @@
32710
-/*
32711
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32712
- * You may freely copy it for use as a template for your own field types.
32713
- * If you develop a field type that might be of general use, please send
32714
- * it back to the ncurses maintainers for inclusion in the next version.
32715
- */
32716
+/****************************************************************************
32717
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32718
+ * *
32719
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32720
+ * copy of this software and associated documentation files (the *
32721
+ * "Software"), to deal in the Software without restriction, including *
32722
+ * without limitation the rights to use, copy, modify, merge, publish, *
32723
+ * distribute, distribute with modifications, sublicense, and/or sell *
32724
+ * copies of the Software, and to permit persons to whom the Software is *
32725
+ * furnished to do so, subject to the following conditions: *
32726
+ * *
32727
+ * The above copyright notice and this permission notice shall be included *
32728
+ * in all copies or substantial portions of the Software. *
32729
+ * *
32730
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32731
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32732
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32733
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32734
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32735
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32736
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32737
+ * *
32738
+ * Except as contained in this notice, the name(s) of the above copyright *
32739
+ * holders shall not be used in advertising or otherwise to promote the *
32740
+ * sale, use or other dealings in this Software without prior written *
32741
+ * authorization. *
32742
+ ****************************************************************************/
32743
+
32744
/***************************************************************************
32745
* *
32746
* Author : Juergen Pfeifer *
32747
@@ -12,7 +34,7 @@
32748
32749
#include "form.priv.h"
32750
32751
-MODULE_ID("$Id: fty_alnum.c,v 1.18 2005/08/20 18:26:16 tom Exp $")
32752
+MODULE_ID("$Id: fty_alnum.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
32753
32754
#define thisARG alnumARG
32755
32756
Index: ncurses-5.5/form/fty_alpha.c
32757
===================================================================
32758
--- ncurses-5.5.orig/form/fty_alpha.c 2005-08-20 14:37:48.000000000 -0400
32759
+++ ncurses-5.5/form/fty_alpha.c 2006-04-29 10:41:13.000000000 -0400
32760
@@ -1,9 +1,31 @@
32761
-/*
32762
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32763
- * You may freely copy it for use as a template for your own field types.
32764
- * If you develop a field type that might be of general use, please send
32765
- * it back to the ncurses maintainers for inclusion in the next version.
32766
- */
32767
+/****************************************************************************
32768
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32769
+ * *
32770
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32771
+ * copy of this software and associated documentation files (the *
32772
+ * "Software"), to deal in the Software without restriction, including *
32773
+ * without limitation the rights to use, copy, modify, merge, publish, *
32774
+ * distribute, distribute with modifications, sublicense, and/or sell *
32775
+ * copies of the Software, and to permit persons to whom the Software is *
32776
+ * furnished to do so, subject to the following conditions: *
32777
+ * *
32778
+ * The above copyright notice and this permission notice shall be included *
32779
+ * in all copies or substantial portions of the Software. *
32780
+ * *
32781
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32782
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32783
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32784
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32785
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32786
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32787
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32788
+ * *
32789
+ * Except as contained in this notice, the name(s) of the above copyright *
32790
+ * holders shall not be used in advertising or otherwise to promote the *
32791
+ * sale, use or other dealings in this Software without prior written *
32792
+ * authorization. *
32793
+ ****************************************************************************/
32794
+
32795
/***************************************************************************
32796
* *
32797
* Author : Juergen Pfeifer *
32798
@@ -12,7 +34,7 @@
32799
32800
#include "form.priv.h"
32801
32802
-MODULE_ID("$Id: fty_alpha.c,v 1.20 2005/08/20 18:37:48 tom Exp $")
32803
+MODULE_ID("$Id: fty_alpha.c,v 1.21 2006/04/22 21:33:05 tom Exp $")
32804
32805
#define thisARG alphaARG
32806
32807
Index: ncurses-5.5/form/fty_enum.c
32808
===================================================================
32809
--- ncurses-5.5.orig/form/fty_enum.c 2004-05-29 15:05:20.000000000 -0400
32810
+++ ncurses-5.5/form/fty_enum.c 2006-04-29 10:41:13.000000000 -0400
32811
@@ -1,10 +1,31 @@
32812
+/****************************************************************************
32813
+ * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
32814
+ * *
32815
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32816
+ * copy of this software and associated documentation files (the *
32817
+ * "Software"), to deal in the Software without restriction, including *
32818
+ * without limitation the rights to use, copy, modify, merge, publish, *
32819
+ * distribute, distribute with modifications, sublicense, and/or sell *
32820
+ * copies of the Software, and to permit persons to whom the Software is *
32821
+ * furnished to do so, subject to the following conditions: *
32822
+ * *
32823
+ * The above copyright notice and this permission notice shall be included *
32824
+ * in all copies or substantial portions of the Software. *
32825
+ * *
32826
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32827
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32828
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32829
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32830
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32831
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32832
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32833
+ * *
32834
+ * Except as contained in this notice, the name(s) of the above copyright *
32835
+ * holders shall not be used in advertising or otherwise to promote the *
32836
+ * sale, use or other dealings in this Software without prior written *
32837
+ * authorization. *
32838
+ ****************************************************************************/
32839
32840
-/*
32841
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32842
- * You may freely copy it for use as a template for your own field types.
32843
- * If you develop a field type that might be of general use, please send
32844
- * it back to the ncurses maintainers for inclusion in the next version.
32845
- */
32846
/***************************************************************************
32847
* *
32848
* Author : Juergen Pfeifer *
32849
@@ -13,7 +34,7 @@
32850
32851
#include "form.priv.h"
32852
32853
-MODULE_ID("$Id: fty_enum.c,v 1.19 2004/05/29 19:05:20 tom Exp $")
32854
+MODULE_ID("$Id: fty_enum.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
32855
32856
typedef struct
32857
{
32858
Index: ncurses-5.5/form/fty_int.c
32859
===================================================================
32860
--- ncurses-5.5.orig/form/fty_int.c 2005-08-20 14:26:16.000000000 -0400
32861
+++ ncurses-5.5/form/fty_int.c 2006-04-29 10:41:13.000000000 -0400
32862
@@ -1,9 +1,31 @@
32863
-/*
32864
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32865
- * You may freely copy it for use as a template for your own field types.
32866
- * If you develop a field type that might be of general use, please send
32867
- * it back to the ncurses maintainers for inclusion in the next version.
32868
- */
32869
+/****************************************************************************
32870
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32871
+ * *
32872
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32873
+ * copy of this software and associated documentation files (the *
32874
+ * "Software"), to deal in the Software without restriction, including *
32875
+ * without limitation the rights to use, copy, modify, merge, publish, *
32876
+ * distribute, distribute with modifications, sublicense, and/or sell *
32877
+ * copies of the Software, and to permit persons to whom the Software is *
32878
+ * furnished to do so, subject to the following conditions: *
32879
+ * *
32880
+ * The above copyright notice and this permission notice shall be included *
32881
+ * in all copies or substantial portions of the Software. *
32882
+ * *
32883
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32884
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32885
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32886
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32887
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32888
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32889
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32890
+ * *
32891
+ * Except as contained in this notice, the name(s) of the above copyright *
32892
+ * holders shall not be used in advertising or otherwise to promote the *
32893
+ * sale, use or other dealings in this Software without prior written *
32894
+ * authorization. *
32895
+ ****************************************************************************/
32896
+
32897
/***************************************************************************
32898
* *
32899
* Author : Juergen Pfeifer *
32900
@@ -12,7 +34,7 @@
32901
32902
#include "form.priv.h"
32903
32904
-MODULE_ID("$Id: fty_int.c,v 1.19 2005/08/20 18:26:16 tom Exp $")
32905
+MODULE_ID("$Id: fty_int.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
32906
32907
#if USE_WIDEC_SUPPORT
32908
#define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
32909
Index: ncurses-5.5/form/fty_ipv4.c
32910
===================================================================
32911
--- ncurses-5.5.orig/form/fty_ipv4.c 2004-05-29 15:13:48.000000000 -0400
32912
+++ ncurses-5.5/form/fty_ipv4.c 2006-04-29 10:41:13.000000000 -0400
32913
@@ -1,10 +1,31 @@
32914
+/****************************************************************************
32915
+ * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
32916
+ * *
32917
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32918
+ * copy of this software and associated documentation files (the *
32919
+ * "Software"), to deal in the Software without restriction, including *
32920
+ * without limitation the rights to use, copy, modify, merge, publish, *
32921
+ * distribute, distribute with modifications, sublicense, and/or sell *
32922
+ * copies of the Software, and to permit persons to whom the Software is *
32923
+ * furnished to do so, subject to the following conditions: *
32924
+ * *
32925
+ * The above copyright notice and this permission notice shall be included *
32926
+ * in all copies or substantial portions of the Software. *
32927
+ * *
32928
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32929
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32930
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32931
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32932
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32933
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32934
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32935
+ * *
32936
+ * Except as contained in this notice, the name(s) of the above copyright *
32937
+ * holders shall not be used in advertising or otherwise to promote the *
32938
+ * sale, use or other dealings in this Software without prior written *
32939
+ * authorization. *
32940
+ ****************************************************************************/
32941
32942
-/*
32943
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32944
- * You may freely copy it for use as a template for your own field types.
32945
- * If you develop a field type that might be of general use, please send
32946
- * it back to the ncurses maintainers for inclusion in the next version.
32947
- */
32948
/***************************************************************************
32949
* *
32950
* Author : Per Foreby, perf@efd.lth.se *
32951
@@ -13,7 +34,7 @@
32952
32953
#include "form.priv.h"
32954
32955
-MODULE_ID("$Id: fty_ipv4.c,v 1.6 2004/05/29 19:13:48 tom Exp $")
32956
+MODULE_ID("$Id: fty_ipv4.c,v 1.7 2006/04/22 21:33:05 tom Exp $")
32957
32958
/*---------------------------------------------------------------------------
32959
| Facility : libnform
32960
Index: ncurses-5.5/form/fty_num.c
32961
===================================================================
32962
--- ncurses-5.5.orig/form/fty_num.c 2005-08-20 14:26:16.000000000 -0400
32963
+++ ncurses-5.5/form/fty_num.c 2006-04-29 10:41:13.000000000 -0400
32964
@@ -1,9 +1,31 @@
32965
-/*
32966
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
32967
- * You may freely copy it for use as a template for your own field types.
32968
- * If you develop a field type that might be of general use, please send
32969
- * it back to the ncurses maintainers for inclusion in the next version.
32970
- */
32971
+/****************************************************************************
32972
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
32973
+ * *
32974
+ * Permission is hereby granted, free of charge, to any person obtaining a *
32975
+ * copy of this software and associated documentation files (the *
32976
+ * "Software"), to deal in the Software without restriction, including *
32977
+ * without limitation the rights to use, copy, modify, merge, publish, *
32978
+ * distribute, distribute with modifications, sublicense, and/or sell *
32979
+ * copies of the Software, and to permit persons to whom the Software is *
32980
+ * furnished to do so, subject to the following conditions: *
32981
+ * *
32982
+ * The above copyright notice and this permission notice shall be included *
32983
+ * in all copies or substantial portions of the Software. *
32984
+ * *
32985
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
32986
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
32987
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
32988
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
32989
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
32990
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
32991
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
32992
+ * *
32993
+ * Except as contained in this notice, the name(s) of the above copyright *
32994
+ * holders shall not be used in advertising or otherwise to promote the *
32995
+ * sale, use or other dealings in this Software without prior written *
32996
+ * authorization. *
32997
+ ****************************************************************************/
32998
+
32999
/***************************************************************************
33000
* *
33001
* Author : Juergen Pfeifer *
33002
@@ -12,7 +34,7 @@
33003
33004
#include "form.priv.h"
33005
33006
-MODULE_ID("$Id: fty_num.c,v 1.22 2005/08/20 18:26:16 tom Exp $")
33007
+MODULE_ID("$Id: fty_num.c,v 1.23 2006/04/22 21:33:05 tom Exp $")
33008
33009
#if HAVE_LOCALE_H
33010
#include <locale.h>
33011
Index: ncurses-5.5/form/fty_regex.c
33012
===================================================================
33013
--- ncurses-5.5.orig/form/fty_regex.c 2004-05-29 15:19:09.000000000 -0400
33014
+++ ncurses-5.5/form/fty_regex.c 2006-04-29 10:41:13.000000000 -0400
33015
@@ -1,10 +1,31 @@
33016
+/****************************************************************************
33017
+ * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
33018
+ * *
33019
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33020
+ * copy of this software and associated documentation files (the *
33021
+ * "Software"), to deal in the Software without restriction, including *
33022
+ * without limitation the rights to use, copy, modify, merge, publish, *
33023
+ * distribute, distribute with modifications, sublicense, and/or sell *
33024
+ * copies of the Software, and to permit persons to whom the Software is *
33025
+ * furnished to do so, subject to the following conditions: *
33026
+ * *
33027
+ * The above copyright notice and this permission notice shall be included *
33028
+ * in all copies or substantial portions of the Software. *
33029
+ * *
33030
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33031
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33032
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33033
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33034
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33035
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33036
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33037
+ * *
33038
+ * Except as contained in this notice, the name(s) of the above copyright *
33039
+ * holders shall not be used in advertising or otherwise to promote the *
33040
+ * sale, use or other dealings in this Software without prior written *
33041
+ * authorization. *
33042
+ ****************************************************************************/
33043
33044
-/*
33045
- * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
33046
- * You may freely copy it for use as a template for your own field types.
33047
- * If you develop a field type that might be of general use, please send
33048
- * it back to the ncurses maintainers for inclusion in the next version.
33049
- */
33050
/***************************************************************************
33051
* *
33052
* Author : Juergen Pfeifer *
33053
@@ -13,7 +34,7 @@
33054
33055
#include "form.priv.h"
33056
33057
-MODULE_ID("$Id: fty_regex.c,v 1.18 2004/05/29 19:19:09 tom Exp $")
33058
+MODULE_ID("$Id: fty_regex.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
33059
33060
#if HAVE_REGEX_H_FUNCS /* We prefer POSIX regex */
33061
#include <regex.h>
33062
Index: ncurses-5.5/include/MKhashsize.sh
33063
===================================================================
33064
--- ncurses-5.5.orig/include/MKhashsize.sh 1996-05-11 09:17:23.000000000 -0400
33065
+++ ncurses-5.5/include/MKhashsize.sh 2006-04-29 10:41:13.000000000 -0400
33066
@@ -1,4 +1,32 @@
33067
#!/bin/sh
33068
+##############################################################################
33069
+# Copyright (c) 1998,2006 Free Software Foundation, Inc. #
33070
+# #
33071
+# Permission is hereby granted, free of charge, to any person obtaining a #
33072
+# copy of this software and associated documentation files (the "Software"), #
33073
+# to deal in the Software without restriction, including without limitation #
33074
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33075
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33076
+# permit persons to whom the Software is furnished to do so, subject to the #
33077
+# following conditions: #
33078
+# #
33079
+# The above copyright notice and this permission notice shall be included in #
33080
+# all copies or substantial portions of the Software. #
33081
+# #
33082
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33083
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33084
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33085
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33086
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33087
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33088
+# DEALINGS IN THE SOFTWARE. #
33089
+# #
33090
+# Except as contained in this notice, the name(s) of the above copyright #
33091
+# holders shall not be used in advertising or otherwise to promote the sale, #
33092
+# use or other dealings in this Software without prior written #
33093
+# authorization. #
33094
+##############################################################################
33095
+# $Id: MKhashsize.sh,v 1.5 2006/04/22 21:36:16 tom Exp $
33096
#
33097
# MKhashsize.sh --- generate size include for hash functions
33098
#
33099
Index: ncurses-5.5/include/MKparametrized.sh
33100
===================================================================
33101
--- ncurses-5.5.orig/include/MKparametrized.sh 2000-09-30 20:57:24.000000000 -0400
33102
+++ ncurses-5.5/include/MKparametrized.sh 2006-04-29 10:41:13.000000000 -0400
33103
@@ -1,5 +1,32 @@
33104
#!/bin/sh
33105
-# $Id: MKparametrized.sh,v 1.5 2000/10/01 00:57:24 tom Exp $
33106
+##############################################################################
33107
+# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. #
33108
+# #
33109
+# Permission is hereby granted, free of charge, to any person obtaining a #
33110
+# copy of this software and associated documentation files (the "Software"), #
33111
+# to deal in the Software without restriction, including without limitation #
33112
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33113
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33114
+# permit persons to whom the Software is furnished to do so, subject to the #
33115
+# following conditions: #
33116
+# #
33117
+# The above copyright notice and this permission notice shall be included in #
33118
+# all copies or substantial portions of the Software. #
33119
+# #
33120
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33121
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33122
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33123
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33124
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33125
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33126
+# DEALINGS IN THE SOFTWARE. #
33127
+# #
33128
+# Except as contained in this notice, the name(s) of the above copyright #
33129
+# holders shall not be used in advertising or otherwise to promote the sale, #
33130
+# use or other dealings in this Software without prior written #
33131
+# authorization. #
33132
+##############################################################################
33133
+# $Id: MKparametrized.sh,v 1.6 2006/04/22 21:36:16 tom Exp $
33134
#
33135
# MKparametrized.sh -- generate indirection vectors for various sort methods
33136
#
33137
Index: ncurses-5.5/include/ncurses_dll.h
33138
===================================================================
33139
--- ncurses-5.5.orig/include/ncurses_dll.h 2003-07-19 14:44:32.000000000 -0400
33140
+++ ncurses-5.5/include/ncurses_dll.h 2006-04-29 10:41:13.000000000 -0400
33141
@@ -1,4 +1,31 @@
33142
-/* $Id: ncurses_dll.h,v 1.4 2003/07/19 18:44:32 Charles.Wilson Exp $ */
33143
+/****************************************************************************
33144
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
33145
+ * *
33146
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33147
+ * copy of this software and associated documentation files (the *
33148
+ * "Software"), to deal in the Software without restriction, including *
33149
+ * without limitation the rights to use, copy, modify, merge, publish, *
33150
+ * distribute, distribute with modifications, sublicense, and/or sell *
33151
+ * copies of the Software, and to permit persons to whom the Software is *
33152
+ * furnished to do so, subject to the following conditions: *
33153
+ * *
33154
+ * The above copyright notice and this permission notice shall be included *
33155
+ * in all copies or substantial portions of the Software. *
33156
+ * *
33157
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33158
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33159
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33160
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33161
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33162
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33163
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33164
+ * *
33165
+ * Except as contained in this notice, the name(s) of the above copyright *
33166
+ * holders shall not be used in advertising or otherwise to promote the *
33167
+ * sale, use or other dealings in this Software without prior written *
33168
+ * authorization. *
33169
+ ****************************************************************************/
33170
+/* $Id: ncurses_dll.h,v 1.5 2006/04/22 22:07:51 tom Exp $ */
33171
33172
#ifndef NCURSES_DLL_H_incl
33173
#define NCURSES_DLL_H_incl 1
33174
Index: ncurses-5.5/man/man_db.renames
33175
===================================================================
33176
--- ncurses-5.5.orig/man/man_db.renames 2005-06-25 14:30:53.000000000 -0400
33177
+++ ncurses-5.5/man/man_db.renames 2006-04-29 10:41:13.000000000 -0400
33178
@@ -1,4 +1,31 @@
33179
-# $Id: man_db.renames,v 0.34 2005/06/25 18:30:53 Daniel.Jacobowitz Exp $
33180
+##############################################################################
33181
+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
33182
+# #
33183
+# Permission is hereby granted, free of charge, to any person obtaining a #
33184
+# copy of this software and associated documentation files (the "Software"), #
33185
+# to deal in the Software without restriction, including without limitation #
33186
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33187
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33188
+# permit persons to whom the Software is furnished to do so, subject to the #
33189
+# following conditions: #
33190
+# #
33191
+# The above copyright notice and this permission notice shall be included in #
33192
+# all copies or substantial portions of the Software. #
33193
+# #
33194
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33195
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33196
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33197
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33198
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33199
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33200
+# DEALINGS IN THE SOFTWARE. #
33201
+# #
33202
+# Except as contained in this notice, the name(s) of the above copyright #
33203
+# holders shall not be used in advertising or otherwise to promote the sale, #
33204
+# use or other dealings in this Software without prior written #
33205
+# authorization. #
33206
+##############################################################################
33207
+# $Id: man_db.renames,v 0.35 2006/04/22 21:46:17 tom Exp $
33208
# Manual-page renamings for the man_db program
33209
#
33210
# Files:
33211
Index: ncurses-5.5/menu/READ.ME
33212
===================================================================
33213
--- ncurses-5.5.orig/menu/READ.ME 2003-10-25 11:22:35.000000000 -0400
33214
+++ ncurses-5.5/menu/READ.ME 2006-04-29 10:41:13.000000000 -0400
33215
@@ -1,5 +1,33 @@
33216
--- $Id: READ.ME,v 1.8 2003/10/25 15:22:35 tom Exp $
33217
-------------------------------------------------------------------------------
33218
+-- Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. --
33219
+-- --
33220
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33221
+-- copy of this software and associated documentation files (the --
33222
+-- "Software"), to deal in the Software without restriction, including --
33223
+-- without limitation the rights to use, copy, modify, merge, publish, --
33224
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33225
+-- of the Software, and to permit persons to whom the Software is furnished --
33226
+-- to do so, subject to the following conditions: --
33227
+-- --
33228
+-- The above copyright notice and this permission notice shall be included --
33229
+-- in all copies or substantial portions of the Software. --
33230
+-- --
33231
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33232
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33233
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33234
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33235
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33236
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33237
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33238
+-- --
33239
+-- Except as contained in this notice, the name(s) of the above copyright --
33240
+-- holders shall not be used in advertising or otherwise to promote the --
33241
+-- sale, use or other dealings in this Software without prior written --
33242
+-- authorization. --
33243
+-------------------------------------------------------------------------------
33244
+-- $Id: READ.ME,v 1.9 2006/04/22 23:13:05 tom Exp $
33245
+-------------------------------------------------------------------------------
33246
+
33247
This is a clone of the menu library that is available with typical
33248
System V curses implementations (ETI).
33249
33250
Index: ncurses-5.5/misc/chkdef.cmd
33251
===================================================================
33252
--- ncurses-5.5.orig/misc/chkdef.cmd 1998-08-29 17:45:58.000000000 -0400
33253
+++ ncurses-5.5/misc/chkdef.cmd 2006-04-29 10:41:13.000000000 -0400
33254
@@ -1,5 +1,33 @@
33255
+/****************************************************************************
33256
+ * Copyright (c) 1998,2006 Free Software Foundation, Inc. *
33257
+ * *
33258
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33259
+ * copy of this software and associated documentation files (the *
33260
+ * "Software"), to deal in the Software without restriction, including *
33261
+ * without limitation the rights to use, copy, modify, merge, publish, *
33262
+ * distribute, distribute with modifications, sublicense, and/or sell *
33263
+ * copies of the Software, and to permit persons to whom the Software is *
33264
+ * furnished to do so, subject to the following conditions: *
33265
+ * *
33266
+ * The above copyright notice and this permission notice shall be included *
33267
+ * in all copies or substantial portions of the Software. *
33268
+ * *
33269
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33270
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33271
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33272
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33273
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33274
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33275
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33276
+ * *
33277
+ * Except as contained in this notice, the name(s) of the above copyright *
33278
+ * holders shall not be used in advertising or otherwise to promote the *
33279
+ * sale, use or other dealings in this Software without prior written *
33280
+ * authorization. *
33281
+ ****************************************************************************/
33282
+
33283
/*
33284
- * $Id: chkdef.cmd,v 1.2 1998/08/29 21:45:58 tom Exp $
33285
+ * $Id: chkdef.cmd,v 1.3 2006/04/22 23:14:50 tom Exp $
33286
*
33287
* Author: Juan Jose Garcia Ripoll <worm@arrakis.es>.
33288
* Webpage: http://www.arrakis.es/~worm/
33289
Index: ncurses-5.5/misc/cleantic.cmd
33290
===================================================================
33291
--- ncurses-5.5.orig/misc/cleantic.cmd 1998-08-29 17:43:19.000000000 -0400
33292
+++ ncurses-5.5/misc/cleantic.cmd 2006-04-29 10:41:13.000000000 -0400
33293
@@ -1,5 +1,33 @@
33294
+/****************************************************************************
33295
+ * Copyright (c) 1998,2006 Free Software Foundation, Inc. *
33296
+ * *
33297
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33298
+ * copy of this software and associated documentation files (the *
33299
+ * "Software"), to deal in the Software without restriction, including *
33300
+ * without limitation the rights to use, copy, modify, merge, publish, *
33301
+ * distribute, distribute with modifications, sublicense, and/or sell *
33302
+ * copies of the Software, and to permit persons to whom the Software is *
33303
+ * furnished to do so, subject to the following conditions: *
33304
+ * *
33305
+ * The above copyright notice and this permission notice shall be included *
33306
+ * in all copies or substantial portions of the Software. *
33307
+ * *
33308
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33309
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33310
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33311
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33312
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33313
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33314
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33315
+ * *
33316
+ * Except as contained in this notice, the name(s) of the above copyright *
33317
+ * holders shall not be used in advertising or otherwise to promote the *
33318
+ * sale, use or other dealings in this Software without prior written *
33319
+ * authorization. *
33320
+ ****************************************************************************/
33321
+
33322
/*
33323
- * $Id: cleantic.cmd,v 1.3 1998/08/29 21:43:19 tom Exp $
33324
+ * $Id: cleantic.cmd,v 1.4 2006/04/22 23:14:50 tom Exp $
33325
*
33326
* Author: Juan Jose Garcia Ripoll <worm@arrakis.es>.
33327
* Webpage: http://www.arrakis.es/~worm/
33328
Index: ncurses-5.5/misc/cmpdef.cmd
33329
===================================================================
33330
--- ncurses-5.5.orig/misc/cmpdef.cmd 1998-08-29 17:44:47.000000000 -0400
33331
+++ ncurses-5.5/misc/cmpdef.cmd 2006-04-29 10:41:13.000000000 -0400
33332
@@ -1,5 +1,33 @@
33333
+/****************************************************************************
33334
+ * Copyright (c) 1998,2006 Free Software Foundation, Inc. *
33335
+ * *
33336
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33337
+ * copy of this software and associated documentation files (the *
33338
+ * "Software"), to deal in the Software without restriction, including *
33339
+ * without limitation the rights to use, copy, modify, merge, publish, *
33340
+ * distribute, distribute with modifications, sublicense, and/or sell *
33341
+ * copies of the Software, and to permit persons to whom the Software is *
33342
+ * furnished to do so, subject to the following conditions: *
33343
+ * *
33344
+ * The above copyright notice and this permission notice shall be included *
33345
+ * in all copies or substantial portions of the Software. *
33346
+ * *
33347
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33348
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33349
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33350
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33351
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33352
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33353
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33354
+ * *
33355
+ * Except as contained in this notice, the name(s) of the above copyright *
33356
+ * holders shall not be used in advertising or otherwise to promote the *
33357
+ * sale, use or other dealings in this Software without prior written *
33358
+ * authorization. *
33359
+ ****************************************************************************/
33360
+
33361
/*
33362
- * $Id: cmpdef.cmd,v 1.2 1998/08/29 21:44:47 tom Exp $
33363
+ * $Id: cmpdef.cmd,v 1.3 2006/04/22 23:14:50 tom Exp $
33364
*
33365
* Author: Juan Jose Garcia Ripoll <worm@arrakis.es>.
33366
* Webpage: http://www.arrakis.es/~worm/
33367
Index: ncurses-5.5/misc/emx.src
33368
===================================================================
33369
--- ncurses-5.5.orig/misc/emx.src 2003-01-25 20:17:55.000000000 -0500
33370
+++ ncurses-5.5/misc/emx.src 2006-04-29 10:41:13.000000000 -0400
33371
@@ -1,4 +1,31 @@
33372
-# $Id: emx.src,v 1.8 2003/01/26 01:17:55 tom Exp $
33373
+##############################################################################
33374
+# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. #
33375
+# #
33376
+# Permission is hereby granted, free of charge, to any person obtaining a #
33377
+# copy of this software and associated documentation files (the "Software"), #
33378
+# to deal in the Software without restriction, including without limitation #
33379
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33380
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33381
+# permit persons to whom the Software is furnished to do so, subject to the #
33382
+# following conditions: #
33383
+# #
33384
+# The above copyright notice and this permission notice shall be included in #
33385
+# all copies or substantial portions of the Software. #
33386
+# #
33387
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33388
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33389
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33390
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33391
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33392
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33393
+# DEALINGS IN THE SOFTWARE. #
33394
+# #
33395
+# Except as contained in this notice, the name(s) of the above copyright #
33396
+# holders shall not be used in advertising or otherwise to promote the sale, #
33397
+# use or other dealings in this Software without prior written #
33398
+# authorization. #
33399
+##############################################################################
33400
+# $Id: emx.src,v 1.9 2006/04/22 21:46:17 tom Exp $
33401
# This is a reformatted copy of the terminfo source for OS/2 EMX from
33402
# Juan Jose Garcia Ripoll <worm@arrakis.es>.
33403
# http://www.arrakis.es/~worm/
33404
Index: ncurses-5.5/misc/makedef.cmd
33405
===================================================================
33406
--- ncurses-5.5.orig/misc/makedef.cmd 1998-11-21 22:14:08.000000000 -0500
33407
+++ ncurses-5.5/misc/makedef.cmd 2006-04-29 10:41:13.000000000 -0400
33408
@@ -1,5 +1,33 @@
33409
+/****************************************************************************
33410
+ * Copyright (c) 1998,2006 Free Software Foundation, Inc. *
33411
+ * *
33412
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33413
+ * copy of this software and associated documentation files (the *
33414
+ * "Software"), to deal in the Software without restriction, including *
33415
+ * without limitation the rights to use, copy, modify, merge, publish, *
33416
+ * distribute, distribute with modifications, sublicense, and/or sell *
33417
+ * copies of the Software, and to permit persons to whom the Software is *
33418
+ * furnished to do so, subject to the following conditions: *
33419
+ * *
33420
+ * The above copyright notice and this permission notice shall be included *
33421
+ * in all copies or substantial portions of the Software. *
33422
+ * *
33423
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33424
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33425
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33426
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33427
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33428
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33429
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33430
+ * *
33431
+ * Except as contained in this notice, the name(s) of the above copyright *
33432
+ * holders shall not be used in advertising or otherwise to promote the *
33433
+ * sale, use or other dealings in this Software without prior written *
33434
+ * authorization. *
33435
+ ****************************************************************************/
33436
+
33437
/*
33438
- * $Id: makedef.cmd,v 1.4 1998/11/22 03:14:08 tom Exp $
33439
+ * $Id: makedef.cmd,v 1.5 2006/04/22 23:14:50 tom Exp $
33440
*
33441
* Author: Juan Jose Garcia Ripoll <worm@arrakis.es>.
33442
* Webpage: http://www.arrakis.es/~worm/
33443
Index: ncurses-5.5/ncurses/README
33444
===================================================================
33445
--- ncurses-5.5.orig/ncurses/README 2000-12-09 21:37:43.000000000 -0500
33446
+++ ncurses-5.5/ncurses/README 2006-04-29 10:41:13.000000000 -0400
33447
@@ -1,2 +1,31 @@
33448
+-------------------------------------------------------------------------------
33449
+-- Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. --
33450
+-- --
33451
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33452
+-- copy of this software and associated documentation files (the --
33453
+-- "Software"), to deal in the Software without restriction, including --
33454
+-- without limitation the rights to use, copy, modify, merge, publish, --
33455
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33456
+-- of the Software, and to permit persons to whom the Software is furnished --
33457
+-- to do so, subject to the following conditions: --
33458
+-- --
33459
+-- The above copyright notice and this permission notice shall be included --
33460
+-- in all copies or substantial portions of the Software. --
33461
+-- --
33462
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33463
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33464
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33465
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33466
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33467
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33468
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33469
+-- --
33470
+-- Except as contained in this notice, the name(s) of the above copyright --
33471
+-- holders shall not be used in advertising or otherwise to promote the --
33472
+-- sale, use or other dealings in this Software without prior written --
33473
+-- authorization. --
33474
+-------------------------------------------------------------------------------
33475
+-- $Id: README,v 1.9 2006/04/22 22:19:37 tom Exp $
33476
+-------------------------------------------------------------------------------
33477
For discussion of the package internals, see hackguide.html in the doc/html
33478
directory.
33479
Index: ncurses-5.5/ncurses/README.IZ
33480
===================================================================
33481
--- ncurses-5.5.orig/ncurses/README.IZ 2002-08-31 18:48:38.000000000 -0400
33482
+++ ncurses-5.5/ncurses/README.IZ 2006-04-29 10:41:13.000000000 -0400
33483
@@ -1,3 +1,33 @@
33484
+-------------------------------------------------------------------------------
33485
+-- Copyright (c) 2002,2006 Free Software Foundation, Inc. --
33486
+-- --
33487
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33488
+-- copy of this software and associated documentation files (the --
33489
+-- "Software"), to deal in the Software without restriction, including --
33490
+-- without limitation the rights to use, copy, modify, merge, publish, --
33491
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33492
+-- of the Software, and to permit persons to whom the Software is furnished --
33493
+-- to do so, subject to the following conditions: --
33494
+-- --
33495
+-- The above copyright notice and this permission notice shall be included --
33496
+-- in all copies or substantial portions of the Software. --
33497
+-- --
33498
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33499
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33500
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33501
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33502
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33503
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33504
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33505
+-- --
33506
+-- Except as contained in this notice, the name(s) of the above copyright --
33507
+-- holders shall not be used in advertising or otherwise to promote the --
33508
+-- sale, use or other dealings in this Software without prior written --
33509
+-- authorization. --
33510
+-------------------------------------------------------------------------------
33511
+-- $Id: README.IZ,v 1.2 2006/04/22 23:13:05 tom Exp $
33512
+---------------------------------------------------------------------
33513
+
33514
Here is the patch. I did no testing whatsoever with event watching
33515
requests present (I need some applications which exersize this before
33516
this, probably lynx ;-), but the code looks working "the normal way".
33517
Index: ncurses-5.5/ncurses/base/README
33518
===================================================================
33519
--- ncurses-5.5.orig/ncurses/base/README 1998-11-14 17:58:22.000000000 -0500
33520
+++ ncurses-5.5/ncurses/base/README 2006-04-29 10:41:13.000000000 -0400
33521
@@ -1,4 +1,32 @@
33522
--- $Id: README,v 1.1 1998/11/14 22:58:22 tom Exp $
33523
+-------------------------------------------------------------------------------
33524
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
33525
+-- --
33526
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33527
+-- copy of this software and associated documentation files (the --
33528
+-- "Software"), to deal in the Software without restriction, including --
33529
+-- without limitation the rights to use, copy, modify, merge, publish, --
33530
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33531
+-- of the Software, and to permit persons to whom the Software is furnished --
33532
+-- to do so, subject to the following conditions: --
33533
+-- --
33534
+-- The above copyright notice and this permission notice shall be included --
33535
+-- in all copies or substantial portions of the Software. --
33536
+-- --
33537
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33538
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33539
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33540
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33541
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33542
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33543
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33544
+-- --
33545
+-- Except as contained in this notice, the name(s) of the above copyright --
33546
+-- holders shall not be used in advertising or otherwise to promote the --
33547
+-- sale, use or other dealings in this Software without prior written --
33548
+-- authorization. --
33549
+-------------------------------------------------------------------------------
33550
+-- $Id: README,v 1.2 2006/04/22 22:19:37 tom Exp $
33551
+-------------------------------------------------------------------------------
33552
33553
The functions in this directory are the generic (not device-specific) modules
33554
of ncurses.
33555
Index: ncurses-5.5/ncurses/tinfo/MKcaptab.awk
33556
===================================================================
33557
--- ncurses-5.5.orig/ncurses/tinfo/MKcaptab.awk 2000-12-09 19:14:12.000000000 -0500
33558
+++ ncurses-5.5/ncurses/tinfo/MKcaptab.awk 2006-04-29 10:41:13.000000000 -0400
33559
@@ -1,5 +1,32 @@
33560
#!/bin/sh
33561
-# $Id: MKcaptab.awk,v 1.12 2000/12/10 00:14:12 tom Exp $
33562
+##############################################################################
33563
+# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. #
33564
+# #
33565
+# Permission is hereby granted, free of charge, to any person obtaining a #
33566
+# copy of this software and associated documentation files (the "Software"), #
33567
+# to deal in the Software without restriction, including without limitation #
33568
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33569
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33570
+# permit persons to whom the Software is furnished to do so, subject to the #
33571
+# following conditions: #
33572
+# #
33573
+# The above copyright notice and this permission notice shall be included in #
33574
+# all copies or substantial portions of the Software. #
33575
+# #
33576
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33577
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33578
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33579
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33580
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33581
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33582
+# DEALINGS IN THE SOFTWARE. #
33583
+# #
33584
+# Except as contained in this notice, the name(s) of the above copyright #
33585
+# holders shall not be used in advertising or otherwise to promote the sale, #
33586
+# use or other dealings in this Software without prior written #
33587
+# authorization. #
33588
+##############################################################################
33589
+# $Id: MKcaptab.awk,v 1.13 2006/04/22 21:46:17 tom Exp $
33590
AWK=${1-awk}
33591
DATA=${2-../include/Caps}
33592
33593
Index: ncurses-5.5/ncurses/tinfo/MKfallback.sh
33594
===================================================================
33595
--- ncurses-5.5.orig/ncurses/tinfo/MKfallback.sh 2001-12-01 20:55:30.000000000 -0500
33596
+++ ncurses-5.5/ncurses/tinfo/MKfallback.sh 2006-04-29 10:41:13.000000000 -0400
33597
@@ -1,5 +1,32 @@
33598
#!/bin/sh
33599
-# $Id: MKfallback.sh,v 1.11 2001/12/02 01:55:30 tom Exp $
33600
+##############################################################################
33601
+# Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. #
33602
+# #
33603
+# Permission is hereby granted, free of charge, to any person obtaining a #
33604
+# copy of this software and associated documentation files (the "Software"), #
33605
+# to deal in the Software without restriction, including without limitation #
33606
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33607
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33608
+# permit persons to whom the Software is furnished to do so, subject to the #
33609
+# following conditions: #
33610
+# #
33611
+# The above copyright notice and this permission notice shall be included in #
33612
+# all copies or substantial portions of the Software. #
33613
+# #
33614
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33615
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33616
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33617
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33618
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33619
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33620
+# DEALINGS IN THE SOFTWARE. #
33621
+# #
33622
+# Except as contained in this notice, the name(s) of the above copyright #
33623
+# holders shall not be used in advertising or otherwise to promote the sale, #
33624
+# use or other dealings in this Software without prior written #
33625
+# authorization. #
33626
+##############################################################################
33627
+# $Id: MKfallback.sh,v 1.12 2006/04/22 21:36:16 tom Exp $
33628
#
33629
# MKfallback.sh -- create fallback table for entry reads
33630
#
33631
Index: ncurses-5.5/ncurses/tinfo/MKnames.awk
33632
===================================================================
33633
--- ncurses-5.5.orig/ncurses/tinfo/MKnames.awk 2000-12-09 18:46:13.000000000 -0500
33634
+++ ncurses-5.5/ncurses/tinfo/MKnames.awk 2006-04-29 10:41:13.000000000 -0400
33635
@@ -1,4 +1,31 @@
33636
-# $Id: MKnames.awk,v 1.11 2000/12/09 23:46:13 tom Exp $
33637
+##############################################################################
33638
+# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. #
33639
+# #
33640
+# Permission is hereby granted, free of charge, to any person obtaining a #
33641
+# copy of this software and associated documentation files (the "Software"), #
33642
+# to deal in the Software without restriction, including without limitation #
33643
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33644
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33645
+# permit persons to whom the Software is furnished to do so, subject to the #
33646
+# following conditions: #
33647
+# #
33648
+# The above copyright notice and this permission notice shall be included in #
33649
+# all copies or substantial portions of the Software. #
33650
+# #
33651
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33652
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33653
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33654
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33655
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33656
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33657
+# DEALINGS IN THE SOFTWARE. #
33658
+# #
33659
+# Except as contained in this notice, the name(s) of the above copyright #
33660
+# holders shall not be used in advertising or otherwise to promote the sale, #
33661
+# use or other dealings in this Software without prior written #
33662
+# authorization. #
33663
+##############################################################################
33664
+# $Id: MKnames.awk,v 1.12 2006/04/22 21:46:17 tom Exp $
33665
BEGIN {
33666
print "/* This file was generated by MKnames.awk */" > "namehdr"
33667
print "" > "namehdr"
33668
Index: ncurses-5.5/ncurses/tinfo/README
33669
===================================================================
33670
--- ncurses-5.5.orig/ncurses/tinfo/README 1998-11-07 17:59:07.000000000 -0500
33671
+++ ncurses-5.5/ncurses/tinfo/README 2006-04-29 10:41:13.000000000 -0400
33672
@@ -1,4 +1,32 @@
33673
--- $Id: README,v 1.1 1998/11/07 22:59:07 tom Exp $
33674
+-------------------------------------------------------------------------------
33675
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
33676
+-- --
33677
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33678
+-- copy of this software and associated documentation files (the --
33679
+-- "Software"), to deal in the Software without restriction, including --
33680
+-- without limitation the rights to use, copy, modify, merge, publish, --
33681
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33682
+-- of the Software, and to permit persons to whom the Software is furnished --
33683
+-- to do so, subject to the following conditions: --
33684
+-- --
33685
+-- The above copyright notice and this permission notice shall be included --
33686
+-- in all copies or substantial portions of the Software. --
33687
+-- --
33688
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33689
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33690
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33691
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33692
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33693
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33694
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33695
+-- --
33696
+-- Except as contained in this notice, the name(s) of the above copyright --
33697
+-- holders shall not be used in advertising or otherwise to promote the --
33698
+-- sale, use or other dealings in this Software without prior written --
33699
+-- authorization. --
33700
+-------------------------------------------------------------------------------
33701
+-- $Id: README,v 1.2 2006/04/22 22:19:37 tom Exp $
33702
+-------------------------------------------------------------------------------
33703
33704
The files in this directory (tinfo) are those that support the terminfo
33705
database and interfaces for ncurses. The terminfo library can be built
33706
Index: ncurses-5.5/ncurses/trace/README
33707
===================================================================
33708
--- ncurses-5.5.orig/ncurses/trace/README 1998-11-07 19:11:01.000000000 -0500
33709
+++ ncurses-5.5/ncurses/trace/README 2006-04-29 10:41:13.000000000 -0400
33710
@@ -1,4 +1,32 @@
33711
--- $Id: README,v 1.1 1998/11/08 00:11:01 tom Exp $
33712
+-------------------------------------------------------------------------------
33713
+-- Copyright (c) 1998,2006 Free Software Foundation, Inc. --
33714
+-- --
33715
+-- Permission is hereby granted, free of charge, to any person obtaining a --
33716
+-- copy of this software and associated documentation files (the --
33717
+-- "Software"), to deal in the Software without restriction, including --
33718
+-- without limitation the rights to use, copy, modify, merge, publish, --
33719
+-- distribute, distribute with modifications, sublicense, and/or sell copies --
33720
+-- of the Software, and to permit persons to whom the Software is furnished --
33721
+-- to do so, subject to the following conditions: --
33722
+-- --
33723
+-- The above copyright notice and this permission notice shall be included --
33724
+-- in all copies or substantial portions of the Software. --
33725
+-- --
33726
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --
33727
+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --
33728
+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN --
33729
+-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --
33730
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR --
33731
+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE --
33732
+-- USE OR OTHER DEALINGS IN THE SOFTWARE. --
33733
+-- --
33734
+-- Except as contained in this notice, the name(s) of the above copyright --
33735
+-- holders shall not be used in advertising or otherwise to promote the --
33736
+-- sale, use or other dealings in this Software without prior written --
33737
+-- authorization. --
33738
+-------------------------------------------------------------------------------
33739
+-- $Id: README,v 1.2 2006/04/22 22:19:37 tom Exp $
33740
+-------------------------------------------------------------------------------
33741
33742
The files in this directory (trace) support both the terminfo and ncurses
33743
libraries. Most of the functions are linked in only when the libraries
33744
Index: ncurses-5.5/progs/capconvert
33745
===================================================================
33746
--- ncurses-5.5.orig/progs/capconvert 1997-08-02 17:52:06.000000000 -0400
33747
+++ ncurses-5.5/progs/capconvert 2006-04-29 10:41:13.000000000 -0400
33748
@@ -1,5 +1,32 @@
33749
#!/bin/sh
33750
-# $Id: capconvert,v 1.3 1997/08/02 21:52:06 tom Exp $
33751
+##############################################################################
33752
+# Copyright (c) 1998,2006 Free Software Foundation, Inc. #
33753
+# #
33754
+# Permission is hereby granted, free of charge, to any person obtaining a #
33755
+# copy of this software and associated documentation files (the "Software"), #
33756
+# to deal in the Software without restriction, including without limitation #
33757
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33758
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33759
+# permit persons to whom the Software is furnished to do so, subject to the #
33760
+# following conditions: #
33761
+# #
33762
+# The above copyright notice and this permission notice shall be included in #
33763
+# all copies or substantial portions of the Software. #
33764
+# #
33765
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33766
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33767
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33768
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33769
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33770
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33771
+# DEALINGS IN THE SOFTWARE. #
33772
+# #
33773
+# Except as contained in this notice, the name(s) of the above copyright #
33774
+# holders shall not be used in advertising or otherwise to promote the sale, #
33775
+# use or other dealings in this Software without prior written #
33776
+# authorization. #
33777
+##############################################################################
33778
+# $Id: capconvert,v 1.4 2006/04/22 21:46:17 tom Exp $
33779
#
33780
# capconvert -- automated conversion from termcap to terminfo
33781
#
33782
Index: ncurses-5.5/progs/clear.sh
33783
===================================================================
33784
--- ncurses-5.5.orig/progs/clear.sh 1995-01-15 17:37:30.000000000 -0500
33785
+++ ncurses-5.5/progs/clear.sh 2006-04-29 10:41:13.000000000 -0400
33786
@@ -1 +1,29 @@
33787
+#!/bin/sh
33788
+##############################################################################
33789
+# Copyright (c) 1998,2006 Free Software Foundation, Inc. #
33790
+# #
33791
+# Permission is hereby granted, free of charge, to any person obtaining a #
33792
+# copy of this software and associated documentation files (the "Software"), #
33793
+# to deal in the Software without restriction, including without limitation #
33794
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33795
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33796
+# permit persons to whom the Software is furnished to do so, subject to the #
33797
+# following conditions: #
33798
+# #
33799
+# The above copyright notice and this permission notice shall be included in #
33800
+# all copies or substantial portions of the Software. #
33801
+# #
33802
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33803
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33804
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33805
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33806
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33807
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33808
+# DEALINGS IN THE SOFTWARE. #
33809
+# #
33810
+# Except as contained in this notice, the name(s) of the above copyright #
33811
+# holders shall not be used in advertising or otherwise to promote the sale, #
33812
+# use or other dealings in this Software without prior written #
33813
+# authorization. #
33814
+##############################################################################
33815
exec tput clear
33816
Index: ncurses-5.5/tack/Makefile.in
33817
===================================================================
33818
--- ncurses-5.5.orig/tack/Makefile.in 2005-06-18 19:01:59.000000000 -0400
33819
+++ ncurses-5.5/tack/Makefile.in 2006-04-29 10:41:13.000000000 -0400
33820
@@ -1,4 +1,31 @@
33821
-# $Id: Makefile.in,v 1.35 2005/06/18 23:01:59 tom Exp $
33822
+##############################################################################
33823
+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
33824
+# #
33825
+# Permission is hereby granted, free of charge, to any person obtaining a #
33826
+# copy of this software and associated documentation files (the "Software"), #
33827
+# to deal in the Software without restriction, including without limitation #
33828
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33829
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33830
+# permit persons to whom the Software is furnished to do so, subject to the #
33831
+# following conditions: #
33832
+# #
33833
+# The above copyright notice and this permission notice shall be included in #
33834
+# all copies or substantial portions of the Software. #
33835
+# #
33836
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33837
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33838
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33839
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33840
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33841
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33842
+# DEALINGS IN THE SOFTWARE. #
33843
+# #
33844
+# Except as contained in this notice, the name(s) of the above copyright #
33845
+# holders shall not be used in advertising or otherwise to promote the sale, #
33846
+# use or other dealings in this Software without prior written #
33847
+# authorization. #
33848
+##############################################################################
33849
+# $Id: Makefile.in,v 1.36 2006/04/22 21:46:17 tom Exp $
33850
# Makefile for tack
33851
#
33852
# The variable 'srcdir' refers to the source-distribution, and can be set with
33853
Index: ncurses-5.5/tack/modules
33854
===================================================================
33855
--- ncurses-5.5.orig/tack/modules 1999-04-17 21:43:32.000000000 -0400
33856
+++ ncurses-5.5/tack/modules 2006-04-29 10:41:13.000000000 -0400
33857
@@ -1,4 +1,31 @@
33858
-# $Id: modules,v 1.4 1999/04/18 01:43:32 tom Exp $
33859
+##############################################################################
33860
+# Copyright (c) 1998-1999,2006 Free Software Foundation, Inc. #
33861
+# #
33862
+# Permission is hereby granted, free of charge, to any person obtaining a #
33863
+# copy of this software and associated documentation files (the "Software"), #
33864
+# to deal in the Software without restriction, including without limitation #
33865
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
33866
+# with modifications, sublicense, and/or sell copies of the Software, and to #
33867
+# permit persons to whom the Software is furnished to do so, subject to the #
33868
+# following conditions: #
33869
+# #
33870
+# The above copyright notice and this permission notice shall be included in #
33871
+# all copies or substantial portions of the Software. #
33872
+# #
33873
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
33874
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
33875
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
33876
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
33877
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
33878
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
33879
+# DEALINGS IN THE SOFTWARE. #
33880
+# #
33881
+# Except as contained in this notice, the name(s) of the above copyright #
33882
+# holders shall not be used in advertising or otherwise to promote the sale, #
33883
+# use or other dealings in this Software without prior written #
33884
+# authorization. #
33885
+##############################################################################
33886
+# $Id: modules,v 1.5 2006/04/22 22:37:18 tom Exp $
33887
@ base
33888
ansi progs $(srcdir) $(srcdir)/tack.h ../include/term.h
33889
charset progs $(srcdir) $(srcdir)/tack.h ../include/term.h
33890
Index: ncurses-5.5/tack/tack.1
33891
===================================================================
33892
--- ncurses-5.5.orig/tack/tack.1 2005-06-25 14:30:53.000000000 -0400
33893
+++ ncurses-5.5/tack/tack.1 2006-04-29 10:41:13.000000000 -0400
33894
@@ -1,3 +1,32 @@
33895
+.\"***************************************************************************
33896
+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
33897
+.\" *
33898
+.\" Permission is hereby granted, free of charge, to any person obtaining a *
33899
+.\" copy of this software and associated documentation files (the *
33900
+.\" "Software"), to deal in the Software without restriction, including *
33901
+.\" without limitation the rights to use, copy, modify, merge, publish, *
33902
+.\" distribute, distribute with modifications, sublicense, and/or sell *
33903
+.\" copies of the Software, and to permit persons to whom the Software is *
33904
+.\" furnished to do so, subject to the following conditions: *
33905
+.\" *
33906
+.\" The above copyright notice and this permission notice shall be included *
33907
+.\" in all copies or substantial portions of the Software. *
33908
+.\" *
33909
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33910
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33911
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33912
+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33913
+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33914
+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33915
+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33916
+.\" *
33917
+.\" Except as contained in this notice, the name(s) of the above copyright *
33918
+.\" holders shall not be used in advertising or otherwise to promote the *
33919
+.\" sale, use or other dealings in this Software without prior written *
33920
+.\" authorization. *
33921
+.\"***************************************************************************
33922
+.\"
33923
+.\" $Id: tack.1,v 1.3 2006/04/22 22:26:55 tom Exp $
33924
.TH tack 1M ""
33925
.ds n 5
33926
.ds d @TERMINFO@
33927
Index: ncurses-5.5/test/bs.6
33928
===================================================================
33929
--- ncurses-5.5.orig/test/bs.6 1994-12-07 01:29:08.000000000 -0500
33930
+++ ncurses-5.5/test/bs.6 2006-04-29 10:41:13.000000000 -0400
33931
@@ -1,3 +1,32 @@
33932
+.\"***************************************************************************
33933
+.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
33934
+.\" *
33935
+.\" Permission is hereby granted, free of charge, to any person obtaining a *
33936
+.\" copy of this software and associated documentation files (the *
33937
+.\" "Software"), to deal in the Software without restriction, including *
33938
+.\" without limitation the rights to use, copy, modify, merge, publish, *
33939
+.\" distribute, distribute with modifications, sublicense, and/or sell *
33940
+.\" copies of the Software, and to permit persons to whom the Software is *
33941
+.\" furnished to do so, subject to the following conditions: *
33942
+.\" *
33943
+.\" The above copyright notice and this permission notice shall be included *
33944
+.\" in all copies or substantial portions of the Software. *
33945
+.\" *
33946
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33947
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33948
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33949
+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33950
+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33951
+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33952
+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33953
+.\" *
33954
+.\" Except as contained in this notice, the name(s) of the above copyright *
33955
+.\" holders shall not be used in advertising or otherwise to promote the *
33956
+.\" sale, use or other dealings in this Software without prior written *
33957
+.\" authorization. *
33958
+.\"***************************************************************************
33959
+.\"
33960
+.\" $Id: bs.6,v 1.2 2006/04/22 22:42:44 tom Exp $
33961
.TH BATTLESHIPS 6 "Aug 23, 1989"
33962
.SH NAME
33963
bs \- battleships game
33964
Index: ncurses-5.5/test/edit_field.h
33965
===================================================================
33966
--- ncurses-5.5.orig/test/edit_field.h 2005-09-24 18:59:52.000000000 -0400
33967
+++ ncurses-5.5/test/edit_field.h 2006-04-29 10:41:13.000000000 -0400
33968
@@ -1,5 +1,32 @@
33969
+/****************************************************************************
33970
+ * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
33971
+ * *
33972
+ * Permission is hereby granted, free of charge, to any person obtaining a *
33973
+ * copy of this software and associated documentation files (the *
33974
+ * "Software"), to deal in the Software without restriction, including *
33975
+ * without limitation the rights to use, copy, modify, merge, publish, *
33976
+ * distribute, distribute with modifications, sublicense, and/or sell *
33977
+ * copies of the Software, and to permit persons to whom the Software is *
33978
+ * furnished to do so, subject to the following conditions: *
33979
+ * *
33980
+ * The above copyright notice and this permission notice shall be included *
33981
+ * in all copies or substantial portions of the Software. *
33982
+ * *
33983
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
33984
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
33985
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
33986
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
33987
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
33988
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
33989
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
33990
+ * *
33991
+ * Except as contained in this notice, the name(s) of the above copyright *
33992
+ * holders shall not be used in advertising or otherwise to promote the *
33993
+ * sale, use or other dealings in this Software without prior written *
33994
+ * authorization. *
33995
+ ****************************************************************************/
33996
/*
33997
- * $Id: edit_field.h,v 1.3 2005/09/24 22:59:52 tom Exp $
33998
+ * $Id: edit_field.h,v 1.4 2006/04/22 22:07:51 tom Exp $
33999
*
34000
* Interface of edit_field.c
34001
*/
34002
Index: ncurses-5.5/test/gdc.6
34003
===================================================================
34004
--- ncurses-5.5.orig/test/gdc.6 2003-03-15 15:50:03.000000000 -0500
34005
+++ ncurses-5.5/test/gdc.6 2006-04-29 10:41:13.000000000 -0400
34006
@@ -1,23 +1,64 @@
34007
-.\" $Id: gdc.6,v 1.2 2003/03/15 20:50:03 tom Exp $
34008
+.\"***************************************************************************
34009
+.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
34010
+.\" *
34011
+.\" Permission is hereby granted, free of charge, to any person obtaining a *
34012
+.\" copy of this software and associated documentation files (the *
34013
+.\" "Software"), to deal in the Software without restriction, including *
34014
+.\" without limitation the rights to use, copy, modify, merge, publish, *
34015
+.\" distribute, distribute with modifications, sublicense, and/or sell *
34016
+.\" copies of the Software, and to permit persons to whom the Software is *
34017
+.\" furnished to do so, subject to the following conditions: *
34018
+.\" *
34019
+.\" The above copyright notice and this permission notice shall be included *
34020
+.\" in all copies or substantial portions of the Software. *
34021
+.\" *
34022
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
34023
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
34024
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
34025
+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
34026
+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
34027
+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
34028
+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
34029
+.\" *
34030
+.\" Except as contained in this notice, the name(s) of the above copyright *
34031
+.\" holders shall not be used in advertising or otherwise to promote the *
34032
+.\" sale, use or other dealings in this Software without prior written *
34033
+.\" authorization. *
34034
+.\"***************************************************************************
34035
+.\"
34036
+.\" $Id: gdc.6,v 1.3 2006/04/22 23:02:15 tom Exp $
34037
.TH GDC 6
34038
.SH NAME
34039
gdc \- grand digital clock (curses)
34040
.SH SYNOPSIS
34041
.B gdc
34042
+[-n] [
34043
[-s] [
34044
.I n
34045
]
34046
.SH DESCRIPTION
34047
.I Gdc
34048
-runs a digital clock made of reverse-video blanks on a curses
34049
-compatible VDU screen. With an optional numeric argument
34050
-.I n
34051
-it stops after
34052
-.I n
34053
-seconds (default never).
34054
-The optional
34055
+runs a digital clock made of reverse-video blanks on a terminal screen.
34056
+If the terminal supports color, the clock is drawn in red.
34057
+You can make the clock stop, pause or resume by pressing a ``q'',
34058
+``s'' or space, respectively.
34059
+.SH OPTIONS
34060
+.TP
34061
+.B -n
34062
+redirects input to /dev/null, making it ignore the stop/pause commands.
34063
+You can still stop it by pressing the interrupt key.
34064
+.TP
34065
.B -s
34066
-flag makes digits scroll as they change. In some curses mode implementations,
34067
-the scrolling option has trouble keeping up.
34068
+makes digits scroll as they change.
34069
+When running on a fast display, the program breaks up the scrolling into
34070
+subsecond repaints, making the operation appear smooth.
34071
+.PP
34072
+With an optional numeric argument
34073
+.I num
34074
+it stops after
34075
+.I num
34076
+seconds.
34077
+Normally it runs "forever" (counting down from 2 billion seconds).
34078
.SH AUTHOR
34079
Amos Shapir, modified for curses by John Lupien.
34080
+Improvements for ncurses by Thomas Dickey.
34081
Index: ncurses-5.5/test/gdc.c
34082
===================================================================
34083
--- ncurses-5.5.orig/test/gdc.c 2005-05-28 17:39:39.000000000 -0400
34084
+++ ncurses-5.5/test/gdc.c 2006-04-29 10:41:13.000000000 -0400
34085
@@ -1,3 +1,30 @@
34086
+/****************************************************************************
34087
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
34088
+ * *
34089
+ * Permission is hereby granted, free of charge, to any person obtaining a *
34090
+ * copy of this software and associated documentation files (the *
34091
+ * "Software"), to deal in the Software without restriction, including *
34092
+ * without limitation the rights to use, copy, modify, merge, publish, *
34093
+ * distribute, distribute with modifications, sublicense, and/or sell *
34094
+ * copies of the Software, and to permit persons to whom the Software is *
34095
+ * furnished to do so, subject to the following conditions: *
34096
+ * *
34097
+ * The above copyright notice and this permission notice shall be included *
34098
+ * in all copies or substantial portions of the Software. *
34099
+ * *
34100
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
34101
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
34102
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
34103
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
34104
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
34105
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
34106
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
34107
+ * *
34108
+ * Except as contained in this notice, the name(s) of the above copyright *
34109
+ * holders shall not be used in advertising or otherwise to promote the *
34110
+ * sale, use or other dealings in this Software without prior written *
34111
+ * authorization. *
34112
+ ****************************************************************************/
34113
/*
34114
* Grand digital clock for curses compatible terminals
34115
* Usage: gdc [-s] [n] -- run for n seconds (default infinity)
34116
@@ -6,7 +33,7 @@
34117
* modified 10-18-89 for curses (jrl)
34118
* 10-18-89 added signal handling
34119
*
34120
- * $Id: gdc.c,v 1.26 2005/05/28 21:39:39 tom Exp $
34121
+ * $Id: gdc.c,v 1.27 2006/04/22 22:41:22 tom Exp $
34122
*/
34123
34124
#include <test.priv.h>
34125
Index: ncurses-5.5/test/hanoi.c
34126
===================================================================
34127
--- ncurses-5.5.orig/test/hanoi.c 2002-06-29 19:32:18.000000000 -0400
34128
+++ ncurses-5.5/test/hanoi.c 2006-04-29 10:41:13.000000000 -0400
34129
@@ -1,3 +1,30 @@
34130
+/****************************************************************************
34131
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
34132
+ * *
34133
+ * Permission is hereby granted, free of charge, to any person obtaining a *
34134
+ * copy of this software and associated documentation files (the *
34135
+ * "Software"), to deal in the Software without restriction, including *
34136
+ * without limitation the rights to use, copy, modify, merge, publish, *
34137
+ * distribute, distribute with modifications, sublicense, and/or sell *
34138
+ * copies of the Software, and to permit persons to whom the Software is *
34139
+ * furnished to do so, subject to the following conditions: *
34140
+ * *
34141
+ * The above copyright notice and this permission notice shall be included *
34142
+ * in all copies or substantial portions of the Software. *
34143
+ * *
34144
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
34145
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
34146
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
34147
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
34148
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
34149
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
34150
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
34151
+ * *
34152
+ * Except as contained in this notice, the name(s) of the above copyright *
34153
+ * holders shall not be used in advertising or otherwise to promote the *
34154
+ * sale, use or other dealings in this Software without prior written *
34155
+ * authorization. *
34156
+ ****************************************************************************/
34157
/*
34158
* Name: Towers of Hanoi.
34159
*
34160
@@ -14,7 +41,7 @@
34161
*
34162
* Date: 05.Nov.90
34163
*
34164
- * $Id: hanoi.c,v 1.24 2002/06/29 23:32:18 tom Exp $
34165
+ * $Id: hanoi.c,v 1.25 2006/04/22 22:41:22 tom Exp $
34166
*/
34167
34168
#include <test.priv.h>
34169
Index: ncurses-5.5/test/knight.c
34170
===================================================================
34171
--- ncurses-5.5.orig/test/knight.c 2002-10-19 18:11:24.000000000 -0400
34172
+++ ncurses-5.5/test/knight.c 2006-04-29 10:41:13.000000000 -0400
34173
@@ -1,3 +1,30 @@
34174
+/****************************************************************************
34175
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
34176
+ * *
34177
+ * Permission is hereby granted, free of charge, to any person obtaining a *
34178
+ * copy of this software and associated documentation files (the *
34179
+ * "Software"), to deal in the Software without restriction, including *
34180
+ * without limitation the rights to use, copy, modify, merge, publish, *
34181
+ * distribute, distribute with modifications, sublicense, and/or sell *
34182
+ * copies of the Software, and to permit persons to whom the Software is *
34183
+ * furnished to do so, subject to the following conditions: *
34184
+ * *
34185
+ * The above copyright notice and this permission notice shall be included *
34186
+ * in all copies or substantial portions of the Software. *
34187
+ * *
34188
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
34189
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
34190
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
34191
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
34192
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
34193
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
34194
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
34195
+ * *
34196
+ * Except as contained in this notice, the name(s) of the above copyright *
34197
+ * holders shall not be used in advertising or otherwise to promote the *
34198
+ * sale, use or other dealings in this Software without prior written *
34199
+ * authorization. *
34200
+ ****************************************************************************/
34201
/*
34202
* Knight's Tour - a brain game
34203
*
34204
@@ -6,7 +33,7 @@
34205
* Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995. Mouse support
34206
* added September 20th 1995.
34207
*
34208
- * $Id: knight.c,v 1.26 2002/10/19 22:11:24 tom Exp $
34209
+ * $Id: knight.c,v 1.27 2006/04/22 22:41:22 tom Exp $
34210
*/
34211
34212
#include <test.priv.h>
34213
Index: ncurses-5.5/test/linux-color.dat
34214
===================================================================
34215
--- ncurses-5.5.orig/test/linux-color.dat 2004-05-22 19:42:45.000000000 -0400
34216
+++ ncurses-5.5/test/linux-color.dat 2006-04-29 10:41:13.000000000 -0400
34217
@@ -1,4 +1,31 @@
34218
-# $Id: linux-color.dat,v 1.1 2004/05/22 23:42:45 tom Exp $
34219
+##############################################################################
34220
+# Copyright (c) 2004,2006 Free Software Foundation, Inc. #
34221
+# #
34222
+# Permission is hereby granted, free of charge, to any person obtaining a #
34223
+# copy of this software and associated documentation files (the "Software"), #
34224
+# to deal in the Software without restriction, including without limitation #
34225
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
34226
+# with modifications, sublicense, and/or sell copies of the Software, and to #
34227
+# permit persons to whom the Software is furnished to do so, subject to the #
34228
+# following conditions: #
34229
+# #
34230
+# The above copyright notice and this permission notice shall be included in #
34231
+# all copies or substantial portions of the Software. #
34232
+# #
34233
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
34234
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
34235
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
34236
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
34237
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
34238
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
34239
+# DEALINGS IN THE SOFTWARE. #
34240
+# #
34241
+# Except as contained in this notice, the name(s) of the above copyright #
34242
+# holders shall not be used in advertising or otherwise to promote the sale, #
34243
+# use or other dealings in this Software without prior written #
34244
+# authorization. #
34245
+##############################################################################
34246
+# $Id: linux-color.dat,v 1.2 2006/04/22 21:40:00 tom Exp $
34247
# These values are derived from linux/drivers/char/vt.c (default_red[],
34248
# default_grn[] and default_blu[]), commented
34249
/* the default colour table, for VGA+ colour systems */
34250
Index: ncurses-5.5/test/listused.sh
34251
===================================================================
34252
--- ncurses-5.5.orig/test/listused.sh 2003-07-05 15:02:41.000000000 -0400
34253
+++ ncurses-5.5/test/listused.sh 2006-04-29 10:41:13.000000000 -0400
34254
@@ -1,5 +1,32 @@
34255
#!/bin/sh
34256
-# $Id: listused.sh,v 1.5 2003/07/05 19:02:41 tom Exp $
34257
+##############################################################################
34258
+# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. #
34259
+# #
34260
+# Permission is hereby granted, free of charge, to any person obtaining a #
34261
+# copy of this software and associated documentation files (the "Software"), #
34262
+# to deal in the Software without restriction, including without limitation #
34263
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
34264
+# with modifications, sublicense, and/or sell copies of the Software, and to #
34265
+# permit persons to whom the Software is furnished to do so, subject to the #
34266
+# following conditions: #
34267
+# #
34268
+# The above copyright notice and this permission notice shall be included in #
34269
+# all copies or substantial portions of the Software. #
34270
+# #
34271
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
34272
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
34273
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
34274
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
34275
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
34276
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
34277
+# DEALINGS IN THE SOFTWARE. #
34278
+# #
34279
+# Except as contained in this notice, the name(s) of the above copyright #
34280
+# holders shall not be used in advertising or otherwise to promote the sale, #
34281
+# use or other dealings in this Software without prior written #
34282
+# authorization. #
34283
+##############################################################################
34284
+# $Id: listused.sh,v 1.6 2006/04/22 21:36:16 tom Exp $
34285
# A very simple script to list entrypoints that are used by either a test
34286
# program, or within the libraries. This relies on the output format of 'nm',
34287
# and assumes that the libraries are configured with TRACE defined, and using
34288
Index: ncurses-5.5/test/xterm-16color.dat
34289
===================================================================
34290
--- ncurses-5.5.orig/test/xterm-16color.dat 2004-05-22 19:14:42.000000000 -0400
34291
+++ ncurses-5.5/test/xterm-16color.dat 2006-04-29 10:41:13.000000000 -0400
34292
@@ -1,4 +1,31 @@
34293
-# $Id: xterm-16color.dat,v 1.1 2004/05/22 23:14:42 tom Exp $
34294
+##############################################################################
34295
+# Copyright (c) 2004,2006 Free Software Foundation, Inc. #
34296
+# #
34297
+# Permission is hereby granted, free of charge, to any person obtaining a #
34298
+# copy of this software and associated documentation files (the "Software"), #
34299
+# to deal in the Software without restriction, including without limitation #
34300
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
34301
+# with modifications, sublicense, and/or sell copies of the Software, and to #
34302
+# permit persons to whom the Software is furnished to do so, subject to the #
34303
+# following conditions: #
34304
+# #
34305
+# The above copyright notice and this permission notice shall be included in #
34306
+# all copies or substantial portions of the Software. #
34307
+# #
34308
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
34309
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
34310
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
34311
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
34312
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
34313
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
34314
+# DEALINGS IN THE SOFTWARE. #
34315
+# #
34316
+# Except as contained in this notice, the name(s) of the above copyright #
34317
+# holders shall not be used in advertising or otherwise to promote the sale, #
34318
+# use or other dealings in this Software without prior written #
34319
+# authorization. #
34320
+##############################################################################
34321
+# $Id: xterm-16color.dat,v 1.2 2006/04/22 21:40:00 tom Exp $
34322
# This illustrates the predefined colors for XFree86 xterm's "xterm-16color".
34323
# If you set $TERM to "xterm-88color" (and have xterm compiled to support the
34324
# 88-color or 256-color feature), you can use the ncurses 'd' screen to
34325
Index: ncurses-5.5/test/xterm-88color.dat
34326
===================================================================
34327
--- ncurses-5.5.orig/test/xterm-88color.dat 2005-01-28 16:11:53.000000000 -0500
34328
+++ ncurses-5.5/test/xterm-88color.dat 2006-04-29 10:41:13.000000000 -0400
34329
@@ -1,4 +1,31 @@
34330
-# $Id: xterm-88color.dat,v 1.1 2005/01/28 21:11:53 tom Exp $
34331
+##############################################################################
34332
+# Copyright (c) 2005,2006 Free Software Foundation, Inc. #
34333
+# #
34334
+# Permission is hereby granted, free of charge, to any person obtaining a #
34335
+# copy of this software and associated documentation files (the "Software"), #
34336
+# to deal in the Software without restriction, including without limitation #
34337
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
34338
+# with modifications, sublicense, and/or sell copies of the Software, and to #
34339
+# permit persons to whom the Software is furnished to do so, subject to the #
34340
+# following conditions: #
34341
+# #
34342
+# The above copyright notice and this permission notice shall be included in #
34343
+# all copies or substantial portions of the Software. #
34344
+# #
34345
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
34346
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
34347
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
34348
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
34349
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
34350
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
34351
+# DEALINGS IN THE SOFTWARE. #
34352
+# #
34353
+# Except as contained in this notice, the name(s) of the above copyright #
34354
+# holders shall not be used in advertising or otherwise to promote the sale, #
34355
+# use or other dealings in this Software without prior written #
34356
+# authorization. #
34357
+##############################################################################
34358
+# $Id: xterm-88color.dat,v 1.2 2006/04/22 21:40:00 tom Exp $
34359
# This illustrates the predefined colors for XFree86 xterm's "xterm-16color".
34360
# If you set $TERM to "xterm-88color" (and have xterm compiled to support the
34361
# 88-color or 256-color feature), you can use the ncurses 'd' screen to
Loggerhead is a web-based interface for Breezy
Version: 2.0.1