| scterm-teken.c (256281) | scterm-teken.c (262861) |
|---|---|
| 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: stable/10/sys/dev/syscons/scterm-teken.c 239696 2012-08-25 23:59:31Z gonzo $"); | 31__FBSDID("$FreeBSD: stable/10/sys/dev/syscons/scterm-teken.c 262861 2014-03-06 18:30:56Z jhb $"); |
| 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> --- 508 unchanged lines hidden (view full) --- 548 const teken_attr_t *a) 549{ 550 scr_stat *scp = arg; 551 u_char *map; 552 u_char ch; 553 vm_offset_t p; 554 int cursor, attr; 555 | 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> --- 508 unchanged lines hidden (view full) --- 548 const teken_attr_t *a) 549{ 550 scr_stat *scp = arg; 551 u_char *map; 552 u_char ch; 553 vm_offset_t p; 554 int cursor, attr; 555 |
| 556 /* 557 * No support for printing right hand sides for CJK fullwidth 558 * characters. Simply print a space and assume that the left 559 * hand side describes the entire character. 560 */ |
|
| 556 attr = scteken_attr(a) << 8; | 561 attr = scteken_attr(a) << 8; |
| 562 if (a->ta_format & TF_CJK_RIGHT) 563 c = ' '; |
|
| 557#ifdef TEKEN_UTF8 558 scteken_get_cp437(&c, &attr); 559#endif /* TEKEN_UTF8 */ 560 ch = c; 561 562 map = scp->sc->scr_map; 563 564 cursor = tp->tp_row * scp->xsize + tp->tp_col; --- 159 unchanged lines hidden --- | 564#ifdef TEKEN_UTF8 565 scteken_get_cp437(&c, &attr); 566#endif /* TEKEN_UTF8 */ 567 ch = c; 568 569 map = scp->sc->scr_map; 570 571 cursor = tp->tp_row * scp->xsize + tp->tp_col; --- 159 unchanged lines hidden --- |