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

[tabs] get all unit tests working #1233

Browse Source
This commit is contained in:
nick black 2022-02-11 05:10:08 -05:00 committed by nick black
parent 21f68bf57c
commit 78cc44a1bf
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/notcurses.c
View File

@ -1894,10 +1894,10 @@ ncplane_put(ncplane* n, int y, int x, const char* egc, int cols,
// FIXME might need autogrow to the next tab stop out
}
}
if(cell_load_direct(n, targ, " ", bytes, cols) < 0){
if(cell_load_direct(n, targ, " ", bytes, 1) < 0){
return -1;
}
cols = (n->x + TABSTOP) / TABSTOP * TABSTOP;
cols = TABSTOP - (n->x % TABSTOP);
}else{
if(cell_load_direct(n, targ, egc, bytes, cols) < 0){
return -1;
@ -1914,9 +1914,15 @@ ncplane_put(ncplane* n, int y, int x, const char* egc, int cols,
while(--off > 0){
nccell_obliterate(n, &n->fb[nfbcellidx(n, n->y, n->x + off)]);
}
candidate->channels = targ->channels;
candidate->stylemask = targ->stylemask;
candidate->width = targ->width;
if(*egc != '\t'){
candidate->channels = targ->channels;
candidate->stylemask = targ->stylemask;
candidate->width = targ->width;
}else{
if(cell_load_direct(n, candidate, " ", bytes, 1) < 0){
return -1;
}
}
++n->x;
}
}

39
src/tests/tabs.cpp
View File

@ -14,36 +14,32 @@ TEST_CASE("TaBs") { // refreshing and delicious
SUBCASE("PutcTaB") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = 80;
nopts.cols = 10;
auto n = ncplane_create(n_, &nopts);
unsigned y, x;
CHECK(TABWIDTH == ncplane_putchar(n, '\t'));
ncplane_cursor_yx(n, &y, &x);
CHECK(y == 0);
CHECK(x == TABWIDTH);
char* c = ncplane_at_yx(n, 0, 0, nullptr, nullptr);
REQUIRE(c);
CHECK(0 == strcmp(c, " "));
free(c);
for(unsigned i = 1 ; i < x ; ++i){
nccell nc;
CHECK(1 == ncplane_at_yx_cell(n, 0, i, &nc));
CHECK(nccell_wide_right_p(&nc));
nccell_release(n, &nc);
for(unsigned i = 0 ; i < x ; ++i){
char* c = ncplane_at_yx(n, 0, i, nullptr, nullptr);
REQUIRE(c);
CHECK(0 == strcmp(c, " "));
free(c);
}
}
SUBCASE("PutXoffsetTaBs") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = TABWIDTH;
nopts.cols = 10;
auto n = ncplane_create(n_, &nopts);
unsigned y, x;
for(int i = 0 ; i < TABWIDTH ; ++i){
CHECK(TABWIDTH - i == ncplane_putchar(n, '\t'));
ncplane_cursor_yx(n, &y, &x);
CHECK(y == 0);
CHECK(x == TABWIDTH - i);
CHECK(x == TABWIDTH);
CHECK(0 == ncplane_cursor_move_yx(n, 0, i + 1));
}
for(unsigned i = 0 ; i < x ; ++i){
@ -57,7 +53,7 @@ TEST_CASE("TaBs") { // refreshing and delicious
SUBCASE("PutwcTaB") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = TABWIDTH;
nopts.cols = 10;
auto n = ncplane_create(n_, &nopts);
unsigned y, x;
CHECK(TABWIDTH == ncplane_putwc(n, L'\t'));
@ -75,11 +71,11 @@ TEST_CASE("TaBs") { // refreshing and delicious
SUBCASE("PutCellTaB") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = TABWIDTH;
nopts.cols = 10;
auto n = ncplane_create(n_, &nopts);
nccell c = NCCELL_CHAR_INITIALIZER('\t');
unsigned y, x;
CHECK(1 == ncplane_putc(n, &c));
CHECK(8 == ncplane_putc(n, &c));
ncplane_cursor_yx(n, &y, &x);
CHECK(y == 0);
CHECK(x == TABWIDTH);
@ -94,10 +90,10 @@ TEST_CASE("TaBs") { // refreshing and delicious
SUBCASE("PutMultipleTaBs") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = TABWIDTH;
nopts.cols = 80;
auto n = ncplane_create(n_, &nopts);
unsigned y, x;
CHECK(1 == ncplane_putstr(n, "\t\t"));
CHECK(16 == ncplane_putstr(n, "\t\t"));
ncplane_cursor_yx(n, &y, &x);
CHECK(y == 0);
CHECK(x == 16);
@ -112,13 +108,14 @@ TEST_CASE("TaBs") { // refreshing and delicious
SUBCASE("PutRowOfTaBs") {
struct ncplane_options nopts{};
nopts.rows = 2;
nopts.cols = TABWIDTH;
nopts.cols = 80;
nopts.flags = NCPLANE_OPTION_VSCROLL;
auto n = ncplane_create(n_, &nopts);
unsigned y, x;
CHECK(1 == ncplane_putstr(n, "\t\t\t\t\t\t\t\t\t\t"));
CHECK(80 == ncplane_putstr(n, "\t\t\t\t\t\t\t\t\t\t"));
ncplane_cursor_yx(n, &y, &x);
CHECK(y == 1);
CHECK(x == 0);
CHECK(y == 0);
CHECK(x == 80);
for(unsigned i = 0 ; i < ncplane_dim_x(n) ; ++i){
char* c = ncplane_at_yx(n, 0, i, nullptr, nullptr);
REQUIRE(c);