X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaConsole.ml;h=222055e6539a59b8b9ecfed8bf3434d746bcb936;hb=e09713d333183e929f108ff8bb8fbe2a25bfcac7;hp=9c3c5a9b5aa7fb702ffa64f0d1e2e9695a91f7cf;hpb=4cf419a2e770f4971be7b03b1d73e585d973dc1b;p=helm.git

diff --git a/helm/matita/matitaConsole.ml b/helm/matita/matitaConsole.ml
index 9c3c5a9b5..222055e65 100644
--- a/helm/matita/matitaConsole.ml
+++ b/helm/matita/matitaConsole.ml
@@ -23,11 +23,14 @@
  * http://helm.cs.unibo.it/
  *)
 
-let default_prompt = "# "
-let default_phrase_sep = "."
-let default_callback = fun (phrase: string) -> ()
+open Printf
+
+open MatitaTypes
 
-let history_size = 100
+(* let default_prompt = "# " *)
+let default_prompt = ""
+let default_phrase_sep = "."
+let default_callback = fun (phrase: string) -> true
 
 let message_props = [ `STYLE `ITALIC ]
 let error_props = [ `WEIGHT `BOLD ]
@@ -35,11 +38,39 @@ let prompt_props = [ ]
 
 let trailing_NL_RE = Pcre.regexp "\n\\s*$"
 
+exception History_failure
+
+  (** shell like phrase history *)
+class history size =
+  let size = size + 1 in
+  let decr x = let x' = x - 1 in if x' < 0 then size + x' else x' in
+  let incr x = (x + 1) mod size in
+  object
+    val data = Array.create size ""
+    val mutable hd = 0  (* insertion point *)
+    val mutable tl = -1 (* oldest inserted item *)
+    val mutable cur = -1  (* current item for the history *)
+    method add s =
+      data.(hd) <- s;
+      if tl = -1 then tl <- hd;
+      hd <- incr hd;
+      if hd = tl then tl <- incr tl;
+      cur <- hd
+    method previous =
+      if cur = tl then raise History_failure;
+      cur <- decr cur;
+      data.(cur)
+    method next =
+      if cur = hd then raise History_failure;
+      cur <- incr cur;
+      if cur = hd then "" else data.(cur)
+  end
+
 class console
   ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep)
-  ?(callback = default_callback)
-  obj
+  ?(callback = default_callback) ?evbox ~(paned:GPack.paned) obj
 =
+  let console_height = 100 in (* pixels *)
   object (self)
     inherit GText.view obj
 
@@ -47,6 +78,10 @@ class console
     method phrase_sep = _phrase_sep
     method set_phrase_sep sep = _phrase_sep <- sep
 
+    val mutable _prompt = prompt
+    method prompt = _prompt
+    method set_prompt prompt = _prompt <- prompt
+
     val mutable _callback = callback
     method set_callback f = _callback <- f
 
@@ -54,18 +89,14 @@ class console
     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
-*)
+    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"
@@ -83,9 +114,46 @@ class console
           let pat = (Pcre.quote _phrase_sep) ^ "\\s*$" in
           if Pcre.pmatch ~pat inserted_text then begin (* complete phrase *)
             self#lock;
-            _callback inserted_text;
+            self#invoke_callback inserted_text;
             self#echo_prompt ()
-          end))
+          end));
+      (match evbox with (* history key bindings *)
+      | None -> ()
+      | Some evbox ->
+          List.iter (fun (key, f) -> MatitaGtkMisc.add_key_binding key f evbox)
+            [ GdkKeysyms._p, (fun () -> self#previous_phrase);
+              GdkKeysyms._n, (fun () -> self#next_phrase);
+            ]);
+      ignore (self#connect#after#move_cursor
+        (* avoid cursor being placed at prompt's left *)
+        ~callback:(fun step count ~extend ->
+            let buf = self#buffer in
+            let cursor_iter = buf#get_iter_at_mark `INSERT in
+            let prompt_iter = buf#get_iter_at_mark (`NAME "USER_INPUT_START") in
+            if prompt_iter#compare cursor_iter = 1 then (* prompt > cursor *)
+              buf#place_cursor ~where:prompt_iter))
+
+    method private set_phrase phrase =
+      let buf = self#buffer in
+      buf#delete
+        ~start:(buf#get_iter_at_mark (`NAME "USER_INPUT_START"))
+        ~stop:buf#end_iter;
+      buf#insert ~iter:buf#end_iter phrase
+
+    method private invoke_callback phrase =
+      history#add (* do not push trailing phrase separator *)
+        (String.sub phrase 0
+          (String.length phrase - String.length _phrase_sep));
+      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 =
@@ -110,17 +178,59 @@ 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
+
+    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, ... *)
+
+    method private previous_phrase =
+      try self#set_phrase history#previous with History_failure -> ()
+    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)
+  ?(callback = default_callback) ?evbox ~paned
   ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width
   ?width ?height ?packing ?show ()
 =
@@ -129,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 view#as_view
+  new console ~prompt ~phrase_sep ~callback ?evbox ~paned view#as_view