Bug fix: undo now respects the locked area.

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

diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml
index f1a0e6429622490e4973fd1aa218ff284e33a3cc..ad4592a67ec028c545afb948c88e5b51a949464a 100644 (file)
--- a/helm/matita/matitaScript.ml
+++ b/helm/matita/matitaScript.ml
@@ -151,7 +151,10 @@ let eval_with_engine guistuff status user_goal parsed_text st =
       let compile_needed_and_go_on d =
         let root = MatitamakeLib.root_for_development d in
         let target = root ^ "/" ^ what in
-        if not(MatitamakeLib.build_development ~target d) then
+        let refresh_cb () = 
+          while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
+        in
+        if not(MatitamakeLib.build_development_in_bg ~target refresh_cb d) then
           raise exc
         else
           eval_with_engine guistuff status user_goal parsed_text st
@@ -334,7 +337,7 @@ let eval_executable guistuff status user_goal parsed_text script ex =
         (match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
         | None -> ()
         | Some u -> 
-            if not (MatitacleanLib.is_empty u) then
+            if not (ML.is_empty u) then
               match 
                 guistuff.ask_confirmation 
                   ~title:"Baseuri redefinition" 
@@ -380,13 +383,15 @@ let fresh_script_id =
   let i = ref 0 in
   fun () -> incr i; !i
 
-class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status) 
+class script  ~(view: GText.view)
+              ~(init: MatitaTypes.status) 
               ~(mathviewer: MatitaTypes.mathViewer) 
               ~set_star
               ~ask_confirmation
               ~urichooser 
               ~develcreator 
               () =
+let buffer = view#buffer in
 object (self)
   val scriptId = fresh_script_id ()
   
@@ -412,9 +417,7 @@ object (self)
        (fun _ -> if buffer#modified then 
           set_star self#ppFilename true 
         else 
-          set_star self#ppFilename false));
-    self#reset ();
-    self#template ()
+          set_star self#ppFilename false))
 
   val mutable statements = [];    (** executed statements *)
   val mutable history = [ init ];
@@ -431,6 +434,8 @@ object (self)
     buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter
   val locked_tag = buffer#create_tag [`BACKGROUND "lightblue"; `EDITABLE false]
 
+  method locked_mark = locked_mark
+
     (* history can't be empty, the invariant above grant that it contains at
      * least the init status *)
   method status = match history with hd :: _ -> hd | _ -> assert false
@@ -461,14 +466,12 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
       end;
     self#moveMark (String.length new_text)
 
-  method private _retract () =
-    match statements, history with
-    | last_statement :: _, cur_status :: prev_status :: _ ->
-        MatitaSync.time_travel ~present:cur_status ~past:prev_status;
-        statements <- List.tl statements;
-        history <- List.tl history;
-        self#moveMark (- (String.length last_statement));
-    | _ -> raise Margin
+  method private _retract offset status new_statements new_history =
+   let cur_status = match history with s::_ -> s | [] -> assert false in
+    MatitaSync.time_travel ~present:cur_status ~past:status;
+    statements <- new_statements;
+    history <- new_history;
+    self#moveMark (- offset)
 
   method advance ?statement () =
     try
@@ -480,8 +483,15 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
 
   method retract () =
     try
-      self#_retract ();
-      self#notify
+      let cmp,new_statements,new_history,status =
+       match statements,history with
+          stat::statements, _::(status::_ as history) ->
+           String.length stat, statements, history, status
+       | [],[_] -> raise Margin
+       | _,_ -> assert false
+      in
+       self#_retract cmp status new_statements new_history;
+       self#notify
     with 
     | Margin -> self#notify
     | exc -> self#notify; raise exc
@@ -511,6 +521,12 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
         Incomplete_proof (_,goal) -> self#setGoal goal
       | _ -> ()
     end ;
+    let mark_position = buffer#get_iter_at_mark mark in
+    if view#move_mark_onscreen mark then
+     begin
+      buffer#move_mark mark mark_position;
+      view#scroll_to_mark ~use_align:true ~xalign:1.0 ~yalign:0.1 mark;
+     end;
     while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
 
   method clean_dirty_lock =
@@ -595,28 +611,31 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
         | exc -> self#notify; raise exc)
     | `Cursor ->
         let locked_iter () = buffer#get_iter_at_mark (`NAME "locked") in
-        let cursor_iter () = buffer#get_iter_at_mark `INSERT in
+        let cursor_iter = buffer#get_iter_at_mark `INSERT in
+        let cmp = (locked_iter ())#offset - cursor_iter#offset in
         let forward_until_cursor () = (* go forward until locked > cursor *)
           let rec aux oldpos =
             self#_advance ();
-            if (locked_iter ())#compare (cursor_iter ()) < 0 &&
+            if (locked_iter ())#compare cursor_iter < 0 &&
                oldpos#compare (getpos ()) < 0 
             then
               aux (getpos ())
           in
           aux (getpos ())
         in
-        let rec back_until_cursor () = (* go backward until locked < cursor *)
-          self#_retract ();
-          if (locked_iter ())#compare (cursor_iter ()) > 0 then
-            back_until_cursor ()
+        let rec back_until_cursor len = (* go backward until locked < cursor *)
+         function
+            statements, (status::_ as history) when len <= 0 ->
+             self#_retract (cmp - len) status statements history
+          | statement::tl1, _::tl2 ->
+             back_until_cursor (len - String.length statement) (tl1,tl2)
+          | _,_ -> assert false
         in
-        let cmp = (locked_iter ())#compare (cursor_iter ()) in
         (try
           if cmp < 0 then       (* locked < cursor *)
             (forward_until_cursor (); self#notify)
           else if cmp > 0 then  (* locked > cursor *)
-            (back_until_cursor (); self#notify)
+            (back_until_cursor cmp (statements,history); self#notify)
           else                  (* cursor = locked *)
               ()
         with 
@@ -670,10 +689,10 @@ end
 
 let _script = ref None
 
-let script ~buffer ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
+let script ~view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
 =
   let s = new script 
-    ~buffer ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () 
+    ~view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () 
   in
   _script := Some s;
   s