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

postpaint(): no need to replace nul with space #777

Browse Source
This commit is contained in:
nick black 2020-07-10 11:15:23 -04:00
parent a97297192d
commit 5512158fc5
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/render.c
View File

@ -414,9 +414,6 @@ postpaint(cell* fb, cell* lastframe, int dimy, int dimx,
struct crender* crender = &rvec[fbcellidx(y, dimx, x)]; struct crender* crender = &rvec[fbcellidx(y, dimx, x)];
lock_in_highcontrast(targc, crender); lock_in_highcontrast(targc, crender);
cell* prevcell = &lastframe[fbcellidx(y, dimx, x)]; cell* prevcell = &lastframe[fbcellidx(y, dimx, x)];
if(targc->gcluster == 0){
targc->gcluster = ' ';
}
if(cellcmp_and_dupfar(pool, prevcell, crender->p, targc)){ if(cellcmp_and_dupfar(pool, prevcell, crender->p, targc)){
crender->damaged = true; crender->damaged = true;
} }

4
tests/scrolling.cpp
View File

@ -160,7 +160,7 @@ TEST_CASE("Scrolling") {
if(i < 11){ if(i < 11){
CHECK(next2[i - 1] == *egc); CHECK(next2[i - 1] == *egc);
}else{ }else{
CHECK(' ' == *egc); CHECK('\0' == *egc);
} }
free(egc); free(egc);
} }
@ -193,7 +193,7 @@ TEST_CASE("Scrolling") {
if(i < 11){ if(i < 11){
CHECK(onext[i - 1] == *egc); CHECK(onext[i - 1] == *egc);
}else{ }else{
CHECK(' ' == *egc); CHECK('\0' == *egc);
} }
free(egc); free(egc);
} }

26
tests/wide.cpp
View File

@ -363,7 +363,7 @@ TEST_CASE("Wide") {
// should be nothing, having been stomped // should be nothing, having been stomped
egc = notcurses_at_yx(nc_, 0, 3, &c.attrword, &c.channels); egc = notcurses_at_yx(nc_, 0, 3, &c.attrword, &c.channels);
REQUIRE(egc); REQUIRE(egc);
CHECK(0 == strcmp(" ", egc)); CHECK(0 == strcmp("", egc));
free(egc); free(egc);
cell_init(&c); cell_init(&c);
@ -461,7 +461,7 @@ TEST_CASE("Wide") {
CHECK(widechans == channels); CHECK(widechans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, " "));
@ -483,7 +483,7 @@ TEST_CASE("Wide") {
CHECK(narchans == channels); CHECK(narchans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
CHECK(0 == ncplane_move_yx(topp, 0, 2)); CHECK(0 == ncplane_move_yx(topp, 0, 2));
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
@ -492,7 +492,7 @@ TEST_CASE("Wide") {
CHECK(widechans == channels); CHECK(widechans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels)));
CHECK(0 == strcmp(egc, "a")); CHECK(0 == strcmp(egc, "a"));
@ -539,14 +539,14 @@ TEST_CASE("Wide") {
CHECK(narchans == channels); CHECK(narchans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 5, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 5, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 6, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 6, &attrword, &channels)));
CHECK(0 == strcmp(egc, "六")); CHECK(0 == strcmp(egc, "六"));
CHECK(widechans == channels); CHECK(widechans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
CHECK(0 == ncplane_move_yx(topp, 0, 0)); CHECK(0 == ncplane_move_yx(topp, 0, 0));
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
@ -578,7 +578,7 @@ TEST_CASE("Wide") {
CHECK(widechans == channels); CHECK(widechans == channels);
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
ncplane_destroy(topp); ncplane_destroy(topp);
} }
@ -627,7 +627,7 @@ TEST_CASE("Wide") {
CHECK(0 == strcmp(egc, "六")); CHECK(0 == strcmp(egc, "六"));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, " "));
@ -645,7 +645,7 @@ TEST_CASE("Wide") {
CHECK(0 == strcmp(egc, "")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
CHECK(0 == ncplane_move_yx(topp, 0, 2)); CHECK(0 == ncplane_move_yx(topp, 0, 2));
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
@ -653,7 +653,7 @@ TEST_CASE("Wide") {
CHECK(0 == strcmp(egc, "六")); CHECK(0 == strcmp(egc, "六"));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 1, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 2, &attrword, &channels)));
CHECK(0 == strcmp(egc, "次")); CHECK(0 == strcmp(egc, "次"));
@ -691,13 +691,13 @@ TEST_CASE("Wide") {
CHECK(0 == strcmp(egc, "")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 5, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 5, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 6, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 6, &attrword, &channels)));
CHECK(0 == strcmp(egc, "六")); CHECK(0 == strcmp(egc, "六"));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
CHECK(0 == ncplane_move_yx(topp, 0, 0)); CHECK(0 == ncplane_move_yx(topp, 0, 0));
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
@ -723,7 +723,7 @@ TEST_CASE("Wide") {
CHECK(0 == strcmp(egc, "六")); CHECK(0 == strcmp(egc, "六"));
free(egc); free(egc);
REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels))); REQUIRE((egc = notcurses_at_yx(nc_, 0, 7, &attrword, &channels)));
CHECK(0 == strcmp(egc, " ")); CHECK(0 == strcmp(egc, ""));
free(egc); free(egc);
ncplane_destroy(topp); ncplane_destroy(topp);
} }