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

[raster] second pass on sprixel rasterization #1487

Browse Source
This commit is contained in:
nick black 2021-03-31 04:01:19 -04:00
parent d813a66581
commit 38a5e16f85
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/man/man1/ncplayer.1.md
View File

@ -51,8 +51,7 @@ Default margins are all 0 and default scaling is **stretch**. The full
rendering area will thus be used. Using **-m**, margins can be supplied. rendering area will thus be used. Using **-m**, margins can be supplied.
Provide a single number to set all four margins to the same value, or four Provide a single number to set all four margins to the same value, or four
comma-delimited values for the top, right, bottom, and left margins comma-delimited values for the top, right, bottom, and left margins
respectively. Top and bottom margins are ignored when **-k** is used. Negative respectively. Negative margins are illegal.
margins are illegal.
Scaling mode **stretch** resizes the object to match the target rendering Scaling mode **stretch** resizes the object to match the target rendering
area exactly. Unless a blitter is specified with **-b**, **stretch** will use area exactly. Unless a blitter is specified with **-b**, **stretch** will use

7
src/lib/render.c
View File

@ -941,7 +941,7 @@ rasterize_sprixels(notcurses* nc, const ncpile* p, FILE* out){
ncplane_yx(s->n, &y, &x); ncplane_yx(s->n, &y, &x);
y += s->y; y += s->y;
x += s->x; x += s->x;
//fprintf(stderr, "DRAWING BITMAP %d AT %d/%d for %p\n", s->id, y + nc->stdplane->absy, x + nc->stdplane->absx, s->n); fprintf(stderr, "DRAWING BITMAP %d AT %d/%d for %p\n", s->id, y + nc->stdplane->absy, x + nc->stdplane->absx, s->n);
if(goto_location(nc, out, y + nc->stdplane->absy, x + nc->stdplane->absx)){ if(goto_location(nc, out, y + nc->stdplane->absy, x + nc->stdplane->absx)){
return -1; return -1;
} }
@ -952,7 +952,7 @@ rasterize_sprixels(notcurses* nc, const ncpile* p, FILE* out){
nc->rstate.hardcursorpos = true; nc->rstate.hardcursorpos = true;
parent = &s->next; parent = &s->next;
}else if(s->invalidated == SPRIXEL_HIDE){ }else if(s->invalidated == SPRIXEL_HIDE){
//fprintf(stderr, "OUGHT HIDE %d [%dx%d @ %d/%d] %p\n", s->id, s->dimy, s->dimx, s->y, s->x, s); fprintf(stderr, "OUGHT HIDE %d [%dx%d @ %d/%d] %p\n", s->id, s->dimy, s->dimx, s->y, s->x, s);
int r = sprite_destroy(nc, p, out, s); int r = sprite_destroy(nc, p, out, s);
if(r < 0){ if(r < 0){
return -1; return -1;
@ -1105,6 +1105,9 @@ notcurses_rasterize_inner(notcurses* nc, const ncpile* p, FILE* out){
if(rasterize_core(nc, p, out)){ if(rasterize_core(nc, p, out)){
return -1; return -1;
} }
if(rasterize_sprixels(nc, p, out) < 0){
return -1;
}
if(fflush(out)){ if(fflush(out)){
return -1; return -1;
} }