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

separate output from scaled geometry #1560

Browse Source
This commit is contained in:
nick black 2021-05-02 16:37:22 -04:00 committed by Nick Black
parent 9c2aef0ff7
commit fedcd94502
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/direct.c
View File

@ -502,7 +502,7 @@ ncdirect_render_visual(ncdirect* n, ncvisual* ncv, ncblitter_e blitfxn,
if(!bset){
return NULL;
}
int disprows, dispcols;
int disprows, dispcols, outy;
if(scale != NCSCALE_NONE && scale != NCSCALE_NONE_HIRES){
if(bset->geom != NCBLIT_PIXEL){
dispcols = dimx * encoding_x_scale(&n->tcache, bset);
@ -510,19 +510,19 @@ ncdirect_render_visual(ncdirect* n, ncvisual* ncv, ncblitter_e blitfxn,
}else{
dispcols = dimx * n->tcache.cellpixx;
disprows = (dimy - 1) * n->tcache.cellpixy;
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols);
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols, &outy);
}
if(scale == NCSCALE_SCALE || scale == NCSCALE_SCALE_HIRES){
scale_visual(ncv, &disprows, &dispcols);
if(bset->geom == NCBLIT_PIXEL){
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols);
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols, &outy);
}
}
}else{
disprows = ncv->pixy;
dispcols = ncv->pixx;
if(bset->geom == NCBLIT_PIXEL){
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols);
clamp_to_sixelmax(&n->tcache, &disprows, &dispcols, &outy);
}
}
leny = (leny / (double)ncv->pixy) * ((double)disprows);

14
src/lib/internal.h
View File

@ -1017,15 +1017,19 @@ sprite_rebuild(const notcurses* nc, sprixel* s, int ycell, int xcell){
return ret;
}
// |y| and |x| are scaled geometry on input, and clamped scaled geometry on
// output. |outy| is output geometry on output, and unused on input. output
// geometry is derived from scaled geometry and output requirements (that Sixel
// must be a multiple of six pixels tall). output width is always equal to
// scaled width. all are pixels.
static inline void
clamp_to_sixelmax(const tinfo* t, int* y, int* x){
clamp_to_sixelmax(const tinfo* t, int* y, int* x, int* outy){
if(t->sixel_maxy && *y > t->sixel_maxy){
*y = t->sixel_maxy;
}
if(*y % t->sprixel_scale_height){
// FIXME take it up and use transparent rows, rather than clipping FIXME
//*y += t->sprixel_scale_height - (*y % t->sprixel_scale_height);
*y -= *y % t->sprixel_scale_height;
*outy = *y;
if(*outy % t->sprixel_scale_height){
*outy += t->sprixel_scale_height - (*outy % t->sprixel_scale_height);
}
if(t->sixel_maxx && *x > t->sixel_maxx){
*x = t->sixel_maxx;

33
src/lib/visual.c
View File

@ -610,11 +610,14 @@ ncplane* ncvisual_render_cells(notcurses* nc, ncvisual* ncv, const struct blitse
return n;
}
// create a plane in which to blit the sprixel.
// create a plane in which to blit the sprixel. |disppixx| and |disppixy| are
// scaled pixel geometry on output, and unused on input. |placey| and |placex|
// are used to position the new plane, and reset to 0 on output. |outy| is
// output height on output, and unused on input.
static ncplane*
make_sprixel_plane(notcurses* nc, ncvisual* ncv, ncscale_e scaling,
int* disppixy, int* disppixx, uint64_t flags,
int* placey, int* placex){
int* outy, int* placey, int* placex){
if(scaling != NCSCALE_NONE && scaling != NCSCALE_NONE_HIRES){
// FIXME this ought be based off a specified pile
notcurses_term_dim_yx(nc, disppixy, disppixx);
@ -627,15 +630,15 @@ make_sprixel_plane(notcurses* nc, ncvisual* ncv, ncscale_e scaling,
--*disppixy; // some terminals will scroll if we blit to the last row
*disppixx *= nc->tcache.cellpixx;
*disppixy *= nc->tcache.cellpixy;
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx);
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx, outy);
if(scaling == NCSCALE_SCALE || scaling == NCSCALE_SCALE_HIRES){
scale_visual(ncv, disppixy, disppixx); // can only shrink
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx);
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx, outy);
}
}else{
*disppixx = ncv->pixx;
*disppixy = ncv->pixy;
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx);
clamp_to_sixelmax(&nc->tcache, disppixy, disppixx, outy);
}
struct ncplane_options nopts = {
.y = *placey,
@ -671,10 +674,12 @@ make_sprixel_plane(notcurses* nc, ncvisual* ncv, ncscale_e scaling,
// relative to the parent plane, as they would be in ncplane_create().
//
// by the end, disppixy/disppixx refer to the number of target rows/cols (in
// pixels), while leny/lenx refer to the number of source rows/cols (likewise
// in pixels). begy/begx refer to the starting offset within the source. the
// sum of begy+leny must not exceed ncv->rows; the sum of begx+lenx must not
// exceed ncv->cols.
// pixels), aka the scaled geometry. outy refers to the output height, subject
// to Sixel considerations. leny/lenx refer to the number of source rows/cols
// (likewise in pixels). begy/begx refer to the starting offset within the
// source. the sum of begy+leny must not exceed ncv->rows; the sum of begx+lenx
// must not exceed ncv->cols. these sums define the selected geometry. the
// output width is always equal to the scaled width; it has no distinct name.
ncplane* ncvisual_render_pixels(notcurses* nc, ncvisual* ncv, const struct blitset* bset,
int placey, int placex, int begy, int begx,
ncplane* n, ncscale_e scaling, uint64_t flags,
@ -684,12 +689,12 @@ ncplane* ncvisual_render_pixels(notcurses* nc, ncvisual* ncv, const struct blits
logerror(nc, "Won't blit bitmaps to the standard plane\n");
return NULL;
}
int disppixy = 0, disppixx = 0;
int disppixy = 0, disppixx = 0, outy = 0;
ncplane* createdn = NULL;
//fprintf(stderr, "INPUT N: %p rows: %d cols: %d 0x%016lx\n", n ? n : NULL, disppixy, disppixx, flags);
if(n == NULL){ // create plane
createdn = make_sprixel_plane(nc, ncv, scaling, &disppixy, &disppixx,
flags, &placey, &placex);
flags, &outy, &placey, &placex);
if(createdn == NULL){
return NULL;
}
@ -699,7 +704,7 @@ ncplane* ncvisual_render_pixels(notcurses* nc, ncvisual* ncv, const struct blits
ncplane_dim_yx(n, &disppixy, &disppixx);
disppixx *= nc->tcache.cellpixx;
disppixy *= nc->tcache.cellpixy;
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx);
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx, &outy);
if(!(flags & NCVISUAL_OPTION_HORALIGNED)){
disppixx -= placex * nc->tcache.cellpixx;
}
@ -710,10 +715,10 @@ ncplane* ncvisual_render_pixels(notcurses* nc, ncvisual* ncv, const struct blits
disppixx = ncv->pixx;
disppixy = ncv->pixy;
}
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx);
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx, &outy);
if(scaling == NCSCALE_SCALE || scaling == NCSCALE_SCALE_HIRES){
scale_visual(ncv, &disppixy, &disppixx);
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx);
clamp_to_sixelmax(&nc->tcache, &disppixy, &disppixx, &outy);
}
}
//fprintf(stderr, "pblit: %dx%d <- %dx%d of %d/%d stride %u @%dx%d %p %u\n", disppixy, disppixx, begy, begx, ncv->pixy, ncv->pixx, ncv->rowstride, placey, placex, ncv->data, nc->tcache.cellpixx);