| scterm-teken.c (197174) | scterm-teken.c (197522) |
|---|---|
| 1/*- 2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * All rights reserved. 4 * 5 * Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org> 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * All rights reserved. 4 * 5 * Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org> 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: head/sys/dev/syscons/scterm-teken.c 197174 2009-09-13 18:45:59Z ed $"); | 31__FBSDID("$FreeBSD: head/sys/dev/syscons/scterm-teken.c 197522 2009-09-26 15:26:32Z ed $"); |
| 32 33#include "opt_syscons.h" 34#include "opt_teken.h" 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/kernel.h> 39#include <sys/module.h> --- 268 unchanged lines hidden (view full) --- 308 309static unsigned int 310scteken_attr(const teken_attr_t *a) 311{ 312 unsigned int attr = 0; 313 teken_color_t fg, bg; 314 315 if (a->ta_format & TF_REVERSE) { | 32 33#include "opt_syscons.h" 34#include "opt_teken.h" 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/kernel.h> 39#include <sys/module.h> --- 268 unchanged lines hidden (view full) --- 308 309static unsigned int 310scteken_attr(const teken_attr_t *a) 311{ 312 unsigned int attr = 0; 313 teken_color_t fg, bg; 314 315 if (a->ta_format & TF_REVERSE) { |
| 316 fg = a->ta_bgcolor; 317 bg = a->ta_fgcolor; | 316 fg = teken_256to8(a->ta_bgcolor); 317 bg = teken_256to8(a->ta_fgcolor); |
| 318 } else { | 318 } else { |
| 319 fg = a->ta_fgcolor; 320 bg = a->ta_bgcolor; | 319 fg = teken_256to8(a->ta_fgcolor); 320 bg = teken_256to8(a->ta_bgcolor); |
| 321 } 322 if (a->ta_format & TF_BOLD) 323 attr |= fgcolors_bold[fg]; 324 else 325 attr |= fgcolors_normal[fg]; 326 attr |= bgcolors[bg]; 327 328#ifdef FG_UNDERLINE --- 328 unchanged lines hidden --- | 321 } 322 if (a->ta_format & TF_BOLD) 323 attr |= fgcolors_bold[fg]; 324 else 325 attr |= fgcolors_normal[fg]; 326 attr |= bgcolors[bg]; 327 328#ifdef FG_UNDERLINE --- 328 unchanged lines hidden --- |