X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaConsole.ml;h=222055e6539a59b8b9ecfed8bf3434d746bcb936;hb=e09713d333183e929f108ff8bb8fbe2a25bfcac7;hp=1f86e51a0c522aefdc68bc393ff7c7a6aec7fba4;hpb=1fa0472bfe2ed04c7adf166fa48df687f0022226;p=helm.git diff --git a/helm/matita/matitaConsole.ml b/helm/matita/matitaConsole.ml index 1f86e51a0..222055e65 100644 --- a/helm/matita/matitaConsole.ml +++ b/helm/matita/matitaConsole.ml @@ -23,11 +23,14 @@ * http://helm.cs.unibo.it/ *) -let default_prompt = "# " -let default_phrase_sep = "." -let default_callback = fun (phrase: string) -> () +open Printf + +open MatitaTypes -let history_size = 100 +(* let default_prompt = "# " *) +let default_prompt = "" +let default_phrase_sep = "." +let default_callback = fun (phrase: string) -> true let message_props = [ `STYLE `ITALIC ] let error_props = [ `WEIGHT `BOLD ] @@ -65,8 +68,9 @@ class history size = class console ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep) - ?(callback = default_callback) ?evbox obj + ?(callback = default_callback) ?evbox ~(paned:GPack.paned) obj = + let console_height = 100 in (* pixels *) object (self) inherit GText.view obj @@ -85,11 +89,14 @@ class console method ignore_insert_text_signal ignore = _ignore_insert_text_signal <- ignore - val history = new history history_size + val history = new history BuildTimeConf.console_history_size + + val mutable handle_position = 450 initializer let buf = self#buffer in self#set_wrap_mode `CHAR; + self#hide (); (* create "USER_INPUT_START" mark. This mark will always point to the * beginning of user input not yet processed *) ignore (buf#create_mark ~name:"USER_INPUT_START" @@ -110,17 +117,21 @@ class console self#invoke_callback inserted_text; self#echo_prompt () end)); - (match evbox with + (match evbox with (* history key bindings *) | None -> () | Some evbox -> List.iter (fun (key, f) -> MatitaGtkMisc.add_key_binding key f evbox) [ GdkKeysyms._p, (fun () -> self#previous_phrase); GdkKeysyms._n, (fun () -> self#next_phrase); - GdkKeysyms._a, (fun () -> self#beginning_of_phrase); - GdkKeysyms._e, (fun () -> self#end_of_phrase); - GdkKeysyms._f, (fun () -> self#forward_char); - GdkKeysyms._b, (fun () -> self#backward_char); - ]) + ]); + ignore (self#connect#after#move_cursor + (* avoid cursor being placed at prompt's left *) + ~callback:(fun step count ~extend -> + let buf = self#buffer in + let cursor_iter = buf#get_iter_at_mark `INSERT in + let prompt_iter = buf#get_iter_at_mark (`NAME "USER_INPUT_START") in + if prompt_iter#compare cursor_iter = 1 then (* prompt > cursor *) + buf#place_cursor ~where:prompt_iter)) method private set_phrase phrase = let buf = self#buffer in @@ -133,7 +144,16 @@ class console history#add (* do not push trailing phrase separator *) (String.sub phrase 0 (String.length phrase - String.length _phrase_sep)); - _callback phrase + if _callback phrase then begin + self#hide (); + self#clear () + (* else callback encountered troubles, don't hide console which + probably contains error message *) + end + + method clear () = + let buf = self#buffer in + buf#delete ~start:buf#start_iter ~stop:buf#end_iter (* lock old text and bump USER_INPUT_START mark *) method private lock = @@ -158,6 +178,7 @@ class console self#lock method echo_error msg = + self#show (); let buf = self#buffer in self#ignore_insert_text_signal true; buf#insert ~iter:buf#end_iter ~tags:[buf#create_tag error_props] @@ -165,30 +186,51 @@ class console self#ignore_insert_text_signal false; self#lock + method private get_paned_prop s = + Gobject.get { Gobject.name = s; Gobject.conv = Gobject.Data.int } + paned#as_widget + method private get_position = self#get_paned_prop "position" + method private get_min_position = self#get_paned_prop "min-position" + method private get_max_position = self#get_paned_prop "max-position" + + method show ?(msg = "") () = + self#buffer#insert msg; + paned#set_position (self#get_max_position - console_height); + self#misc#grab_focus () + method hide () = + paned#set_position self#get_max_position + method toggle () = + let pos = self#get_position in + if pos > self#get_max_position - console_height then + self#show () + else + self#hide () + (** navigation methods: history, cursor motion, ... *) method private previous_phrase = try self#set_phrase history#previous with History_failure -> () method private next_phrase = try self#set_phrase history#next with History_failure -> () - method private beginning_of_phrase = - let buf = self#buffer in - buf#place_cursor ~where:(buf#get_iter_at_mark (`NAME "USER_INPUT_START")) - method private end_of_phrase = - let buf = self#buffer in - buf#place_cursor ~where:buf#end_iter - method private forward_char = - let buf = self#buffer in - buf#place_cursor ~where:(buf#get_iter_at_mark `INSERT)#forward_char - method private backward_char = - let buf = self#buffer in - buf#place_cursor ~where:(buf#get_iter_at_mark `INSERT)#backward_char + + method wrap_exn (f: unit -> unit) = + try + f (); + true + with + | StatefulProofEngine.Tactic_failure exn -> + self#echo_error (sprintf "Tactic failed: %s"(Printexc.to_string exn)); + false + | exn -> + self#echo_error (sprintf "Uncaught exception: %s" + (Printexc.to_string exn)); + false end let console ?(prompt = default_prompt) ?(phrase_sep = default_phrase_sep) - ?(callback = default_callback) ?evbox + ?(callback = default_callback) ?evbox ~paned ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width ?width ?height ?packing ?show () = @@ -197,5 +239,5 @@ let console ?buffer ?editable ?cursor_visible ?justification ?wrap_mode ?border_width ?width ?height ?packing ?show () in - new console ~prompt ~phrase_sep ~callback ?evbox view#as_view + new console ~prompt ~phrase_sep ~callback ?evbox ~paned view#as_view