Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-06 03:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncplane_put: reject wide char on last column #967

Browse Source
This commit is contained in:
nick black 2020-08-29 20:21:12 -04:00 committed by Nick Black
parent 5901fce433
commit 277411a1b9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/notcurses.c
View File

@ -1340,8 +1340,15 @@ static inline int
ncplane_put(ncplane* n, int y, int x, const char* egc, int cols,
uint16_t stylemask, uint64_t channels, int bytes){
// if scrolling is enabled, check *before ncplane_cursor_move_yx()* whether
// we're past the end of the line, and move to the next line if so.
if(x == -1 && y == -1 && n->x + cols > n->lenx){
// we're past the end of the line, and move to the next line if so. if x or y
// are specified, however, we must always try to print there.
if(x != -1){
if(x + cols > n->lenx){
logerror(n->nc, "Target x %d + %d cols >= length %d\n", x, cols, n->lenx);
ncplane_cursor_move_yx(n, y, x); // update cursor, though
return -1;
}
}else if(y == -1 && n->x + cols > n->lenx){
if(!n->scrolling){
logerror(n->nc, "No room to output [%.*s] %d/%d\n", bytes, egc, n->y, n->x);
return -1;