X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fmatita.ml;h=fb163aa9cfac9f0e0dc03db0874d562078b079eb;hb=a7ab0ef67114c3152920f03ae1d7bfaaf1fae290;hp=8f34f5bf728c141b88fe12cc8f97c3303cc45756;hpb=e89486cad653803954662a5e543537acd49a866f;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 8f34f5bf7..fb163aa9c 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,41 +23,86 @@
  * http://helm.cs.unibo.it/
  *)
 
+open Printf
+
 open MatitaGtkMisc
 
 (** {2 Internal status} *)
 
 let (get_proof, set_proof, has_proof) =
   let (current_proof: MatitaTypes.proof option ref) = ref None in
-  ((fun () ->
+  ((fun () -> (* get_proof *)
     match !current_proof with
     | Some proof -> proof
     | None -> failwith "No current proof"),
-   (fun proof -> current_proof := proof),
-   (fun () -> !current_proof <> None))
+   (fun proof ->  (* set_proof *)
+      current_proof := proof),
+   (fun () -> (* has_proof *)
+      !current_proof <> None))
 
 (** {2 Settings} *)
 
 let debug_print = MatitaTypes.debug_print
 
+let save_dom =
+  let domImpl = lazy (Gdome.domImplementation ()) in
+  fun ~doc ~dest ->
+    ignore
+      ((Lazy.force domImpl)#saveDocumentToFile ~doc ~name:dest ~indent:true ())
+
 (** {2 Initialization} *)
 
+let _ =
+  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;
+  GtkMain.Main.init ()
 let _ = Helm_registry.load_from "matita.conf.xml"
 let _ = GMain.Main.init ()
-let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file")
 let parserr = new MatitaDisambiguator.parserr ()
 let mqiconn = MQIConn.init ()
+let gui = MatitaGui.instance ()
 let disambiguator =
   new MatitaDisambiguator.disambiguator ~parserr ~mqiconn
     ~chooseUris:(interactive_user_uri_choice ~gui)
     ~chooseInterp:(interactive_interp_choice ~gui)
     ()
+let proof_viewer =
+  let frame = GBin.frame ~packing:(gui#proof#scrolledProof#add) ~show:true () in
+  MatitaMathView.proof_viewer ~show:true ~packing:(frame#add) ()
+let sequent_viewer = MatitaMathView.sequent_viewer ~show:true ()
+let sequents_viewer =
+  let set_goal goal =
+    debug_print (sprintf "Setting goal %d" goal);
+    if not (has_proof ()) then assert false;
+    (get_proof ())#set_goal goal
+  in
+  MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook
+    ~sequent_viewer ~set_goal ()
 
-let new_proof proof =
-  (* TODO Zack: high level function which create a new proof object and register
-  * to it the widgets which must be refreshed upon status changes *)
-(*       proof#status#attach ... *)
-  proof#status#notify ();
+let new_proof (proof: MatitaTypes.proof) =
+  let xmldump_observer _ _ =  print_endline proof#toString in
+  let proof_observer _ (status, ()) =
+    debug_print "proof_observer";
+    let ((uri_opt, _, _, _), _) = status in
+    let uri = MatitaTypes.unopt_uri uri_opt in
+    debug_print "apply transformation";
+    proof_viewer#load_proof status;
+    debug_print "/proof_observer"
+  in
+  let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) =
+    sequents_viewer#reset;
+    (match goal_opt with
+    | None -> ()
+    | Some goal ->
+        sequents_viewer#load_sequents metasenv;
+        sequents_viewer#goto_sequent goal)
+  in
+  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
+    sequents_observer);
+  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
+    proof_observer);
+  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
+    xmldump_observer);
+  proof#notify;
   set_proof (Some proof)
 
 let quit () = (* quit program, asking for confirmation if needed *)
@@ -67,8 +112,15 @@ let quit () = (* quit program, asking for confirmation if needed *)
   then
     GMain.Main.quit ()
 
+let abort_proof () =
+  if has_proof () then begin
+    set_proof None;
+    sequents_viewer#reset
+  end
+
 let proof_handler =
   { MatitaTypes.get_proof = get_proof;
+    MatitaTypes.abort_proof = abort_proof;
     MatitaTypes.set_proof = set_proof;
     MatitaTypes.has_proof = has_proof;
     MatitaTypes.new_proof = new_proof;
@@ -92,10 +144,10 @@ let _ =
       ()  (* abort new proof process *)
     else
       let input = ask_text ~gui ~msg:"Insert proof goal" ~multiline:true () in
-      let (env, metasenv, term) =
+      let (env, metasenv, expr) =
         disambiguator#disambiguateTerm (Stream.of_string input)
       in
-      let proof = MatitaProof.proof ~typ:term ~metasenv () in
+      let proof = MatitaProof.proof ~typ:expr ~metasenv () in
       new_proof proof))
 
   (** <DEBUGGING> *)
@@ -127,7 +179,7 @@ let _ =
       prerr_endline
         (ask_text ~gui ~title:"title" ~multiline:true ~msg:"message" ()));
     addDebugItem "dump proof status to stdout" (fun _ ->
-      print_endline ((get_proof ())#status#toString));
+      print_endline ((get_proof ())#toString));
   end
   (** </DEBUGGING> *)