From owner-svn-src-user@FreeBSD.ORG Tue Oct 15 12:54:48 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDBE7D92; Tue, 15 Oct 2013 12:54:47 +0000 (UTC) (envelope-from ray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBC162056; Tue, 15 Oct 2013 12:54:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FCslq6003093; Tue, 15 Oct 2013 12:54:47 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FCslUs003090; Tue, 15 Oct 2013 12:54:47 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201310151254.r9FCslUs003090@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 15 Oct 2013 12:54:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256530 - user/ed/newcons/sys/dev/vt/colors X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 12:54:48 -0000 Author: ray Date: Tue Oct 15 12:54:47 2013 New Revision: 256530 URL: http://svnweb.freebsd.org/changeset/base/256530 Log: Add helper to generate color map. Sponsored by: The FreeBSD Foundation Added: user/ed/newcons/sys/dev/vt/colors/ user/ed/newcons/sys/dev/vt/colors/vt_termcolors.c (contents, props changed) user/ed/newcons/sys/dev/vt/colors/vt_termcolors.h (contents, props changed) Added: user/ed/newcons/sys/dev/vt/colors/vt_termcolors.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ed/newcons/sys/dev/vt/colors/vt_termcolors.c Tue Oct 15 12:54:47 2013 (r256530) @@ -0,0 +1,80 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Aleksandr Rybalko under sponsorship from the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include + +#include + +static struct { + unsigned char r; /* Red percentage value. */ + unsigned char g; /* Green percentage value. */ + unsigned char b; /* Blue percentage value. */ +} color_def[16] = { + {0, 0, 0}, /* black */ + {0, 0, 50}, /* dark blue */ + {0, 50, 0}, /* dark green */ + {0, 50, 50}, /* dark cyan */ + {50, 0, 0}, /* dark red */ + {50, 0, 50}, /* dark magenta */ + {50, 50, 0}, /* brown */ + {75, 75, 75}, /* light gray */ + {50, 50, 50}, /* dark gray */ + {0, 0, 100}, /* light blue */ + {0, 100, 0}, /* light green */ + {0, 100, 100}, /* light cyan */ + {100, 0, 0}, /* light red */ + {100, 0, 100}, /* light magenta */ + {100, 100, 0}, /* yellow */ + {100, 100, 100}, /* white */ +}; + +int +vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int roffset, + uint32_t gmax, int goffset, uint32_t bmax, int boffset) +{ + int i; + +#define CF(_f, _i) ((_f ## max * color_def[(_i)]._f / 100) << _f ## offset) + for (i = 0; i < 16; i++) { + switch (format) { + case COLOR_FORMAT_VGA: + palette[i] = i; + break; + case COLOR_FORMAT_RGB: + palette[i] = CF(r, i) | CF(g, i) | CF(b, i); + break; + default: + return (ENODEV); + } + } +#undef CF + return (0); +} Added: user/ed/newcons/sys/dev/vt/colors/vt_termcolors.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ed/newcons/sys/dev/vt/colors/vt_termcolors.h Tue Oct 15 12:54:47 2013 (r256530) @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Aleksandr Rybalko under sponsorship from the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +enum vt_color_format { + COLOR_FORMAT_BW = 0, + COLOR_FORMAT_GRAY, + COLOR_FORMAT_VGA, /* Color Index. */ + COLOR_FORMAT_RGB, + COLOR_FORMAT_ARGB, + COLOR_FORMAT_CMYK, + COLOR_FORMAT_HSL, + COLOR_FORMAT_YUV, + COLOR_FORMAT_YCbCr, + COLOR_FORMAT_YPbPr, + + COLOR_FORMAT_MAX = 15, +}; + +/* Helper to fill color map used by driver */ +int vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, + int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset); +