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

break out pool_load_direct(), pool_load()

Browse Source
This commit is contained in:
nick black 2020-08-20 20:33:36 -04:00 committed by Nick Black
parent ab0833fc6e
commit 8ebadbc76f
2 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/lib/internal.h
View File

@ -876,6 +876,54 @@ cell_blend_bchannel(cell* cl, unsigned channel, unsigned* blends){
return cell_set_bchannel(cl, channels_blend(cell_bchannel(cl), channel, blends));
}
static inline int
pool_load_direct(egcpool* pool, cell* c, const char* gcluster, int bytes, int cols){
if(bytes < 0 || cols < 0){
return -1;
}
if(bytes <= 1){
assert(cols < 2);
pool_release(pool, c);
c->channels &= ~(CELL_WIDEASIAN_MASK | CELL_NOBACKGROUND_MASK);
c->gcluster = *gcluster;
return bytes;
}
// FIXME also shaded blocks! ░ etc. are there combined EGCs involving these?
if(strcmp(gcluster, "\xe2\x96\x88")){
c->channels &= ~CELL_NOBACKGROUND_MASK;
if(cols < 2){
c->channels &= ~CELL_WIDEASIAN_MASK;
}else{
c->channels |= CELL_WIDEASIAN_MASK;
}
}else{
c->channels |= CELL_NOBACKGROUND_MASK;
c->channels &= ~CELL_WIDEASIAN_MASK;
}
if(bytes <= 4){
if(strcmp(gcluster, (const char*)&c->gcluster)){
pool_release(pool, c);
c->gcluster = 0;
memcpy(&c->gcluster, gcluster, bytes);
}
return bytes;
}
int eoffset = egcpool_stash(pool, gcluster, bytes);
if(eoffset < 0){
return -1;
}
pool_release(pool, c);
c->gcluster = 0x01000000ul + eoffset;
return bytes;
}
static inline int
pool_load(egcpool* pool, cell* c, const char* gcluster){
int cols;
int bytes = utf8_egc_len(gcluster, &cols);
return pool_load_direct(pool, c, gcluster, bytes, cols);
}
#ifdef __cplusplus
}
#endif

42
src/lib/notcurses.c
View File

@ -1363,49 +1363,11 @@ int ncplane_putc_yx(ncplane* n, int y, int x, const cell* c){
static inline int
cell_load_direct(ncplane* n, cell* c, const char* gcluster, int bytes, int cols){
if(bytes < 0 || cols < 0){
return -1;
}
if(bytes <= 1){
assert(cols < 2);
cell_release(n, c);
c->channels &= ~(CELL_WIDEASIAN_MASK | CELL_NOBACKGROUND_MASK);
c->gcluster = *gcluster;
return bytes;
}
// FIXME also shaded blocks! ░ etc. are there combined EGCs involving these?
if(strcmp(gcluster, "\xe2\x96\x88")){
c->channels &= ~CELL_NOBACKGROUND_MASK;
if(cols < 2){
c->channels &= ~CELL_WIDEASIAN_MASK;
}else{
c->channels |= CELL_WIDEASIAN_MASK;
}
}else{
c->channels |= CELL_NOBACKGROUND_MASK;
c->channels &= ~CELL_WIDEASIAN_MASK;
}
if(bytes <= 4){
if(strcmp(gcluster, (const char*)&c->gcluster)){
cell_release(n, c);
c->gcluster = 0;
memcpy(&c->gcluster, gcluster, bytes);
}
return bytes;
}
int eoffset = egcpool_stash(&n->pool, gcluster, bytes);
if(eoffset < 0){
return -1;
}
cell_release(n, c);
c->gcluster = 0x01000000ul + eoffset;
return bytes;
return pool_load_direct(&n->pool, c, gcluster, bytes, cols);
}
int cell_load(ncplane* n, cell* c, const char* gcluster){
int cols;
int bytes = utf8_egc_len(gcluster, &cols);
return cell_load_direct(n, c, gcluster, bytes, cols);
return pool_load(&n->pool, c, gcluster);
}
int ncplane_putegc_yx(ncplane* n, int y, int x, const char* gclust, int* sbytes){