improve lm_terminfo

Author: LdBeth

cutil/lm_terminfo.c

@@ -43,6 +43,14 @@ static int load_terminfo() {
 
 }
 
+/* Converts termcap data type to capname */
+static char *capname(int i) {
+
+    char *names[] = {"bold", "snrmq", "ssubm", "ssupm", "smul", "sitm", "sgr0"};
+
+    return names[i];
+}
+
 #endif /* NCURSES support? */
 
 /*
@@ -69,7 +77,8 @@ value caml_tgetstr(value id) {
       in.  */
 #ifdef NCURSES
    if(load_terminfo() == 0) {
-      termdata = tigetstr(String_val(id));
+       char *name = capname(Int_val(id));
+       termdata = tigetstr(name);
    }
 #endif /* NCURSES */
 

util/lm_terminfo.ml

@@ -22,11 +22,14 @@
  * LICENSE.libmojave for more details.
  *)
 
+(* Terminal Capname *)
+type termcap = Bold | Normal | Subscript | Superscript
+             | Underline | Italics | Reset
 
-(* The C function takes a string ID, and returns the escape sequence
+(* The C function takes a integer, and returns the escape sequence
    (or an empty string if the ID is not defined for this terminal).  *)
 external caml_tgetstr_enabled : unit -> bool = "caml_tgetstr_enabled"
-external caml_tgetstr : string -> string = "caml_tgetstr"
+external caml_tgetstr : termcap -> string = "caml_tgetstr"
 
 
 (* Tgetstr is enabled only if the terminal is defined *)
@@ -48,8 +51,18 @@ let tgetstr id =
 
 
 (* Various terminfo identifier names for use with tgetstr *)
-let enter_bold_mode = "bold"
-let exit_attribute_mode = "sgr0"
+let enter_bold_mode = Bold
+
+let enter_normal_quality = Normal
+
+let enter_subscript_mode = Subscript
+let enter_superscript_mode = Superscript
+
+let enter_underline_mode = Underline
+
+let enter_italics_mode = Italics
+
+let exit_attribute_mode = Reset
 
 
 (* xterm_ok ()

util/lm_terminfo.mli

@@ -22,18 +22,22 @@
  * LICENSE.libmojave for more details.
  *)
 
+type termcap
 
 (* tgetstr id
    Lookup the terminal capability with indicated id.  This assumes the
    terminfo to lookup is given in the TERM environment variable.  This
    function returns None if the terminal capability is not defined.  *)
-val tgetstr : string -> string option
-
+val tgetstr : termcap -> string option
 
 (* Various terminfo identifier names for use with tgetstr *)
-val enter_bold_mode : string
-val exit_attribute_mode : string
-
+val enter_bold_mode : termcap
+val enter_italics_mode : termcap
+val enter_normal_quality : termcap
+val enter_subscript_mode : termcap
+val enter_superscript_mode : termcap
+val enter_underline_mode : termcap
+val exit_attribute_mode : termcap
 
 (* xterm_escape_begin ()
    Display XTerm title begin escape, if available.  *)