blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

panelreel-demo: done after demodelay * 5 #135

Browse Source
This commit is contained in:
nick black 2019-12-13 20:25:48 -05:00
parent 88163325fa
commit 54eb41cf3a
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -75,7 +75,7 @@ target_compile_options(notcurses-demo
)
target_compile_definitions(notcurses-demo
PRIVATE
FORTIFY_SOURCE=2
FORTIFY_SOURCE=2 _GNU_SOURCE
)
# tiny proofs of concept, one binary per source file

9
src/demo/demo.h
View File

@ -55,6 +55,15 @@ timespec_div(const struct timespec* ts, unsigned divisor, struct timespec* quots
quots->tv_sec = ns / GIG;
}
// divide the provided timespec 'ts' by 'multiplier' into 'product'
static inline void
timespec_mul(const struct timespec* ts, unsigned multiplier, struct timespec* product){
uint64_t ns = timespec_to_ns(ts);
ns *= multiplier;
product->tv_nsec = ns % GIG;
product->tv_sec = ns / GIG;
}
#ifdef __cplusplus
}
#endif

32
src/demo/panelreel.c
View File

@ -204,18 +204,27 @@ new_tabletctx(struct panelreel* pr, unsigned *id){
}
static wchar_t
handle_input(struct notcurses* nc, struct panelreel* pr, int efd){
handle_input(struct notcurses* nc, struct panelreel* pr, int efd,
const struct timespec* deadline){
struct pollfd fds[2] = {
{ .fd = STDIN_FILENO, .events = POLLIN, .revents = 0, },
{ .fd = efd, .events = POLLIN, .revents = 0, },
};
sigset_t sset;
sigemptyset(&sset);
wchar_t key = -1;
int pret;
notcurses_render(nc);
do{
pret = poll(fds, sizeof(fds) / sizeof(*fds), -1);
if(pret < 0){
struct timespec pollspec, cur;
clock_gettime(CLOCK_MONOTONIC, &cur);
timespec_subtract(&pollspec, deadline, &cur);
pret = ppoll(fds, sizeof(fds) / sizeof(*fds), &pollspec, &sset);
if(pret == 0){
return 0;
}else if(pret < 0){
fprintf(stderr, "Error polling on stdin/eventfd (%s)\n", strerror(errno));
return (wchar_t)-1;
}else{
if(fds[0].revents & POLLIN){
key = notcurses_getc_blocking(nc);
@ -277,13 +286,11 @@ panelreel_demo_core(struct notcurses* nc, int efd, tabletctx** tctxs){
ncplane_cursor_move_yx(w, 1, 1);
ncplane_printf(w, "a, b, c create tablets, DEL deletes, q quits.");
// FIXME clrtoeol();
/*
struct timespec fadets = { .tv_sec = 1, .tv_nsec = 0, };
if(ncplane_fadein(panelreel_plane(pr), &fadets)){
return NULL;
}
*/
unsigned id = 0;
struct timespec deadline;
clock_gettime(CLOCK_MONOTONIC, &deadline);
ns_to_timespec((timespec_to_ns(&demodelay) * 5) + timespec_to_ns(&deadline),
&deadline);
do{
ncplane_styles_set(w, 0);
ncplane_set_fg_rgb(w, 197, 15, 31);
@ -293,7 +300,7 @@ panelreel_demo_core(struct notcurses* nc, int efd, tabletctx** tctxs){
// FIXME wclrtoeol(w);
ncplane_set_fg_rgb(w, 0, 55, 218);
wchar_t rw;
if((rw = handle_input(nc, pr, efd)) < 0){
if((rw = handle_input(nc, pr, efd, &deadline)) <= 0){
done = true;
break;
}
@ -322,6 +329,11 @@ panelreel_demo_core(struct notcurses* nc, int efd, tabletctx** tctxs){
newtablet->next = *tctxs;
*tctxs = newtablet;
}
struct timespec cur;
clock_gettime(CLOCK_MONOTONIC, &cur);
if(timespec_subtract_ns(&cur, &deadline) >= 0){
break;
}
//panelreel_validate(w, pr); // do what, if not assert()ing? FIXME
}while(!done);
return pr;

2
src/demo/widecolor.c
View File

@ -1,6 +1,6 @@
#include <assert.h>
#include <ctype.h>
#include <curses.h>
#include <wctype.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>