blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

always use space when fgrgb == bgrgb #1316

Browse Source 
When both foreground and background are using RGB, and
the two channels are the same RGB value, the glyph will
be invisible; emitting a space with the correct background
can save RGB escapes and glyph bytes. Eliminates several
longstanding FIXMEs in the Stacking unit tests. Add a new
function nccell_rgbequal_p(), and unit testing for it.
Add a new unit test to check that this optimization has
taken place, and that it has only taken place in the
rasterization phase--the original plane must be unchanged.
Closes #1316.
This commit is contained in:
nick black 2021-11-29 19:02:21 -05:00 committed by nick black
parent 0b75f06abd
commit b340f01a0a
2 changed files with 71 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/lib/render.c
View File

@ -480,14 +480,13 @@ postpaint_cell(const tinfo* ti, nccell* lastframe, int dimx,
// we don't need to change it when under an opaque cell, because
// that's always printed on top.
if(!crender->s.p_beats_sprixel){
// leaving out SPRIXCELL_OPAQUE_KITTY here results in cruft
if(state != SPRIXCELL_OPAQUE_SIXEL){
//fprintf(stderr, "damaged due to opaque %d/%d\n", y, *x);
crender->s.damaged = 1;
}
}
}else{
//fprintf(stderr, "damaged due to opaque else %d/%d\n", y, *x);
//fprintf(stderr, "damaged due to lastframe disagree %d/%d\n", y, *x);
crender->s.damaged = 1;
}
assert(!nccell_wide_right_p(targc));
@ -631,8 +630,8 @@ int ncplane_mergedown_simple(ncplane* restrict src, ncplane* restrict dst){
return ncplane_mergedown(src, dst, 0, 0, 0, 0, 0, 0);
}
// write the nccell's UTF-8 extended grapheme cluster to the provided FILE*.
static int
// write the nccell's UTF-8 extended grapheme cluster to the provided fbuf.
static inline int
term_putc(fbuf* f, const egcpool* e, const nccell* c){
if(cell_simple_p(c)){
//fprintf(stderr, "[%.4s] %08x\n", (const char*)&c->gcluster, c->gcluster); }
@ -1138,7 +1137,7 @@ rasterize_core(notcurses* nc, const ncpile* p, fbuf* f, unsigned phase){
const int innerx = x - nc->margin_l;
const size_t damageidx = innery * nc->lfdimx + innerx;
unsigned r, g, b, br, bg, bb;
const nccell* srccell = &nc->lastframe[damageidx];
nccell* srccell = &nc->lastframe[damageidx];
if(!rvec[damageidx].s.damaged){
// no need to emit a cell; what we rendered appears to already be
// here. no updates are performed to elision state nor lastframe.
@ -1165,22 +1164,62 @@ rasterize_core(notcurses* nc, const ncpile* p, fbuf* f, unsigned phase){
// * we are a partial glyph, and the previous was default on both, or
// * we are a no-foreground glyph, and the previous was default background, or
// * we are a no-background glyph, and the previous was default foreground
bool nobackground = cell_nobackground_p(srccell);
bool nobackground = nccell_nobackground_p(srccell);
bool rgbequal = nccell_rgbequal_p(srccell);
const char* alttext = NULL;
if((nccell_fg_default_p(srccell)) || (!nobackground && nccell_bg_default_p(srccell))){
if(raster_defaults(nc, nccell_fg_default_p(srccell),
!nobackground && nccell_bg_default_p(srccell), f)){
return -1;
}
}
// if our cell has a non-default foreground, we can elide the
// non-default foreground set iff either:
// * the previous was non-default, and matches what we have now, or
// * we are a no-foreground glyph (iswspace() is true)
// we apply the background first because if the fg and bg values are
// same, and they're both rgb (rgbequal), we can emit either a space
// or a full block to avoid an rgb. we prefer to emit the space, doing
// so unless the current background would need a change but the
// current foreground would not (thus requiring no rgb change at all,
// but only for the full black). FIXME we don't yet do this, though.
if(nobackground){
++nc->stats.s.bgelisions;
}else if(nccell_bg_palindex_p(srccell)){ // palette-indexed background
if(emit_bg_palindex(nc, f, srccell)){
return -1;
}
}else if(!nccell_bg_default_p(srccell)){ // rgb background
// if our cell has a non-default background, we can elide the
// non-default background set iff either:
// * we do not use the background, because the cell is all-foreground,
// * the previous was non-default, and matches what we have now, or
nccell_bg_rgb8(srccell, &br, &bg, &bb);
if(nc->rstate.bgelidable && nc->rstate.lastbr == br && nc->rstate.lastbg == bg && nc->rstate.lastbb == bb){
++nc->stats.s.bgelisions;
}else{
if(term_bg_rgb8(&nc->tcache, f, br, bg, bb)){
return -1;
}
++nc->stats.s.bgemissions;
nc->rstate.bgelidable = true;
}
nc->rstate.lastbr = br; nc->rstate.lastbg = bg; nc->rstate.lastbb = bb;
nc->rstate.bgdefelidable = false;
nc->rstate.bgpalelidable = false;
// FIXME see above -- if we don't have to change the fg, but do need
// to change the bg, emit full block and no rgb at all
if(rgbequal){
// FIXME need one per column of original glyph
pool_load_direct(&nc->pool, srccell, " ", 1, 1);
}
}
// we ought check for noforeground (see below) FIXME
if(nccell_fg_palindex_p(srccell)){ // palette-indexed foreground
if(emit_fg_palindex(nc, f, srccell)){
return -1;
}
}else if(!nccell_fg_default_p(srccell)){ // rgb foreground
// if our cell has a non-default foreground, we can elide the
// non-default foreground set iff either:
// * the previous was non-default, and matches what we have now, or
// * we are a no-foreground glyph (iswspace() is true) FIXME
nccell_fg_rgb8(srccell, &r, &g, &b);
if(nc->rstate.fgelidable && nc->rstate.lastr == r && nc->rstate.lastg == g && nc->rstate.lastb == b){
++nc->stats.s.fgelisions;
@ -1195,31 +1234,7 @@ rasterize_core(notcurses* nc, const ncpile* p, fbuf* f, unsigned phase){
nc->rstate.fgdefelidable = false;
nc->rstate.fgpalelidable = false;
}
// if our cell has a non-default background, we can elide the
// non-default background set iff either:
// * we do not use the background, because the cell is all-foreground,
// * the previous was non-default, and matches what we have now, or
if(nobackground){
++nc->stats.s.bgelisions;
}else if(nccell_bg_palindex_p(srccell)){ // palette-indexed background
if(emit_bg_palindex(nc, f, srccell)){
return -1;
}
}else if(!nccell_bg_default_p(srccell)){ // rgb background
nccell_bg_rgb8(srccell, &br, &bg, &bb);
if(nc->rstate.bgelidable && nc->rstate.lastbr == br && nc->rstate.lastbg == bg && nc->rstate.lastbb == bb){
++nc->stats.s.bgelisions;
}else{
if(term_bg_rgb8(&nc->tcache, f, br, bg, bb)){
return -1;
}
++nc->stats.s.bgemissions;
nc->rstate.bgelidable = true;
}
nc->rstate.lastbr = br; nc->rstate.lastbg = bg; nc->rstate.lastbb = bb;
nc->rstate.bgdefelidable = false;
nc->rstate.bgpalelidable = false;
}
//fprintf(stderr, "RGBEQUAL: %u ALTTEXT: [%s]\n", rgbequal, alttext ? alttext : "");
//fprintf(stderr, "RAST %08x [%s] to %d/%d cols: %u %016" PRIx64 "\n", srccell->gcluster, pool_extended_gcluster(&nc->pool, srccell), y, x, srccell->width, srccell->channels);
// this is used to invalidate the sprixel in the first text round,
// which is only necessary for sixel, not kitty.
@ -1231,8 +1246,14 @@ rasterize_core(notcurses* nc, const ncpile* p, fbuf* f, unsigned phase){
sprixel_invalidate(rvec[damageidx].sprixel, y, x);
}
}
if(term_putc(f, &nc->pool, srccell)){
return -1;
if(!alttext){
if(term_putc(f, &nc->pool, srccell)){
return -1;
}
}else{
if(fbuf_puts(f, alttext) < 0){ // alttext must match srccell's width
return -1;
}
}
if(srccell->gcluster == '\n'){
saw_linefeed = true;

31
src/tests/stacking.cpp
View File

@ -26,12 +26,13 @@ TEST_CASE("Stacking") {
struct ncplane* n_ = notcurses_stddim_yx(nc_, &dimy, &dimx);
REQUIRE(nullptr != n_);
// whenever the foreground matches the background (using palette-indexed or
// RGB color, *not* default colors), we ought emit a space with the
// whenever the foreground matches the background (using RGB color, *not*
// default colors not palette-indexed color), we ought emit a space with the
// specified background, or a full block with the specified foreground (only
// if UTF8 is available). default colors must not be merged. the
// transformation should only take place at raster time.
SUBCASE("FgMatchesBg") {
// if UTF8 is available). default colors must not be merged (palette-indexed
// could be, but it's pointless). the transformation must only take place at
// raster time--the original output must be recoverable from the plane.
SUBCASE("FgMatchesBgRGB") {
// first we write an a with the desired background, but a distinct
// foreground. then we write an a with the two matching (via RGB).
// this ought generate a space with the desired background on the
@ -70,7 +71,9 @@ TEST_CASE("Stacking") {
rblit = notcurses_at_yx(nc_, 0, 3, nullptr, &channels);
if(notcurses_canutf8(nc_)){
CHECK(0x808080 == ncchannels_fg_rgb(channels));
CHECK(0 == strcmp(u8"\u2588", rblit));
// FIXME we're not yet this advanced, and use space instead
// CHECK(0 == strcmp(u8"\u2588", rblit));
CHECK(0 == strcmp(u8" ", rblit));
}else{
CHECK(0 == strcmp(" ", rblit));
CHECK(0x808080 == ncchannels_bg_rgb(channels));
@ -115,9 +118,7 @@ TEST_CASE("Stacking") {
uint64_t channels;
auto egc = notcurses_at_yx(nc_, 0, 0, nullptr, &channels);
REQUIRE(nullptr != egc);
// ought yield space with white background FIXME currently just yields
// a lower half block
CHECK(0 == strcmp("\u2584", egc));
CHECK(0 == strcmp(u8" ", egc));
free(egc);
CHECK(0xffffff == ncchannels_fg_rgb(channels));
CHECK(0xffffff == ncchannels_bg_rgb(channels));
@ -158,9 +159,7 @@ TEST_CASE("Stacking") {
uint64_t channels;
auto egc = notcurses_at_yx(nc_, 0, 0, nullptr, &channels);
REQUIRE(nullptr != egc);
// ought yield space with white background FIXME currently just yields
// an upper half block
CHECK(0 == strcmp("\u2580", egc));
CHECK(0 == strcmp(u8" ", egc));
free(egc);
CHECK(0xffffff == ncchannels_fg_rgb(channels));
CHECK(0xffffff == ncchannels_bg_rgb(channels));
@ -202,9 +201,7 @@ TEST_CASE("Stacking") {
uint64_t channels;
auto egc = notcurses_at_yx(nc_, 0, 0, nullptr, &channels);
REQUIRE(nullptr != egc);
// ought yield space with white background FIXME currently just yields
// an upper half block
CHECK(0 == strcmp("\u2580", egc));
CHECK(0 == strcmp(u8" ", egc));
free(egc);
CHECK(0x00ff00 == ncchannels_fg_rgb(channels));
CHECK(0x00ff00 == ncchannels_bg_rgb(channels));
@ -249,9 +246,7 @@ TEST_CASE("Stacking") {
uint64_t channels;
auto egc = notcurses_at_yx(nc_, 0, 0, nullptr, &channels);
REQUIRE(nullptr != egc);
// ought yield space with white background FIXME currently just yields
// an upper half block
CHECK(0 == strcmp("\u259a", egc)); // quadrant upper left and lower right
CHECK(0 == strcmp(u8" ", egc)); // quadrant upper left and lower right
free(egc);
CHECK(0xffffff == ncchannels_fg_rgb(channels));
CHECK(0xffffff == ncchannels_bg_rgb(channels));