X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMathView.ml;h=bb62f51c98d334818e64eb013b6300e0ca783e3e;hb=e09713d333183e929f108ff8bb8fbe2a25bfcac7;hp=c0da0447dd469f16f0d8cc4a56ffe5b19835087c;hpb=687d1d3676afa3f936c22855f9510b78d702ec4c;p=helm.git

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index c0da0447d..bb62f51c9 100644
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -44,21 +44,41 @@ let list_map_fail f =
  in
   aux
 
+let choose_selection mmlwidget (element : Gdome.element option) =
+  let rec aux element =
+    if element#hasAttributeNS
+       ~namespaceURI:Misc.helmns
+       ~localName:(Gdome.domString "xref")
+    then
+      mmlwidget#set_selection (Some element)
+    else
+      try
+        match element#get_parentNode with
+        | None -> assert false
+        | Some p -> aux (new Gdome.element_of_node p)
+      with GdomeInit.DOMCastException _ ->
+        debug_print "trying to select above the document root"
+  in
+  match element with
+  | Some x -> aux x
+  | None   -> mmlwidget#set_selection None
+
 class proof_viewer obj =
  object(self)
 
   inherit GMathViewAux.single_selection_math_view obj
 
-(*   initializer self#set_log_verbosity 3 *)
+  val mutable current_infos = None
+  val mutable current_mathml = None
 
   initializer
     ignore (self#connect#click (fun (gdome_elt, _, _, _) ->
       match gdome_elt with
-      | Some gdome_elt -> ignore (self#action_toggle gdome_elt)
-      | None -> ()))
-
-  val mutable current_infos = None
-  val mutable current_mathml = None
+      | Some gdome_elt ->
+          prerr_endline (gdome_elt#get_nodeName#to_string);
+          ignore (self#action_toggle gdome_elt)
+      | None -> ()));
+    ignore (self#connect#selection_changed (choose_selection self))
 
   method load_proof ((uri_opt, _, _, _) as proof, (goal_opt: int option)) =
     let (annobj, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
@@ -75,12 +95,10 @@ class proof_viewer obj =
     ignore (Misc.domImpl#saveDocumentToFile ~name:"/tmp/proof" ~doc:mathml ());
     match current_mathml with
     |  None ->
-        debug_print "no previous MathML";
         self#load_root ~root:mathml#get_documentElement ;
         current_mathml <- Some mathml
     | Some current_mathml ->
-        debug_print "Previous MathML available: xmldiffing ...";
-        self#freeze ;
+        self#freeze;
         XmlDiff.update_dom ~from:current_mathml mathml ;
         self#thaw
   end
@@ -90,6 +108,9 @@ class sequent_viewer obj =
 
   inherit GMathViewAux.multi_selection_math_view obj
 
+  initializer
+    ignore (self#connect#selection_changed (choose_selection self))
+
   val mutable current_infos = None
 
   method get_selected_terms =
@@ -153,11 +174,15 @@ class sequent_viewer obj =
 class sequents_viewer ~(notebook:GPack.notebook)
   ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
 =
+  let tab_label metano =
+    (GMisc.label ~text:(sprintf "?%d" metano) ~show:true ())#coerce
+  in
   object (self)
     val mutable pages = 0
     val mutable switch_page_callback = None
     val mutable page2goal = []  (* associative list: page no -> goal no *)
     val mutable goal2page = []  (* the other way round *)
+    val mutable goal2win = []   (* associative list: goal no -> scrolled win *)
     val mutable _metasenv = []
 
     method reset =
@@ -165,6 +190,7 @@ class sequents_viewer ~(notebook:GPack.notebook)
       pages <- 0;
       page2goal <- [];
       goal2page <- [];
+      goal2win <- [];
       _metasenv <- [];
       (match switch_page_callback with
       | Some id ->
@@ -175,35 +201,45 @@ class sequents_viewer ~(notebook:GPack.notebook)
     method load_sequents metasenv =
       let sequents_no = List.length metasenv in
       _metasenv <- metasenv;
-      debug_print (sprintf "sequents no: %d" sequents_no);
       pages <- sequents_no;
-      let widget = sequent_viewer#coerce in
+      let win metano =
+        let w =
+          GBin.scrolled_window ~hpolicy:`AUTOMATIC ~vpolicy:`AUTOMATIC
+            ~shadow_type:`IN ~show:true ()
+        in
+        let reparent () =
+          match sequent_viewer#misc#parent with
+          | None -> w#add sequent_viewer#coerce
+          | Some _ -> sequent_viewer#misc#reparent w#coerce
+        in
+        goal2win <- (metano, reparent) :: goal2win;
+        w#coerce
+      in
       let page = ref 0 in
       List.iter
         (fun (metano, _, _) ->
           page2goal <- (!page, metano) :: page2goal;
           goal2page <- (metano, !page) :: goal2page;
           incr page;
-          let tab_label =
-            (GMisc.label ~text:(sprintf "?%d" metano) ~show:true ())#coerce
-          in
-          notebook#append_page ~tab_label widget)
+          notebook#append_page ~tab_label:(tab_label metano) (win metano))
         metasenv;
       switch_page_callback <-
-        (* TODO Zack the "#after" may probably be removed after Luca's fix for
-        * widget not loading documents before being realized *)
-        Some (notebook#connect#after#switch_page ~callback:(fun page ->
-          debug_print "switch_page callback";
+        Some (notebook#connect#switch_page ~callback:(fun page ->
           let goal =
             try
               List.assoc page page2goal
             with Not_found -> assert false
           in
           set_goal goal;
-          self#render_page goal))
+          self#render_page ~page ~goal))
 
-    method private render_page goal =
-      sequent_viewer#load_sequent _metasenv goal
+    method private render_page ~page ~goal =
+      sequent_viewer#load_sequent _metasenv goal;
+      try
+        List.assoc goal goal2win ();
+        debug_print "set_selection none";
+        sequent_viewer#set_selection None
+      with Not_found -> assert false
 
     method goto_sequent goal =
       let page =
@@ -212,7 +248,7 @@ class sequents_viewer ~(notebook:GPack.notebook)
         with Not_found -> assert false
       in
       notebook#goto_page page;
-      self#render_page goal
+      self#render_page page goal;
 
   end
 
@@ -234,6 +270,13 @@ let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
         ~font_size ~log_verbosity))
     []
 
+let proof_viewer_instance =
+  let instance = lazy (
+    let gui = MatitaGui.instance () in
+    proof_viewer ~show:true ~packing:gui#proof#scrolledProof#add ()
+  ) in
+  fun () -> Lazy.force instance
+
 let sequents_viewer ~(notebook:GPack.notebook)
   ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
 =