[terminfo] fix tiparm_s()

Author: tstack

src/third-party/notcurses/include/notcurses/notcurses.h

@@ -16,6 +16,10 @@
 #include <notcurses/nckeys.h>
 #include <notcurses/ncseqs.h>
 
+#include "terminfo/terminfo.h"
+
+extern Terminfo* notcurses_terminfo;
+
 #ifdef __cplusplus
 extern "C" {
 #define RESTRICT

src/third-party/notcurses/include/terminfo/terminfo.h

@@ -3,6 +3,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TERMINFO_MAGIC       0x011A
 #define TERMINFO_MAGIC_32BIT 0x021E
 
@@ -74,4 +78,8 @@ tiparm_str(const char* value)
     return v;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/third-party/notcurses/src/lib/internal.h

@@ -1937,16 +1937,14 @@ encoding_is_utf8(const char *enc){
 // tell ncmetric that utf8 is available. should be per-context, but isn't.
 void ncmetric_use_utf8(void);
 
-extern Terminfo* notcurses_terminfo;
-
 #ifdef __cplusplus
     extern "C" {
 #define NCURSES_CAST(type,value) static_cast<type>(value)
 #else
 #define NCURSES_CAST(type,value) (type)(value)
 #endif
 
-typedef unsigned chtype;
+typedef int32_t chtype;
 
 #define NCURSES_ATTR_SHIFT       8
 #define NCURSES_BITS(mask,shift) (NCURSES_CAST(chtype,(mask)) << ((shift) + NCURSES_ATTR_SHIFT))

src/third-party/notcurses/src/lib/terminfo.c

@@ -440,14 +440,16 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
     int skip = 0;  // skip logic block
     int cond_level = 0;
     int exec = 1;  // whether we're in an active (true) branch
+    int cond_execed = 0;
 
     while (*p) {
         if (*p == '%') {
             p++;
             switch (*p) {
                 case '%':
-                    if (exec && out_len + 1 < out_cap)
+                    if (exec && out_len + 1 < out_cap) {
                         out[out_len++] = '%';
+                    }
                     p++;
                     break;
                 case 'p': {
@@ -554,21 +556,31 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
                     break;
                 }
                 case '?':  // start conditional
+                    exec = 1;
+                    cond_execed = 0;
                     cond_level++;
                     p++;
                     break;
                 case 't': {
                     StackVal v = pop(&stack);
-                    exec = (v.type == STK_INT && v.i);
+                    exec = exec && (v.type == STK_INT && v.i);
+                    if (exec) {
+                        cond_execed = 1;
+                    }
                     p++;
                     break;
                 }
                 case 'e':  // else
-                    exec = !exec;
+                    if (cond_execed) {
+                        exec = 0;
+                    } else {
+                        exec = !exec;
+                    }
                     p++;
                     break;
                 case ';':  // end if
                     cond_level--;
+                    cond_execed = 0;
                     exec = 1;
                     p++;
                     break;

src/view_curses.cc

@@ -36,7 +36,6 @@
 
 #include "view_curses.hh"
 
-#include <curses.h>
 #include <zlib.h>
 
 #include "base/ansi_scrubber.hh"
@@ -49,6 +48,7 @@
 #include "config.h"
 #include "lnav_config.hh"
 #include "shlex.hh"
+#include "terminfo/terminfo.h"
 #include "uniwidth.h"
 #include "xterm_mouse.hh"
 

test/lnav_doctests.cc

@@ -44,6 +44,8 @@
 #include "shlex.hh"
 #include "unique_path.hh"
 
+#include "terminfo/terminfo.h"
+
 using namespace std;
 
 #if 0
@@ -81,6 +83,20 @@ TEST_CASE("shlex::eval")
     CHECK(rc);
     CHECK(out == "foo");
 }
+#if 0
+TEST_CASE("tiparm_s")
+{
+    const auto* path = terminfo_find_path_for_term("xterm-256color");
+    auto* ti = terminfo_load(path);
+
+    TiparmValue argv[] = {tiparm_int(5)};
+    const auto* fmt = terminfo_get_string_by_name(ti, "setab");
+    auto_mem<char> ab1;
+    ab1 = tiparm_s(fmt, 1, argv);
+    fprintf(stderr, "ab = %s", &(ab1.in()[1]));
+    terminfo_free(ti);
+}
+#endif
 
 TEST_CASE("lnav::command::parse_for_prompt")
 {