X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Ftest%2Ftest.ml;h=76b2856d30e5e5f2a8a99f975e66bfdfeef5a61a;hb=56b68e877e6eb517c3efba7d9485947e940f7785;hp=655970cca5a1974e7c6aa0db5cb3c19106839123;hpb=5c0956cb044202bc8263b7428da298cdc1d2dd59;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/test/test.ml b/helm/DEVEL/lablgtkmathview/test/test.ml
index 655970cca..76b2856d3 100644
--- a/helm/DEVEL/lablgtkmathview/test/test.ml
+++ b/helm/DEVEL/lablgtkmathview/test/test.ml
@@ -40,10 +40,10 @@ let selection_changed mathview (element : Gdome.element option) =
  flush stdout
 ;;
 
-let element_changed mathview (element : Gdome.element option) =
- print_endline ("element_changed: " ^
+let element_over mathview (element : Gdome.element option) _ =
+ print_endline ("element_over: " ^
   (match element with
-      None -> "element_changed on nothing"
+      None -> "element_over on nothing"
     | Some element -> element#get_tagName#to_string
   )
  ) ;
@@ -74,9 +74,39 @@ let rec jump (element : Gdome.element) =
     end
 ;;
 
-let clicked (mathview : GMathView.math_view) (element : Gdome.element) =
+let rec action mathview (element : Gdome.element) =
+ let module G = Gdome in
+  if element#get_tagName#to_string = "m:maction" then
+   let selection =
+    if element#hasAttribute ~name:(G.domString "selection") then
+     int_of_string (element#getAttribute ~name:(G.domString "selection"))#to_string
+    else
+     1
+   in
+    mathview#freeze ;
+    (* the widget will cast the index back into a reasonable range *)
+    element#setAttribute ~name:(G.domString "selection") ~value:(G.domString (string_of_int (selection + 1))) ;
+    mathview#thaw ;
+    true
+  else
+   match element#get_parentNode with
+      Some p ->
+       begin
+        try
+	 action mathview (new Gdome.element_of_node p)
+	with
+	 GdomeInit.DOMCastException _ ->
+	  print_string "action: NO MACTION FOUND\n" ;
+	  flush stdout ;
+	  false
+       end
+     | None -> assert false (* every element has a parent *)
+
+let click mathview (element : Gdome.element) _ =
  let module G = Gdome in
   if not (jump element) then
+  if not (mathview#action_toggle element) then
+  (*
    match mathview#get_action with
       Some n ->
        mathview#action_toggle ;
@@ -91,17 +121,19 @@ let clicked (mathview : GMathView.math_view) (element : Gdome.element) =
          ) ^ "\n") ;
        print_endline ("clicked: " ^ element#get_tagName#to_string) ;
        flush stdout
+   *)
+   ()
 ;;
 
 
-let activate_t1 (mathview : GMathView.math_view) () =
- mathview#set_font_manager_type `font_manager_t1;
+let activate_t1 mathview () =
+ mathview#set_font_manager_type ~fm_type:`font_manager_t1;
  print_string "WIDGET SET WITH T1 FONTS\n" ;
  flush stdout
 ;;
 
-let activate_gtk (mathview : GMathView.math_view) () =
- mathview#set_font_manager_type `font_manager_gtk ;
+let activate_gtk mathview () =
+ mathview#set_font_manager_type ~fm_type:`font_manager_gtk ;
  print_string "WIDGET SET WITH GTK FONTS\n" ;
  flush stdout
 ;;
@@ -130,19 +162,19 @@ let set_transparency mathview () =
 ;;
 
 
-let load (mathview : GMathView.math_view) () =
- mathview#load "test.xml" ;
+let load_uri mathview () =
+ mathview#load_uri ~filename:"test.xml" ;
  print_string "load: SEEMS TO WORK\n" ;
  flush stdout
 ;;
 
-let load_dom (mathview : GMathView.math_view) () =
- mathview#load_tree ((Gdome.domImplementation ())#createDocumentFromURI ~uri:"test.xml" ()) ;
+let load_doc mathview () =
+ mathview#load_doc ~dom:((Gdome.domImplementation ())#createDocumentFromURI ~uri:"test.xml" ()) ;
  print_string "load from DOM: SEEMS TO WORK\n" ;
  flush stdout
 ;;
 
-let get_selection (mathview : GMathView.math_view) () =
+let test_get_selection mathview () =
  let selection =
    match mathview#get_selection with
       Some element -> element#get_tagName#to_string
@@ -152,7 +184,7 @@ let get_selection (mathview : GMathView.math_view) () =
   flush stdout
 ;;
 
-let set_selection (mathview : GMathView.math_view) () =
+let test_set_selection mathview () =
  begin
    match mathview#get_selection with
       Some element -> 
@@ -176,6 +208,20 @@ let set_selection (mathview : GMathView.math_view) () =
  flush stdout
 ;;
 
+let test_add_selection (mathview : GMathViewAux.multi_selection_math_view) () =
+ match mathview#get_selection with
+    Some e -> mathview#add_selection e
+  | None ->
+     begin
+      print_string "no selection to add\n" ;
+      flush stdout
+     end
+;;
+
+let test_reset_selections (mathview : GMathViewAux.multi_selection_math_view) () =
+ mathview#set_selection None ;
+ mathview#remove_selections
+
 let unload mathview () =
  mathview#unload ;
  print_string "unload: SEEMS TO WORK\n" ;
@@ -267,6 +313,7 @@ let get_anti_aliasing mathview () =
  flush stdout
 ;;
  
+ (*
 let set_kerning mathview () =
  mathview#set_kerning true ;
  print_string "set_kerning: ON\n" ;
@@ -279,6 +326,7 @@ let get_kerning mathview () =
   "\n") ;
  flush stdout
 ;;
+*)
 
 let set_log_verbosity mathview () =
  mathview#set_log_verbosity 3 ;
@@ -293,7 +341,7 @@ let get_log_verbosity mathview () =
  flush stdout
 ;;
 
-let export_to_postscript (mathview : GMathView.math_view) () =
+let export_to_postscript (mathview : GMathViewAux.multi_selection_math_view) () =
  mathview#export_to_postscript ~filename:"test.ps" ();
  print_string "expor_to_postscript: SEEMS TO WORK (hint: look at test.ps)\n";
  flush stdout
@@ -303,13 +351,15 @@ let export_to_postscript (mathview : GMathView.math_view) () =
 let main_window = GWindow.window ~title:"GtkMathView test" () in
 let vbox = GPack.vbox ~packing:main_window#add () in
 let sw = GBin.scrolled_window ~width:50 ~height:50 ~packing:vbox#pack () in
-let mathview= GMathView.math_view ~packing:sw#add ~width:50 ~height:50 () in
+let mathview= GMathViewAux.multi_selection_math_view ~packing:sw#add ~width:50 ~height:50 () in
 let table = GPack.table ~rows:6 ~columns:5 ~packing:vbox#pack () in
 let button_gtk=GButton.button ~label:"activate Gtk fonts" ~packing:(table#attach ~left:0 ~top:0) () in
 let button_load = GButton.button ~label:"load" ~packing:(table#attach ~left:1 ~top:0) () in
 let button_unload = GButton.button ~label:"unload" ~packing:(table#attach ~left:2 ~top:0) () in
 let button_get_selection = GButton.button ~label:"get_selection" ~packing:(table#attach ~left:3 ~top:0) () in
 let button_set_selection = GButton.button ~label:"set_selection" ~packing:(table#attach ~left:4 ~top:0) () in
+let button_add_selection = GButton.button ~label:"add_selection" ~packing:(table#attach ~left:3 ~top:3) () in
+let button_reset_selections = GButton.button ~label:"reset_selections" ~packing:(table#attach ~left:4 ~top:3) () in
 let button_get_width = GButton.button ~label:"get_width" ~packing:(table#attach ~left:0 ~top:1) () in
 let button_get_height = GButton.button ~label:"get_height" ~packing:(table#attach ~left:1 ~top:1) () in
 let button_get_top = GButton.button ~label:"get_top" ~packing:(table#attach ~left:2 ~top:1) () in
@@ -323,8 +373,6 @@ let button_set_font_size = GButton.button ~label:"set_font_size" ~packing:(table
 let button_get_font_size = GButton.button ~label:"get_font_size" ~packing:(table#attach ~left:0 ~top:3) () in
 let button_set_anti_aliasing = GButton.button ~label:"set_anti_aliasing" ~packing:(table#attach ~left:1 ~top:3) () in
 let button_get_anti_aliasing = GButton.button ~label:"get_anti_aliasing" ~packing:(table#attach ~left:2 ~top:3) () in
-let button_set_kerning = GButton.button ~label:"set_kerning" ~packing:(table#attach ~left:3 ~top:3) () in
-let button_get_kerning = GButton.button ~label:"get_kerning" ~packing:(table#attach ~left:4 ~top:3) () in
 let button_set_log_verbosity = GButton.button ~label:"set_log_verbosity" ~packing:(table#attach ~left:0 ~top:4) () in
 let button_get_log_verbosity = GButton.button ~label:"get_log_verbosity" ~packing:(table#attach ~left:1 ~top:4) () in
 let button_export_to_postscript = GButton.button ~label:"export_to_postscript" ~packing:(table#attach ~left:2 ~top:4) () in
@@ -335,10 +383,12 @@ let button_set_transparency = GButton.button ~label:"set_transparency" ~packing:
 let button_load_dom = GButton.button ~label:"load from DOM" ~packing:(table#attach ~left:2 ~top:5) () in
 (* Signals connection *)
 ignore(button_gtk#connect#clicked (activate_gtk mathview)) ;
-ignore(button_load#connect#clicked (load mathview)) ;
+ignore(button_load#connect#clicked (load_uri mathview)) ;
 ignore(button_unload#connect#clicked (unload mathview)) ;
-ignore(button_get_selection#connect#clicked (get_selection mathview)) ;
-ignore(button_set_selection#connect#clicked (set_selection mathview)) ;
+ignore(button_get_selection#connect#clicked (test_get_selection mathview)) ;
+ignore(button_set_selection#connect#clicked (test_set_selection mathview)) ;
+ignore(button_add_selection#connect#clicked (test_add_selection mathview)) ;
+ignore(button_reset_selections#connect#clicked (test_reset_selections mathview)) ;
 ignore(button_get_width#connect#clicked (get_width mathview)) ;
 ignore(button_get_height#connect#clicked (get_height mathview)) ;
 ignore(button_get_top#connect#clicked (get_top mathview)) ;
@@ -352,8 +402,6 @@ ignore(button_set_font_size#connect#clicked (set_font_size mathview)) ;
 ignore(button_get_font_size#connect#clicked (get_font_size mathview)) ;
 ignore(button_set_anti_aliasing#connect#clicked (set_anti_aliasing mathview)) ;
 ignore(button_get_anti_aliasing#connect#clicked (get_anti_aliasing mathview)) ;
-ignore(button_set_kerning#connect#clicked (set_kerning mathview)) ;
-ignore(button_get_kerning#connect#clicked (get_kerning mathview)) ;
 ignore(button_set_log_verbosity#connect#clicked (set_log_verbosity mathview)) ;
 ignore(button_get_log_verbosity#connect#clicked (get_log_verbosity mathview)) ;
 ignore(button_export_to_postscript#connect#clicked (export_to_postscript mathview)) ;
@@ -361,10 +409,10 @@ ignore(button_t1#connect#clicked (activate_t1 mathview)) ;
 ignore(button_get_font_manager_type#connect#clicked (get_font_manager_type mathview)) ;
 ignore(button_get_transparency#connect#clicked (get_transparency mathview)) ;
 ignore(button_set_transparency#connect#clicked (set_transparency mathview)) ;
-ignore(mathview#connect#clicked (clicked mathview)) ;
-ignore(mathview#connect#selection_changed (selection_changed mathview)) ;
-ignore(mathview#connect#element_changed (element_changed mathview)) ;
-ignore(button_load_dom#connect#clicked (load_dom mathview)) ;
+ignore(mathview#connect#click (click mathview)) ;
+ignore(mathview#connect#selection_changed (selection_changed mathview));
+ignore(mathview#connect#element_over (element_over mathview)) ;
+ignore(button_load_dom#connect#clicked (load_doc mathview)) ;
 (* Main Loop *)
 main_window#show () ;
 GMain.Main.main ()