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

NCBLIT_PIXEL restrictions for planes

Browse Source 
Go ahead and allow the standard plane to be used with
NCBLIT_PIXEL, but enforce placement at the origin with
any provided plane. Implement this in ncvisual_blitter_geom()
so that it applies everywhere #1572.
This commit is contained in:
nick black 2021-04-24 03:22:23 -04:00
parent ea809345e3
commit d3877cbe44
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/visual.c
View File

@ -148,6 +148,18 @@ ncvisual_blitset_geom(const notcurses* nc, const ncvisual* n,
if(!x){
x = &fauxx;
}
if(bset->geom == NCBLIT_PIXEL && vopts){
if(vopts->n){
if(vopts->y && !(vopts->flags & NCVISUAL_OPTION_VERALIGNED)){
logerror(nc, "Non-origin y placement %d for sprixel\n", vopts->y);
return -1;
}
if(vopts->x && !(vopts->flags & NCVISUAL_OPTION_HORALIGNED)){
logerror(nc, "Non-origin x placement %d for sprixel\n", vopts->x);
return -1;
}
}
}
if(n){
if(scale == NCSCALE_NONE || scale == NCSCALE_NONE_HIRES){
*y = n->rows;
@ -600,6 +612,8 @@ ncplane* ncvisual_render_cells(notcurses* nc, ncvisual* ncv, const struct blitse
// by the end, disprows/dispcols refer to the number of source rows/cols (in
// pixels), which will be mapped to a region of cells scaled by the encodings).
// sprixels are only blit to the origin; placey and placex may be non-zero
// only if the target plane is being created.
// the blit will begin at placey/placex (in terms of cells). begy/begx define
// the origin of the source region to draw (in pixels). leny/lenx defined the
// geometry of the source region to draw, again in pixels. ncv->rows and
@ -609,10 +623,6 @@ ncplane* ncvisual_render_pixels(notcurses* nc, ncvisual* ncv, const struct blits
ncplane* n, ncscale_e scaling, uint64_t flags,
uint32_t transcolor){
ncplane* stdn = notcurses_stdplane(nc);
if(stdn == n){
logerror(nc, "Won't render bitmaps to the standard plane\n");
return NULL;
}
int disprows = 0, dispcols = 0;
if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
dispcols = ncv->cols;