From 57114c80057e4b6cdfe2aaf262efade7526e7478 Mon Sep 17 00:00:00 2001 From: nick black Date: Sun, 28 Mar 2021 16:59:02 -0400 Subject: [PATCH] [bitmaps] remove redundant PixelWipeBlocks test --- CMakeLists.txt | 2 +- NEWS.md | 2 +- cffi/notcurses-pydemo.1.md | 2 +- cffi/setup.py | 2 +- doc/Doxyfile | 2 +- doc/man/index.html | 2 +- doc/man/man1/ncls.1.md | 2 +- doc/man/man1/ncneofetch.1.md | 2 +- doc/man/man1/ncplayer.1.md | 2 +- doc/man/man1/nctetris.1.md | 2 +- doc/man/man1/notcurses-demo.1.md | 2 +- doc/man/man1/notcurses-input.1.md | 2 +- doc/man/man1/notcurses-tester.1.md | 2 +- doc/man/man3/notcurses.3.md | 2 +- doc/man/man3/notcurses_capabilities.3.md | 2 +- doc/man/man3/notcurses_cell.3.md | 2 +- doc/man/man3/notcurses_channels.3.md | 2 +- doc/man/man3/notcurses_core.3.md | 2 +- doc/man/man3/notcurses_direct.3.md | 2 +- doc/man/man3/notcurses_fade.3.md | 2 +- doc/man/man3/notcurses_fds.3.md | 2 +- doc/man/man3/notcurses_init.3.md | 2 +- doc/man/man3/notcurses_input.3.md | 2 +- doc/man/man3/notcurses_lines.3.md | 2 +- doc/man/man3/notcurses_menu.3.md | 2 +- doc/man/man3/notcurses_metric.3.md | 2 +- doc/man/man3/notcurses_multiselector.3.md | 2 +- doc/man/man3/notcurses_output.3.md | 2 +- doc/man/man3/notcurses_palette.3.md | 2 +- doc/man/man3/notcurses_plane.3.md | 2 +- doc/man/man3/notcurses_plot.3.md | 2 +- doc/man/man3/notcurses_reader.3.md | 2 +- doc/man/man3/notcurses_reel.3.md | 2 +- doc/man/man3/notcurses_refresh.3.md | 2 +- doc/man/man3/notcurses_render.3.md | 2 +- doc/man/man3/notcurses_selector.3.md | 2 +- doc/man/man3/notcurses_stats.3.md | 2 +- doc/man/man3/notcurses_stdplane.3.md | 2 +- doc/man/man3/notcurses_stop.3.md | 2 +- doc/man/man3/notcurses_tabbed.3.md | 2 +- doc/man/man3/notcurses_tree.3.md | 2 +- doc/man/man3/notcurses_visual.3.md | 2 +- rust/Cargo.toml | 2 +- rust/build/build.rs | 2 +- src/tests/pixel.cpp | 21 --------------------- 45 files changed, 44 insertions(+), 65 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34d8bbf21..64b53b8ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # 3.14.0 introduced NAME_WLE cmake_minimum_required(VERSION 3.14.0) -project(notcurses VERSION 2.2.3 +project(notcurses VERSION 2.2.4 DESCRIPTION "Blingful UI for modern terminal emulators" HOMEPAGE_URL "https://nick-black.com/dankwiki/index.php/notcurses" LANGUAGES C CXX) diff --git a/NEWS.md b/NEWS.md index 21d8b3a17..ce30edeee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ This document attempts to list user-visible changes and any major internal rearrangements of Notcurses. -* 2.2.4 (not yet released) +* 2.2.4 (2021-03-29) * Implemented **EXPERIMENTAL** `NCBLIT_PIXEL` for terminals reporting the Kitty pixel graphics protocol. * Added `notcurses_debug_caps()` to dump terminal properties, both those diff --git a/cffi/notcurses-pydemo.1.md b/cffi/notcurses-pydemo.1.md index 64c80c2ee..bd28f4bda 100644 --- a/cffi/notcurses-pydemo.1.md +++ b/cffi/notcurses-pydemo.1.md @@ -1,6 +1,6 @@ % notcurses-pydemo(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/cffi/setup.py b/cffi/setup.py index d87766dfe..38fd408ea 100644 --- a/cffi/setup.py +++ b/cffi/setup.py @@ -34,7 +34,7 @@ def read(fname): setup( name="notcurses", - version="2.2.3", + version="2.2.4", packages=['notcurses'], scripts=['notcurses-pydemo', 'ncdirect-pydemo'], package_dir={'': 'src'}, diff --git a/doc/Doxyfile b/doc/Doxyfile index 2ebeb7dd2..4d89e411e 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Notcurses # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.2.3 +PROJECT_NUMBER = 2.2.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/man/index.html b/doc/man/index.html index 8504115ee..7aa3b6e68 100644 --- a/doc/man/index.html +++ b/doc/man/index.html @@ -33,7 +33,7 @@
-

notcurses manual pages (v2.2.3)

+

notcurses manual pages (v2.2.4)

notcurses(3)—a blingful TUI library

Executables (section 1)

ncls—list files, displaying multimedia along with them
diff --git a/doc/man/man1/ncls.1.md b/doc/man/man1/ncls.1.md index c47a31332..aa0cc54ff 100644 --- a/doc/man/man1/ncls.1.md +++ b/doc/man/man1/ncls.1.md @@ -1,6 +1,6 @@ % ncls(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/ncneofetch.1.md b/doc/man/man1/ncneofetch.1.md index d71c3ee56..9a39533bf 100644 --- a/doc/man/man1/ncneofetch.1.md +++ b/doc/man/man1/ncneofetch.1.md @@ -1,6 +1,6 @@ % ncneofetch(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/ncplayer.1.md b/doc/man/man1/ncplayer.1.md index 05c48763f..432f13c0f 100644 --- a/doc/man/man1/ncplayer.1.md +++ b/doc/man/man1/ncplayer.1.md @@ -1,6 +1,6 @@ % ncplayer(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/nctetris.1.md b/doc/man/man1/nctetris.1.md index ccfd5457d..31e505516 100644 --- a/doc/man/man1/nctetris.1.md +++ b/doc/man/man1/nctetris.1.md @@ -1,6 +1,6 @@ % nctetris(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/notcurses-demo.1.md b/doc/man/man1/notcurses-demo.1.md index 92e47d6f2..420bff152 100644 --- a/doc/man/man1/notcurses-demo.1.md +++ b/doc/man/man1/notcurses-demo.1.md @@ -1,6 +1,6 @@ % notcurses-demo(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/notcurses-input.1.md b/doc/man/man1/notcurses-input.1.md index e6ca1b4f5..099ffcaf1 100644 --- a/doc/man/man1/notcurses-input.1.md +++ b/doc/man/man1/notcurses-input.1.md @@ -1,6 +1,6 @@ % notcurses-input(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man1/notcurses-tester.1.md b/doc/man/man1/notcurses-tester.1.md index 031feeadb..f329ff708 100644 --- a/doc/man/man1/notcurses-tester.1.md +++ b/doc/man/man1/notcurses-tester.1.md @@ -1,6 +1,6 @@ % notcurses-tester(1) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses.3.md b/doc/man/man3/notcurses.3.md index 0c4f6ef5b..b5235974f 100644 --- a/doc/man/man3/notcurses.3.md +++ b/doc/man/man3/notcurses.3.md @@ -1,6 +1,6 @@ % notcurses(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_capabilities.3.md b/doc/man/man3/notcurses_capabilities.3.md index f4cba7762..115cf64b1 100644 --- a/doc/man/man3/notcurses_capabilities.3.md +++ b/doc/man/man3/notcurses_capabilities.3.md @@ -1,6 +1,6 @@ % notcurses_capabilities(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_cell.3.md b/doc/man/man3/notcurses_cell.3.md index 7734b5019..ab09b69dc 100644 --- a/doc/man/man3/notcurses_cell.3.md +++ b/doc/man/man3/notcurses_cell.3.md @@ -1,6 +1,6 @@ % notcurses_cell(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_channels.3.md b/doc/man/man3/notcurses_channels.3.md index df56dab56..32283849c 100644 --- a/doc/man/man3/notcurses_channels.3.md +++ b/doc/man/man3/notcurses_channels.3.md @@ -1,6 +1,6 @@ % notcurses_channels(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_core.3.md b/doc/man/man3/notcurses_core.3.md index c8a471abc..8851e7bdc 100644 --- a/doc/man/man3/notcurses_core.3.md +++ b/doc/man/man3/notcurses_core.3.md @@ -1,6 +1,6 @@ % notcurses_core(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_direct.3.md b/doc/man/man3/notcurses_direct.3.md index 2bfc7ded8..e1e674551 100644 --- a/doc/man/man3/notcurses_direct.3.md +++ b/doc/man/man3/notcurses_direct.3.md @@ -1,6 +1,6 @@ % notcurses_direct(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_fade.3.md b/doc/man/man3/notcurses_fade.3.md index 1e40f69ed..9acc292a7 100644 --- a/doc/man/man3/notcurses_fade.3.md +++ b/doc/man/man3/notcurses_fade.3.md @@ -1,6 +1,6 @@ % notcurses_fade(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_fds.3.md b/doc/man/man3/notcurses_fds.3.md index 127ec3922..29f80726e 100644 --- a/doc/man/man3/notcurses_fds.3.md +++ b/doc/man/man3/notcurses_fds.3.md @@ -1,6 +1,6 @@ % notcurses_fds(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_init.3.md b/doc/man/man3/notcurses_init.3.md index 5cf4597c6..ae0e22756 100644 --- a/doc/man/man3/notcurses_init.3.md +++ b/doc/man/man3/notcurses_init.3.md @@ -1,6 +1,6 @@ % notcurses_init(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_input.3.md b/doc/man/man3/notcurses_input.3.md index 8bd7931fc..5f8ad448f 100644 --- a/doc/man/man3/notcurses_input.3.md +++ b/doc/man/man3/notcurses_input.3.md @@ -1,6 +1,6 @@ % notcurses_input(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_lines.3.md b/doc/man/man3/notcurses_lines.3.md index d58091c9e..3f58a4cfb 100644 --- a/doc/man/man3/notcurses_lines.3.md +++ b/doc/man/man3/notcurses_lines.3.md @@ -1,6 +1,6 @@ % notcurses_lines(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_menu.3.md b/doc/man/man3/notcurses_menu.3.md index 670fe1828..c9fae8de0 100644 --- a/doc/man/man3/notcurses_menu.3.md +++ b/doc/man/man3/notcurses_menu.3.md @@ -1,6 +1,6 @@ % notcurses_menu(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_metric.3.md b/doc/man/man3/notcurses_metric.3.md index 824f522df..ba6b91e87 100644 --- a/doc/man/man3/notcurses_metric.3.md +++ b/doc/man/man3/notcurses_metric.3.md @@ -1,6 +1,6 @@ % notcurses_metric(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_multiselector.3.md b/doc/man/man3/notcurses_multiselector.3.md index 46a003115..0b35d4621 100644 --- a/doc/man/man3/notcurses_multiselector.3.md +++ b/doc/man/man3/notcurses_multiselector.3.md @@ -1,6 +1,6 @@ % notcurses_multiselector(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_output.3.md b/doc/man/man3/notcurses_output.3.md index 910509680..3de1a2dbc 100644 --- a/doc/man/man3/notcurses_output.3.md +++ b/doc/man/man3/notcurses_output.3.md @@ -1,6 +1,6 @@ % notcurses_output(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_palette.3.md b/doc/man/man3/notcurses_palette.3.md index 8a713e22d..f366838cd 100644 --- a/doc/man/man3/notcurses_palette.3.md +++ b/doc/man/man3/notcurses_palette.3.md @@ -1,6 +1,6 @@ % notcurses_palette(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_plane.3.md b/doc/man/man3/notcurses_plane.3.md index 342e6d5ec..bcbe0f321 100644 --- a/doc/man/man3/notcurses_plane.3.md +++ b/doc/man/man3/notcurses_plane.3.md @@ -1,6 +1,6 @@ % notcurses_plane(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_plot.3.md b/doc/man/man3/notcurses_plot.3.md index 29468306f..5e3739554 100644 --- a/doc/man/man3/notcurses_plot.3.md +++ b/doc/man/man3/notcurses_plot.3.md @@ -1,6 +1,6 @@ % notcurses_plot(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_reader.3.md b/doc/man/man3/notcurses_reader.3.md index a669e81c9..c8bd8b01d 100644 --- a/doc/man/man3/notcurses_reader.3.md +++ b/doc/man/man3/notcurses_reader.3.md @@ -1,6 +1,6 @@ % notcurses_reader(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_reel.3.md b/doc/man/man3/notcurses_reel.3.md index 32b3cc57e..7c128fae7 100644 --- a/doc/man/man3/notcurses_reel.3.md +++ b/doc/man/man3/notcurses_reel.3.md @@ -1,6 +1,6 @@ % notcurses_reel(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_refresh.3.md b/doc/man/man3/notcurses_refresh.3.md index ad6e18a61..31fcb01a5 100644 --- a/doc/man/man3/notcurses_refresh.3.md +++ b/doc/man/man3/notcurses_refresh.3.md @@ -1,6 +1,6 @@ % notcurses_refresh(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_render.3.md b/doc/man/man3/notcurses_render.3.md index cd867d0a6..523cf3dae 100644 --- a/doc/man/man3/notcurses_render.3.md +++ b/doc/man/man3/notcurses_render.3.md @@ -1,6 +1,6 @@ % notcurses_render(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_selector.3.md b/doc/man/man3/notcurses_selector.3.md index f89154293..8792e152e 100644 --- a/doc/man/man3/notcurses_selector.3.md +++ b/doc/man/man3/notcurses_selector.3.md @@ -1,6 +1,6 @@ % notcurses_selector(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_stats.3.md b/doc/man/man3/notcurses_stats.3.md index 31874a6f0..aa3f9205f 100644 --- a/doc/man/man3/notcurses_stats.3.md +++ b/doc/man/man3/notcurses_stats.3.md @@ -1,6 +1,6 @@ % notcurses_stats(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_stdplane.3.md b/doc/man/man3/notcurses_stdplane.3.md index d4be9822b..a1df73b9d 100644 --- a/doc/man/man3/notcurses_stdplane.3.md +++ b/doc/man/man3/notcurses_stdplane.3.md @@ -1,6 +1,6 @@ % notcurses_stdplane(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_stop.3.md b/doc/man/man3/notcurses_stop.3.md index 65e8c5ddb..c648aec3e 100644 --- a/doc/man/man3/notcurses_stop.3.md +++ b/doc/man/man3/notcurses_stop.3.md @@ -1,6 +1,6 @@ % notcurses_stop(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_tabbed.3.md b/doc/man/man3/notcurses_tabbed.3.md index 0d0621f13..3c738fb38 100644 --- a/doc/man/man3/notcurses_tabbed.3.md +++ b/doc/man/man3/notcurses_tabbed.3.md @@ -1,5 +1,5 @@ % notcurses_tabbed(3) -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_tree.3.md b/doc/man/man3/notcurses_tree.3.md index dc27d2355..8d7827788 100644 --- a/doc/man/man3/notcurses_tree.3.md +++ b/doc/man/man3/notcurses_tree.3.md @@ -1,6 +1,6 @@ % notcurses_tree(3) % nick black -% v2.2.3 +% v2.2.4 # NAME diff --git a/doc/man/man3/notcurses_visual.3.md b/doc/man/man3/notcurses_visual.3.md index 3abedf06c..b5141610c 100644 --- a/doc/man/man3/notcurses_visual.3.md +++ b/doc/man/man3/notcurses_visual.3.md @@ -1,6 +1,6 @@ % notcurses_visual(3) % nick black -% v2.2.3 +% v2.2.4 # NAME notcurses_visual - notcurses multimedia diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 9620675fa..60d68c115 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libnotcurses-sys" -version = "2.2.3" +version = "2.2.4" authors = [ "nick black ", "José Luis Cruz " diff --git a/rust/build/build.rs b/rust/build/build.rs index 0834089b3..8c58a5950 100644 --- a/rust/build/build.rs +++ b/rust/build/build.rs @@ -7,7 +7,7 @@ use std::path::PathBuf; // largely taken from https://rust-lang.github.io/rust-bindgen/tutorial-3.html fn main() { let plib = pkg_config::Config::new() - .atleast_version("2.2.3") + .atleast_version("2.2.4") .probe("notcurses") .unwrap(); diff --git a/src/tests/pixel.cpp b/src/tests/pixel.cpp index 5d66a4d31..dcd704f94 100644 --- a/src/tests/pixel.cpp +++ b/src/tests/pixel.cpp @@ -147,27 +147,6 @@ TEST_CASE("Pixel") { } #ifdef NOTCURSES_USE_MULTIMEDIA - SUBCASE("PixelWipeBlocks") { - auto ncv = ncvisual_from_file(find_data("blocks.png")); - REQUIRE(ncv); - struct ncvisual_options vopts{}; - vopts.blitter = NCBLIT_PIXEL; - vopts.flags = NCVISUAL_OPTION_NODEGRADE; - auto newn = ncvisual_render(nc_, ncv, &vopts); - REQUIRE(newn); - CHECK(0 == notcurses_render(nc_)); - const auto s = newn->sprite; - for(int y = 0 ; y < s->dimy ; ++y){ - for(int x = 0 ; x < s->dimx ; ++x){ - CHECK(0 == sprite_wipe_cell(nc_, s, y, x)); - CHECK(0 == notcurses_render(nc_)); - } - } - ncplane_destroy(newn); - CHECK(0 == notcurses_render(nc_)); - ncvisual_destroy(ncv); - } - SUBCASE("PixelWipeImage") { auto ncv = ncvisual_from_file(find_data("worldmap.png")); REQUIRE(ncv);