X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fmatita.ml;h=fb163aa9cfac9f0e0dc03db0874d562078b079eb;hb=c73f6a661af7adbf91370232b555f31d413ce6ac;hp=3c543d5c179a1602acb6b17b288d60a11bf0ef5a;hpb=06c2b37f3d7d4e14cabeef3b18211e5d12b9b4eb;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 3c543d5c1..fb163aa9c 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,20 +23,22 @@
  * 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 ->  (* TODO Zack: this function should probably be smarter taking
-               care also of unregistering notifications subscriber and so on *)
-     current_proof := proof),
-   (fun () -> !current_proof <> None))
+   (fun proof ->  (* set_proof *)
+      current_proof := proof),
+   (fun () -> (* has_proof *)
+      !current_proof <> None))
 
 (** {2 Settings} *)
 
@@ -50,57 +52,56 @@ let save_dom =
 
 (** {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 mml_of_cic_object = BuildTimeConf.Transformer.mml_of_cic_object in
-(*
   let frame = GBin.frame ~packing:(gui#proof#scrolledProof#add) ~show:true () in
   MatitaMathView.proof_viewer ~show:true ~packing:(frame#add) ()
-*)
-  MatitaMathView.proof_viewer ~show:true ~packing:(gui#proof#scrolledProof#add) ()
-(*
-let sequent_viewer =
-  let mml_of_cic_sequent = BuildTimeConf.Transformer.mml_of_cic_sequent in
-  MatitaMathView.sequent_viewer ~mml_of_cic_sequent ~show:true
-    ~packing:(gui#main#scrolledSequents#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: MatitaTypes.proof) =
-  (* TODO Zack a lot:
-  * - ids_to_inner_types, ids_to_inner_sorts handling
-  * - sequent viewer notification
-  *)
   let xmldump_observer _ _ =  print_endline proof#toString in
-  let proof_observer _ (status, metadata) =
+  let proof_observer _ (status, ()) =
     debug_print "proof_observer";
-    let (acic, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
-        ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses) =
-      metadata
-    in
     let ((uri_opt, _, _, _), _) = status in
     let uri = MatitaTypes.unopt_uri uri_opt in
     debug_print "apply transformation";
-    let mathml =
-      BuildTimeConf.Transformer.mml_of_cic_object
-        ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
-    in
-    if BuildTimeConf.debug then save_dom ~doc:mathml ~dest:"/tmp/matita.xml";
-    proof_viewer#load_proof mathml metadata;
+    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
-    xmldump_observer);
+    sequents_observer);
+  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
+    proof_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      proof_observer);
+    xmldump_observer);
   proof#notify;
   set_proof (Some proof)
 
@@ -111,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;