diff --git a/sw/lib/ocaml/papget_common.ml b/sw/lib/ocaml/papget_common.ml
new file mode 100644
index 0000000000..c3a3995e3d
--- /dev/null
+++ b/sw/lib/ocaml/papget_common.ml
@@ -0,0 +1,51 @@
+(*
+ * $Id$
+ *
+ * Commons for papgets
+ *  
+ * Copyright (C) 2008 ENAC
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ *
+ *)
+
+let get_property = fun attr_name xml ->
+  let attr = ExtXml.child ~select:(fun x -> ExtXml.attrib x "name" = attr_name) xml "property" in
+  ExtXml.attrib attr "value"
+
+
+let get_prop = fun name children default ->
+  let xml = Xml.Element ("", [], children) in
+  try get_property name xml with _ -> default
+
+let property = fun name value ->
+  Xml.Element("property", [ "name", name; "value", value ], [])
+
+let xml = fun type_ display_ properties ->
+  Xml.Element ("papget", ["type", type_; "display", display_], 
+	       List.map (fun (x, y) -> property x y) properties)
+
+let float_property = fun name value ->
+  property name (string_of_float value)
+
+let dnd_source = fun (widget:GObj.widget) papget_xml ->
+  let dnd_targets = [ { Gtk.target = "STRING"; flags = []; info = 0} ] in
+  widget#drag#source_set dnd_targets ~modi:[`BUTTON1] ~actions:[`COPY];
+  let data_get = fun _ (sel:GObj.selection_context) ~info ~time ->
+    sel#return (Xml.to_string papget_xml) in
+  ignore (widget#drag#connect#data_get ~callback:data_get);
diff --git a/sw/lib/ocaml/papget_renderer.ml b/sw/lib/ocaml/papget_renderer.ml
new file mode 100644
index 0000000000..cc4099c170
--- /dev/null
+++ b/sw/lib/ocaml/papget_renderer.ml
@@ -0,0 +1,189 @@
+(*
+ * $Id$
+ *
+ * Paparazzi widget renderers
+ *  
+ * Copyright (C) 2008 ENAC
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ *
+ *)
+
+open Printf
+module PC = Papget_common
+let (//) = Filename.concat
+
+class type movable_item =
+    object
+      inherit GnoCanvas.base_item
+      method set : GnomeCanvas.group_p list -> unit
+    end
+
+class type t =
+  object
+    method tag : string
+    method edit : (GObj.widget -> unit) -> unit
+    method item : movable_item
+    method update : string -> unit
+    method config : unit -> Xml.xml list
+  end
+
+
+class canvas_text = fun ?(config=[]) canvas_group x y ->
+  let group = GnoCanvas.group ~x ~y canvas_group in
+  let text = GnoCanvas.text group in
+  object (self)
+    val mutable format = PC.get_prop "format" config "%.2f"
+    val mutable size = float_of_string (PC.get_prop "size" config "15.")
+    val mutable color = PC.get_prop "color" config "green"
+ 
+    method tag = "Text"
+    method item = (group :> movable_item)
+    method config = fun () ->
+      [ PC.property "format" format;
+	PC.float_property "size" size;
+	PC.property "color" color ]
+    method update = fun value ->
+      let renderer = fun x -> sprintf (Obj.magic format) (float_of_string x) in
+      text#set [`SIZE_POINTS size; `TEXT (renderer value); `FILL_COLOR color; `ANCHOR `NW]
+
+
+    method edit = fun (pack:GObj.widget -> unit) ->
+      let file = Env.paparazzi_src // "sw" // "lib" // "ocaml" // "widgets.glade" in
+      let text_editor = new Gtk_papget_text_editor.table_text_editor ~file () in
+      pack text_editor#table_text_editor#coerce;
+
+      (* Initialize the entries *)
+      text_editor#entry_format#set_text format;
+      text_editor#spinbutton_size#set_value size;
+      
+      (* Connect the entries *)
+      let callback = fun () ->
+	format <- text_editor#entry_format#text in
+      ignore (text_editor#entry_format#connect#activate ~callback);
+      let callback = fun () ->
+	size <- text_editor#spinbutton_size#value in
+      ignore (text_editor#spinbutton_size#connect#value_changed ~callback);
+  end
+
+
+(***************************Vertical Ruler ***********************************)
+let affine_pos_and_angle xw yw angle =
+  let cos_a = cos angle in
+  let sin_a = sin angle in
+  [| cos_a ; sin_a ; ~-. sin_a; cos_a; xw ; yw |]
+let affine_pos xw yw = affine_pos_and_angle xw yw 0.
+
+
+class canvas_ruler = fun ?(config=[]) canvas_group x y ->
+  let h = float_of_string (PC.get_prop "height" config "100.")
+  and index_on_right = bool_of_string (PC.get_prop "index_on_right" config "false")
+  and scale = float_of_string (PC.get_prop "scale" config "2.")
+  and w = float_of_string (PC.get_prop "width" config "32.")
+  and step = int_of_string (PC.get_prop "step" config "10") in
+  let text_props=[`ANCHOR `CENTER; `FILL_COLOR "white"]
+  and index_width = 10. in
+
+  let root = GnoCanvas.group ~x ~y canvas_group in
+  let r = GnoCanvas.group root in
+  
+  let props = (text_props@[`ANCHOR `EAST]) in
+  
+  (* One step drawer *)
+  let draw = fun i value ->
+    let i = i * step in
+    let y = -. scale *. (float i -. value) in
+    if y >= -. h && y <= h then begin
+      let text = Printf.sprintf "%d" i in
+      ignore (GnoCanvas.text ~text ~props ~y ~x:(w*.0.75) r);
+      ignore(GnoCanvas.line ~points:[|w*.0.8;y;w-.1.;y|] ~fill_color:"white" r)
+    end;
+    let y = y -. float step /. 2. *. scale in
+    if y >= -. h && y <= h then
+      ignore(GnoCanvas.line ~points:[|w*.0.8;y;w-.1.;y|] ~fill_color:"white" r)
+  in
+  
+  let drawer = fun value ->
+    (* Remove previous items *)
+    List.iter (fun i -> i#destroy ()) r#get_items;
+    let v = truncate value / step in
+    let k = truncate (h /. scale) / step in
+    for i = Pervasives.max 0 (v - k) to (v + k) do
+      draw i value
+    done in
+  
+  (** Yellow index *)
+  let _ = GnoCanvas.line ~points:[|0.;0.;w-.1.;0.|] ~fill_color:"yellow" root in
+  let s = index_width in
+  let idx = GnoCanvas.polygon ~points:[|0.;0.;-.s;s/.2.;-.s;-.s/.2.|] ~fill_color:"yellow" root in
+  let () = 
+    if index_on_right then
+      idx#affine_absolute (affine_pos_and_angle w 0. Latlong.pi) in
+  
+  object
+    method tag = "Ruler"
+    method edit = fun (pack:GObj.widget -> unit) -> ()
+    method update = fun value ->
+      let value = float_of_string value in
+      drawer value
+    method item = (root :> movable_item)
+    method config = fun () -> config (* Not editable *)
+  end
+
+(****************************************************************************)
+class canvas_button = fun ?(config=[]) canvas_group x y ->
+  let icon = PC.get_prop "icon" config "icon_file" in
+  let pixbuf = GdkPixbuf.from_file (Env.gcs_icons_path // icon) in
+  let group = GnoCanvas.group ~x ~y canvas_group in
+  let _item = GnoCanvas.pixbuf ~pixbuf group in
+  object
+    method tag = "Button"
+    method item = (group :> movable_item)
+    method edit = fun (pack:GObj.widget -> unit) -> ()
+    method update = fun (value:string) -> ()
+    method config = fun () ->
+      [ PC.property "icon" icon]
+  end
+
+
+(****************************************************************************)
+class widget_renderer = fun (tag:string) (widget:GObj.widget) ?(config=[]) canvas_group x y ->
+  let group = GnoCanvas.group ~x ~y canvas_group in
+  let item = GnoCanvas.widget ~width:50. ~height:50. ~widget group in
+  object
+    method tag = tag
+    method edit = fun (_:GObj.widget->unit) -> () 
+    method item = (item :> movable_item)
+    method update = fun (_:string) -> ()
+    method config = fun () -> (config : Xml.xml list)
+  end
+
+
+let renderers =
+  [ (new canvas_text :> ?config:Xml.xml list -> #GnoCanvas.group -> float -> float -> t);
+    (new canvas_ruler :> ?config:Xml.xml list -> #GnoCanvas.group -> float -> float -> t) ] 
+
+let lazy_tagged_renderers = lazy
+    (let x = 0. and y = 0.
+    and group = (GnoCanvas.canvas ())#root in
+    List.map
+      (fun constructor ->
+	let o = constructor ?config:None group x y in
+	(o#tag, constructor))
+      renderers)
+