add ncplane_scrolling_p() #1841

NEWS.md

@@ -10,6 +10,7 @@ rearrangements of Notcurses.
     plane and inhibition of the alternate screen, this allows rendered mode
     to easily be used for scrolling shell environment programs.
   * `ncls` now defaults to `NCBLIT_PIXEL`.
+  * Added `ncplane_scrolling_p()` to retrieve a plane's scrolling status.
 
 * 2.3.6 (2021-06-23)
   * Fixed (harmless) warning with `-Wformat-security`.

doc/man/man3/notcurses_plane.3.md

@@ -204,6 +204,8 @@ typedef struct ncplane_options {
 
 **bool ncplane_set_scrolling(struct ncplane* ***n***, bool ***scrollp***);**
 
+**bool ncplane_scrolling_p(const struct ncplane* ***n***);**
+
 **int ncplane_rotate_cw(struct ncplane* ***n***);**
 
 **int ncplane_rotate_ccw(struct ncplane* ***n***);**

include/notcurses/notcurses.h

@@ -1209,14 +1209,16 @@ API struct ncplane* ncplane_reparent(struct ncplane* n, struct ncplane* newparen
 // The same as ncplane_reparent(), except any planes bound to 'n' come along
 // with it to its new destination. Their z-order is maintained. If 'newparent'
 // is an ancestor of 'n', NULL is returned, and no changes are made.
-API struct ncplane* ncplane_reparent_family(struct ncplane* n, struct ncplane* newparent);
+API struct ncplane* ncplane_reparent_family(struct ncplane* n, struct ncplane* newparent)
+  __attribute__ ((nonnull (1, 2)));
 
 // Duplicate an existing ncplane. The new plane will have the same geometry,
 // will duplicate all content, and will start with the same rendering state.
 // The new plane will be immediately above the old one on the z axis, and will
 // be bound to the same parent. Bound planes are *not* duplicated; the new
 // plane is bound to the parent of 'n', but has no bound planes.
-API ALLOC struct ncplane* ncplane_dup(const struct ncplane* n, void* opaque);
+API ALLOC struct ncplane* ncplane_dup(const struct ncplane* n, void* opaque)
+  __attribute__ ((nonnull (1)));
 
 // provided a coordinate relative to the origin of 'src', map it to the same
 // absolute coordinate relative to the origin of 'dst'. either or both of 'y'
@@ -1228,12 +1230,17 @@ API void ncplane_translate(const struct ncplane* src, const struct ncplane* dst,
 // within the ncplane 'n'. If not, return false. If so, return true. Either
 // way, translate the absolute coordinates relative to 'n'. If the point is not
 // within 'n', these coordinates will not be within the dimensions of the plane.
-API bool ncplane_translate_abs(const struct ncplane* n, int* RESTRICT y, int* RESTRICT x);
+API bool ncplane_translate_abs(const struct ncplane* n, int* RESTRICT y, int* RESTRICT x)
+  __attribute__ ((nonnull (1)));
 
 // All planes are created with scrolling disabled. Scrolling can be dynamically
 // controlled with ncplane_set_scrolling(). Returns true if scrolling was
 // previously enabled, or false if it was disabled.
-API bool ncplane_set_scrolling(struct ncplane* n, bool scrollp);
+API bool ncplane_set_scrolling(struct ncplane* n, bool scrollp)
+  __attribute__ ((nonnull (1)));
+
+API bool ncplane_scrolling_p(const struct ncplane* n)
+  __attribute__ ((nonnull (1)));
 
 // Palette API. Some terminals only support 256 colors, but allow the full
 // palette to be specified with arbitrary RGB colors. In all cases, it's more

src/lib/input.c

@@ -340,7 +340,7 @@ block_on_input(int fd, const struct timespec* ts, const sigset_t* sigmask){
   if(sigmask){
     memcpy(&scratchmask, sigmask, sizeof(*sigmask));
   }else{
-    pthread_sigmask(0, NULL, &scratchmask);
+    sigfillset(&scratchmask);
   }
   sigdelset(&scratchmask, SIGCONT);
   sigdelset(&scratchmask, SIGWINCH);

src/lib/notcurses.c

@@ -2573,6 +2573,10 @@ bool ncplane_set_scrolling(ncplane* n, bool scrollp){
   return old;
 }
 
+bool ncplane_scrolling_p(const ncplane* n){
+  return n->scrolling;
+}
+
 // extract an integer, which must be non-negative, and followed by either a
 // comma or a NUL terminator.
 static int

src/tests/visual.cpp

@@ -78,22 +78,16 @@ TEST_CASE("Visual") {
     auto p = ncvisual_render(nc_, ncv, &vopts);
     REQUIRE(nullptr != p);
     CHECK(0 == notcurses_render(nc_));
-fprintf(stderr, "FIRST RECNDER %p\n", ncv->data);
-sleep(1);
     CHECK(0 == ncplane_destroy(p));
     CHECK(0 == ncvisual_resize(ncv, 20, 20));
     p = ncvisual_render(nc_, ncv, &vopts);
     REQUIRE(nullptr != p);
     CHECK(0 == notcurses_render(nc_));
-fprintf(stderr, "2ND RECNDER %p\n", ncv->data);
-sleep(1);
     CHECK(0 == ncplane_destroy(p));
     CHECK(0 == ncvisual_rotate(ncv, M_PI / 2));
     p = ncvisual_render(nc_, ncv, &vopts);
     REQUIRE(nullptr != p);
     CHECK(0 == notcurses_render(nc_));
-fprintf(stderr, "3RD RECNDER %p\n", ncv->data);
-sleep(1);
     CHECK(0 == ncplane_destroy(p));
     ncvisual_destroy(ncv);
   }