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

Properly set italics/struck following sgr #1138

Browse Source
This commit is contained in:
nick black 2020-11-27 15:29:38 -05:00
parent 0ed8c0d234
commit f82ad10667
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/render.c
View File

@ -558,8 +558,9 @@ term_setstyles(FILE* out, uint32_t* curattr, const cell* c, bool* normalized,
out, false) < 0){ out, false) < 0){
ret = -1; ret = -1;
} }
// sgr will blow away italics/struck if they were set beforehand
*curattr &= !(NCSTYLE_ITALIC | NCSTYLE_STRUCK);
} }
// sgr will blow away italics/struck if they were set beforehand
ret |= term_setstyle(out, *curattr, cellattr, NCSTYLE_ITALIC, italics, italoff); ret |= term_setstyle(out, *curattr, cellattr, NCSTYLE_ITALIC, italics, italoff);
ret |= term_setstyle(out, *curattr, cellattr, NCSTYLE_STRUCK, struck, struckoff); ret |= term_setstyle(out, *curattr, cellattr, NCSTYLE_STRUCK, struck, struckoff);
*curattr = cellattr; *curattr = cellattr;

6
src/poc/sgr-full.c
View File

@ -42,6 +42,12 @@ int main(void){
ncplane_putstr_yx(n, y++, 0, "a ═ struck underline"); ncplane_putstr_yx(n, y++, 0, "a ═ struck underline");
ncplane_set_styles(n, NCSTYLE_STRUCK | NCSTYLE_BLINK); ncplane_set_styles(n, NCSTYLE_STRUCK | NCSTYLE_BLINK);
ncplane_putstr_yx(n, y++, 0, "a ═ struck blink"); ncplane_putstr_yx(n, y++, 0, "a ═ struck blink");
ncplane_set_styles(n, NCSTYLE_BOLD | NCSTYLE_REVERSE);
ncplane_putstr_yx(n, y++, 0, "a ═ bold reverse");
ncplane_set_styles(n, NCSTYLE_BOLD | NCSTYLE_UNDERLINE);
ncplane_putstr_yx(n, y++, 0, "a ═ bold underline");
ncplane_set_styles(n, NCSTYLE_BOLD | NCSTYLE_BLINK);
ncplane_putstr_yx(n, y++, 0, "a ═ bold blink");
ncplane_putstr_yx(n, y++, 0, "sleeping for 15s..."); ncplane_putstr_yx(n, y++, 0, "sleeping for 15s...");
if(notcurses_render(nc)){ if(notcurses_render(nc)){
goto err; goto err;