SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-11-11 01:29:48 +00:00
parent 5903cbe575
commit 62d64fa864
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
841 changed files with 83929 additions and 40755 deletions
Download patch file Download diff file Expand all files Collapse all files

54
lib/libcurses/base/lib_insch.c
View file

@ -1,7 +1,8 @@
/* $OpenBSD: lib_insch.c,v 1.3 2010/01/12 23:22:05 nicm Exp $ */
/* $OpenBSD: lib_insch.c,v 1.4 2023/10/17 09:52:08 nicm Exp $ */
/****************************************************************************
* Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. *
* Copyright 2020 Thomas E. Dickey *
* Copyright 1998-2013,2016 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@ -45,24 +46,31 @@
#include <curses.priv.h>
#include <ctype.h>
MODULE_ID("$Id: lib_insch.c,v 1.3 2010/01/12 23:22:05 nicm Exp $")
MODULE_ID("$Id: lib_insch.c,v 1.4 2023/10/17 09:52:08 nicm Exp $")
/*
* Insert the given character, updating the current location to simplify
* inserting a string.
*/
NCURSES_EXPORT(int)
_nc_insert_ch(WINDOW *win, chtype ch)
_nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
{
int code = OK;
int ch8 = (int) ChCharOf(ch);
NCURSES_CH_T wch;
int count;
NCURSES_CONST char *s;
int tabsize = (
#if USE_REENTRANT
sp->_TABSIZE
#else
TABSIZE
#endif
);
switch (ch) {
case '\t':
for (count = (TABSIZE - (win->_curx % TABSIZE)); count > 0; count--) {
if ((code = _nc_insert_ch(win, ' ')) != OK)
for (count = (tabsize - (win->_curx % tabsize)); count > 0; count--) {
if ((code = _nc_insert_ch(sp, win, ' ')) != OK)
break;
}
break;
@ -77,8 +85,9 @@ _nc_insert_ch(WINDOW *win, chtype ch)
#if USE_WIDEC_SUPPORT
WINDOW_EXT(win, addch_used) == 0 &&
#endif
is8bits(ChCharOf(ch)) &&
isprint(ChCharOf(ch))) {
(isprint(ch8) ||
(ChAttrOf(ch) & A_ALTCHARSET) ||
(sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) {
if (win->_curx <= win->_maxx) {
struct ldat *line = &(win->_line[win->_cury]);
NCURSES_CH_T *end = &(line->text[win->_curx]);
@ -94,10 +103,11 @@ _nc_insert_ch(WINDOW *win, chtype ch)
*temp1 = _nc_render(win, wch);
win->_curx++;
}
} else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) {
s = unctrl(ChCharOf(ch));
} else if (iscntrl(ch8)) {
NCURSES_CONST char *s;
s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
while (*s != '\0') {
code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
code = _nc_insert_ch(sp, win, ChAttrOf(ch) | UChar(*s));
if (code != OK)
break;
++s;
@ -112,13 +122,15 @@ _nc_insert_ch(WINDOW *win, chtype ch)
wch = _nc_render(win, wch);
count = _nc_build_wch(win, &wch);
if (count > 0) {
code = wins_wch(win, &wch);
code = _nc_insert_wch(win, &wch);
} else if (count == -1) {
NCURSES_CONST char *s;
/* handle EILSEQ */
if (is8bits(ch)) {
s = unctrl(ChCharOf(ch));
s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
if (strlen(s) > 1) {
while (*s != '\0') {
code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
code = _nc_insert_ch(sp, win,
ChAttrOf(ch) | UChar(*s));
if (code != OK)
break;
++s;
@ -137,17 +149,15 @@ _nc_insert_ch(WINDOW *win, chtype ch)
NCURSES_EXPORT(int)
winsch(WINDOW *win, chtype c)
{
NCURSES_SIZE_T oy;
NCURSES_SIZE_T ox;
int code = ERR;
T((T_CALLED("winsch(%p, %s)"), win, _tracechtype(c)));
T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
if (win != 0) {
oy = win->_cury;
ox = win->_curx;
NCURSES_SIZE_T oy = win->_cury;
NCURSES_SIZE_T ox = win->_curx;
code = _nc_insert_ch(win, c);
code = _nc_insert_ch(_nc_screen_of(win), win, c);
win->_curx = ox;
win->_cury = oy;