From owner-p4-projects@FreeBSD.ORG  Sun Dec  7 13:11:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5E814106567C; Sun,  7 Dec 2008 13:11:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21F6A106564A
	for <perforce@FreeBSD.org>; Sun,  7 Dec 2008 13:11:14 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 10F1D8FC0C
	for <perforce@FreeBSD.org>; Sun,  7 Dec 2008 13:11:14 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7DBDiI083274
	for <perforce@FreeBSD.org>; Sun, 7 Dec 2008 13:11:13 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7DBDLS083272
	for perforce@freebsd.org; Sun, 7 Dec 2008 13:11:13 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 13:11:13 GMT
Message-Id: <200812071311.mB7DBDLS083272@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 154254 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Dec 2008 13:11:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=154254

Change 154254 by ed@ed_flippo on 2008/12/07 13:10:56

	Add an implementation of wcwidth() to libteken.
	
	I just took Markus Kuhn's implementation (see URL in
	teken_wcwidth.h). Maybe we should add it to libkern. It's good
	enough for now.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#1 add

Differences ...

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 (text+ko) ====

@@ -46,6 +46,16 @@
 #endif /* __FreeBSD__ && _KERNEL */
 
 #include "teken.h"
+#ifdef TEKEN_UTF8
+#include "teken_wcwidth.h"
+#else /* !TEKEN_UTF8 */
+static inline int
+teken_wcwidth(teken_char_t c)
+{
+
+	return (c <= 0x1B) ? -1 : 1;
+}
+#endif /* TEKEN_UTF8 */
 
 #define	teken_clamp(x,low,high)	(((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 (text+ko) ====

@@ -685,18 +685,11 @@
 static void
 teken_subr_regular_character(teken_t *t, teken_char_t c)
 {
-	unsigned int width;
+	int width;
 
-	/* Unprintable characters. */
-	if (c <= 0x1B)
+	width = teken_wcwidth(c);
+	if (width < 0)
 		return;
-	
-	/* XXX: calculate character width! */
-#ifdef TEKEN_UTF8
-	width = 1;
-#else /* !TEKEN_UTF8 */
-	width = 1;
-#endif /* TEKEN_UTF8 */
 
 	if (t->t_stateflags & TS_INSERT) {
 		/*