in
aux
+let add_trailing_slash =
+ let rex = Pcre.regexp "/$" in
+ fun s ->
+ if Pcre.pmatch ~rex s then s
+ else s ^ "/"
+
+let strip_blanks =
+ let rex = Pcre.regexp "^\\s*([^\\s]*)\\s*$" in
+ fun s ->
+ (Pcre.extract ~rex s).(1)
+
(** inherit from this class if you want to access current script *)
class scriptAccessor =
object (self)
=
let term_RE = Pcre.regexp "^term:(.*)" in
let whelp_RE = Pcre.regexp "^\\s*whelp" in
+ let uri_RE =
+ Pcre.regexp
+ "^cic:/(\\w+/)*\\w+\\.(con|ind|var)(#xpointer\\(\\d+(/\\d+)+\\))?$"
+ in
+ let dir_RE = Pcre.regexp "^cic:((/(\\w+/)*\\w+(/)?)|/|)$" in
let whelp_query_RE = Pcre.regexp "^\\s*whelp\\s+([^\\s]+)\\s+(.*)$" in
let trailing_slash_RE = Pcre.regexp "/$" in
let has_xpointer_RE = Pcre.regexp "#xpointer\\(\\d+/\\d+(/\\d+)?\\)$" in
+ let is_whelp txt = Pcre.pmatch ~rex:whelp_RE txt in
+ let is_uri txt = Pcre.pmatch ~rex:uri_RE txt in
+ let is_dir txt = Pcre.pmatch ~rex:dir_RE txt in
let gui = MatitaGui.instance () in
let win = gui#newBrowserWin () in
let queries = ["Locate";"Hint";"Match";"Elim";"Instance"] in
ignore (MatitaGtkMisc.ask_confirmation ~gui:(MatitaGui.instance ())
~title:"Cic browser" ~msg ~cancel:false ());
in
+ let tags =
+ [ "dir", GdkPixbuf.from_file (MatitaMisc.image_path "matita-folder.png");
+ "obj", GdkPixbuf.from_file (MatitaMisc.image_path "matita-object.png") ]
+ in
let handle_error f =
try
f ()
with exn ->
fail (sprintf "Uncaught exception:\n%s" (Printexc.to_string exn))
in
- let handle_error' f = fun () -> handle_error f in (* used in callbacks *)
+ let handle_error' f = (fun () -> handle_error (fun () -> f ())) in
object (self)
inherit scriptAccessor
initializer
activate_combo_query "" "locate";
- win#comboVbox#add (combo :> GObj.widget);
+ win#whelpBarComboVbox#add combo#coerce;
let start_query () =
let query = String.lowercase (List.nth queries combo#active) in
let input = win#queryInputText#text in
in
ignore(win#queryInputText#connect#activate ~callback:start_query);
ignore(combo#connect#changed ~callback:start_query);
- win#whelpImage2#set_file "icons/whelp.png";
- win#whelpBarToggleButton#set_active false;
- win#whelpBarBox#misc#hide ();
+ win#whelpBarImage#set_file (MatitaMisc.image_path "whelp.png");
win#mathOrListNotebook#set_show_tabs false;
- MatitaGtkMisc.connect_toggle_button win#whelpBarToggleButton
- (fun () ->
- if win#whelpBarToggleButton#active then
- win#whelpBarBox#misc#show ()
- else
- win#whelpBarBox#misc#hide ());
win#browserForwardButton#misc#set_sensitive false;
win#browserBackButton#misc#set_sensitive false;
- ignore (win#browserUri#connect#activate (handle_error' (fun () ->
- self#loadInput win#browserUri#text)));
+ ignore (win#browserUri#entry#connect#activate (handle_error' (fun () ->
+ self#loadInput win#browserUri#entry#text)));
ignore (win#browserHomeButton#connect#clicked (handle_error' (fun () ->
- self#_load (`About `Current_proof))));
+ self#load (`About `Current_proof))));
ignore (win#browserRefreshButton#connect#clicked
(handle_error' self#refresh));
ignore (win#browserBackButton#connect#clicked (handle_error' self#back));
GMain.quit ();
false));
ignore(win#whelpResultTreeview#connect#row_activated
- ~callback:(fun _ _ ->
- let selection = self#_getWhelpResultTreeviewSelection () in
- let is_cic s =
- try
- String.sub s 0 5 = "cic:/"
- with Invalid_argument _ -> false
- in
- let txt =
- if is_cic selection then
- selection
- else
- win#browserUri#text ^ selection
- in
- self#loadInput txt));
+ ~callback:(fun _ _ -> self#loadInput (self#_getSelectedUri ())));
mathView#set_href_callback (Some (fun uri ->
- handle_error (fun () -> self#_load (`Uri uri))));
+ handle_error (fun () -> self#load (`Uri uri))));
self#_load (`About `Blank);
toplevel#show ()
val mutable current_infos = None
val mutable current_mathml = None
- val model = new MatitaGtkMisc.stringListModel win#whelpResultTreeview
+ val model =
+ new MatitaGtkMisc.taggedStringListModel tags win#whelpResultTreeview
- method private _getWhelpResultTreeviewSelection () =
+ method private _getSelectedUri () =
match model#easy_selection () with
- | [u] -> u
- | _ -> assert false
+ | [sel] when is_uri sel -> sel (* absolute URI selected *)
+ | [sel] -> win#browserUri#entry#text ^ sel (* relative URI selected *)
+ | _ -> assert false
(** history RATIONALE
*
- * all operations about history are done using _historyFoo
- *
- * only toplevel function like load loadInput can call
- * _historyAdd
+ * All operations about history are done using _historyFoo.
+ * Only toplevel functions (ATM load and loadInput) call _historyAdd.
*)
method private _historyAdd item =
method private _showList = win#mathOrListNotebook#goto_page 1
method private _showMath = win#mathOrListNotebook#goto_page 0
-
-
method private back () =
try
self#_load (self#_historyPrev ())
| `Uri uri -> self#_loadUriManagerUri (UriManager.uri_of_string uri)
| `Whelp (query, results) ->
set_whelp_query query;
- self#_loadList results);
+ self#_loadList (List.map (fun r -> "obj", r) results));
self#setEntry entry
end
with
method private _loadDir dir =
let content = Http_getter.ls dir in
- let l = List.map (function
- | Http_getter_types.Ls_section sec -> sec
- | Http_getter_types.Ls_object obj -> obj.Http_getter_types.uri
- ) content
+ let l =
+ List.map
+ (function
+ | Http_getter_types.Ls_section s -> "dir", s
+ | Http_getter_types.Ls_object o -> "obj", o.Http_getter_types.uri)
+ content
in
+ if l = [] then raise (Browser_failure "no such directory");
self#_loadList l
method private setEntry entry =
- win#browserUri#set_text (string_of_entry entry);
+ win#browserUri#entry#set_text (string_of_entry entry);
current_entry <- entry
method private _loadObj obj =
method private _loadList l =
model#list_store#clear ();
- List.iter model#easy_append l;
+ List.iter (fun (tag, s) -> model#easy_append ~tag s) l;
self#_showList
(** { public methods, all must call _load!! } *)
- method load uri =
- handle_error (fun () -> self#_load uri);
- self#_historyAdd uri
+ method load entry =
+ handle_error (fun () -> self#_load entry; self#_historyAdd entry)
(** this is what the browser does when you enter a string an hit enter *)
- method loadInput txt =
- let add_terminating_slash s =
- if not(Pcre.pmatch ~rex:trailing_slash_RE s) &&
- not(Pcre.pmatch ~rex:has_xpointer_RE s) then s^"/" else s
- in
- let is_uri txt =
- try
- let u = UriManager.strip_xpointer (UriManager.uri_of_string txt) in
- ignore (Http_getter.resolve' u);
- true
- with
- | Http_getter_types.Key_not_found _
- | Http_getter_types.Unresolvable_URI _
- | UriManager.IllFormedUri ("cic:/" | "cic:") -> false
- | UriManager.IllFormedUri u -> failwith ("Malformed URI '" ^ u ^ "'")
+ method loadInput txt =
+ let txt = strip_blanks txt in
+ let fix_uri txt =
+ UriManager.string_of_uri
+ (UriManager.strip_xpointer (UriManager.uri_of_string txt))
in
- let is_whelp txt = Pcre.pmatch ~rex:whelp_RE txt in
- if is_whelp txt then
- begin
- set_whelp_query txt;
-
-
- (MatitaScript.instance ())#advance ~statement:(txt^".") ()
- end
- else
- begin
- let entry =
- if is_uri txt then
- (`Uri txt)
- else
- (`Dir (add_terminating_slash txt))
- in
- self#_load entry;
- self#_historyAdd entry
- end
-
-
+ if is_whelp txt then begin
+ set_whelp_query txt;
+ (MatitaScript.instance ())#advance ~statement:(txt ^ ".") ()
+ end else begin
+ let entry =
+ match txt with
+ | txt when is_uri txt -> `Uri (fix_uri txt)
+ | txt when is_dir txt -> `Dir (add_trailing_slash txt)
+ | txt ->
+ (try
+ entry_of_string txt
+ with Invalid_argument _ ->
+ raise (Browser_failure (sprintf "unsupported uri: %s" txt)))
+ in
+ self#_load entry;
+ self#_historyAdd entry
+ end
+
(** {2 methods used by constructor only} *)
method win = win