From owner-p4-projects@FreeBSD.ORG  Thu Dec  4 19:00:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B70491065679; Thu,  4 Dec 2008 19:00:22 +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 7B5F61065670
	for <perforce@FreeBSD.org>; Thu,  4 Dec 2008 19:00:22 +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 6B4858FC1F
	for <perforce@FreeBSD.org>; Thu,  4 Dec 2008 19:00:22 +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 mB4J0MZq011474
	for <perforce@FreeBSD.org>; Thu, 4 Dec 2008 19:00:22 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB4J0Ml3011472
	for perforce@freebsd.org; Thu, 4 Dec 2008 19:00:22 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 4 Dec 2008 19:00:22 GMT
Message-Id: <200812041900.mB4J0Ml3011472@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 154058 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: Thu, 04 Dec 2008 19:00:22 -0000

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

Change 154058 by ed@ed_flippo on 2008/12/04 18:59:41

	Let there be colors!

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#3 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#4 edit

Differences ...

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

@@ -210,6 +210,19 @@
  * libteken routines.
  */
 
+static unsigned char sccolors[8] = {
+	FG_BLACK, FG_RED, FG_GREEN, FG_BROWN, FG_BLUE, FG_MAGENTA, FG_CYAN, 
+	FG_LIGHTGREY,
+};
+
+static inline int
+scteken_attr(const teken_attr_t *a)
+{
+
+	return (((unsigned int)sccolors[a->ta_fgcolor]) << 8) |
+	    (((unsigned int)sccolors[a->ta_bgcolor]) << 12);
+}
+
 static void
 scteken_bell(void *arg)
 {
@@ -238,7 +251,7 @@
 
 	cursor = tp->tp_row * scp->xsize + tp->tp_col;
 	p = sc_vtb_pointer(&scp->vtb, cursor);
-	sc_vtb_putchar(&scp->vtb, p, map[ch], SC_NORM_ATTR << 8);
+	sc_vtb_putchar(&scp->vtb, p, map[ch], scteken_attr(a));
 	mark_all(scp);
 }
 

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

@@ -40,11 +40,11 @@
 typedef unsigned char teken_char_t;
 #endif /* TEKEN_UTF8 */
 typedef unsigned int teken_unit_t;
-typedef char teken_format_t;
+typedef unsigned char teken_format_t;
 #define	TF_BOLD		0x01
 #define	TF_UNDERLINE	0x02
 #define	TF_BLINK	0x04
-typedef char teken_color_t;
+typedef unsigned char teken_color_t;
 #define	TC_BLACK	0
 #define	TC_RED		1
 #define	TC_GREEN	2