notcurses-info: draw a bit more

pull/1995/head
nick black 3 years ago
parent 269196c39c
commit 99843190c0
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC

@ -47,7 +47,8 @@ tinfo_debug_style(struct ncplane* n, const char* name, int style, char ch){
static int
braille_viz(ncplane* n, wchar_t l, const wchar_t* egcs, wchar_t r,
const char* indent, wchar_t suit,
const wchar_t* bounds, wchar_t r8, wchar_t l8){
const wchar_t* bounds, wchar_t r8, wchar_t l8,
const char* trailer){
ncplane_printf(n, "%s%lc", indent, l);
for(int i = 0 ; i < 64 ; ++i){
if(ncplane_putwc(n, egcs[i]) <= 0){
@ -65,6 +66,9 @@ braille_viz(ncplane* n, wchar_t l, const wchar_t* egcs, wchar_t r,
ncplane_putchar(n, ' ');
}
ncplane_putwc(n, bounds[1]);
if(trailer){
ncplane_putstr(n, trailer);
}
ncplane_putchar(n, '\n');
return 0;
}
@ -177,7 +181,8 @@ triviz(struct ncplane* n, const wchar_t* w1, const wchar_t* w2, const wchar_t* w
}
static void
vertviz(struct ncplane* n, wchar_t l, wchar_t li, wchar_t ri, wchar_t r){
vertviz(struct ncplane* n, wchar_t l, wchar_t li, wchar_t ri, wchar_t r,
const char* trail){
if(ncplane_putwc(n, l) <= 0){
ncplane_putchar(n, ' ');
}
@ -190,6 +195,7 @@ vertviz(struct ncplane* n, wchar_t l, wchar_t li, wchar_t ri, wchar_t r){
if(ncplane_putwc(n, r) <= 0){
ncplane_putchar(n, ' ');
}
ncplane_putstr(n, trail);
ncplane_putchar(n, '\n');
}
@ -199,41 +205,45 @@ unicodedumper(struct ncplane* n, tinfo* ti, const char* indent){
// all NCHALFBLOCKS are contained within NCQUADBLOCKS
ncplane_printf(n, "%s%ls ⎧", indent, NCQUADBLOCKS);
sex_viz(n, NCSEXBLOCKS, L'', L"🯰🯱🯲🯳🯴🯵🯶🯷🯸🯹\u2157\u2158\u2159\u215a\u215b");
vertviz(n, L'', NCEIGHTHSR[0], NCEIGHTHSL[0], L'');
vertviz(n, L'', NCEIGHTHSR[0], NCEIGHTHSL[0], L'', "┌╥─╥─╥┐🭩");
ncplane_printf(n, "%s╲╿ ◨◧ ◪◩ ◖◗ ⎩", indent);
sex_viz(n, &NCSEXBLOCKS[32], L'', L"\u00bc\u00bd\u00be\u2150\u2151\u2152\u2153\u2154\u2155\u2156\u215c\u215d\u215e\u215f\u2189");
vertviz(n, L'', NCEIGHTHSR[1], NCEIGHTHSL[1], L'');
vertviz(n, L'', NCEIGHTHSR[1], NCEIGHTHSL[1], L'', "├╜╓╫╖╙┤🭫");
ncplane_printf(n, "%s╾", indent);
triviz(n, NCWHITESQUARESW, NCWHITECIRCLESW, NCDIAGONALSW, &NCDIAGONALSW[4],
NCCIRCULARARCSW, NCWHITETRIANGLESW, NCSHADETRIANGLESW, NCBLACKTRIANGLESW,
NCBOXLIGHTW, &NCBOXLIGHTW[4], NCBOXHEAVYW, &NCBOXHEAVYW[4], NCBOXROUNDW,
&NCBOXROUNDW[4], NCBOXDOUBLEW, &NCBOXDOUBLEW[4], NCBOXOUTERW, &NCBOXOUTERW[4],
L"▵△▹▷▿▽◃◁", NCARROWW);
vertviz(n, L'', NCEIGHTHSR[2], NCEIGHTHSL[2], L'');
vertviz(n, L'', NCEIGHTHSR[2], NCEIGHTHSL[2], L'', "├─╨╫╨─┤┇");
ncplane_printf(n, "%s╽╲ ", indent);
triviz(n, &NCWHITESQUARESW[2], &NCWHITECIRCLESW[2], &NCDIAGONALSW[2], &NCDIAGONALSW[6],
&NCCIRCULARARCSW[2], &NCWHITETRIANGLESW[2], &NCSHADETRIANGLESW[2], &NCBLACKTRIANGLESW[2],
&NCBOXLIGHTW[2], &NCBOXLIGHTW[5], &NCBOXHEAVYW[2], &NCBOXHEAVYW[5], &NCBOXROUNDW[2],
&NCBOXROUNDW[5], &NCBOXDOUBLEW[2], &NCBOXDOUBLEW[5], &NCBOXOUTERW[2], &NCBOXOUTERW[5],
L"▴⏶⯅▲▸⏵⯈▶", L"▾⏷⯆▼◂⏴⯇◀");
vertviz(n, L'', NCEIGHTHSR[3], NCEIGHTHSL[3], L'');
braille_viz(n, L'', NCBRAILLEEGCS, L'', indent, L'', L"⎨⎬", NCEIGHTHSR[4], NCEIGHTHSL[4]);
braille_viz(n, L'', &NCBRAILLEEGCS[64], L'', indent, L'', L"⎪⎪", NCEIGHTHSR[5], NCEIGHTHSL[5]);
braille_viz(n, L'', &NCBRAILLEEGCS[128], L'', indent, L'', L"⎪⎪", NCEIGHTHSR[6], NCEIGHTHSL[6]);
braille_viz(n, L'', &NCBRAILLEEGCS[192], L'', indent, L'', L"⎩⎭", NCEIGHTHSR[7], NCEIGHTHSL[7]);
vertviz(n, L'', NCEIGHTHSR[3], NCEIGHTHSL[3], L'', "╞═╤╬╤═╡┋");
braille_viz(n, L'', NCBRAILLEEGCS, L'', indent, L'', L"⎨⎬", NCEIGHTHSR[4], NCEIGHTHSL[4],
"╞╕╘╬╛╒╡┊");
braille_viz(n, L'', &NCBRAILLEEGCS[64], L'', indent, L'', L"⎪⎪", NCEIGHTHSR[5], NCEIGHTHSL[5],
"└┴─╨─┴┘╏");
braille_viz(n, L'', &NCBRAILLEEGCS[128], L'', indent, L'', L"⎪⎪", NCEIGHTHSR[6], NCEIGHTHSL[6],
"╭──╮⟬⟭╔╗");
braille_viz(n, L'', &NCBRAILLEEGCS[192], L'', indent, L'', L"⎩⎭", NCEIGHTHSR[7], NCEIGHTHSL[7],
"│╭╮│╔═╝║");
legacy_viz(n, indent, L"▔🭶🭷🭸🭹🭺🭻▁", NCANGLESBR, NCANGLESBL);
wviz(n, L"🭨🭪 ");
wviz(n, NCDIGITSSUBW);
ncplane_printf(n, "");
wviz(n, NCEIGHTHSB);
ncplane_printf(n, "");
ncplane_printf(n, "╰╯││║╔═╝");
ncplane_putchar(n, '\n');
legacy_viz(n, indent, L"▏🭰🭱🭲🭳🭴🭵▕", NCANGLESTR, NCANGLESTL);
wviz(n, L"🭪🭨 ");
wviz(n, NCDIGITSSUPERW);
ncplane_printf(n, "");
wviz(n, NCEIGHTHST);
ncplane_printf(n, "");
ncplane_printf(n, "⧒⧑╰╯╚╝❨❩");
ncplane_putchar(n, '\n');
int y, x;
ncplane_cursor_yx(n, &y, &x);
@ -248,10 +258,15 @@ unicodedumper(struct ncplane* n, tinfo* ti, const char* indent){
ncplane_printf_aligned(n, y - 2, NCALIGN_RIGHT, "⎢⎜⎟⎥");
ncplane_printf_aligned(n, y - 1, NCALIGN_RIGHT, "⎣⎝⎠⎦");
*/
// the horizontal eighths
uint32_t ul = NCCHANNEL_INITIALIZER(0x60, 0x7d, 0x3b);
uint32_t lr = NCCHANNEL_INITIALIZER(0x02, 0x8a, 0x0f);
ncplane_cursor_move_yx(n, y - 10, 67);
ncplane_stain(n, y - 1, 79, lr, ul, lr, ul);
// the symbols for legacy computing
ncplane_cursor_move_yx(n, y - 2, 0);
uint32_t ul = NCCHANNEL_INITIALIZER(0x30, 0x30, 0x30);
uint32_t lr = NCCHANNEL_INITIALIZER(0x80, 0x80, 0x80);
ul = NCCHANNEL_INITIALIZER(0x30, 0x30, 0x30);
lr = NCCHANNEL_INITIALIZER(0x80, 0x80, 0x80);
ncplane_stain(n, y - 1, 70, ul, lr, ul, lr);
// the braille
ncplane_cursor_move_yx(n, y - 6, 0);
@ -265,12 +280,7 @@ unicodedumper(struct ncplane* n, tinfo* ti, const char* indent){
ncplane_stain(n, y - 9, 57, lr, ul, lr, ul);
// the boxes + quadrants
ncplane_cursor_move_yx(n, y - 10, 0);
ncplane_stain(n, y - 7, 70, lr, ul, lr, ul);
// the horizontal eighths
ul = NCCHANNEL_INITIALIZER(0x60, 0x7d, 0x3b);
lr = NCCHANNEL_INITIALIZER(0x02, 0x8a, 0x0f);
ncplane_cursor_move_yx(n, y - 10, 67);
ncplane_stain(n, y - 3, 70, lr, ul, lr, ul);
ncplane_stain(n, y - 7, 66, lr, ul, lr, ul);
// the capabilities
ul = NCCHANNEL_INITIALIZER(0x1B, 0xb8, 0x8E);
lr = NCCHANNEL_INITIALIZER(0x19, 0x19, 0x70);

Loading…
Cancel
Save