Index: /trunk/essentials/sys-libs/ncurses/Makefile.kmk
===================================================================
--- /trunk/essentials/sys-libs/ncurses/Makefile.kmk	(revision 3072)
+++ /trunk/essentials/sys-libs/ncurses/Makefile.kmk	(revision 3073)
@@ -1,3 +1,5 @@
-# $Id: $
+# $Id$
+
+ifdef NOT_BOOTSTRAPPING_KNIX
 
 # Make file for working the OS/2 port.
@@ -15,5 +17,11 @@
 SET_MAKE     = EMXSHELL="$(SHELL)"
 
-pm_topdir := ..
+pm_topdir := ../../../
 include $(pm_topdir)/ports-make/gnugccomf.gmk
 
+else
+
+include kNIX-bootstrap.kmk
+
+endif
+
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-codes.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-codes.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-codes.c	(revision 3073)
@@ -0,0 +1,529 @@
+/* This file was generated by MKnames.awk */
+
+#include <curses.priv.h>
+
+#define IT NCURSES_CONST char * const
+
+#if BROKEN_LINKER
+#include <term.h>
+#define DCL(it) static IT data##it[]
+#else
+#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]
+#endif
+
+DCL(boolcodes)  = {
+		"bw",
+		"am",
+		"xb",
+		"xs",
+		"xn",
+		"eo",
+		"gn",
+		"hc",
+		"km",
+		"hs",
+		"in",
+		"da",
+		"db",
+		"mi",
+		"ms",
+		"os",
+		"es",
+		"xt",
+		"hz",
+		"ul",
+		"xo",
+		"nx",
+		"5i",
+		"HC",
+		"NR",
+		"NP",
+		"ND",
+		"cc",
+		"ut",
+		"hl",
+		"YA",
+		"YB",
+		"YC",
+		"YD",
+		"YE",
+		"YF",
+		"YG",
+		"bs",
+		"ns",
+		"nc",
+		"MT",
+		"NL",
+		"pt",
+		"xr",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(numcodes)   = {
+		"co",
+		"it",
+		"li",
+		"lm",
+		"sg",
+		"pb",
+		"vt",
+		"ws",
+		"Nl",
+		"lh",
+		"lw",
+		"ma",
+		"MW",
+		"Co",
+		"pa",
+		"NC",
+		"Ya",
+		"Yb",
+		"Yc",
+		"Yd",
+		"Ye",
+		"Yf",
+		"Yg",
+		"Yh",
+		"Yi",
+		"Yj",
+		"Yk",
+		"Yl",
+		"Ym",
+		"Yn",
+		"BT",
+		"Yo",
+		"Yp",
+		"ug",
+		"dC",
+		"dN",
+		"dB",
+		"dT",
+		"kn",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(strcodes)   = {
+		"bt",
+		"bl",
+		"cr",
+		"cs",
+		"ct",
+		"cl",
+		"ce",
+		"cd",
+		"ch",
+		"CC",
+		"cm",
+		"do",
+		"ho",
+		"vi",
+		"le",
+		"CM",
+		"ve",
+		"nd",
+		"ll",
+		"up",
+		"vs",
+		"dc",
+		"dl",
+		"ds",
+		"hd",
+		"as",
+		"mb",
+		"md",
+		"ti",
+		"dm",
+		"mh",
+		"im",
+		"mk",
+		"mp",
+		"mr",
+		"so",
+		"us",
+		"ec",
+		"ae",
+		"me",
+		"te",
+		"ed",
+		"ei",
+		"se",
+		"ue",
+		"vb",
+		"ff",
+		"fs",
+		"i1",
+		"is",
+		"i3",
+		"if",
+		"ic",
+		"al",
+		"ip",
+		"kb",
+		"ka",
+		"kC",
+		"kt",
+		"kD",
+		"kL",
+		"kd",
+		"kM",
+		"kE",
+		"kS",
+		"k0",
+		"k1",
+		"k;",
+		"k2",
+		"k3",
+		"k4",
+		"k5",
+		"k6",
+		"k7",
+		"k8",
+		"k9",
+		"kh",
+		"kI",
+		"kA",
+		"kl",
+		"kH",
+		"kN",
+		"kP",
+		"kr",
+		"kF",
+		"kR",
+		"kT",
+		"ku",
+		"ke",
+		"ks",
+		"l0",
+		"l1",
+		"la",
+		"l2",
+		"l3",
+		"l4",
+		"l5",
+		"l6",
+		"l7",
+		"l8",
+		"l9",
+		"mo",
+		"mm",
+		"nw",
+		"pc",
+		"DC",
+		"DL",
+		"DO",
+		"IC",
+		"SF",
+		"AL",
+		"LE",
+		"RI",
+		"SR",
+		"UP",
+		"pk",
+		"pl",
+		"px",
+		"ps",
+		"pf",
+		"po",
+		"rp",
+		"r1",
+		"r2",
+		"r3",
+		"rf",
+		"rc",
+		"cv",
+		"sc",
+		"sf",
+		"sr",
+		"sa",
+		"st",
+		"wi",
+		"ta",
+		"ts",
+		"uc",
+		"hu",
+		"iP",
+		"K1",
+		"K3",
+		"K2",
+		"K4",
+		"K5",
+		"pO",
+		"rP",
+		"ac",
+		"pn",
+		"kB",
+		"SX",
+		"RX",
+		"SA",
+		"RA",
+		"XN",
+		"XF",
+		"eA",
+		"LO",
+		"LF",
+		"@1",
+		"@2",
+		"@3",
+		"@4",
+		"@5",
+		"@6",
+		"@7",
+		"@8",
+		"@9",
+		"@0",
+		"%1",
+		"%2",
+		"%3",
+		"%4",
+		"%5",
+		"%6",
+		"%7",
+		"%8",
+		"%9",
+		"%0",
+		"&1",
+		"&2",
+		"&3",
+		"&4",
+		"&5",
+		"&6",
+		"&7",
+		"&8",
+		"&9",
+		"&0",
+		"*1",
+		"*2",
+		"*3",
+		"*4",
+		"*5",
+		"*6",
+		"*7",
+		"*8",
+		"*9",
+		"*0",
+		"#1",
+		"#2",
+		"#3",
+		"#4",
+		"%a",
+		"%b",
+		"%c",
+		"%d",
+		"%e",
+		"%f",
+		"%g",
+		"%h",
+		"%i",
+		"%j",
+		"!1",
+		"!2",
+		"!3",
+		"RF",
+		"F1",
+		"F2",
+		"F3",
+		"F4",
+		"F5",
+		"F6",
+		"F7",
+		"F8",
+		"F9",
+		"FA",
+		"FB",
+		"FC",
+		"FD",
+		"FE",
+		"FF",
+		"FG",
+		"FH",
+		"FI",
+		"FJ",
+		"FK",
+		"FL",
+		"FM",
+		"FN",
+		"FO",
+		"FP",
+		"FQ",
+		"FR",
+		"FS",
+		"FT",
+		"FU",
+		"FV",
+		"FW",
+		"FX",
+		"FY",
+		"FZ",
+		"Fa",
+		"Fb",
+		"Fc",
+		"Fd",
+		"Fe",
+		"Ff",
+		"Fg",
+		"Fh",
+		"Fi",
+		"Fj",
+		"Fk",
+		"Fl",
+		"Fm",
+		"Fn",
+		"Fo",
+		"Fp",
+		"Fq",
+		"Fr",
+		"cb",
+		"MC",
+		"ML",
+		"MR",
+		"Lf",
+		"SC",
+		"DK",
+		"RC",
+		"CW",
+		"WG",
+		"HU",
+		"DI",
+		"QD",
+		"TO",
+		"PU",
+		"fh",
+		"PA",
+		"WA",
+		"u0",
+		"u1",
+		"u2",
+		"u3",
+		"u4",
+		"u5",
+		"u6",
+		"u7",
+		"u8",
+		"u9",
+		"op",
+		"oc",
+		"Ic",
+		"Ip",
+		"sp",
+		"Sf",
+		"Sb",
+		"ZA",
+		"ZB",
+		"ZC",
+		"ZD",
+		"ZE",
+		"ZF",
+		"ZG",
+		"ZH",
+		"ZI",
+		"ZJ",
+		"ZK",
+		"ZL",
+		"ZM",
+		"ZN",
+		"ZO",
+		"ZP",
+		"ZQ",
+		"ZR",
+		"ZS",
+		"ZT",
+		"ZU",
+		"ZV",
+		"ZW",
+		"ZX",
+		"ZY",
+		"ZZ",
+		"Za",
+		"Zb",
+		"Zc",
+		"Zd",
+		"Ze",
+		"Zf",
+		"Zg",
+		"Zh",
+		"Zi",
+		"Zj",
+		"Zk",
+		"Zl",
+		"Zm",
+		"Zn",
+		"Zo",
+		"Zp",
+		"Zq",
+		"Zr",
+		"Zs",
+		"Zt",
+		"Zu",
+		"Zv",
+		"Zw",
+		"Zx",
+		"Zy",
+		"Km",
+		"Mi",
+		"RQ",
+		"Gm",
+		"AF",
+		"AB",
+		"xl",
+		"dv",
+		"ci",
+		"s0",
+		"s1",
+		"s2",
+		"s3",
+		"ML",
+		"MT",
+		"Xy",
+		"Zz",
+		"Yv",
+		"Yw",
+		"Yx",
+		"Yy",
+		"Yz",
+		"YZ",
+		"S1",
+		"S2",
+		"S3",
+		"S4",
+		"S5",
+		"S6",
+		"S7",
+		"S8",
+		"Xh",
+		"Xl",
+		"Xo",
+		"Xr",
+		"Xt",
+		"Xv",
+		"sA",
+		"sL",
+		"i2",
+		"rs",
+		"nl",
+		"bc",
+		"ko",
+		"ma",
+		"G2",
+		"G3",
+		"G1",
+		"G4",
+		"GR",
+		"GL",
+		"GU",
+		"GD",
+		"GH",
+		"GV",
+		"GC",
+		"ml",
+		"mu",
+		"bx",
+		(NCURSES_CONST char *)0,
+};
+
+
+#if BROKEN_LINKER
+#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }
+FIX(boolcodes)
+FIX(numcodes)
+FIX(strcodes)
+#endif /* BROKEN_LINKER */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-comp_captab.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-comp_captab.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-comp_captab.c	(revision 3073)
@@ -0,0 +1,3090 @@
+/*
+ *	comp_captab.c -- The names of the capabilities indexed via a hash
+ *		         table for the compiler.
+ *
+ */
+
+#include <ncurses_cfg.h>
+#include <curses.priv.h>
+#include <tic.h>
+#include <term.h>
+
+static struct name_table_entry const _nc_info_table[] =
+{
+	{            "bw",	   BOOLEAN,	  0,  -1 },
+	{            "am",	   BOOLEAN,	  1,  -1 },
+	{           "xsb",	   BOOLEAN,	  2,  -1 },
+	{           "xhp",	   BOOLEAN,	  3,  -1 },
+	{          "xenl",	   BOOLEAN,	  4,  -1 },
+	{            "eo",	   BOOLEAN,	  5,  -1 },
+	{            "gn",	   BOOLEAN,	  6,  -1 },
+	{            "hc",	   BOOLEAN,	  7,  -1 },
+	{            "km",	   BOOLEAN,	  8,  -1 },
+	{            "hs",	   BOOLEAN,	  9,  -1 },
+	{            "in",	   BOOLEAN,	 10,  -1 },
+	{            "da",	   BOOLEAN,	 11,  -1 },
+	{            "db",	   BOOLEAN,	 12,  -1 },
+	{           "mir",	   BOOLEAN,	 13,  -1 },
+	{          "msgr",	   BOOLEAN,	 14,  -1 },
+	{            "os",	   BOOLEAN,	 15,  -1 },
+	{         "eslok",	   BOOLEAN,	 16,  -1 },
+	{            "xt",	   BOOLEAN,	 17,  -1 },
+	{            "hz",	   BOOLEAN,	 18,  -1 },
+	{            "ul",	   BOOLEAN,	 19,  -1 },
+	{           "xon",	   BOOLEAN,	 20,  -1 },
+	{          "nxon",	   BOOLEAN,	 21,  -1 },
+	{          "mc5i",	   BOOLEAN,	 22,  -1 },
+	{          "chts",	   BOOLEAN,	 23,  -1 },
+	{         "nrrmc",	   BOOLEAN,	 24,  -1 },
+	{           "npc",	   BOOLEAN,	 25,  -1 },
+	{         "ndscr",	   BOOLEAN,	 26,  -1 },
+	{           "ccc",	   BOOLEAN,	 27,  -1 },
+	{           "bce",	   BOOLEAN,	 28,  -1 },
+	{           "hls",	   BOOLEAN,	 29,  -1 },
+	{          "xhpa",	   BOOLEAN,	 30,  -1 },
+	{          "crxm",	   BOOLEAN,	 31,  -1 },
+	{         "daisy",	   BOOLEAN,	 32,  -1 },
+	{          "xvpa",	   BOOLEAN,	 33,  -1 },
+	{           "sam",	   BOOLEAN,	 34,  -1 },
+	{          "cpix",	   BOOLEAN,	 35,  -1 },
+	{          "lpix",	   BOOLEAN,	 36,  -1 },
+	{          "cols",	    NUMBER,	  0,  -1 },
+	{            "it",	    NUMBER,	  1,  -1 },
+	{         "lines",	    NUMBER,	  2,   6 },
+	{            "lm",	    NUMBER,	  3,  -1 },
+	{           "xmc",	    NUMBER,	  4,  -1 },
+	{            "pb",	    NUMBER,	  5,  -1 },
+	{            "vt",	    NUMBER,	  6,  -1 },
+	{           "wsl",	    NUMBER,	  7,  -1 },
+	{          "nlab",	    NUMBER,	  8,  -1 },
+	{            "lh",	    NUMBER,	  9,  -1 },
+	{            "lw",	    NUMBER,	 10,  -1 },
+	{            "ma",	    NUMBER,	 11,  -1 },
+	{          "wnum",	    NUMBER,	 12,  -1 },
+	{        "colors",	    NUMBER,	 13,  -1 },
+	{         "pairs",	    NUMBER,	 14,  -1 },
+	{           "ncv",	    NUMBER,	 15,  -1 },
+	{         "bufsz",	    NUMBER,	 16,  46 },
+	{         "spinv",	    NUMBER,	 17,  -1 },
+	{         "spinh",	    NUMBER,	 18,  -1 },
+	{         "maddr",	    NUMBER,	 19,  -1 },
+	{         "mjump",	    NUMBER,	 20,  -1 },
+	{           "mcs",	    NUMBER,	 21,  -1 },
+	{           "mls",	    NUMBER,	 22,  -1 },
+	{         "npins",	    NUMBER,	 23,  -1 },
+	{           "orc",	    NUMBER,	 24,  -1 },
+	{           "orl",	    NUMBER,	 25,  -1 },
+	{          "orhi",	    NUMBER,	 26,  -1 },
+	{          "orvi",	    NUMBER,	 27,  -1 },
+	{           "cps",	    NUMBER,	 28,  -1 },
+	{         "widcs",	    NUMBER,	 29,  -1 },
+	{          "btns",	    NUMBER,	 30,  -1 },
+	{        "bitwin",	    NUMBER,	 31,  -1 },
+	{        "bitype",	    NUMBER,	 32,  68 },
+	{           "cbt",	    STRING,	  0,  -1 },
+	{           "bel",	    STRING,	  1,  -1 },
+	{            "cr",	    STRING,	  2,  -1 },
+	{           "csr",	    STRING,	  3,  -1 },
+	{           "tbc",	    STRING,	  4,  -1 },
+	{         "clear",	    STRING,	  5,  -1 },
+	{            "el",	    STRING,	  6,  -1 },
+	{            "ed",	    STRING,	  7,  -1 },
+	{           "hpa",	    STRING,	  8,  -1 },
+	{         "cmdch",	    STRING,	  9,  -1 },
+	{           "cup",	    STRING,	 10,  73 },
+	{          "cud1",	    STRING,	 11,  -1 },
+	{          "home",	    STRING,	 12,  -1 },
+	{         "civis",	    STRING,	 13,  -1 },
+	{          "cub1",	    STRING,	 14,  -1 },
+	{         "mrcup",	    STRING,	 15,  -1 },
+	{         "cnorm",	    STRING,	 16,  -1 },
+	{          "cuf1",	    STRING,	 17,  -1 },
+	{            "ll",	    STRING,	 18,  -1 },
+	{          "cuu1",	    STRING,	 19,  -1 },
+	{         "cvvis",	    STRING,	 20,  -1 },
+	{          "dch1",	    STRING,	 21,  -1 },
+	{           "dl1",	    STRING,	 22,  -1 },
+	{           "dsl",	    STRING,	 23,  -1 },
+	{            "hd",	    STRING,	 24,  -1 },
+	{         "smacs",	    STRING,	 25,  -1 },
+	{         "blink",	    STRING,	 26,  -1 },
+	{          "bold",	    STRING,	 27,  -1 },
+	{         "smcup",	    STRING,	 28,  -1 },
+	{          "smdc",	    STRING,	 29,  -1 },
+	{           "dim",	    STRING,	 30,  -1 },
+	{          "smir",	    STRING,	 31,  -1 },
+	{         "invis",	    STRING,	 32,  -1 },
+	{          "prot",	    STRING,	 33,  -1 },
+	{           "rev",	    STRING,	 34,  -1 },
+	{          "smso",	    STRING,	 35,  -1 },
+	{          "smul",	    STRING,	 36,  -1 },
+	{           "ech",	    STRING,	 37,  -1 },
+	{         "rmacs",	    STRING,	 38,  -1 },
+	{          "sgr0",	    STRING,	 39,  -1 },
+	{         "rmcup",	    STRING,	 40,  -1 },
+	{          "rmdc",	    STRING,	 41,  -1 },
+	{          "rmir",	    STRING,	 42,  -1 },
+	{          "rmso",	    STRING,	 43,  -1 },
+	{          "rmul",	    STRING,	 44,  -1 },
+	{         "flash",	    STRING,	 45,  -1 },
+	{            "ff",	    STRING,	 46,  -1 },
+	{           "fsl",	    STRING,	 47,  -1 },
+	{           "is1",	    STRING,	 48,  -1 },
+	{           "is2",	    STRING,	 49,  59 },
+	{           "is3",	    STRING,	 50,  76 },
+	{            "if",	    STRING,	 51,  -1 },
+	{          "ich1",	    STRING,	 52,  20 },
+	{           "il1",	    STRING,	 53,  -1 },
+	{            "ip",	    STRING,	 54,  -1 },
+	{           "kbs",	    STRING,	 55,  -1 },
+	{          "ktbc",	    STRING,	 56,  -1 },
+	{          "kclr",	    STRING,	 57,  98 },
+	{         "kctab",	    STRING,	 58,  -1 },
+	{         "kdch1",	    STRING,	 59,  -1 },
+	{          "kdl1",	    STRING,	 60,  -1 },
+	{         "kcud1",	    STRING,	 61,  -1 },
+	{         "krmir",	    STRING,	 62,  -1 },
+	{           "kel",	    STRING,	 63,  -1 },
+	{           "ked",	    STRING,	 64,  -1 },
+	{           "kf0",	    STRING,	 65,  -1 },
+	{           "kf1",	    STRING,	 66,  -1 },
+	{          "kf10",	    STRING,	 67,  -1 },
+	{           "kf2",	    STRING,	 68,  -1 },
+	{           "kf3",	    STRING,	 69,  -1 },
+	{           "kf4",	    STRING,	 70,  -1 },
+	{           "kf5",	    STRING,	 71,  61 },
+	{           "kf6",	    STRING,	 72,  -1 },
+	{           "kf7",	    STRING,	 73,  -1 },
+	{           "kf8",	    STRING,	 74,  -1 },
+	{           "kf9",	    STRING,	 75,  -1 },
+	{         "khome",	    STRING,	 76,  -1 },
+	{         "kich1",	    STRING,	 77,  -1 },
+	{          "kil1",	    STRING,	 78,  -1 },
+	{         "kcub1",	    STRING,	 79,  -1 },
+	{           "kll",	    STRING,	 80,  -1 },
+	{           "knp",	    STRING,	 81,  -1 },
+	{           "kpp",	    STRING,	 82,  -1 },
+	{         "kcuf1",	    STRING,	 83,  -1 },
+	{          "kind",	    STRING,	 84,  55 },
+	{           "kri",	    STRING,	 85, 105 },
+	{          "khts",	    STRING,	 86,  -1 },
+	{         "kcuu1",	    STRING,	 87,  81 },
+	{          "rmkx",	    STRING,	 88,  -1 },
+	{          "smkx",	    STRING,	 89,  -1 },
+	{           "lf0",	    STRING,	 90,  -1 },
+	{           "lf1",	    STRING,	 91,  -1 },
+	{          "lf10",	    STRING,	 92,  -1 },
+	{           "lf2",	    STRING,	 93,  -1 },
+	{           "lf3",	    STRING,	 94,  33 },
+	{           "lf4",	    STRING,	 95,  -1 },
+	{           "lf5",	    STRING,	 96,  -1 },
+	{           "lf6",	    STRING,	 97,  -1 },
+	{           "lf7",	    STRING,	 98,   7 },
+	{           "lf8",	    STRING,	 99,  94 },
+	{           "lf9",	    STRING,	100,  -1 },
+	{           "rmm",	    STRING,	101, 131 },
+	{           "smm",	    STRING,	102,  -1 },
+	{           "nel",	    STRING,	103,  -1 },
+	{           "pad",	    STRING,	104,  30 },
+	{           "dch",	    STRING,	105,  -1 },
+	{            "dl",	    STRING,	106,  -1 },
+	{           "cud",	    STRING,	107,  -1 },
+	{           "ich",	    STRING,	108,  -1 },
+	{          "indn",	    STRING,	109,  -1 },
+	{            "il",	    STRING,	110,  -1 },
+	{           "cub",	    STRING,	111,  -1 },
+	{           "cuf",	    STRING,	112, 156 },
+	{           "rin",	    STRING,	113,  -1 },
+	{           "cuu",	    STRING,	114,  -1 },
+	{         "pfkey",	    STRING,	115,  51 },
+	{         "pfloc",	    STRING,	116,  -1 },
+	{           "pfx",	    STRING,	117,  -1 },
+	{           "mc0",	    STRING,	118,  -1 },
+	{           "mc4",	    STRING,	119,  -1 },
+	{           "mc5",	    STRING,	120,  -1 },
+	{           "rep",	    STRING,	121,  -1 },
+	{           "rs1",	    STRING,	122,  -1 },
+	{           "rs2",	    STRING,	123,  -1 },
+	{           "rs3",	    STRING,	124, 126 },
+	{            "rf",	    STRING,	125,  -1 },
+	{            "rc",	    STRING,	126,  -1 },
+	{           "vpa",	    STRING,	127,  -1 },
+	{            "sc",	    STRING,	128,  -1 },
+	{           "ind",	    STRING,	129,  -1 },
+	{            "ri",	    STRING,	130,  -1 },
+	{           "sgr",	    STRING,	131,  -1 },
+	{           "hts",	    STRING,	132,  -1 },
+	{          "wind",	    STRING,	133,  -1 },
+	{            "ht",	    STRING,	134,  -1 },
+	{           "tsl",	    STRING,	135,  -1 },
+	{            "uc",	    STRING,	136,  23 },
+	{            "hu",	    STRING,	137,  -1 },
+	{         "iprog",	    STRING,	138,  -1 },
+	{           "ka1",	    STRING,	139,  -1 },
+	{           "ka3",	    STRING,	140,  -1 },
+	{           "kb2",	    STRING,	141, 210 },
+	{           "kc1",	    STRING,	142, 211 },
+	{           "kc3",	    STRING,	143, 135 },
+	{          "mc5p",	    STRING,	144,  -1 },
+	{           "rmp",	    STRING,	145,  -1 },
+	{          "acsc",	    STRING,	146, 176 },
+	{           "pln",	    STRING,	147,  -1 },
+	{          "kcbt",	    STRING,	148, 194 },
+	{         "smxon",	    STRING,	149,  -1 },
+	{         "rmxon",	    STRING,	150,  -1 },
+	{          "smam",	    STRING,	151, 137 },
+	{          "rmam",	    STRING,	152,  -1 },
+	{          "xonc",	    STRING,	153,  -1 },
+	{         "xoffc",	    STRING,	154,  -1 },
+	{         "enacs",	    STRING,	155,  -1 },
+	{          "smln",	    STRING,	156,  -1 },
+	{          "rmln",	    STRING,	157,  -1 },
+	{          "kbeg",	    STRING,	158,  -1 },
+	{          "kcan",	    STRING,	159,  -1 },
+	{          "kclo",	    STRING,	160,  -1 },
+	{          "kcmd",	    STRING,	161,  -1 },
+	{          "kcpy",	    STRING,	162,  -1 },
+	{          "kcrt",	    STRING,	163,  54 },
+	{          "kend",	    STRING,	164, 192 },
+	{          "kent",	    STRING,	165,  -1 },
+	{          "kext",	    STRING,	166,  -1 },
+	{          "kfnd",	    STRING,	167, 193 },
+	{          "khlp",	    STRING,	168,  -1 },
+	{          "kmrk",	    STRING,	169,  70 },
+	{          "kmsg",	    STRING,	170, 235 },
+	{          "kmov",	    STRING,	171,  -1 },
+	{          "knxt",	    STRING,	172,  -1 },
+	{          "kopn",	    STRING,	173, 177 },
+	{          "kopt",	    STRING,	174,  -1 },
+	{          "kprv",	    STRING,	175,  -1 },
+	{          "kprt",	    STRING,	176,  -1 },
+	{          "krdo",	    STRING,	177,  -1 },
+	{          "kref",	    STRING,	178,  -1 },
+	{          "krfr",	    STRING,	179, 239 },
+	{          "krpl",	    STRING,	180, 219 },
+	{          "krst",	    STRING,	181,  80 },
+	{          "kres",	    STRING,	182, 249 },
+	{          "ksav",	    STRING,	183, 252 },
+	{          "kspd",	    STRING,	184, 240 },
+	{          "kund",	    STRING,	185, 254 },
+	{          "kBEG",	    STRING,	186,  -1 },
+	{          "kCAN",	    STRING,	187,  -1 },
+	{          "kCMD",	    STRING,	188, 101 },
+	{          "kCPY",	    STRING,	189,  -1 },
+	{          "kCRT",	    STRING,	190,  -1 },
+	{           "kDC",	    STRING,	191,  -1 },
+	{           "kDL",	    STRING,	192,  -1 },
+	{          "kslt",	    STRING,	193, 244 },
+	{          "kEND",	    STRING,	194,  -1 },
+	{          "kEOL",	    STRING,	195, 152 },
+	{          "kEXT",	    STRING,	196,  -1 },
+	{          "kFND",	    STRING,	197, 150 },
+	{          "kHLP",	    STRING,	198,  -1 },
+	{          "kHOM",	    STRING,	199, 268 },
+	{           "kIC",	    STRING,	200,  -1 },
+	{          "kLFT",	    STRING,	201,  72 },
+	{          "kMSG",	    STRING,	202,  -1 },
+	{          "kMOV",	    STRING,	203,  -1 },
+	{          "kNXT",	    STRING,	204,  -1 },
+	{          "kOPT",	    STRING,	205,  -1 },
+	{          "kPRV",	    STRING,	206,  -1 },
+	{          "kPRT",	    STRING,	207, 196 },
+	{          "kRDO",	    STRING,	208,  -1 },
+	{          "kRPL",	    STRING,	209,  -1 },
+	{          "kRIT",	    STRING,	210,  -1 },
+	{          "kRES",	    STRING,	211,  -1 },
+	{          "kSAV",	    STRING,	212, 281 },
+	{          "kSPD",	    STRING,	213, 272 },
+	{          "kUND",	    STRING,	214, 283 },
+	{           "rfi",	    STRING,	215,  -1 },
+	{          "kf11",	    STRING,	216,  -1 },
+	{          "kf12",	    STRING,	217, 134 },
+	{          "kf13",	    STRING,	218,  -1 },
+	{          "kf14",	    STRING,	219,  -1 },
+	{          "kf15",	    STRING,	220,  -1 },
+	{          "kf16",	    STRING,	221,  43 },
+	{          "kf17",	    STRING,	222, 256 },
+	{          "kf18",	    STRING,	223,  -1 },
+	{          "kf19",	    STRING,	224,  -1 },
+	{          "kf20",	    STRING,	225, 286 },
+	{          "kf21",	    STRING,	226, 287 },
+	{          "kf22",	    STRING,	227, 288 },
+	{          "kf23",	    STRING,	228, 289 },
+	{          "kf24",	    STRING,	229, 290 },
+	{          "kf25",	    STRING,	230, 291 },
+	{          "kf26",	    STRING,	231, 292 },
+	{          "kf27",	    STRING,	232, 293 },
+	{          "kf28",	    STRING,	233, 294 },
+	{          "kf29",	    STRING,	234, 133 },
+	{          "kf30",	    STRING,	235, 296 },
+	{          "kf31",	    STRING,	236, 297 },
+	{          "kf32",	    STRING,	237, 298 },
+	{          "kf33",	    STRING,	238, 299 },
+	{          "kf34",	    STRING,	239, 300 },
+	{          "kf35",	    STRING,	240, 301 },
+	{          "kf36",	    STRING,	241, 302 },
+	{          "kf37",	    STRING,	242, 303 },
+	{          "kf38",	    STRING,	243, 304 },
+	{          "kf39",	    STRING,	244, 257 },
+	{          "kf40",	    STRING,	245, 306 },
+	{          "kf41",	    STRING,	246, 307 },
+	{          "kf42",	    STRING,	247, 308 },
+	{          "kf43",	    STRING,	248, 309 },
+	{          "kf44",	    STRING,	249, 310 },
+	{          "kf45",	    STRING,	250, 311 },
+	{          "kf46",	    STRING,	251, 312 },
+	{          "kf47",	    STRING,	252, 313 },
+	{          "kf48",	    STRING,	253, 314 },
+	{          "kf49",	    STRING,	254, 226 },
+	{          "kf50",	    STRING,	255, 316 },
+	{          "kf51",	    STRING,	256, 317 },
+	{          "kf52",	    STRING,	257, 318 },
+	{          "kf53",	    STRING,	258, 319 },
+	{          "kf54",	    STRING,	259, 320 },
+	{          "kf55",	    STRING,	260, 321 },
+	{          "kf56",	    STRING,	261, 322 },
+	{          "kf57",	    STRING,	262, 323 },
+	{          "kf58",	    STRING,	263, 324 },
+	{          "kf59",	    STRING,	264, 258 },
+	{          "kf60",	    STRING,	265, 326 },
+	{          "kf61",	    STRING,	266, 327 },
+	{          "kf62",	    STRING,	267, 328 },
+	{          "kf63",	    STRING,	268, 329 },
+	{           "el1",	    STRING,	269,  -1 },
+	{           "mgc",	    STRING,	270,  -1 },
+	{          "smgl",	    STRING,	271, 335 },
+	{          "smgr",	    STRING,	272, 332 },
+	{           "fln",	    STRING,	273,  -1 },
+	{          "sclk",	    STRING,	274,  -1 },
+	{          "dclk",	    STRING,	275,  -1 },
+	{         "rmclk",	    STRING,	276,  -1 },
+	{          "cwin",	    STRING,	277,  37 },
+	{         "wingo",	    STRING,	278,  -1 },
+	{           "hup",	    STRING,	279,  -1 },
+	{          "dial",	    STRING,	280,  -1 },
+	{         "qdial",	    STRING,	281,  -1 },
+	{          "tone",	    STRING,	282,  -1 },
+	{         "pulse",	    STRING,	283,  -1 },
+	{          "hook",	    STRING,	284,  -1 },
+	{         "pause",	    STRING,	285,   8 },
+	{          "wait",	    STRING,	286, 262 },
+	{            "u0",	    STRING,	287,  -1 },
+	{            "u1",	    STRING,	288,  -1 },
+	{            "u2",	    STRING,	289,  -1 },
+	{            "u3",	    STRING,	290,  -1 },
+	{            "u4",	    STRING,	291,  -1 },
+	{            "u5",	    STRING,	292,  -1 },
+	{            "u6",	    STRING,	293,  -1 },
+	{            "u7",	    STRING,	294,  -1 },
+	{            "u8",	    STRING,	295,  -1 },
+	{            "u9",	    STRING,	296,  -1 },
+	{            "op",	    STRING,	297,  -1 },
+	{            "oc",	    STRING,	298,  -1 },
+	{         "initc",	    STRING,	299,  -1 },
+	{         "initp",	    STRING,	300,  -1 },
+	{           "scp",	    STRING,	301,  -1 },
+	{          "setf",	    STRING,	302, 325 },
+	{          "setb",	    STRING,	303, 221 },
+	{           "cpi",	    STRING,	304, 243 },
+	{           "lpi",	    STRING,	305,  -1 },
+	{           "chr",	    STRING,	306, 250 },
+	{           "cvr",	    STRING,	307,  -1 },
+	{          "defc",	    STRING,	308, 141 },
+	{         "swidm",	    STRING,	309, 248 },
+	{         "sdrfq",	    STRING,	310, 218 },
+	{          "sitm",	    STRING,	311,  -1 },
+	{           "slm",	    STRING,	312, 201 },
+	{         "smicm",	    STRING,	313, 229 },
+	{          "snlq",	    STRING,	314, 264 },
+	{         "snrmq",	    STRING,	315, 253 },
+	{          "sshm",	    STRING,	316, 334 },
+	{         "ssubm",	    STRING,	317,  -1 },
+	{         "ssupm",	    STRING,	318, 236 },
+	{           "sum",	    STRING,	319, 185 },
+	{         "rwidm",	    STRING,	320,  -1 },
+	{          "ritm",	    STRING,	321,  -1 },
+	{           "rlm",	    STRING,	322,  -1 },
+	{         "rmicm",	    STRING,	323,  -1 },
+	{          "rshm",	    STRING,	324, 112 },
+	{         "rsubm",	    STRING,	325,  -1 },
+	{         "rsupm",	    STRING,	326,  -1 },
+	{           "rum",	    STRING,	327,  -1 },
+	{          "mhpa",	    STRING,	328,  -1 },
+	{         "mcud1",	    STRING,	329,  -1 },
+	{         "mcub1",	    STRING,	330,  -1 },
+	{         "mcuf1",	    STRING,	331,  53 },
+	{          "mvpa",	    STRING,	332,  -1 },
+	{         "mcuu1",	    STRING,	333,  47 },
+	{        "porder",	    STRING,	334, 155 },
+	{          "mcud",	    STRING,	335,  -1 },
+	{          "mcub",	    STRING,	336,  -1 },
+	{          "mcuf",	    STRING,	337,  -1 },
+	{          "mcuu",	    STRING,	338,  -1 },
+	{           "scs",	    STRING,	339,  -1 },
+	{          "smgb",	    STRING,	340,  -1 },
+	{         "smgbp",	    STRING,	341, 383 },
+	{         "smglp",	    STRING,	342,  -1 },
+	{         "smgrp",	    STRING,	343,  -1 },
+	{          "smgt",	    STRING,	344, 386 },
+	{         "smgtp",	    STRING,	345, 238 },
+	{          "sbim",	    STRING,	346,  -1 },
+	{          "scsd",	    STRING,	347, 344 },
+	{          "rbim",	    STRING,	348,  31 },
+	{          "rcsd",	    STRING,	349,  -1 },
+	{         "subcs",	    STRING,	350, 380 },
+	{         "supcs",	    STRING,	351, 255 },
+	{          "docr",	    STRING,	352,  -1 },
+	{         "zerom",	    STRING,	353,  -1 },
+	{          "csnm",	    STRING,	354, 347 },
+	{         "kmous",	    STRING,	355,  -1 },
+	{         "minfo",	    STRING,	356,  -1 },
+	{         "reqmp",	    STRING,	357,  -1 },
+	{          "getm",	    STRING,	358,  87 },
+	{         "setaf",	    STRING,	359,  -1 },
+	{         "setab",	    STRING,	360,  -1 },
+	{          "pfxl",	    STRING,	361,  -1 },
+	{          "devt",	    STRING,	362,  -1 },
+	{          "csin",	    STRING,	363,  -1 },
+	{          "s0ds",	    STRING,	364,  -1 },
+	{          "s1ds",	    STRING,	365, 212 },
+	{          "s2ds",	    STRING,	366, 109 },
+	{          "s3ds",	    STRING,	367, 213 },
+	{         "smglr",	    STRING,	368, 230 },
+	{         "smgtb",	    STRING,	369,  -1 },
+	{         "birep",	    STRING,	370,  -1 },
+	{         "binel",	    STRING,	371,  -1 },
+	{          "bicr",	    STRING,	372,  -1 },
+	{       "colornm",	    STRING,	373,  -1 },
+	{         "defbi",	    STRING,	374,  -1 },
+	{         "endbi",	    STRING,	375,  -1 },
+	{      "setcolor",	    STRING,	376,  -1 },
+	{        "slines",	    STRING,	377, 116 },
+	{         "dispc",	    STRING,	378,  -1 },
+	{         "smpch",	    STRING,	379, 231 },
+	{         "rmpch",	    STRING,	380,  -1 },
+	{          "smsc",	    STRING,	381, 338 },
+	{          "rmsc",	    STRING,	382,  -1 },
+	{         "pctrm",	    STRING,	383,  -1 },
+	{         "scesc",	    STRING,	384, 197 },
+	{         "scesa",	    STRING,	385, 430 },
+	{         "ehhlm",	    STRING,	386,  -1 },
+	{         "elhlm",	    STRING,	387,  -1 },
+	{        "elohlm",	    STRING,	388,  -1 },
+	{         "erhlm",	    STRING,	389,  -1 },
+	{         "ethlm",	    STRING,	390,  -1 },
+	{         "evhlm",	    STRING,	391,  -1 },
+	{          "sgr1",	    STRING,	392, 437 },
+	{       "slength",	    STRING,	393,  -1 },
+	{          "OTi2",	    STRING,	394,  -1 },
+	{          "OTrs",	    STRING,	395,  -1 },
+	{          "OTug",	    NUMBER,	 33,  -1 },
+	{          "OTbs",	   BOOLEAN,	 37,  -1 },
+	{          "OTns",	   BOOLEAN,	 38,  -1 },
+	{          "OTnc",	   BOOLEAN,	 39,  -1 },
+	{          "OTdC",	    NUMBER,	 34,  -1 },
+	{          "OTdN",	    NUMBER,	 35,  -1 },
+	{          "OTnl",	    STRING,	396,  -1 },
+	{          "OTbc",	    STRING,	397,  13 },
+	{          "OTMT",	   BOOLEAN,	 40,  -1 },
+	{          "OTNL",	   BOOLEAN,	 41, 446 },
+	{          "OTdB",	    NUMBER,	 36,  -1 },
+	{          "OTdT",	    NUMBER,	 37,  -1 },
+	{          "OTkn",	    NUMBER,	 38,  -1 },
+	{          "OTko",	    STRING,	398, 472 },
+	{          "OTma",	    STRING,	399,  -1 },
+	{          "OTpt",	   BOOLEAN,	 42,  -1 },
+	{          "OTxr",	   BOOLEAN,	 43,  -1 },
+	{          "OTG2",	    STRING,	400,  -1 },
+	{          "OTG3",	    STRING,	401,  -1 },
+	{          "OTG1",	    STRING,	402,  -1 },
+	{          "OTG4",	    STRING,	403,  -1 },
+	{          "OTGR",	    STRING,	404,  -1 },
+	{          "OTGL",	    STRING,	405,  -1 },
+	{          "OTGU",	    STRING,	406,  -1 },
+	{          "OTGD",	    STRING,	407,  -1 },
+	{          "OTGH",	    STRING,	408,  26 },
+	{          "OTGV",	    STRING,	409,  60 },
+	{          "OTGC",	    STRING,	410, 121 },
+	{          "meml",	    STRING,	411, 407 },
+	{          "memu",	    STRING,	412, 402 },
+	{          "box1",	    STRING,	413,  -1 } 
+};
+
+const struct name_table_entry * const _nc_info_hash_table[995] =
+{
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 465,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 261,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 457,
+	0,
+	0,
+	_nc_info_table + 265,
+	_nc_info_table + 216,
+	_nc_info_table + 120,
+	0,
+	0,
+	0,
+	_nc_info_table + 180,
+	0,
+	0,
+	_nc_info_table +  88,
+	0,
+	_nc_info_table + 420,
+	0,
+	_nc_info_table + 398,
+	0,
+	_nc_info_table + 348,
+	0,
+	0,
+	_nc_info_table +  19,
+	0,
+	0,
+	0,
+	_nc_info_table + 359,
+	0,
+	_nc_info_table + 174,
+	0,
+	_nc_info_table + 245,
+	0,
+	_nc_info_table +  74,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 269,
+	0,
+	_nc_info_table + 480,
+	0,
+	0,
+	0,
+	_nc_info_table + 124,
+	0,
+	0,
+	0,
+	_nc_info_table + 390,
+	_nc_info_table + 379,
+	_nc_info_table + 367,
+	0,
+	0,
+	_nc_info_table + 444,
+	0,
+	0,
+	0,
+	_nc_info_table + 305,
+	0,
+	0,
+	_nc_info_table + 363,
+	0,
+	0,
+	_nc_info_table + 483,
+	_nc_info_table + 377,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 460,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 204,
+	_nc_info_table +  38,
+	0,
+	_nc_info_table +  82,
+	0,
+	_nc_info_table + 110,
+	_nc_info_table + 127,
+	0,
+	0,
+	_nc_info_table + 463,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 336,
+	0,
+	_nc_info_table +  17,
+	_nc_info_table + 128,
+	_nc_info_table + 434,
+	0,
+	_nc_info_table + 188,
+	_nc_info_table + 129,
+	0,
+	_nc_info_table + 351,
+	0,
+	0,
+	_nc_info_table +  16,
+	0,
+	0,
+	_nc_info_table + 259,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 489,
+	0,
+	_nc_info_table + 353,
+	0,
+	_nc_info_table +  71,
+	_nc_info_table + 247,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  78,
+	0,
+	0,
+	_nc_info_table + 331,
+	0,
+	0,
+	_nc_info_table + 173,
+	_nc_info_table + 136,
+	_nc_info_table + 161,
+	_nc_info_table + 189,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 454,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 224,
+	_nc_info_table + 479,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 354,
+	0,
+	0,
+	_nc_info_table + 233,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 125,
+	_nc_info_table +  11,
+	0,
+	0,
+	_nc_info_table + 378,
+	_nc_info_table + 166,
+	0,
+	_nc_info_table + 191,
+	0,
+	0,
+	_nc_info_table +  48,
+	_nc_info_table + 228,
+	0,
+	_nc_info_table +   2,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 374,
+	0,
+	_nc_info_table + 408,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 375,
+	0,
+	_nc_info_table +  52,
+	_nc_info_table + 145,
+	_nc_info_table + 170,
+	0,
+	_nc_info_table + 392,
+	_nc_info_table + 382,
+	0,
+	_nc_info_table + 393,
+	_nc_info_table + 411,
+	0,
+	0,
+	0,
+	_nc_info_table + 276,
+	0,
+	0,
+	_nc_info_table +  35,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 396,
+	_nc_info_table + 388,
+	_nc_info_table +  36,
+	0,
+	0,
+	_nc_info_table +  64,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 350,
+	0,
+	0,
+	_nc_info_table + 215,
+	_nc_info_table +  91,
+	0,
+	0,
+	_nc_info_table + 439,
+	0,
+	_nc_info_table + 122,
+	0,
+	_nc_info_table + 200,
+	0,
+	_nc_info_table +  67,
+	0,
+	_nc_info_table + 410,
+	0,
+	0,
+	_nc_info_table +  89,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  96,
+	_nc_info_table +  21,
+	0,
+	_nc_info_table + 103,
+	_nc_info_table +   1,
+	0,
+	0,
+	_nc_info_table + 369,
+	0,
+	0,
+	_nc_info_table + 345,
+	0,
+	0,
+	0,
+	_nc_info_table + 355,
+	_nc_info_table +  40,
+	0,
+	_nc_info_table +  27,
+	0,
+	_nc_info_table + 406,
+	0,
+	0,
+	0,
+	_nc_info_table + 482,
+	_nc_info_table + 419,
+	_nc_info_table + 417,
+	0,
+	0,
+	_nc_info_table + 360,
+	_nc_info_table + 270,
+	0,
+	0,
+	_nc_info_table + 251,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 349,
+	0,
+	0,
+	_nc_info_table + 278,
+	0,
+	_nc_info_table + 442,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 438,
+	0,
+	_nc_info_table + 494,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 315,
+	0,
+	_nc_info_table + 340,
+	_nc_info_table + 364,
+	_nc_info_table + 356,
+	0,
+	_nc_info_table + 484,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  32,
+	0,
+	0,
+	0,
+	_nc_info_table + 260,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 207,
+	_nc_info_table + 487,
+	_nc_info_table +  84,
+	_nc_info_table + 453,
+	0,
+	0,
+	_nc_info_table + 413,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 214,
+	0,
+	_nc_info_table + 337,
+	_nc_info_table + 352,
+	_nc_info_table + 477,
+	0,
+	_nc_info_table + 435,
+	_nc_info_table +  56,
+	0,
+	0,
+	_nc_info_table +  34,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 132,
+	0,
+	_nc_info_table +  85,
+	_nc_info_table + 492,
+	_nc_info_table + 428,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 199,
+	0,
+	_nc_info_table + 342,
+	0,
+	0,
+	0,
+	_nc_info_table + 138,
+	_nc_info_table + 163,
+	_nc_info_table + 190,
+	_nc_info_table + 147,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 266,
+	0,
+	0,
+	_nc_info_table + 433,
+	0,
+	0,
+	_nc_info_table + 474,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 385,
+	_nc_info_table + 100,
+	0,
+	0,
+	0,
+	_nc_info_table + 431,
+	0,
+	_nc_info_table + 391,
+	_nc_info_table + 381,
+	_nc_info_table +  12,
+	_nc_info_table +  58,
+	0,
+	_nc_info_table + 142,
+	_nc_info_table + 167,
+	0,
+	0,
+	_nc_info_table + 409,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  42,
+	_nc_info_table +  45,
+	_nc_info_table +  66,
+	0,
+	0,
+	_nc_info_table + 424,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 220,
+	_nc_info_table + 376,
+	0,
+	0,
+	_nc_info_table + 343,
+	0,
+	0,
+	0,
+	_nc_info_table + 114,
+	_nc_info_table + 106,
+	0,
+	0,
+	_nc_info_table + 447,
+	0,
+	_nc_info_table + 217,
+	_nc_info_table + 493,
+	_nc_info_table + 171,
+	_nc_info_table + 172,
+	_nc_info_table + 399,
+	_nc_info_table + 346,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 195,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 496,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 241,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 151,
+	0,
+	_nc_info_table + 118,
+	0,
+	_nc_info_table +  62,
+	_nc_info_table + 187,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 234,
+	0,
+	_nc_info_table + 443,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 357,
+	0,
+	0,
+	0,
+	_nc_info_table + 246,
+	0,
+	0,
+	0,
+	_nc_info_table + 448,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  39,
+	0,
+	_nc_info_table +  10,
+	_nc_info_table + 397,
+	_nc_info_table + 389,
+	0,
+	0,
+	_nc_info_table + 154,
+	0,
+	0,
+	0,
+	_nc_info_table + 130,
+	0,
+	_nc_info_table +  22,
+	_nc_info_table + 222,
+	_nc_info_table + 373,
+	_nc_info_table + 162,
+	0,
+	_nc_info_table + 361,
+	_nc_info_table + 203,
+	0,
+	0,
+	_nc_info_table + 242,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 459,
+	0,
+	0,
+	_nc_info_table + 271,
+	0,
+	_nc_info_table +  97,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 427,
+	0,
+	_nc_info_table + 175,
+	_nc_info_table + 107,
+	0,
+	0,
+	0,
+	_nc_info_table + 178,
+	_nc_info_table + 423,
+	_nc_info_table + 372,
+	_nc_info_table +  69,
+	0,
+	_nc_info_table + 365,
+	0,
+	_nc_info_table +   4,
+	_nc_info_table + 486,
+	_nc_info_table + 184,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 461,
+	0,
+	0,
+	_nc_info_table + 282,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 475,
+	0,
+	0,
+	0,
+	_nc_info_table + 395,
+	_nc_info_table + 387,
+	0,
+	0,
+	_nc_info_table +  79,
+	_nc_info_table +  63,
+	0,
+	0,
+	_nc_info_table + 452,
+	_nc_info_table + 451,
+	0,
+	_nc_info_table +  50,
+	0,
+	_nc_info_table + 436,
+	0,
+	0,
+	_nc_info_table + 285,
+	0,
+	0,
+	_nc_info_table +  83,
+	_nc_info_table + 455,
+	0,
+	0,
+	0,
+	_nc_info_table + 279,
+	_nc_info_table + 370,
+	0,
+	0,
+	0,
+	_nc_info_table +  18,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 421,
+	0,
+	_nc_info_table + 495,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 227,
+	_nc_info_table + 333,
+	0,
+	0,
+	_nc_info_table +  25,
+	_nc_info_table + 139,
+	_nc_info_table + 164,
+	0,
+	0,
+	_nc_info_table + 371,
+	0,
+	0,
+	_nc_info_table + 429,
+	0,
+	0,
+	0,
+	_nc_info_table + 273,
+	0,
+	_nc_info_table + 466,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 181,
+	0,
+	0,
+	_nc_info_table +  75,
+	0,
+	_nc_info_table +  92,
+	_nc_info_table + 339,
+	0,
+	_nc_info_table + 384,
+	0,
+	_nc_info_table + 123,
+	0,
+	_nc_info_table + 143,
+	_nc_info_table + 168,
+	0,
+	_nc_info_table + 183,
+	_nc_info_table + 186,
+	0,
+	_nc_info_table + 108,
+	_nc_info_table +  95,
+	_nc_info_table + 368,
+	0,
+	0,
+	_nc_info_table + 277,
+	_nc_info_table + 198,
+	0,
+	_nc_info_table + 206,
+	_nc_info_table + 432,
+	0,
+	_nc_info_table + 476,
+	0,
+	_nc_info_table + 458,
+	0,
+	0,
+	_nc_info_table + 182,
+	0,
+	_nc_info_table + 441,
+	0,
+	0,
+	0,
+	_nc_info_table + 115,
+	_nc_info_table + 113,
+	_nc_info_table + 404,
+	0,
+	_nc_info_table + 473,
+	0,
+	0,
+	0,
+	_nc_info_table + 490,
+	_nc_info_table + 104,
+	0,
+	0,
+	_nc_info_table + 450,
+	_nc_info_table + 449,
+	0,
+	0,
+	0,
+	_nc_info_table + 274,
+	0,
+	_nc_info_table + 481,
+	_nc_info_table + 111,
+	_nc_info_table +  99,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 263,
+	_nc_info_table +  93,
+	0,
+	_nc_info_table + 117,
+	0,
+	_nc_info_table +  29,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 119,
+	0,
+	0,
+	_nc_info_table + 426,
+	_nc_info_table + 491,
+	0,
+	0,
+	_nc_info_table + 205,
+	0,
+	_nc_info_table + 237,
+	_nc_info_table +  44,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 418,
+	_nc_info_table + 416,
+	0,
+	0,
+	_nc_info_table + 358,
+	0,
+	0,
+	0,
+	_nc_info_table +  65,
+	0,
+	_nc_info_table + 440,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +   5,
+	0,
+	0,
+	0,
+	_nc_info_table + 488,
+	0,
+	0,
+	0,
+	_nc_info_table +  28,
+	_nc_info_table + 412,
+	0,
+	_nc_info_table + 405,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 295,
+	0,
+	_nc_info_table + 471,
+	_nc_info_table + 362,
+	0,
+	0,
+	_nc_info_table + 485,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 202,
+	0,
+	0,
+	_nc_info_table + 284,
+	0,
+	_nc_info_table + 469,
+	0,
+	0,
+	_nc_info_table +   9,
+	_nc_info_table +  24,
+	0,
+	0,
+	_nc_info_table + 179,
+	0,
+	0,
+	_nc_info_table +  15,
+	0,
+	0,
+	_nc_info_table + 148,
+	0,
+	0,
+	0,
+	_nc_info_table + 341,
+	0,
+	0,
+	_nc_info_table + 366,
+	_nc_info_table + 209,
+	_nc_info_table + 223,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +   0,
+	0,
+	_nc_info_table + 208,
+	_nc_info_table + 467,
+	0,
+	_nc_info_table + 422,
+	0,
+	_nc_info_table + 464,
+	_nc_info_table + 157,
+	0,
+	_nc_info_table + 403,
+	0,
+	_nc_info_table + 415,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 445,
+	0,
+	0,
+	_nc_info_table + 330,
+	0,
+	0,
+	0,
+	_nc_info_table + 462,
+	_nc_info_table + 160,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table +  86,
+	0,
+	0,
+	_nc_info_table +  41,
+	0,
+	_nc_info_table + 280,
+	0,
+	_nc_info_table + 478,
+	0,
+	0,
+	_nc_info_table +  57,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 394,
+	_nc_info_table + 414,
+	0,
+	0,
+	0,
+	_nc_info_table + 140,
+	_nc_info_table + 165,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 275,
+	_nc_info_table + 102,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 232,
+	0,
+	_nc_info_table +  14,
+	0,
+	0,
+	_nc_info_table + 225,
+	0,
+	0,
+	_nc_info_table + 267,
+	0,
+	_nc_info_table +  77,
+	0,
+	_nc_info_table + 144,
+	_nc_info_table + 169,
+	0,
+	_nc_info_table + 149,
+	0,
+	_nc_info_table + 400,
+	0,
+	0,
+	0,
+	_nc_info_table +   3,
+	0,
+	0,
+	0,
+	_nc_info_table + 468,
+	_nc_info_table + 425,
+	0,
+	0,
+	_nc_info_table + 470,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_info_table + 456,
+	0,
+	_nc_info_table + 158,
+	_nc_info_table + 159,
+	0,
+	0,
+	_nc_info_table + 146,
+	_nc_info_table +  49,
+	0,
+	0,
+	_nc_info_table + 153,
+	0,
+	_nc_info_table + 401,
+	_nc_info_table +  90,
+	_nc_info_table	/* base-of-table */
+};
+
+#if (BOOLCOUNT!=44)||(NUMCOUNT!=39)||(STRCOUNT!=414)
+#error	--> term.h and comp_captab.c disagree about the <--
+#error	--> numbers of booleans, numbers and/or strings <--
+#endif
+
+static struct name_table_entry const _nc_cap_table[] =
+{
+	{            "bw",	   BOOLEAN,	  0,  -1 },
+	{            "am",	   BOOLEAN,	  1,  -1 },
+	{            "xb",	   BOOLEAN,	  2,  -1 },
+	{            "xs",	   BOOLEAN,	  3,  -1 },
+	{            "xn",	   BOOLEAN,	  4,  -1 },
+	{            "eo",	   BOOLEAN,	  5,  -1 },
+	{            "gn",	   BOOLEAN,	  6,  -1 },
+	{            "hc",	   BOOLEAN,	  7,  -1 },
+	{            "km",	   BOOLEAN,	  8,  -1 },
+	{            "hs",	   BOOLEAN,	  9,  -1 },
+	{            "in",	   BOOLEAN,	 10,  -1 },
+	{            "da",	   BOOLEAN,	 11,  -1 },
+	{            "db",	   BOOLEAN,	 12,  -1 },
+	{            "mi",	   BOOLEAN,	 13,  -1 },
+	{            "ms",	   BOOLEAN,	 14,  -1 },
+	{            "os",	   BOOLEAN,	 15,  -1 },
+	{            "es",	   BOOLEAN,	 16,  -1 },
+	{            "xt",	   BOOLEAN,	 17,  -1 },
+	{            "hz",	   BOOLEAN,	 18,  -1 },
+	{            "ul",	   BOOLEAN,	 19,  -1 },
+	{            "xo",	   BOOLEAN,	 20,  -1 },
+	{            "nx",	   BOOLEAN,	 21,  -1 },
+	{            "5i",	   BOOLEAN,	 22,  -1 },
+	{            "HC",	   BOOLEAN,	 23,  -1 },
+	{            "NR",	   BOOLEAN,	 24,   1 },
+	{            "NP",	   BOOLEAN,	 25,  -1 },
+	{            "ND",	   BOOLEAN,	 26,  -1 },
+	{            "cc",	   BOOLEAN,	 27,  -1 },
+	{            "ut",	   BOOLEAN,	 28,  -1 },
+	{            "hl",	   BOOLEAN,	 29,  -1 },
+	{            "YA",	   BOOLEAN,	 30,  -1 },
+	{            "YB",	   BOOLEAN,	 31,  -1 },
+	{            "YC",	   BOOLEAN,	 32,  -1 },
+	{            "YD",	   BOOLEAN,	 33,  -1 },
+	{            "YE",	   BOOLEAN,	 34,  -1 },
+	{            "YF",	   BOOLEAN,	 35,  -1 },
+	{            "YG",	   BOOLEAN,	 36,  -1 },
+	{            "co",	    NUMBER,	  0,  -1 },
+	{            "it",	    NUMBER,	  1,  -1 },
+	{            "li",	    NUMBER,	  2,  -1 },
+	{            "lm",	    NUMBER,	  3,  -1 },
+	{            "sg",	    NUMBER,	  4,  -1 },
+	{            "pb",	    NUMBER,	  5,  -1 },
+	{            "vt",	    NUMBER,	  6,  -1 },
+	{            "ws",	    NUMBER,	  7,  -1 },
+	{            "Nl",	    NUMBER,	  8,  -1 },
+	{            "lh",	    NUMBER,	  9,  -1 },
+	{            "lw",	    NUMBER,	 10,  -1 },
+	{            "ma",	    NUMBER,	 11,  -1 },
+	{            "MW",	    NUMBER,	 12,  -1 },
+	{            "Co",	    NUMBER,	 13,  -1 },
+	{            "pa",	    NUMBER,	 14,  -1 },
+	{            "NC",	    NUMBER,	 15,  -1 },
+	{            "Ya",	    NUMBER,	 16,  -1 },
+	{            "Yb",	    NUMBER,	 17,  -1 },
+	{            "Yc",	    NUMBER,	 18,  -1 },
+	{            "Yd",	    NUMBER,	 19,  -1 },
+	{            "Ye",	    NUMBER,	 20,  -1 },
+	{            "Yf",	    NUMBER,	 21,  -1 },
+	{            "Yg",	    NUMBER,	 22,  -1 },
+	{            "Yh",	    NUMBER,	 23,  -1 },
+	{            "Yi",	    NUMBER,	 24,  -1 },
+	{            "Yj",	    NUMBER,	 25,  -1 },
+	{            "Yk",	    NUMBER,	 26,  -1 },
+	{            "Yl",	    NUMBER,	 27,  -1 },
+	{            "Ym",	    NUMBER,	 28,  -1 },
+	{            "Yn",	    NUMBER,	 29,  -1 },
+	{            "BT",	    NUMBER,	 30,  -1 },
+	{            "Yo",	    NUMBER,	 31,  -1 },
+	{            "Yp",	    NUMBER,	 32,  -1 },
+	{            "bt",	    STRING,	  0,  -1 },
+	{            "bl",	    STRING,	  1,  -1 },
+	{            "cr",	    STRING,	  2,  -1 },
+	{            "cs",	    STRING,	  3,  -1 },
+	{            "ct",	    STRING,	  4,  -1 },
+	{            "cl",	    STRING,	  5,  -1 },
+	{            "ce",	    STRING,	  6,  -1 },
+	{            "cd",	    STRING,	  7,  -1 },
+	{            "ch",	    STRING,	  8,  -1 },
+	{            "CC",	    STRING,	  9,  -1 },
+	{            "cm",	    STRING,	 10,  -1 },
+	{            "do",	    STRING,	 11,  -1 },
+	{            "ho",	    STRING,	 12,  -1 },
+	{            "vi",	    STRING,	 13,  -1 },
+	{            "le",	    STRING,	 14,  -1 },
+	{            "CM",	    STRING,	 15,  -1 },
+	{            "ve",	    STRING,	 16,  -1 },
+	{            "nd",	    STRING,	 17,  -1 },
+	{            "ll",	    STRING,	 18,  -1 },
+	{            "up",	    STRING,	 19,  -1 },
+	{            "vs",	    STRING,	 20,  -1 },
+	{            "dc",	    STRING,	 21,  -1 },
+	{            "dl",	    STRING,	 22,  -1 },
+	{            "ds",	    STRING,	 23,  -1 },
+	{            "hd",	    STRING,	 24,  -1 },
+	{            "as",	    STRING,	 25,  -1 },
+	{            "mb",	    STRING,	 26,  -1 },
+	{            "md",	    STRING,	 27,  -1 },
+	{            "ti",	    STRING,	 28,  -1 },
+	{            "dm",	    STRING,	 29,  -1 },
+	{            "mh",	    STRING,	 30,  -1 },
+	{            "im",	    STRING,	 31,  -1 },
+	{            "mk",	    STRING,	 32,  -1 },
+	{            "mp",	    STRING,	 33,  -1 },
+	{            "mr",	    STRING,	 34,  -1 },
+	{            "so",	    STRING,	 35,  -1 },
+	{            "us",	    STRING,	 36,  -1 },
+	{            "ec",	    STRING,	 37,  -1 },
+	{            "ae",	    STRING,	 38,  -1 },
+	{            "me",	    STRING,	 39,  -1 },
+	{            "te",	    STRING,	 40,  -1 },
+	{            "ed",	    STRING,	 41,  -1 },
+	{            "ei",	    STRING,	 42,  -1 },
+	{            "se",	    STRING,	 43,  -1 },
+	{            "ue",	    STRING,	 44,  -1 },
+	{            "vb",	    STRING,	 45,  -1 },
+	{            "ff",	    STRING,	 46,  -1 },
+	{            "fs",	    STRING,	 47,  -1 },
+	{            "i1",	    STRING,	 48, 102 },
+	{            "is",	    STRING,	 49,  -1 },
+	{            "i3",	    STRING,	 50,  -1 },
+	{            "if",	    STRING,	 51,  -1 },
+	{            "ic",	    STRING,	 52,  -1 },
+	{            "al",	    STRING,	 53,  -1 },
+	{            "ip",	    STRING,	 54,  -1 },
+	{            "kb",	    STRING,	 55,  -1 },
+	{            "ka",	    STRING,	 56,  -1 },
+	{            "kC",	    STRING,	 57,  -1 },
+	{            "kt",	    STRING,	 58,  -1 },
+	{            "kD",	    STRING,	 59,  -1 },
+	{            "kL",	    STRING,	 60,  -1 },
+	{            "kd",	    STRING,	 61,  -1 },
+	{            "kM",	    STRING,	 62,  -1 },
+	{            "kE",	    STRING,	 63,  -1 },
+	{            "kS",	    STRING,	 64,  -1 },
+	{            "k0",	    STRING,	 65,  -1 },
+	{            "k1",	    STRING,	 66,  -1 },
+	{            "k;",	    STRING,	 67,  -1 },
+	{            "k2",	    STRING,	 68,  -1 },
+	{            "k3",	    STRING,	 69,  -1 },
+	{            "k4",	    STRING,	 70,  -1 },
+	{            "k5",	    STRING,	 71,  -1 },
+	{            "k6",	    STRING,	 72,  -1 },
+	{            "k7",	    STRING,	 73,  -1 },
+	{            "k8",	    STRING,	 74,  -1 },
+	{            "k9",	    STRING,	 75,  15 },
+	{            "kh",	    STRING,	 76,  -1 },
+	{            "kI",	    STRING,	 77,  -1 },
+	{            "kA",	    STRING,	 78,  -1 },
+	{            "kl",	    STRING,	 79,  -1 },
+	{            "kH",	    STRING,	 80,  -1 },
+	{            "kN",	    STRING,	 81,  -1 },
+	{            "kP",	    STRING,	 82,  -1 },
+	{            "kr",	    STRING,	 83,  -1 },
+	{            "kF",	    STRING,	 84,  -1 },
+	{            "kR",	    STRING,	 85,  -1 },
+	{            "kT",	    STRING,	 86,  -1 },
+	{            "ku",	    STRING,	 87,  -1 },
+	{            "ke",	    STRING,	 88,  -1 },
+	{            "ks",	    STRING,	 89,  -1 },
+	{            "l0",	    STRING,	 90,  -1 },
+	{            "l1",	    STRING,	 91,  -1 },
+	{            "la",	    STRING,	 92,  35 },
+	{            "l2",	    STRING,	 93,  -1 },
+	{            "l3",	    STRING,	 94,  -1 },
+	{            "l4",	    STRING,	 95,  -1 },
+	{            "l5",	    STRING,	 96,  -1 },
+	{            "l6",	    STRING,	 97,  -1 },
+	{            "l7",	    STRING,	 98,  -1 },
+	{            "l8",	    STRING,	 99,  -1 },
+	{            "l9",	    STRING,	100,  -1 },
+	{            "mo",	    STRING,	101,  -1 },
+	{            "mm",	    STRING,	102, 120 },
+	{            "nw",	    STRING,	103,  -1 },
+	{            "pc",	    STRING,	104,  -1 },
+	{            "DC",	    STRING,	105,  -1 },
+	{            "DL",	    STRING,	106,  -1 },
+	{            "DO",	    STRING,	107,  -1 },
+	{            "IC",	    STRING,	108,  -1 },
+	{            "SF",	    STRING,	109,  -1 },
+	{            "AL",	    STRING,	110,  -1 },
+	{            "LE",	    STRING,	111,  -1 },
+	{            "RI",	    STRING,	112, 111 },
+	{            "SR",	    STRING,	113,  -1 },
+	{            "UP",	    STRING,	114,  -1 },
+	{            "pk",	    STRING,	115, 161 },
+	{            "pl",	    STRING,	116, 163 },
+	{            "px",	    STRING,	117,  -1 },
+	{            "ps",	    STRING,	118, 170 },
+	{            "pf",	    STRING,	119,  -1 },
+	{            "po",	    STRING,	120, 166 },
+	{            "rp",	    STRING,	121,  -1 },
+	{            "r1",	    STRING,	122,  -1 },
+	{            "r2",	    STRING,	123,  -1 },
+	{            "r3",	    STRING,	124,  -1 },
+	{            "rf",	    STRING,	125,  -1 },
+	{            "rc",	    STRING,	126,  -1 },
+	{            "cv",	    STRING,	127,  -1 },
+	{            "sc",	    STRING,	128,  -1 },
+	{            "sf",	    STRING,	129,  -1 },
+	{            "sr",	    STRING,	130,  -1 },
+	{            "sa",	    STRING,	131,  -1 },
+	{            "st",	    STRING,	132,  -1 },
+	{            "wi",	    STRING,	133,  -1 },
+	{            "ta",	    STRING,	134,  -1 },
+	{            "ts",	    STRING,	135,  -1 },
+	{            "uc",	    STRING,	136,  -1 },
+	{            "hu",	    STRING,	137,  -1 },
+	{            "iP",	    STRING,	138,  -1 },
+	{            "K1",	    STRING,	139,  -1 },
+	{            "K3",	    STRING,	140,  -1 },
+	{            "K2",	    STRING,	141,  -1 },
+	{            "K4",	    STRING,	142,  -1 },
+	{            "K5",	    STRING,	143,  -1 },
+	{            "pO",	    STRING,	144,  -1 },
+	{            "rP",	    STRING,	145,  37 },
+	{            "ac",	    STRING,	146,  -1 },
+	{            "pn",	    STRING,	147, 165 },
+	{            "kB",	    STRING,	148,  -1 },
+	{            "SX",	    STRING,	149, 117 },
+	{            "RX",	    STRING,	150,  16 },
+	{            "SA",	    STRING,	151,  -1 },
+	{            "RA",	    STRING,	152,  -1 },
+	{            "XN",	    STRING,	153,  -1 },
+	{            "XF",	    STRING,	154, 126 },
+	{            "eA",	    STRING,	155,  -1 },
+	{            "LO",	    STRING,	156,  -1 },
+	{            "LF",	    STRING,	157,  -1 },
+	{            "@1",	    STRING,	158,  -1 },
+	{            "@2",	    STRING,	159,  -1 },
+	{            "@3",	    STRING,	160,  -1 },
+	{            "@4",	    STRING,	161,  -1 },
+	{            "@5",	    STRING,	162,  -1 },
+	{            "@6",	    STRING,	163,  -1 },
+	{            "@7",	    STRING,	164, 183 },
+	{            "@8",	    STRING,	165,  -1 },
+	{            "@9",	    STRING,	166,  -1 },
+	{            "@0",	    STRING,	167, 116 },
+	{            "%1",	    STRING,	168,  -1 },
+	{            "%2",	    STRING,	169,  97 },
+	{            "%3",	    STRING,	170, 109 },
+	{            "%4",	    STRING,	171,  -1 },
+	{            "%5",	    STRING,	172,  -1 },
+	{            "%6",	    STRING,	173, 100 },
+	{            "%7",	    STRING,	174,  13 },
+	{            "%8",	    STRING,	175,  -1 },
+	{            "%9",	    STRING,	176, 118 },
+	{            "%0",	    STRING,	177,  96 },
+	{            "&1",	    STRING,	178,  -1 },
+	{            "&2",	    STRING,	179,  87 },
+	{            "&3",	    STRING,	180,  -1 },
+	{            "&4",	    STRING,	181,  -1 },
+	{            "&5",	    STRING,	182,  -1 },
+	{            "&6",	    STRING,	183,  -1 },
+	{            "&7",	    STRING,	184,  -1 },
+	{            "&8",	    STRING,	185,  -1 },
+	{            "&9",	    STRING,	186,  -1 },
+	{            "&0",	    STRING,	187,  -1 },
+	{            "*1",	    STRING,	188, 196 },
+	{            "*2",	    STRING,	189,  -1 },
+	{            "*3",	    STRING,	190,  -1 },
+	{            "*4",	    STRING,	191, 195 },
+	{            "*5",	    STRING,	192,  -1 },
+	{            "*6",	    STRING,	193,  -1 },
+	{            "*7",	    STRING,	194,  -1 },
+	{            "*8",	    STRING,	195,  -1 },
+	{            "*9",	    STRING,	196,  -1 },
+	{            "*0",	    STRING,	197,  -1 },
+	{            "#1",	    STRING,	198,  -1 },
+	{            "#2",	    STRING,	199, 131 },
+	{            "#3",	    STRING,	200, 158 },
+	{            "#4",	    STRING,	201,  -1 },
+	{            "%a",	    STRING,	202,  -1 },
+	{            "%b",	    STRING,	203,  -1 },
+	{            "%c",	    STRING,	204,  -1 },
+	{            "%d",	    STRING,	205,  -1 },
+	{            "%e",	    STRING,	206,  -1 },
+	{            "%f",	    STRING,	207,  -1 },
+	{            "%g",	    STRING,	208,  -1 },
+	{            "%h",	    STRING,	209,  -1 },
+	{            "%i",	    STRING,	210,  -1 },
+	{            "%j",	    STRING,	211,  -1 },
+	{            "!1",	    STRING,	212, 122 },
+	{            "!2",	    STRING,	213,  -1 },
+	{            "!3",	    STRING,	214,  -1 },
+	{            "RF",	    STRING,	215,  -1 },
+	{            "F1",	    STRING,	216,  -1 },
+	{            "F2",	    STRING,	217,  46 },
+	{            "F3",	    STRING,	218,  39 },
+	{            "F4",	    STRING,	219,  -1 },
+	{            "F5",	    STRING,	220,  -1 },
+	{            "F6",	    STRING,	221,  88 },
+	{            "F7",	    STRING,	222,  40 },
+	{            "F8",	    STRING,	223,  -1 },
+	{            "F9",	    STRING,	224,  -1 },
+	{            "FA",	    STRING,	225,  47 },
+	{            "FB",	    STRING,	226,  -1 },
+	{            "FC",	    STRING,	227,  -1 },
+	{            "FD",	    STRING,	228,  -1 },
+	{            "FE",	    STRING,	229,  -1 },
+	{            "FF",	    STRING,	230,  53 },
+	{            "FG",	    STRING,	231,  54 },
+	{            "FH",	    STRING,	232,  55 },
+	{            "FI",	    STRING,	233,  56 },
+	{            "FJ",	    STRING,	234,  57 },
+	{            "FK",	    STRING,	235,  58 },
+	{            "FL",	    STRING,	236,  59 },
+	{            "FM",	    STRING,	237,  60 },
+	{            "FN",	    STRING,	238,  61 },
+	{            "FO",	    STRING,	239,  62 },
+	{            "FP",	    STRING,	240,  63 },
+	{            "FQ",	    STRING,	241,  64 },
+	{            "FR",	    STRING,	242,  65 },
+	{            "FS",	    STRING,	243,  66 },
+	{            "FT",	    STRING,	244,  68 },
+	{            "FU",	    STRING,	245,  69 },
+	{            "FV",	    STRING,	246,  -1 },
+	{            "FW",	    STRING,	247,  -1 },
+	{            "FX",	    STRING,	248,  -1 },
+	{            "FY",	    STRING,	249,  -1 },
+	{            "FZ",	    STRING,	250,  -1 },
+	{            "Fa",	    STRING,	251,  -1 },
+	{            "Fb",	    STRING,	252,  -1 },
+	{            "Fc",	    STRING,	253,  -1 },
+	{            "Fd",	    STRING,	254,  -1 },
+	{            "Fe",	    STRING,	255,  -1 },
+	{            "Ff",	    STRING,	256,  -1 },
+	{            "Fg",	    STRING,	257,   7 },
+	{            "Fh",	    STRING,	258,  94 },
+	{            "Fi",	    STRING,	259,  -1 },
+	{            "Fj",	    STRING,	260,  -1 },
+	{            "Fk",	    STRING,	261,  -1 },
+	{            "Fl",	    STRING,	262,  -1 },
+	{            "Fm",	    STRING,	263,  -1 },
+	{            "Fn",	    STRING,	264,  -1 },
+	{            "Fo",	    STRING,	265, 184 },
+	{            "Fp",	    STRING,	266,  29 },
+	{            "Fq",	    STRING,	267,  -1 },
+	{            "Fr",	    STRING,	268,  -1 },
+	{            "cb",	    STRING,	269,  -1 },
+	{            "MC",	    STRING,	270,  -1 },
+	{            "ML",	    STRING,	271,  -1 },
+	{            "MR",	    STRING,	272,  -1 },
+	{            "Lf",	    STRING,	273, 257 },
+	{            "SC",	    STRING,	274,  -1 },
+	{            "DK",	    STRING,	275,  -1 },
+	{            "RC",	    STRING,	276,  -1 },
+	{            "CW",	    STRING,	277,   4 },
+	{            "WG",	    STRING,	278,  -1 },
+	{            "HU",	    STRING,	279,  -1 },
+	{            "DI",	    STRING,	280,  -1 },
+	{            "QD",	    STRING,	281,  -1 },
+	{            "TO",	    STRING,	282,  -1 },
+	{            "PU",	    STRING,	283,  -1 },
+	{            "fh",	    STRING,	284, 229 },
+	{            "PA",	    STRING,	285,  -1 },
+	{            "WA",	    STRING,	286,  -1 },
+	{            "u0",	    STRING,	287,  -1 },
+	{            "u1",	    STRING,	288,  -1 },
+	{            "u2",	    STRING,	289,  -1 },
+	{            "u3",	    STRING,	290,  -1 },
+	{            "u4",	    STRING,	291,  -1 },
+	{            "u5",	    STRING,	292,  -1 },
+	{            "u6",	    STRING,	293,  -1 },
+	{            "u7",	    STRING,	294,  -1 },
+	{            "u8",	    STRING,	295,  -1 },
+	{            "u9",	    STRING,	296,  -1 },
+	{            "op",	    STRING,	297, 142 },
+	{            "oc",	    STRING,	298,  -1 },
+	{            "Ic",	    STRING,	299,  -1 },
+	{            "Ip",	    STRING,	300, 149 },
+	{            "sp",	    STRING,	301,  -1 },
+	{            "Sf",	    STRING,	302,  -1 },
+	{            "Sb",	    STRING,	303,  -1 },
+	{            "ZA",	    STRING,	304,  -1 },
+	{            "ZB",	    STRING,	305,  -1 },
+	{            "ZC",	    STRING,	306,  -1 },
+	{            "ZD",	    STRING,	307,  -1 },
+	{            "ZE",	    STRING,	308,  -1 },
+	{            "ZF",	    STRING,	309,  48 },
+	{            "ZG",	    STRING,	310, 247 },
+	{            "ZH",	    STRING,	311, 238 },
+	{            "ZI",	    STRING,	312, 239 },
+	{            "ZJ",	    STRING,	313, 240 },
+	{            "ZK",	    STRING,	314, 241 },
+	{            "ZL",	    STRING,	315, 242 },
+	{            "ZM",	    STRING,	316, 243 },
+	{            "ZN",	    STRING,	317, 244 },
+	{            "ZO",	    STRING,	318, 245 },
+	{            "ZP",	    STRING,	319, 246 },
+	{            "ZQ",	    STRING,	320,  -1 },
+	{            "ZR",	    STRING,	321, 172 },
+	{            "ZS",	    STRING,	322,  -1 },
+	{            "ZT",	    STRING,	323, 171 },
+	{            "ZU",	    STRING,	324, 103 },
+	{            "ZV",	    STRING,	325,  -1 },
+	{            "ZW",	    STRING,	326, 104 },
+	{            "ZX",	    STRING,	327,  14 },
+	{            "ZY",	    STRING,	328,  -1 },
+	{            "ZZ",	    STRING,	329,  -1 },
+	{            "Za",	    STRING,	330,  -1 },
+	{            "Zb",	    STRING,	331,  -1 },
+	{            "Zc",	    STRING,	332,  -1 },
+	{            "Zd",	    STRING,	333,  -1 },
+	{            "Ze",	    STRING,	334,  -1 },
+	{            "Zf",	    STRING,	335,  -1 },
+	{            "Zg",	    STRING,	336,  -1 },
+	{            "Zh",	    STRING,	337,  -1 },
+	{            "Zi",	    STRING,	338,  -1 },
+	{            "Zj",	    STRING,	339,  -1 },
+	{            "Zk",	    STRING,	340,  -1 },
+	{            "Zl",	    STRING,	341,  -1 },
+	{            "Zm",	    STRING,	342,  -1 },
+	{            "Zn",	    STRING,	343,  -1 },
+	{            "Zo",	    STRING,	344, 208 },
+	{            "Zp",	    STRING,	345,  -1 },
+	{            "Zq",	    STRING,	346,  -1 },
+	{            "Zr",	    STRING,	347,  -1 },
+	{            "Zs",	    STRING,	348,  -1 },
+	{            "Zt",	    STRING,	349,  -1 },
+	{            "Zu",	    STRING,	350,  -1 },
+	{            "Zv",	    STRING,	351,  -1 },
+	{            "Zw",	    STRING,	352,  -1 },
+	{            "Zx",	    STRING,	353, 272 },
+	{            "Zy",	    STRING,	354, 273 },
+	{            "Km",	    STRING,	355, 387 },
+	{            "Mi",	    STRING,	356,  -1 },
+	{            "RQ",	    STRING,	357,  -1 },
+	{            "Gm",	    STRING,	358,  -1 },
+	{            "AF",	    STRING,	359,  -1 },
+	{            "AB",	    STRING,	360,  -1 },
+	{            "xl",	    STRING,	361,  -1 },
+	{            "dv",	    STRING,	362,  -1 },
+	{            "ci",	    STRING,	363,  -1 },
+	{            "s0",	    STRING,	364,  -1 },
+	{            "s1",	    STRING,	365,  67 },
+	{            "s2",	    STRING,	366,  -1 },
+	{            "s3",	    STRING,	367,  -1 },
+	{            "ML",	    STRING,	368, 341 },
+	{            "MT",	    STRING,	369,  -1 },
+	{            "Xy",	    STRING,	370,  -1 },
+	{            "Zz",	    STRING,	371, 274 },
+	{            "Yv",	    STRING,	372,  -1 },
+	{            "Yw",	    STRING,	373,  -1 },
+	{            "Yx",	    STRING,	374,  -1 },
+	{            "Yy",	    STRING,	375,  -1 },
+	{            "Yz",	    STRING,	376,  -1 },
+	{            "YZ",	    STRING,	377,  -1 },
+	{            "S1",	    STRING,	378,  -1 },
+	{            "S2",	    STRING,	379,  -1 },
+	{            "S3",	    STRING,	380,  -1 },
+	{            "S4",	    STRING,	381, 357 },
+	{            "S5",	    STRING,	382, 358 },
+	{            "S6",	    STRING,	383, 359 },
+	{            "S7",	    STRING,	384, 360 },
+	{            "S8",	    STRING,	385, 361 },
+	{            "Xh",	    STRING,	386,  -1 },
+	{            "Xl",	    STRING,	387,  -1 },
+	{            "Xo",	    STRING,	388,  -1 },
+	{            "Xr",	    STRING,	389,  -1 },
+	{            "Xt",	    STRING,	390,  -1 },
+	{            "Xv",	    STRING,	391,  -1 },
+	{            "sA",	    STRING,	392,  -1 },
+	{            "sL",	    STRING,	393,  -1 },
+	{            "i2",	    STRING,	394, 390 },
+	{            "rs",	    STRING,	395,  -1 },
+	{            "ug",	    NUMBER,	 33,  -1 },
+	{            "bs",	   BOOLEAN,	 37,  -1 },
+	{            "ns",	   BOOLEAN,	 38,  -1 },
+	{            "nc",	   BOOLEAN,	 39, 248 },
+	{            "dC",	    NUMBER,	 34,  -1 },
+	{            "dN",	    NUMBER,	 35, 203 },
+	{            "nl",	    STRING,	396,  -1 },
+	{            "bc",	    STRING,	397,  -1 },
+	{            "MT",	   BOOLEAN,	 40, 439 },
+	{            "NL",	   BOOLEAN,	 41,  -1 },
+	{            "dB",	    NUMBER,	 36,  -1 },
+	{            "dT",	    NUMBER,	 37,  -1 },
+	{            "kn",	    NUMBER,	 38,  -1 },
+	{            "ko",	    STRING,	398,  -1 },
+	{            "ma",	    STRING,	399, 379 },
+	{            "pt",	   BOOLEAN,	 42,  -1 },
+	{            "xr",	   BOOLEAN,	 43,  -1 },
+	{            "G2",	    STRING,	400, 386 },
+	{            "G3",	    STRING,	401, 425 },
+	{            "G1",	    STRING,	402, 385 },
+	{            "G4",	    STRING,	403, 388 },
+	{            "GR",	    STRING,	404, 412 },
+	{            "GL",	    STRING,	405, 406 },
+	{            "GU",	    STRING,	406, 415 },
+	{            "GD",	    STRING,	407,  -1 },
+	{            "GH",	    STRING,	408, 402 },
+	{            "GV",	    STRING,	409, 416 },
+	{            "GC",	    STRING,	410,  -1 },
+	{            "ml",	    STRING,	411, 464 },
+	{            "mu",	    STRING,	412, 399 },
+	{            "bx",	    STRING,	413,  -1 } 
+};
+
+const struct name_table_entry * const _nc_cap_hash_table[995] =
+{
+	_nc_cap_table + 253,
+	0,
+	_nc_cap_table +  45,
+	_nc_cap_table + 211,
+	_nc_cap_table + 263,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 449,
+	_nc_cap_table + 457,
+	_nc_cap_table + 311,
+	_nc_cap_table + 411,
+	0,
+	_nc_cap_table + 132,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 123,
+	_nc_cap_table +  71,
+	_nc_cap_table +  75,
+	_nc_cap_table +  92,
+	_nc_cap_table + 427,
+	_nc_cap_table + 233,
+	0,
+	_nc_cap_table + 336,
+	0,
+	0,
+	_nc_cap_table + 370,
+	_nc_cap_table + 291,
+	_nc_cap_table + 494,
+	_nc_cap_table + 472,
+	_nc_cap_table + 138,
+	_nc_cap_table + 186,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  19,
+	_nc_cap_table + 193,
+	_nc_cap_table + 436,
+	_nc_cap_table + 431,
+	_nc_cap_table + 453,
+	0,
+	_nc_cap_table + 315,
+	_nc_cap_table + 489,
+	_nc_cap_table + 349,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 353,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 124,
+	0,
+	0,
+	0,
+	_nc_cap_table + 394,
+	0,
+	_nc_cap_table + 367,
+	_nc_cap_table + 167,
+	0,
+	_nc_cap_table + 191,
+	_nc_cap_table + 371,
+	0,
+	_nc_cap_table +  89,
+	0,
+	0,
+	0,
+	_nc_cap_table + 363,
+	_nc_cap_table + 460,
+	_nc_cap_table + 319,
+	_nc_cap_table + 419,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  70,
+	_nc_cap_table +  74,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  38,
+	0,
+	_nc_cap_table + 128,
+	0,
+	_nc_cap_table + 398,
+	0,
+	0,
+	_nc_cap_table + 481,
+	0,
+	0,
+	_nc_cap_table + 202,
+	0,
+	_nc_cap_table +  28,
+	_nc_cap_table +  43,
+	0,
+	_nc_cap_table +  17,
+	0,
+	0,
+	_nc_cap_table + 444,
+	_nc_cap_table + 423,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 496,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 430,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 296,
+	0,
+	_nc_cap_table +  21,
+	0,
+	_nc_cap_table + 187,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 321,
+	_nc_cap_table + 276,
+	0,
+	0,
+	_nc_cap_table +  31,
+	_nc_cap_table + 375,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 429,
+	_nc_cap_table + 476,
+	0,
+	0,
+	0,
+	_nc_cap_table + 300,
+	_nc_cap_table + 400,
+	0,
+	_nc_cap_table + 218,
+	0,
+	0,
+	_nc_cap_table + 227,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  11,
+	_nc_cap_table + 285,
+	_nc_cap_table + 179,
+	0,
+	_nc_cap_table + 325,
+	_nc_cap_table + 280,
+	0,
+	_nc_cap_table + 224,
+	_nc_cap_table + 162,
+	_nc_cap_table + 480,
+	0,
+	0,
+	_nc_cap_table +  51,
+	0,
+	0,
+	_nc_cap_table + 201,
+	_nc_cap_table + 204,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  22,
+	0,
+	_nc_cap_table + 304,
+	_nc_cap_table + 404,
+	0,
+	_nc_cap_table + 154,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 108,
+	0,
+	_nc_cap_table +  76,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 329,
+	_nc_cap_table + 284,
+	0,
+	_nc_cap_table + 270,
+	_nc_cap_table +  84,
+	_nc_cap_table + 383,
+	_nc_cap_table + 250,
+	_nc_cap_table + 426,
+	0,
+	0,
+	_nc_cap_table + 260,
+	_nc_cap_table + 113,
+	_nc_cap_table + 110,
+	_nc_cap_table + 114,
+	_nc_cap_table +  86,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 308,
+	_nc_cap_table + 408,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 433,
+	0,
+	_nc_cap_table + 112,
+	_nc_cap_table + 230,
+	0,
+	_nc_cap_table + 333,
+	_nc_cap_table + 428,
+	0,
+	_nc_cap_table + 223,
+	_nc_cap_table + 288,
+	_nc_cap_table + 484,
+	_nc_cap_table + 254,
+	0,
+	0,
+	_nc_cap_table + 210,
+	_nc_cap_table + 264,
+	0,
+	_nc_cap_table +  98,
+	0,
+	_nc_cap_table +  83,
+	_nc_cap_table + 471,
+	0,
+	_nc_cap_table + 450,
+	0,
+	_nc_cap_table + 312,
+	_nc_cap_table + 487,
+	0,
+	_nc_cap_table + 151,
+	0,
+	0,
+	0,
+	_nc_cap_table + 342,
+	_nc_cap_table +  24,
+	0,
+	_nc_cap_table +  80,
+	_nc_cap_table +  99,
+	0,
+	_nc_cap_table + 234,
+	0,
+	_nc_cap_table + 337,
+	_nc_cap_table + 101,
+	0,
+	_nc_cap_table +   8,
+	_nc_cap_table + 292,
+	_nc_cap_table + 391,
+	0,
+	_nc_cap_table + 139,
+	_nc_cap_table + 164,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 194,
+	_nc_cap_table + 437,
+	0,
+	_nc_cap_table + 454,
+	0,
+	_nc_cap_table + 316,
+	_nc_cap_table + 492,
+	0,
+	_nc_cap_table + 155,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 395,
+	0,
+	_nc_cap_table + 143,
+	_nc_cap_table + 168,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 364,
+	0,
+	_nc_cap_table + 320,
+	_nc_cap_table + 420,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 207,
+	0,
+	0,
+	_nc_cap_table + 157,
+	_nc_cap_table + 447,
+	_nc_cap_table + 495,
+	0,
+	_nc_cap_table + 137,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 440,
+	_nc_cap_table + 445,
+	_nc_cap_table + 424,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  79,
+	_nc_cap_table + 175,
+	0,
+	_nc_cap_table + 297,
+	_nc_cap_table + 493,
+	_nc_cap_table +  23,
+	_nc_cap_table + 178,
+	0,
+	0,
+	0,
+	_nc_cap_table + 340,
+	_nc_cap_table +  52,
+	0,
+	0,
+	0,
+	_nc_cap_table + 346,
+	_nc_cap_table + 344,
+	0,
+	_nc_cap_table + 322,
+	_nc_cap_table + 277,
+	0,
+	0,
+	_nc_cap_table +  32,
+	_nc_cap_table + 376,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 373,
+	0,
+	_nc_cap_table + 470,
+	0,
+	0,
+	0,
+	_nc_cap_table + 301,
+	_nc_cap_table + 401,
+	0,
+	_nc_cap_table + 127,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 339,
+	_nc_cap_table +  12,
+	0,
+	0,
+	0,
+	_nc_cap_table + 326,
+	_nc_cap_table + 281,
+	_nc_cap_table + 348,
+	_nc_cap_table + 125,
+	_nc_cap_table +  36,
+	_nc_cap_table + 380,
+	_nc_cap_table + 343,
+	0,
+	_nc_cap_table +  42,
+	0,
+	_nc_cap_table + 267,
+	0,
+	0,
+	_nc_cap_table + 372,
+	_nc_cap_table + 115,
+	0,
+	_nc_cap_table +   2,
+	_nc_cap_table + 345,
+	0,
+	_nc_cap_table + 305,
+	_nc_cap_table + 405,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 237,
+	0,
+	_nc_cap_table + 330,
+	_nc_cap_table + 121,
+	0,
+	_nc_cap_table + 271,
+	0,
+	_nc_cap_table + 384,
+	_nc_cap_table + 251,
+	0,
+	_nc_cap_table + 189,
+	0,
+	_nc_cap_table + 261,
+	_nc_cap_table + 199,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 177,
+	0,
+	_nc_cap_table + 309,
+	_nc_cap_table + 409,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 226,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 231,
+	_nc_cap_table + 352,
+	_nc_cap_table + 334,
+	0,
+	0,
+	0,
+	_nc_cap_table + 289,
+	_nc_cap_table + 486,
+	_nc_cap_table + 255,
+	_nc_cap_table + 135,
+	_nc_cap_table + 160,
+	_nc_cap_table + 212,
+	_nc_cap_table + 265,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 434,
+	0,
+	_nc_cap_table + 451,
+	0,
+	_nc_cap_table + 313,
+	_nc_cap_table + 413,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 214,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 235,
+	_nc_cap_table +   6,
+	_nc_cap_table + 338,
+	_nc_cap_table +  10,
+	0,
+	_nc_cap_table + 478,
+	_nc_cap_table + 293,
+	_nc_cap_table + 392,
+	0,
+	_nc_cap_table + 140,
+	_nc_cap_table + 217,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 347,
+	_nc_cap_table + 455,
+	_nc_cap_table + 459,
+	_nc_cap_table + 317,
+	_nc_cap_table + 417,
+	0,
+	_nc_cap_table + 134,
+	0,
+	0,
+	0,
+	_nc_cap_table +  49,
+	0,
+	0,
+	_nc_cap_table +  72,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 153,
+	0,
+	_nc_cap_table + 396,
+	0,
+	_nc_cap_table + 144,
+	_nc_cap_table + 169,
+	0,
+	0,
+	_nc_cap_table + 200,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 482,
+	_nc_cap_table + 365,
+	_nc_cap_table + 461,
+	_nc_cap_table + 442,
+	_nc_cap_table + 421,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 197,
+	_nc_cap_table + 432,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 446,
+	_nc_cap_table + 441,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  18,
+	0,
+	0,
+	0,
+	_nc_cap_table + 298,
+	_nc_cap_table + 490,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  26,
+	0,
+	0,
+	_nc_cap_table + 351,
+	0,
+	0,
+	0,
+	_nc_cap_table + 323,
+	_nc_cap_table + 278,
+	0,
+	_nc_cap_table + 369,
+	_nc_cap_table +  33,
+	_nc_cap_table + 377,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 302,
+	_nc_cap_table + 491,
+	0,
+	_nc_cap_table + 129,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 216,
+	_nc_cap_table + 473,
+	_nc_cap_table +  27,
+	_nc_cap_table +  91,
+	_nc_cap_table + 107,
+	0,
+	0,
+	_nc_cap_table + 327,
+	_nc_cap_table + 282,
+	0,
+	_nc_cap_table + 268,
+	0,
+	_nc_cap_table + 381,
+	_nc_cap_table + 469,
+	_nc_cap_table + 368,
+	_nc_cap_table + 174,
+	0,
+	_nc_cap_table + 258,
+	_nc_cap_table + 198,
+	0,
+	_nc_cap_table + 206,
+	_nc_cap_table + 180,
+	0,
+	0,
+	_nc_cap_table + 176,
+	0,
+	_nc_cap_table + 306,
+	_nc_cap_table + 488,
+	0,
+	_nc_cap_table + 150,
+	0,
+	0,
+	0,
+	_nc_cap_table + 438,
+	_nc_cap_table + 475,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 228,
+	0,
+	_nc_cap_table + 331,
+	0,
+	0,
+	0,
+	_nc_cap_table + 286,
+	_nc_cap_table + 485,
+	_nc_cap_table + 252,
+	0,
+	0,
+	_nc_cap_table + 209,
+	_nc_cap_table + 262,
+	_nc_cap_table +  41,
+	0,
+	_nc_cap_table + 466,
+	0,
+	0,
+	0,
+	_nc_cap_table + 448,
+	0,
+	_nc_cap_table + 310,
+	_nc_cap_table + 410,
+	0,
+	_nc_cap_table + 130,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  25,
+	0,
+	0,
+	_nc_cap_table + 463,
+	_nc_cap_table +  50,
+	_nc_cap_table + 232,
+	0,
+	_nc_cap_table + 335,
+	0,
+	0,
+	0,
+	_nc_cap_table + 290,
+	_nc_cap_table + 389,
+	_nc_cap_table + 256,
+	_nc_cap_table + 136,
+	_nc_cap_table + 185,
+	_nc_cap_table + 213,
+	_nc_cap_table + 266,
+	0,
+	0,
+	0,
+	_nc_cap_table + 192,
+	_nc_cap_table + 435,
+	0,
+	_nc_cap_table + 452,
+	_nc_cap_table + 458,
+	_nc_cap_table + 314,
+	_nc_cap_table + 414,
+	0,
+	_nc_cap_table + 152,
+	0,
+	0,
+	0,
+	_nc_cap_table + 474,
+	0,
+	0,
+	_nc_cap_table + 215,
+	_nc_cap_table +  81,
+	_nc_cap_table +   5,
+	_nc_cap_table + 236,
+	0,
+	_nc_cap_table +  82,
+	0,
+	0,
+	_nc_cap_table + 479,
+	_nc_cap_table + 294,
+	_nc_cap_table + 393,
+	0,
+	_nc_cap_table + 141,
+	_nc_cap_table + 190,
+	0,
+	0,
+	_nc_cap_table + 105,
+	0,
+	0,
+	0,
+	_nc_cap_table + 477,
+	_nc_cap_table +  20,
+	_nc_cap_table + 362,
+	0,
+	_nc_cap_table + 318,
+	_nc_cap_table + 418,
+	0,
+	_nc_cap_table + 156,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  95,
+	_nc_cap_table + 467,
+	_nc_cap_table +  73,
+	_nc_cap_table +  93,
+	_nc_cap_table + 220,
+	_nc_cap_table + 219,
+	0,
+	_nc_cap_table +   9,
+	_nc_cap_table + 119,
+	0,
+	_nc_cap_table + 159,
+	0,
+	_nc_cap_table + 397,
+	_nc_cap_table + 468,
+	_nc_cap_table + 145,
+	_nc_cap_table + 188,
+	0,
+	_nc_cap_table + 465,
+	0,
+	_nc_cap_table + 205,
+	_nc_cap_table + 106,
+	_nc_cap_table +  90,
+	_nc_cap_table +  44,
+	_nc_cap_table +   3,
+	_nc_cap_table + 366,
+	0,
+	_nc_cap_table + 443,
+	_nc_cap_table + 422,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +   0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 295,
+	0,
+	_nc_cap_table + 173,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 355,
+	0,
+	_nc_cap_table + 222,
+	_nc_cap_table + 221,
+	0,
+	0,
+	_nc_cap_table + 275,
+	_nc_cap_table + 356,
+	0,
+	_nc_cap_table +  30,
+	_nc_cap_table + 374,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 225,
+	0,
+	0,
+	_nc_cap_table + 299,
+	0,
+	0,
+	_nc_cap_table + 148,
+	0,
+	0,
+	_nc_cap_table + 181,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 462,
+	0,
+	0,
+	0,
+	_nc_cap_table + 324,
+	_nc_cap_table + 279,
+	0,
+	0,
+	_nc_cap_table +  34,
+	_nc_cap_table + 378,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table + 350,
+	0,
+	_nc_cap_table + 303,
+	_nc_cap_table + 403,
+	0,
+	_nc_cap_table + 133,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  77,
+	0,
+	_nc_cap_table + 182,
+	0,
+	0,
+	_nc_cap_table + 328,
+	_nc_cap_table + 283,
+	0,
+	_nc_cap_table + 269,
+	0,
+	_nc_cap_table + 382,
+	_nc_cap_table + 249,
+	0,
+	0,
+	0,
+	_nc_cap_table + 259,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  85,
+	0,
+	_nc_cap_table + 456,
+	_nc_cap_table + 307,
+	_nc_cap_table + 407,
+	0,
+	_nc_cap_table + 147,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	_nc_cap_table +  78,
+	0,
+	0,
+	_nc_cap_table + 354,
+	0,
+	_nc_cap_table + 332,
+	0,
+	0,
+	_nc_cap_table + 146,
+	_nc_cap_table + 287,
+	_nc_cap_table + 483,
+	_nc_cap_table	/* base-of-table */
+};
+
+#if (BOOLCOUNT!=44)||(NUMCOUNT!=39)||(STRCOUNT!=414)
+#error	--> term.h and comp_captab.c disagree about the <--
+#error	--> numbers of booleans, numbers and/or strings <--
+#endif
+
+const struct alias _nc_capalias_table[] =
+{
+	{"sb", "sr", "BSD"},	 /* scroll */
+	{"BO", "mr", "AT&T"},	 /* enter_reverse_mode */
+	{"CI", "vi", "AT&T"},	 /* cursor_invisible */
+	{"CV", "ve", "AT&T"},	 /* cursor_normal */
+	{"DS", "mh", "AT&T"},	 /* enter_dim_mode */
+	{"FE", "LF", "AT&T"},	 /* label_on */
+	{"FL", "LO", "AT&T"},	 /* label_off */
+	{"XS", "mk", "AT&T"},	 /* enter_secure_mode */
+	{"EE", "mh", "XENIX"},	 /* exit_attribute_mode */
+	{"GE", "ae", "XENIX"},	 /* exit_alt_charset_mode */
+	{"GS", "as", "XENIX"},	 /* enter_alt_charset_mode */
+	{"CF", "vi", "XENIX"},	 /* cursor_invis */
+	{"CO", "ve", "XENIX"},	 /* cursor_normal */
+	{"EN", "@7", "XENIX"},	 /* key_end */
+	{"HM", "kh", "XENIX"},	 /* key_home */
+	{"LD", "kL", "XENIX"},	 /* key_dl */
+	{"PD", "kN", "XENIX"},	 /* key_npage */
+	{"PN", "po", "XENIX"},	 /* prtr_off */
+	{"PS", "pf", "XENIX"},	 /* prtr_on */
+	{"PU", "kP", "XENIX"},	 /* key_ppage */
+	{"RT", "@8", "XENIX"},	 /* kent */
+	{"UP", "ku", "XENIX"},	 /* kcuu1 */
+	{"G6", (char *)NULL, "XENIX"},	 /* double-ACS_ULCORNER */
+	{"G7", (char *)NULL, "XENIX"},	 /* double-ACS_LLCORNER */
+	{"G5", (char *)NULL, "XENIX"},	 /* double-ACS_URCORNER */
+	{"G8", (char *)NULL, "XENIX"},	 /* double-ACS_LRCORNER */
+	{"Gr", (char *)NULL, "XENIX"},	 /* double-ACS_LTEE */
+	{"Gr", (char *)NULL, "XENIX"},	 /* double-ACS_RTEE */
+	{"Gu", (char *)NULL, "XENIX"},	 /* double-ACS_BTEE */
+	{"Gd", (char *)NULL, "XENIX"},	 /* double */
+	{"Gh", (char *)NULL, "XENIX"},	 /* double-ACS_HLINE */
+	{"Gv", (char *)NULL, "XENIX"},	 /* double-ACS_VLINE */
+	{"Gc", (char *)NULL, "XENIX"},	 /* double-ACS_PLUS */
+	{"GG", (char *)NULL, "XENIX"},	 /* acs-glitch */
+	{"kq", "%1", "IBM"},	 /* key_help */
+	{"HS", "mh", "IRIS"},	 /* enter_dim_mode */
+	{"KA", "k;", "Tek"},	 /* key_f10 */
+	{"KB", "F1", "Tek"},	 /* key_f11 */
+	{"KC", "F2", "Tek"},	 /* key_f12 */
+	{"KD", "F3", "Tek"},	 /* key_f13 */
+	{"KE", "F4", "Tek"},	 /* key_f14 */
+	{"KF", "F5", "Tek"},	 /* key_f15 */
+	{"BC", "Sb", "Tek"},	 /* set_background */
+	{"FC", "Sf", "Tek"},	 /* set_foreground */
+	{(char *)NULL, (char *)NULL, (char *)NULL}
+};
+
+const struct alias _nc_infoalias_table[] =
+{
+	{"font0", "s0ds", "IBM"},	 /* set0_des_seq */
+	{"font1", "s1ds", "IBM"},	 /* set1_des_seq */
+	{"font2", "s2ds", "IBM"},	 /* set2_des_seq */
+	{"font3", "s3ds", "IBM"},	 /* set3_des_seq */
+	{"kbtab", "kcbt", "IBM"},	 /* key_backtab */
+	{"ksel", "kslt", "IBM"},	 /* key_select */
+	{(char *)NULL, (char *)NULL, (char *)NULL}
+};
+
+NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
+{
+	return termcap ? _nc_cap_table: _nc_info_table ;
+}
+
+NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool termcap)
+{
+	return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
+}
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-curses.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-curses.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-curses.h	(revision 3073)
@@ -0,0 +1,1336 @@
+/****************************************************************************
+ * Copyright (c) 1998-2004,2005 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"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ ****************************************************************************/
+
+/* $Id$ */
+
+#ifndef __NCURSES_H
+#define __NCURSES_H
+
+#define CURSES 1
+#define CURSES_H 1
+
+/* This should be defined for the enhanced functionality to be visible.
+ * However, some of the wide-character (enhanced) functionality is missing.
+ * So we do not define it (yet).
+#define _XOPEN_CURSES 1
+ */
+
+/* These are defined only in curses.h, and are used for conditional compiles */
+#define NCURSES_VERSION_MAJOR 5
+#define NCURSES_VERSION_MINOR 5
+#define NCURSES_VERSION_PATCH 20051010
+
+/* This is defined in more than one ncurses header, for identification */
+#undef  NCURSES_VERSION
+#define NCURSES_VERSION "5.5"
+
+/*
+ * Identify the mouse encoding version.
+ */
+#define NCURSES_MOUSE_VERSION 1
+
+/*
+ * Definitions to facilitate DLL's.
+ */
+#include <ncurses_dll.h>
+
+/*
+ * User-definable tweak to disable the include of <stdbool.h>.
+ */
+#ifndef NCURSES_ENABLE_STDBOOL_H
+#define NCURSES_ENABLE_STDBOOL_H 1
+#endif
+
+/*
+ * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
+ * configured using --disable-macros.
+ */
+#ifdef NCURSES_NOMACROS
+#define NCURSES_ATTR_T attr_t
+#endif
+
+#ifndef NCURSES_ATTR_T
+#define NCURSES_ATTR_T int
+#endif
+
+/*
+ * Expands to 'const' if ncurses is configured using --enable-const.  Note that
+ * doing so makes it incompatible with other implementations of X/Open Curses.
+ */
+#undef  NCURSES_CONST
+#define NCURSES_CONST /*nothing*/
+
+/*
+ * The internal type used for color values
+ */
+#undef	NCURSES_COLOR_T
+#define	NCURSES_COLOR_T short
+
+/*
+ * The internal type used for window dimensions.
+ */
+#undef	NCURSES_SIZE_T
+#define	NCURSES_SIZE_T short
+
+/*
+ * NCURSES_CH_T is used in building the library, but not used otherwise in
+ * this header file, since that would make the normal/wide-character versions
+ * of the header incompatible.
+ */
+#undef	NCURSES_CH_T
+#define NCURSES_CH_T chtype
+
+#if 0 && defined(_LP64)
+typedef unsigned chtype;
+typedef unsigned mmask_t;
+#else
+typedef unsigned long chtype;
+typedef unsigned long mmask_t;
+#endif
+
+#include <stdio.h>
+#include <unctrl.h>
+#include <stdarg.h>	/* we need va_list */
+#ifdef _XOPEN_SOURCE_EXTENDED
+#include <stddef.h>	/* we want wchar_t */
+#endif /* _XOPEN_SOURCE_EXTENDED */
+
+/* XSI and SVr4 specify that curses implements 'bool'.  However, C++ may also
+ * implement it.  If so, we must use the C++ compiler's type to avoid conflict
+ * with other interfaces.
+ *
+ * A further complication is that <stdbool.h> may declare 'bool' to be a
+ * different type, such as an enum which is not necessarily compatible with
+ * C++.  If we have <stdbool.h>, make 'bool' a macro, so users may #undef it.
+ * Otherwise, let it remain a typedef to avoid conflicts with other #define's.
+ * In either case, make a typedef for NCURSES_BOOL which can be used if needed
+ * from either C or C++.
+ */
+
+#undef TRUE
+#define TRUE    1
+
+#undef FALSE
+#define FALSE   0
+
+typedef unsigned char NCURSES_BOOL;
+
+#if defined(__cplusplus)	/* __cplusplus, etc. */
+
+/* use the C++ compiler's bool type */
+#define NCURSES_BOOL bool
+
+#else			/* c89, c99, etc. */
+
+#if NCURSES_ENABLE_STDBOOL_H
+#include <stdbool.h>
+/* use whatever the C compiler decides bool really is */
+#define NCURSES_BOOL bool
+#else
+/* there is no predefined bool - use our own */
+#undef bool
+#define bool NCURSES_BOOL
+#endif
+
+#endif /* !__cplusplus, etc. */
+
+#ifdef __cplusplus
+extern "C" {
+#define NCURSES_CAST(type,value) static_cast<type>(value)
+#else
+#define NCURSES_CAST(type,value) (type)(value)
+#endif
+
+/*
+ * XSI attributes.  In the ncurses implementation, they are identical to the
+ * A_ attributes.
+ */
+#define WA_ATTRIBUTES	A_ATTRIBUTES
+#define WA_NORMAL	A_NORMAL
+#define WA_STANDOUT	A_STANDOUT
+#define WA_UNDERLINE	A_UNDERLINE
+#define WA_REVERSE	A_REVERSE
+#define WA_BLINK	A_BLINK
+#define WA_DIM		A_DIM
+#define WA_BOLD		A_BOLD
+#define WA_ALTCHARSET	A_ALTCHARSET
+#define WA_INVIS	A_INVIS
+#define WA_PROTECT	A_PROTECT
+#define WA_HORIZONTAL	A_HORIZONTAL
+#define WA_LEFT		A_LEFT
+#define WA_LOW		A_LOW
+#define WA_RIGHT	A_RIGHT
+#define WA_TOP		A_TOP
+#define WA_VERTICAL	A_VERTICAL
+
+/* colors */
+extern NCURSES_EXPORT_VAR(int) COLORS;
+extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
+
+#define COLOR_BLACK	0
+#define COLOR_RED	1
+#define COLOR_GREEN	2
+#define COLOR_YELLOW	3
+#define COLOR_BLUE	4
+#define COLOR_MAGENTA	5
+#define COLOR_CYAN	6
+#define COLOR_WHITE	7
+
+/* line graphics */
+
+#if 0
+extern NCURSES_EXPORT_VAR(chtype*) _nc_acs_map(void);
+#define acs_map (_nc_acs_map())
+#else
+extern NCURSES_EXPORT_VAR(chtype) acs_map[];
+#endif
+
+#define NCURSES_ACS(c)	(acs_map[NCURSES_CAST(unsigned char,c)])
+
+/* VT100 symbols begin here */
+#define ACS_ULCORNER	NCURSES_ACS('l') /* upper left corner */
+#define ACS_LLCORNER	NCURSES_ACS('m') /* lower left corner */
+#define ACS_URCORNER	NCURSES_ACS('k') /* upper right corner */
+#define ACS_LRCORNER	NCURSES_ACS('j') /* lower right corner */
+#define ACS_LTEE	NCURSES_ACS('t') /* tee pointing right */
+#define ACS_RTEE	NCURSES_ACS('u') /* tee pointing left */
+#define ACS_BTEE	NCURSES_ACS('v') /* tee pointing up */
+#define ACS_TTEE	NCURSES_ACS('w') /* tee pointing down */
+#define ACS_HLINE	NCURSES_ACS('q') /* horizontal line */
+#define ACS_VLINE	NCURSES_ACS('x') /* vertical line */
+#define ACS_PLUS	NCURSES_ACS('n') /* large plus or crossover */
+#define ACS_S1		NCURSES_ACS('o') /* scan line 1 */
+#define ACS_S9		NCURSES_ACS('s') /* scan line 9 */
+#define ACS_DIAMOND	NCURSES_ACS('`') /* diamond */
+#define ACS_CKBOARD	NCURSES_ACS('a') /* checker board (stipple) */
+#define ACS_DEGREE	NCURSES_ACS('f') /* degree symbol */
+#define ACS_PLMINUS	NCURSES_ACS('g') /* plus/minus */
+#define ACS_BULLET	NCURSES_ACS('~') /* bullet */
+/* Teletype 5410v1 symbols begin here */
+#define ACS_LARROW	NCURSES_ACS(',') /* arrow pointing left */
+#define ACS_RARROW	NCURSES_ACS('+') /* arrow pointing right */
+#define ACS_DARROW	NCURSES_ACS('.') /* arrow pointing down */
+#define ACS_UARROW	NCURSES_ACS('-') /* arrow pointing up */
+#define ACS_BOARD	NCURSES_ACS('h') /* board of squares */
+#define ACS_LANTERN	NCURSES_ACS('i') /* lantern symbol */
+#define ACS_BLOCK	NCURSES_ACS('0') /* solid square block */
+/*
+ * These aren't documented, but a lot of System Vs have them anyway
+ * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
+ * The ACS_names may not match AT&T's, our source didn't know them.
+ */
+#define ACS_S3		NCURSES_ACS('p') /* scan line 3 */
+#define ACS_S7		NCURSES_ACS('r') /* scan line 7 */
+#define ACS_LEQUAL	NCURSES_ACS('y') /* less/equal */
+#define ACS_GEQUAL	NCURSES_ACS('z') /* greater/equal */
+#define ACS_PI		NCURSES_ACS('{') /* Pi */
+#define ACS_NEQUAL	NCURSES_ACS('|') /* not equal */
+#define ACS_STERLING	NCURSES_ACS('}') /* UK pound sign */
+
+/*
+ * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
+ * is the right, b is the bottom, and l is the left.  t, r, b, and l might
+ * be B (blank), S (single), D (double), or T (thick).  The subset defined
+ * here only uses B and S.
+ */
+#define ACS_BSSB	ACS_ULCORNER
+#define ACS_SSBB	ACS_LLCORNER
+#define ACS_BBSS	ACS_URCORNER
+#define ACS_SBBS	ACS_LRCORNER
+#define ACS_SBSS	ACS_RTEE
+#define ACS_SSSB	ACS_LTEE
+#define ACS_SSBS	ACS_BTEE
+#define ACS_BSSS	ACS_TTEE
+#define ACS_BSBS	ACS_HLINE
+#define ACS_SBSB	ACS_VLINE
+#define ACS_SSSS	ACS_PLUS
+
+#undef	ERR
+#define ERR     (-1)
+
+#undef	OK
+#define OK      (0)
+
+/* values for the _flags member */
+#define _SUBWIN         0x01	/* is this a sub-window? */
+#define _ENDLINE        0x02	/* is the window flush right? */
+#define _FULLWIN        0x04	/* is the window full-screen? */
+#define _SCROLLWIN      0x08	/* bottom edge is at screen bottom? */
+#define _ISPAD	        0x10	/* is this window a pad? */
+#define _HASMOVED       0x20	/* has cursor moved since last refresh? */
+#define _WRAPPED        0x40	/* cursor was just wrappped */
+
+/*
+ * this value is used in the firstchar and lastchar fields to mark
+ * unchanged lines
+ */
+#define _NOCHANGE       -1
+
+/*
+ * this value is used in the oldindex field to mark lines created by insertions
+ * and scrolls.
+ */
+#define _NEWINDEX	-1
+
+typedef struct screen  SCREEN;
+typedef struct _win_st WINDOW;
+
+typedef	chtype	attr_t;		/* ...must be at least as wide as chtype */
+
+#ifdef _XOPEN_SOURCE_EXTENDED
+
+#if 0
+#ifdef mblen			/* libutf8.h defines it w/o undefining first */
+#undef mblen
+#endif
+#include <libutf8.h>
+#endif
+
+#if 0
+#include <wchar.h>		/* ...to get mbstate_t, etc. */
+#endif
+
+#if 0
+typedef unsigned short wchar_t;
+#endif
+
+#if 0
+typedef unsigned int wint_t;
+#endif
+
+#define CCHARW_MAX	5
+typedef struct
+{
+    attr_t	attr;
+    wchar_t	chars[CCHARW_MAX];
+#if 0
+    int		ext_color;	/* color pair, must be more than 16-bits */
+#endif
+}
+cchar_t;
+
+#endif /* _XOPEN_SOURCE_EXTENDED */
+
+struct ldat;
+
+struct _win_st
+{
+	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
+
+	/* window location and size */
+	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
+	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
+
+	short   _flags;		/* window state flags */
+
+	/* attribute tracking */
+	attr_t  _attrs;		/* current attribute for non-space character */
+	chtype  _bkgd;		/* current background char/attribute pair */
+
+	/* option values set by user */
+	bool	_notimeout;	/* no time out on function-key entry? */
+	bool	_clear;		/* consider all data in the window invalid? */
+	bool	_leaveok;	/* OK to not reset cursor on exit? */
+	bool	_scroll;	/* OK to scroll this window? */
+	bool	_idlok;		/* OK to use insert/delete line? */
+	bool	_idcok;		/* OK to use insert/delete char? */
+	bool	_immed;		/* window in immed mode? (not yet used) */
+	bool	_sync;		/* window in sync mode? */
+	bool	_use_keypad;	/* process function keys into KEY_ symbols? */
+	int	_delay;		/* 0 = nodelay, <0 = blocking, >0 = delay */
+
+	struct ldat *_line;	/* the actual line data */
+
+	/* global screen state */
+	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
+	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
+
+	/* these are used only if this is a sub-window */
+	int	_parx;		/* x coordinate of this window in parent */
+	int	_pary;		/* y coordinate of this window in parent */
+	WINDOW	*_parent;	/* pointer to parent if a sub-window */
+
+	/* these are used only if this is a pad */
+	struct pdat
+	{
+	    NCURSES_SIZE_T _pad_y,      _pad_x;
+	    NCURSES_SIZE_T _pad_top,    _pad_left;
+	    NCURSES_SIZE_T _pad_bottom, _pad_right;
+	} _pad;
+
+	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
+
+#ifdef _XOPEN_SOURCE_EXTENDED
+	cchar_t  _bkgrnd;	/* current background char/attribute pair */
+#if 0
+	int	_color;		/* current color-pair for non-space character */
+#endif
+#endif
+};
+
+extern NCURSES_EXPORT_VAR(WINDOW *)   stdscr;
+extern NCURSES_EXPORT_VAR(WINDOW *)   curscr;
+extern NCURSES_EXPORT_VAR(WINDOW *)   newscr;
+
+extern NCURSES_EXPORT_VAR(int)	LINES;
+extern NCURSES_EXPORT_VAR(int)	COLS;
+extern NCURSES_EXPORT_VAR(int)	TABSIZE;
+
+/*
+ * This global was an undocumented feature under AIX curses.
+ */
+extern NCURSES_EXPORT_VAR(int) ESCDELAY;	/* ESC expire time in milliseconds */
+
+extern NCURSES_EXPORT_VAR(char) ttytype[];	/* needed for backward compatibility */
+
+/*
+ * These functions are extensions - not in XSI Curses.
+ */
+#if 1
+extern NCURSES_EXPORT(bool) is_term_resized (int, int);
+extern NCURSES_EXPORT(char *) keybound (int, int);
+extern NCURSES_EXPORT(const char *) curses_version (void);
+extern NCURSES_EXPORT(int) assume_default_colors (int, int);
+extern NCURSES_EXPORT(int) define_key (const char *, int);
+extern NCURSES_EXPORT(int) key_defined (const char *);
+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) use_default_colors (void);
+extern NCURSES_EXPORT(int) use_extended_names (bool);
+extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
+#else
+#define curses_version() NCURSES_VERSION
+#endif
+
+/*
+ * This is an extension to support events...
+ */
+#if 1
+#ifdef NCURSES_WGETCH_EVENTS
+#if !defined(__BEOS__)		/* Fix _nc_timed_wait() on BEOS... */
+#  define NCURSES_EVENT_VERSION	1
+#endif	/* !defined(__BEOS__) */
+
+/*
+ * Bits to set in _nc_event.data.flags
+ */
+#  define _NC_EVENT_TIMEOUT_MSEC	1
+#  define _NC_EVENT_FILE		2
+#  define _NC_EVENT_FILE_READABLE	2
+#  if 0					/* Not supported yet... */
+#    define _NC_EVENT_FILE_WRITABLE	4
+#    define _NC_EVENT_FILE_EXCEPTION	8
+#  endif
+
+typedef struct
+{
+    int type;
+    union
+    {
+	long timeout_msec;	/* _NC_EVENT_TIMEOUT_MSEC */
+	struct
+	{
+	    unsigned int flags;
+	    int fd;
+	    unsigned int result;
+	} fev;				/* _NC_EVENT_FILE */
+    } data;
+} _nc_event;
+
+typedef struct
+{
+    int count;
+    int result_flags;	/* _NC_EVENT_TIMEOUT_MSEC or _NC_EVENT_FILE_READABLE */
+    _nc_event *events[1];
+} _nc_eventlist;
+
+extern NCURSES_EXPORT(int) wgetch_events(WINDOW *, _nc_eventlist *);	/* experimental */
+extern NCURSES_EXPORT(int) wgetnstr_events(WINDOW *,char *,int,_nc_eventlist *);/* experimental */
+
+#endif /* NCURSES_WGETCH_EVENTS */
+#endif /* NCURSES_EXT_FUNCS */
+
+/*
+ * GCC (and some other compilers) define '__attribute__'; we're using this
+ * macro to alert the compiler to flag inconsistencies in printf/scanf-like
+ * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
+ * Old versions of G++ do not accept it anyway, at least not consistently with
+ * GCC.
+ */
+#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))
+#define __attribute__(p) /* nothing */
+#endif
+
+/*
+ * We cannot define these in ncurses_cfg.h, since they require parameters to be
+ * passed (that's non-portable).
+ */
+#ifndef GCC_PRINTFLIKE
+#if defined(GCC_PRINTF) && !defined(printf)
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+#else
+#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
+#endif
+#endif
+
+#ifndef GCC_SCANFLIKE
+#if defined(GCC_SCANF) && !defined(scanf)
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+#else
+#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
+#endif
+#endif
+
+#ifndef	GCC_NORETURN
+#define	GCC_NORETURN /* nothing */
+#endif
+
+#ifndef	GCC_UNUSED
+#define	GCC_UNUSED /* nothing */
+#endif
+
+/*
+ * Function prototypes.  This is the complete XSI Curses list of required
+ * functions.  Those marked `generated' will have sources generated from the
+ * macro definitions later in this file, in order to satisfy XPG4.2
+ * requirements.
+ */
+
+extern NCURSES_EXPORT(int) addch (const chtype);			/* generated */
+extern NCURSES_EXPORT(int) addchnstr (const chtype *, int);		/* generated */
+extern NCURSES_EXPORT(int) addchstr (const chtype *);			/* generated */
+extern NCURSES_EXPORT(int) addnstr (const char *, int);			/* generated */
+extern NCURSES_EXPORT(int) addstr (const char *);			/* generated */
+extern NCURSES_EXPORT(int) attroff (NCURSES_ATTR_T);			/* generated */
+extern NCURSES_EXPORT(int) attron (NCURSES_ATTR_T);			/* generated */
+extern NCURSES_EXPORT(int) attrset (NCURSES_ATTR_T);			/* generated */
+extern NCURSES_EXPORT(int) attr_get (attr_t *, short *, void *);	/* generated */
+extern NCURSES_EXPORT(int) attr_off (attr_t, void *);			/* generated */
+extern NCURSES_EXPORT(int) attr_on (attr_t, void *);			/* generated */
+extern NCURSES_EXPORT(int) attr_set (attr_t, short, void *);		/* generated */
+extern NCURSES_EXPORT(int) baudrate (void);				/* implemented */
+extern NCURSES_EXPORT(int) beep  (void);				/* implemented */
+extern NCURSES_EXPORT(int) bkgd (chtype);				/* generated */
+extern NCURSES_EXPORT(void) bkgdset (chtype);				/* generated */
+extern NCURSES_EXPORT(int) border (chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
+extern NCURSES_EXPORT(int) box (WINDOW *, chtype, chtype);		/* generated */
+extern NCURSES_EXPORT(bool) can_change_color (void);			/* implemented */
+extern NCURSES_EXPORT(int) cbreak (void);				/* implemented */
+extern NCURSES_EXPORT(int) chgat (int, attr_t, short, const void *);	/* generated */
+extern NCURSES_EXPORT(int) clear (void);				/* generated */
+extern NCURSES_EXPORT(int) clearok (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(int) clrtobot (void);				/* generated */
+extern NCURSES_EXPORT(int) clrtoeol (void);				/* generated */
+extern NCURSES_EXPORT(int) color_content (short,short*,short*,short*);	/* implemented */
+extern NCURSES_EXPORT(int) color_set (short,void*);			/* generated */
+extern NCURSES_EXPORT(int) COLOR_PAIR (int);				/* generated */
+extern NCURSES_EXPORT(int) copywin (const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
+extern NCURSES_EXPORT(int) curs_set (int);				/* implemented */
+extern NCURSES_EXPORT(int) def_prog_mode (void);			/* implemented */
+extern NCURSES_EXPORT(int) def_shell_mode (void);			/* implemented */
+extern NCURSES_EXPORT(int) delay_output (int);				/* implemented */
+extern NCURSES_EXPORT(int) delch (void);				/* generated */
+extern NCURSES_EXPORT(void) delscreen (SCREEN *);			/* implemented */
+extern NCURSES_EXPORT(int) delwin (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) deleteln (void);				/* generated */
+extern NCURSES_EXPORT(WINDOW *) derwin (WINDOW *,int,int,int,int);	/* implemented */
+extern NCURSES_EXPORT(int) doupdate (void);				/* implemented */
+extern NCURSES_EXPORT(WINDOW *) dupwin (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(int) echo (void);					/* implemented */
+extern NCURSES_EXPORT(int) echochar (const chtype);			/* generated */
+extern NCURSES_EXPORT(int) erase (void);				/* generated */
+extern NCURSES_EXPORT(int) endwin (void);				/* implemented */
+extern NCURSES_EXPORT(char) erasechar (void);				/* implemented */
+extern NCURSES_EXPORT(void) filter (void);				/* implemented */
+extern NCURSES_EXPORT(int) flash (void);				/* implemented */
+extern NCURSES_EXPORT(int) flushinp (void);				/* implemented */
+extern NCURSES_EXPORT(chtype) getbkgd (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(int) getch (void);				/* generated */
+extern NCURSES_EXPORT(int) getnstr (char *, int);			/* generated */
+extern NCURSES_EXPORT(int) getstr (char *);				/* generated */
+extern NCURSES_EXPORT(WINDOW *) getwin (FILE *);			/* implemented */
+extern NCURSES_EXPORT(int) halfdelay (int);				/* implemented */
+extern NCURSES_EXPORT(bool) has_colors (void);				/* implemented */
+extern NCURSES_EXPORT(bool) has_ic (void);				/* implemented */
+extern NCURSES_EXPORT(bool) has_il (void);				/* implemented */
+extern NCURSES_EXPORT(int) hline (chtype, int);				/* generated */
+extern NCURSES_EXPORT(void) idcok (WINDOW *, bool);			/* implemented */
+extern NCURSES_EXPORT(int) idlok (WINDOW *, bool);			/* implemented */
+extern NCURSES_EXPORT(void) immedok (WINDOW *, bool);			/* implemented */
+extern NCURSES_EXPORT(chtype) inch (void);				/* generated */
+extern NCURSES_EXPORT(int) inchnstr (chtype *, int);			/* generated */
+extern NCURSES_EXPORT(int) inchstr (chtype *);				/* generated */
+extern NCURSES_EXPORT(WINDOW *) initscr (void);				/* implemented */
+extern NCURSES_EXPORT(int) init_color (short,short,short,short);	/* implemented */
+extern NCURSES_EXPORT(int) init_pair (short,short,short);		/* implemented */
+extern NCURSES_EXPORT(int) innstr (char *, int);			/* generated */
+extern NCURSES_EXPORT(int) insch (chtype);				/* generated */
+extern NCURSES_EXPORT(int) insdelln (int);				/* generated */
+extern NCURSES_EXPORT(int) insertln (void);				/* generated */
+extern NCURSES_EXPORT(int) insnstr (const char *, int);			/* generated */
+extern NCURSES_EXPORT(int) insstr (const char *);			/* generated */
+extern NCURSES_EXPORT(int) instr (char *);				/* generated */
+extern NCURSES_EXPORT(int) intrflush (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(bool) isendwin (void);				/* implemented */
+extern NCURSES_EXPORT(bool) is_linetouched (WINDOW *,int);		/* implemented */
+extern NCURSES_EXPORT(bool) is_wintouched (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(NCURSES_CONST char *) keyname (int);		/* implemented */
+extern NCURSES_EXPORT(int) keypad (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(char) killchar (void);				/* implemented */
+extern NCURSES_EXPORT(int) leaveok (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(char *) longname (void);				/* implemented */
+extern NCURSES_EXPORT(int) meta (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(int) move (int, int);				/* generated */
+extern NCURSES_EXPORT(int) mvaddch (int, int, const chtype);		/* generated */
+extern NCURSES_EXPORT(int) mvaddchnstr (int, int, const chtype *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvaddchstr (int, int, const chtype *);	/* generated */
+extern NCURSES_EXPORT(int) mvaddnstr (int, int, const char *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvaddstr (int, int, const char *);		/* generated */
+extern NCURSES_EXPORT(int) mvchgat (int, int, int, attr_t, short, const void *);	/* generated */
+extern NCURSES_EXPORT(int) mvcur (int,int,int,int);			/* implemented */
+extern NCURSES_EXPORT(int) mvdelch (int, int);				/* generated */
+extern NCURSES_EXPORT(int) mvderwin (WINDOW *, int, int);		/* implemented */
+extern NCURSES_EXPORT(int) mvgetch (int, int);				/* generated */
+extern NCURSES_EXPORT(int) mvgetnstr (int, int, char *, int);		/* generated */
+extern NCURSES_EXPORT(int) mvgetstr (int, int, char *);			/* generated */
+extern NCURSES_EXPORT(int) mvhline (int, int, chtype, int);		/* generated */
+extern NCURSES_EXPORT(chtype) mvinch (int, int);			/* generated */
+extern NCURSES_EXPORT(int) mvinchnstr (int, int, chtype *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvinchstr (int, int, chtype *);		/* generated */
+extern NCURSES_EXPORT(int) mvinnstr (int, int, char *, int);		/* generated */
+extern NCURSES_EXPORT(int) mvinsch (int, int, chtype);			/* generated */
+extern NCURSES_EXPORT(int) mvinsnstr (int, int, const char *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvinsstr (int, int, const char *);		/* generated */
+extern NCURSES_EXPORT(int) mvinstr (int, int, char *);			/* generated */
+extern NCURSES_EXPORT(int) mvprintw (int,int, const char *,...)		/* implemented */
+		GCC_PRINTFLIKE(3,4);
+extern NCURSES_EXPORT(int) mvscanw (int,int, NCURSES_CONST char *,...)	/* implemented */
+		GCC_SCANFLIKE(3,4);
+extern NCURSES_EXPORT(int) mvvline (int, int, chtype, int);		/* generated */
+extern NCURSES_EXPORT(int) mvwaddch (WINDOW *, int, int, const chtype);	/* generated */
+extern NCURSES_EXPORT(int) mvwaddchnstr (WINDOW *, int, int, const chtype *, int);/* generated */
+extern NCURSES_EXPORT(int) mvwaddchstr (WINDOW *, int, int, const chtype *);	/* generated */
+extern NCURSES_EXPORT(int) mvwaddnstr (WINDOW *, int, int, const char *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvwaddstr (WINDOW *, int, int, const char *);	/* generated */
+extern NCURSES_EXPORT(int) mvwchgat (WINDOW *, int, int, int, attr_t, short, const void *);/* generated */
+extern NCURSES_EXPORT(int) mvwdelch (WINDOW *, int, int);		/* generated */
+extern NCURSES_EXPORT(int) mvwgetch (WINDOW *, int, int);		/* generated */
+extern NCURSES_EXPORT(int) mvwgetnstr (WINDOW *, int, int, char *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvwgetstr (WINDOW *, int, int, char *);	/* generated */
+extern NCURSES_EXPORT(int) mvwhline (WINDOW *, int, int, chtype, int);	/* generated */
+extern NCURSES_EXPORT(int) mvwin (WINDOW *,int,int);			/* implemented */
+extern NCURSES_EXPORT(chtype) mvwinch (WINDOW *, int, int);			/* generated */
+extern NCURSES_EXPORT(int) mvwinchnstr (WINDOW *, int, int, chtype *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvwinchstr (WINDOW *, int, int, chtype *);		/* generated */
+extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);		/* generated */
+extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);		/* generated */
+extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int);	/* generated */
+extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);		/* generated */
+extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);		/* generated */
+extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)	/* implemented */
+		GCC_PRINTFLIKE(4,5);
+extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
+		GCC_SCANFLIKE(4,5);
+extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
+extern NCURSES_EXPORT(int) napms (int);					/* implemented */
+extern NCURSES_EXPORT(WINDOW *) newpad (int,int);				/* implemented */
+extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
+extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);			/* implemented */
+extern NCURSES_EXPORT(int) nl (void);					/* implemented */
+extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
+extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(int) noecho (void);				/* implemented */
+extern NCURSES_EXPORT(int) nonl (void);					/* implemented */
+extern NCURSES_EXPORT(void) noqiflush (void);				/* implemented */
+extern NCURSES_EXPORT(int) noraw (void);				/* implemented */
+extern NCURSES_EXPORT(int) notimeout (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(int) overlay (const WINDOW*,WINDOW *);		/* implemented */
+extern NCURSES_EXPORT(int) overwrite (const WINDOW*,WINDOW *);		/* implemented */
+extern NCURSES_EXPORT(int) pair_content (short,short*,short*);		/* implemented */
+extern NCURSES_EXPORT(int) PAIR_NUMBER (int);				/* generated */
+extern NCURSES_EXPORT(int) pechochar (WINDOW *, const chtype);		/* implemented */
+extern NCURSES_EXPORT(int) pnoutrefresh (WINDOW*,int,int,int,int,int,int);/* implemented */
+extern NCURSES_EXPORT(int) prefresh (WINDOW *,int,int,int,int,int,int);	/* implemented */
+extern NCURSES_EXPORT(int) printw (const char *,...)			/* implemented */
+		GCC_PRINTFLIKE(1,2);
+extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
+extern NCURSES_EXPORT(int) putwin (WINDOW *, FILE *);			/* implemented */
+extern NCURSES_EXPORT(void) qiflush (void);				/* implemented */
+extern NCURSES_EXPORT(int) raw (void);					/* implemented */
+extern NCURSES_EXPORT(int) redrawwin (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(int) refresh (void);				/* generated */
+extern NCURSES_EXPORT(int) resetty (void);				/* implemented */
+extern NCURSES_EXPORT(int) reset_prog_mode (void);			/* implemented */
+extern NCURSES_EXPORT(int) reset_shell_mode (void);			/* implemented */
+extern NCURSES_EXPORT(int) ripoffline (int, int (*)(WINDOW *, int));	/* implemented */
+extern NCURSES_EXPORT(int) savetty (void);				/* implemented */
+extern NCURSES_EXPORT(int) scanw (NCURSES_CONST char *,...)		/* implemented */
+		GCC_SCANFLIKE(1,2);
+extern NCURSES_EXPORT(int) scr_dump (const char *);			/* implemented */
+extern NCURSES_EXPORT(int) scr_init (const char *);			/* implemented */
+extern NCURSES_EXPORT(int) scrl (int);					/* generated */
+extern NCURSES_EXPORT(int) scroll (WINDOW *);				/* generated */
+extern NCURSES_EXPORT(int) scrollok (WINDOW *,bool);			/* implemented */
+extern NCURSES_EXPORT(int) scr_restore (const char *);			/* implemented */
+extern NCURSES_EXPORT(int) scr_set (const char *);			/* implemented */
+extern NCURSES_EXPORT(int) setscrreg (int,int);				/* generated */
+extern NCURSES_EXPORT(SCREEN *) set_term (SCREEN *);			/* implemented */
+extern NCURSES_EXPORT(int) slk_attroff (const chtype);			/* implemented */
+extern NCURSES_EXPORT(int) slk_attr_off (const attr_t, void *);		/* generated:WIDEC */
+extern NCURSES_EXPORT(int) slk_attron (const chtype);			/* implemented */
+extern NCURSES_EXPORT(int) slk_attr_on (attr_t,void*);			/* generated:WIDEC */
+extern NCURSES_EXPORT(int) slk_attrset (const chtype);			/* implemented */
+extern NCURSES_EXPORT(attr_t) slk_attr (void);				/* implemented */
+extern NCURSES_EXPORT(int) slk_attr_set (const attr_t,short,void*);	/* implemented */
+extern NCURSES_EXPORT(int) slk_clear (void);				/* implemented */
+extern NCURSES_EXPORT(int) slk_color (short);				/* implemented */
+extern NCURSES_EXPORT(int) slk_init (int);				/* implemented */
+extern NCURSES_EXPORT(char *) slk_label (int);				/* implemented */
+extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
+extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
+extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
+extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
+extern NCURSES_EXPORT(int) slk_touch (void);				/* implemented */
+extern NCURSES_EXPORT(int) standout (void);				/* generated */
+extern NCURSES_EXPORT(int) standend (void);				/* generated */
+extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
+extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
+extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *,int,int,int,int);	/* implemented */
+extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
+extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
+extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
+extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);		/* implemented */
+extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);		/* implemented */
+extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);		/* implemented */
+extern NCURSES_EXPORT(void) timeout (int);				/* generated */
+extern NCURSES_EXPORT(int) touchline (WINDOW *, int, int);		/* generated */
+extern NCURSES_EXPORT(int) touchwin (WINDOW *);				/* generated */
+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* implemented */
+extern NCURSES_EXPORT(int) typeahead (int);				/* implemented */
+extern NCURSES_EXPORT(int) ungetch (int);				/* implemented */
+extern NCURSES_EXPORT(int) untouchwin (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(void) use_env (bool);				/* implemented */
+extern NCURSES_EXPORT(int) vidattr (chtype);				/* implemented */
+extern NCURSES_EXPORT(int) vidputs (chtype, int (*)(int));		/* implemented */
+extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
+extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list);	/* implemented */
+extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list);	/* generated */
+extern NCURSES_EXPORT(int) vwscanw (WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
+extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
+extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype);		/* implemented */
+extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int);	/* implemented */
+extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *);		/* generated */
+extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int);	/* implemented */
+extern NCURSES_EXPORT(int) waddstr (WINDOW *,const char *);		/* generated */
+extern NCURSES_EXPORT(int) wattron (WINDOW *, int);			/* generated */
+extern NCURSES_EXPORT(int) wattroff (WINDOW *, int);			/* generated */
+extern NCURSES_EXPORT(int) wattrset (WINDOW *, int);			/* generated */
+extern NCURSES_EXPORT(int) wattr_get (WINDOW *, attr_t *, short *, void *);	/* generated */
+extern NCURSES_EXPORT(int) wattr_on (WINDOW *, attr_t, void *);		/* implemented */
+extern NCURSES_EXPORT(int) wattr_off (WINDOW *, attr_t, void *);	/* implemented */
+extern NCURSES_EXPORT(int) wattr_set (WINDOW *, attr_t, short, void *);	/* generated */
+extern NCURSES_EXPORT(int) wbkgd (WINDOW *, chtype);			/* implemented */
+extern NCURSES_EXPORT(void) wbkgdset (WINDOW *,chtype);			/* implemented */
+extern NCURSES_EXPORT(int) wborder (WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
+extern NCURSES_EXPORT(int) wchgat (WINDOW *, int, attr_t, short, const void *);/* implemented */
+extern NCURSES_EXPORT(int) wclear (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) wclrtobot (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(int) wclrtoeol (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(int) wcolor_set (WINDOW*,short,void*);		/* implemented */
+extern NCURSES_EXPORT(void) wcursyncup (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(int) wdelch (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) wdeleteln (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(int) wechochar (WINDOW *, const chtype);		/* implemented */
+extern NCURSES_EXPORT(int) werase (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) wgetch (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) wgetnstr (WINDOW *,char *,int);		/* implemented */
+extern NCURSES_EXPORT(int) wgetstr (WINDOW *, char *);			/* generated */
+extern NCURSES_EXPORT(int) whline (WINDOW *, chtype, int);		/* implemented */
+extern NCURSES_EXPORT(chtype) winch (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) winchnstr (WINDOW *, chtype *, int);		/* implemented */
+extern NCURSES_EXPORT(int) winchstr (WINDOW *, chtype *);		/* generated */
+extern NCURSES_EXPORT(int) winnstr (WINDOW *, char *, int);		/* implemented */
+extern NCURSES_EXPORT(int) winsch (WINDOW *, chtype);			/* implemented */
+extern NCURSES_EXPORT(int) winsdelln (WINDOW *,int);			/* implemented */
+extern NCURSES_EXPORT(int) winsertln (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(int) winsnstr (WINDOW *, const char *,int);	/* implemented */
+extern NCURSES_EXPORT(int) winsstr (WINDOW *, const char *);		/* generated */
+extern NCURSES_EXPORT(int) winstr (WINDOW *, char *);			/* generated */
+extern NCURSES_EXPORT(int) wmove (WINDOW *,int,int);			/* implemented */
+extern NCURSES_EXPORT(int) wnoutrefresh (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(int) wprintw (WINDOW *, const char *,...)		/* implemented */
+		GCC_PRINTFLIKE(2,3);
+extern NCURSES_EXPORT(int) wredrawln (WINDOW *,int,int);		/* implemented */
+extern NCURSES_EXPORT(int) wrefresh (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(int) wscanw (WINDOW *, NCURSES_CONST char *,...)	/* implemented */
+		GCC_SCANFLIKE(2,3);
+extern NCURSES_EXPORT(int) wscrl (WINDOW *,int);			/* implemented */
+extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int);		/* implemented */
+extern NCURSES_EXPORT(int) wstandout (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(int) wstandend (WINDOW *);			/* generated */
+extern NCURSES_EXPORT(void) wsyncdown (WINDOW *);			/* implemented */
+extern NCURSES_EXPORT(void) wsyncup (WINDOW *);				/* implemented */
+extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int);			/* implemented */
+extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int);		/* implemented */
+extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int);		/* implemented */
+
+/*
+ * vid_attr() was implemented originally based on the draft of XSI curses.
+ */
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define vid_attr(a,pair,opts) vidattr(a)
+#endif
+
+/* attributes */
+
+#define NCURSES_ATTR_SHIFT       8
+#define NCURSES_BITS(mask,shift) ((mask) << ((shift) + NCURSES_ATTR_SHIFT))
+
+#define A_NORMAL	(1UL - 1UL)
+#define A_ATTRIBUTES	NCURSES_BITS(~(1UL - 1UL),0)
+#define A_CHARTEXT	(NCURSES_BITS(1UL,0) - 1UL)
+#define A_COLOR		NCURSES_BITS(((1UL) << 8) - 1UL,0)
+#define A_STANDOUT	NCURSES_BITS(1UL,8)
+#define A_UNDERLINE	NCURSES_BITS(1UL,9)
+#define A_REVERSE	NCURSES_BITS(1UL,10)
+#define A_BLINK		NCURSES_BITS(1UL,11)
+#define A_DIM		NCURSES_BITS(1UL,12)
+#define A_BOLD		NCURSES_BITS(1UL,13)
+#define A_ALTCHARSET	NCURSES_BITS(1UL,14)
+#define A_INVIS		NCURSES_BITS(1UL,15)
+#define A_PROTECT	NCURSES_BITS(1UL,16)
+#define A_HORIZONTAL	NCURSES_BITS(1UL,17)
+#define A_LEFT		NCURSES_BITS(1UL,18)
+#define A_LOW		NCURSES_BITS(1UL,19)
+#define A_RIGHT		NCURSES_BITS(1UL,20)
+#define A_TOP		NCURSES_BITS(1UL,21)
+#define A_VERTICAL	NCURSES_BITS(1UL,22)
+
+/*
+ * These apply to the first 256 color pairs.
+ */
+#define COLOR_PAIR(n)	NCURSES_BITS(n, 0)
+#define PAIR_NUMBER(a)	(NCURSES_CAST(int,(((a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
+
+/*
+ * pseudo functions
+ */
+#define wgetstr(w, s)		wgetnstr(w, s, -1)
+#define getnstr(s, n)		wgetnstr(stdscr, s, n)
+
+#define setterm(term)		setupterm(term, 1, (int *)0)
+
+#define fixterm()		reset_prog_mode()
+#define resetterm()		reset_shell_mode()
+#define saveterm()		def_prog_mode()
+#define crmode()		cbreak()
+#define nocrmode()		nocbreak()
+#define gettmode()
+
+#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
+#define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
+#define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
+#define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
+
+#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \
+			 else getyx(newscr,(y),(x)); \
+		    } while(0)
+#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \
+			 else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \
+		    } while(0)
+
+/* It seems older SYSV curses versions define these */
+#define getattrs(win)		((win)?(win)->_attrs:A_NORMAL)
+#define getcurx(win)		((win)?(win)->_curx:ERR)
+#define getcury(win)		((win)?(win)->_cury:ERR)
+#define getbegx(win)		((win)?(win)->_begx:ERR)
+#define getbegy(win)		((win)?(win)->_begy:ERR)
+#define getmaxx(win)		((win)?((win)->_maxx + 1):ERR)
+#define getmaxy(win)		((win)?((win)->_maxy + 1):ERR)
+#define getparx(win)		((win)?(win)->_parx:ERR)
+#define getpary(win)		((win)?(win)->_pary:ERR)
+
+#define wstandout(win)      	(wattrset(win,A_STANDOUT))
+#define wstandend(win)      	(wattrset(win,A_NORMAL))
+
+#define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
+#define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
+
+#if 0
+#define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
+				 (win)->_attrs = (at))
+#else
+#define wattrset(win,at)	((win)->_attrs = (at))
+#endif
+
+#define scroll(win)		wscrl(win,1)
+
+#define touchwin(win)		wtouchln((win), 0, getmaxy(win), 1)
+#define touchline(win, s, c)	wtouchln((win), s, c, 1)
+#define untouchwin(win)		wtouchln((win), 0, getmaxy(win), 0)
+
+#define box(win, v, h)		wborder(win, v, v, h, h, 0, 0, 0, 0)
+#define border(ls, rs, ts, bs, tl, tr, bl, br)	wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
+#define hline(ch, n)		whline(stdscr, ch, n)
+#define vline(ch, n)		wvline(stdscr, ch, n)
+
+#define winstr(w, s)		winnstr(w, s, -1)
+#define winchstr(w, s)		winchnstr(w, s, -1)
+#define winsstr(w, s)		winsnstr(w, s, -1)
+
+#define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
+#define waddstr(win,str)	waddnstr(win,str,-1)
+#define waddchstr(win,str)	waddchnstr(win,str,-1)
+
+/*
+ * pseudo functions for standard screen
+ */
+
+#define addch(ch)		waddch(stdscr,ch)
+#define addchnstr(str,n)	waddchnstr(stdscr,str,n)
+#define addchstr(str)		waddchstr(stdscr,str)
+#define addnstr(str,n)		waddnstr(stdscr,str,n)
+#define addstr(str)		waddnstr(stdscr,str,-1)
+#define attroff(at)		wattroff(stdscr,at)
+#define attron(at)		wattron(stdscr,at)
+#define attrset(at)		wattrset(stdscr,at)
+#define attr_get(ap,cp,o)	wattr_get(stdscr,ap,cp,o)
+#define attr_off(a,o)		wattr_off(stdscr,a,o)
+#define attr_on(a,o)		wattr_on(stdscr,a,o)
+#define attr_set(a,c,o)		wattr_set(stdscr,a,c,o)
+#define bkgd(ch)		wbkgd(stdscr,ch)
+#define bkgdset(ch)		wbkgdset(stdscr,ch)
+#define chgat(n,a,c,o)		wchgat(stdscr,n,a,c,o)
+#define clear()			wclear(stdscr)
+#define clrtobot()		wclrtobot(stdscr)
+#define clrtoeol()		wclrtoeol(stdscr)
+#define color_set(c,o)		wcolor_set(stdscr,c,o)
+#define delch()			wdelch(stdscr)
+#define deleteln()		winsdelln(stdscr,-1)
+#define echochar(c)		wechochar(stdscr,c)
+#define erase()			werase(stdscr)
+#define getch()			wgetch(stdscr)
+#define getstr(str)		wgetstr(stdscr,str)
+#define inch()			winch(stdscr)
+#define inchnstr(s,n)		winchnstr(stdscr,s,n)
+#define inchstr(s)		winchstr(stdscr,s)
+#define innstr(s,n)		winnstr(stdscr,s,n)
+#define insch(c)		winsch(stdscr,c)
+#define insdelln(n)		winsdelln(stdscr,n)
+#define insertln()		winsdelln(stdscr,1)
+#define insnstr(s,n)		winsnstr(stdscr,s,n)
+#define insstr(s)		winsstr(stdscr,s)
+#define instr(s)		winstr(stdscr,s)
+#define move(y,x)		wmove(stdscr,y,x)
+#define refresh()		wrefresh(stdscr)
+#define scrl(n)			wscrl(stdscr,n)
+#define setscrreg(t,b)		wsetscrreg(stdscr,t,b)
+#define standend()		wstandend(stdscr)
+#define standout()		wstandout(stdscr)
+#define timeout(delay)		wtimeout(stdscr,delay)
+#define wdeleteln(win)		winsdelln(win,-1)
+#define winsertln(win)		winsdelln(win,1)
+
+/*
+ * mv functions
+ */
+
+#define mvwaddch(win,y,x,ch)		(wmove(win,y,x) == ERR ? ERR : waddch(win,ch))
+#define mvwaddchnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,n))
+#define mvwaddchstr(win,y,x,str)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,-1))
+#define mvwaddnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,n))
+#define mvwaddstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,-1))
+#define mvwdelch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wdelch(win))
+#define mvwchgat(win,y,x,n,a,c,o)	(wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o))
+#define mvwgetch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wgetch(win))
+#define mvwgetnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : wgetnstr(win,str,n))
+#define mvwgetstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : wgetstr(win,str))
+#define mvwhline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : whline(win,c,n))
+#define mvwinch(win,y,x)		(wmove(win,y,x) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
+#define mvwinchnstr(win,y,x,s,n)	(wmove(win,y,x) == ERR ? ERR : winchnstr(win,s,n))
+#define mvwinchstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winchstr(win,s))
+#define mvwinnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winnstr(win,s,n))
+#define mvwinsch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winsch(win,c))
+#define mvwinsnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winsnstr(win,s,n))
+#define mvwinsstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winsstr(win,s))
+#define mvwinstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winstr(win,s))
+#define mvwvline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : wvline(win,c,n))
+
+#define mvaddch(y,x,ch)			mvwaddch(stdscr,y,x,ch)
+#define mvaddchnstr(y,x,str,n)		mvwaddchnstr(stdscr,y,x,str,n)
+#define mvaddchstr(y,x,str)		mvwaddchstr(stdscr,y,x,str)
+#define mvaddnstr(y,x,str,n)		mvwaddnstr(stdscr,y,x,str,n)
+#define mvaddstr(y,x,str)		mvwaddstr(stdscr,y,x,str)
+#define mvchgat(y,x,n,a,c,o)		mvwchgat(stdscr,y,x,n,a,c,o)
+#define mvdelch(y,x)			mvwdelch(stdscr,y,x)
+#define mvgetch(y,x)			mvwgetch(stdscr,y,x)
+#define mvgetnstr(y,x,str,n)		mvwgetnstr(stdscr,y,x,str,n)
+#define mvgetstr(y,x,str)		mvwgetstr(stdscr,y,x,str)
+#define mvhline(y,x,c,n)		mvwhline(stdscr,y,x,c,n)
+#define mvinch(y,x)			mvwinch(stdscr,y,x)
+#define mvinchnstr(y,x,s,n)		mvwinchnstr(stdscr,y,x,s,n)
+#define mvinchstr(y,x,s)		mvwinchstr(stdscr,y,x,s)
+#define mvinnstr(y,x,s,n)		mvwinnstr(stdscr,y,x,s,n)
+#define mvinsch(y,x,c)			mvwinsch(stdscr,y,x,c)
+#define mvinsnstr(y,x,s,n)		mvwinsnstr(stdscr,y,x,s,n)
+#define mvinsstr(y,x,s)			mvwinsstr(stdscr,y,x,s)
+#define mvinstr(y,x,s)			mvwinstr(stdscr,y,x,s)
+#define mvvline(y,x,c,n)		mvwvline(stdscr,y,x,c,n)
+
+/*
+ * Some wide-character functions can be implemented without the extensions.
+ */
+#define getbkgd(win)                    ((win)->_bkgd)
+
+#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
+#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
+
+#if 0
+#define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
+					 (win)->_color = (p), \
+					 OK)
+#define wattr_get(win,a,p,opts)		((void)((a) != 0 && (*(a) = (win)->_attrs)), \
+					 (void)((p) != 0 && (*(p) = (win)->_color)), \
+					 OK)
+#else
+#define wattr_set(win,a,p,opts)		((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
+#define wattr_get(win,a,p,opts)		((void)((a) != 0 && (*(a) = (win)->_attrs)), \
+					 (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
+					 OK)
+#endif
+
+/*
+ * XSI curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
+ * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
+ * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
+ * use stdarg.h, so...
+ */
+#define vw_printw		vwprintw
+#define vw_scanw		vwscanw
+
+/*
+ * Export fallback function for use in C++ binding.
+ */
+#if !1
+#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
+NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
+#endif
+
+/*
+ * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
+ * will return any given one of these only if the corresponding k- capability
+ * is defined in your terminal's terminfo entry.
+ *
+ * Some keys (KEY_A1, etc) are arranged like this:
+ *	a1     up    a3
+ *	left   b2    right
+ *	c1     down  c3
+ *
+ * A few key codes do not depend upon the terminfo entry.
+ */
+#define KEY_CODE_YES	0400		/* A wchar_t contains a key code */
+#define KEY_MIN		0401		/* Minimum curses key */
+#define KEY_BREAK	0401		/* Break key (unreliable) */
+#define KEY_SRESET	0530		/* Soft (partial) reset (unreliable) */
+#define KEY_RESET	0531		/* Reset or hard reset (unreliable) */
+/*
+ * These definitions were generated by D:/coding/libc/svn/trunk/essentials/sys-libs/ncurses/include/MKkey_defs.sh D:/coding/libc/svn/trunk/essentials/sys-libs/ncurses/include/Caps
+ */
+#define KEY_DOWN	0402		/* down-arrow key */
+#define KEY_UP		0403		/* up-arrow key */
+#define KEY_LEFT	0404		/* left-arrow key */
+#define KEY_RIGHT	0405		/* right-arrow key */
+#define KEY_HOME	0406		/* home key */
+#define KEY_BACKSPACE	0407		/* backspace key */
+#define KEY_F0		0410		/* Function keys.  Space for 64 */
+#define KEY_F(n)	(KEY_F0+(n))	/* Value of function key n */
+#define KEY_DL		0510		/* delete-line key */
+#define KEY_IL		0511		/* insert-line key */
+#define KEY_DC		0512		/* delete-character key */
+#define KEY_IC		0513		/* insert-character key */
+#define KEY_EIC		0514		/* sent by rmir or smir in insert mode */
+#define KEY_CLEAR	0515		/* clear-screen or erase key */
+#define KEY_EOS		0516		/* clear-to-end-of-screen key */
+#define KEY_EOL		0517		/* clear-to-end-of-line key */
+#define KEY_SF		0520		/* scroll-forward key */
+#define KEY_SR		0521		/* scroll-backward key */
+#define KEY_NPAGE	0522		/* next-page key */
+#define KEY_PPAGE	0523		/* previous-page key */
+#define KEY_STAB	0524		/* set-tab key */
+#define KEY_CTAB	0525		/* clear-tab key */
+#define KEY_CATAB	0526		/* clear-all-tabs key */
+#define KEY_ENTER	0527		/* enter/send key */
+#define KEY_PRINT	0532		/* print key */
+#define KEY_LL		0533		/* lower-left key (home down) */
+#define KEY_A1		0534		/* upper left of keypad */
+#define KEY_A3		0535		/* upper right of keypad */
+#define KEY_B2		0536		/* center of keypad */
+#define KEY_C1		0537		/* lower left of keypad */
+#define KEY_C3		0540		/* lower right of keypad */
+#define KEY_BTAB	0541		/* back-tab key */
+#define KEY_BEG		0542		/* begin key */
+#define KEY_CANCEL	0543		/* cancel key */
+#define KEY_CLOSE	0544		/* close key */
+#define KEY_COMMAND	0545		/* command key */
+#define KEY_COPY	0546		/* copy key */
+#define KEY_CREATE	0547		/* create key */
+#define KEY_END		0550		/* end key */
+#define KEY_EXIT	0551		/* exit key */
+#define KEY_FIND	0552		/* find key */
+#define KEY_HELP	0553		/* help key */
+#define KEY_MARK	0554		/* mark key */
+#define KEY_MESSAGE	0555		/* message key */
+#define KEY_MOVE	0556		/* move key */
+#define KEY_NEXT	0557		/* next key */
+#define KEY_OPEN	0560		/* open key */
+#define KEY_OPTIONS	0561		/* options key */
+#define KEY_PREVIOUS	0562		/* previous key */
+#define KEY_REDO	0563		/* redo key */
+#define KEY_REFERENCE	0564		/* reference key */
+#define KEY_REFRESH	0565		/* refresh key */
+#define KEY_REPLACE	0566		/* replace key */
+#define KEY_RESTART	0567		/* restart key */
+#define KEY_RESUME	0570		/* resume key */
+#define KEY_SAVE	0571		/* save key */
+#define KEY_SBEG	0572		/* shifted begin key */
+#define KEY_SCANCEL	0573		/* shifted cancel key */
+#define KEY_SCOMMAND	0574		/* shifted command key */
+#define KEY_SCOPY	0575		/* shifted copy key */
+#define KEY_SCREATE	0576		/* shifted create key */
+#define KEY_SDC		0577		/* shifted delete-character key */
+#define KEY_SDL		0600		/* shifted delete-line key */
+#define KEY_SELECT	0601		/* select key */
+#define KEY_SEND	0602		/* shifted end key */
+#define KEY_SEOL	0603		/* shifted clear-to-end-of-line key */
+#define KEY_SEXIT	0604		/* shifted exit key */
+#define KEY_SFIND	0605		/* shifted find key */
+#define KEY_SHELP	0606		/* shifted help key */
+#define KEY_SHOME	0607		/* shifted home key */
+#define KEY_SIC		0610		/* shifted insert-character key */
+#define KEY_SLEFT	0611		/* shifted left-arrow key */
+#define KEY_SMESSAGE	0612		/* shifted message key */
+#define KEY_SMOVE	0613		/* shifted move key */
+#define KEY_SNEXT	0614		/* shifted next key */
+#define KEY_SOPTIONS	0615		/* shifted options key */
+#define KEY_SPREVIOUS	0616		/* shifted previous key */
+#define KEY_SPRINT	0617		/* shifted print key */
+#define KEY_SREDO	0620		/* shifted redo key */
+#define KEY_SREPLACE	0621		/* shifted replace key */
+#define KEY_SRIGHT	0622		/* shifted right-arrow key */
+#define KEY_SRSUME	0623		/* shifted resume key */
+#define KEY_SSAVE	0624		/* shifted save key */
+#define KEY_SSUSPEND	0625		/* shifted suspend key */
+#define KEY_SUNDO	0626		/* shifted undo key */
+#define KEY_SUSPEND	0627		/* suspend key */
+#define KEY_UNDO	0630		/* undo key */
+#define KEY_MOUSE	0631		/* Mouse event has occurred */
+#define KEY_RESIZE	0632		/* Terminal resize event */
+#define KEY_EVENT	0633		/* We were interrupted by an event */
+
+#define KEY_MAX		0777		/* Maximum key value is 0633 */
+/* $Id$ */
+
+/* mouse interface */
+
+#if NCURSES_MOUSE_VERSION > 1
+#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
+#else
+#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
+#endif
+
+#define	NCURSES_BUTTON_RELEASED	001L
+#define	NCURSES_BUTTON_PRESSED	002L
+#define	NCURSES_BUTTON_CLICKED	004L
+#define	NCURSES_DOUBLE_CLICKED	010L
+#define	NCURSES_TRIPLE_CLICKED	020L
+#define	NCURSES_RESERVED_EVENT	040L
+
+/* event masks */
+#define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
+#define	BUTTON1_PRESSED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)
+#define	BUTTON1_CLICKED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_CLICKED)
+#define	BUTTON1_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)
+#define	BUTTON1_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)
+
+#define	BUTTON2_RELEASED	NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_RELEASED)
+#define	BUTTON2_PRESSED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_PRESSED)
+#define	BUTTON2_CLICKED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_CLICKED)
+#define	BUTTON2_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_DOUBLE_CLICKED)
+#define	BUTTON2_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_TRIPLE_CLICKED)
+
+#define	BUTTON3_RELEASED	NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_RELEASED)
+#define	BUTTON3_PRESSED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_PRESSED)
+#define	BUTTON3_CLICKED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_CLICKED)
+#define	BUTTON3_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_DOUBLE_CLICKED)
+#define	BUTTON3_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_TRIPLE_CLICKED)
+
+#define	BUTTON4_RELEASED	NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_RELEASED)
+#define	BUTTON4_PRESSED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_PRESSED)
+#define	BUTTON4_CLICKED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_CLICKED)
+#define	BUTTON4_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_DOUBLE_CLICKED)
+#define	BUTTON4_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_TRIPLE_CLICKED)
+
+/*
+ * In 32 bits the version-1 scheme does not provide enough space for a 5th
+ * button, unless we choose to change the ABI by omitting the reserved-events.
+ */
+#if NCURSES_MOUSE_VERSION > 1
+
+#define	BUTTON5_RELEASED	NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_RELEASED)
+#define	BUTTON5_PRESSED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_PRESSED)
+#define	BUTTON5_CLICKED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_CLICKED)
+#define	BUTTON5_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_DOUBLE_CLICKED)
+#define	BUTTON5_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_TRIPLE_CLICKED)
+
+#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(6, 0001L)
+#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(6, 0002L)
+#define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
+#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
+
+#else
+
+#define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
+#define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
+#define	BUTTON3_RESERVED_EVENT	NCURSES_MOUSE_MASK(3, NCURSES_RESERVED_EVENT)
+#define	BUTTON4_RESERVED_EVENT	NCURSES_MOUSE_MASK(4, NCURSES_RESERVED_EVENT)
+
+#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(5, 0001L)
+#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(5, 0002L)
+#define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
+#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
+
+#endif
+
+#define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
+
+/* macros to extract single event-bits from masks */
+#define	BUTTON_RELEASE(e, x)		((e) & (001 << (6 * ((x) - 1))))
+#define	BUTTON_PRESS(e, x)		((e) & (002 << (6 * ((x) - 1))))
+#define	BUTTON_CLICK(e, x)		((e) & (004 << (6 * ((x) - 1))))
+#define	BUTTON_DOUBLE_CLICK(e, x)	((e) & (010 << (6 * ((x) - 1))))
+#define	BUTTON_TRIPLE_CLICK(e, x)	((e) & (020 << (6 * ((x) - 1))))
+#define	BUTTON_RESERVED_EVENT(e, x)	((e) & (040 << (6 * ((x) - 1))))
+
+typedef struct
+{
+    short id;		/* ID to distinguish multiple devices */
+    int x, y, z;	/* event coordinates (character-cell) */
+    mmask_t bstate;	/* button state bits */
+}
+MEVENT;
+
+extern NCURSES_EXPORT(int) getmouse (MEVENT *);
+extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
+extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
+extern NCURSES_EXPORT(bool) wenclose (const WINDOW *, int, int);
+extern NCURSES_EXPORT(int) mouseinterval (int);
+extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool);
+extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool);              /* generated */
+
+#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
+
+/* other non-XSI functions */
+
+extern NCURSES_EXPORT(int) mcprint (char *, int);	/* direct data to printer */
+extern NCURSES_EXPORT(int) has_key (int);		/* do we have given key? */
+
+/* Debugging : use with libncurses_g.a */
+
+extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
+extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
+extern NCURSES_EXPORT(char *) _traceattr (attr_t);
+extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
+extern NCURSES_EXPORT(char *) _nc_tracebits (void);
+extern NCURSES_EXPORT(char *) _tracechar (int);
+extern NCURSES_EXPORT(char *) _tracechtype (chtype);
+extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
+#ifdef _XOPEN_SOURCE_EXTENDED
+#define _tracech_t		_tracecchar_t
+extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
+#define _tracech_t2		_tracecchar_t2
+extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
+#else
+#define _tracech_t		_tracechtype
+#define _tracech_t2		_tracechtype2
+#endif
+extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
+extern NCURSES_EXPORT(void) trace (const unsigned int);
+
+/* trace masks */
+#define TRACE_DISABLE	0x0000	/* turn off tracing */
+#define TRACE_TIMES	0x0001	/* trace user and system times of updates */
+#define TRACE_TPUTS	0x0002	/* trace tputs calls */
+#define TRACE_UPDATE	0x0004	/* trace update actions, old & new screens */
+#define TRACE_MOVE	0x0008	/* trace cursor moves and scrolls */
+#define TRACE_CHARPUT	0x0010	/* trace all character outputs */
+#define TRACE_ORDINARY	0x001F	/* trace all update actions */
+#define TRACE_CALLS	0x0020	/* trace all curses calls */
+#define TRACE_VIRTPUT	0x0040	/* trace virtual character puts */
+#define TRACE_IEVENT	0x0080	/* trace low-level input processing */
+#define TRACE_BITS	0x0100	/* trace state of TTY control bits */
+#define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
+#define TRACE_CCALLS	0x0400	/* trace per-character calls */
+#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
+#define TRACE_ATTRS	0x1000	/* trace attribute updates */
+
+#define TRACE_SHIFT	13	/* number of bits in the trace masks */
+#define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
+
+#if defined(TRACE) || defined(NCURSES_TEST)
+extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
+#ifdef _XOPEN_SOURCE_EXTENDED
+extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
+extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
+#endif
+extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
+#define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
+#define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
+#define OPTIMIZE_SCROLL		0x04	/* scroll optimization */
+#define OPTIMIZE_ALL		0xff	/* enable all optimizations (dflt) */
+#endif
+
+#ifdef __cplusplus
+
+/* these names conflict with STL */
+#undef box
+#undef clear
+#undef erase
+#undef move
+#undef refresh
+
+}
+#endif
+
+#endif /* __NCURSES_H */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-expanded.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-expanded.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-expanded.c	(revision 3073)
@@ -0,0 +1,27 @@
+/* generated by MKexpanded.sh */
+#include <curses.priv.h>
+#include <term.h>
+#if NCURSES_EXPANDED
+ void _nc_toggle_attr_on (attr_t *S, attr_t at)
+{
+        { if (PAIR_NUMBER(at) > 0) { (*S) = ((*S) & ALL_BUT_COLOR) | (at); } else { (*S) |= (at); } ;};
+}
+ void _nc_toggle_attr_off (attr_t *S, attr_t at)
+{
+        { if (PAIR_NUMBER(at) > 0) { (*S) &= ~(at|((((1UL) << 8) - 1UL) << ((0) + 8))); } else { (*S) &= ~(at); } ;};
+}
+ int _nc_DelCharCost (int count)
+{
+        return ((cur_term->type. Strings[105] != 0) ? SP->_dch_cost : ((cur_term->type. Strings[21] != 0) ? (SP->_dch1_cost * count) : 1000000));
+}
+ int _nc_InsCharCost (int count)
+{
+        return ((cur_term->type. Strings[108] != 0) ? SP->_ich_cost : ((cur_term->type. Strings[31] && cur_term->type. Strings[42]) ? SP->_smir_cost + SP->_rmir_cost + (SP->_ip_cost * count) : ((cur_term->type. Strings[52] != 0) ? ((SP->_ich1_cost + SP->_ip_cost) * count) : 1000000)));
+}
+ void _nc_UpdateAttrs (chtype c)
+{
+        if (!((((*((SP)->_current_attr))) & (chtype)((~(1UL - 1UL)) << ((0) + 8))) == ((c) & (chtype)((~(1UL - 1UL)) << ((0) + 8))))) vidattr(((c) & (chtype)((~(1UL - 1UL)) << ((0) + 8))));;
+}
+#else /* ! NCURSES_EXPANDED */
+NCURSES_EXPORT(void) _nc_expanded (void) { }
+#endif /* NCURSES_EXPANDED */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-fallback.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-fallback.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-fallback.c	(revision 3073)
@@ -0,0 +1,12 @@
+/*
+ * DO NOT EDIT THIS FILE BY HAND!  It is generated by MKfallback.sh.
+ */
+
+#include <curses.priv.h>
+#include <term.h>
+
+NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *name GCC_UNUSED)
+{
+	/* the fallback list is empty */
+	return((TERMTYPE *)0);
+}
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-hashsize.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-hashsize.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-hashsize.h	(revision 3073)
@@ -0,0 +1,6 @@
+/*
+ * hashsize.h -- hash and token table constants
+ */
+
+#define CAPTABSIZE	    497
+#define HASHTABSIZE	(    497 * 2)
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-init_keytry.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-init_keytry.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-init_keytry.h	(revision 3073)
@@ -0,0 +1,162 @@
+#ifndef NCU_KEYS_H
+#define NCU_KEYS_H 1
+
+/* This file was generated by MAKE_KEYS */
+
+#if BROKEN_LINKER
+static
+#endif
+struct tinfo_fkeys _nc_tinfo_fkeys[] = {
+	{  139, KEY_A1           },	/* key_a1 */
+	{  140, KEY_A3           },	/* key_a3 */
+	{  141, KEY_B2           },	/* key_b2 */
+	{   55, KEY_BACKSPACE    },	/* key_backspace */
+	{  158, KEY_BEG          },	/* key_beg */
+	{  148, KEY_BTAB         },	/* key_btab */
+	{  142, KEY_C1           },	/* key_c1 */
+	{  143, KEY_C3           },	/* key_c3 */
+	{  159, KEY_CANCEL       },	/* key_cancel */
+	{   56, KEY_CATAB        },	/* key_catab */
+	{   57, KEY_CLEAR        },	/* key_clear */
+	{  160, KEY_CLOSE        },	/* key_close */
+	{  161, KEY_COMMAND      },	/* key_command */
+	{  162, KEY_COPY         },	/* key_copy */
+	{  163, KEY_CREATE       },	/* key_create */
+	{   58, KEY_CTAB         },	/* key_ctab */
+	{   59, KEY_DC           },	/* key_dc */
+	{   60, KEY_DL           },	/* key_dl */
+	{   61, KEY_DOWN         },	/* key_down */
+	{   62, KEY_EIC          },	/* key_eic */
+	{  164, KEY_END          },	/* key_end */
+	{  165, KEY_ENTER        },	/* key_enter */
+	{   63, KEY_EOL          },	/* key_eol */
+	{   64, KEY_EOS          },	/* key_eos */
+	{  166, KEY_EXIT         },	/* key_exit */
+	{   65, KEY_F(0)         },	/* key_f0 */
+	{   66, KEY_F(1)         },	/* key_f1 */
+	{   67, KEY_F(10)        },	/* key_f10 */
+	{  216, KEY_F(11)        },	/* key_f11 */
+	{  217, KEY_F(12)        },	/* key_f12 */
+	{  218, KEY_F(13)        },	/* key_f13 */
+	{  219, KEY_F(14)        },	/* key_f14 */
+	{  220, KEY_F(15)        },	/* key_f15 */
+	{  221, KEY_F(16)        },	/* key_f16 */
+	{  222, KEY_F(17)        },	/* key_f17 */
+	{  223, KEY_F(18)        },	/* key_f18 */
+	{  224, KEY_F(19)        },	/* key_f19 */
+	{   68, KEY_F(2)         },	/* key_f2 */
+	{  225, KEY_F(20)        },	/* key_f20 */
+	{  226, KEY_F(21)        },	/* key_f21 */
+	{  227, KEY_F(22)        },	/* key_f22 */
+	{  228, KEY_F(23)        },	/* key_f23 */
+	{  229, KEY_F(24)        },	/* key_f24 */
+	{  230, KEY_F(25)        },	/* key_f25 */
+	{  231, KEY_F(26)        },	/* key_f26 */
+	{  232, KEY_F(27)        },	/* key_f27 */
+	{  233, KEY_F(28)        },	/* key_f28 */
+	{  234, KEY_F(29)        },	/* key_f29 */
+	{   69, KEY_F(3)         },	/* key_f3 */
+	{  235, KEY_F(30)        },	/* key_f30 */
+	{  236, KEY_F(31)        },	/* key_f31 */
+	{  237, KEY_F(32)        },	/* key_f32 */
+	{  238, KEY_F(33)        },	/* key_f33 */
+	{  239, KEY_F(34)        },	/* key_f34 */
+	{  240, KEY_F(35)        },	/* key_f35 */
+	{  241, KEY_F(36)        },	/* key_f36 */
+	{  242, KEY_F(37)        },	/* key_f37 */
+	{  243, KEY_F(38)        },	/* key_f38 */
+	{  244, KEY_F(39)        },	/* key_f39 */
+	{   70, KEY_F(4)         },	/* key_f4 */
+	{  245, KEY_F(40)        },	/* key_f40 */
+	{  246, KEY_F(41)        },	/* key_f41 */
+	{  247, KEY_F(42)        },	/* key_f42 */
+	{  248, KEY_F(43)        },	/* key_f43 */
+	{  249, KEY_F(44)        },	/* key_f44 */
+	{  250, KEY_F(45)        },	/* key_f45 */
+	{  251, KEY_F(46)        },	/* key_f46 */
+	{  252, KEY_F(47)        },	/* key_f47 */
+	{  253, KEY_F(48)        },	/* key_f48 */
+	{  254, KEY_F(49)        },	/* key_f49 */
+	{   71, KEY_F(5)         },	/* key_f5 */
+	{  255, KEY_F(50)        },	/* key_f50 */
+	{  256, KEY_F(51)        },	/* key_f51 */
+	{  257, KEY_F(52)        },	/* key_f52 */
+	{  258, KEY_F(53)        },	/* key_f53 */
+	{  259, KEY_F(54)        },	/* key_f54 */
+	{  260, KEY_F(55)        },	/* key_f55 */
+	{  261, KEY_F(56)        },	/* key_f56 */
+	{  262, KEY_F(57)        },	/* key_f57 */
+	{  263, KEY_F(58)        },	/* key_f58 */
+	{  264, KEY_F(59)        },	/* key_f59 */
+	{   72, KEY_F(6)         },	/* key_f6 */
+	{  265, KEY_F(60)        },	/* key_f60 */
+	{  266, KEY_F(61)        },	/* key_f61 */
+	{  267, KEY_F(62)        },	/* key_f62 */
+	{  268, KEY_F(63)        },	/* key_f63 */
+	{   73, KEY_F(7)         },	/* key_f7 */
+	{   74, KEY_F(8)         },	/* key_f8 */
+	{   75, KEY_F(9)         },	/* key_f9 */
+	{  167, KEY_FIND         },	/* key_find */
+	{  168, KEY_HELP         },	/* key_help */
+	{   76, KEY_HOME         },	/* key_home */
+	{   77, KEY_IC           },	/* key_ic */
+	{   78, KEY_IL           },	/* key_il */
+	{   79, KEY_LEFT         },	/* key_left */
+	{   80, KEY_LL           },	/* key_ll */
+	{  169, KEY_MARK         },	/* key_mark */
+	{  170, KEY_MESSAGE      },	/* key_message */
+	{  355, KEY_MOUSE        },	/* key_mouse */
+	{  171, KEY_MOVE         },	/* key_move */
+	{  172, KEY_NEXT         },	/* key_next */
+	{   81, KEY_NPAGE        },	/* key_npage */
+	{  173, KEY_OPEN         },	/* key_open */
+	{  174, KEY_OPTIONS      },	/* key_options */
+	{   82, KEY_PPAGE        },	/* key_ppage */
+	{  175, KEY_PREVIOUS     },	/* key_previous */
+	{  176, KEY_PRINT        },	/* key_print */
+	{  177, KEY_REDO         },	/* key_redo */
+	{  178, KEY_REFERENCE    },	/* key_reference */
+	{  179, KEY_REFRESH      },	/* key_refresh */
+	{  180, KEY_REPLACE      },	/* key_replace */
+	{  181, KEY_RESTART      },	/* key_restart */
+	{  182, KEY_RESUME       },	/* key_resume */
+	{   83, KEY_RIGHT        },	/* key_right */
+	{  183, KEY_SAVE         },	/* key_save */
+	{  186, KEY_SBEG         },	/* key_sbeg */
+	{  187, KEY_SCANCEL      },	/* key_scancel */
+	{  188, KEY_SCOMMAND     },	/* key_scommand */
+	{  189, KEY_SCOPY        },	/* key_scopy */
+	{  190, KEY_SCREATE      },	/* key_screate */
+	{  191, KEY_SDC          },	/* key_sdc */
+	{  192, KEY_SDL          },	/* key_sdl */
+	{  193, KEY_SELECT       },	/* key_select */
+	{  194, KEY_SEND         },	/* key_send */
+	{  195, KEY_SEOL         },	/* key_seol */
+	{  196, KEY_SEXIT        },	/* key_sexit */
+	{   84, KEY_SF           },	/* key_sf */
+	{  197, KEY_SFIND        },	/* key_sfind */
+	{  198, KEY_SHELP        },	/* key_shelp */
+	{  199, KEY_SHOME        },	/* key_shome */
+	{  200, KEY_SIC          },	/* key_sic */
+	{  201, KEY_SLEFT        },	/* key_sleft */
+	{  202, KEY_SMESSAGE     },	/* key_smessage */
+	{  203, KEY_SMOVE        },	/* key_smove */
+	{  204, KEY_SNEXT        },	/* key_snext */
+	{  205, KEY_SOPTIONS     },	/* key_soptions */
+	{  206, KEY_SPREVIOUS    },	/* key_sprevious */
+	{  207, KEY_SPRINT       },	/* key_sprint */
+	{   85, KEY_SR           },	/* key_sr */
+	{  208, KEY_SREDO        },	/* key_sredo */
+	{  209, KEY_SREPLACE     },	/* key_sreplace */
+	{  210, KEY_SRIGHT       },	/* key_sright */
+	{  211, KEY_SRSUME       },	/* key_srsume */
+	{  212, KEY_SSAVE        },	/* key_ssave */
+	{  213, KEY_SSUSPEND     },	/* key_ssuspend */
+	{   86, KEY_STAB         },	/* key_stab */
+	{  214, KEY_SUNDO        },	/* key_sundo */
+	{  184, KEY_SUSPEND      },	/* key_suspend */
+	{  185, KEY_UNDO         },	/* key_undo */
+	{   87, KEY_UP           },	/* key_up */
+	{ 0, 0} };
+
+#endif /* NCU_KEYS_H */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_gen.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_gen.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_gen.c	(revision 3073)
@@ -0,0 +1,825 @@
+/*
+ * DO NOT EDIT THIS FILE BY HAND!
+ * It is generated by D:/coding/libc/svn/trunk/essentials/sys-libs/ncurses/ncurses/base/MKlib_gen.sh generated.
+ *
+ * This is a file of trivial functions generated from macro
+ * definitions in curses.h to satisfy the XSI Curses requirement
+ * that every macro also exist as a callable function.
+ *
+ * It will never be linked unless you call one of the entry
+ * points with its normal macro definition disabled. In that
+ * case, if you have no shared libraries, it will indirectly
+ * pull most of the rest of the library into your link image.
+ */
+#include <curses.priv.h>
+
+
+#undef addch
+NCURSES_EXPORT(int) addch (const chtype z)
+{
+	T((T_CALLED("addch(%s)"), _tracechtype2(0,z))); returnCode(waddch(stdscr,z));
+}
+
+
+#undef addchnstr
+NCURSES_EXPORT(int) addchnstr (const chtype * a1, int z)
+{
+	T((T_CALLED("addchnstr(%p,%d)"), a1, z)); returnCode(waddchnstr(stdscr,a1,z));
+}
+
+
+#undef addchstr
+NCURSES_EXPORT(int) addchstr (const chtype * z)
+{
+	T((T_CALLED("addchstr(%p)"), z)); returnCode(waddchnstr(stdscr,z,-1));
+}
+
+
+#undef addnstr
+NCURSES_EXPORT(int) addnstr (const char * a1, int z)
+{
+	T((T_CALLED("addnstr(%s,%d)"), _nc_visbuf2(0,a1), z)); returnCode(waddnstr(stdscr,a1,z));
+}
+
+
+#undef addstr
+NCURSES_EXPORT(int) addstr (const char * z)
+{
+	T((T_CALLED("addstr(%s)"), _nc_visbuf2(0,z))); returnCode(waddnstr(stdscr,z,-1));
+}
+
+
+#undef attroff
+NCURSES_EXPORT(int) attroff (attr_t z)
+{
+	T((T_CALLED("attroff(%s)"), _traceattr2(0,z))); returnCode(wattr_off(stdscr, (attr_t)(z), 0));
+}
+
+
+#undef attron
+NCURSES_EXPORT(int) attron (attr_t z)
+{
+	T((T_CALLED("attron(%s)"), _traceattr2(0,z))); returnCode(wattr_on(stdscr, (attr_t)(z), 0));
+}
+
+
+#undef attrset
+NCURSES_EXPORT(int) attrset (attr_t z)
+{
+	T((T_CALLED("attrset(%s)"), _traceattr2(0,z))); returnAttr(((stdscr)->_attrs = (z)));
+}
+
+
+#undef attr_get
+NCURSES_EXPORT(int) attr_get (attr_t * a1, short * a2, void * z)
+{
+	T((T_CALLED("attr_get(%p,%p,%p)"), a1, a2, z)); returnCode(((void)((a1) != 0 && (*(a1) = (stdscr)->_attrs)), (void)((a2) != 0 && (*(a2) = ((int)(((((stdscr)->_attrs) & ((((1UL) << 8) - 1UL) << ((0) + 8))) >> 8))))), (0)));
+}
+
+
+#undef attr_off
+NCURSES_EXPORT(int) attr_off (attr_t a1, void * z)
+{
+	T((T_CALLED("attr_off(%s,%p)"), _traceattr2(0,a1), z)); returnCode(wattr_off(stdscr,a1,z));
+}
+
+
+#undef attr_on
+NCURSES_EXPORT(int) attr_on (attr_t a1, void * z)
+{
+	T((T_CALLED("attr_on(%s,%p)"), _traceattr2(0,a1), z)); returnCode(wattr_on(stdscr,a1,z));
+}
+
+
+#undef attr_set
+NCURSES_EXPORT(int) attr_set (attr_t a1, short a2, void * z)
+{
+	T((T_CALLED("attr_set(%s,%d,%p)"), _traceattr2(0,a1), a2, z)); returnCode(((stdscr)->_attrs = (((a1) & ~((((1UL) << 8) - 1UL) << ((0) + 8))) | ((a2) << ((0) + 8))), (0)));
+}
+
+
+#undef bkgd
+NCURSES_EXPORT(int) bkgd (chtype z)
+{
+	T((T_CALLED("bkgd(%s)"), _tracechtype2(0,z))); returnCode(wbkgd(stdscr,z));
+}
+
+
+#undef bkgdset
+NCURSES_EXPORT(void) bkgdset (chtype z)
+{
+	T((T_CALLED("bkgdset(%s)"), _tracechtype2(0,z))); wbkgdset(stdscr,z);
+	returnVoid;
+}
+
+
+#undef border
+NCURSES_EXPORT(int) border (chtype a1, chtype a2, chtype a3, chtype a4, chtype a5, chtype a6, chtype a7, chtype z)
+{
+	T((T_CALLED("border(%s,%s,%s,%s,%s,%s,%s,%s)"), _tracechtype2(0,a1), _tracechtype2(1,a2), _tracechtype2(2,a3), _tracechtype2(3,a4), _tracechtype2(4,a5), _tracechtype2(5,a6), _tracechtype2(6,a7), _tracechtype2(7,z))); returnCode(wborder(stdscr, a1, a2, a3, a4, a5, a6, a7, z));
+}
+
+
+#undef box
+NCURSES_EXPORT(int) box (WINDOW * a1, chtype a2, chtype z)
+{
+	T((T_CALLED("box(%p,%s,%s)"), a1, _tracechtype2(1,a2), _tracechtype2(2,z))); returnCode(wborder(a1, a2, a2, z, z, 0, 0, 0, 0));
+}
+
+
+#undef chgat
+NCURSES_EXPORT(int) chgat (int a1, attr_t a2, short a3, const void * z)
+{
+	T((T_CALLED("chgat(%d,%s,%d,%p)"), a1, _traceattr2(1,a2), a3, z)); returnCode(wchgat(stdscr,a1,a2,a3,z));
+}
+
+
+#undef clear
+NCURSES_EXPORT(int) clear (void)
+{
+	T((T_CALLED("clear()"))); returnCode(wclear(stdscr));
+}
+
+
+#undef clrtobot
+NCURSES_EXPORT(int) clrtobot (void)
+{
+	T((T_CALLED("clrtobot()"))); returnCode(wclrtobot(stdscr));
+}
+
+
+#undef clrtoeol
+NCURSES_EXPORT(int) clrtoeol (void)
+{
+	T((T_CALLED("clrtoeol()"))); returnCode(wclrtoeol(stdscr));
+}
+
+
+#undef color_set
+NCURSES_EXPORT(int) color_set (short a1, void * z)
+{
+	T((T_CALLED("color_set(%d,%p)"), a1, z)); returnCode(wcolor_set(stdscr,a1,z));
+}
+
+
+#undef COLOR_PAIR
+NCURSES_EXPORT(int) COLOR_PAIR (int z)
+{
+	T((T_CALLED("COLOR_PAIR(%d)"), z)); returnCode(((z) << ((0) + 8)));
+}
+
+
+#undef delch
+NCURSES_EXPORT(int) delch (void)
+{
+	T((T_CALLED("delch()"))); returnCode(wdelch(stdscr));
+}
+
+
+#undef deleteln
+NCURSES_EXPORT(int) deleteln (void)
+{
+	T((T_CALLED("deleteln()"))); returnCode(winsdelln(stdscr,-1));
+}
+
+
+#undef echochar
+NCURSES_EXPORT(int) echochar (const chtype z)
+{
+	T((T_CALLED("echochar(%s)"), _tracechtype2(0,z))); returnCode(wechochar(stdscr,z));
+}
+
+
+#undef erase
+NCURSES_EXPORT(int) erase (void)
+{
+	T((T_CALLED("erase()"))); returnCode(werase(stdscr));
+}
+
+
+#undef getbkgd
+NCURSES_EXPORT(chtype) getbkgd (WINDOW * z)
+{
+	T((T_CALLED("getbkgd(%p)"), z)); returnChar(((z)->_bkgd));
+}
+
+
+#undef getch
+NCURSES_EXPORT(int) getch (void)
+{
+	T((T_CALLED("getch()"))); returnCode(wgetch(stdscr));
+}
+
+
+#undef getnstr
+NCURSES_EXPORT(int) getnstr (char * a1, int z)
+{
+	T((T_CALLED("getnstr(%s,%d)"), _nc_visbuf2(0,a1), z)); returnCode(wgetnstr(stdscr, a1, z));
+}
+
+
+#undef getstr
+NCURSES_EXPORT(int) getstr (char * z)
+{
+	T((T_CALLED("getstr(%s)"), _nc_visbuf2(0,z))); returnCode(wgetnstr(stdscr, z, -1));
+}
+
+
+#undef hline
+NCURSES_EXPORT(int) hline (chtype a1, int z)
+{
+	T((T_CALLED("hline(%s,%d)"), _tracechtype2(0,a1), z)); returnCode(whline(stdscr, a1, z));
+}
+
+
+#undef inch
+NCURSES_EXPORT(chtype) inch (void)
+{
+	T((T_CALLED("inch()"))); returnChar(winch(stdscr));
+}
+
+
+#undef inchnstr
+NCURSES_EXPORT(int) inchnstr (chtype * a1, int z)
+{
+	T((T_CALLED("inchnstr(%p,%d)"), a1, z)); returnCode(winchnstr(stdscr,a1,z));
+}
+
+
+#undef inchstr
+NCURSES_EXPORT(int) inchstr (chtype * z)
+{
+	T((T_CALLED("inchstr(%p)"), z)); returnCode(winchnstr(stdscr, z, -1));
+}
+
+
+#undef innstr
+NCURSES_EXPORT(int) innstr (char * a1, int z)
+{
+	return winnstr(stdscr,a1,z) ;
+}
+
+
+#undef insch
+NCURSES_EXPORT(int) insch (chtype z)
+{
+	T((T_CALLED("insch(%s)"), _tracechtype2(0,z))); returnCode(winsch(stdscr,z));
+}
+
+
+#undef insdelln
+NCURSES_EXPORT(int) insdelln (int z)
+{
+	T((T_CALLED("insdelln(%d)"), z)); returnCode(winsdelln(stdscr,z));
+}
+
+
+#undef insertln
+NCURSES_EXPORT(int) insertln (void)
+{
+	T((T_CALLED("insertln()"))); returnCode(winsdelln(stdscr,1));
+}
+
+
+#undef insnstr
+NCURSES_EXPORT(int) insnstr (const char * a1, int z)
+{
+	T((T_CALLED("insnstr(%s,%d)"), _nc_visbuf2(0,a1), z)); returnCode(winsnstr(stdscr,a1,z));
+}
+
+
+#undef insstr
+NCURSES_EXPORT(int) insstr (const char * z)
+{
+	T((T_CALLED("insstr(%s)"), _nc_visbuf2(0,z))); returnCode(winsnstr(stdscr, z, -1));
+}
+
+
+#undef instr
+NCURSES_EXPORT(int) instr (char * z)
+{
+	T((T_CALLED("instr(%s)"), _nc_visbuf2(0,z))); returnCode(winnstr(stdscr, z, -1));
+}
+
+
+#undef move
+NCURSES_EXPORT(int) move (int a1, int z)
+{
+	T((T_CALLED("move(%d,%d)"), a1, z)); returnCode(wmove(stdscr,a1,z));
+}
+
+
+#undef mvaddch
+NCURSES_EXPORT(int) mvaddch (int a1, int a2, const chtype z)
+{
+	T((T_CALLED("mvaddch(%d,%d,%s)"), a1, a2, _tracechtype2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : waddch(stdscr,z)));
+}
+
+
+#undef mvaddchnstr
+NCURSES_EXPORT(int) mvaddchnstr (int a1, int a2, const chtype * a3, int z)
+{
+	T((T_CALLED("mvaddchnstr(%d,%d,%p,%d)"), a1, a2, a3, z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : waddchnstr(stdscr,a3,z)));
+}
+
+
+#undef mvaddchstr
+NCURSES_EXPORT(int) mvaddchstr (int a1, int a2, const chtype * z)
+{
+	T((T_CALLED("mvaddchstr(%d,%d,%p)"), a1, a2, z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : waddchnstr(stdscr,z,-1)));
+}
+
+
+#undef mvaddnstr
+NCURSES_EXPORT(int) mvaddnstr (int a1, int a2, const char * a3, int z)
+{
+	T((T_CALLED("mvaddnstr(%d,%d,%s,%d)"), a1, a2, _nc_visbuf2(2,a3), z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : waddnstr(stdscr,a3,z)));
+}
+
+
+#undef mvaddstr
+NCURSES_EXPORT(int) mvaddstr (int a1, int a2, const char * z)
+{
+	T((T_CALLED("mvaddstr(%d,%d,%s)"), a1, a2, _nc_visbuf2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : waddnstr(stdscr,z,-1)));
+}
+
+
+#undef mvchgat
+NCURSES_EXPORT(int) mvchgat (int a1, int a2, int a3, attr_t a4, short a5, const void * z)
+{
+	T((T_CALLED("mvchgat(%d,%d,%d,%s,%d,%p)"), a1, a2, a3, _traceattr2(3,a4), a5, z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : wchgat(stdscr,a3,a4,a5,z)));
+}
+
+
+#undef mvdelch
+NCURSES_EXPORT(int) mvdelch (int a1, int z)
+{
+	T((T_CALLED("mvdelch(%d,%d)"), a1, z)); returnCode((wmove(stdscr,a1,z) == (-1) ? (-1) : wdelch(stdscr)));
+}
+
+
+#undef mvgetch
+NCURSES_EXPORT(int) mvgetch (int a1, int z)
+{
+	T((T_CALLED("mvgetch(%d,%d)"), a1, z)); returnCode((wmove(stdscr,a1,z) == (-1) ? (-1) : wgetch(stdscr)));
+}
+
+
+#undef mvgetnstr
+NCURSES_EXPORT(int) mvgetnstr (int a1, int a2, char * a3, int z)
+{
+	T((T_CALLED("mvgetnstr(%d,%d,%s,%d)"), a1, a2, _nc_visbuf2(2,a3), z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : wgetnstr(stdscr,a3,z)));
+}
+
+
+#undef mvgetstr
+NCURSES_EXPORT(int) mvgetstr (int a1, int a2, char * z)
+{
+	T((T_CALLED("mvgetstr(%d,%d,%s)"), a1, a2, _nc_visbuf2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : wgetnstr(stdscr, z, -1)));
+}
+
+
+#undef mvhline
+NCURSES_EXPORT(int) mvhline (int a1, int a2, chtype a3, int z)
+{
+	T((T_CALLED("mvhline(%d,%d,%s,%d)"), a1, a2, _tracechtype2(2,a3), z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : whline(stdscr,a3,z)));
+}
+
+
+#undef mvinch
+NCURSES_EXPORT(chtype) mvinch (int a1, int z)
+{
+	T((T_CALLED("mvinch(%d,%d)"), a1, z)); returnChar((wmove(stdscr,a1,z) == (-1) ? (chtype)((-1)) : winch(stdscr)));
+}
+
+
+#undef mvinchnstr
+NCURSES_EXPORT(int) mvinchnstr (int a1, int a2, chtype * a3, int z)
+{
+	T((T_CALLED("mvinchnstr(%d,%d,%p,%d)"), a1, a2, a3, z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winchnstr(stdscr,a3,z)));
+}
+
+
+#undef mvinchstr
+NCURSES_EXPORT(int) mvinchstr (int a1, int a2, chtype * z)
+{
+	T((T_CALLED("mvinchstr(%d,%d,%p)"), a1, a2, z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winchnstr(stdscr, z, -1)));
+}
+
+
+#undef mvinnstr
+NCURSES_EXPORT(int) mvinnstr (int a1, int a2, char * a3, int z)
+{
+	return (wmove(stdscr,a1,a2) == (-1) ? (-1) : winnstr(stdscr,a3,z)) ;
+}
+
+
+#undef mvinsch
+NCURSES_EXPORT(int) mvinsch (int a1, int a2, chtype z)
+{
+	T((T_CALLED("mvinsch(%d,%d,%s)"), a1, a2, _tracechtype2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winsch(stdscr,z)));
+}
+
+
+#undef mvinsnstr
+NCURSES_EXPORT(int) mvinsnstr (int a1, int a2, const char * a3, int z)
+{
+	T((T_CALLED("mvinsnstr(%d,%d,%s,%d)"), a1, a2, _nc_visbuf2(2,a3), z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winsnstr(stdscr,a3,z)));
+}
+
+
+#undef mvinsstr
+NCURSES_EXPORT(int) mvinsstr (int a1, int a2, const char * z)
+{
+	T((T_CALLED("mvinsstr(%d,%d,%s)"), a1, a2, _nc_visbuf2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winsnstr(stdscr, z, -1)));
+}
+
+
+#undef mvinstr
+NCURSES_EXPORT(int) mvinstr (int a1, int a2, char * z)
+{
+	T((T_CALLED("mvinstr(%d,%d,%s)"), a1, a2, _nc_visbuf2(2,z))); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : winnstr(stdscr, z, -1)));
+}
+
+
+#undef mvvline
+NCURSES_EXPORT(int) mvvline (int a1, int a2, chtype a3, int z)
+{
+	T((T_CALLED("mvvline(%d,%d,%s,%d)"), a1, a2, _tracechtype2(2,a3), z)); returnCode((wmove(stdscr,a1,a2) == (-1) ? (-1) : wvline(stdscr,a3,z)));
+}
+
+
+#undef mvwaddch
+NCURSES_EXPORT(int) mvwaddch (WINDOW * a1, int a2, int a3, const chtype z)
+{
+	T((T_CALLED("mvwaddch(%p,%d,%d,%s)"), a1, a2, a3, _tracechtype2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : waddch(a1,z)));
+}
+
+
+#undef mvwaddchnstr
+NCURSES_EXPORT(int) mvwaddchnstr (WINDOW * a1, int a2, int a3, const chtype * a4, int z)
+{
+	T((T_CALLED("mvwaddchnstr(%p,%d,%d,%p,%d)"), a1, a2, a3, a4, z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : waddchnstr(a1,a4,z)));
+}
+
+
+#undef mvwaddchstr
+NCURSES_EXPORT(int) mvwaddchstr (WINDOW * a1, int a2, int a3, const chtype * z)
+{
+	T((T_CALLED("mvwaddchstr(%p,%d,%d,%p)"), a1, a2, a3, z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : waddchnstr(a1,z,-1)));
+}
+
+
+#undef mvwaddnstr
+NCURSES_EXPORT(int) mvwaddnstr (WINDOW * a1, int a2, int a3, const char * a4, int z)
+{
+	T((T_CALLED("mvwaddnstr(%p,%d,%d,%s,%d)"), a1, a2, a3, _nc_visbuf2(3,a4), z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : waddnstr(a1,a4,z)));
+}
+
+
+#undef mvwaddstr
+NCURSES_EXPORT(int) mvwaddstr (WINDOW * a1, int a2, int a3, const char * z)
+{
+	T((T_CALLED("mvwaddstr(%p,%d,%d,%s)"), a1, a2, a3, _nc_visbuf2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : waddnstr(a1,z,-1)));
+}
+
+
+#undef mvwchgat
+NCURSES_EXPORT(int) mvwchgat (WINDOW * a1, int a2, int a3, int a4, attr_t a5, short a6, const void * z)
+{
+	T((T_CALLED("mvwchgat(%p,%d,%d,%d,%s,%d,%p)"), a1, a2, a3, a4, _traceattr2(4,a5), a6, z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : wchgat(a1,a4,a5,a6,z)));
+}
+
+
+#undef mvwdelch
+NCURSES_EXPORT(int) mvwdelch (WINDOW * a1, int a2, int z)
+{
+	T((T_CALLED("mvwdelch(%p,%d,%d)"), a1, a2, z)); returnCode((wmove(a1,a2,z) == (-1) ? (-1) : wdelch(a1)));
+}
+
+
+#undef mvwgetch
+NCURSES_EXPORT(int) mvwgetch (WINDOW * a1, int a2, int z)
+{
+	T((T_CALLED("mvwgetch(%p,%d,%d)"), a1, a2, z)); returnCode((wmove(a1,a2,z) == (-1) ? (-1) : wgetch(a1)));
+}
+
+
+#undef mvwgetnstr
+NCURSES_EXPORT(int) mvwgetnstr (WINDOW * a1, int a2, int a3, char * a4, int z)
+{
+	T((T_CALLED("mvwgetnstr(%p,%d,%d,%s,%d)"), a1, a2, a3, _nc_visbuf2(3,a4), z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : wgetnstr(a1,a4,z)));
+}
+
+
+#undef mvwgetstr
+NCURSES_EXPORT(int) mvwgetstr (WINDOW * a1, int a2, int a3, char * z)
+{
+	T((T_CALLED("mvwgetstr(%p,%d,%d,%s)"), a1, a2, a3, _nc_visbuf2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : wgetnstr(a1, z, -1)));
+}
+
+
+#undef mvwhline
+NCURSES_EXPORT(int) mvwhline (WINDOW * a1, int a2, int a3, chtype a4, int z)
+{
+	T((T_CALLED("mvwhline(%p,%d,%d,%s,%d)"), a1, a2, a3, _tracechtype2(3,a4), z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : whline(a1,a4,z)));
+}
+
+
+#undef mvwinch
+NCURSES_EXPORT(chtype) mvwinch (WINDOW * a1, int a2, int z)
+{
+	T((T_CALLED("mvwinch(%p,%d,%d)"), a1, a2, z)); returnChar((wmove(a1,a2,z) == (-1) ? (chtype)((-1)) : winch(a1)));
+}
+
+
+#undef mvwinchnstr
+NCURSES_EXPORT(int) mvwinchnstr (WINDOW * a1, int a2, int a3, chtype * a4, int z)
+{
+	T((T_CALLED("mvwinchnstr(%p,%d,%d,%p,%d)"), a1, a2, a3, a4, z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winchnstr(a1,a4,z)));
+}
+
+
+#undef mvwinchstr
+NCURSES_EXPORT(int) mvwinchstr (WINDOW * a1, int a2, int a3, chtype * z)
+{
+	T((T_CALLED("mvwinchstr(%p,%d,%d,%p)"), a1, a2, a3, z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winchnstr(a1, z, -1)));
+}
+
+
+#undef mvwinnstr
+NCURSES_EXPORT(int) mvwinnstr (WINDOW * a1, int a2, int a3, char * a4, int z)
+{
+	return (wmove(a1,a2,a3) == (-1) ? (-1) : winnstr(a1,a4,z)) ;
+}
+
+
+#undef mvwinsch
+NCURSES_EXPORT(int) mvwinsch (WINDOW * a1, int a2, int a3, chtype z)
+{
+	T((T_CALLED("mvwinsch(%p,%d,%d,%s)"), a1, a2, a3, _tracechtype2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winsch(a1,z)));
+}
+
+
+#undef mvwinsnstr
+NCURSES_EXPORT(int) mvwinsnstr (WINDOW * a1, int a2, int a3, const char * a4, int z)
+{
+	T((T_CALLED("mvwinsnstr(%p,%d,%d,%s,%d)"), a1, a2, a3, _nc_visbuf2(3,a4), z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winsnstr(a1,a4,z)));
+}
+
+
+#undef mvwinsstr
+NCURSES_EXPORT(int) mvwinsstr (WINDOW * a1, int a2, int a3, const char * z)
+{
+	T((T_CALLED("mvwinsstr(%p,%d,%d,%s)"), a1, a2, a3, _nc_visbuf2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winsnstr(a1, z, -1)));
+}
+
+
+#undef mvwinstr
+NCURSES_EXPORT(int) mvwinstr (WINDOW * a1, int a2, int a3, char * z)
+{
+	T((T_CALLED("mvwinstr(%p,%d,%d,%s)"), a1, a2, a3, _nc_visbuf2(3,z))); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : winnstr(a1, z, -1)));
+}
+
+
+#undef mvwvline
+NCURSES_EXPORT(int) mvwvline (WINDOW * a1, int a2, int a3, chtype a4, int z)
+{
+	T((T_CALLED("mvwvline(%p,%d,%d,%s,%d)"), a1, a2, a3, _tracechtype2(3,a4), z)); returnCode((wmove(a1,a2,a3) == (-1) ? (-1) : wvline(a1,a4,z)));
+}
+
+
+#undef PAIR_NUMBER
+NCURSES_EXPORT(int) PAIR_NUMBER (int z)
+{
+	T((T_CALLED("PAIR_NUMBER(%d)"), z)); returnCode(((int)((((z) & ((((1UL) << 8) - 1UL) << ((0) + 8))) >> 8))));
+}
+
+
+#undef redrawwin
+NCURSES_EXPORT(int) redrawwin (WINDOW * z)
+{
+	T((T_CALLED("redrawwin(%p)"), z)); returnCode(wredrawln(z, 0, (z)->_maxy+1));
+}
+
+
+#undef refresh
+NCURSES_EXPORT(int) refresh (void)
+{
+	T((T_CALLED("refresh()"))); returnCode(wrefresh(stdscr));
+}
+
+
+#undef scrl
+NCURSES_EXPORT(int) scrl (int z)
+{
+	T((T_CALLED("scrl(%d)"), z)); returnCode(wscrl(stdscr,z));
+}
+
+
+#undef scroll
+NCURSES_EXPORT(int) scroll (WINDOW * z)
+{
+	T((T_CALLED("scroll(%p)"), z)); returnCode(wscrl(z,1));
+}
+
+
+#undef setscrreg
+NCURSES_EXPORT(int) setscrreg (int a1, int z)
+{
+	T((T_CALLED("setscrreg(%d,%d)"), a1, z)); returnCode(wsetscrreg(stdscr,a1,z));
+}
+
+
+#if USE_WIDEC_SUPPORT
+#undef slk_attr_off
+NCURSES_EXPORT(int) slk_attr_off (const attr_t a1, void * z)
+{
+	T((T_CALLED("slk_attr_off(%s,%p)"), _traceattr2(0,a1), z)); returnCode(((z) ? (-1) : slk_attroff(a1)));
+}
+#endif
+
+
+#if USE_WIDEC_SUPPORT
+#undef slk_attr_on
+NCURSES_EXPORT(int) slk_attr_on (attr_t a1, void * z)
+{
+	T((T_CALLED("slk_attr_on(%s,%p)"), _traceattr2(0,a1), z)); returnCode(((z) ? (-1) : slk_attron(a1)));
+}
+#endif
+
+
+#undef standout
+NCURSES_EXPORT(int) standout (void)
+{
+	T((T_CALLED("standout()"))); returnAttr((((stdscr)->_attrs = (((1UL) << ((8) + 8))))));
+}
+
+
+#undef standend
+NCURSES_EXPORT(int) standend (void)
+{
+	T((T_CALLED("standend()"))); returnAttr((((stdscr)->_attrs = ((1UL - 1UL)))));
+}
+
+
+#undef timeout
+NCURSES_EXPORT(void) timeout (int z)
+{
+	T((T_CALLED("timeout(%d)"), z)); wtimeout(stdscr,z);
+	returnVoid;
+}
+
+
+#undef touchline
+NCURSES_EXPORT(int) touchline (WINDOW * a1, int a2, int z)
+{
+	T((T_CALLED("touchline(%p,%d,%d)"), a1, a2, z)); returnCode(wtouchln((a1), a2, z, 1));
+}
+
+
+#undef touchwin
+NCURSES_EXPORT(int) touchwin (WINDOW * z)
+{
+	T((T_CALLED("touchwin(%p)"), z)); returnCode(wtouchln((z), 0, ((z)?((z)->_maxy + 1):(-1)), 1));
+}
+
+
+#undef untouchwin
+NCURSES_EXPORT(int) untouchwin (WINDOW * z)
+{
+	T((T_CALLED("untouchwin(%p)"), z)); returnCode(wtouchln((z), 0, ((z)?((z)->_maxy + 1):(-1)), 0));
+}
+
+
+#undef vline
+NCURSES_EXPORT(int) vline (chtype a1, int z)
+{
+	T((T_CALLED("vline(%s,%d)"), _tracechtype2(0,a1), z)); returnCode(wvline(stdscr, a1, z));
+}
+
+
+#undef vw_printw
+NCURSES_EXPORT(int) vw_printw (WINDOW * a1, const char * a2, va_list z)
+{
+	T((T_CALLED("vw_printw(%p,%s,%s)"), a1, _nc_visbuf2(1,a2), "va_list")); returnCode(vwprintw(a1, a2, z));
+}
+
+
+#undef vw_scanw
+NCURSES_EXPORT(int) vw_scanw (WINDOW * a1, char * a2, va_list z)
+{
+	T((T_CALLED("vw_scanw(%p,%s,%s)"), a1, _nc_visbuf2(1,a2), "va_list")); returnCode(vwscanw(a1, a2, z));
+}
+
+
+#undef waddchstr
+NCURSES_EXPORT(int) waddchstr (WINDOW * a1, const chtype * z)
+{
+	T((T_CALLED("waddchstr(%p,%p)"), a1, z)); returnCode(waddchnstr(a1,z,-1));
+}
+
+
+#undef waddstr
+NCURSES_EXPORT(int) waddstr (WINDOW * a1, const char * z)
+{
+	T((T_CALLED("waddstr(%p,%s)"), a1, _nc_visbuf2(1,z))); returnCode(waddnstr(a1,z,-1));
+}
+
+
+#undef wattron
+NCURSES_EXPORT(int) wattron (WINDOW * a1, int z)
+{
+	T((T_CALLED("wattron(%p,%d)"), a1, z)); returnCode(wattr_on(a1, (attr_t)(z), 0));
+}
+
+
+#undef wattroff
+NCURSES_EXPORT(int) wattroff (WINDOW * a1, int z)
+{
+	T((T_CALLED("wattroff(%p,%d)"), a1, z)); returnCode(wattr_off(a1, (attr_t)(z), 0));
+}
+
+
+#undef wattrset
+NCURSES_EXPORT(int) wattrset (WINDOW * a1, int z)
+{
+	T((T_CALLED("wattrset(%p,%d)"), a1, z)); returnAttr(((a1)->_attrs = (z)));
+}
+
+
+#undef wattr_get
+NCURSES_EXPORT(int) wattr_get (WINDOW * a1, attr_t * a2, short * a3, void * z)
+{
+	T((T_CALLED("wattr_get(%p,%p,%p,%p)"), a1, a2, a3, z)); returnCode(((void)((a2) != 0 && (*(a2) = (a1)->_attrs)), (void)((a3) != 0 && (*(a3) = ((int)(((((a1)->_attrs) & ((((1UL) << 8) - 1UL) << ((0) + 8))) >> 8))))), (0)));
+}
+
+
+#undef wattr_set
+NCURSES_EXPORT(int) wattr_set (WINDOW * a1, attr_t a2, short a3, void * z)
+{
+	T((T_CALLED("wattr_set(%p,%s,%d,%p)"), a1, _traceattr2(1,a2), a3, z)); returnCode(((a1)->_attrs = (((a2) & ~((((1UL) << 8) - 1UL) << ((0) + 8))) | ((a3) << ((0) + 8))), (0)));
+}
+
+
+#undef wdeleteln
+NCURSES_EXPORT(int) wdeleteln (WINDOW * z)
+{
+	T((T_CALLED("wdeleteln(%p)"), z)); returnCode(winsdelln(z,-1));
+}
+
+
+#undef wgetstr
+NCURSES_EXPORT(int) wgetstr (WINDOW * a1, char * z)
+{
+	T((T_CALLED("wgetstr(%p,%s)"), a1, _nc_visbuf2(1,z))); returnCode(wgetnstr(a1, z, -1));
+}
+
+
+#undef winchstr
+NCURSES_EXPORT(int) winchstr (WINDOW * a1, chtype * z)
+{
+	T((T_CALLED("winchstr(%p,%p)"), a1, z)); returnCode(winchnstr(a1, z, -1));
+}
+
+
+#undef winsertln
+NCURSES_EXPORT(int) winsertln (WINDOW * z)
+{
+	T((T_CALLED("winsertln(%p)"), z)); returnCode(winsdelln(z,1));
+}
+
+
+#undef winsstr
+NCURSES_EXPORT(int) winsstr (WINDOW * a1, const char * z)
+{
+	T((T_CALLED("winsstr(%p,%s)"), a1, _nc_visbuf2(1,z))); returnCode(winsnstr(a1, z, -1));
+}
+
+
+#undef winstr
+NCURSES_EXPORT(int) winstr (WINDOW * a1, char * z)
+{
+	T((T_CALLED("winstr(%p,%s)"), a1, _nc_visbuf2(1,z))); returnCode(winnstr(a1, z, -1));
+}
+
+
+#undef wstandout
+NCURSES_EXPORT(int) wstandout (WINDOW * z)
+{
+	T((T_CALLED("wstandout(%p)"), z)); returnAttr((((z)->_attrs = (((1UL) << ((8) + 8))))));
+}
+
+
+#undef wstandend
+NCURSES_EXPORT(int) wstandend (WINDOW * z)
+{
+	T((T_CALLED("wstandend(%p)"), z)); returnAttr((((z)->_attrs = ((1UL - 1UL)))));
+}
+
+
+#undef mouse_trafo
+NCURSES_EXPORT(_Bool) mouse_trafo (int * a1, int * a2, _Bool z)
+{
+	T((T_CALLED("mouse_trafo(%p,%p,%#lx)"), a1, a2, (long)z)); returnBool(wmouse_trafo(stdscr,a1,a2,z));
+}
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_keyname.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_keyname.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-lib_keyname.c	(revision 3073)
@@ -0,0 +1,235 @@
+/* generated by MKkeyname.awk */
+
+#include <curses.priv.h>
+#include <tic.h>
+#include <term_entry.h>
+
+const struct kn _nc_key_names[] = {
+	{ "KEY_A1", KEY_A1 },
+	{ "KEY_A3", KEY_A3 },
+	{ "KEY_B2", KEY_B2 },
+	{ "KEY_BACKSPACE", KEY_BACKSPACE },
+	{ "KEY_BEG", KEY_BEG },
+	{ "KEY_BREAK", KEY_BREAK },
+	{ "KEY_BTAB", KEY_BTAB },
+	{ "KEY_C1", KEY_C1 },
+	{ "KEY_C3", KEY_C3 },
+	{ "KEY_CANCEL", KEY_CANCEL },
+	{ "KEY_CATAB", KEY_CATAB },
+	{ "KEY_CLEAR", KEY_CLEAR },
+	{ "KEY_CLOSE", KEY_CLOSE },
+	{ "KEY_COMMAND", KEY_COMMAND },
+	{ "KEY_COPY", KEY_COPY },
+	{ "KEY_CREATE", KEY_CREATE },
+	{ "KEY_CTAB", KEY_CTAB },
+	{ "KEY_DC", KEY_DC },
+	{ "KEY_DL", KEY_DL },
+	{ "KEY_DOWN", KEY_DOWN },
+	{ "KEY_EIC", KEY_EIC },
+	{ "KEY_END", KEY_END },
+	{ "KEY_ENTER", KEY_ENTER },
+	{ "KEY_EOL", KEY_EOL },
+	{ "KEY_EOS", KEY_EOS },
+	{ "KEY_EXIT", KEY_EXIT },
+	{ "KEY_F(0)", KEY_F(0) },
+	{ "KEY_F(1)", KEY_F(1) },
+	{ "KEY_F(10)", KEY_F(10) },
+	{ "KEY_F(11)", KEY_F(11) },
+	{ "KEY_F(12)", KEY_F(12) },
+	{ "KEY_F(13)", KEY_F(13) },
+	{ "KEY_F(14)", KEY_F(14) },
+	{ "KEY_F(15)", KEY_F(15) },
+	{ "KEY_F(16)", KEY_F(16) },
+	{ "KEY_F(17)", KEY_F(17) },
+	{ "KEY_F(18)", KEY_F(18) },
+	{ "KEY_F(19)", KEY_F(19) },
+	{ "KEY_F(2)", KEY_F(2) },
+	{ "KEY_F(20)", KEY_F(20) },
+	{ "KEY_F(21)", KEY_F(21) },
+	{ "KEY_F(22)", KEY_F(22) },
+	{ "KEY_F(23)", KEY_F(23) },
+	{ "KEY_F(24)", KEY_F(24) },
+	{ "KEY_F(25)", KEY_F(25) },
+	{ "KEY_F(26)", KEY_F(26) },
+	{ "KEY_F(27)", KEY_F(27) },
+	{ "KEY_F(28)", KEY_F(28) },
+	{ "KEY_F(29)", KEY_F(29) },
+	{ "KEY_F(3)", KEY_F(3) },
+	{ "KEY_F(30)", KEY_F(30) },
+	{ "KEY_F(31)", KEY_F(31) },
+	{ "KEY_F(32)", KEY_F(32) },
+	{ "KEY_F(33)", KEY_F(33) },
+	{ "KEY_F(34)", KEY_F(34) },
+	{ "KEY_F(35)", KEY_F(35) },
+	{ "KEY_F(36)", KEY_F(36) },
+	{ "KEY_F(37)", KEY_F(37) },
+	{ "KEY_F(38)", KEY_F(38) },
+	{ "KEY_F(39)", KEY_F(39) },
+	{ "KEY_F(4)", KEY_F(4) },
+	{ "KEY_F(40)", KEY_F(40) },
+	{ "KEY_F(41)", KEY_F(41) },
+	{ "KEY_F(42)", KEY_F(42) },
+	{ "KEY_F(43)", KEY_F(43) },
+	{ "KEY_F(44)", KEY_F(44) },
+	{ "KEY_F(45)", KEY_F(45) },
+	{ "KEY_F(46)", KEY_F(46) },
+	{ "KEY_F(47)", KEY_F(47) },
+	{ "KEY_F(48)", KEY_F(48) },
+	{ "KEY_F(49)", KEY_F(49) },
+	{ "KEY_F(5)", KEY_F(5) },
+	{ "KEY_F(50)", KEY_F(50) },
+	{ "KEY_F(51)", KEY_F(51) },
+	{ "KEY_F(52)", KEY_F(52) },
+	{ "KEY_F(53)", KEY_F(53) },
+	{ "KEY_F(54)", KEY_F(54) },
+	{ "KEY_F(55)", KEY_F(55) },
+	{ "KEY_F(56)", KEY_F(56) },
+	{ "KEY_F(57)", KEY_F(57) },
+	{ "KEY_F(58)", KEY_F(58) },
+	{ "KEY_F(59)", KEY_F(59) },
+	{ "KEY_F(6)", KEY_F(6) },
+	{ "KEY_F(60)", KEY_F(60) },
+	{ "KEY_F(61)", KEY_F(61) },
+	{ "KEY_F(62)", KEY_F(62) },
+	{ "KEY_F(63)", KEY_F(63) },
+	{ "KEY_F(7)", KEY_F(7) },
+	{ "KEY_F(8)", KEY_F(8) },
+	{ "KEY_F(9)", KEY_F(9) },
+	{ "KEY_FIND", KEY_FIND },
+	{ "KEY_HELP", KEY_HELP },
+	{ "KEY_HOME", KEY_HOME },
+	{ "KEY_IC", KEY_IC },
+	{ "KEY_IL", KEY_IL },
+	{ "KEY_LEFT", KEY_LEFT },
+	{ "KEY_LL", KEY_LL },
+	{ "KEY_MARK", KEY_MARK },
+	{ "KEY_MESSAGE", KEY_MESSAGE },
+	{ "KEY_MOUSE", KEY_MOUSE },
+	{ "KEY_MOVE", KEY_MOVE },
+	{ "KEY_NEXT", KEY_NEXT },
+	{ "KEY_NPAGE", KEY_NPAGE },
+	{ "KEY_OPEN", KEY_OPEN },
+	{ "KEY_OPTIONS", KEY_OPTIONS },
+	{ "KEY_PPAGE", KEY_PPAGE },
+	{ "KEY_PREVIOUS", KEY_PREVIOUS },
+	{ "KEY_PRINT", KEY_PRINT },
+	{ "KEY_REDO", KEY_REDO },
+	{ "KEY_REFERENCE", KEY_REFERENCE },
+	{ "KEY_REFRESH", KEY_REFRESH },
+	{ "KEY_REPLACE", KEY_REPLACE },
+	{ "KEY_RESET", KEY_RESET },
+	{ "KEY_RESIZE", KEY_RESIZE },
+	{ "KEY_RESTART", KEY_RESTART },
+	{ "KEY_RESUME", KEY_RESUME },
+	{ "KEY_RIGHT", KEY_RIGHT },
+	{ "KEY_SAVE", KEY_SAVE },
+	{ "KEY_SBEG", KEY_SBEG },
+	{ "KEY_SCANCEL", KEY_SCANCEL },
+	{ "KEY_SCOMMAND", KEY_SCOMMAND },
+	{ "KEY_SCOPY", KEY_SCOPY },
+	{ "KEY_SCREATE", KEY_SCREATE },
+	{ "KEY_SDC", KEY_SDC },
+	{ "KEY_SDL", KEY_SDL },
+	{ "KEY_SELECT", KEY_SELECT },
+	{ "KEY_SEND", KEY_SEND },
+	{ "KEY_SEOL", KEY_SEOL },
+	{ "KEY_SEXIT", KEY_SEXIT },
+	{ "KEY_SF", KEY_SF },
+	{ "KEY_SFIND", KEY_SFIND },
+	{ "KEY_SHELP", KEY_SHELP },
+	{ "KEY_SHOME", KEY_SHOME },
+	{ "KEY_SIC", KEY_SIC },
+	{ "KEY_SLEFT", KEY_SLEFT },
+	{ "KEY_SMESSAGE", KEY_SMESSAGE },
+	{ "KEY_SMOVE", KEY_SMOVE },
+	{ "KEY_SNEXT", KEY_SNEXT },
+	{ "KEY_SOPTIONS", KEY_SOPTIONS },
+	{ "KEY_SPREVIOUS", KEY_SPREVIOUS },
+	{ "KEY_SPRINT", KEY_SPRINT },
+	{ "KEY_SR", KEY_SR },
+	{ "KEY_SREDO", KEY_SREDO },
+	{ "KEY_SREPLACE", KEY_SREPLACE },
+	{ "KEY_SRESET", KEY_SRESET },
+	{ "KEY_SRIGHT", KEY_SRIGHT },
+	{ "KEY_SRSUME", KEY_SRSUME },
+	{ "KEY_SSAVE", KEY_SSAVE },
+	{ "KEY_SSUSPEND", KEY_SSUSPEND },
+	{ "KEY_STAB", KEY_STAB },
+	{ "KEY_SUNDO", KEY_SUNDO },
+	{ "KEY_SUSPEND", KEY_SUSPEND },
+	{ "KEY_UNDO", KEY_UNDO },
+	{ "KEY_UP", KEY_UP },
+	{ 0, 0 }};
+
+NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)
+{
+	static char **table;
+	int i;
+	char name[20];
+	char *p;
+	NCURSES_CONST char *result = 0;
+
+	if (c == -1) {
+		result = "-1";
+	} else {
+		for (i = 0; _nc_key_names[i].name != 0; i++) {
+			if (_nc_key_names[i].code == c) {
+				result = (NCURSES_CONST char *)_nc_key_names[i].name;
+				break;
+			}
+		}
+
+		if (result == 0 && (c >= 0 && c < 256)) {
+			if (table == 0)
+				table = typeCalloc(char *, 256);
+			if (table != 0) {
+				if (table[c] == 0) {
+					p = name;
+					if (c >= 128) {
+						strcpy(p, "M-");
+						p += 2;
+						c -= 128;
+					}
+					if (c < 32)
+						sprintf(p, "^%c", c + '@');
+					else if (c == 127)
+						strcpy(p, "^?");
+					else
+						sprintf(p, "%c", c);
+					table[c] = strdup(name);
+				}
+				result = table[c];
+			}
+#if NCURSES_EXT_FUNCS && NCURSES_XNAMES
+		} else if (result == 0 && cur_term != 0) {
+			int j, k;
+			char * bound;
+			TERMTYPE *tp = &(cur_term->type);
+			int save_trace = _nc_tracing;
+
+			_nc_tracing = 0;	/* prevent recursion via keybound() */
+			for (j = 0; (bound = keybound(c, j)) != 0; ++j) {
+				for(k = STRCOUNT; k < NUM_STRINGS(tp);  k++) {
+					if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {
+						result = ExtStrname(tp, k, strnames);
+						break;
+					}
+				}
+				if (result != 0)
+					break;
+			}
+			_nc_tracing = save_trace;
+#endif
+		}
+	}
+	return result;
+}
+
+#if USE_WIDEC_SUPPORT
+NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)
+{
+	NCURSES_CONST char *result = keyname((int)c);
+	if (!strncmp(result, "M-", 2)) result = 0;
+	return result;
+}
+#endif
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-names.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-names.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-names.c	(revision 3073)
@@ -0,0 +1,1045 @@
+/* This file was generated by MKnames.awk */
+
+#include <curses.priv.h>
+
+#define IT NCURSES_CONST char * const
+
+#if BROKEN_LINKER
+#include <term.h>
+#define DCL(it) static IT data##it[]
+#else
+#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]
+#endif
+
+/*
+ *	names.c - Arrays of capability names and codes
+ *
+ */
+
+DCL(boolnames)  = {
+		"bw",
+		"am",
+		"xsb",
+		"xhp",
+		"xenl",
+		"eo",
+		"gn",
+		"hc",
+		"km",
+		"hs",
+		"in",
+		"da",
+		"db",
+		"mir",
+		"msgr",
+		"os",
+		"eslok",
+		"xt",
+		"hz",
+		"ul",
+		"xon",
+		"nxon",
+		"mc5i",
+		"chts",
+		"nrrmc",
+		"npc",
+		"ndscr",
+		"ccc",
+		"bce",
+		"hls",
+		"xhpa",
+		"crxm",
+		"daisy",
+		"xvpa",
+		"sam",
+		"cpix",
+		"lpix",
+		"OTbs",
+		"OTns",
+		"OTnc",
+		"OTMT",
+		"OTNL",
+		"OTpt",
+		"OTxr",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(boolfnames) = {
+		"auto_left_margin",
+		"auto_right_margin",
+		"no_esc_ctlc",
+		"ceol_standout_glitch",
+		"eat_newline_glitch",
+		"erase_overstrike",
+		"generic_type",
+		"hard_copy",
+		"has_meta_key",
+		"has_status_line",
+		"insert_null_glitch",
+		"memory_above",
+		"memory_below",
+		"move_insert_mode",
+		"move_standout_mode",
+		"over_strike",
+		"status_line_esc_ok",
+		"dest_tabs_magic_smso",
+		"tilde_glitch",
+		"transparent_underline",
+		"xon_xoff",
+		"needs_xon_xoff",
+		"prtr_silent",
+		"hard_cursor",
+		"non_rev_rmcup",
+		"no_pad_char",
+		"non_dest_scroll_region",
+		"can_change",
+		"back_color_erase",
+		"hue_lightness_saturation",
+		"col_addr_glitch",
+		"cr_cancels_micro_mode",
+		"has_print_wheel",
+		"row_addr_glitch",
+		"semi_auto_right_margin",
+		"cpi_changes_res",
+		"lpi_changes_res",
+		"backspaces_with_bs",
+		"crt_no_scrolling",
+		"no_correctly_working_cr",
+		"gnu_has_meta_key",
+		"linefeed_is_newline",
+		"has_hardware_tabs",
+		"return_does_clr_eol",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(numnames)   = {
+		"cols",
+		"it",
+		"lines",
+		"lm",
+		"xmc",
+		"pb",
+		"vt",
+		"wsl",
+		"nlab",
+		"lh",
+		"lw",
+		"ma",
+		"wnum",
+		"colors",
+		"pairs",
+		"ncv",
+		"bufsz",
+		"spinv",
+		"spinh",
+		"maddr",
+		"mjump",
+		"mcs",
+		"mls",
+		"npins",
+		"orc",
+		"orl",
+		"orhi",
+		"orvi",
+		"cps",
+		"widcs",
+		"btns",
+		"bitwin",
+		"bitype",
+		"OTug",
+		"OTdC",
+		"OTdN",
+		"OTdB",
+		"OTdT",
+		"OTkn",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(numfnames)  = {
+		"columns",
+		"init_tabs",
+		"lines",
+		"lines_of_memory",
+		"magic_cookie_glitch",
+		"padding_baud_rate",
+		"virtual_terminal",
+		"width_status_line",
+		"num_labels",
+		"label_height",
+		"label_width",
+		"max_attributes",
+		"maximum_windows",
+		"max_colors",
+		"max_pairs",
+		"no_color_video",
+		"buffer_capacity",
+		"dot_vert_spacing",
+		"dot_horz_spacing",
+		"max_micro_address",
+		"max_micro_jump",
+		"micro_col_size",
+		"micro_line_size",
+		"number_of_pins",
+		"output_res_char",
+		"output_res_line",
+		"output_res_horz_inch",
+		"output_res_vert_inch",
+		"print_rate",
+		"wide_char_size",
+		"buttons",
+		"bit_image_entwining",
+		"bit_image_type",
+		"magic_cookie_glitch_ul",
+		"carriage_return_delay",
+		"new_line_delay",
+		"backspace_delay",
+		"horizontal_tab_delay",
+		"number_of_function_keys",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(strnames)   = {
+		"cbt",
+		"bel",
+		"cr",
+		"csr",
+		"tbc",
+		"clear",
+		"el",
+		"ed",
+		"hpa",
+		"cmdch",
+		"cup",
+		"cud1",
+		"home",
+		"civis",
+		"cub1",
+		"mrcup",
+		"cnorm",
+		"cuf1",
+		"ll",
+		"cuu1",
+		"cvvis",
+		"dch1",
+		"dl1",
+		"dsl",
+		"hd",
+		"smacs",
+		"blink",
+		"bold",
+		"smcup",
+		"smdc",
+		"dim",
+		"smir",
+		"invis",
+		"prot",
+		"rev",
+		"smso",
+		"smul",
+		"ech",
+		"rmacs",
+		"sgr0",
+		"rmcup",
+		"rmdc",
+		"rmir",
+		"rmso",
+		"rmul",
+		"flash",
+		"ff",
+		"fsl",
+		"is1",
+		"is2",
+		"is3",
+		"if",
+		"ich1",
+		"il1",
+		"ip",
+		"kbs",
+		"ktbc",
+		"kclr",
+		"kctab",
+		"kdch1",
+		"kdl1",
+		"kcud1",
+		"krmir",
+		"kel",
+		"ked",
+		"kf0",
+		"kf1",
+		"kf10",
+		"kf2",
+		"kf3",
+		"kf4",
+		"kf5",
+		"kf6",
+		"kf7",
+		"kf8",
+		"kf9",
+		"khome",
+		"kich1",
+		"kil1",
+		"kcub1",
+		"kll",
+		"knp",
+		"kpp",
+		"kcuf1",
+		"kind",
+		"kri",
+		"khts",
+		"kcuu1",
+		"rmkx",
+		"smkx",
+		"lf0",
+		"lf1",
+		"lf10",
+		"lf2",
+		"lf3",
+		"lf4",
+		"lf5",
+		"lf6",
+		"lf7",
+		"lf8",
+		"lf9",
+		"rmm",
+		"smm",
+		"nel",
+		"pad",
+		"dch",
+		"dl",
+		"cud",
+		"ich",
+		"indn",
+		"il",
+		"cub",
+		"cuf",
+		"rin",
+		"cuu",
+		"pfkey",
+		"pfloc",
+		"pfx",
+		"mc0",
+		"mc4",
+		"mc5",
+		"rep",
+		"rs1",
+		"rs2",
+		"rs3",
+		"rf",
+		"rc",
+		"vpa",
+		"sc",
+		"ind",
+		"ri",
+		"sgr",
+		"hts",
+		"wind",
+		"ht",
+		"tsl",
+		"uc",
+		"hu",
+		"iprog",
+		"ka1",
+		"ka3",
+		"kb2",
+		"kc1",
+		"kc3",
+		"mc5p",
+		"rmp",
+		"acsc",
+		"pln",
+		"kcbt",
+		"smxon",
+		"rmxon",
+		"smam",
+		"rmam",
+		"xonc",
+		"xoffc",
+		"enacs",
+		"smln",
+		"rmln",
+		"kbeg",
+		"kcan",
+		"kclo",
+		"kcmd",
+		"kcpy",
+		"kcrt",
+		"kend",
+		"kent",
+		"kext",
+		"kfnd",
+		"khlp",
+		"kmrk",
+		"kmsg",
+		"kmov",
+		"knxt",
+		"kopn",
+		"kopt",
+		"kprv",
+		"kprt",
+		"krdo",
+		"kref",
+		"krfr",
+		"krpl",
+		"krst",
+		"kres",
+		"ksav",
+		"kspd",
+		"kund",
+		"kBEG",
+		"kCAN",
+		"kCMD",
+		"kCPY",
+		"kCRT",
+		"kDC",
+		"kDL",
+		"kslt",
+		"kEND",
+		"kEOL",
+		"kEXT",
+		"kFND",
+		"kHLP",
+		"kHOM",
+		"kIC",
+		"kLFT",
+		"kMSG",
+		"kMOV",
+		"kNXT",
+		"kOPT",
+		"kPRV",
+		"kPRT",
+		"kRDO",
+		"kRPL",
+		"kRIT",
+		"kRES",
+		"kSAV",
+		"kSPD",
+		"kUND",
+		"rfi",
+		"kf11",
+		"kf12",
+		"kf13",
+		"kf14",
+		"kf15",
+		"kf16",
+		"kf17",
+		"kf18",
+		"kf19",
+		"kf20",
+		"kf21",
+		"kf22",
+		"kf23",
+		"kf24",
+		"kf25",
+		"kf26",
+		"kf27",
+		"kf28",
+		"kf29",
+		"kf30",
+		"kf31",
+		"kf32",
+		"kf33",
+		"kf34",
+		"kf35",
+		"kf36",
+		"kf37",
+		"kf38",
+		"kf39",
+		"kf40",
+		"kf41",
+		"kf42",
+		"kf43",
+		"kf44",
+		"kf45",
+		"kf46",
+		"kf47",
+		"kf48",
+		"kf49",
+		"kf50",
+		"kf51",
+		"kf52",
+		"kf53",
+		"kf54",
+		"kf55",
+		"kf56",
+		"kf57",
+		"kf58",
+		"kf59",
+		"kf60",
+		"kf61",
+		"kf62",
+		"kf63",
+		"el1",
+		"mgc",
+		"smgl",
+		"smgr",
+		"fln",
+		"sclk",
+		"dclk",
+		"rmclk",
+		"cwin",
+		"wingo",
+		"hup",
+		"dial",
+		"qdial",
+		"tone",
+		"pulse",
+		"hook",
+		"pause",
+		"wait",
+		"u0",
+		"u1",
+		"u2",
+		"u3",
+		"u4",
+		"u5",
+		"u6",
+		"u7",
+		"u8",
+		"u9",
+		"op",
+		"oc",
+		"initc",
+		"initp",
+		"scp",
+		"setf",
+		"setb",
+		"cpi",
+		"lpi",
+		"chr",
+		"cvr",
+		"defc",
+		"swidm",
+		"sdrfq",
+		"sitm",
+		"slm",
+		"smicm",
+		"snlq",
+		"snrmq",
+		"sshm",
+		"ssubm",
+		"ssupm",
+		"sum",
+		"rwidm",
+		"ritm",
+		"rlm",
+		"rmicm",
+		"rshm",
+		"rsubm",
+		"rsupm",
+		"rum",
+		"mhpa",
+		"mcud1",
+		"mcub1",
+		"mcuf1",
+		"mvpa",
+		"mcuu1",
+		"porder",
+		"mcud",
+		"mcub",
+		"mcuf",
+		"mcuu",
+		"scs",
+		"smgb",
+		"smgbp",
+		"smglp",
+		"smgrp",
+		"smgt",
+		"smgtp",
+		"sbim",
+		"scsd",
+		"rbim",
+		"rcsd",
+		"subcs",
+		"supcs",
+		"docr",
+		"zerom",
+		"csnm",
+		"kmous",
+		"minfo",
+		"reqmp",
+		"getm",
+		"setaf",
+		"setab",
+		"pfxl",
+		"devt",
+		"csin",
+		"s0ds",
+		"s1ds",
+		"s2ds",
+		"s3ds",
+		"smglr",
+		"smgtb",
+		"birep",
+		"binel",
+		"bicr",
+		"colornm",
+		"defbi",
+		"endbi",
+		"setcolor",
+		"slines",
+		"dispc",
+		"smpch",
+		"rmpch",
+		"smsc",
+		"rmsc",
+		"pctrm",
+		"scesc",
+		"scesa",
+		"ehhlm",
+		"elhlm",
+		"elohlm",
+		"erhlm",
+		"ethlm",
+		"evhlm",
+		"sgr1",
+		"slength",
+		"OTi2",
+		"OTrs",
+		"OTnl",
+		"OTbc",
+		"OTko",
+		"OTma",
+		"OTG2",
+		"OTG3",
+		"OTG1",
+		"OTG4",
+		"OTGR",
+		"OTGL",
+		"OTGU",
+		"OTGD",
+		"OTGH",
+		"OTGV",
+		"OTGC",
+		"meml",
+		"memu",
+		"box1",
+		(NCURSES_CONST char *)0,
+};
+
+DCL(strfnames)  = {
+		"back_tab",
+		"bell",
+		"carriage_return",
+		"change_scroll_region",
+		"clear_all_tabs",
+		"clear_screen",
+		"clr_eol",
+		"clr_eos",
+		"column_address",
+		"command_character",
+		"cursor_address",
+		"cursor_down",
+		"cursor_home",
+		"cursor_invisible",
+		"cursor_left",
+		"cursor_mem_address",
+		"cursor_normal",
+		"cursor_right",
+		"cursor_to_ll",
+		"cursor_up",
+		"cursor_visible",
+		"delete_character",
+		"delete_line",
+		"dis_status_line",
+		"down_half_line",
+		"enter_alt_charset_mode",
+		"enter_blink_mode",
+		"enter_bold_mode",
+		"enter_ca_mode",
+		"enter_delete_mode",
+		"enter_dim_mode",
+		"enter_insert_mode",
+		"enter_secure_mode",
+		"enter_protected_mode",
+		"enter_reverse_mode",
+		"enter_standout_mode",
+		"enter_underline_mode",
+		"erase_chars",
+		"exit_alt_charset_mode",
+		"exit_attribute_mode",
+		"exit_ca_mode",
+		"exit_delete_mode",
+		"exit_insert_mode",
+		"exit_standout_mode",
+		"exit_underline_mode",
+		"flash_screen",
+		"form_feed",
+		"from_status_line",
+		"init_1string",
+		"init_2string",
+		"init_3string",
+		"init_file",
+		"insert_character",
+		"insert_line",
+		"insert_padding",
+		"key_backspace",
+		"key_catab",
+		"key_clear",
+		"key_ctab",
+		"key_dc",
+		"key_dl",
+		"key_down",
+		"key_eic",
+		"key_eol",
+		"key_eos",
+		"key_f0",
+		"key_f1",
+		"key_f10",
+		"key_f2",
+		"key_f3",
+		"key_f4",
+		"key_f5",
+		"key_f6",
+		"key_f7",
+		"key_f8",
+		"key_f9",
+		"key_home",
+		"key_ic",
+		"key_il",
+		"key_left",
+		"key_ll",
+		"key_npage",
+		"key_ppage",
+		"key_right",
+		"key_sf",
+		"key_sr",
+		"key_stab",
+		"key_up",
+		"keypad_local",
+		"keypad_xmit",
+		"lab_f0",
+		"lab_f1",
+		"lab_f10",
+		"lab_f2",
+		"lab_f3",
+		"lab_f4",
+		"lab_f5",
+		"lab_f6",
+		"lab_f7",
+		"lab_f8",
+		"lab_f9",
+		"meta_off",
+		"meta_on",
+		"newline",
+		"pad_char",
+		"parm_dch",
+		"parm_delete_line",
+		"parm_down_cursor",
+		"parm_ich",
+		"parm_index",
+		"parm_insert_line",
+		"parm_left_cursor",
+		"parm_right_cursor",
+		"parm_rindex",
+		"parm_up_cursor",
+		"pkey_key",
+		"pkey_local",
+		"pkey_xmit",
+		"print_screen",
+		"prtr_off",
+		"prtr_on",
+		"repeat_char",
+		"reset_1string",
+		"reset_2string",
+		"reset_3string",
+		"reset_file",
+		"restore_cursor",
+		"row_address",
+		"save_cursor",
+		"scroll_forward",
+		"scroll_reverse",
+		"set_attributes",
+		"set_tab",
+		"set_window",
+		"tab",
+		"to_status_line",
+		"underline_char",
+		"up_half_line",
+		"init_prog",
+		"key_a1",
+		"key_a3",
+		"key_b2",
+		"key_c1",
+		"key_c3",
+		"prtr_non",
+		"char_padding",
+		"acs_chars",
+		"plab_norm",
+		"key_btab",
+		"enter_xon_mode",
+		"exit_xon_mode",
+		"enter_am_mode",
+		"exit_am_mode",
+		"xon_character",
+		"xoff_character",
+		"ena_acs",
+		"label_on",
+		"label_off",
+		"key_beg",
+		"key_cancel",
+		"key_close",
+		"key_command",
+		"key_copy",
+		"key_create",
+		"key_end",
+		"key_enter",
+		"key_exit",
+		"key_find",
+		"key_help",
+		"key_mark",
+		"key_message",
+		"key_move",
+		"key_next",
+		"key_open",
+		"key_options",
+		"key_previous",
+		"key_print",
+		"key_redo",
+		"key_reference",
+		"key_refresh",
+		"key_replace",
+		"key_restart",
+		"key_resume",
+		"key_save",
+		"key_suspend",
+		"key_undo",
+		"key_sbeg",
+		"key_scancel",
+		"key_scommand",
+		"key_scopy",
+		"key_screate",
+		"key_sdc",
+		"key_sdl",
+		"key_select",
+		"key_send",
+		"key_seol",
+		"key_sexit",
+		"key_sfind",
+		"key_shelp",
+		"key_shome",
+		"key_sic",
+		"key_sleft",
+		"key_smessage",
+		"key_smove",
+		"key_snext",
+		"key_soptions",
+		"key_sprevious",
+		"key_sprint",
+		"key_sredo",
+		"key_sreplace",
+		"key_sright",
+		"key_srsume",
+		"key_ssave",
+		"key_ssuspend",
+		"key_sundo",
+		"req_for_input",
+		"key_f11",
+		"key_f12",
+		"key_f13",
+		"key_f14",
+		"key_f15",
+		"key_f16",
+		"key_f17",
+		"key_f18",
+		"key_f19",
+		"key_f20",
+		"key_f21",
+		"key_f22",
+		"key_f23",
+		"key_f24",
+		"key_f25",
+		"key_f26",
+		"key_f27",
+		"key_f28",
+		"key_f29",
+		"key_f30",
+		"key_f31",
+		"key_f32",
+		"key_f33",
+		"key_f34",
+		"key_f35",
+		"key_f36",
+		"key_f37",
+		"key_f38",
+		"key_f39",
+		"key_f40",
+		"key_f41",
+		"key_f42",
+		"key_f43",
+		"key_f44",
+		"key_f45",
+		"key_f46",
+		"key_f47",
+		"key_f48",
+		"key_f49",
+		"key_f50",
+		"key_f51",
+		"key_f52",
+		"key_f53",
+		"key_f54",
+		"key_f55",
+		"key_f56",
+		"key_f57",
+		"key_f58",
+		"key_f59",
+		"key_f60",
+		"key_f61",
+		"key_f62",
+		"key_f63",
+		"clr_bol",
+		"clear_margins",
+		"set_left_margin",
+		"set_right_margin",
+		"label_format",
+		"set_clock",
+		"display_clock",
+		"remove_clock",
+		"create_window",
+		"goto_window",
+		"hangup",
+		"dial_phone",
+		"quick_dial",
+		"tone",
+		"pulse",
+		"flash_hook",
+		"fixed_pause",
+		"wait_tone",
+		"user0",
+		"user1",
+		"user2",
+		"user3",
+		"user4",
+		"user5",
+		"user6",
+		"user7",
+		"user8",
+		"user9",
+		"orig_pair",
+		"orig_colors",
+		"initialize_color",
+		"initialize_pair",
+		"set_color_pair",
+		"set_foreground",
+		"set_background",
+		"change_char_pitch",
+		"change_line_pitch",
+		"change_res_horz",
+		"change_res_vert",
+		"define_char",
+		"enter_doublewide_mode",
+		"enter_draft_quality",
+		"enter_italics_mode",
+		"enter_leftward_mode",
+		"enter_micro_mode",
+		"enter_near_letter_quality",
+		"enter_normal_quality",
+		"enter_shadow_mode",
+		"enter_subscript_mode",
+		"enter_superscript_mode",
+		"enter_upward_mode",
+		"exit_doublewide_mode",
+		"exit_italics_mode",
+		"exit_leftward_mode",
+		"exit_micro_mode",
+		"exit_shadow_mode",
+		"exit_subscript_mode",
+		"exit_superscript_mode",
+		"exit_upward_mode",
+		"micro_column_address",
+		"micro_down",
+		"micro_left",
+		"micro_right",
+		"micro_row_address",
+		"micro_up",
+		"order_of_pins",
+		"parm_down_micro",
+		"parm_left_micro",
+		"parm_right_micro",
+		"parm_up_micro",
+		"select_char_set",
+		"set_bottom_margin",
+		"set_bottom_margin_parm",
+		"set_left_margin_parm",
+		"set_right_margin_parm",
+		"set_top_margin",
+		"set_top_margin_parm",
+		"start_bit_image",
+		"start_char_set_def",
+		"stop_bit_image",
+		"stop_char_set_def",
+		"subscript_characters",
+		"superscript_characters",
+		"these_cause_cr",
+		"zero_motion",
+		"char_set_names",
+		"key_mouse",
+		"mouse_info",
+		"req_mouse_pos",
+		"get_mouse",
+		"set_a_foreground",
+		"set_a_background",
+		"pkey_plab",
+		"device_type",
+		"code_set_init",
+		"set0_des_seq",
+		"set1_des_seq",
+		"set2_des_seq",
+		"set3_des_seq",
+		"set_lr_margin",
+		"set_tb_margin",
+		"bit_image_repeat",
+		"bit_image_newline",
+		"bit_image_carriage_return",
+		"color_names",
+		"define_bit_image_region",
+		"end_bit_image_region",
+		"set_color_band",
+		"set_page_length",
+		"display_pc_char",
+		"enter_pc_charset_mode",
+		"exit_pc_charset_mode",
+		"enter_scancode_mode",
+		"exit_scancode_mode",
+		"pc_term_options",
+		"scancode_escape",
+		"alt_scancode_esc",
+		"enter_horizontal_hl_mode",
+		"enter_left_hl_mode",
+		"enter_low_hl_mode",
+		"enter_right_hl_mode",
+		"enter_top_hl_mode",
+		"enter_vertical_hl_mode",
+		"set_a_attributes",
+		"set_pglen_inch",
+		"termcap_init2",
+		"termcap_reset",
+		"linefeed_if_not_lf",
+		"backspace_if_not_bs",
+		"other_non_function_keys",
+		"arrow_key_map",
+		"acs_ulcorner",
+		"acs_llcorner",
+		"acs_urcorner",
+		"acs_lrcorner",
+		"acs_ltee",
+		"acs_rtee",
+		"acs_btee",
+		"acs_ttee",
+		"acs_hline",
+		"acs_vline",
+		"acs_plus",
+		"memory_lock",
+		"memory_unlock",
+		"box_chars_1",
+		(NCURSES_CONST char *)0,
+};
+
+#if BROKEN_LINKER
+#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }
+FIX(boolnames)
+FIX(boolfnames)
+FIX(numnames)
+FIX(numfnames)
+FIX(strnames)
+FIX(strfnames)
+#endif /* BROKEN_LINKER */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_cfg.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_cfg.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_cfg.h	(revision 3073)
@@ -0,0 +1,180 @@
+/* include/ncurses_cfg.h.  Generated by configure.  */
+/****************************************************************************
+ * Copyright (c) 1998-2004,2005 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"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ ****************************************************************************/
+/*
+ * $Id$
+ *
+ * This is a template-file used to generate the "ncurses_cfg.h" file.
+ *
+ * Rather than list every definition, the configuration script substitutes the
+ * definitions that it finds using 'sed'.  You need a patch (original date
+ * 971222) to autoconf 2.12 or 2.13 to do this.
+ *
+ * See:
+ *	http://invisible-island.net/autoconf/
+ *	ftp://invisible-island.net/autoconf/
+ */
+#ifndef NC_CONFIG_H
+#define NC_CONFIG_H
+
+/* stupid - start */
+#define CC_HAS_INLINE_FUNCS 1
+#define CC_HAS_PROTOS 1
+#define CPP_HAS_STATIC_CAST 1
+#define GCC_NORETURN __attribute__((noreturn))
+#define GCC_PRINTF 1
+#define GCC_SCANF 1
+#define GCC_UNUSED __attribute__((unused))
+#define HAVE_BIG_CORE 1
+#define HAVE_CURSES_VERSION 1
+#define HAVE_DIRENT_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_FORM_H 1
+#define HAVE_GETCWD 1
+#define HAVE_GETEGID 1
+#define HAVE_GETEUID 1
+#define HAVE_GETOPT_H 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_HAS_KEY 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_ISASCII 1
+#define HAVE_ISSETUGID 1
+#define HAVE_LANGINFO_CODESET 1
+#define HAVE_LIBFORM 1
+#define HAVE_LIBMENU 1
+#define HAVE_LIBPANEL 1
+#define HAVE_LIMITS_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_LONG_FILE_NAMES 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MENU_H 1
+#define HAVE_MKSTEMP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_NC_ALLOC_H 1
+#define HAVE_PANEL_H 1
+#define HAVE_REGEX_H_FUNCS 1
+#define HAVE_REMOVE 1
+#define HAVE_REMOVE 1
+#define HAVE_RESIZETERM 1
+#define HAVE_RESIZE_TERM 1
+#define HAVE_SELECT 1
+#define HAVE_SETBUF 1
+#define HAVE_SETBUFFER 1
+#define HAVE_SETVBUF 1
+#define HAVE_SIGACTION 1
+#define HAVE_SIGVEC 1
+#define HAVE_SLK_COLOR 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRDUP 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRSTR 1
+#define HAVE_SYMLINK 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIME_SELECT 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_TCGETATTR 1
+#define HAVE_TCGETPGRP 1
+#define HAVE_TERMIOS_H 1
+#define HAVE_TERMIO_H 1
+#define HAVE_TIMES 1
+#define HAVE_TYPEINFO 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNLINK 1
+#define HAVE_USE_DEFAULT_COLORS 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_VSSCANF 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_WRESIZE 1
+#define NCURSES_EXT_FUNCS 1
+#define NCURSES_NO_PADDING 1
+#define NCURSES_PATHSEP ';'
+#define NCURSES_VERSION_STRING "5.5.20051010"
+#define NDEBUG 1
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME ""
+#define PACKAGE_STRING ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_VERSION ""
+#define PROG_EXT ".exe"
+#define PROTOTYPES 1
+#define PURE_TERMINFO 1
+#define RETSIGTYPE void
+#define STDC_HEADERS 1
+#define STDC_HEADERS 1
+#define SYSTEM_NAME "os2-emx"
+#define TERMINFO "/@unixroot/usr/share/terminfo"
+#define TERMINFO_DIRS "/@unixroot/usr/share/terminfo"
+#define TIME_WITH_SYS_TIME 1
+#define TYPEOF_CHTYPE long
+#define USE_ASSUMED_COLOR 1
+#define USE_DATABASE 1
+#define USE_HASHMAP 1
+#define USE_HOME_TERMINFO 1
+#define USE_ROOT_ENVIRON 1
+#define USE_SIGWINCH 1
+#define USE_SYMLINKS 1
+#define __PROTOTYPES 1
+/* stupid - end */
+
+#include <ncurses_def.h>
+
+	/* The C compiler may not treat these properly but C++ has to */
+#ifdef __cplusplus
+/* #undef const */
+/* #undef inline */
+#else
+#if defined(lint) || defined(TRACE)
+/* #undef inline */
+#define inline /* nothing */
+#endif
+#endif
+
+	/* On HP-UX, the C compiler doesn't grok mbstate_t without
+	   -D_XOPEN_SOURCE=500. However, this causes problems on
+	   IRIX. So, we #define mbstate_t to int in configure.in
+	   only for the C compiler if needed. */
+#ifndef __cplusplus
+#ifdef NEED_MBSTATE_T_DEF
+#define mbstate_t int
+#endif
+#endif
+
+#endif /* NC_CONFIG_H */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_def.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_def.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-ncurses_def.h	(revision 3073)
@@ -0,0 +1,604 @@
+/*
+ * This file is generated by D:/coding/libc/svn/trunk/essentials/sys-libs/ncurses/include/MKncurses_def.sh
+ */
+
+#ifndef NC_DEFINE_H
+#define NC_DEFINE_H 1
+
+#ifndef BROKEN_LINKER
+#define BROKEN_LINKER 0
+#endif
+
+#ifndef BSD_TPUTS
+#define BSD_TPUTS 0
+#endif
+
+#ifndef CC_HAS_INLINE_FUNCS
+#define CC_HAS_INLINE_FUNCS 0
+#endif
+
+#ifndef CC_HAS_PROTOS
+#define CC_HAS_PROTOS 0
+#endif
+
+#ifndef CPP_HAS_PARAM_INIT
+#define CPP_HAS_PARAM_INIT 0
+#endif
+
+#ifndef CPP_HAS_VSCAN_FUNC
+#define CPP_HAS_VSCAN_FUNC 0
+#endif
+
+#ifndef CURSES_ACS_ARRAY
+#define CURSES_ACS_ARRAY acs_map
+#endif
+
+#ifndef CURSES_WACS_ARRAY
+#define CURSES_WACS_ARRAY _nc_wacs
+#endif
+
+#ifndef DECL_ERRNO
+#define DECL_ERRNO 0
+#endif
+
+#ifndef ETIP_NEEDS_MATH_H
+#define ETIP_NEEDS_MATH_H 0
+#endif
+
+#ifndef GCC_NORETURN
+#define GCC_NORETURN /* nothing */
+#endif
+
+#ifndef GCC_UNUSED
+#define GCC_UNUSED /* nothing */
+#endif
+
+#ifndef HAVE_BIG_CORE
+#define HAVE_BIG_CORE 0
+#endif
+
+#ifndef HAVE_BSD_CGETENT
+#define HAVE_BSD_CGETENT 0
+#endif
+
+#ifndef HAVE_BSD_SIGNAL_H
+#define HAVE_BSD_SIGNAL_H 0
+#endif
+
+#ifndef HAVE_BTOWC
+#define HAVE_BTOWC 0
+#endif
+
+#ifndef HAVE_BUILTIN_H
+#define HAVE_BUILTIN_H 0
+#endif
+
+#ifndef HAVE_DIRENT_H
+#define HAVE_DIRENT_H 0
+#endif
+
+#ifndef HAVE_ERRNO
+#define HAVE_ERRNO 0
+#endif
+
+#ifndef HAVE_FCNTL_H
+#define HAVE_FCNTL_H 0
+#endif
+
+#ifndef HAVE_FORM_H
+#define HAVE_FORM_H 0
+#endif
+
+#ifndef HAVE_GETCWD
+#define HAVE_GETCWD 0
+#endif
+
+#ifndef HAVE_GETEGID
+#define HAVE_GETEGID 0
+#endif
+
+#ifndef HAVE_GETEUID
+#define HAVE_GETEUID 0
+#endif
+
+#ifndef HAVE_GETNSTR
+#define HAVE_GETNSTR 0
+#endif
+
+#ifndef HAVE_GETOPT_H
+#define HAVE_GETOPT_H 0
+#endif
+
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY 0
+#endif
+
+#ifndef HAVE_GETTTYNAM
+#define HAVE_GETTTYNAM 0
+#endif
+
+#ifndef HAVE_GPM_H
+#define HAVE_GPM_H 0
+#endif
+
+#ifndef HAVE_GPP_BUILTIN_H
+#define HAVE_GPP_BUILTIN_H 0
+#endif
+
+#ifndef HAVE_GXX_BUILTIN_H
+#define HAVE_GXX_BUILTIN_H 0
+#endif
+
+#ifndef HAVE_HAS_KEY
+#define HAVE_HAS_KEY 0
+#endif
+
+#ifndef HAVE_ISASCII
+#define HAVE_ISASCII 0
+#endif
+
+#ifndef HAVE_ISSETUGID
+#define HAVE_ISSETUGID 0
+#endif
+
+#ifndef HAVE_LANGINFO_CODESET
+#define HAVE_LANGINFO_CODESET 0
+#endif
+
+#ifndef HAVE_LIBC_H
+#define HAVE_LIBC_H 0
+#endif
+
+#ifndef HAVE_LIBDBMALLOC
+#define HAVE_LIBDBMALLOC 0
+#endif
+
+#ifndef HAVE_LIBDMALLOC
+#define HAVE_LIBDMALLOC 0
+#endif
+
+#ifndef HAVE_LIBFORM
+#define HAVE_LIBFORM 0
+#endif
+
+#ifndef HAVE_LIBGPM
+#define HAVE_LIBGPM 0
+#endif
+
+#ifndef HAVE_LIBMENU
+#define HAVE_LIBMENU 0
+#endif
+
+#ifndef HAVE_LIBMPATROL
+#define HAVE_LIBMPATROL 0
+#endif
+
+#ifndef HAVE_LIBPANEL
+#define HAVE_LIBPANEL 0
+#endif
+
+#ifndef HAVE_LIMITS_H
+#define HAVE_LIMITS_H 0
+#endif
+
+#ifndef HAVE_LINK
+#define HAVE_LINK 0
+#endif
+
+#ifndef HAVE_LOCALE_H
+#define HAVE_LOCALE_H 0
+#endif
+
+#ifndef HAVE_LONG_FILE_NAMES
+#define HAVE_LONG_FILE_NAMES 0
+#endif
+
+#ifndef HAVE_MBLEN
+#define HAVE_MBLEN 0
+#endif
+
+#ifndef HAVE_MBRLEN
+#define HAVE_MBRLEN 0
+#endif
+
+#ifndef HAVE_MBRTOWC
+#define HAVE_MBRTOWC 0
+#endif
+
+#ifndef HAVE_MBTOWC
+#define HAVE_MBTOWC 0
+#endif
+
+#ifndef HAVE_MENU_H
+#define HAVE_MENU_H 0
+#endif
+
+#ifndef HAVE_MKSTEMP
+#define HAVE_MKSTEMP 0
+#endif
+
+#ifndef HAVE_NANOSLEEP
+#define HAVE_NANOSLEEP 0
+#endif
+
+#ifndef HAVE_NC_ALLOC_H
+#define HAVE_NC_ALLOC_H 0
+#endif
+
+#ifndef HAVE_PANEL_H
+#define HAVE_PANEL_H 0
+#endif
+
+#ifndef HAVE_POLL
+#define HAVE_POLL 0
+#endif
+
+#ifndef HAVE_POLL_H
+#define HAVE_POLL_H 0
+#endif
+
+#ifndef HAVE_PURIFY
+#define HAVE_PURIFY 0
+#endif
+
+#ifndef HAVE_PUTWC
+#define HAVE_PUTWC 0
+#endif
+
+#ifndef HAVE_REGEXPR_H_FUNCS
+#define HAVE_REGEXPR_H_FUNCS 0
+#endif
+
+#ifndef HAVE_REGEXP_H_FUNCS
+#define HAVE_REGEXP_H_FUNCS 0
+#endif
+
+#ifndef HAVE_REGEX_H_FUNCS
+#define HAVE_REGEX_H_FUNCS 0
+#endif
+
+#ifndef HAVE_REMOVE
+#define HAVE_REMOVE 0
+#endif
+
+#ifndef HAVE_RESIZETERM
+#define HAVE_RESIZETERM 0
+#endif
+
+#ifndef HAVE_SELECT
+#define HAVE_SELECT 0
+#endif
+
+#ifndef HAVE_SETBUF
+#define HAVE_SETBUF 0
+#endif
+
+#ifndef HAVE_SETBUFFER
+#define HAVE_SETBUFFER 0
+#endif
+
+#ifndef HAVE_SETVBUF
+#define HAVE_SETVBUF 0
+#endif
+
+#ifndef HAVE_SIGACTION
+#define HAVE_SIGACTION 0
+#endif
+
+#ifndef HAVE_SIGVEC
+#define HAVE_SIGVEC 0
+#endif
+
+#ifndef HAVE_SIZECHANGE
+#define HAVE_SIZECHANGE 0
+#endif
+
+#ifndef HAVE_SLK_COLOR
+#define HAVE_SLK_COLOR 0
+#endif
+
+#ifndef HAVE_STRDUP
+#define HAVE_STRDUP 0
+#endif
+
+#ifndef HAVE_STRSTR
+#define HAVE_STRSTR 0
+#endif
+
+#ifndef HAVE_SYMLINK
+#define HAVE_SYMLINK 0
+#endif
+
+#ifndef HAVE_SYS_BSDTYPES_H
+#define HAVE_SYS_BSDTYPES_H 0
+#endif
+
+#ifndef HAVE_SYS_IOCTL_H
+#define HAVE_SYS_IOCTL_H 0
+#endif
+
+#ifndef HAVE_SYS_PARAM_H
+#define HAVE_SYS_PARAM_H 0
+#endif
+
+#ifndef HAVE_SYS_POLL_H
+#define HAVE_SYS_POLL_H 0
+#endif
+
+#ifndef HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 0
+#endif
+
+#ifndef HAVE_SYS_TERMIO_H
+#define HAVE_SYS_TERMIO_H 0
+#endif
+
+#ifndef HAVE_SYS_TIMES_H
+#define HAVE_SYS_TIMES_H 0
+#endif
+
+#ifndef HAVE_SYS_TIME_H
+#define HAVE_SYS_TIME_H 0
+#endif
+
+#ifndef HAVE_SYS_TIME_SELECT
+#define HAVE_SYS_TIME_SELECT 0
+#endif
+
+#ifndef HAVE_TCGETATTR
+#define HAVE_TCGETATTR 0
+#endif
+
+#ifndef HAVE_TCGETPGRP
+#define HAVE_TCGETPGRP 0
+#endif
+
+#ifndef HAVE_TELL
+#define HAVE_TELL 0
+#endif
+
+#ifndef HAVE_TERMIOS_H
+#define HAVE_TERMIOS_H 0
+#endif
+
+#ifndef HAVE_TERMIO_H
+#define HAVE_TERMIO_H 0
+#endif
+
+#ifndef HAVE_TIMES
+#define HAVE_TIMES 0
+#endif
+
+#ifndef HAVE_TTYENT_H
+#define HAVE_TTYENT_H 0
+#endif
+
+#ifndef HAVE_TYPEINFO
+#define HAVE_TYPEINFO 0
+#endif
+
+#ifndef HAVE_TYPE_ATTR_T
+#define HAVE_TYPE_ATTR_T 0
+#endif
+
+#ifndef HAVE_TYPE_SIGACTION
+#define HAVE_TYPE_SIGACTION 0
+#endif
+
+#ifndef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 0
+#endif
+
+#ifndef HAVE_UNLINK
+#define HAVE_UNLINK 0
+#endif
+
+#ifndef HAVE_USE_DEFAULT_COLORS
+#define HAVE_USE_DEFAULT_COLORS 0
+#endif
+
+#ifndef HAVE_VFSCANF
+#define HAVE_VFSCANF 0
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#define HAVE_VSNPRINTF 0
+#endif
+
+#ifndef HAVE_VSSCANF
+#define HAVE_VSSCANF 0
+#endif
+
+#ifndef HAVE_WCTOB
+#define HAVE_WCTOB 0
+#endif
+
+#ifndef HAVE_WCTOMB
+#define HAVE_WCTOMB 0
+#endif
+
+#ifndef HAVE_WCTYPE_H
+#define HAVE_WCTYPE_H 0
+#endif
+
+#ifndef HAVE_WORKING_POLL
+#define HAVE_WORKING_POLL 0
+#endif
+
+#ifndef HAVE_WRESIZE
+#define HAVE_WRESIZE 0
+#endif
+
+#ifndef HAVE__DOSCAN
+#define HAVE__DOSCAN 0
+#endif
+
+#ifndef MIXEDCASE_FILENAMES
+#define MIXEDCASE_FILENAMES 0
+#endif
+
+#ifndef NCURSES_EXPANDED
+#define NCURSES_EXPANDED 0
+#endif
+
+#ifndef NCURSES_EXT_COLORS
+#define NCURSES_EXT_COLORS 0
+#endif
+
+#ifndef NCURSES_EXT_FUNCS
+#define NCURSES_EXT_FUNCS 0
+#endif
+
+#ifndef NCURSES_NOMACROS
+#define NCURSES_NOMACROS 0
+#endif
+
+#ifndef NCURSES_NO_PADDING
+#define NCURSES_NO_PADDING 0
+#endif
+
+#ifndef NCURSES_PATHSEP
+#define NCURSES_PATHSEP ':'
+#endif
+
+#ifndef NDEBUG
+#define NDEBUG 0
+#endif
+
+#ifndef NEED_PTEM_H
+#define NEED_PTEM_H 0
+#endif
+
+#ifndef NO_LEAKS
+#define NO_LEAKS 0
+#endif
+
+#ifndef PURE_TERMINFO
+#define PURE_TERMINFO 0
+#endif
+
+#ifndef RETSIGTYPE
+#define RETSIGTYPE 0
+#endif
+
+#ifndef STDC_HEADERS
+#define STDC_HEADERS 0
+#endif
+
+#ifndef SVR4_ACTION
+#define SVR4_ACTION 0
+#endif
+
+#ifndef SVR4_TERMIO
+#define SVR4_TERMIO 0
+#endif
+
+#ifndef SYSTEM_NAME
+#define SYSTEM_NAME "unknown"
+#endif
+
+#ifndef TERMINFO
+#define TERMINFO "none"
+#endif
+
+#ifndef TERMPATH
+#define TERMPATH "none"
+#endif
+
+#ifndef TIME_WITH_SYS_TIME
+#define TIME_WITH_SYS_TIME 0
+#endif
+
+#ifndef TYPEOF_CHTYPE
+#define TYPEOF_CHTYPE 0
+#endif
+
+#ifndef USE_COLORFGBG
+#define USE_COLORFGBG 0
+#endif
+
+#ifndef USE_DATABASE
+#define USE_DATABASE 0
+#endif
+
+#ifndef USE_GETCAP
+#define USE_GETCAP 0
+#endif
+
+#ifndef USE_GETCAP_CACHE
+#define USE_GETCAP_CACHE 0
+#endif
+
+#ifndef USE_HARD_TABS
+#define USE_HARD_TABS 0
+#endif
+
+#ifndef USE_HASHMAP
+#define USE_HASHMAP 0
+#endif
+
+#ifndef USE_HOME_TERMINFO
+#define USE_HOME_TERMINFO 0
+#endif
+
+#ifndef USE_LINKS
+#define USE_LINKS 0
+#endif
+
+#ifndef USE_MY_MEMMOVE
+#define USE_MY_MEMMOVE 0
+#endif
+
+#ifndef USE_OK_BCOPY
+#define USE_OK_BCOPY 0
+#endif
+
+#ifndef USE_RCS_IDS
+#define USE_RCS_IDS 0
+#endif
+
+#ifndef USE_SAFE_SPRINTF
+#define USE_SAFE_SPRINTF 0
+#endif
+
+#ifndef USE_SCROLL_HINTS
+#define USE_SCROLL_HINTS 0
+#endif
+
+#ifndef USE_SIGWINCH
+#define USE_SIGWINCH 0
+#endif
+
+#ifndef USE_STDIO_VSCAN
+#define USE_STDIO_VSCAN 0
+#endif
+
+#ifndef USE_STRSTREAM_VSCAN
+#define USE_STRSTREAM_VSCAN 0
+#endif
+
+#ifndef USE_STRSTREAM_VSCAN_CAST
+#define USE_STRSTREAM_VSCAN_CAST 0
+#endif
+
+#ifndef USE_SYMLINKS
+#define USE_SYMLINKS 0
+#endif
+
+#ifndef USE_SYSMOUSE
+#define USE_SYSMOUSE 0
+#endif
+
+#ifndef USE_TERMCAP
+#define USE_TERMCAP 0
+#endif
+
+#ifndef USE_WIDEC_SUPPORT
+#define USE_WIDEC_SUPPORT 0
+#endif
+
+#ifndef USE_XMC_SUPPORT
+#define USE_XMC_SUPPORT 0
+#endif
+
+#endif /* NC_DEFINE_H */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-nomacros.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-nomacros.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-nomacros.h	(revision 3073)
@@ -0,0 +1,115 @@
+#undef addch
+#undef addchnstr
+#undef addchstr
+#undef addnstr
+#undef addstr
+#undef attroff
+#undef attron
+#undef attrset
+#undef attr_get
+#undef attr_off
+#undef attr_on
+#undef attr_set
+#undef bkgd
+#undef bkgdset
+#undef border
+#undef box
+#undef chgat
+#undef clear
+#undef clrtobot
+#undef clrtoeol
+#undef color_set
+#undef COLOR_PAIR
+#undef delch
+#undef deleteln
+#undef echochar
+#undef erase
+#undef getbkgd
+#undef getch
+#undef getnstr
+#undef getstr
+#undef hline
+#undef inch
+#undef inchnstr
+#undef inchstr
+#undef innstr
+#undef insch
+#undef insdelln
+#undef insertln
+#undef insnstr
+#undef insstr
+#undef instr
+#undef move
+#undef mvaddch
+#undef mvaddchnstr
+#undef mvaddchstr
+#undef mvaddnstr
+#undef mvaddstr
+#undef mvchgat
+#undef mvdelch
+#undef mvgetch
+#undef mvgetnstr
+#undef mvgetstr
+#undef mvhline
+#undef mvinch
+#undef mvinchnstr
+#undef mvinchstr
+#undef mvinnstr
+#undef mvinsch
+#undef mvinsnstr
+#undef mvinsstr
+#undef mvinstr
+#undef mvvline
+#undef mvwaddch
+#undef mvwaddchnstr
+#undef mvwaddchstr
+#undef mvwaddnstr
+#undef mvwaddstr
+#undef mvwchgat
+#undef mvwdelch
+#undef mvwgetch
+#undef mvwgetnstr
+#undef mvwgetstr
+#undef mvwhline
+#undef mvwinch
+#undef mvwinchnstr
+#undef mvwinchstr
+#undef mvwinnstr
+#undef mvwinsch
+#undef mvwinsnstr
+#undef mvwinsstr
+#undef mvwinstr
+#undef mvwvline
+#undef PAIR_NUMBER
+#undef redrawwin
+#undef refresh
+#undef scrl
+#undef scroll
+#undef setscrreg
+#undef slk_attr_off
+#undef slk_attr_on
+#undef standout
+#undef standend
+#undef timeout
+#undef touchline
+#undef touchwin
+#undef untouchwin
+#undef vline
+#undef vw_printw
+#undef vw_scanw
+#undef waddchstr
+#undef waddstr
+#undef wattron
+#undef wattroff
+#undef wattrset
+#undef wattr_get
+#undef wattr_set
+#undef wdeleteln
+#undef wgetstr
+#undef winchstr
+#undef winsertln
+#undef winsstr
+#undef winstr
+#undef wstandout
+#undef wstandend
+#undef mouse_trafo
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-parametrized.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-parametrized.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-parametrized.h	(revision 3073)
@@ -0,0 +1,560 @@
+/*
+ * parametrized.h --- is a termcap capability parametrized?
+ *
+ * Note: this file is generated using MKparametrized.sh, do not edit by hand.
+ * A value of -1 in the table means suppress both pad and % translations.
+ * A value of 0 in the table means do pad but not % translations.
+ * A value of 1 in the table means do both pad and % translations.
+ */
+
+static short const parametrized[] = {
+0,	/*  cbt  */
+0,	/*  bel  */
+0,	/*  cr  */
+1,	/*  csr  */
+0,	/*  tbc  */
+0,	/*  clear  */
+0,	/*  el  */
+0,	/*  ed  */
+1,	/*  hpa  */
+0,	/*  cmdch  */
+1,	/*  cup  */
+0,	/*  cud1  */
+0,	/*  home  */
+0,	/*  civis  */
+0,	/*  cub1  */
+1,	/*  mrcup  */
+0,	/*  cnorm  */
+0,	/*  cuf1  */
+0,	/*  ll  */
+0,	/*  cuu1  */
+0,	/*  cvvis  */
+0,	/*  dch1  */
+0,	/*  dl1  */
+0,	/*  dsl  */
+0,	/*  hd  */
+0,	/*  smacs  */
+0,	/*  blink  */
+0,	/*  bold  */
+0,	/*  smcup  */
+0,	/*  smdc  */
+0,	/*  dim  */
+0,	/*  smir  */
+0,	/*  invis  */
+0,	/*  prot  */
+0,	/*  rev  */
+0,	/*  smso  */
+0,	/*  smul  */
+1,	/*  ech  */
+0,	/*  rmacs  */
+0,	/*  sgr0  */
+0,	/*  rmcup  */
+0,	/*  rmdc  */
+0,	/*  rmir  */
+0,	/*  rmso  */
+0,	/*  rmul  */
+0,	/*  flash  */
+0,	/*  ff  */
+0,	/*  fsl  */
+0,	/*  is1  */
+0,	/*  is2  */
+0,	/*  is3  */
+0,	/*  if  */
+0,	/*  ich1  */
+0,	/*  il1  */
+0,	/*  ip  */
+0,	/*  kbs  */
+0,	/*  ktbc  */
+0,	/*  kclr  */
+0,	/*  kctab  */
+0,	/*  kdch1  */
+0,	/*  kdl1  */
+0,	/*  kcud1  */
+0,	/*  krmir  */
+0,	/*  kel  */
+0,	/*  ked  */
+0,	/*  kf0  */
+0,	/*  kf1  */
+0,	/*  kf10  */
+0,	/*  kf2  */
+0,	/*  kf3  */
+0,	/*  kf4  */
+0,	/*  kf5  */
+0,	/*  kf6  */
+0,	/*  kf7  */
+0,	/*  kf8  */
+0,	/*  kf9  */
+0,	/*  khome  */
+0,	/*  kich1  */
+0,	/*  kil1  */
+0,	/*  kcub1  */
+0,	/*  kll  */
+0,	/*  knp  */
+0,	/*  kpp  */
+0,	/*  kcuf1  */
+0,	/*  kind  */
+0,	/*  kri  */
+0,	/*  khts  */
+0,	/*  kcuu1  */
+0,	/*  rmkx  */
+0,	/*  smkx  */
+0,	/*  lf0  */
+0,	/*  lf1  */
+0,	/*  lf10  */
+0,	/*  lf2  */
+0,	/*  lf3  */
+0,	/*  lf4  */
+0,	/*  lf5  */
+0,	/*  lf6  */
+0,	/*  lf7  */
+0,	/*  lf8  */
+0,	/*  lf9  */
+0,	/*  rmm  */
+0,	/*  smm  */
+0,	/*  nel  */
+0,	/*  pad  */
+1,	/*  dch  */
+1,	/*  dl  */
+1,	/*  cud  */
+1,	/*  ich  */
+1,	/*  indn  */
+1,	/*  il  */
+1,	/*  cub  */
+1,	/*  cuf  */
+1,	/*  rin  */
+1,	/*  cuu  */
+1,	/*  pfkey  */
+1,	/*  pfloc  */
+1,	/*  pfx  */
+0,	/*  mc0  */
+0,	/*  mc4  */
+0,	/*  mc5  */
+1,	/*  rep  */
+0,	/*  rs1  */
+0,	/*  rs2  */
+0,	/*  rs3  */
+0,	/*  rf  */
+0,	/*  rc  */
+1,	/*  vpa  */
+0,	/*  sc  */
+0,	/*  ind  */
+0,	/*  ri  */
+1,	/*  sgr  */
+0,	/*  hts  */
+1,	/*  wind  */
+0,	/*  ht  */
+1,	/*  tsl  */
+0,	/*  uc  */
+0,	/*  hu  */
+0,	/*  iprog  */
+0,	/*  ka1  */
+0,	/*  ka3  */
+0,	/*  kb2  */
+0,	/*  kc1  */
+0,	/*  kc3  */
+1,	/*  mc5p  */
+0,	/*  rmp  */
+-1,	/*  acsc  */
+1,	/*  pln  */
+0,	/*  kcbt  */
+0,	/*  smxon  */
+0,	/*  rmxon  */
+0,	/*  smam  */
+0,	/*  rmam  */
+0,	/*  xonc  */
+0,	/*  xoffc  */
+0,	/*  enacs  */
+0,	/*  smln  */
+0,	/*  rmln  */
+0,	/*  kbeg  */
+0,	/*  kcan  */
+0,	/*  kclo  */
+0,	/*  kcmd  */
+0,	/*  kcpy  */
+0,	/*  kcrt  */
+0,	/*  kend  */
+0,	/*  kent  */
+0,	/*  kext  */
+0,	/*  kfnd  */
+0,	/*  khlp  */
+0,	/*  kmrk  */
+0,	/*  kmsg  */
+0,	/*  kmov  */
+0,	/*  knxt  */
+0,	/*  kopn  */
+0,	/*  kopt  */
+0,	/*  kprv  */
+0,	/*  kprt  */
+0,	/*  krdo  */
+0,	/*  kref  */
+0,	/*  krfr  */
+0,	/*  krpl  */
+0,	/*  krst  */
+0,	/*  kres  */
+0,	/*  ksav  */
+0,	/*  kspd  */
+0,	/*  kund  */
+0,	/*  kBEG  */
+0,	/*  kCAN  */
+0,	/*  kCMD  */
+0,	/*  kCPY  */
+0,	/*  kCRT  */
+0,	/*  kDC  */
+0,	/*  kDL  */
+0,	/*  kslt  */
+0,	/*  kEND  */
+0,	/*  kEOL  */
+0,	/*  kEXT  */
+0,	/*  kFND  */
+1,	/*  kHLP  */
+1,	/*  kHOM  */
+1,	/*  kIC  */
+1,	/*  kLFT  */
+0,	/*  kMSG  */
+0,	/*  kMOV  */
+0,	/*  kNXT  */
+0,	/*  kOPT  */
+0,	/*  kPRV  */
+0,	/*  kPRT  */
+0,	/*  kRDO  */
+0,	/*  kRPL  */
+0,	/*  kRIT  */
+0,	/*  kRES  */
+0,	/*  kSAV  */
+0,	/*  kSPD  */
+0,	/*  kUND  */
+0,	/*  rfi  */
+0,	/*  kf11  */
+0,	/*  kf12  */
+0,	/*  kf13  */
+0,	/*  kf14  */
+0,	/*  kf15  */
+0,	/*  kf16  */
+0,	/*  kf17  */
+0,	/*  kf18  */
+0,	/*  kf19  */
+0,	/*  kf20  */
+0,	/*  kf21  */
+0,	/*  kf22  */
+0,	/*  kf23  */
+0,	/*  kf24  */
+0,	/*  kf25  */
+0,	/*  kf26  */
+0,	/*  kf27  */
+0,	/*  kf28  */
+0,	/*  kf29  */
+0,	/*  kf30  */
+0,	/*  kf31  */
+0,	/*  kf32  */
+0,	/*  kf33  */
+0,	/*  kf34  */
+0,	/*  kf35  */
+0,	/*  kf36  */
+0,	/*  kf37  */
+0,	/*  kf38  */
+0,	/*  kf39  */
+0,	/*  kf40  */
+0,	/*  kf41  */
+0,	/*  kf42  */
+0,	/*  kf43  */
+0,	/*  kf44  */
+0,	/*  kf45  */
+0,	/*  kf46  */
+0,	/*  kf47  */
+0,	/*  kf48  */
+0,	/*  kf49  */
+0,	/*  kf50  */
+0,	/*  kf51  */
+0,	/*  kf52  */
+0,	/*  kf53  */
+0,	/*  kf54  */
+0,	/*  kf55  */
+0,	/*  kf56  */
+0,	/*  kf57  */
+0,	/*  kf58  */
+0,	/*  kf59  */
+0,	/*  kf60  */
+0,	/*  kf61  */
+0,	/*  kf62  */
+0,	/*  kf63  */
+0,	/*  el1  */
+0,	/*  mgc  */
+0,	/*  smgl  */
+0,	/*  smgr  */
+0,	/*  fln  */
+1,	/*  sclk  */
+0,	/*  dclk  */
+0,	/*  rmclk  */
+1,	/*  cwin  */
+1,	/*  wingo  */
+0,	/*  hup  */
+1,	/*  dial  */
+1,	/*  qdial  */
+0,	/*  tone  */
+0,	/*  pulse  */
+0,	/*  hook  */
+0,	/*  pause  */
+0,	/*  wait  */
+1,	/*  u0  */
+1,	/*  u1  */
+1,	/*  u2  */
+1,	/*  u3  */
+1,	/*  u4  */
+1,	/*  u5  */
+1,	/*  u6  */
+1,	/*  u7  */
+1,	/*  u8  */
+1,	/*  u9  */
+0,	/*  op  */
+0,	/*  oc  */
+1,	/*  initc  */
+1,	/*  initp  */
+1,	/*  scp  */
+1,	/*  setf  */
+1,	/*  setb  */
+1,	/*  cpi  */
+1,	/*  lpi  */
+1,	/*  chr  */
+1,	/*  cvr  */
+1,	/*  defc  */
+0,	/*  swidm  */
+0,	/*  sdrfq  */
+0,	/*  sitm  */
+0,	/*  slm  */
+0,	/*  smicm  */
+0,	/*  snlq  */
+0,	/*  snrmq  */
+0,	/*  sshm  */
+0,	/*  ssubm  */
+0,	/*  ssupm  */
+0,	/*  sum  */
+0,	/*  rwidm  */
+0,	/*  ritm  */
+0,	/*  rlm  */
+0,	/*  rmicm  */
+0,	/*  rshm  */
+0,	/*  rsubm  */
+0,	/*  rsupm  */
+0,	/*  rum  */
+0,	/*  mhpa  */
+0,	/*  mcud1  */
+0,	/*  mcub1  */
+0,	/*  mcuf1  */
+1,	/*  mvpa  */
+0,	/*  mcuu1  */
+0,	/*  porder  */
+0,	/*  mcud  */
+0,	/*  mcub  */
+0,	/*  mcuf  */
+0,	/*  mcuu  */
+1,	/*  scs  */
+0,	/*  smgb  */
+1,	/*  smgbp  */
+1,	/*  smglp  */
+1,	/*  smgrp  */
+0,	/*  smgt  */
+1,	/*  smgtp  */
+0,	/*  sbim  */
+1,	/*  scsd  */
+0,	/*  rbim  */
+1,	/*  rcsd  */
+0,	/*  subcs  */
+0,	/*  supcs  */
+0,	/*  docr  */
+0,	/*  zerom  */
+1,	/*  csnm  */
+0,	/*  kmous  */
+0,	/*  minfo  */
+0,	/*  reqmp  */
+1,	/*  getm  */
+1,	/*  setaf  */
+1,	/*  setab  */
+1,	/*  pfxl  */
+0,	/*  devt  */
+0,	/*  csin  */
+0,	/*  s0ds  */
+0,	/*  s1ds  */
+0,	/*  s2ds  */
+0,	/*  s3ds  */
+1,	/*  smglr  */
+1,	/*  smgtb  */
+1,	/*  birep  */
+0,	/*  binel  */
+0,	/*  bicr  */
+1,	/*  colornm  */
+0,	/*  defbi  */
+0,	/*  endbi  */
+1,	/*  setcolor  */
+1,	/*  slines  */
+1,	/*  dispc  */
+0,	/*  smpch  */
+0,	/*  rmpch  */
+0,	/*  smsc  */
+0,	/*  rmsc  */
+0,	/*  pctrm  */
+0,	/*  scesc  */
+0,	/*  scesa  */
+0,	/*  ehhlm  */
+0,	/*  elhlm  */
+0,	/*  elohlm  */
+0,	/*  erhlm  */
+0,	/*  ethlm  */
+0,	/*  evhlm  */
+1,	/*  sgr1  */
+1,	/*  slength  */
+0,	/*  OTi2  */
+0,	/*  OTrs  */
+0,	/*  OTnl  */
+0,	/*  OTbc  */
+0,	/*  OTko  */
+0,	/*  OTma  */
+-1,	/*  OTG2  */
+-1,	/*  OTG3  */
+-1,	/*  OTG1  */
+-1,	/*  OTG4  */
+-1,	/*  OTGR  */
+-1,	/*  OTGL  */
+-1,	/*  OTGU  */
+-1,	/*  OTGD  */
+-1,	/*  OTGH  */
+-1,	/*  OTGV  */
+-1,	/*  OTGC  */
+0,	/*  meml  */
+0,	/*  memu  */
+1,	/*  pln  */
+0,	/*  smln  */
+0,	/*  rmln  */
+0,	/*  kf11  */
+0,	/*  kf12  */
+0,	/*  kf13  */
+0,	/*  kf14  */
+0,	/*  kf15  */
+0,	/*  kf16  */
+0,	/*  kf17  */
+0,	/*  kf18  */
+0,	/*  kf19  */
+0,	/*  kf20  */
+0,	/*  kf21  */
+0,	/*  kf22  */
+0,	/*  kf23  */
+0,	/*  kf24  */
+0,	/*  kf25  */
+0,	/*  kf26  */
+0,	/*  kf27  */
+0,	/*  kf28  */
+0,	/*  kf29  */
+0,	/*  kf30  */
+0,	/*  kf31  */
+0,	/*  kf32  */
+0,	/*  kf33  */
+0,	/*  kf34  */
+0,	/*  kf35  */
+0,	/*  kf36  */
+0,	/*  kf37  */
+0,	/*  kf38  */
+0,	/*  kf39  */
+0,	/*  kf40  */
+0,	/*  kf41  */
+0,	/*  kf42  */
+0,	/*  kf43  */
+0,	/*  kf44  */
+0,	/*  kf45  */
+0,	/*  kf46  */
+0,	/*  kf47  */
+0,	/*  kf48  */
+0,	/*  kf49  */
+0,	/*  kf50  */
+0,	/*  kf51  */
+0,	/*  kf52  */
+0,	/*  kf53  */
+0,	/*  kf54  */
+0,	/*  kf55  */
+0,	/*  kf56  */
+0,	/*  kf57  */
+0,	/*  kf58  */
+0,	/*  kf59  */
+0,	/*  kf60  */
+0,	/*  kf61  */
+0,	/*  kf62  */
+0,	/*  kf63  */
+0,	/*  box1  */
+0,	/*  box2  */
+0,	/*  batt1  */
+0,	/*  batt2  */
+0,	/*  colb0  */
+0,	/*  colb1  */
+0,	/*  colb2  */
+0,	/*  colb3  */
+0,	/*  colb4  */
+0,	/*  colb5  */
+0,	/*  colb6  */
+0,	/*  colb7  */
+0,	/*  colf0  */
+0,	/*  colf1  */
+0,	/*  colf2  */
+0,	/*  colf3  */
+0,	/*  colf4  */
+0,	/*  colf5  */
+0,	/*  colf6  */
+0,	/*  colf7  */
+0,	/*  font0  */
+0,	/*  font1  */
+0,	/*  font2  */
+0,	/*  font3  */
+0,	/*  font4  */
+0,	/*  font5  */
+0,	/*  font6  */
+0,	/*  font7  */
+0,	/*  kbtab  */
+0,	/*  kdo  */
+0,	/*  kcmd  */
+0,	/*  kcpn  */
+0,	/*  kend  */
+0,	/*  khlp  */
+0,	/*  knl  */
+0,	/*  knpn  */
+0,	/*  kppn  */
+0,	/*  kppn  */
+0,	/*  kquit  */
+0,	/*  ksel  */
+0,	/*  kscl  */
+0,	/*  kscr  */
+0,	/*  ktab  */
+0,	/*  kmpf1  */
+0,	/*  kmpt1  */
+0,	/*  kmpf2  */
+0,	/*  kmpt2  */
+0,	/*  kmpf3  */
+0,	/*  kmpt3  */
+0,	/*  kmpf4  */
+0,	/*  kmpt4  */
+0,	/*  kmpf5  */
+0,	/*  kmpt5  */
+0,	/*  apstr  */
+0,	/*  kmpf6  */
+0,	/*  kmpt6  */
+0,	/*  kmpf7  */
+0,	/*  kmpt7  */
+0,	/*  kmpf8  */
+0,	/*  kmpt8  */
+0,	/*  kmpf9  */
+0,	/*  kmpt9  */
+0,	/*  ksf1  */
+0,	/*  ksf2  */
+0,	/*  ksf3  */
+0,	/*  ksf4  */
+0,	/*  ksf5  */
+0,	/*  ksf6  */
+0,	/*  ksf7  */
+0,	/*  ksf8  */
+0,	/*  ksf9  */
+0,	/*  ksf10  */
+0,	/*  kf11  */
+0,	/*  kf12  */
+0,	/*  kact  */
+0,	/*  topl  */
+0,	/*  btml  */
+0,	/*  rvert  */
+0,	/*  lvert  */
+} /* 548 entries */;
+
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-term.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-term.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-term.h	(revision 3073)
@@ -0,0 +1,784 @@
+/****************************************************************************
+ * Copyright (c) 1998-2001,2003 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"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************/
+/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */
+/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */
+/*    and: Thomas E. Dickey                        1995-2003                */
+/****************************************************************************/
+
+/* $Id$ */
+
+/*
+**	term.h -- Definition of struct term
+*/
+
+#ifndef NCURSES_TERM_H_incl
+#define NCURSES_TERM_H_incl 1
+
+#undef  NCURSES_VERSION
+#define NCURSES_VERSION "5.5"
+
+#include <ncurses_dll.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Make this file self-contained by providing defaults for the HAVE_TERMIO[S]_H
+ * definition (based on the system for which this was configured).
+ */
+
+#undef  HAVE_TERMIOS_H
+#define HAVE_TERMIOS_H 1
+
+#undef  HAVE_TCGETATTR
+#define HAVE_TCGETATTR 1
+
+#undef  NCURSES_CONST
+#define NCURSES_CONST /*nothing*/
+
+#undef  NCURSES_XNAMES
+#define NCURSES_XNAMES 1
+
+/* We will use these symbols to hide differences between
+ * termios/termio/sgttyb interfaces.
+ */
+#undef  TTY
+#undef  SET_TTY
+#undef  GET_TTY
+
+/* Assume POSIX termio if we have the header and function */
+#if HAVE_TERMIOS_H && HAVE_TCGETATTR
+
+#undef  TERMIOS
+#define TERMIOS 1
+
+#include <termios.h>
+#define TTY struct termios
+
+#else /* !HAVE_TERMIOS_H */
+
+#if 1 /* HAVE_TERMIO_H */
+
+#undef  TERMIOS
+#define TERMIOS 1
+
+#include <termio.h>
+#define TTY struct termio
+
+/* Add definitions to make termio look like termios.
+ * But ifdef it, since there are some implementations
+ * that try to do this for us in a fake <termio.h>.
+ */
+#ifndef TCSANOW
+#define TCSANOW TCSETA
+#endif
+#ifndef TCSADRAIN
+#define TCSADRAIN TCSETAW
+#endif
+#ifndef TCSAFLUSH
+#define TCSAFLUSH TCSETAF
+#endif
+#ifndef tcsetattr
+#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)
+#endif
+#ifndef tcgetattr
+#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)
+#endif
+#ifndef cfgetospeed
+#define cfgetospeed(t) ((t)->c_cflag & CBAUD)
+#endif
+#ifndef TCIFLUSH 
+#define TCIFLUSH 0
+#endif
+#ifndef TCOFLUSH 
+#define TCOFLUSH 1
+#endif
+#ifndef TCIOFLUSH 
+#define TCIOFLUSH 2
+#endif
+#ifndef tcflush
+#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)
+#endif
+
+#else /* !HAVE_TERMIO_H */
+
+#undef TERMIOS
+#include <sgtty.h>
+#include <sys/ioctl.h>
+#define TTY struct sgttyb
+
+#endif /* HAVE_TERMIO_H */
+
+#endif /* HAVE_TERMIOS_H */
+
+#ifdef TERMIOS
+#define GET_TTY(fd, buf) tcgetattr(fd, buf)
+#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)
+#else
+#define GET_TTY(fd, buf) gtty(fd, buf)
+#define SET_TTY(fd, buf) stty(fd, buf)
+#endif
+
+#define NAMESIZE 256
+
+#define CUR cur_term->type.
+
+#define auto_left_margin               CUR Booleans[0]
+#define auto_right_margin              CUR Booleans[1]
+#define no_esc_ctlc                    CUR Booleans[2]
+#define ceol_standout_glitch           CUR Booleans[3]
+#define eat_newline_glitch             CUR Booleans[4]
+#define erase_overstrike               CUR Booleans[5]
+#define generic_type                   CUR Booleans[6]
+#define hard_copy                      CUR Booleans[7]
+#define has_meta_key                   CUR Booleans[8]
+#define has_status_line                CUR Booleans[9]
+#define insert_null_glitch             CUR Booleans[10]
+#define memory_above                   CUR Booleans[11]
+#define memory_below                   CUR Booleans[12]
+#define move_insert_mode               CUR Booleans[13]
+#define move_standout_mode             CUR Booleans[14]
+#define over_strike                    CUR Booleans[15]
+#define status_line_esc_ok             CUR Booleans[16]
+#define dest_tabs_magic_smso           CUR Booleans[17]
+#define tilde_glitch                   CUR Booleans[18]
+#define transparent_underline          CUR Booleans[19]
+#define xon_xoff                       CUR Booleans[20]
+#define needs_xon_xoff                 CUR Booleans[21]
+#define prtr_silent                    CUR Booleans[22]
+#define hard_cursor                    CUR Booleans[23]
+#define non_rev_rmcup                  CUR Booleans[24]
+#define no_pad_char                    CUR Booleans[25]
+#define non_dest_scroll_region         CUR Booleans[26]
+#define can_change                     CUR Booleans[27]
+#define back_color_erase               CUR Booleans[28]
+#define hue_lightness_saturation       CUR Booleans[29]
+#define col_addr_glitch                CUR Booleans[30]
+#define cr_cancels_micro_mode          CUR Booleans[31]
+#define has_print_wheel                CUR Booleans[32]
+#define row_addr_glitch                CUR Booleans[33]
+#define semi_auto_right_margin         CUR Booleans[34]
+#define cpi_changes_res                CUR Booleans[35]
+#define lpi_changes_res                CUR Booleans[36]
+#define columns                        CUR Numbers[0]
+#define init_tabs                      CUR Numbers[1]
+#define lines                          CUR Numbers[2]
+#define lines_of_memory                CUR Numbers[3]
+#define magic_cookie_glitch            CUR Numbers[4]
+#define padding_baud_rate              CUR Numbers[5]
+#define virtual_terminal               CUR Numbers[6]
+#define width_status_line              CUR Numbers[7]
+#define num_labels                     CUR Numbers[8]
+#define label_height                   CUR Numbers[9]
+#define label_width                    CUR Numbers[10]
+#define max_attributes                 CUR Numbers[11]
+#define maximum_windows                CUR Numbers[12]
+#define max_colors                     CUR Numbers[13]
+#define max_pairs                      CUR Numbers[14]
+#define no_color_video                 CUR Numbers[15]
+#define buffer_capacity                CUR Numbers[16]
+#define dot_vert_spacing               CUR Numbers[17]
+#define dot_horz_spacing               CUR Numbers[18]
+#define max_micro_address              CUR Numbers[19]
+#define max_micro_jump                 CUR Numbers[20]
+#define micro_col_size                 CUR Numbers[21]
+#define micro_line_size                CUR Numbers[22]
+#define number_of_pins                 CUR Numbers[23]
+#define output_res_char                CUR Numbers[24]
+#define output_res_line                CUR Numbers[25]
+#define output_res_horz_inch           CUR Numbers[26]
+#define output_res_vert_inch           CUR Numbers[27]
+#define print_rate                     CUR Numbers[28]
+#define wide_char_size                 CUR Numbers[29]
+#define buttons                        CUR Numbers[30]
+#define bit_image_entwining            CUR Numbers[31]
+#define bit_image_type                 CUR Numbers[32]
+#define back_tab                       CUR Strings[0]
+#define bell                           CUR Strings[1]
+#define carriage_return                CUR Strings[2]
+#define change_scroll_region           CUR Strings[3]
+#define clear_all_tabs                 CUR Strings[4]
+#define clear_screen                   CUR Strings[5]
+#define clr_eol                        CUR Strings[6]
+#define clr_eos                        CUR Strings[7]
+#define column_address                 CUR Strings[8]
+#define command_character              CUR Strings[9]
+#define cursor_address                 CUR Strings[10]
+#define cursor_down                    CUR Strings[11]
+#define cursor_home                    CUR Strings[12]
+#define cursor_invisible               CUR Strings[13]
+#define cursor_left                    CUR Strings[14]
+#define cursor_mem_address             CUR Strings[15]
+#define cursor_normal                  CUR Strings[16]
+#define cursor_right                   CUR Strings[17]
+#define cursor_to_ll                   CUR Strings[18]
+#define cursor_up                      CUR Strings[19]
+#define cursor_visible                 CUR Strings[20]
+#define delete_character               CUR Strings[21]
+#define delete_line                    CUR Strings[22]
+#define dis_status_line                CUR Strings[23]
+#define down_half_line                 CUR Strings[24]
+#define enter_alt_charset_mode         CUR Strings[25]
+#define enter_blink_mode               CUR Strings[26]
+#define enter_bold_mode                CUR Strings[27]
+#define enter_ca_mode                  CUR Strings[28]
+#define enter_delete_mode              CUR Strings[29]
+#define enter_dim_mode                 CUR Strings[30]
+#define enter_insert_mode              CUR Strings[31]
+#define enter_secure_mode              CUR Strings[32]
+#define enter_protected_mode           CUR Strings[33]
+#define enter_reverse_mode             CUR Strings[34]
+#define enter_standout_mode            CUR Strings[35]
+#define enter_underline_mode           CUR Strings[36]
+#define erase_chars                    CUR Strings[37]
+#define exit_alt_charset_mode          CUR Strings[38]
+#define exit_attribute_mode            CUR Strings[39]
+#define exit_ca_mode                   CUR Strings[40]
+#define exit_delete_mode               CUR Strings[41]
+#define exit_insert_mode               CUR Strings[42]
+#define exit_standout_mode             CUR Strings[43]
+#define exit_underline_mode            CUR Strings[44]
+#define flash_screen                   CUR Strings[45]
+#define form_feed                      CUR Strings[46]
+#define from_status_line               CUR Strings[47]
+#define init_1string                   CUR Strings[48]
+#define init_2string                   CUR Strings[49]
+#define init_3string                   CUR Strings[50]
+#define init_file                      CUR Strings[51]
+#define insert_character               CUR Strings[52]
+#define insert_line                    CUR Strings[53]
+#define insert_padding                 CUR Strings[54]
+#define key_backspace                  CUR Strings[55]
+#define key_catab                      CUR Strings[56]
+#define key_clear                      CUR Strings[57]
+#define key_ctab                       CUR Strings[58]
+#define key_dc                         CUR Strings[59]
+#define key_dl                         CUR Strings[60]
+#define key_down                       CUR Strings[61]
+#define key_eic                        CUR Strings[62]
+#define key_eol                        CUR Strings[63]
+#define key_eos                        CUR Strings[64]
+#define key_f0                         CUR Strings[65]
+#define key_f1                         CUR Strings[66]
+#define key_f10                        CUR Strings[67]
+#define key_f2                         CUR Strings[68]
+#define key_f3                         CUR Strings[69]
+#define key_f4                         CUR Strings[70]
+#define key_f5                         CUR Strings[71]
+#define key_f6                         CUR Strings[72]
+#define key_f7                         CUR Strings[73]
+#define key_f8                         CUR Strings[74]
+#define key_f9                         CUR Strings[75]
+#define key_home                       CUR Strings[76]
+#define key_ic                         CUR Strings[77]
+#define key_il                         CUR Strings[78]
+#define key_left                       CUR Strings[79]
+#define key_ll                         CUR Strings[80]
+#define key_npage                      CUR Strings[81]
+#define key_ppage                      CUR Strings[82]
+#define key_right                      CUR Strings[83]
+#define key_sf                         CUR Strings[84]
+#define key_sr                         CUR Strings[85]
+#define key_stab                       CUR Strings[86]
+#define key_up                         CUR Strings[87]
+#define keypad_local                   CUR Strings[88]
+#define keypad_xmit                    CUR Strings[89]
+#define lab_f0                         CUR Strings[90]
+#define lab_f1                         CUR Strings[91]
+#define lab_f10                        CUR Strings[92]
+#define lab_f2                         CUR Strings[93]
+#define lab_f3                         CUR Strings[94]
+#define lab_f4                         CUR Strings[95]
+#define lab_f5                         CUR Strings[96]
+#define lab_f6                         CUR Strings[97]
+#define lab_f7                         CUR Strings[98]
+#define lab_f8                         CUR Strings[99]
+#define lab_f9                         CUR Strings[100]
+#define meta_off                       CUR Strings[101]
+#define meta_on                        CUR Strings[102]
+#define newline                        CUR Strings[103]
+#define pad_char                       CUR Strings[104]
+#define parm_dch                       CUR Strings[105]
+#define parm_delete_line               CUR Strings[106]
+#define parm_down_cursor               CUR Strings[107]
+#define parm_ich                       CUR Strings[108]
+#define parm_index                     CUR Strings[109]
+#define parm_insert_line               CUR Strings[110]
+#define parm_left_cursor               CUR Strings[111]
+#define parm_right_cursor              CUR Strings[112]
+#define parm_rindex                    CUR Strings[113]
+#define parm_up_cursor                 CUR Strings[114]
+#define pkey_key                       CUR Strings[115]
+#define pkey_local                     CUR Strings[116]
+#define pkey_xmit                      CUR Strings[117]
+#define print_screen                   CUR Strings[118]
+#define prtr_off                       CUR Strings[119]
+#define prtr_on                        CUR Strings[120]
+#define repeat_char                    CUR Strings[121]
+#define reset_1string                  CUR Strings[122]
+#define reset_2string                  CUR Strings[123]
+#define reset_3string                  CUR Strings[124]
+#define reset_file                     CUR Strings[125]
+#define restore_cursor                 CUR Strings[126]
+#define row_address                    CUR Strings[127]
+#define save_cursor                    CUR Strings[128]
+#define scroll_forward                 CUR Strings[129]
+#define scroll_reverse                 CUR Strings[130]
+#define set_attributes                 CUR Strings[131]
+#define set_tab                        CUR Strings[132]
+#define set_window                     CUR Strings[133]
+#define tab                            CUR Strings[134]
+#define to_status_line                 CUR Strings[135]
+#define underline_char                 CUR Strings[136]
+#define up_half_line                   CUR Strings[137]
+#define init_prog                      CUR Strings[138]
+#define key_a1                         CUR Strings[139]
+#define key_a3                         CUR Strings[140]
+#define key_b2                         CUR Strings[141]
+#define key_c1                         CUR Strings[142]
+#define key_c3                         CUR Strings[143]
+#define prtr_non                       CUR Strings[144]
+#define char_padding                   CUR Strings[145]
+#define acs_chars                      CUR Strings[146]
+#define plab_norm                      CUR Strings[147]
+#define key_btab                       CUR Strings[148]
+#define enter_xon_mode                 CUR Strings[149]
+#define exit_xon_mode                  CUR Strings[150]
+#define enter_am_mode                  CUR Strings[151]
+#define exit_am_mode                   CUR Strings[152]
+#define xon_character                  CUR Strings[153]
+#define xoff_character                 CUR Strings[154]
+#define ena_acs                        CUR Strings[155]
+#define label_on                       CUR Strings[156]
+#define label_off                      CUR Strings[157]
+#define key_beg                        CUR Strings[158]
+#define key_cancel                     CUR Strings[159]
+#define key_close                      CUR Strings[160]
+#define key_command                    CUR Strings[161]
+#define key_copy                       CUR Strings[162]
+#define key_create                     CUR Strings[163]
+#define key_end                        CUR Strings[164]
+#define key_enter                      CUR Strings[165]
+#define key_exit                       CUR Strings[166]
+#define key_find                       CUR Strings[167]
+#define key_help                       CUR Strings[168]
+#define key_mark                       CUR Strings[169]
+#define key_message                    CUR Strings[170]
+#define key_move                       CUR Strings[171]
+#define key_next                       CUR Strings[172]
+#define key_open                       CUR Strings[173]
+#define key_options                    CUR Strings[174]
+#define key_previous                   CUR Strings[175]
+#define key_print                      CUR Strings[176]
+#define key_redo                       CUR Strings[177]
+#define key_reference                  CUR Strings[178]
+#define key_refresh                    CUR Strings[179]
+#define key_replace                    CUR Strings[180]
+#define key_restart                    CUR Strings[181]
+#define key_resume                     CUR Strings[182]
+#define key_save                       CUR Strings[183]
+#define key_suspend                    CUR Strings[184]
+#define key_undo                       CUR Strings[185]
+#define key_sbeg                       CUR Strings[186]
+#define key_scancel                    CUR Strings[187]
+#define key_scommand                   CUR Strings[188]
+#define key_scopy                      CUR Strings[189]
+#define key_screate                    CUR Strings[190]
+#define key_sdc                        CUR Strings[191]
+#define key_sdl                        CUR Strings[192]
+#define key_select                     CUR Strings[193]
+#define key_send                       CUR Strings[194]
+#define key_seol                       CUR Strings[195]
+#define key_sexit                      CUR Strings[196]
+#define key_sfind                      CUR Strings[197]
+#define key_shelp                      CUR Strings[198]
+#define key_shome                      CUR Strings[199]
+#define key_sic                        CUR Strings[200]
+#define key_sleft                      CUR Strings[201]
+#define key_smessage                   CUR Strings[202]
+#define key_smove                      CUR Strings[203]
+#define key_snext                      CUR Strings[204]
+#define key_soptions                   CUR Strings[205]
+#define key_sprevious                  CUR Strings[206]
+#define key_sprint                     CUR Strings[207]
+#define key_sredo                      CUR Strings[208]
+#define key_sreplace                   CUR Strings[209]
+#define key_sright                     CUR Strings[210]
+#define key_srsume                     CUR Strings[211]
+#define key_ssave                      CUR Strings[212]
+#define key_ssuspend                   CUR Strings[213]
+#define key_sundo                      CUR Strings[214]
+#define req_for_input                  CUR Strings[215]
+#define key_f11                        CUR Strings[216]
+#define key_f12                        CUR Strings[217]
+#define key_f13                        CUR Strings[218]
+#define key_f14                        CUR Strings[219]
+#define key_f15                        CUR Strings[220]
+#define key_f16                        CUR Strings[221]
+#define key_f17                        CUR Strings[222]
+#define key_f18                        CUR Strings[223]
+#define key_f19                        CUR Strings[224]
+#define key_f20                        CUR Strings[225]
+#define key_f21                        CUR Strings[226]
+#define key_f22                        CUR Strings[227]
+#define key_f23                        CUR Strings[228]
+#define key_f24                        CUR Strings[229]
+#define key_f25                        CUR Strings[230]
+#define key_f26                        CUR Strings[231]
+#define key_f27                        CUR Strings[232]
+#define key_f28                        CUR Strings[233]
+#define key_f29                        CUR Strings[234]
+#define key_f30                        CUR Strings[235]
+#define key_f31                        CUR Strings[236]
+#define key_f32                        CUR Strings[237]
+#define key_f33                        CUR Strings[238]
+#define key_f34                        CUR Strings[239]
+#define key_f35                        CUR Strings[240]
+#define key_f36                        CUR Strings[241]
+#define key_f37                        CUR Strings[242]
+#define key_f38                        CUR Strings[243]
+#define key_f39                        CUR Strings[244]
+#define key_f40                        CUR Strings[245]
+#define key_f41                        CUR Strings[246]
+#define key_f42                        CUR Strings[247]
+#define key_f43                        CUR Strings[248]
+#define key_f44                        CUR Strings[249]
+#define key_f45                        CUR Strings[250]
+#define key_f46                        CUR Strings[251]
+#define key_f47                        CUR Strings[252]
+#define key_f48                        CUR Strings[253]
+#define key_f49                        CUR Strings[254]
+#define key_f50                        CUR Strings[255]
+#define key_f51                        CUR Strings[256]
+#define key_f52                        CUR Strings[257]
+#define key_f53                        CUR Strings[258]
+#define key_f54                        CUR Strings[259]
+#define key_f55                        CUR Strings[260]
+#define key_f56                        CUR Strings[261]
+#define key_f57                        CUR Strings[262]
+#define key_f58                        CUR Strings[263]
+#define key_f59                        CUR Strings[264]
+#define key_f60                        CUR Strings[265]
+#define key_f61                        CUR Strings[266]
+#define key_f62                        CUR Strings[267]
+#define key_f63                        CUR Strings[268]
+#define clr_bol                        CUR Strings[269]
+#define clear_margins                  CUR Strings[270]
+#define set_left_margin                CUR Strings[271]
+#define set_right_margin               CUR Strings[272]
+#define label_format                   CUR Strings[273]
+#define set_clock                      CUR Strings[274]
+#define display_clock                  CUR Strings[275]
+#define remove_clock                   CUR Strings[276]
+#define create_window                  CUR Strings[277]
+#define goto_window                    CUR Strings[278]
+#define hangup                         CUR Strings[279]
+#define dial_phone                     CUR Strings[280]
+#define quick_dial                     CUR Strings[281]
+#define tone                           CUR Strings[282]
+#define pulse                          CUR Strings[283]
+#define flash_hook                     CUR Strings[284]
+#define fixed_pause                    CUR Strings[285]
+#define wait_tone                      CUR Strings[286]
+#define user0                          CUR Strings[287]
+#define user1                          CUR Strings[288]
+#define user2                          CUR Strings[289]
+#define user3                          CUR Strings[290]
+#define user4                          CUR Strings[291]
+#define user5                          CUR Strings[292]
+#define user6                          CUR Strings[293]
+#define user7                          CUR Strings[294]
+#define user8                          CUR Strings[295]
+#define user9                          CUR Strings[296]
+#define orig_pair                      CUR Strings[297]
+#define orig_colors                    CUR Strings[298]
+#define initialize_color               CUR Strings[299]
+#define initialize_pair                CUR Strings[300]
+#define set_color_pair                 CUR Strings[301]
+#define set_foreground                 CUR Strings[302]
+#define set_background                 CUR Strings[303]
+#define change_char_pitch              CUR Strings[304]
+#define change_line_pitch              CUR Strings[305]
+#define change_res_horz                CUR Strings[306]
+#define change_res_vert                CUR Strings[307]
+#define define_char                    CUR Strings[308]
+#define enter_doublewide_mode          CUR Strings[309]
+#define enter_draft_quality            CUR Strings[310]
+#define enter_italics_mode             CUR Strings[311]
+#define enter_leftward_mode            CUR Strings[312]
+#define enter_micro_mode               CUR Strings[313]
+#define enter_near_letter_quality      CUR Strings[314]
+#define enter_normal_quality           CUR Strings[315]
+#define enter_shadow_mode              CUR Strings[316]
+#define enter_subscript_mode           CUR Strings[317]
+#define enter_superscript_mode         CUR Strings[318]
+#define enter_upward_mode              CUR Strings[319]
+#define exit_doublewide_mode           CUR Strings[320]
+#define exit_italics_mode              CUR Strings[321]
+#define exit_leftward_mode             CUR Strings[322]
+#define exit_micro_mode                CUR Strings[323]
+#define exit_shadow_mode               CUR Strings[324]
+#define exit_subscript_mode            CUR Strings[325]
+#define exit_superscript_mode          CUR Strings[326]
+#define exit_upward_mode               CUR Strings[327]
+#define micro_column_address           CUR Strings[328]
+#define micro_down                     CUR Strings[329]
+#define micro_left                     CUR Strings[330]
+#define micro_right                    CUR Strings[331]
+#define micro_row_address              CUR Strings[332]
+#define micro_up                       CUR Strings[333]
+#define order_of_pins                  CUR Strings[334]
+#define parm_down_micro                CUR Strings[335]
+#define parm_left_micro                CUR Strings[336]
+#define parm_right_micro               CUR Strings[337]
+#define parm_up_micro                  CUR Strings[338]
+#define select_char_set                CUR Strings[339]
+#define set_bottom_margin              CUR Strings[340]
+#define set_bottom_margin_parm         CUR Strings[341]
+#define set_left_margin_parm           CUR Strings[342]
+#define set_right_margin_parm          CUR Strings[343]
+#define set_top_margin                 CUR Strings[344]
+#define set_top_margin_parm            CUR Strings[345]
+#define start_bit_image                CUR Strings[346]
+#define start_char_set_def             CUR Strings[347]
+#define stop_bit_image                 CUR Strings[348]
+#define stop_char_set_def              CUR Strings[349]
+#define subscript_characters           CUR Strings[350]
+#define superscript_characters         CUR Strings[351]
+#define these_cause_cr                 CUR Strings[352]
+#define zero_motion                    CUR Strings[353]
+#define char_set_names                 CUR Strings[354]
+#define key_mouse                      CUR Strings[355]
+#define mouse_info                     CUR Strings[356]
+#define req_mouse_pos                  CUR Strings[357]
+#define get_mouse                      CUR Strings[358]
+#define set_a_foreground               CUR Strings[359]
+#define set_a_background               CUR Strings[360]
+#define pkey_plab                      CUR Strings[361]
+#define device_type                    CUR Strings[362]
+#define code_set_init                  CUR Strings[363]
+#define set0_des_seq                   CUR Strings[364]
+#define set1_des_seq                   CUR Strings[365]
+#define set2_des_seq                   CUR Strings[366]
+#define set3_des_seq                   CUR Strings[367]
+#define set_lr_margin                  CUR Strings[368]
+#define set_tb_margin                  CUR Strings[369]
+#define bit_image_repeat               CUR Strings[370]
+#define bit_image_newline              CUR Strings[371]
+#define bit_image_carriage_return      CUR Strings[372]
+#define color_names                    CUR Strings[373]
+#define define_bit_image_region        CUR Strings[374]
+#define end_bit_image_region           CUR Strings[375]
+#define set_color_band                 CUR Strings[376]
+#define set_page_length                CUR Strings[377]
+#define display_pc_char                CUR Strings[378]
+#define enter_pc_charset_mode          CUR Strings[379]
+#define exit_pc_charset_mode           CUR Strings[380]
+#define enter_scancode_mode            CUR Strings[381]
+#define exit_scancode_mode             CUR Strings[382]
+#define pc_term_options                CUR Strings[383]
+#define scancode_escape                CUR Strings[384]
+#define alt_scancode_esc               CUR Strings[385]
+#define enter_horizontal_hl_mode       CUR Strings[386]
+#define enter_left_hl_mode             CUR Strings[387]
+#define enter_low_hl_mode              CUR Strings[388]
+#define enter_right_hl_mode            CUR Strings[389]
+#define enter_top_hl_mode              CUR Strings[390]
+#define enter_vertical_hl_mode         CUR Strings[391]
+#define set_a_attributes               CUR Strings[392]
+#define set_pglen_inch                 CUR Strings[393]
+
+#define BOOLWRITE 37
+#define NUMWRITE  33
+#define STRWRITE  394
+
+/* older synonyms for some capabilities */
+#define beehive_glitch	no_esc_ctlc
+#define teleray_glitch	dest_tabs_magic_smso
+#define micro_char_size micro_col_size
+
+#ifdef __INTERNAL_CAPS_VISIBLE
+#define termcap_init2                  CUR Strings[394]
+#define termcap_reset                  CUR Strings[395]
+#define magic_cookie_glitch_ul         CUR Numbers[33]
+#define backspaces_with_bs             CUR Booleans[37]
+#define crt_no_scrolling               CUR Booleans[38]
+#define no_correctly_working_cr        CUR Booleans[39]
+#define carriage_return_delay          CUR Numbers[34]
+#define new_line_delay                 CUR Numbers[35]
+#define linefeed_if_not_lf             CUR Strings[396]
+#define backspace_if_not_bs            CUR Strings[397]
+#define gnu_has_meta_key               CUR Booleans[40]
+#define linefeed_is_newline            CUR Booleans[41]
+#define backspace_delay                CUR Numbers[36]
+#define horizontal_tab_delay           CUR Numbers[37]
+#define number_of_function_keys        CUR Numbers[38]
+#define other_non_function_keys        CUR Strings[398]
+#define arrow_key_map                  CUR Strings[399]
+#define has_hardware_tabs              CUR Booleans[42]
+#define return_does_clr_eol            CUR Booleans[43]
+#define acs_ulcorner                   CUR Strings[400]
+#define acs_llcorner                   CUR Strings[401]
+#define acs_urcorner                   CUR Strings[402]
+#define acs_lrcorner                   CUR Strings[403]
+#define acs_ltee                       CUR Strings[404]
+#define acs_rtee                       CUR Strings[405]
+#define acs_btee                       CUR Strings[406]
+#define acs_ttee                       CUR Strings[407]
+#define acs_hline                      CUR Strings[408]
+#define acs_vline                      CUR Strings[409]
+#define acs_plus                       CUR Strings[410]
+#define memory_lock                    CUR Strings[411]
+#define memory_unlock                  CUR Strings[412]
+#define box_chars_1                    CUR Strings[413]
+#endif /* __INTERNAL_CAPS_VISIBLE */
+
+
+/*
+ * Predefined terminfo array sizes
+ */
+#define BOOLCOUNT 44
+#define NUMCOUNT  39
+#define STRCOUNT  414
+
+/* used by code for comparing entries */
+#define acs_chars_index	 146
+
+typedef struct termtype {	/* in-core form of terminfo data */
+    char  *term_names;		/* str_table offset of term names */
+    char  *str_table;		/* pointer to string table */
+    char  *Booleans;		/* array of boolean values */
+    short *Numbers;		/* array of integer values */
+    char  **Strings;		/* array of string offsets */
+
+#if NCURSES_XNAMES
+    char  *ext_str_table;	/* pointer to extended string table */
+    char  **ext_Names;		/* corresponding names */
+
+    unsigned short num_Booleans;/* count total Booleans */
+    unsigned short num_Numbers;	/* count total Numbers */
+    unsigned short num_Strings;	/* count total Strings */
+
+    unsigned short ext_Booleans;/* count extensions to Booleans */
+    unsigned short ext_Numbers;	/* count extensions to Numbers */
+    unsigned short ext_Strings;	/* count extensions to Strings */
+#endif /* NCURSES_XNAMES */
+
+} TERMTYPE;
+
+typedef struct term {		/* describe an actual terminal */
+    TERMTYPE	type;		/* terminal type description */
+    short	Filedes;	/* file description being written to */
+    TTY		Ottyb,		/* original state of the terminal */
+		Nttyb;		/* current state of the terminal */
+    int		_baudrate;	/* used to compute padding */
+    char *      _termname;      /* used for termname() */
+} TERMINAL;
+
+extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
+
+#if 0 /* BROKEN_LINKER */
+#define boolnames  _nc_boolnames()
+#define boolcodes  _nc_boolcodes()
+#define boolfnames _nc_boolfnames()
+#define numnames   _nc_numnames()
+#define numcodes   _nc_numcodes()
+#define numfnames  _nc_numfnames()
+#define strnames   _nc_strnames()
+#define strcodes   _nc_strcodes()
+#define strfnames  _nc_strfnames()
+
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);
+extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);
+
+#else
+
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
+
+#endif
+
+/* internals */
+extern NCURSES_EXPORT(int) _nc_set_tty_mode (TTY *buf);
+extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);
+extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);
+extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);
+extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);
+extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);
+extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);
+extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);
+
+/* entry points */
+extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);
+extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);
+
+/* miscellaneous entry points */
+extern NCURSES_EXPORT(int) restartterm (NCURSES_CONST char *, int, int *);
+extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *);
+
+/* terminfo entry points, also declared in curses.h */
+#if !defined(__NCURSES_H)
+extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);
+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);
+extern NCURSES_EXPORT_VAR(char) ttytype[];
+extern NCURSES_EXPORT(int) putp (const char *);
+extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);
+extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);
+#endif /* __NCURSES_H */
+
+/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
+#if !defined(NCURSES_TERMCAP_H_incl)
+extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
+extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
+extern NCURSES_EXPORT(int) tgetent (char *, const char *);
+extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
+extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
+extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
+#endif /* NCURSES_TERMCAP_H_incl */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NCURSES_TERM_H_incl */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-termcap.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-termcap.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-termcap.h	(revision 3073)
@@ -0,0 +1,75 @@
+/****************************************************************************
+ * Copyright (c) 1998,2000 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"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
+
+/* $Id$ */
+
+#ifndef NCURSES_TERMCAP_H_incl
+#define NCURSES_TERMCAP_H_incl	1
+
+#undef  NCURSES_VERSION
+#define NCURSES_VERSION "5.5"
+
+#include <ncurses_dll.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#include <sys/types.h>
+
+#undef  NCURSES_CONST 
+#define NCURSES_CONST /*nothing*/ 
+
+#undef  NCURSES_OSPEED 
+#define NCURSES_OSPEED short 
+
+extern NCURSES_EXPORT_VAR(char) PC;
+extern NCURSES_EXPORT_VAR(char *) UP;
+extern NCURSES_EXPORT_VAR(char *) BC;
+extern NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed; 
+
+#if !defined(NCURSES_TERM_H_incl)
+extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
+extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
+extern NCURSES_EXPORT(int) tgetent (char *, const char *);
+extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
+extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
+extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NCURSES_TERMCAP_H_incl */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.c
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.c	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.c	(revision 3073)
@@ -0,0 +1,48 @@
+/* generated by MKunctrl.awk */
+
+#include <curses.priv.h>
+
+#undef unctrl
+
+NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)
+{
+static const char* const table[] = {
+    "^\100", "^\101", "^\102", "^\103", "^\104", "^\105", "^\106", "^\107",
+    "^\110", "^\111", "^\112", "^\113", "^\114", "^\115", "^\116", "^\117",
+    "^\120", "^\121", "^\122", "^\123", "^\124", "^\125", "^\126", "^\127",
+    "^\130", "^\131", "^\132", "^\133", "^\134", "^\135", "^\136", "^\137",
+    "\040",  "\041",  "\042",  "\043",  "\044",  "\045",  "\046",  "\047", 
+    "\050",  "\051",  "\052",  "\053",  "\054",  "\055",  "\056",  "\057", 
+    "\060",  "\061",  "\062",  "\063",  "\064",  "\065",  "\066",  "\067", 
+    "\070",  "\071",  "\072",  "\073",  "\074",  "\075",  "\076",  "\077", 
+    "\100",  "\101",  "\102",  "\103",  "\104",  "\105",  "\106",  "\107", 
+    "\110",  "\111",  "\112",  "\113",  "\114",  "\115",  "\116",  "\117", 
+    "\120",  "\121",  "\122",  "\123",  "\124",  "\125",  "\126",  "\127", 
+    "\130",  "\131",  "\132",  "\133",  "\134",  "\135",  "\136",  "\137", 
+    "\140",  "\141",  "\142",  "\143",  "\144",  "\145",  "\146",  "\147", 
+    "\150",  "\151",  "\152",  "\153",  "\154",  "\155",  "\156",  "\157", 
+    "\160",  "\161",  "\162",  "\163",  "\164",  "\165",  "\166",  "\167", 
+    "\170",  "\171",  "\172",  "\173",  "\174",  "\175",  "\176",  "^?",
+    "~\100", "~\101", "~\102", "~\103", "~\104", "~\105", "~\106", "~\107",
+    "~\110", "~\111", "~\112", "~\113", "~\114", "~\115", "~\116", "~\117",
+    "~\120", "~\121", "~\122", "~\123", "~\124", "~\125", "~\126", "~\127",
+    "~\130", "~\131", "~\132", "~\133", "~\134", "~\135", "~\136", "~\137",
+    "\240",  "\241",  "\242",  "\243",  "\244",  "\245",  "\246",  "\247", 
+    "\250",  "\251",  "\252",  "\253",  "\254",  "\255",  "\256",  "\257", 
+    "\260",  "\261",  "\262",  "\263",  "\264",  "\265",  "\266",  "\267", 
+    "\270",  "\271",  "\272",  "\273",  "\274",  "\275",  "\276",  "\277", 
+    "\300",  "\301",  "\302",  "\303",  "\304",  "\305",  "\306",  "\307", 
+    "\310",  "\311",  "\312",  "\313",  "\314",  "\315",  "\316",  "\317", 
+    "\320",  "\321",  "\322",  "\323",  "\324",  "\325",  "\326",  "\327", 
+    "\330",  "\331",  "\332",  "\333",  "\334",  "\335",  "\336",  "\337", 
+    "\340",  "\341",  "\342",  "\343",  "\344",  "\345",  "\346",  "\347", 
+    "\350",  "\351",  "\352",  "\353",  "\354",  "\355",  "\356",  "\357", 
+    "\360",  "\361",  "\362",  "\363",  "\364",  "\365",  "\366",  "\367", 
+    "\370",  "\371",  "\372",  "\373",  "\374",  "\375",  "\376",  "\377"
+};
+int check = ChCharOf(ch);
+
+	if (check < 0 || check >= (int)SIZEOF(table)) return 0;
+
+	return (NCURSES_CONST char *)table[check];
+}
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.h
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.h	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap-os2.x86-unctrl.h	(revision 3073)
@@ -0,0 +1,63 @@
+/****************************************************************************
+ * Copyright (c) 1998,2000 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"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
+
+/*
+ * unctrl.h
+ *
+ * Display a printable version of a control character.
+ * Control characters are displayed in caret notation (^x), DELETE is displayed
+ * as ^?. Printable characters are displayed as is.
+ */
+
+/* $Id$ */
+
+#ifndef NCURSES_UNCTRL_H_incl
+#define NCURSES_UNCTRL_H_incl	1
+
+#undef  NCURSES_VERSION
+#define NCURSES_VERSION "5.5"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <curses.h>
+
+#undef unctrl
+NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NCURSES_UNCTRL_H_incl */
Index: /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap.kmk
===================================================================
--- /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap.kmk	(revision 3073)
+++ /trunk/essentials/sys-libs/ncurses/kNIX-bootstrap.kmk	(revision 3073)
@@ -0,0 +1,377 @@
+# $Id$
+## @file
+#
+# kNIX Boostrap Makefile for ncurses
+#
+# Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+#
+#
+# This file is part of kLIBC.
+#
+# kLIBC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# kLIBC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with kLIBC; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+
+DEPTH = ../../..
+include $(PATH_KBUILD)/header.kmk
+
+# 
+# The ncurses template.
+#
+TEMPLATE_ncurses_EXTENDS = usr.lib
+TEMPLATE_ncurses_DEFS = $(TEMPLATE_usr.lib_DEFS) \
+	HAVE_CONFIG_H \
+	_BSD_TYPES \
+	__BSD_VISIBLE \
+	_POSIX_C_SOURCE=200112L \
+	_XOPEN_SOURCE=600
+#	LOCALEDIR=\"/@unixroot/usr/share/locale\" 
+TEMPLATE_ncurses_INCS = $(TEMPLATE_usr.lib_INCS) \
+	$(PATH_TARGET) \
+	$(PATH_SUB_ROOT)/ncurses \
+	$(PATH_SUB_ROOT)/include \
+	$(PATH_SUB_CURRENT) \
+	$(PATH_SUB_ROOT)/menu \
+	$(PATH_SUB_ROOT)/panel\
+	$(PATH_SUB_ROOT)/form
+TEMPLATE_ncurses_LIBS = $(TEMPLATE_usr.lib_LIBS) \
+	$(TARGET_libncurses)
+TEMPLATE_ncurses_ORDERDEPS = $(TEMPLATE_usr.lib_ORDERDEPS) \
+	$(PATH_TARGET)/curses.h \
+	$(PATH_TARGET)/hashsize.h \
+	$(PATH_TARGET)/init_keytry.h \
+	$(PATH_TARGET)/ncurses_cfg.h \
+	$(PATH_TARGET)/ncurses_def.h \
+	$(PATH_TARGET)/nomacros.h \
+	$(PATH_TARGET)/parametrized.h \
+	$(PATH_TARGET)/term.h \
+	$(PATH_TARGET)/termcap.h \
+	$(PATH_TARGET)/unctrl.h
+
+#
+# libncurses
+#
+LIBRARIES += libncurses
+libncurses_TEMPLATE = ncurses
+libncurses_SOURCES = \
+	ncurses/tty/hardscroll.c \
+	ncurses/tty/hashmap.c \
+	ncurses/base/lib_addch.c \
+	ncurses/base/lib_addstr.c \
+	ncurses/base/lib_beep.c \
+	ncurses/base/lib_bkgd.c \
+	ncurses/base/lib_box.c \
+	ncurses/base/lib_chgat.c \
+	ncurses/base/lib_clear.c \
+	ncurses/base/lib_clearok.c \
+	ncurses/base/lib_clrbot.c \
+	ncurses/base/lib_clreol.c \
+	ncurses/base/lib_color.c \
+	ncurses/base/lib_colorset.c \
+	ncurses/base/lib_delch.c \
+	ncurses/base/lib_delwin.c \
+	ncurses/base/lib_echo.c \
+	ncurses/base/lib_endwin.c \
+	ncurses/base/lib_erase.c \
+	ncurses/base/lib_flash.c \
+	ncurses/base/lib_getch.c \
+	ncurses/base/lib_getstr.c \
+	ncurses/base/lib_hline.c \
+	ncurses/base/lib_immedok.c \
+	ncurses/base/lib_inchstr.c \
+	ncurses/base/lib_initscr.c \
+	ncurses/base/lib_insch.c \
+	ncurses/base/lib_insdel.c \
+	ncurses/base/lib_insnstr.c \
+	ncurses/base/lib_instr.c \
+	ncurses/base/lib_isendwin.c \
+	ncurses/base/lib_leaveok.c \
+	ncurses/base/lib_mouse.c \
+	ncurses/base/lib_move.c \
+	ncurses/tty/lib_mvcur.c \
+	ncurses/base/lib_mvwin.c \
+	ncurses/base/lib_newterm.c \
+	ncurses/base/lib_newwin.c \
+	ncurses/base/lib_nl.c \
+	ncurses/base/lib_overlay.c \
+	ncurses/base/lib_pad.c \
+	ncurses/base/lib_printw.c \
+	ncurses/base/lib_redrawln.c \
+	ncurses/base/lib_refresh.c \
+	ncurses/base/lib_restart.c \
+	ncurses/base/lib_scanw.c \
+	ncurses/base/lib_screen.c \
+	ncurses/base/lib_scroll.c \
+	ncurses/base/lib_scrollok.c \
+	ncurses/base/lib_scrreg.c \
+	ncurses/base/lib_set_term.c \
+	ncurses/base/lib_slk.c \
+	ncurses/base/lib_slkatr_set.c \
+	ncurses/base/lib_slkatrof.c \
+	ncurses/base/lib_slkatron.c \
+	ncurses/base/lib_slkatrset.c \
+	ncurses/base/lib_slkattr.c \
+	ncurses/base/lib_slkclear.c \
+	ncurses/base/lib_slkcolor.c \
+	ncurses/base/lib_slkinit.c \
+	ncurses/base/lib_slklab.c \
+	ncurses/base/lib_slkrefr.c \
+	ncurses/base/lib_slkset.c \
+	ncurses/base/lib_slktouch.c \
+	ncurses/base/lib_touch.c \
+	ncurses/tty/lib_tstp.c \
+	ncurses/base/lib_ungetch.c \
+	ncurses/tty/lib_vidattr.c \
+	ncurses/base/lib_vline.c \
+	ncurses/base/lib_wattroff.c \
+	ncurses/base/lib_wattron.c \
+	ncurses/base/lib_winch.c \
+	ncurses/base/lib_window.c \
+	ncurses/base/nc_panel.c \
+	ncurses/base/safe_sprintf.c \
+	ncurses/tty/tty_update.c \
+	ncurses/trace/varargs.c \
+	ncurses/base/memmove.c \
+	ncurses/base/vsscanf.c \
+	ncurses/base/lib_freeall.c \
+	ncurses/base/lib_dft_fgbg.c \
+	ncurses/tinfo/lib_print.c \
+	ncurses/base/resizeterm.c \
+	ncurses/base/wresize.c \
+	ncurses/tinfo/access.c \
+	ncurses/tinfo/add_tries.c \
+	ncurses/tinfo/alloc_entry.c \
+	ncurses/tinfo/alloc_ttype.c \
+	ncurses/tinfo/captoinfo.c \
+	ncurses/tinfo/comp_error.c \
+	ncurses/tinfo/comp_expand.c \
+	ncurses/tinfo/comp_hash.c \
+	ncurses/tinfo/comp_parse.c \
+	ncurses/tinfo/comp_scan.c \
+	ncurses/tinfo/doalloc.c \
+	ncurses/tinfo/free_ttype.c \
+	ncurses/tinfo/getenv_num.c \
+	ncurses/tinfo/home_terminfo.c \
+	ncurses/tinfo/init_keytry.c \
+	ncurses/tinfo/lib_acs.c \
+	ncurses/tinfo/lib_baudrate.c \
+	ncurses/tinfo/lib_cur_term.c \
+	ncurses/tinfo/lib_data.c \
+	ncurses/tinfo/lib_has_cap.c \
+	ncurses/tinfo/lib_kernel.c \
+	ncurses/tinfo/lib_longname.c \
+	ncurses/tinfo/lib_napms.c \
+	ncurses/tinfo/lib_options.c \
+	ncurses/tinfo/lib_raw.c \
+	ncurses/tinfo/lib_setup.c \
+	ncurses/tinfo/lib_termcap.c \
+	ncurses/tinfo/lib_termname.c \
+	ncurses/tinfo/lib_tgoto.c \
+	ncurses/tinfo/lib_ti.c \
+	ncurses/tinfo/lib_tparm.c \
+	ncurses/tinfo/lib_tputs.c \
+	ncurses/trace/lib_trace.c \
+	ncurses/tinfo/lib_ttyflags.c \
+	ncurses/tty/lib_twait.c \
+	ncurses/tinfo/name_match.c \
+	ncurses/tinfo/parse_entry.c \
+	ncurses/tinfo/read_entry.c \
+	ncurses/tinfo/read_termcap.c \
+	ncurses/tinfo/setbuf.c \
+	ncurses/tinfo/strings.c \
+	ncurses/base/tries.c \
+	ncurses/tinfo/trim_sgr0.c \
+	ncurses/trace/visbuf.c \
+	ncurses/tinfo/write_entry.c \
+	ncurses/base/define_key.c \
+	ncurses/base/key_defined.c \
+	ncurses/base/keybound.c \
+	ncurses/base/keyok.c \
+	ncurses/base/version.c \
+	\
+	$(PATH_TARGET)/lib_gen.c \
+	$(PATH_TARGET)/unctrl.c \
+	$(PATH_TARGET)/names.c \
+	$(PATH_TARGET)/expanded.c \
+	$(PATH_TARGET)/codes.c \
+	$(PATH_TARGET)/comp_captab.c \
+	$(PATH_TARGET)/fallback.c \
+	$(PATH_TARGET)/lib_keyname.c \
+
+#
+# form.a
+#
+LIBRARIES += libform
+libform_TEMPLATE = ncurses
+libform_SOURCES = \
+	form/fld_arg.c \
+	form/fld_attr.c \
+	form/fld_current.c \
+	form/fld_def.c \
+	form/fld_dup.c \
+	form/fld_ftchoice.c \
+	form/fld_ftlink.c \
+	form/fld_info.c \
+	form/fld_just.c \
+	form/fld_link.c \
+	form/fld_max.c \
+	form/fld_move.c \
+	form/fld_newftyp.c \
+	form/fld_opts.c \
+	form/fld_pad.c \
+	form/fld_page.c \
+	form/fld_stat.c \
+	form/fld_type.c \
+	form/fld_user.c \
+	form/frm_cursor.c \
+	form/frm_data.c \
+	form/frm_def.c \
+	form/frm_driver.c \
+	form/frm_hook.c \
+	form/frm_opts.c \
+	form/frm_page.c \
+	form/frm_post.c \
+	form/frm_req_name.c \
+	form/frm_scale.c \
+	form/frm_sub.c \
+	form/frm_user.c \
+	form/frm_win.c \
+	form/fty_alnum.c \
+	form/fty_alpha.c \
+	form/fty_enum.c \
+	form/fty_int.c \
+	form/fty_ipv4.c \
+	form/fty_num.c \
+	form/fty_regex.c \
+
+#
+# menu.a
+#
+LIBRARIES += libmenu
+libmenu_TEMPLATE = ncurses
+libmenu_SOURCES = \
+	menu/m_attribs.c \
+	menu/m_cursor.c \
+	menu/m_driver.c \
+	menu/m_format.c \
+	menu/m_global.c \
+	menu/m_hook.c \
+	menu/m_item_cur.c \
+	menu/m_item_nam.c \
+	menu/m_item_new.c \
+	menu/m_item_opt.c \
+	menu/m_item_top.c \
+	menu/m_item_use.c \
+	menu/m_item_val.c \
+	menu/m_item_vis.c \
+	menu/m_items.c \
+	menu/m_new.c \
+	menu/m_opts.c \
+	menu/m_pad.c \
+	menu/m_pattern.c \
+	menu/m_post.c \
+	menu/m_req_name.c \
+	menu/m_scale.c \
+	menu/m_spacing.c \
+	menu/m_sub.c \
+	menu/m_userptr.c \
+	menu/m_win.c \
+
+#
+# panel.a
+#
+LIBRARIES += libpanel
+libpanel_TEMPLATE = ncurses
+libpanel_SOURCES = \
+	panel/panel.c \
+	panel/p_above.c \
+	panel/p_below.c \
+	panel/p_bottom.c \
+	panel/p_delete.c \
+	panel/p_hide.c \
+	panel/p_hidden.c \
+	panel/p_move.c \
+	panel/p_new.c \
+	panel/p_replace.c \
+	panel/p_show.c \
+	panel/p_top.c \
+	panel/p_update.c \
+	panel/p_user.c \
+	panel/p_win.c \
+
+#
+# Generated source files.
+#
+$(PATH_TARGET)/codes.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-codes.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/comp_captab.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-comp_captab.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/expanded.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-expanded.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/fallback.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-fallback.c	
+	$(INSTALL) $< $@
+$(PATH_TARGET)/lib_gen.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-lib_gen.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/lib_keyname.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-lib_keyname.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/names.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-names.c
+	$(INSTALL) $< $@
+$(PATH_TARGET)/unctrl.c: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-unctrl.c
+	$(INSTALL) $< $@
+
+
+#
+# Generated header files.
+#
+$(PATH_TARGET)/curses.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-curses.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/hashsize.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-hashsize.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/init_keytry.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-init_keytry.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/ncurses_cfg.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-ncurses_cfg.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/ncurses_def.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-ncurses_def.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/nomacros.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-nomacros.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/parametrized.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-parametrized.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/term.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-term.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/termcap.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-termcap.h
+	$(INSTALL) $< $@
+$(PATH_TARGET)/unctrl.h: kNIX-bootstrap-$(BUILD_TARGET).$(BUILD_TARGET_ARCH)-unctrl.h
+	$(INSTALL) $< $@
+
+#
+# Header Installs
+#
+INSTALLS += ncurses-headers
+ncurses-headers_TEMPLATE = usr.include
+ncurses-headers_SOURCES = \
+	$(PATH_TARGET)/curses.h \
+	form/form.h \
+	menu/menu.h \
+	menu/eti.h \
+	$(PATH_TARGET)/curses.h=>ncurses.h \
+	include/ncurses_dll.h \
+	panel/panel.h \
+	$(PATH_TARGET)/term.h \
+	$(PATH_TARGET)/termcap.h \
+	$(PATH_TARGET)/unctrl.h
+
+include $(PATH_KBUILD)/footer.kmk
+
