Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-20 03:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

need to call sprite_init() from setup_sixel_bitmaps()

Browse Source
This commit is contained in:
nick black 2021-06-17 19:34:17 -04:00 committed by Nick Black
parent 5e16208801
commit 574eef2e28
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/termdesc.c
View File

@ -4,7 +4,7 @@
// we found Sixel support -- set up the API // we found Sixel support -- set up the API
static inline void static inline void
setup_sixel_bitmaps(tinfo* ti){ setup_sixel_bitmaps(tinfo* ti, int fd){
ti->bitmap_supported = true; ti->bitmap_supported = true;
ti->pixel_init = sixel_init; ti->pixel_init = sixel_init;
ti->pixel_draw = sixel_draw; ti->pixel_draw = sixel_draw;
@ -14,6 +14,7 @@ setup_sixel_bitmaps(tinfo* ti){
ti->pixel_shutdown = sixel_shutdown; ti->pixel_shutdown = sixel_shutdown;
ti->pixel_rebuild = sixel_rebuild; ti->pixel_rebuild = sixel_rebuild;
ti->sprixel_scale_height = 6; ti->sprixel_scale_height = 6;
sprite_init(ti, fd);
} }
static inline void static inline void
@ -449,11 +450,6 @@ int interrogate_terminfo(tinfo* ti, int fd, const char* termname, unsigned utf8,
if(ncinputlayer_init(ti, stdin, &detected)){ if(ncinputlayer_init(ti, stdin, &detected)){
goto err; goto err;
} }
// our current sixel quantization algorithm requires at least 64 color
// registers. we make use of no more than 256.
if(ti->color_registers >= 64){
setup_sixel_bitmaps(ti);
}
if(nocbreak){ if(nocbreak){
if(fd >= 0){ if(fd >= 0){
if(tcsetattr(fd, TCSANOW, &ti->tpreserved)){ if(tcsetattr(fd, TCSANOW, &ti->tpreserved)){
@ -466,6 +462,12 @@ int interrogate_terminfo(tinfo* ti, int fd, const char* termname, unsigned utf8,
ncinputlayer_stop(&ti->input); ncinputlayer_stop(&ti->input);
goto err; goto err;
} }
// our current sixel quantization algorithm requires at least 64 color
// registers. we make use of no more than 256. this needs to happen
// after heuristics, since sixel_init() depends on sprixel_cursor_hack.
if(ti->color_registers >= 64){
setup_sixel_bitmaps(ti, fd);
}
return 0; return 0;
err: err: