version 1.63, 2018/08/21 16:06:48 |
version 1.65, 2020/09/06 14:45:22 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2014,2015,2017,2018,2020 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 90 ascii_init(enum termenc enc, const struct manoutput *o |
|
Line 90 ascii_init(enum termenc enc, const struct manoutput *o |
|
p->width = ascii_width; |
p->width = ascii_width; |
|
|
#if HAVE_WCHAR |
#if HAVE_WCHAR |
if (TERMENC_ASCII != enc) { |
if (enc != TERMENC_ASCII) { |
|
|
/* |
/* |
* Do not change any of this to LC_ALL. It might break |
* Do not change any of this to LC_ALL. It might break |
Line 99 ascii_init(enum termenc enc, const struct manoutput *o |
|
Line 99 ascii_init(enum termenc enc, const struct manoutput *o |
|
* worst case, it might even cause buffer overflows. |
* worst case, it might even cause buffer overflows. |
*/ |
*/ |
|
|
v = TERMENC_LOCALE == enc ? |
v = enc == TERMENC_LOCALE ? |
setlocale(LC_CTYPE, "") : |
setlocale(LC_CTYPE, "") : |
setlocale(LC_CTYPE, UTF8_LOCALE); |
setlocale(LC_CTYPE, UTF8_LOCALE); |
|
|
Line 113 ascii_init(enum termenc enc, const struct manoutput *o |
|
Line 113 ascii_init(enum termenc enc, const struct manoutput *o |
|
v = setlocale(LC_CTYPE, "C"); |
v = setlocale(LC_CTYPE, "C"); |
|
|
if (v != NULL && MB_CUR_MAX > 1) { |
if (v != NULL && MB_CUR_MAX > 1) { |
p->enc = enc; |
p->enc = TERMENC_UTF8; |
p->advance = locale_advance; |
p->advance = locale_advance; |
p->endline = locale_endline; |
p->endline = locale_endline; |
p->letter = locale_letter; |
p->letter = locale_letter; |
Line 232 ascii_endline(struct termp *p) |
|
Line 232 ascii_endline(struct termp *p) |
|
{ |
{ |
|
|
p->line++; |
p->line++; |
p->tcol->offset -= p->ti; |
if ((int)p->tcol->offset > p->ti) |
|
p->tcol->offset -= p->ti; |
|
else |
|
p->tcol->offset = 0; |
p->ti = 0; |
p->ti = 0; |
putchar('\n'); |
putchar('\n'); |
} |
} |
Line 390 locale_endline(struct termp *p) |
|
Line 393 locale_endline(struct termp *p) |
|
{ |
{ |
|
|
p->line++; |
p->line++; |
p->tcol->offset -= p->ti; |
if ((int)p->tcol->offset > p->ti) |
|
p->tcol->offset -= p->ti; |
|
else |
|
p->tcol->offset = 0; |
p->ti = 0; |
p->ti = 0; |
putwchar(L'\n'); |
putwchar(L'\n'); |
} |
} |