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

ncplane_erase: kill any bound sprixel #1432

Browse Source
This commit is contained in:
nick black 2021-03-22 03:31:42 -04:00 committed by Nick Black
parent ed1a35d87a
commit 1c50fceb0a
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/notcurses.c
View File

@ -1940,6 +1940,9 @@ void ncplane_yx(const ncplane* n, int* y, int* x){
}
void ncplane_erase(ncplane* n){
if(n->sprite){
sprixel_hide(n->sprite);
}
// we must preserve the background, but a pure cell_duplicate() would be
// wiped out by the egcpool_dump(). do a duplication (to get the stylemask
// and channels), and then reload.

2
src/lib/sprite.c
View File

@ -11,8 +11,6 @@ void sprixel_free(sprixel* s){
void sprixel_hide(sprixel* s){
s->n->sprite = NULL;
s->invalidated = SPRIXEL_HIDE;
ncplane_yx(s->n, &s->y, &s->x);
ncplane_dim_yx(s->n, &s->dimy, &s->dimx);
s->n = NULL;
}

20
src/player/play.cpp
View File

@ -325,21 +325,31 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv,
double timescale, double displaytime){
int dimy, dimx;
std::unique_ptr<Plane> stdn(nc.get_stdplane(&dimy, &dimx));
uint64_t transchan = 0;
channels_set_fg_alpha(&transchan, CELL_ALPHA_TRANSPARENT);
channels_set_bg_alpha(&transchan, CELL_ALPHA_TRANSPARENT);
stdn->set_base("", 0, transchan);
struct ncplane_options nopts{};
nopts.rows = dimy - 1; // don't want kitty to scroll on pixels FIXME
nopts.cols = dimx;
nopts.resizecb = ncplane_resize_maximize;
struct ncplane* n = ncplane_create(*stdn, &nopts); // FIXME make c++ style
if(!n){
return -1;
}
ncplane_move_bottom(n);
for(auto i = 0 ; i < argc ; ++i){
std::unique_ptr<Visual> ncv;
ncv = std::make_unique<Visual>(argv[i]);
stdn->erase();
struct ncvisual_options vopts{};
int r;
vopts.n = *stdn;
vopts.n = n;
vopts.scaling = scalemode;
vopts.blitter = blitter;
if(vopts.blitter == NCBLIT_PIXEL){
notcurses_check_pixel_support(nc);
vopts.y = 1;
}else{
vopts.y = 0;
}
ncplane_erase(n);
do{
struct marshal marsh = {
.subtitle_plane = nullptr,