is_test_tty: check for /dev/tty #1668

src/lib/internal.h

@@ -1293,9 +1293,6 @@ void nclog(const char* fmt, ...);
 
 bool is_linux_console(const notcurses* nc, unsigned no_font_changes);
 
-// get a file descriptor for the controlling tty device, -1 on error
-int get_controlling_tty(FILE* fp);
-
 // logging
 #define logerror(nc, fmt, ...) do{ \
   if(nc){ if((nc)->loglevel >= NCLOGLEVEL_ERROR){ \

src/tests/direct.cpp

@@ -105,7 +105,7 @@ TEST_CASE("DirectMode") {
   }
 
   SUBCASE("CursorPostGlyphRender") {
-    if(is_test_tty(stdout)){
+    if(is_test_tty()){
       auto dirf = ncdirectf_from_file(nc_, find_data("worldmap.png"));
       REQUIRE(nullptr != dirf);
       auto ncdv = ncdirectf_render(nc_, dirf, NCBLIT_1x1, NCSCALE_NONE, 0, 0);
@@ -124,7 +124,7 @@ TEST_CASE("DirectMode") {
   }
 
   SUBCASE("CursorPostSprixel") {
-    if(is_test_tty(stdout)){
+    if(is_test_tty()){
       if(ncdirect_check_pixel_support(nc_) > 0){
         auto dirf = ncdirectf_from_file(nc_, find_data("worldmap.png"));
         REQUIRE(nullptr != dirf);

src/tests/main.cpp

@@ -31,15 +31,14 @@ auto find_data(const char* datum) -> char* {
   return strdup(p.c_str());
 }
 
-auto is_test_tty(FILE* fp) -> bool {
+auto is_test_tty() -> bool {
-  int fd = fileno(fp);
+  int fd = open("/dev/tty", O_RDWR);
-  if(fd >= 0){
+  if(fd < 0){
-    if(isatty(fd)){
-      return true;
-    }
-  }
     return false;
   }
+  close(fd);
+  return true;
+}
 
 static void
 handle_opts(const char** argv){

src/tests/main.h

@@ -10,7 +10,7 @@
 #include <ncpp/_exceptions.hh>
 #include "internal.h"
 
-auto is_test_tty(FILE* fp) -> bool;
+auto is_test_tty() -> bool;
 auto find_data(const char* datum) -> char*;
 auto testing_notcurses() -> struct notcurses*;
 auto ncreel_validate(const ncreel* n) -> bool;