From 8f7fa9da44a64d659199d8d375011d396cb72b60 Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 25 Nov 2020 12:19:33 -0500 Subject: [PATCH] move postpaint() out of render step #1135 --- include/ncpp/NotCurses.hh | 5 ----- src/lib/render.c | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/ncpp/NotCurses.hh b/include/ncpp/NotCurses.hh index ebd972e8d..59894c24d 100644 --- a/include/ncpp/NotCurses.hh +++ b/include/ncpp/NotCurses.hh @@ -195,11 +195,6 @@ namespace ncpp return error_guard (notcurses_render (nc), -1); } - bool render_to_buffer (char** buf, size_t* buflen) const NOEXCEPT_MAYBE - { - return error_guard (notcurses_render_to_buffer (nc, buf, buflen), -1); - } - bool render_to_file (FILE* fp) const NOEXCEPT_MAYBE { return error_guard (notcurses_render_to_file (nc, fp), -1); diff --git a/src/lib/render.c b/src/lib/render.c index a912ad1b7..4bbdc7277 100644 --- a/src/lib/render.c +++ b/src/lib/render.c @@ -1037,15 +1037,12 @@ int notcurses_render_to_file(notcurses* nc, FILE* fp){ // locking down the EGC, the attributes, and the channels for each cell. static int notcurses_render_internal(notcurses* nc, struct crender* rvec){ - int dimy, dimx; - ncplane_dim_yx(nc->stdplane, &dimy, &dimx); ncplane* p = ncplane_pile(nc->stdplane)->top; while(p){ paint(p, rvec, nc->stdplane->leny, nc->stdplane->lenx, nc->stdplane->absy, nc->stdplane->absx); p = p->below; } - postpaint(nc->lastframe, dimy, dimx, rvec, &nc->pool); return 0; } @@ -1061,6 +1058,7 @@ int notcurses_render(notcurses* nc){ if(notcurses_render_internal(nc, crender) == 0){ clock_gettime(CLOCK_MONOTONIC, &rasterdone); update_render_stats(&rasterdone, &start, &nc->stats); + postpaint(nc->lastframe, dimy, dimx, crender, &nc->pool); bytes = notcurses_rasterize(nc, crender, nc->rstate.mstreamfp); } update_render_bytes(&nc->stats, bytes); @@ -1089,6 +1087,7 @@ int notcurses_render_to_buffer(notcurses* nc, char** buf, size_t* buflen){ if(notcurses_render_internal(nc, crender) == 0){ clock_gettime(CLOCK_MONOTONIC, &rasterdone); update_render_stats(&rasterdone, &start, &nc->stats); + postpaint(nc->lastframe, dimy, dimx, crender, &nc->pool); bytes = notcurses_rasterize_inner(nc, crender, nc->rstate.mstreamfp); } update_render_bytes(&nc->stats, bytes);