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

require set_pixel_blitter() for sixel_blit

Browse Source
This commit is contained in:
nick black 2021-07-03 00:26:24 -04:00
parent cbb27d2948
commit d558c8d6e1
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/blit.c
View File

@ -897,7 +897,7 @@ static struct blitset notcurses_blitters[] = {
.blit = braille_blit, .name = "braille", .fill = true, }, .blit = braille_blit, .name = "braille", .fill = true, },
{ .geom = NCBLIT_PIXEL, .width = 1, .height = 1, { .geom = NCBLIT_PIXEL, .width = 1, .height = 1,
.egcs = L"", .plotegcs = NULL, .egcs = L"", .plotegcs = NULL,
.blit = sixel_blit, .name = "pixel", .fill = true, }, .blit = NULL, .name = "pixel", .fill = true, },
{ .geom = NCBLIT_4x1, .width = 1, .height = 4, { .geom = NCBLIT_4x1, .width = 1, .height = 4,
.egcs = NULL, .plotegcs = L" ▂▄▆█", .egcs = NULL, .plotegcs = L" ▂▄▆█",
.blit = tria_blit, .name = "fourstep", .fill = false, }, .blit = tria_blit, .name = "fourstep", .fill = false, },

10
src/lib/termdesc.c
View File

@ -59,11 +59,13 @@ setup_sixel_bitmaps(tinfo* ti, int fd, bool invert80){
ti->pixel_rebuild = sixel_rebuild; ti->pixel_rebuild = sixel_rebuild;
ti->pixel_trans_auxvec = sixel_trans_auxvec; ti->pixel_trans_auxvec = sixel_trans_auxvec;
ti->sprixel_scale_height = 6; ti->sprixel_scale_height = 6;
set_pixel_blitter(sixel_blit);
sprite_init(ti, fd); sprite_init(ti, fd);
} }
// kitty 0.19.3 didn't have C=1, and thus needs sixel_maxy_pristine
static inline void static inline void
setup_kitty_bitmaps(tinfo* ti, int fd){ setup_kitty_bitmaps(tinfo* ti, int fd, int sixel_maxy_pristine){
ti->pixel_wipe = kitty_wipe; ti->pixel_wipe = kitty_wipe;
ti->pixel_destroy = kitty_destroy; ti->pixel_destroy = kitty_destroy;
ti->pixel_remove = kitty_remove; ti->pixel_remove = kitty_remove;
@ -74,6 +76,7 @@ setup_kitty_bitmaps(tinfo* ti, int fd){
ti->pixel_rebuild = kitty_rebuild; ti->pixel_rebuild = kitty_rebuild;
ti->pixel_clear_all = kitty_clear_all; ti->pixel_clear_all = kitty_clear_all;
ti->pixel_trans_auxvec = kitty_trans_auxvec; ti->pixel_trans_auxvec = kitty_trans_auxvec;
ti->sixel_maxy_pristine = sixel_maxy_pristine;
set_pixel_blitter(kitty_blit); set_pixel_blitter(kitty_blit);
sprite_init(ti, fd); sprite_init(ti, fd);
} }
@ -380,14 +383,15 @@ apply_term_heuristics(tinfo* ti, const char* termname, int fd,
ti->caps.sextants = true; // work since bugfix in 0.19.3 ti->caps.sextants = true; // work since bugfix in 0.19.3
ti->caps.quadrants = true; ti->caps.quadrants = true;
ti->caps.rgb = true; ti->caps.rgb = true;
setup_kitty_bitmaps(ti, fd);
*advertised_appsync = 0; // FIXME see above *advertised_appsync = 0; // FIXME see above
if(add_smulx_escapes(ti, tablelen, tableused)){ if(add_smulx_escapes(ti, tablelen, tableused)){
return -1; return -1;
} }
// kitty only introduced C=1 in 0.20.0 // kitty only introduced C=1 in 0.20.0
if(compare_versions(ti->termversion, "0.20.0") < 0){ if(compare_versions(ti->termversion, "0.20.0") < 0){
ti->sixel_maxy_pristine = INT_MAX; setup_kitty_bitmaps(ti, fd, INT_MAX);
}else{
setup_kitty_bitmaps(ti, fd, 0);
} }
}else if(qterm == TERMINAL_ALACRITTY){ }else if(qterm == TERMINAL_ALACRITTY){
termname = "Alacritty"; termname = "Alacritty";