blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

cell_load: ingest pool_load()

Browse Source
This commit is contained in:
nick black 2021-02-05 02:30:52 -05:00
parent e8f03235eb
commit 8b4c5fdeb9
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/notcurses.c
View File

@ -1446,7 +1446,9 @@ void scroll_down(ncplane* n){
}
int cell_load(ncplane* n, nccell* c, const char* gcluster){
return pool_load(&n->pool, c, gcluster);
int cols;
int bytes = utf8_egc_len(gcluster, &cols);
return pool_load_direct(&n->pool, c, gcluster, bytes, cols);
}
// where the magic happens. write the single EGC completely described by |egc|,
@ -1457,9 +1459,10 @@ int cell_load(ncplane* n, nccell* c, const char* gcluster){
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 or y
// are specified, however, we must always try to print there.
// FIXME reject any control or space characters here--should be iswgraph()
// check *before ncplane_cursor_move_yx()* whether we're past the end of the
// line. if scrolling is enabled, move to the next line if so. if x or y are
// specified, we must always try to print at exactly that location.
if(x != -1){
if(x + cols > n->lenx){
logerror(ncplane_notcurses(n), "Target x %d + %d cols >= length %d\n", x, cols, n->lenx);
@ -1479,11 +1482,8 @@ ncplane_put(ncplane* n, int y, int x, const char* egc, int cols,
// FIXME don't we need to check here for wide character on edge (though our
// docs currently claim that a wide char on edge is allowed...)?
if(*egc == '\n'){
if(n->scrolling){
scroll_down(n);
return 0;
}
// FIXME isn't it an error if scrolling is disabled?
scroll_down(n);
return 0;
}
// A wide character obliterates anything to its immediate right (and marks
// that cell as wide). Any character placed atop one half of a wide character