Various fixes.

The Makefile in particular has been reworked (see README for details).

Author: xorpse

Makefile

@@ -1,13 +1,24 @@
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
 
-AR = ocamlmklib
+INTERFACES = pretty_types.cmi pretty.cmi
+OPT_IMPLS = pretty.cmx
+BYTE_IMPLS = pretty.cmo
 
-INTERFACES = pretty_types.mli pretty.mli
-IMPLEMENTATIONS = pretty.ml
+%.cmi: %.mli
+	$(OCAMLC) -o $@ -c $<
 
-pretty: $(INTERFACES) $(IMPLEMENTATIONS)
-	$(AR) -o $@ $^
+%.cmo: %.ml
+	$(OCAMLC) -o $@ -c $<
+
+%.cmx: %.ml
+	$(OCAMLOPT) -o $@ -c $<
+
+byte: $(INTERFACES) $(BYTE_IMPLS)
+	$(OCAMLC) -a -o pretty.cma unix.cma $(BYTE_IMPLS)
+
+opt: $(INTERFACES) $(OPT_IMPLS)
+	$(OCAMLOPT) -a -o pretty.cmxa unix.cmxa $(OPT_IMPLS)
 
 clean:
 	rm -f *.{a,cm*,o,out}

README

@@ -6,6 +6,15 @@ Supports the following functionality:
    - Clearing/erasing text;
    - Text attributes/colours.
 
+Changes: 2012/07/19
+   - Fixed Makefile;
+   - Changed interface for Pretty.noecho_aux.
+
+Changes: 2012/07/18
+   - No-echo utility functions;
+   - Required dependency: unix module;
+   - Turned off dynamic loading in Makefile.
+
 More features to come!
 
 For reference of ANSI/VT100 see: http://www.termsys.demon.co.uk/vtansi.htm

pretty.ml

@@ -135,3 +135,16 @@ let print_string ?(attrs = []) ?(x = -1) ?(y = -1) str =
       in print_string ("\027[" ^ y ^ ";" ^ x ^ "H"));
 
    print_string_attrs ~attrs:attrs str
+
+let noecho_aux fd f =
+   let open Unix in
+   let attrs = tcgetattr stdin in
+   tcsetattr fd TCSANOW { attrs with c_echo = false };
+   let ret = try f fd with
+      | ex -> tcsetattr fd TCSANOW attrs; raise ex
+   in
+   tcsetattr fd TCSANOW attrs; ret
+
+let noecho_read_line () = noecho_aux Unix.stdin (fun fd -> read_line ())
+let noecho_read_int () = noecho_aux Unix.stdin (fun fd -> read_int ())
+let noecho_read_float () = noecho_aux Unix.stdin (fun fd -> read_float ())

pretty.mli

@@ -79,3 +79,13 @@ val print_custom : attribute list -> unit
     * Supports printing text with decorative attributes applied.
  *)
 val print_string : ?attrs:attribute list -> ?x:int -> ?y:int -> string -> unit
+
+(* Turn of echoing whilst reading input.
+ *
+ * NOTE:
+    * Restores echoing after completion.
+ *)
+val noecho_aux        : Unix.file_descr -> (Unix.file_descr -> 'a) -> 'a
+val noecho_read_line  : unit -> string
+val noecho_read_int   : unit -> int
+val noecho_read_float : unit -> float