| None -> self#set_selection None
end
-let clickable_math_view =
+let clickable_math_view ?hadjustment ?vadjustment ?font_size ?log_verbosity =
GtkBase.Widget.size_params
~cont:(OgtkMathViewProps.pack_return (fun p ->
OgtkMathViewProps.set_params
(new clickable_math_view (GtkMathViewProps.MathView_GMetaDOM.create p))
~font_size:None ~log_verbosity:None))
[]
-let clickable_math_view () = clickable_math_view ()
-
-class proof_viewer obj =
- object (self)
-
- inherit clickable_math_view obj
-
- val mutable current_infos = None
- val mutable current_mathml = None
-
- method load_proof ((uri_opt, _, _, _) as proof, (goal_opt: int option)) =
- let uri = unopt_uri uri_opt in
- let obj = cicCurrentProof proof in
- let (mathml, (_,(ids_to_terms, ids_to_father_ids, ids_to_conjectures,
- ids_to_hypotheses,_,_))) =
- ApplyTransformation.mml_of_cic_object uri obj
- in
- current_infos <- Some (ids_to_terms, ids_to_father_ids,
- ids_to_conjectures, ids_to_hypotheses);
- debug_print "load_proof: dumping MathML to ./proof";
- ignore (Misc.domImpl#saveDocumentToFile ~name:"./proof" ~doc:mathml ());
- match current_mathml with
- | None ->
- self#load_root ~root:mathml#get_documentElement ;
- current_mathml <- Some mathml
- | Some current_mathml ->
- self#freeze;
- XmlDiff.update_dom ~from:current_mathml mathml ;
- self#thaw
- end
class sequent_viewer obj =
object(self)
(** constructors *)
+type 'widget constructor =
+ ?hadjustment:GData.adjustment ->
+ ?vadjustment:GData.adjustment ->
+ ?font_size:int ->
+ ?log_verbosity:int ->
+ ?width:int ->
+ ?height:int ->
+ ?packing:(GObj.widget -> unit) ->
+ ?show:bool ->
+ unit ->
+ 'widget
+
let sequent_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
GtkBase.Widget.size_params
~cont:(OgtkMathViewProps.pack_return (fun p ->
~font_size ~log_verbosity))
[]
-class cicBrowser =
- object (self)
- val widget =
- let gui = MatitaGui.instance () in
- sequent_viewer ~show:true ~packing:gui#browser#scrolledBrowser#add ()
+let blank_uri = BuildTimeConf.blank_uri
+let current_proof_uri = BuildTimeConf.current_proof_uri
+exception Browser_failure of string
+
+let cicBrowsers = ref []
+
+class cicBrowser
+ ~(disambiguator:MatitaTypes.disambiguator)
+ ~(currentProof:MatitaTypes.currentProof)
+ ~(history:string MatitaMisc.history)
+ ()
+=
+ let term_RE = Pcre.regexp "^term:(.*)" in
+ let gui = MatitaGui.instance () in
+ let win = gui#newBrowserWin () in
+ let toplevel = win#toplevel in
+ let mathView = sequent_viewer ~packing:win#scrolledBrowser#add () in
+ let fail msg =
+ ignore (MatitaGtkMisc.ask_confirmation ~gui:(MatitaGui.instance ())
+ ~title:"Cic browser" ~msg ~cancel:false ());
+ in
+ let handle_error f =
+ try
+ f ()
+ with exn ->
+ fail (sprintf "Uncaught exception:\n%s" (Printexc.to_string exn))
+ in
+ object (self)
initializer
- widget#set_href_callback (Some (fun uri -> self#load_uri uri))
+ ignore (win#browserUri#connect#activate (fun () ->
+ self#_loadUri win#browserUri#text));
+ ignore (win#browserHomeButton#connect#clicked (fun () ->
+ self#_loadUri current_proof_uri));
+ ignore (win#browserRefreshButton#connect#clicked self#refresh);
+ ignore (win#browserBackButton#connect#clicked self#back);
+ ignore (win#browserForwardButton#connect#clicked self#forward);
+ ignore (win#toplevel#event#connect#delete (fun _ ->
+ let my_id = Oo.id self in
+ cicBrowsers := List.filter (fun b -> Oo.id b <> my_id) !cicBrowsers;
+ false));
+ mathView#set_href_callback (Some (fun uri ->
+ handle_error (fun () -> self#_loadUri (UriManager.string_of_uri uri))));
+ self#_loadUri ~add_to_history:false blank_uri;
+ toplevel#show ();
+
+ val mutable current_uri = ""
+ val mutable current_infos = None
+ val mutable current_mathml = None
- method load_uri uri = ()
- end
+ method private back () =
+ try
+ self#_loadUri ~add_to_history:false history#previous
+ with MatitaMisc.History_failure -> ()
-let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
- GtkBase.Widget.size_params
- ~cont:(OgtkMathViewProps.pack_return (fun p ->
- OgtkMathViewProps.set_params
- (new proof_viewer (GtkMathViewProps.MathView_GMetaDOM.create p))
- ~font_size ~log_verbosity))
- []
+ method private forward () =
+ try
+ self#_loadUri ~add_to_history:false history#next
+ with MatitaMisc.History_failure -> ()
-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
+ (* loads a uri which can be a cic uri or an about:* uri
+ * @param uri string *)
+ method private _loadUri ?(add_to_history = true) uri =
+ try
+ if current_uri <> uri || uri = current_proof_uri then begin
+ (match uri with
+ | uri when uri = blank_uri -> self#blank ()
+ | uri when uri = current_proof_uri -> self#home ()
+ | uri when Pcre.pmatch ~rex:term_RE uri ->
+ self#loadTerm (`String (Pcre.extract ~rex:term_RE uri).(1))
+ | _ -> self#loadUriManagerUri (UriManager.uri_of_string uri));
+ self#setUri uri;
+ if add_to_history then history#add uri
+ end
+ with
+ | UriManager.IllFormedUri _ -> fail (sprintf "invalid uri: %s" uri)
+ | CicEnvironment.Object_not_found _ ->
+ fail (sprintf "object not found: %s" uri)
+ | Browser_failure msg -> fail msg
+
+ method loadUri uri =
+ handle_error (fun () -> self#_loadUri ~add_to_history:true uri)
+
+ method private blank () = mathView#load_root MatitaMisc.empty_mathml
+
+ method private home () =
+ if currentProof#onGoing () then
+ self#loadObj (cicCurrentProof currentProof#proof#proof)
+ else
+ raise (Browser_failure "no on going proof")
+
+ (** loads a cic uri from the environment
+ * @param uri UriManager.uri *)
+ method private loadUriManagerUri uri =
+ let uri = UriManager.strip_xpointer uri in
+ let (obj, _) = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
+ self#loadObj obj
+
+ method private setUri uri =
+ win#browserUri#set_text uri;
+ current_uri <- uri
+
+ method private loadObj obj =
+ let use_diff = false in (* ZACK TODO use XmlDiff when re-rendering? *)
+ let (mathml, (_,(ids_to_terms, ids_to_father_ids, ids_to_conjectures,
+ ids_to_hypotheses,_,_))) =
+ ApplyTransformation.mml_of_cic_object obj
+ in
+ current_infos <- Some (ids_to_terms, ids_to_father_ids,
+ ids_to_conjectures, ids_to_hypotheses);
+ match current_mathml with
+ | Some current_mathml when use_diff ->
+ mathView#freeze;
+ XmlDiff.update_dom ~from:current_mathml mathml;
+ mathView#thaw
+ | _ ->
+ mathView#load_root ~root:mathml#get_documentElement;
+ current_mathml <- Some mathml
-class mathViewer =
- let href_callback: (UriManager.uri -> unit) option ref = ref None in
- object
- val check_widget =
- lazy
- (let gui = MatitaGui.instance () in
- let sequent_viewer =
- sequent_viewer ~show:true ~packing:gui#check#scrolledCheck#add ()
- in
- sequent_viewer#set_href_callback !href_callback;
- sequent_viewer)
+ method private _loadTerm s =
+ self#_loadTermAst (disambiguator#parserr#parseTerm (Stream.of_string s))
- method set_href_callback f = href_callback := f
+ method private _loadTermAst ast =
+ let (_, _, term, _) =
+ MatitaCicMisc.disambiguate ~disambiguator ~currentProof ast
+ in
+ self#_loadTermCic term
- method checkTerm sequent metasenv =
- let (metano, context, expr) = sequent in
- let widget = Lazy.force check_widget in
- let gui = MatitaGui.instance () in
- gui#check#checkWin#show ();
- gui#main#showCheckMenuItem#set_active true;
- widget#load_sequent (sequent :: metasenv) metano
+ method private _loadTermCic term =
+ let (context, metasenv) =
+ MatitaCicMisc.get_context_and_metasenv currentProof
+ in
+ let dummyno = CicMkImplicit.new_meta metasenv [] in
+ let sequent = (dummyno, context, term) in
+ mathView#load_sequent (sequent :: metasenv) dummyno
+
+ method loadTerm (src:MatitaTypes.term_source) =
+ handle_error (fun () ->
+ (match src with
+ | `Ast ast -> self#_loadTermAst ast
+ | `Cic cic -> self#_loadTermCic cic
+ | `String s -> self#_loadTerm s);
+ self#setUri "check")
+
+ (** {2 methods used by constructor only} *)
+
+ method win = win
+ method history = history
+ method currentUri = current_uri
+ method refresh () =
+ if current_uri = current_proof_uri then
+ self#_loadUri ~add_to_history:false current_proof_uri
- method unload () = (proof_viewer_instance ())#unload
end
let sequents_viewer ~(notebook:GPack.notebook)
=
new sequents_viewer ~notebook ~sequent_viewer ~set_goal ()
-let mathViewer () = new mathViewer
+let cicBrowser ~disambiguator ~currentProof () =
+ let size = BuildTimeConf.browser_history_size in
+ let rec aux history =
+ let browser = new cicBrowser ~disambiguator ~currentProof ~history () in
+ let win = browser#win in
+ ignore (win#browserNewButton#connect#clicked (fun () ->
+ let history =
+ new MatitaMisc.browser_history ~memento:history#save size ""
+ in
+ let newBrowser = aux history in
+ newBrowser#loadUri browser#currentUri));
+(*
+ (* attempt (failed) to close windows on CTRL-W ... *)
+ MatitaGtkMisc.connect_key win#browserWinEventBox#event ~modifiers:[`CONTROL]
+ GdkKeysyms._W (fun () -> win#toplevel#destroy ());
+*)
+ cicBrowsers := browser :: !cicBrowsers;
+ (browser :> MatitaTypes.cicBrowser)
+ in
+ let history = new MatitaMisc.browser_history size blank_uri in
+ aux history
+
+let refresh_all_browsers () = List.iter (fun b -> b#refresh ()) !cicBrowsers
+
+class mathViewer ~disambiguator ~currentProof =
+ object
+ method checkTerm (src:MatitaTypes.term_source) =
+ let browser = cicBrowser ~disambiguator ~currentProof () in
+ browser#loadTerm src
+ end
-let cicBrowser () = new cicBrowser
+let mathViewer ~disambiguator ~currentProof () =
+ new mathViewer ~disambiguator ~currentProof
projects / helm.git / blobdiff