Module Name: src
Committed By: drochner
Date: Tue Feb 23 19:48:26 UTC 2010
Modified Files:
src/lib/libcurses: acs.c add_wchstr.c addbytes.c addch.c border.c
cchar.c curses.h curses_private.h ins_wch.c ins_wstr.c line.c
move.c touchwin.c
Log Message:
misc fixes and improvements:
-call setlocale(LC_CTYPE, "") before nl_langinfo(CODESET) if the
locale settings is (still) at "C" - otherwise the CODESET doesn't work
-fix the type of the WACS_* symbols -- this needs to be cchar_t*
-add safeguards where the return value of wcwidth() is used for
loop counters or indexing -- it can be -1
-use more common code in the widechar support case -- in particular
let the wchar functions do the work even if chtype ones were called
-implement wcursyncup/wsyncup/wsyncdown
-somewhat experimental: allow ACS_* variables to refer to WACS_*
table entries -- this way, programs using the old chtype using API
can use UTF8 line drawing on terminals which support UTF8 but not
ACS switching
-fix some logics bugs in UTF8 recognition and ALTCHARSET handling
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libcurses/acs.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/add_wchstr.c \
src/lib/libcurses/cchar.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libcurses/addch.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/border.c
cvs rdiff -u -r1.99 -r1.100 src/lib/libcurses/curses.h
cvs rdiff -u -r1.44 -r1.45 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/ins_wch.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/line.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libcurses/move.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libcurses/touchwin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/acs.c
diff -u src/lib/libcurses/acs.c:1.17 src/lib/libcurses/acs.c:1.18
--- src/lib/libcurses/acs.c:1.17 Wed Feb 3 15:34:40 2010
+++ src/lib/libcurses/acs.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acs.c,v 1.17 2010/02/03 15:34:40 roy Exp $ */
+/* $NetBSD: acs.c,v 1.18 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: acs.c,v 1.17 2010/02/03 15:34:40 roy Exp $");
+__RCSID("$NetBSD: acs.c,v 1.18 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include "curses.h"
@@ -40,6 +40,7 @@
chtype _acs_char[NUM_ACS];
#ifdef HAVE_WCHAR
#include <assert.h>
+#include <locale.h>
#include <langinfo.h>
#include <strings.h>
@@ -105,9 +106,7 @@
while (*aofac != '\0') {
if ((acs = *aofac) == '\0')
return;
- if (++aofac == '\0')
- return;
- if ((term = *aofac) == '\0')
+ if ((term = *++aofac) == '\0')
return;
/* Only add characters 1 to 127 */
if (acs < NUM_ACS)
@@ -158,72 +157,106 @@
}
/* Add the SUSv2 defaults (those that are not '+') */
+ if (!strcmp(setlocale(LC_CTYPE, NULL), "C"))
+ setlocale(LC_CTYPE, "");
lstr = nl_langinfo(CODESET);
_DIAGASSERT(lstr);
- if (!strcasecmp(lstr, "UTF-8")) {
+ if (strcasecmp(lstr, "UTF-8")) {
#ifdef DEBUG
__CTRACE(__CTRACE_INIT, "__init_wacs: setting defaults\n" );
#endif /* DEBUG */
- WACS_RARROW = ( wchar_t )btowc( '>' );
- WACS_LARROW = ( wchar_t )btowc( '<' );
- WACS_UARROW = ( wchar_t )btowc( '^' );
- WACS_DARROW = ( wchar_t )btowc( 'v' );
- WACS_BLOCK = ( wchar_t )btowc( '#' );
- WACS_CKBOARD = ( wchar_t )btowc( ':' );
- WACS_DEGREE = ( wchar_t )btowc( 39 ); /* ' */
- WACS_PLMINUS = ( wchar_t )btowc( '#' );
- WACS_BOARD = ( wchar_t )btowc( '#' );
- WACS_LANTERN = ( wchar_t )btowc( '#' );
- WACS_HLINE = ( wchar_t )btowc( '-' );
- WACS_S1 = ( wchar_t )btowc( '-' );
- WACS_S9 = ( wchar_t )btowc( '_' );
- WACS_VLINE = ( wchar_t )btowc( '|' );
- WACS_BULLET = ( wchar_t )btowc( 'o' );
- WACS_S3 = ( wchar_t )btowc( 'p' );
- WACS_S7 = ( wchar_t )btowc( 'r' );
- WACS_LEQUAL = ( wchar_t )btowc( 'y' );
- WACS_GEQUAL = ( wchar_t )btowc( 'z' );
- WACS_PI = ( wchar_t )btowc( '{' );
- WACS_NEQUAL = ( wchar_t )btowc( '|' );
- WACS_STERLING = ( wchar_t )btowc( '}' );
+ WACS_RARROW->vals[0] = ( wchar_t )btowc( '>' );
+ WACS_LARROW->vals[0] = ( wchar_t )btowc( '<' );
+ WACS_UARROW->vals[0] = ( wchar_t )btowc( '^' );
+ WACS_DARROW->vals[0] = ( wchar_t )btowc( 'v' );
+ WACS_BLOCK->vals[0] = ( wchar_t )btowc( '#' );
+ WACS_CKBOARD->vals[0] = ( wchar_t )btowc( ':' );
+ WACS_DEGREE->vals[0] = ( wchar_t )btowc( 39 ); /* ' */
+ WACS_PLMINUS->vals[0] = ( wchar_t )btowc( '#' );
+ WACS_BOARD->vals[0] = ( wchar_t )btowc( '#' );
+ WACS_LANTERN->vals[0] = ( wchar_t )btowc( '#' );
+ WACS_HLINE->vals[0] = ( wchar_t )btowc( '-' );
+ WACS_S1->vals[0] = ( wchar_t )btowc( '-' );
+ WACS_S9->vals[0] = ( wchar_t )btowc( '_' );
+ WACS_VLINE->vals[0] = ( wchar_t )btowc( '|' );
+ WACS_BULLET->vals[0] = ( wchar_t )btowc( 'o' );
+ WACS_S3->vals[0] = ( wchar_t )btowc( 'p' );
+ WACS_S7->vals[0] = ( wchar_t )btowc( 'r' );
+ WACS_LEQUAL->vals[0] = ( wchar_t )btowc( 'y' );
+ WACS_GEQUAL->vals[0] = ( wchar_t )btowc( 'z' );
+ WACS_PI->vals[0] = ( wchar_t )btowc( '{' );
+ WACS_NEQUAL->vals[0] = ( wchar_t )btowc( '|' );
+ WACS_STERLING->vals[0]= ( wchar_t )btowc( '}' );
} else {
/* Unicode defaults */
#ifdef DEBUG
__CTRACE(__CTRACE_INIT,
"__init_wacs: setting Unicode defaults\n" );
#endif /* DEBUG */
- WACS_RARROW = 0x2192;
- WACS_LARROW = 0x2190;
- WACS_UARROW = 0x2192;
- WACS_DARROW = 0x2193;
- WACS_BLOCK = 0x25ae;
- WACS_DIAMOND = 0x25c6;
- WACS_CKBOARD = 0x2592;
- WACS_DEGREE = 0x00b0;
- WACS_PLMINUS = 0x00b1;
- WACS_BOARD = 0x2592;
- WACS_LANTERN = 0x2603;
- WACS_LRCORNER = 0x2518;
- WACS_URCORNER = 0x2510;
- WACS_ULCORNER = 0x250c;
- WACS_LLCORNER = 0x2514;
- WACS_PLUS = 0x253c;
- WACS_HLINE = 0x2500;
- WACS_S1 = 0x23ba;
- WACS_S9 = 0x23bd;
- WACS_LTEE = 0x251c;
- WACS_RTEE = 0x2524;
- WACS_BTEE = 0x2534;
- WACS_TTEE = 0x252c;
- WACS_VLINE = 0x2502;
- WACS_BULLET = 0x00b7;
- WACS_S3 = 0x23bb;
- WACS_S7 = 0x23bc;
- WACS_LEQUAL = 0x2264;
- WACS_GEQUAL = 0x2265;
- WACS_PI = 0x03C0;
- WACS_NEQUAL = 0x2260;
- WACS_STERLING = 0x00A3;
+ WACS_RARROW->vals[0] = 0x2192;
+ ACS_RARROW = '+' | __ACS_IS_WACS;
+ WACS_LARROW->vals[0] = 0x2190;
+ ACS_LARROW = ',' | __ACS_IS_WACS;
+ WACS_UARROW->vals[0] = 0x2192;
+ ACS_UARROW = '-' | __ACS_IS_WACS;
+ WACS_DARROW->vals[0] = 0x2193;
+ ACS_DARROW = '.' | __ACS_IS_WACS;
+ WACS_BLOCK->vals[0] = 0x25ae;
+ ACS_BLOCK = '0' | __ACS_IS_WACS;
+ WACS_DIAMOND->vals[0] = 0x25c6;
+ ACS_DIAMOND = '`' | __ACS_IS_WACS;
+ WACS_CKBOARD->vals[0] = 0x2592;
+ ACS_CKBOARD = 'a' | __ACS_IS_WACS;
+ WACS_DEGREE->vals[0] = 0x00b0;
+ ACS_DEGREE = 'f' | __ACS_IS_WACS;
+ WACS_PLMINUS->vals[0] = 0x00b1;
+ ACS_PLMINUS = 'g' | __ACS_IS_WACS;
+ WACS_BOARD->vals[0] = 0x2592;
+ ACS_BOARD = 'h' | __ACS_IS_WACS;
+ WACS_LANTERN->vals[0] = 0x2603;
+ ACS_LANTERN = 'i' | __ACS_IS_WACS;
+ WACS_LRCORNER->vals[0]= 0x2518;
+ ACS_LRCORNER = 'j' | __ACS_IS_WACS;
+ WACS_URCORNER->vals[0]= 0x2510;
+ ACS_URCORNER = 'k' | __ACS_IS_WACS;
+ WACS_ULCORNER->vals[0]= 0x250c;
+ ACS_ULCORNER = 'l' | __ACS_IS_WACS;
+ WACS_LLCORNER->vals[0]= 0x2514;
+ ACS_LLCORNER = 'm' | __ACS_IS_WACS;
+ WACS_PLUS->vals[0] = 0x253c;
+ ACS_PLUS = 'n' | __ACS_IS_WACS;
+ WACS_HLINE->vals[0] = 0x2500;
+ ACS_HLINE = 'q' | __ACS_IS_WACS;
+ WACS_S1->vals[0] = 0x23ba;
+ ACS_S1 = 'o' | __ACS_IS_WACS;
+ WACS_S9->vals[0] = 0x23bd;
+ ACS_S9 = 's' | __ACS_IS_WACS;
+ WACS_LTEE->vals[0] = 0x251c;
+ ACS_LTEE = 't' | __ACS_IS_WACS;
+ WACS_RTEE->vals[0] = 0x2524;
+ ACS_RTEE = 'u' | __ACS_IS_WACS;
+ WACS_BTEE->vals[0] = 0x2534;
+ ACS_BTEE = 'v' | __ACS_IS_WACS;
+ WACS_TTEE->vals[0] = 0x252c;
+ ACS_TTEE = 'w' | __ACS_IS_WACS;
+ WACS_VLINE->vals[0] = 0x2502;
+ ACS_VLINE = 'x' | __ACS_IS_WACS;
+ WACS_BULLET->vals[0] = 0x00b7;
+ ACS_BULLET = '~' | __ACS_IS_WACS;
+ WACS_S3->vals[0] = 0x23bb;
+ ACS_S3 = 'p' | __ACS_IS_WACS;
+ WACS_S7->vals[0] = 0x23bc;
+ ACS_S7 = 'r' | __ACS_IS_WACS;
+ WACS_LEQUAL->vals[0] = 0x2264;
+ ACS_LEQUAL = 'y' | __ACS_IS_WACS;
+ WACS_GEQUAL->vals[0] = 0x2265;
+ ACS_GEQUAL = 'z' | __ACS_IS_WACS;
+ WACS_PI->vals[0] = 0x03C0;
+ ACS_PI = '{' | __ACS_IS_WACS;
+ WACS_NEQUAL->vals[0] = 0x2260;
+ ACS_NEQUAL = '|' | __ACS_IS_WACS;
+ WACS_STERLING->vals[0]= 0x00A3;
+ ACS_STERLING = '}' | __ACS_IS_WACS;
}
if (t_acs_chars(screen->term) == NULL) {
@@ -239,9 +272,7 @@
while (*aofac != '\0') {
if ((acs = *aofac) == '\0')
return;
- if (++aofac == '\0')
- return;
- if ((term = *aofac) == '\0')
+ if ((term = *++aofac) == '\0')
return;
/* Only add characters 1 to 127 */
if (acs < NUM_ACS) {
@@ -259,9 +290,11 @@
__cputchar_args, screen->outfd);
out:
- for (count=0; count < NUM_ACS; count++)
+ for (count=0; count < NUM_ACS; count++) {
memcpy(&screen->wacs_char[count], &_wacs_char[count],
sizeof(cchar_t));
+ screen->acs_char[count]= _acs_char[count];
+ }
}
void
Index: src/lib/libcurses/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.3 src/lib/libcurses/add_wchstr.c:1.4
--- src/lib/libcurses/add_wchstr.c:1.3 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/add_wchstr.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.3 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.3 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -233,6 +233,8 @@
__CTRACE(__CTRACE_INPUT, "wadd_wchnstr: adding %x", wc);
#endif /* DEBUG */
cw = wcwidth(wc);
+ if (cw < 0)
+ cw = 1;
if (cw) {
/* spacing character */
#ifdef DEBUG
Index: src/lib/libcurses/cchar.c
diff -u src/lib/libcurses/cchar.c:1.3 src/lib/libcurses/cchar.c:1.4
--- src/lib/libcurses/cchar.c:1.3 Tue May 29 11:10:56 2007
+++ src/lib/libcurses/cchar.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cchar.c,v 1.3 2007/05/29 11:10:56 blymn Exp $ */
+/* $NetBSD: cchar.c,v 1.4 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cchar.c,v 1.3 2007/05/29 11:10:56 blymn Exp $");
+__RCSID("$NetBSD: cchar.c,v 1.4 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <string.h>
@@ -118,3 +118,21 @@
return OK;
#endif /* HAVE_WCHAR */
}
+
+void
+__cursesi_chtype_to_cchar(chtype in, cchar_t *out)
+{
+ unsigned int idx;
+
+ if (in & __ACS_IS_WACS) {
+ idx = in & __CHARTEXT;
+ if (idx < NUM_ACS) {
+ memcpy(out, &_wacs_char[idx], sizeof(cchar_t));
+ out->attributes |= in & __ATTRIBUTES;
+ return;
+ }
+ }
+ out->vals[0] = in & __CHARTEXT;
+ out->attributes = in & __ATTRIBUTES;
+ out->elements = 1;
+}
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.35 src/lib/libcurses/addbytes.c:1.36
--- src/lib/libcurses/addbytes.c:1.35 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/addbytes.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.35 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: addbytes.c,v 1.36 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.35 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.36 2010/02/23 19:48:26 drochner Exp $");
#endif
#endif /* not lint */
@@ -438,6 +438,8 @@
/* check for enough space before the end of line */
cw = wcwidth(wch->vals[0]);
+ if (cw < 0)
+ cw = 1;
if (cw > win->maxx - *x) {
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT,
Index: src/lib/libcurses/addch.c
diff -u src/lib/libcurses/addch.c:1.15 src/lib/libcurses/addch.c:1.16
--- src/lib/libcurses/addch.c:1.15 Mon May 28 15:01:53 2007
+++ src/lib/libcurses/addch.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: addch.c,v 1.15 2007/05/28 15:01:53 blymn Exp $ */
+/* $NetBSD: addch.c,v 1.16 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addch.c,v 1.15 2007/05/28 15:01:53 blymn Exp $");
+__RCSID("$NetBSD: addch.c,v 1.16 2010/02/23 19:48:26 drochner Exp $");
#endif
#endif /* not lint */
@@ -94,9 +94,7 @@
#endif
#ifdef HAVE_WCHAR
- cc.vals[0] = ch & __CHARTEXT;
- cc.elements = 1;
- cc.attributes = ch & __ATTRIBUTES;
+ __cursesi_chtype_to_cchar(ch, &cc);
#else
buf.ch = (wchar_t) ch & __CHARTEXT;
buf.attr = (attr_t) ch & __ATTRIBUTES;
Index: src/lib/libcurses/border.c
diff -u src/lib/libcurses/border.c:1.12 src/lib/libcurses/border.c:1.13
--- src/lib/libcurses/border.c:1.12 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/border.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: border.c,v 1.12 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: border.c,v 1.13 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: border.c,v 1.12 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: border.c,v 1.13 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -66,6 +66,7 @@
wborder(WINDOW *win, chtype left, chtype right, chtype top, chtype bottom,
chtype topleft, chtype topright, chtype botleft, chtype botright)
{
+#ifndef HAVE_WCHAR
int endy, endx, i;
__LDATA *fp, *lp;
@@ -134,20 +135,12 @@
win->alines[i]->line[0].attr = (attr_t) left & __ATTRIBUTES;
win->alines[i]->line[endx].ch = (wchar_t) right & __CHARTEXT;
win->alines[i]->line[endx].attr = (attr_t) right & __ATTRIBUTES;
-#ifdef HAVE_WCHAR
- SET_WCOL(win->alines[i]->line[0], 1);
- SET_WCOL(win->alines[i]->line[endx], 1);
-#endif
}
for (i = 1; i < endx; i++) {
fp[i].ch = (wchar_t) top & __CHARTEXT;
fp[i].attr = (attr_t) top & __ATTRIBUTES;
lp[i].ch = (wchar_t) bottom & __CHARTEXT;
lp[i].attr = (attr_t) bottom & __ATTRIBUTES;
-#ifdef HAVE_WCHAR
- SET_WCOL(fp[i], 1);
- SET_WCOL(lp[i], 1);
-#endif
}
/* Corners */
@@ -161,15 +154,30 @@
lp[0].attr = (attr_t) botleft & __ATTRIBUTES;
lp[endx].ch = (wchar_t) botright & __CHARTEXT;
lp[endx].attr = (attr_t) botright & __ATTRIBUTES;
-#ifdef HAVE_WCHAR
- SET_WCOL(fp[0], 1);
- SET_WCOL(fp[endx], 1);
- SET_WCOL(lp[0], 1);
- SET_WCOL(lp[endx], 1);
-#endif
}
__touchwin(win);
return (OK);
+#else /* HAVE_WCHAR */
+ cchar_t ls, rs, ts, bs, tl, tr, bl, br;
+ cchar_t *lsp, *rsp, *tsp, *bsp, *tlp, *trp, *blp, *brp;
+
+#define S(in, out) \
+ if (in & __CHARTEXT) { \
+ __cursesi_chtype_to_cchar(in, &out); \
+ out##p = &out; \
+ } else \
+ out##p = NULL
+ S(left, ls);
+ S(right, rs);
+ S(top, ts);
+ S(bottom, bs);
+ S(topleft, tl);
+ S(topright, tr);
+ S(botleft, bl);
+ S(botright, br);
+#undef S
+ return wborder_set(win, lsp, rsp, tsp, bsp, tlp, trp, blp, brp);
+#endif /* HAVE_WCHAR */
}
int border_set(const cchar_t *ls, const cchar_t *rs, const cchar_t *ts,
@@ -198,35 +206,35 @@
if ( ls && wcwidth( ls->vals[ 0 ]))
memcpy( &left, ls, sizeof( cchar_t ));
else
- setcchar( &left, &WACS_VLINE, win->wattr, 0, NULL );
+ memcpy( &left, WACS_VLINE, sizeof( cchar_t ));
if ( rs && wcwidth( rs->vals[ 0 ]))
memcpy( &right, rs, sizeof( cchar_t ));
else
- setcchar( &right, &WACS_VLINE, win->wattr, 0, NULL );
+ memcpy( &right, WACS_VLINE, sizeof( cchar_t ));
if ( ts && wcwidth( ts->vals[ 0 ]))
memcpy( &top, ts, sizeof( cchar_t ));
else
- setcchar( &top, &WACS_HLINE, win->wattr, 0, NULL );
+ memcpy( &top, WACS_HLINE, sizeof( cchar_t ));
if ( bs && wcwidth( bs->vals[ 0 ]))
memcpy( &bottom, bs, sizeof( cchar_t ));
else
- setcchar( &bottom, &WACS_HLINE, win->wattr, 0, NULL );
+ memcpy( &bottom, WACS_HLINE, sizeof( cchar_t ));
if ( tl && wcwidth( tl->vals[ 0 ]))
memcpy( &topleft, tl, sizeof( cchar_t ));
else
- setcchar( &topleft, &WACS_ULCORNER, win->wattr, 0, NULL );
+ memcpy( &topleft, WACS_ULCORNER, sizeof( cchar_t ));
if ( tr && wcwidth( tr->vals[ 0 ]))
memcpy( &topright, tr, sizeof( cchar_t ));
else
- setcchar( &topright, &WACS_URCORNER, win->wattr, 0, NULL );
+ memcpy( &topright, WACS_URCORNER, sizeof( cchar_t ));
if ( bl && wcwidth( bl->vals[ 0 ]))
memcpy( &botleft, bl, sizeof( cchar_t ));
else
- setcchar( &botleft, &WACS_LLCORNER, win->wattr, 0, NULL );
+ memcpy( &botleft, WACS_LLCORNER, sizeof( cchar_t ));
if ( br && wcwidth( br->vals[ 0 ]))
memcpy( &botright, br, sizeof( cchar_t ));
else
- setcchar( &botright, &WACS_LRCORNER, win->wattr, 0, NULL );
+ memcpy( &botright, WACS_LRCORNER, sizeof( cchar_t ));
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "wborder_set: left = %c, 0x%x\n",
@@ -272,6 +280,8 @@
for (i = 1; i < endy; i++) {
/* left border */
cw = wcwidth( left.vals[ 0 ]);
+ if (cw < 0)
+ cw = 1;
for ( j = 0; j < cw; j++ ) {
win->alines[i]->line[j].ch = left.vals[ 0 ];
win->alines[i]->line[j].attr = left.attributes;
@@ -314,6 +324,8 @@
}
/* right border */
cw = wcwidth( right.vals[ 0 ]);
+ if (cw < 0)
+ cw = 1;
pcw = WCOL( win->alines[i]->line[endx - cw]);
for ( j = endx - cw + 1; j <= endx; j++ ) {
win->alines[i]->line[j].ch = right.vals[ 0 ];
@@ -363,11 +375,21 @@
}
}
tlcw = wcwidth( topleft.vals[ 0 ]);
+ if (tlcw < 0)
+ tlcw = 1;
blcw = wcwidth( botleft.vals[ 0 ]);
+ if (blcw < 0)
+ blcw = 1;
trcw = wcwidth( topright.vals[ 0 ]);
+ if (trcw < 0)
+ trcw = 1;
brcw = wcwidth( botright.vals[ 0 ]);
+ if (brcw < 0)
+ brcw = 1;
/* upper border */
cw = wcwidth( top.vals[ 0 ]);
+ if (cw < 0)
+ cw = 1;
for (i = tlcw; i <= min( endx - cw, endx - trcw ); i += cw ) {
for ( j = 0; j < cw; j++ ) {
win->alines[ 0 ]->line[i + j].ch = top.vals[ 0 ];
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.99 src/lib/libcurses/curses.h:1.100
--- src/lib/libcurses/curses.h:1.99 Wed Feb 3 15:34:40 2010
+++ src/lib/libcurses/curses.h Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.99 2010/02/03 15:34:40 roy Exp $ */
+/* $NetBSD: curses.h,v 1.100 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -230,6 +230,9 @@
#define __ALTCHARSET 0x00010000 /* Added characters are ACS */
#define __COLOR 0x03fe0000 /* Color bits */
#define __ATTRIBUTES 0x03ffff00 /* All 8-bit attribute bits */
+#ifdef HAVE_WCHAR
+#define __ACS_IS_WACS 0x04000000 /* internal: use wacs table for ACS char */
+#endif
typedef struct __ldata __LDATA;
typedef struct __line __LINE;
@@ -325,38 +328,38 @@
#ifdef HAVE_WCHAR
extern cchar_t _wacs_char[NUM_ACS];
-#define WACS_RARROW _wacs_char[(unsigned char)'+'].vals[0]
-#define WACS_LARROW _wacs_char[(unsigned char)','].vals[0]
-#define WACS_UARROW _wacs_char[(unsigned char)'-'].vals[0]
-#define WACS_DARROW _wacs_char[(unsigned char)'.'].vals[0]
-#define WACS_BLOCK _wacs_char[(unsigned char)'0'].vals[0]
-#define WACS_DIAMOND _wacs_char[(unsigned char)'`'].vals[0]
-#define WACS_CKBOARD _wacs_char[(unsigned char)'a'].vals[0]
-#define WACS_DEGREE _wacs_char[(unsigned char)'f'].vals[0]
-#define WACS_PLMINUS _wacs_char[(unsigned char)'g'].vals[0]
-#define WACS_BOARD _wacs_char[(unsigned char)'h'].vals[0]
-#define WACS_LANTERN _wacs_char[(unsigned char)'i'].vals[0]
-#define WACS_LRCORNER _wacs_char[(unsigned char)'j'].vals[0]
-#define WACS_URCORNER _wacs_char[(unsigned char)'k'].vals[0]
-#define WACS_ULCORNER _wacs_char[(unsigned char)'l'].vals[0]
-#define WACS_LLCORNER _wacs_char[(unsigned char)'m'].vals[0]
-#define WACS_PLUS _wacs_char[(unsigned char)'n'].vals[0]
-#define WACS_HLINE _wacs_char[(unsigned char)'q'].vals[0]
-#define WACS_S1 _wacs_char[(unsigned char)'o'].vals[0]
-#define WACS_S9 _wacs_char[(unsigned char)'s'].vals[0]
-#define WACS_LTEE _wacs_char[(unsigned char)'t'].vals[0]
-#define WACS_RTEE _wacs_char[(unsigned char)'u'].vals[0]
-#define WACS_BTEE _wacs_char[(unsigned char)'v'].vals[0]
-#define WACS_TTEE _wacs_char[(unsigned char)'w'].vals[0]
-#define WACS_VLINE _wacs_char[(unsigned char)'x'].vals[0]
-#define WACS_BULLET _wacs_char[(unsigned char)'~'].vals[0]
-#define WACS_S3 _wacs_char[(unsigned char)'p'].vals[0]
-#define WACS_S7 _wacs_char[(unsigned char)'r'].vals[0]
-#define WACS_LEQUAL _wacs_char[(unsigned char)'y'].vals[0]
-#define WACS_GEQUAL _wacs_char[(unsigned char)'z'].vals[0]
-#define WACS_PI _wacs_char[(unsigned char)'{'].vals[0]
-#define WACS_NEQUAL _wacs_char[(unsigned char)'|'].vals[0]
-#define WACS_STERLING _wacs_char[(unsigned char)'}'].vals[0]
+#define WACS_RARROW (&_wacs_char[(unsigned char)'+'])
+#define WACS_LARROW (&_wacs_char[(unsigned char)','])
+#define WACS_UARROW (&_wacs_char[(unsigned char)'-'])
+#define WACS_DARROW (&_wacs_char[(unsigned char)'.'])
+#define WACS_BLOCK (&_wacs_char[(unsigned char)'0'])
+#define WACS_DIAMOND (&_wacs_char[(unsigned char)'`'])
+#define WACS_CKBOARD (&_wacs_char[(unsigned char)'a'])
+#define WACS_DEGREE (&_wacs_char[(unsigned char)'f'])
+#define WACS_PLMINUS (&_wacs_char[(unsigned char)'g'])
+#define WACS_BOARD (&_wacs_char[(unsigned char)'h'])
+#define WACS_LANTERN (&_wacs_char[(unsigned char)'i'])
+#define WACS_LRCORNER (&_wacs_char[(unsigned char)'j'])
+#define WACS_URCORNER (&_wacs_char[(unsigned char)'k'])
+#define WACS_ULCORNER (&_wacs_char[(unsigned char)'l'])
+#define WACS_LLCORNER (&_wacs_char[(unsigned char)'m'])
+#define WACS_PLUS (&_wacs_char[(unsigned char)'n'])
+#define WACS_HLINE (&_wacs_char[(unsigned char)'q'])
+#define WACS_S1 (&_wacs_char[(unsigned char)'o'])
+#define WACS_S9 (&_wacs_char[(unsigned char)'s'])
+#define WACS_LTEE (&_wacs_char[(unsigned char)'t'])
+#define WACS_RTEE (&_wacs_char[(unsigned char)'u'])
+#define WACS_BTEE (&_wacs_char[(unsigned char)'v'])
+#define WACS_TTEE (&_wacs_char[(unsigned char)'w'])
+#define WACS_VLINE (&_wacs_char[(unsigned char)'x'])
+#define WACS_BULLET (&_wacs_char[(unsigned char)'~'])
+#define WACS_S3 (&_wacs_char[(unsigned char)'p'])
+#define WACS_S7 (&_wacs_char[(unsigned char)'r'])
+#define WACS_LEQUAL (&_wacs_char[(unsigned char)'y'])
+#define WACS_GEQUAL (&_wacs_char[(unsigned char)'z'])
+#define WACS_PI (&_wacs_char[(unsigned char)'{'])
+#define WACS_NEQUAL (&_wacs_char[(unsigned char)'|'])
+#define WACS_STERLING (&_wacs_char[(unsigned char)'}'])
#endif /* HAVE_WCHAR */
/* System V compatibility */
@@ -755,6 +758,7 @@
int wclrtobot(WINDOW *);
int wclrtoeol(WINDOW *);
int wcolor_set(WINDOW *, short, void *);
+void wcursyncup(WINDOW *);
int wdelch(WINDOW *);
int wdeleteln(WINDOW *);
int wechochar(WINDOW *, const chtype);
@@ -782,6 +786,8 @@
int wsetscrreg(WINDOW *, int, int);
int wstandend(WINDOW *);
int wstandout(WINDOW *);
+void wsyncdown(WINDOW *);
+void wsyncup(WINDOW *);
void wtimeout(WINDOW *, int);
int wtouchln(WINDOW *, int, int, int);
int wunderend(WINDOW *);
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.44 src/lib/libcurses/curses_private.h:1.45
--- src/lib/libcurses/curses_private.h:1.44 Wed Feb 3 15:34:40 2010
+++ src/lib/libcurses/curses_private.h Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.44 2010/02/03 15:34:40 roy Exp $ */
+/* $NetBSD: curses_private.h,v 1.45 2010/02/23 19:48:26 drochner Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -311,6 +311,7 @@
void __cursesi_free_nsp(nschar_t *);
void __cursesi_win_free_nsp(WINDOW *);
void __cursesi_putnsp(nschar_t *, const int, const int);
+void __cursesi_chtype_to_cchar(chtype, cchar_t *);
#endif /* HAVE_WCHAR */
int __unget(wint_t);
char *__longname(char *, char *); /* Original BSD version */
Index: src/lib/libcurses/ins_wch.c
diff -u src/lib/libcurses/ins_wch.c:1.4 src/lib/libcurses/ins_wch.c:1.5
--- src/lib/libcurses/ins_wch.c:1.4 Wed Jul 22 16:57:15 2009
+++ src/lib/libcurses/ins_wch.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wch.c,v 1.4 2009/07/22 16:57:15 roy Exp $ */
+/* $NetBSD: ins_wch.c,v 1.5 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.4 2009/07/22 16:57:15 roy Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.5 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <string.h>
@@ -110,6 +110,8 @@
if ( !wch )
return OK;
cw = wcwidth(wch->vals[0]);
+ if (cw < 0)
+ cw = 1;
if (!cw)
return wadd_wch( win, wch );
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.4 src/lib/libcurses/ins_wstr.c:1.5
--- src/lib/libcurses/ins_wstr.c:1.4 Wed Jul 22 16:57:15 2009
+++ src/lib/libcurses/ins_wstr.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.4 2009/07/22 16:57:15 roy Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.5 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.4 2009/07/22 16:57:15 roy Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.5 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <string.h>
@@ -144,6 +144,8 @@
if (!wstr)
return OK;
cw = wcwidth(*wstr);
+ if (cw < 0)
+ cw = 1;
if (!cw)
return ERR;
@@ -152,9 +154,13 @@
len = 1;
n--;
while (*scp) {
+ int w;
if (!n)
break;
- n--, len++, width += wcwidth(*scp);
+ w = wcwidth(*scp);
+ if (w < 0)
+ w = 1;
+ n--, len++, width += w;
scp++;
}
#ifdef DEBUG
@@ -267,6 +273,8 @@
continue;
}
cw = wcwidth(*scp);
+ if (cw < 0)
+ cw = 1;
if (cw) {
/* 1st column */
temp1->ch = (wchar_t)*scp;
Index: src/lib/libcurses/line.c
diff -u src/lib/libcurses/line.c:1.5 src/lib/libcurses/line.c:1.6
--- src/lib/libcurses/line.c:1.5 Mon May 28 15:01:56 2007
+++ src/lib/libcurses/line.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: line.c,v 1.5 2007/05/28 15:01:56 blymn Exp $ */
+/* $NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: line.c,v 1.5 2007/05/28 15:01:56 blymn Exp $");
+__RCSID("$NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $");
#endif /* not lint */
#include <string.h>
@@ -83,6 +83,7 @@
int
whline(WINDOW *win, chtype ch, int count)
{
+#ifndef HAVE_WCHAR
int ocurx, n, i;
n = min(count, win->maxx - win->curx);
@@ -95,6 +96,17 @@
wmove(win, win->cury, ocurx);
return OK;
+#else
+ cchar_t cch, *cchp;
+
+ if (ch & __CHARTEXT) {
+ __cursesi_chtype_to_cchar(ch, &cch);
+ cchp = & cch;
+ } else
+ cchp = WACS_HLINE;
+
+ return whline_set(win, cchp, count);
+#endif
}
/*
@@ -140,6 +152,7 @@
int
wvline(WINDOW *win, chtype ch, int count)
{
+#ifndef HAVE_WCHAR
int ocury, ocurx, n, i;
n = min(count, win->maxy - win->cury);
@@ -153,6 +166,17 @@
wmove(win, ocury, ocurx);
return OK;
+#else
+ cchar_t cch, *cchp;
+
+ if (ch & __CHARTEXT) {
+ __cursesi_chtype_to_cchar(ch, &cch);
+ cchp = & cch;
+ } else
+ cchp = WACS_VLINE;
+
+ return wvline_set(win, cchp, count);
+#endif
}
int hline_set(const cchar_t *wch, int n)
@@ -194,6 +218,8 @@
cchar_t cc;
cw = wcwidth( wch->vals[ 0 ]);
+ if (cw < 0)
+ cw = 1;
if ( ( win->maxx - win->curx ) < cw )
return ERR;
wcn = min( n, ( win->maxx - win->curx ) / cw );
@@ -204,7 +230,7 @@
memcpy( &cc, wch, sizeof( cchar_t ));
if (!(wch->vals[ 0 ]))
- cc.vals[ 0 ] |= WACS_HLINE;
+ cc.vals[ 0 ] |= WACS_HLINE->vals[0];
for (i = 0; i < wcn; i++ ) {
#ifdef DEBUG
__CTRACE(__CTRACE_LINE, "whline_set: (%d,%d)\n",
@@ -265,7 +291,7 @@
memcpy( &cc, wch, sizeof( cchar_t ));
if (!(wch->vals[ 0 ]))
- cc.vals[ 0 ] |= WACS_VLINE;
+ cc.vals[ 0 ] |= WACS_VLINE->vals[0];
for (i = 0; i < wcn; i++) {
mvwadd_wch(win, ocury + i, ocurx, &cc);
#ifdef DEBUG
Index: src/lib/libcurses/move.c
diff -u src/lib/libcurses/move.c:1.16 src/lib/libcurses/move.c:1.17
--- src/lib/libcurses/move.c:1.16 Wed Jul 22 16:57:15 2009
+++ src/lib/libcurses/move.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.16 2009/07/22 16:57:15 roy Exp $ */
+/* $NetBSD: move.c,v 1.17 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: move.c,v 1.16 2009/07/22 16:57:15 roy Exp $");
+__RCSID("$NetBSD: move.c,v 1.17 2010/02/23 19:48:26 drochner Exp $");
#endif
#endif /* not lint */
@@ -75,3 +75,14 @@
win->alines[y]->flags &= ~__ISPASTEOL;
return (OK);
}
+
+void
+wcursyncup(WINDOW *win)
+{
+
+ while (win->orig) {
+ wmove(win->orig, win->cury + win->begy - win->orig->begy,
+ win->curx + win->begx - win->orig->begx);
+ win = win->orig;
+ }
+}
Index: src/lib/libcurses/touchwin.c
diff -u src/lib/libcurses/touchwin.c:1.25 src/lib/libcurses/touchwin.c:1.26
--- src/lib/libcurses/touchwin.c:1.25 Wed Jul 22 16:57:15 2009
+++ src/lib/libcurses/touchwin.c Tue Feb 23 19:48:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: touchwin.c,v 1.25 2009/07/22 16:57:15 roy Exp $ */
+/* $NetBSD: touchwin.c,v 1.26 2010/02/23 19:48:26 drochner Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)touchwin.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: touchwin.c,v 1.25 2009/07/22 16:57:15 roy Exp $");
+__RCSID("$NetBSD: touchwin.c,v 1.26 2010/02/23 19:48:26 drochner Exp $");
#endif
#endif /* not lint */
@@ -211,3 +211,27 @@
#endif
return (OK);
}
+
+void
+wsyncup(WINDOW *win)
+{
+
+ do {
+ touchwin(win);
+ win = win->orig;
+ } while (win);
+}
+
+void
+wsyncdown(WINDOW *win)
+{
+ WINDOW *w = win->orig;
+
+ while (w) {
+ if (is_wintouched(w)) {
+ touchwin(win);
+ break;
+ }
+ w = w->orig;
+ }
+}
