diff --git a/src/demo/xray.c b/src/demo/xray.c index dfa75cffd..e300500c2 100644 --- a/src/demo/xray.c +++ b/src/demo/xray.c @@ -65,7 +65,9 @@ perframecb(struct ncvisual* ncv, struct ncvisual_options* vopts, // only need these two steps done once, but we can't do them in // main() due to the plane being created in ncvisual_stream() =[ ncplane_set_resizecb(vopts->n, ncplane_resize_maximize); - ncplane_move_above(vopts->n, vnewplane); + // until #1518 is done, the stream isn't transparent, and thus it + // can obstruct the slider if there are few enough rows. FIXME + ncplane_move_above(vnewplane, vopts->n); struct notcurses* nc = ncplane_notcurses(vopts->n); static int frameno = 0; diff --git a/src/lib/blit.c b/src/lib/blit.c index 665177a16..277059848 100644 --- a/src/lib/blit.c +++ b/src/lib/blit.c @@ -615,7 +615,7 @@ sex_trans_check(cell* c, const uint32_t rgbas[6], unsigned blendcolors){ ++div; } } - if(transstring == 0){ + if(transstring == 0){ // there was no transparency return NULL; } cell_set_bg_alpha(c, CELL_ALPHA_TRANSPARENT); @@ -685,7 +685,7 @@ sextant_blit(ncplane* nc, int linesize, const void* data, c->channels = 0; c->stylemask = 0; const char* egc = sex_trans_check(c, rgbas, bargs->u.cell.blendcolors); - if(egc == NULL){ + if(egc == NULL){ // no transparency; run a full solver egc = sex_solver(rgbas, &c->channels, bargs->u.cell.blendcolors); cell_set_blitquadrants(c, 1, 1, 1, 1); } diff --git a/src/lib/sixel.c b/src/lib/sixel.c index 307eaba58..bb90a4be7 100644 --- a/src/lib/sixel.c +++ b/src/lib/sixel.c @@ -321,7 +321,8 @@ write_sixel_data(FILE* fp, int leny, int lenx, const sixeltable* stab, int* pars // Set Raster Attributes - pan/pad=1 (pixel aspect ratio), Ph=lenx, Pv=leny // using Ph/Pv causes a background to be drawn using color register 0 for all // unspecified pixels, which we do not want. - fprintf(fp, "\"1;2;%d;%d", lenx, leny); + //fprintf(fp, "\"1;0;%d;%d", lenx, leny); + (void)leny; for(int i = 0 ; i < stab->colors ; ++i){ const unsigned char* rgb = stab->table + i * CENTSIZE;