From cf557ff500069d2e4b908a8f4619ed4bfab897a5 Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Wed, 27 Nov 2019 15:22:54 -0500
Subject: [PATCH] ncurses-view #61

---
 CMakeLists.txt                    | 17 +++++++++++++++--
 src/{bin => demo}/boxdemo.c       |  0
 src/{bin => demo}/demo.c          |  0
 src/{bin => demo}/demo.h          |  0
 src/{bin => demo}/grid.c          |  0
 src/{bin => demo}/maxcolor.c      |  0
 src/{bin => demo}/unicodeblocks.c |  0
 src/{bin => demo}/widecolor.c     |  0
 src/view/main.cpp                 | 18 ++++++++++++++++++
 tests/libav.cpp                   | 10 ++++++----
 10 files changed, 39 insertions(+), 6 deletions(-)
 rename src/{bin => demo}/boxdemo.c (100%)
 rename src/{bin => demo}/demo.c (100%)
 rename src/{bin => demo}/demo.h (100%)
 rename src/{bin => demo}/grid.c (100%)
 rename src/{bin => demo}/maxcolor.c (100%)
 rename src/{bin => demo}/unicodeblocks.c (100%)
 rename src/{bin => demo}/widecolor.c (100%)
 create mode 100644 src/view/main.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aaae4e01..056f51970 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,8 +47,8 @@ target_compile_definitions(notcurses
     _DEFAULT_SOURCE _XOPEN_SOURCE=700
 )
 
-file(GLOB BINSRCS CONFIGURE_DEPENDS src/bin/*.c)
-add_executable(notcurses-demo ${BINSRCS})
+file(GLOB DEMOSRCS CONFIGURE_DEPENDS src/demo/*.c)
+add_executable(notcurses-demo ${DEMOSRCS})
 target_include_directories(notcurses-demo PRIVATE include)
 target_link_libraries(notcurses-demo
   PRIVATE
@@ -59,6 +59,18 @@ target_compile_options(notcurses-demo
     -Wall -Wextra -W -Wshadow
 )
 
+file(GLOB VIEWSRCS CONFIGURE_DEPENDS src/view/*.cpp)
+add_executable(notcurses-view ${VIEWSRCS})
+target_include_directories(notcurses-view PRIVATE include)
+target_link_libraries(notcurses-view
+  PRIVATE
+    notcurses
+)
+target_compile_options(notcurses-view
+  PRIVATE
+    -Wall -Wextra -W -Wshadow
+)
+
 file(GLOB TESTSRCS CONFIGURE_DEPENDS tests/*.cpp)
 add_executable(notcurses-tester ${TESTSRCS})
 find_package(GTest 1.9 REQUIRED)
@@ -107,6 +119,7 @@ install(FILES
 )
 
 install(TARGETS notcurses-demo DESTINATION bin)
+install(TARGETS notcurses-view DESTINATION bin)
 install(TARGETS notcurses
   LIBRARY
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/src/bin/boxdemo.c b/src/demo/boxdemo.c
similarity index 100%
rename from src/bin/boxdemo.c
rename to src/demo/boxdemo.c
diff --git a/src/bin/demo.c b/src/demo/demo.c
similarity index 100%
rename from src/bin/demo.c
rename to src/demo/demo.c
diff --git a/src/bin/demo.h b/src/demo/demo.h
similarity index 100%
rename from src/bin/demo.h
rename to src/demo/demo.h
diff --git a/src/bin/grid.c b/src/demo/grid.c
similarity index 100%
rename from src/bin/grid.c
rename to src/demo/grid.c
diff --git a/src/bin/maxcolor.c b/src/demo/maxcolor.c
similarity index 100%
rename from src/bin/maxcolor.c
rename to src/demo/maxcolor.c
diff --git a/src/bin/unicodeblocks.c b/src/demo/unicodeblocks.c
similarity index 100%
rename from src/bin/unicodeblocks.c
rename to src/demo/unicodeblocks.c
diff --git a/src/bin/widecolor.c b/src/demo/widecolor.c
similarity index 100%
rename from src/bin/widecolor.c
rename to src/demo/widecolor.c
diff --git a/src/view/main.cpp b/src/view/main.cpp
new file mode 100644
index 000000000..425199a92
--- /dev/null
+++ b/src/view/main.cpp
@@ -0,0 +1,18 @@
+#include <cstdlib>
+#include <libgen.h>
+#include <iostream>
+
+void usage(std::ostream& o, char* argv0, int exitcode){
+  o << "usage: " << basename(argv0) << " files" << '\n';
+  exit(exitcode);
+}
+
+int main(int argc, char** argv){
+  if(argc == 1){
+    usage(std::cerr, argv[0], EXIT_FAILURE);
+  }
+  for(int i = 1 ; i < argc ; ++i){
+    std::cout << "file: " << argv[i] << std::endl;
+  }
+  return EXIT_SUCCESS;
+}
diff --git a/tests/libav.cpp b/tests/libav.cpp
index 09d1df76a..6ccdcfa89 100644
--- a/tests/libav.cpp
+++ b/tests/libav.cpp
@@ -11,11 +11,13 @@ class LibavTest : public :: testing::Test {
 };
 
 TEST_F(LibavTest, LoadImage) {
-  int ret = notcurses_visual_open(nullptr, "../tools/dsscaw-purp.png");
-  ASSERT_EQ(0, ret);
+  auto ncv = notcurses_visual_open(nullptr, "../tools/dsscaw-purp.png");
+  ASSERT_NE(nullptr, ncv);
+  ncvisual_destroy(ncv);
 }
 
 TEST_F(LibavTest, LoadVideo) {
-  int ret = notcurses_visual_open(nullptr, "../tools/atliens.mkv");
-  ASSERT_EQ(0, ret);
+  auto ncv = notcurses_visual_open(nullptr, "../tools/atliens.mkv");
+  ASSERT_NE(nullptr, ncv);
+  ncvisual_destroy(ncv);
 }