diff --git a/data/normal.png b/data/normal.png index 4cae17e8d..72e7b3a87 100644 Binary files a/data/normal.png and b/data/normal.png differ diff --git a/data/normal.xcf b/data/normal.xcf index 0ca011e03..9e49a1922 100644 Binary files a/data/normal.xcf and b/data/normal.xcf differ diff --git a/doc/man/man1/notcurses-demo.1.md b/doc/man/man1/notcurses-demo.1.md index 022fa1b05..daee6e02c 100644 --- a/doc/man/man1/notcurses-demo.1.md +++ b/doc/man/man1/notcurses-demo.1.md @@ -74,7 +74,7 @@ terminal, and will refuse to run in anything smaller than 80x24. **-V**|**--version**: Print the program name and version, and exit with success. ***demospec***: Select which demos to run, and what order to run them in. The -default is **ixezcytnhdmbkgarwuvlsfjqo**. See above for a list of demos. +default is **ixetnchdmbkygarwuvlsfjqzo**. See above for a list of demos. Default margins are all 0, and thus the full screen will be rendered. Using **-m**, margins can be supplied. Provide a single number to set all four margins diff --git a/src/demo/demo.c b/src/demo/demo.c index 3d75b5a34..0dd00f2ce 100644 --- a/src/demo/demo.c +++ b/src/demo/demo.c @@ -20,7 +20,7 @@ static int democount; static demoresult* results; static char *datadir = NOTCURSES_SHARE; -static const char DEFAULT_DEMO[] = "ixezcytnhdmbkgarwuvlsfjqo"; +static const char DEFAULT_DEMO[] = "ixetnchdmbkygarwuvlsfjqzo"; atomic_bool interrupted = ATOMIC_VAR_INIT(false); // checked following demos, whether aborted, failed, or otherwise diff --git a/src/demo/normal.c b/src/demo/normal.c index 46beac875..fe4caaaa5 100644 --- a/src/demo/normal.c +++ b/src/demo/normal.c @@ -77,29 +77,18 @@ rotate_visual(struct notcurses* nc, struct ncplane* n, int dy, int dx){ struct ncvisual_options vopts = { }; ncplane_erase(stdn); struct ncvisual* nncv = NULL; - struct ncplane* np = NULL; if(notcurses_canopen_images(nc)){ char* path = find_data("normal.png"); if(path){ nncv = ncvisual_from_file(path); if(nncv){ - struct ncplane_options nopts = { - .y = 1, - .rows = dimy - 1, - .cols = dimx, - }; - np = ncplane_create(stdn, &nopts); - if(np == NULL){ - return -1; - } struct ncvisual_options nvopts = { - .n = np, + .n = stdn, .scaling = NCSCALE_STRETCH, }; if(ncvisual_render(nc, nncv, &nvopts) == NULL){ return -1; } - ncplane_move_below(notcurses_stdplane(nc), np); } free(path); } @@ -123,7 +112,6 @@ rotate_visual(struct notcurses* nc, struct ncplane* n, int dy, int dx){ } ncplane_destroy(newn); } - ncplane_destroy(np); ncvisual_destroy(nncv); ncvisual_destroy(ncv); return r; diff --git a/src/demo/outro.c b/src/demo/outro.c index 033f9db51..e79a50666 100644 --- a/src/demo/outro.c +++ b/src/demo/outro.c @@ -58,6 +58,7 @@ videothread(void* vnc){ .scaling = NCSCALE_STRETCH, .n = ncp, .y = 1, + .flags = NCVISUAL_OPTION_ADDALPHA, }; int three = 3; if(ncvisual_render(nc, ncv, &ovopts) == NULL){