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

[kitty] clean TAM on failure #2268

Browse Source
This commit is contained in:
nick black 2021-10-16 05:17:16 -04:00
parent 9d002feea3
commit 9d4eadc64a
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/kitty.c
View File

@ -404,10 +404,10 @@ kitty_blit_wipe_selfref(sprixel* s, fbuf* f, int ycell, int xcell){
// cell id with which we can delete it in O(1) for a rebuild. this // cell id with which we can delete it in O(1) for a rebuild. this
// way, we needn't delete and redraw the entire sprixel. // way, we needn't delete and redraw the entire sprixel.
int kitty_wipe_animation(sprixel* s, int ycell, int xcell){ int kitty_wipe_animation(sprixel* s, int ycell, int xcell){
logdebug("wiping sprixel %u at %d/%d\n", s->id, ycell, xcell);
if(init_sprixel_animation(s)){ if(init_sprixel_animation(s)){
return -1; return -1;
} }
logdebug("wiping sprixel %u at %d/%d\n", s->id, ycell, xcell);
fbuf* f = &s->glyph; fbuf* f = &s->glyph;
if(kitty_blit_wipe_selfref(s, f, ycell, xcell) < 0){ if(kitty_blit_wipe_selfref(s, f, ycell, xcell) < 0){
return -1; return -1;
@ -552,6 +552,7 @@ cleanup_tam(tament* tam, int ydim, int xdim){
for(int y = 0 ; y < ydim ; ++y){ for(int y = 0 ; y < ydim ; ++y){
for(int x = 0 ; x < xdim ; ++x){ for(int x = 0 ; x < xdim ; ++x){
free(tam[y * xdim + x].auxvector); free(tam[y * xdim + x].auxvector);
tam[y * xdim + x].auxvector = NULL;
} }
} }
} }
@ -928,6 +929,7 @@ write_kitty_data(fbuf* f, int linesize, int leny, int lenx, int cols,
return 0; return 0;
err: err:
logerror("failed blitting kitty graphics\n");
cleanup_tam(tam, (leny + cdimy - 1) / cdimy, (lenx + cdimx - 1) / cdimx); cleanup_tam(tam, (leny + cdimy - 1) / cdimy, (lenx + cdimx - 1) / cdimx);
destroy_deflator(animated, &zctx, leny, lenx); destroy_deflator(animated, &zctx, leny, lenx);
return -1; return -1;
@ -956,11 +958,11 @@ int kitty_rebuild_selfref(sprixel* s, int ycell, int xcell, uint8_t* auxvec){
} }
int kitty_rebuild_animation(sprixel* s, int ycell, int xcell, uint8_t* auxvec){ int kitty_rebuild_animation(sprixel* s, int ycell, int xcell, uint8_t* auxvec){
logdebug("rebuilding sprixel %u %d at %d/%d\n", s->id, s->invalidated, ycell, xcell);
if(init_sprixel_animation(s)){ if(init_sprixel_animation(s)){
return -1; return -1;
} }
fbuf* f = &s->glyph; fbuf* f = &s->glyph;
logdebug("rebuilding sprixel %u %d at %d/%d\n", s->id, s->invalidated, ycell, xcell);
const int ystart = ycell * s->cellpxy; const int ystart = ycell * s->cellpxy;
const int xstart = xcell * s->cellpxx; const int xstart = xcell * s->cellpxx;
const int xlen = xstart + s->cellpxx > s->pixx ? s->pixx - xstart : s->cellpxx; const int xlen = xstart + s->cellpxx > s->pixx ? s->pixx - xstart : s->cellpxx;
@ -1088,6 +1090,7 @@ kitty_blit_core(ncplane* n, int linesize, const void* data, int leny, int lenx,
return 1; return 1;
error: error:
cleanup_tam(n->tam, bargs->u.pixel.spx->dimy, bargs->u.pixel.spx->dimx);
fbuf_free(&s->glyph); fbuf_free(&s->glyph);
return -1; return -1;
} }