Bug in the management of substitutions into auto corrected.

[helm.git] / helm / matita / matitaConsole.ml

diff --git a/helm/matita/matitaConsole.ml b/helm/matita/matitaConsole.ml
index 603a480f45553392920cf27e3c67a031b1d80453..222055e6539a59b8b9ecfed8bf3434d746bcb936 100644 (file)
--- a/helm/matita/matitaConsole.ml
+++ b/helm/matita/matitaConsole.ml
@@ -23,9 +23,14 @@
  * http://helm.cs.unibo.it/
  *)
 
-let default_prompt = "# "
+open Printf
+
+open MatitaTypes
+
+(* let default_prompt = "# " *)
+let default_prompt = ""
 let default_phrase_sep = "."
-let default_callback = fun (phrase: string) -> ()
+let default_callback = fun (phrase: string) -> true
 
 let message_props = [ `STYLE `ITALIC ]
 let error_props = [ `WEIGHT `BOLD ]
@@ -63,8 +68,9 @@ class history size =
 
 class console
   ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep)
-  ?(callback = default_callback) ?evbox obj
+  ?(callback = default_callback) ?evbox ~(paned:GPack.paned) obj
 =
+  let console_height = 100 in (* pixels *)
   object (self)
     inherit GText.view obj
 
@@ -85,9 +91,12 @@ class console
 
     val history = new history BuildTimeConf.console_history_size
 
+    val mutable handle_position = 450
+
     initializer
       let buf = self#buffer in
       self#set_wrap_mode `CHAR;
+      self#hide ();
         (* 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"
@@ -135,7 +144,16 @@ class console
       history#add (* do not push trailing phrase separator *)
         (String.sub phrase 0
           (String.length phrase - String.length _phrase_sep));
-      _callback phrase
+      if _callback phrase then begin
+        self#hide ();
+        self#clear ()
+        (* else callback encountered troubles, don't hide console which
+        probably contains error message *)
+      end
+
+    method clear () =
+      let buf = self#buffer in
+      buf#delete ~start:buf#start_iter ~stop:buf#end_iter
 
       (* lock old text and bump USER_INPUT_START mark *)
     method private lock =
@@ -160,13 +178,33 @@ class console
       self#lock
 
     method echo_error msg =
+      self#show ();
       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;
-      self#echo_prompt ()
+      self#lock
+
+    method private get_paned_prop s =
+      Gobject.get { Gobject.name = s; Gobject.conv = Gobject.Data.int }
+        paned#as_widget
+    method private get_position = self#get_paned_prop "position"
+    method private get_min_position = self#get_paned_prop "min-position"
+    method private get_max_position = self#get_paned_prop "max-position"
+
+    method show ?(msg = "") () =
+      self#buffer#insert msg;
+      paned#set_position (self#get_max_position - console_height);
+      self#misc#grab_focus ()
+    method hide () =
+      paned#set_position self#get_max_position
+    method toggle () =
+      let pos = self#get_position in
+      if pos > self#get_max_position - console_height then
+        self#show ()
+      else
+        self#hide ()
 
       (** navigation methods: history, cursor motion, ... *)
 
@@ -175,11 +213,24 @@ class console
     method private next_phrase =
       try self#set_phrase history#next with History_failure -> ()
 
+    method wrap_exn (f: unit -> unit) =
+      try
+        f ();
+        true
+      with
+      | StatefulProofEngine.Tactic_failure exn ->
+          self#echo_error (sprintf "Tactic failed: %s"(Printexc.to_string exn));
+          false
+      | exn ->
+          self#echo_error (sprintf "Uncaught exception: %s"
+            (Printexc.to_string exn));
+          false
+
   end
 
 let console
   ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep)
-  ?(callback = default_callback) ?evbox
+  ?(callback = default_callback) ?evbox ~paned
   ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width
   ?width ?height ?packing ?show ()
 =
@@ -188,5 +239,5 @@ let console
       ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width
       ?width ?height ?packing ?show ()
   in
-  new console ~prompt ~phrase_sep ~callback ?evbox view#as_view
+  new console ~prompt ~phrase_sep ~callback ?evbox ~paned view#as_view