Date: Wed, 13 Feb 2008 14:54:54 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 135316 for review Message-ID: <200802131454.m1DEssHc087602@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135316 Change 135316 by sephe@sephe_enigma:sam_wifi on 2008/02/13 14:54:18 IFC Affected files ... .. //depot/projects/wifi/UPDATING#39 integrate .. //depot/projects/wifi/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/wifi/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/wifi/contrib/ncurses/NEWS#4 integrate .. //depot/projects/wifi/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/wifi/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/wifi/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/wifi/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/toe.1m#4 integrate .. //depot/projects/wifi/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkinit.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/wifi/contrib/pf/man/pf.conf.5#10 integrate .. //depot/projects/wifi/include/unistd.h#10 integrate .. //depot/projects/wifi/lib/libc/sys/access.2#5 integrate .. //depot/projects/wifi/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/wifi/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libthr/arch/arm/include/pthread_md.h#4 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libthr/arch/powerpc/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libthr/arch/sparc64/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libthr/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/wifi/lib/msun/amd64/Makefile.inc#7 integrate .. //depot/projects/wifi/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/wifi/lib/msun/ld128/s_exp2l.c#3 integrate .. //depot/projects/wifi/lib/msun/ld80/s_exp2l.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_exp2.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#9 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/ncurses_cfg.h#4 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.8#7 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#8 integrate .. //depot/projects/wifi/share/man/man4/Makefile#46 integrate .. //depot/projects/wifi/share/man/man4/geom_lvm.4#1 branch .. //depot/projects/wifi/share/man/man4/mxge.4#5 integrate .. //depot/projects/wifi/share/man/man5/fstab.5#4 integrate .. //depot/projects/wifi/share/man/man9/Makefile#26 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#17 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/wifi/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/wifi/sys/cam/cam_periph.c#10 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/wifi/sys/conf/NOTES#50 integrate .. //depot/projects/wifi/sys/conf/files#65 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#21 integrate .. //depot/projects/wifi/sys/conf/options#44 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#14 integrate .. //depot/projects/wifi/sys/dev/twe/twe.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#21 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.c#11 integrate .. //depot/projects/wifi/sys/fs/coda/cnode.h#4 integrate .. //depot/projects/wifi/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/wifi/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_kernel.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_namecache.c#3 delete .. //depot/projects/wifi/sys/fs/coda/coda_namecache.h#3 delete .. //depot/projects/wifi/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_psdev.c#4 integrate .. //depot/projects/wifi/sys/fs/coda/coda_psdev.h#3 integrate .. //depot/projects/wifi/sys/fs/coda/coda_subr.c#3 integrate .. //depot/projects/wifi/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_venus.c#3 integrate .. //depot/projects/wifi/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/wifi/sys/fs/coda/coda_vfsops.c#6 integrate .. //depot/projects/wifi/sys/fs/coda/coda_vfsops.h#3 integrate .. //depot/projects/wifi/sys/fs/coda/coda_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/coda/coda_vnops.h#3 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_subr.c#10 integrate .. //depot/projects/wifi/sys/geom/lvm/g_lvm.c#1 branch .. //depot/projects/wifi/sys/geom/lvm/g_lvm.h#1 branch .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#16 integrate .. //depot/projects/wifi/sys/i386/i386/geode.c#6 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#16 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#21 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#21 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#22 integrate .. //depot/projects/wifi/sys/kern/systrace_args.c#6 integrate .. //depot/projects/wifi/sys/kern/sysv_shm.c#13 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#29 integrate .. //depot/projects/wifi/sys/modules/coda/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/geom/Makefile#7 integrate .. //depot/projects/wifi/sys/modules/geom/geom_lvm/Makefile#1 branch .. //depot/projects/wifi/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#23 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#15 integrate .. //depot/projects/wifi/sys/nfsclient/nfsm_subs.h#5 integrate .. //depot/projects/wifi/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/wifi/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/wifi/sys/powerpc/conf/NOTES#7 integrate .. //depot/projects/wifi/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/wifi/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/wifi/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/wifi/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/wifi/sys/sparc64/include/md_var.h#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/wifi/sys/sys/ipc.h#3 integrate .. //depot/projects/wifi/sys/sys/lockmgr.h#14 integrate .. //depot/projects/wifi/sys/sys/shm.h#7 integrate .. //depot/projects/wifi/sys/sys/syscall.h#20 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#20 integrate .. //depot/projects/wifi/sys/sys/syscallsubr.h#15 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#20 integrate .. //depot/projects/wifi/usr.bin/netstat/route.c#9 integrate .. //depot/projects/wifi/usr.sbin/timed/timed/timed.8#3 integrate .. //depot/projects/wifi/usr.sbin/traceroute6/traceroute6.8#4 integrate .. //depot/projects/wifi/usr.sbin/traceroute6/traceroute6.c#6 integrate Differences ... ==== //depot/projects/wifi/UPDATING#39 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080211: + The default NFS mount mode has changed from UDP to TCP for + increased reliability. If you rely on (insecurely) NFS + mounting across a firewall you may need to update your + firewall rules. + 20080208: Belatedly note the addition of m_collapse for compacting mbuf chains. @@ -973,4 +979,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.518 2008/02/08 21:24:58 sam Exp $ +$FreeBSD: src/UPDATING,v 1.519 2008/02/11 23:23:20 kris Exp $ ==== //depot/projects/wifi/contrib/ncurses/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.2 2007/12/30 11:19:29 rafan Exp $ +$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.3 2008/02/11 13:42:45 rafan Exp $ ncurses @@ -18,6 +18,10 @@ src/contrib/ncurses NCURSES v5_6_20061217 The date in the tag can be obtained from contrib/ncurses/dist.mk. +If the version is a snapshot, + + cvs import -m 'Import ncurses 5.6-20080209 snapshot onto the vendor branch' \ + src/contrib/ncurses NCURSES v5_6_20080209 Remove files that are removed in this release in vendor branch (NCURSES) instead of HEAD. ==== //depot/projects/wifi/contrib/ncurses/MANIFEST#4 (text+ko) ==== @@ -571,6 +571,7 @@ ./man/curs_termattrs.3x ./man/curs_termcap.3x ./man/curs_terminfo.3x +./man/curs_threads.3x ./man/curs_touch.3x ./man/curs_trace.3x ./man/curs_util.3x @@ -810,6 +811,7 @@ ./ncurses/curses.priv.h ./ncurses/fifo_defs.h ./ncurses/llib-lncurses +./ncurses/llib-lncursest ./ncurses/llib-lncursesw ./ncurses/modules ./ncurses/tinfo/MKcaptab.awk ==== //depot/projects/wifi/contrib/ncurses/NEWS#4 (text+ko) ==== @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1188 2007/12/22 23:56:08 tom Exp $ +-- $Id: NEWS,v 1.1206 2008/02/09 23:49:39 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,54 @@ Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20080209 + + update test programs to build/work with various UNIX curses for + comparisons. This was to reinvestigate statement in X/Open curses + that insnstr and winsnstr perform wrapping. None of the Unix-branded + implementations do this, as noted in manpage (cf: 20040228). + +20080203 + + modify _nc_setupscreen() to set the legacy-coding value the same + for both narrow/wide models. It had been set only for wide model, + but is needed to make unctrl() work with locale in the narrow model. + + improve waddch() and winsch() handling of EILSEQ from mbrtowc() by + using unctrl() to display illegal bytes rather than trying to append + further bytes to make up a valid sequence (reported by Andrey A + Chernov). + + modify unctrl() to check codes in 128-255 range versus isprint(). + If they are not printable, and locale was set, use a "M-" or "~" + sequence. + +20080126 + + improve threading in test/worm.c (wrap refresh calls, and KEY_RESIZE + handling). Now it hangs in napms(), no matter whether nanosleep() + or poll() or select() are used on Linux. + +20080119 + + fixes to build with --disable-ext-funcs + + add manpage for use_window and use_screen. + + add set_tabsize() and set_escdelay() functions. + +20080112 + + remove recursive-mutex definitions, finish threading demo for worm.c + + remove a redundant adjustment of lines in resizeterm.c's + adjust_window() which caused occasional misadjustment of stdscr when + softkeys were used. + +20080105 + + several improvements to terminfo entries based on xterm #230 -TD + + modify MKlib_gen.sh to handle keyname/key_name prototypes, so the + "link_test" builds properly. + + fix for toe command-line options -u/-U to ensure filename is given. + + fix allocation-size for command-line parsing in infocmp from 20070728 + (report by Miroslav Lichvar) + + improve resizeterm() by moving ripped-off lines, and repainting the + soft-keys (report by Katarina Machalkova) + + add clarification in wclear's manpage noting that the screen will be + cleared even if a subwindow is cleared (prompted by Christer Enfors + question). + + change test/ncurses.c soft-key tests to work with KEY_RESIZE. + 20071222 + continue implementing support for threading demo by adding mutex for delwin(). ==== //depot/projects/wifi/contrib/ncurses/dist.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.620 2007/12/22 20:41:31 tom Exp $ +# $Id: dist.mk,v 1.629 2008/02/09 15:32:57 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 6 -NCURSES_PATCH = 20071222 +NCURSES_PATCH = 20080209 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) ==== //depot/projects/wifi/contrib/ncurses/form/frm_driver.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_driver.c,v 1.85 2007/11/24 21:32:53 tom Exp $") +MODULE_ID("$Id: frm_driver.c,v 1.86 2008/01/19 20:11:03 tom Exp $") /*---------------------------------------------------------------------------- This is the core module of the form library. It contains the majority @@ -676,7 +676,7 @@ new_bp[new_buflen] = myZEROS; } -#if USE_WIDEC_SUPPORT +#if USE_WIDEC_SUPPORT && NCURSES_EXT_FUNCS if (wresize(field->working, 1, Buffer_Length(field) + 1) == ERR) result = FALSE; #endif ==== //depot/projects/wifi/contrib/ncurses/include/curses.h.in#4 (text+ko) ==== @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.181 2007/11/18 00:32:03 tom Exp $ */ +/* $Id: curses.h.in,v 1.183 2008/01/19 20:03:48 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -827,7 +827,6 @@ /* * These functions are extensions - not in X/Open Curses. */ -#undef NCURSES_EXT_FUNCS #if @NCURSES_EXT_FUNCS@ #undef NCURSES_EXT_FUNCS #define NCURSES_EXT_FUNCS @NCURSES_PATCH@ @@ -841,6 +840,8 @@ extern NCURSES_EXPORT(int) keyok (int, bool); extern NCURSES_EXPORT(int) resize_term (int, int); extern NCURSES_EXPORT(int) resizeterm (int, int); +extern NCURSES_EXPORT(int) set_escdelay (int); +extern NCURSES_EXPORT(int) set_tabsize (int); extern NCURSES_EXPORT(int) use_default_colors (void); extern NCURSES_EXPORT(int) use_extended_names (bool); extern NCURSES_EXPORT(int) use_legacy_coding (int); ==== //depot/projects/wifi/contrib/ncurses/include/ncurses_defs#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.35 2007/10/06 21:18:16 tom Exp $ +# $Id: ncurses_defs,v 1.38 2008/02/10 00:12:03 tom Exp $ ############################################################################## -# Copyright (c) 2000-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -46,6 +46,8 @@ HAVE_BSD_SIGNAL_H HAVE_BTOWC HAVE_BUILTIN_H +HAVE_CHGAT 1 +HAVE_COLOR_SET 1 HAVE_DIRENT_H HAVE_ERRNO HAVE_FCNTL_H @@ -58,6 +60,7 @@ HAVE_GETEUID HAVE_GETMAXX 1 HAVE_GETNSTR +HAVE_GETPARX 1 HAVE_GETOPT_H HAVE_GETTIMEOFDAY HAVE_GETTTYNAM ==== //depot/projects/wifi/contrib/ncurses/man/curs_clear.3x#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998,2005 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_clear.3x,v 1.10 2005/10/01 19:34:43 tom Exp $ +.\" $Id: curs_clear.3x,v 1.11 2007/12/29 15:58:38 tom Exp $ .TH curs_clear 3X "" .na .hy 0 @@ -105,6 +105,12 @@ That fact is not documented in other implementations, and may not be true of implementations which were not derived from SVr4 source. +.PP +Not obvious from the description, +most implementations clear the screen after \fBwclear\fP +even for a subwindow or derived window. +If you do not want to clear the screen during the next \fBwrefresh\fP, +use \fBwerase\fP instead. .SH SEE ALSO \fBcurses\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X) .\"# ==== //depot/projects/wifi/contrib/ncurses/man/man_db.renames#4 (text+ko) ==== @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: man_db.renames,v 0.39 2007/04/07 23:06:31 tom Exp $ +# $Id: man_db.renames,v 0.40 2008/01/19 18:28:50 tom Exp $ # Manual-page renamings for the man_db program # # Files: @@ -84,6 +84,7 @@ curs_termattrs.3x termattrs.3ncurses curs_termcap.3x termcap.3ncurses curs_terminfo.3x terminfo.3ncurses +curs_threads.3x threads.3ncurses curs_touch.3x touch.3ncurses curs_trace.3x trace.3ncurses curs_util.3x util.3ncurses @@ -116,9 +117,9 @@ form_win.3x win.3form infocmp.1m infocmp.1 infotocap.1m infotocap.1 +key_defined.3x key_defined.3ncurses keybound.3x keybound.3ncurses keyok.3x keyok.3ncurses -key_defined.3x key_defined.3ncurses legacy_coding.3x legacy_coding.3ncurses menu.3x menu.3menu menu_attributes.3x attributes.3menu ==== //depot/projects/wifi/contrib/ncurses/man/manlinks.sed#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $Id: manlinks.sed,v 1.12 2003/12/20 13:17:56 tom Exp $ +# $Id: manlinks.sed,v 1.13 2008/01/19 23:31:17 tom Exp $ ############################################################################## -# Copyright (c) 2000-2002,2003 Free Software Foundation, Inc. # +# Copyright (c) 2000-2003,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -35,6 +35,7 @@ /\.\\"/d /^\.br/d /^\.sp/d +/typedef/d s/^\.IX// s/\\f.//g s/[:,]/ /g ==== //depot/projects/wifi/contrib/ncurses/man/toe.1m#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: toe.1m,v 1.20 2006/12/24 17:20:37 tom Exp $ +.\" $Id: toe.1m,v 1.21 2008/01/05 20:57:16 tom Exp $ .TH @TOE@ 1M "" .ds n 5 .ds d @TERMINFO@ @@ -37,10 +37,14 @@ .br .SH DESCRIPTION .PP -With no options, \fBtoe\fR lists all available terminal types by primary name -with descriptions. File arguments specify the directories to be scanned; if no -such arguments are given, your default terminfo directory is scanned. If you -also specify the \fB-h\fR option, a directory header will be issued as each +With no options, +\fBtoe\fR lists all available terminal types by primary name +with descriptions. +File arguments specify the directories to be scanned; if no +such arguments are given, +your default terminfo directory is scanned. +If you also specify the \fB-h\fR option, +a directory header will be issued as each directory is entered. .PP There are other options intended for use by terminfo file maintainers: @@ -50,16 +54,25 @@ rather than only the first one that it finds. .TP \fB-u\fR \fIfile\fR -says to issue a report on dependencies in the given file. This report condenses -the `use' relation: each line consists of the primary name of a terminal that -has use capabilities, followed by a colon, followed by the +says to write a report to the standard output, +listing dependencies in the given terminfo/termcap source file. +The report condenses the `use' relation: +each line consists of the primary name of a terminal that +has use capabilities, +followed by a colon, +followed by the whitespace-separated primary names of all terminals which occur in those use -capabilities, followed by a newline +capabilities, +followed by a newline .TP \fB-U\fR \fIfile\fR -says to issue a report on reverse dependencies in the given file. This report -reverses the `use' relation: each line consists of the primary name of a -terminal that occurs in use capabilities, followed by a colon, followed by the +says to write a report to the standard output, +listing reverse dependencies in the given terminfo/termcap source file. +The report reverses the `use' relation: +each line consists of the primary name of a +terminal that occurs in use capabilities, +followed by a colon, +followed by the whitespace-separated primary names of all terminals which depend on it, followed by a newline. .TP @@ -70,7 +83,8 @@ interpreted as for \fB@TIC@\fR(1M). .TP \fB-V\fR -reports the version of ncurses which was used in this program, and exits. +reports the version of ncurses which was used in this program, +and exits. .SH FILES .TP 5 \fB\*d/?/*\fR ==== //depot/projects/wifi/contrib/ncurses/misc/terminfo.src#4 (text+ko) ==== @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.318 $ -# $Date: 2007/11/03 19:02:01 $ +# $Revision: 1.326 $ +# $Date: 2007/11/12 00:22:07 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -3017,10 +3017,8 @@ cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v43, -# This is the most common alias for xterm-new. xterm-xfree86|xterm terminal emulator (XFree86), - use=xterm-new, -# use=xterm-old, + use=xterm-xf86-v44, # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, @@ -3048,7 +3046,16 @@ # The meta key may also be used as a modifier in this scheme, adding another # bit to the parameter. xterm+pcfkeys|fragment for PC-style fkeys, - use=xterm+pcf2, use=xterm+pcc2, + use=xterm+app, use=xterm+pcf2, use=xterm+pcc2, + use=xterm+pce2, +# +xterm+noapp|fragment with cursor keys in normal mode, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F, + khome=\E[H, + +xterm+app|fragment with cursor keys in application mode, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, + khome=\EOH, # # The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27) # and revised in patch #167 (2002/8/24). Some other terminal emulators copied @@ -3071,28 +3078,39 @@ # that might apply to xterm+pcfkeys with different values of that resource. xterm+pcc3|fragment with modifyCursorKeys:3, kLFT=\E[>1;2D, kRIT=\E[>1;2C, kind=\E[>1;2B, - kri=\E[>1;2A, kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B, - kLFT5=\E[>1;5D, kLFT6=\E[>1;6D, kRIT5=\E[>1;5C, - kRIT6=\E[>1;6C, kUP=\E[>1;2A, kUP5=\E[>1;5A, - kUP6=\E[>1;6A, + kri=\E[>1;2A, kDN=\E[>1;2B, kDN3=\E[>1;3B, kDN4=\E[>1;4B, + kDN5=\E[>1;5B, kDN6=\E[>1;6B, kDN7=\E[>1;7B, + kLFT3=\E[>1;3D, kLFT4=\E[>1;4D, kLFT5=\E[>1;5D, + kLFT6=\E[>1;6D, kLFT7=\E[>1;7D, kRIT3=\E[>1;3C, + kRIT4=\E[>1;4C, kRIT5=\E[>1;5C, kRIT6=\E[>1;6C, + kRIT7=\E[>1;7C, kUP=\E[>1;2A, kUP3=\E[>1;3A, + kUP4=\E[>1;4A, kUP5=\E[>1;5A, kUP6=\E[>1;6A, + kUP7=\E[>1;7A, xterm+pcc2|fragment with modifyCursorKeys:2, kLFT=\E[1;2D, kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A, - kDN=\E[1;2B, kDN5=\E[1;5B, kDN6=\E[1;6B, kLFT5=\E[1;5D, - kLFT6=\E[1;6D, kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP=\E[1;2A, - kUP5=\E[1;5A, kUP6=\E[1;6A, + kDN=\E[1;2B, kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B, + kDN6=\E[1;6B, kDN7=\E[1;7B, kLFT3=\E[1;3D, kLFT4=\E[1;4D, + kLFT5=\E[1;5D, kLFT6=\E[1;6D, kLFT7=\E[1;7D, + kRIT3=\E[1;3C, kRIT4=\E[1;4C, kRIT5=\E[1;5C, + kRIT6=\E[1;6C, kRIT7=\E[1;7C, kUP=\E[1;2A, kUP3=\E[1;3A, + kUP4=\E[1;4A, kUP5=\E[1;5A, kUP6=\E[1;6A, kUP7=\E[1;7A, xterm+pcc1|fragment with modifyCursorKeys:1, kLFT=\E[2D, kRIT=\E[2C, kind=\E[2B, kri=\E[2A, kDN=\E[2B, - kDN5=\E[5B, kDN6=\E[6B, kLFT5=\E[5D, kLFT6=\E[6D, - kRIT5=\E[5C, kRIT6=\E[6C, kUP=\E[2A, kUP5=\E[5A, - kUP6=\E[6A, + kDN3=\E[3B, kDN4=\E[4B, kDN5=\E[5B, kDN6=\E[6B, kDN7=\E[7B, + kLFT3=\E[3D, kLFT4=\E[4D, kLFT5=\E[5D, kLFT6=\E[6D, + kLFT7=\E[7D, kRIT3=\E[3C, kRIT4=\E[4C, kRIT5=\E[5C, + kRIT6=\E[6C, kRIT7=\E[7C, kUP=\E[2A, kUP3=\E[3A, + kUP4=\E[4A, kUP5=\E[5A, kUP6=\E[6A, kUP7=\E[7A, xterm+pcc0|fragment with modifyCursorKeys:0, kLFT=\EO2D, kRIT=\EO2C, kind=\EO2B, kri=\EO2A, kDN=\EO2B, - kDN5=\EO5B, kDN6=\EO6B, kLFT5=\EO5D, kLFT6=\EO6D, - kRIT5=\EO5C, kRIT6=\EO6C, kUP=\EO2A, kUP5=\EO5A, - kUP6=\EO6A, + kDN3=\EO3B, kDN4=\EO4B, kDN5=\EO5B, kDN6=\EO6B, kDN7=\EO7B, + kLFT3=\EO3D, kLFT4=\EO4D, kLFT5=\EO5D, kLFT6=\EO6D, + kLFT7=\EO7D, kRIT3=\EO3C, kRIT4=\EO4C, kRIT5=\EO5C, + kRIT6=\EO6C, kRIT7=\EO7C, kUP=\EO2A, kUP3=\EO3A, + kUP4=\EO4A, kUP5=\EO5A, kUP6=\EO6A, kUP7=\EO7A, # # Here are corresponding fragments from xterm patch #216: @@ -3136,6 +3154,32 @@ kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, # +# Chunks from xterm #230: +xterm+pce2|fragment with modifyCursorKeys:2, + kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, + kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~, + kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~, + kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F, + kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F, + kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H, + kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~, + kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~, + kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~, + kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~, + kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~, + use=xterm+edit, + +xterm+edit|fragment for 6-key editing-keypad, + kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + use=xterm+pc+edit, + +xterm+pc+edit|fragment for pc-style editing keypad, + kend=\E[4~, khome=\E[1~, + +xterm+vt+edit|fragment for vt220-style editing keypad, + kfnd=\E[1~, kslt=\E[4~, + +# # Those chunks use the new-style (the xterm oldFunctionKeys resource is false). # Alternatively, the same scheme with old-style function keys as in xterm-r6 # is shown here (because that is used in mrxvt and mlterm): @@ -3163,8 +3207,8 @@ flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H, - kdch1=\E[3~, kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, - meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, + kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, + memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, @@ -3310,7 +3354,8 @@ kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, - use=xterm-basic, use=vt220+keypad, + use=xterm+app, use=xterm+edit, use=xterm-basic, + use=vt220+keypad, xterm-vt52|xterm emulating dec vt52, cols#80, it#8, lines#24, @@ -3321,11 +3366,11 @@ kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF, xterm-noapp|xterm with cursor keys in normal mode, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmcup@, - rmkx=\E>, smcup@, smkx=\E=, use=xterm, + rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp, + use=xterm, xterm-24|vs100|xterms|xterm terminal emulator (X Window System), - lines#24, use=xterm, + lines#24, use=xterm-old, # This is xterm for ncurses. xterm|xterm terminal emulator (X Window System), @@ -3349,7 +3394,7 @@ # # xterm with bold instead of underline xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold, - smso=\E[7m, smul=\E[1m, use=xterm, + smso=\E[7m, smul=\E[1m, use=xterm-old, # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr) # (kterm should not invoke DEC Graphics as the alternate character set # -- Kenji Rikitake) @@ -21607,6 +21652,15 @@ # 2007-11-03 # * correct acsc strings for h19 and z100 (Benjamin Sittler) # +# 2007-11-11 +# * use xterm-xf86-v44 for "xterm-xfree86", reflecting changes to +# xterm starting with patch #216 -TD +# * make legacy xterm entries such as xterm-24 inherit from xterm-old, +# to match xterm #230 -TD +# * extend xterm+pccX entries to match xterm #230 -TD +# * add xterm+app, xterm+noapp, from xterm #230 -TD +# * add/use xterm+pce2 from xterm #230, in xterm+pcfkeys -TD +# # The following sets edit modes for GNU EMACS. # Local Variables: # fill-prefix:"\t" ==== //depot/projects/wifi/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 (text+ko) ==== @@ -2,10 +2,10 @@ # # MKlib_gen.sh -- generate sources from curses.h macro definitions # -# ($Id: MKlib_gen.sh,v 1.29 2007/08/18 13:17:14 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.30 2008/01/05 23:21:10 tom Exp $) # ############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -422,4 +422,5 @@ | sed \ -e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \ -e 's/^.*T_CALLED.*returnCode( \((wmove.*) \));/ return \1;/' \ + -e 's/gen_//' \ | sed -f $ED4 ==== //depot/projects/wifi/contrib/ncurses/ncurses/base/MKunctrl.awk#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $Id: MKunctrl.awk,v 1.14 2007/07/28 21:13:21 tom Exp $ +# $Id: MKunctrl.awk,v 1.21 2008/02/03 20:24:30 tom Exp $ ############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -27,13 +27,20 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey <dickey@clark.net> 1997 +# Author: Thomas E. Dickey (1997-on) # BEGIN { print "/* generated by MKunctrl.awk */" print "" print "#include <curses.priv.h>" + print "#include <ctype.h>" + print "" + print "#if USE_WIDEC_SUPPORT" + print "#if HAVE_WCTYPE_H" + print "#include <wctype.h>" + print "#endif" + print "#endif" print "" print "#undef unctrl" print "" @@ -69,6 +76,12 @@ } else if (ch >= 128 && ch < 160) { part = sprintf("~\\%03o", ch - 64); offset = offset + 3; + } else if (ch == 255) { + part = "~?"; + offset = offset + 3; + } else if (ch >= 160) { + part = sprintf("M-\\%03o", ch - 128); + offset = offset + 4; } else { gap = gap " " part = sprintf("\\%03o", ch); @@ -88,14 +101,13 @@ blob = blob "\""; print "" - print "#if NCURSES_EXT_FUNCS" if (bigstrings) { - blob = blob "\n#if NCURSES_EXT_FUNCS" + blob = blob "\n/* printable values in 128-255 range */" printf "static const short unctrl_c1[] = {" } else { printf "static const char* const unctrl_c1[] = {" } - for ( ch = 128; ch < 160; ch++ ) { + for ( ch = 128; ch < 256; ch++ ) { gap = "," if ((ch % 8) == 0) { if (ch != 128) @@ -111,7 +123,7 @@ if (((ch + 1) % 8) != 0) gap = gap " " } else { - if (ch >= 128 && ch < 160) { + if (ch >= 128) { printf "\"\\%03o\"", ch gap = gap " " } @@ -123,8 +135,7 @@ } } print "};" - print "#endif /* NCURSES_EXT_FUNCS */" - blob = blob "\"\n#endif /* NCURSES_EXT_FUNCS */\n" + blob = blob "\"\n" print "" if (bigstrings) { @@ -134,22 +145,41 @@ } else { stringname = "unctrl" } - print "\tint check = ChCharOf(ch);" - print "\tconst char *result;" - print "" - print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" - print "#if NCURSES_EXT_FUNCS" - print "\t\tif ((SP != 0)" - print "\t\t && (SP->_legacy_coding > 1)" - print "\t\t && (check >= 128)" - print "\t\t && (check < 160))" + print "\tint check = ChCharOf(ch);" + print "\tconst char *result;" + print "" + print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" + print "#if NCURSES_EXT_FUNCS" + print "\t\tif ((SP != 0)" + print "\t\t && (SP->_legacy_coding > 1)" + print "\t\t && (check >= 128)" + print "\t\t && (check < 160))" + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; + print "\t\telse" + print "#if USE_WIDEC_SUPPORT" + print "\t\tif ((check >= 160)" + print "\t\t && (check < 256)" + print "\t\t && ((SP != 0)" + print "\t\t && ((SP->_legacy_coding > 0)" + print "\t\t || (SP->_legacy_coding == 0" + print "\t\t && (isprint(check) || iswprint(check))))))" + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; + print "\t\telse" + print "#else" + print "\t\tif ((check >= 160)" + print "\t\t && (check < 256)" + print "\t\t && ((SP != 0)" + print "\t\t && ((SP->_legacy_coding > 0)" + print "\t\t || (SP->_legacy_coding == 0" + print "\t\t && isprint(check)))))" printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; - print "\t\telse" - print "#endif /* NCURSES_EXT_FUNCS */" + print "\t\telse" + print "#endif /* USE_WIDEC_SUPPORT */" + print "#endif /* NCURSES_EXT_FUNCS */" printf "\t\t\tresult = %s_table[check];\n", stringname; - print "\t} else {" - print "\t\tresult = 0;" - print "\t}" - print "\treturn (NCURSES_CONST char *)result;" - print "}" + print "\t} else {" + print "\t\tresult = 0;" + print "\t}" + print "\treturn (NCURSES_CONST char *)result;" + print "}" } ==== //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_addch.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ #include <curses.priv.h> #include <ctype.h> -MODULE_ID("$Id: lib_addch.c,v 1.104 2006/10/14 20:31:19 tom Exp $") +MODULE_ID("$Id: lib_addch.c,v 1.108 2008/02/03 18:50:27 tom Exp $") static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); @@ -219,17 +219,15 @@ attr_t attrs = AttrOf(CHDEREF(ch)); SetChar(CHDEREF(ch), result, attrs); WINDOW_EXT(win, addch_used) = 0; - } else { - if (len == -1) { - /* - * An error occurred. We could either discard everything, - * or assume that the error was in the previous input. - * Try the latter. - */ - TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error")); - buffer[0] = CharOf(CHDEREF(ch)); - WINDOW_EXT(win, addch_used) = 1; - } + } else if (len == -1) { + /* + * An error occurred. We could either discard everything, + * or assume that the error was in the previous input. + * Try the latter. + */ + TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error")); + /* handle this with unctrl() */ + WINDOW_EXT(win, addch_used) = 0; } return len; } @@ -264,13 +262,16 @@ if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) { int len = _nc_build_wch(win, CHREF(ch)); - if (len > 0) { + if (len >= -1) { + /* handle EILSEQ */ if (is8bits(CharOf(ch))) { const char *s = unctrl((chtype) CharOf(ch)); if (s[1] != 0) { return waddstr(win, s); } } + if (len == -1) + return waddch(win, ' '); } else { return OK; } ==== //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_getch.c#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802131454.m1DEssHc087602>