X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaConsole.ml;h=9c3c5a9b5aa7fb702ffa64f0d1e2e9695a91f7cf;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=c1866f3f36efb6cf54121b0532ec24cbab9d9fd8;hpb=481992ea591bf53cba758a96e7d42e9cdce7e129;p=helm.git

diff --git a/helm/matita/matitaConsole.ml b/helm/matita/matitaConsole.ml
index c1866f3f3..9c3c5a9b5 100644
--- a/helm/matita/matitaConsole.ml
+++ b/helm/matita/matitaConsole.ml
@@ -23,38 +23,104 @@
  * http://helm.cs.unibo.it/
  *)
 
-let default_prompt = "## "
+let default_prompt = "# "
+let default_phrase_sep = "."
+let default_callback = fun (phrase: string) -> ()
+
+let history_size = 100
 
 let message_props = [ `STYLE `ITALIC ]
 let error_props = [ `WEIGHT `BOLD ]
+let prompt_props = [ ]
+
+let trailing_NL_RE = Pcre.regexp "\n\\s*$"
 
-class console ?(prompt = default_prompt) obj =
-(*   let read_only = console#buffer#create_tag [ `EDITABLE false ] in *)
+class console
+  ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep)
+  ?(callback = default_callback)
+  obj
+=
   object (self)
     inherit GText.view obj
 
-    method read_phrase () = prompt ^ "foo"
-    method echo_prompt () =
+    val mutable _phrase_sep = phrase_sep
+    method phrase_sep = _phrase_sep
+    method set_phrase_sep sep = _phrase_sep <- sep
+
+    val mutable _callback = callback
+    method set_callback f = _callback <- f
+
+    val mutable _ignore_insert_text_signal = false
+    method ignore_insert_text_signal ignore =
+      _ignore_insert_text_signal <- ignore
+
+(*
+    (* TODO Zack: implement history.
+       IDEA: use CTRL-P/N a la emacs.
+       ISSUE: per-phrase or per-line history? *)
+    val phrases_history = Array.create history_size None
+    val mutable history_last_index = -1
+    val mutable history_cur_index = -1
+*)
+
+    initializer
       let buf = self#buffer in
-      buf#insert ~iter:buf#end_iter ~tags:[] prompt;
-      self#lock
+      self#set_wrap_mode `CHAR;
+        (* create "USER_INPUT_START" mark. This mark will always point to the
+        * beginning of user input not yet processed *)
+      ignore (buf#create_mark ~name:"USER_INPUT_START"
+        ~left_gravity:true buf#start_iter);
+      ignore (buf#connect#after#insert_text (fun iter text ->
+        if (not _ignore_insert_text_signal) &&
+          (iter#compare buf#end_iter = 0) &&  (* insertion at end *)
+          (Pcre.pmatch ~rex:trailing_NL_RE text)
+        then
+          let inserted_text =
+            buf#get_text
+              ~start:(buf#get_iter_at_mark (`NAME "USER_INPUT_START"))
+              ~stop:buf#end_iter ()
+          in
+          let pat = (Pcre.quote _phrase_sep) ^ "\\s*$" in
+          if Pcre.pmatch ~pat inserted_text then begin (* complete phrase *)
+            self#lock;
+            _callback inserted_text;
+            self#echo_prompt ()
+          end))
+
+      (* lock old text and bump USER_INPUT_START mark *)
     method private lock =
       let buf = self#buffer in
       let read_only = buf#create_tag [`EDITABLE false] in
-      buf#apply_tag read_only ~start:buf#start_iter ~stop:buf#end_iter
+      buf#apply_tag read_only ~start:buf#start_iter ~stop:buf#end_iter;
+      buf#move_mark (`NAME "USER_INPUT_START") buf#end_iter
+
+    method echo_prompt () =
+      let buf = self#buffer in
+      self#ignore_insert_text_signal true;
+      buf#insert ~iter:buf#end_iter ~tags:[buf#create_tag prompt_props] prompt;
+      self#ignore_insert_text_signal false;
+      self#lock
+
     method echo_message msg =
       let buf = self#buffer in
+      self#ignore_insert_text_signal true;
       buf#insert ~iter:buf#end_iter ~tags:[buf#create_tag message_props]
         (msg ^ "\n");
+      self#ignore_insert_text_signal false;
       self#lock
+
     method echo_error msg =
       let buf = self#buffer in
+      self#ignore_insert_text_signal true;
       buf#insert ~iter:buf#end_iter ~tags:[buf#create_tag error_props]
         (msg ^ "\n");
+      self#ignore_insert_text_signal false;
       self#lock
   end
 
-let console ?(prompt = default_prompt)
+let console
+  ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep)
+  ?(callback = default_callback)
   ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width
   ?width ?height ?packing ?show ()
 =
@@ -63,5 +129,5 @@ let console ?(prompt = default_prompt)
       ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width
       ?width ?height ?packing ?show ()
   in
-  new console ~prompt view#as_view
+  new console ~prompt ~phrase_sep ~callback view#as_view