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

notcurses-view: move to a complex marshal

Browse Source
This commit is contained in:
nick black 2020-10-21 02:00:42 -04:00
parent 55200b09ad
commit c31a78a244
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# Notcurses, a blingful TUI/character graphics library
# Notcurses: blingful TUIs and character graphics
* **What it is**: a library facilitating complex TUIs on modern terminal
emulators, supporting vivid colors, multimedia, and Unicode to the maximum

8
src/lib/blit.c
View File

@ -10,7 +10,9 @@ lerp(uint32_t c0, uint32_t c1){
unsigned r0, g0, b0, r1, g1, b1;
channel_rgb8(c0, &r0, &g0, &b0);
channel_rgb8(c1, &r1, &g1, &b1);
channel_set_rgb8(&ret, (r0 + r1 + 1) / 2, (g0 + g1 + 1) / 2, (b0 + b1 + 1) / 2);
channel_set_rgb8(&ret, (r0 + r1 + 1) / 2,
(g0 + g1 + 1) / 2,
(b0 + b1 + 1) / 2);
return ret;
}
@ -23,8 +25,8 @@ trilerp(uint32_t c0, uint32_t c1, uint32_t c2){
channel_rgb8(c1, &r1, &g1, &b1);
channel_rgb8(c2, &r2, &g2, &b2);
channel_set_rgb8(&ret, (r0 + r1 + r2 + 2) / 3,
(g0 + g1 + g2 + 2) / 3,
(b0 + b1 + b2 + 2) / 3);
(g0 + g1 + g2 + 2) / 3,
(b0 + b1 + b2 + 2) / 3);
return ret;
}

48
src/view/view.cpp
View File

@ -44,12 +44,16 @@ ns_to_timespec(uint64_t ns, struct timespec* ts){
return ts;
}
// FIXME internalize this via complex curry
static struct ncplane* subtitle_plane = nullptr;
struct marshal {
struct ncplane* subtitle_plane;
int framecount;
bool quiet;
};
// frame count is in the curry. original time is kept in n's userptr.
auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
const struct timespec* abstime, void* vframecount) -> int {
const struct timespec* abstime, void* vmarshal) -> int {
struct marshal* marsh = static_cast<struct marshal*>(vmarshal);
NotCurses &nc = NotCurses::get_instance ();
auto start = static_cast<struct timespec*>(ncplane_userptr(vopts->n));
if(!start){
@ -58,12 +62,10 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
ncplane_set_userptr(vopts->n, start);
}
std::unique_ptr<Plane> stdn(nc.get_stdplane());
int* framecount = static_cast<int*>(vframecount);
// negative framecount means don't print framecount/timing (quiet mode)
if(*framecount >= 0){
++*framecount;
if(marsh->framecount >= 0){
++marsh->framecount;
}
const bool quiet = (*framecount < 0);
stdn->set_fg_rgb(0x80c080);
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
@ -73,28 +75,28 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
blitter = ncvisual_default_blitter(notcurses_canutf8(nc), vopts->scaling);
vopts->blitter = blitter;
}
if(!quiet){
stdn->printf(0, NCAlign::Left, "frame %06d\u2026 (%s)", *framecount,
if(!marsh->quiet){
stdn->printf(0, NCAlign::Left, "frame %06d\u2026 (%s)", marsh->framecount,
notcurses_str_blitter(blitter));
}
char* subtitle = ncvisual_subtitle(ncv);
if(subtitle){
if(!subtitle_plane){
if(!marsh->subtitle_plane){
int dimx, dimy;
ncplane_dim_yx(vopts->n, &dimy, &dimx);
subtitle_plane = ncplane_new(notcurses_stdplane(nc), 1, dimx,
dimy - 1, 0, nullptr, "subt");
marsh->subtitle_plane = ncplane_new(notcurses_stdplane(nc), 1, dimx,
dimy - 1, 0, nullptr, "subt");
uint64_t channels = 0;
channels_set_fg_alpha(&channels, CELL_ALPHA_TRANSPARENT);
channels_set_bg_alpha(&channels, CELL_ALPHA_TRANSPARENT);
ncplane_set_base(subtitle_plane, "", 0, channels);
ncplane_set_fg_rgb(subtitle_plane, 0x00ffff);
ncplane_set_fg_alpha(subtitle_plane, CELL_ALPHA_HIGHCONTRAST);
ncplane_set_bg_alpha(subtitle_plane, CELL_ALPHA_TRANSPARENT);
ncplane_set_base(marsh->subtitle_plane, "", 0, channels);
ncplane_set_fg_rgb(marsh->subtitle_plane, 0x00ffff);
ncplane_set_fg_alpha(marsh->subtitle_plane, CELL_ALPHA_HIGHCONTRAST);
ncplane_set_bg_alpha(marsh->subtitle_plane, CELL_ALPHA_TRANSPARENT);
}else{
ncplane_erase(subtitle_plane);
ncplane_erase(marsh->subtitle_plane);
}
ncplane_printf_yx(subtitle_plane, 0, 0, "%s", subtitle);
ncplane_printf_yx(marsh->subtitle_plane, 0, 0, "%s", subtitle);
free(subtitle);
}
const intmax_t h = ns / (60 * 60 * NANOSECS_IN_SEC);
@ -103,7 +105,7 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
ns -= m * (60 * NANOSECS_IN_SEC);
const intmax_t s = ns / NANOSECS_IN_SEC;
ns -= s * NANOSECS_IN_SEC;
if(!quiet){
if(!marsh->quiet){
stdn->printf(0, NCAlign::Right, "%02jd:%02jd:%02jd.%04jd",
h, m, s, ns / 1000000);
}
@ -259,7 +261,6 @@ auto main(int argc, char** argv) -> int {
{
std::unique_ptr<Plane> stdn(nc.get_stdplane(&dimy, &dimx));
for(auto i = nonopt ; i < argc ; ++i){
int frames = quiet ? -1 : 0;
std::unique_ptr<Visual> ncv;
try{
ncv = std::make_unique<Visual>(argv[i]);
@ -273,12 +274,15 @@ auto main(int argc, char** argv) -> int {
stdn->erase();
}
struct ncvisual_options vopts{};
int r;
vopts.n = *stdn;
vopts.scaling = scalemode;
vopts.blitter = blitter;
int r;
do{
r = ncv->stream(&vopts, timescale, perframe, &frames);
struct marshal marsh = {
.subtitle_plane = nullptr, .framecount = 0, .quiet = quiet,
};
r = ncv->stream(&vopts, timescale, perframe, &marsh);
free(stdn->get_userptr());
stdn->set_userptr(nullptr);
if(r == 0){