4 files changed, 137 insertions, 14 deletions

diff --git a/README.xwidget b/README.xwidget
index 77b98d5fd83..65e5598f7f2 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -169,7 +169,12 @@ it is, except symbols is used instead of integers.
 
 
 *** TODO better lisp based structure for xwidgets
-something like this:
+the lisp interface woud be like this:
+- xwidget-create returns an xwidget object, similar to a process
+  object. this id is used when creating the display spec(instead of
+  the user defined id now used)
+
+the data structure would be something like this:
 - a "process" like aproach to create the xwidgets. xwidgets are
   coupled to buffers, somewhat like processes, except a buffer can
   hold several xwidgets
@@ -183,7 +188,11 @@ there are some things that arent clear:
   be better to store them window locally rather than in an assoc
   coupled to the xwidget model
 
-
+stuff that needs to work:
+- do something for all views of a xwidget(resize, value change)
+- do something for all xw-views in an emacs window(deletion etc)
+- lookup xw-view for xwidget in emacs window(during redisplay)
+(- do something for all siblings of a xw-view. not atm)
 
 ** TODO  more documentation
 There should be user docs, and xwidget contributor docs. The current README
@@ -228,5 +237,59 @@ Surprisingly, this just worked!
 I used gtk signals, the implementation for sliders works well!
 
 ** TODO canvas support
-goocanvas is a gtk canvas implemented with cairo. investigate.
+*** goocanvas
+goocanvas is a gtk canvas implemented using cairo. investigate.
 http://developer.gnome.org/goocanvas/unstable/goocanvas-model-view-canvas.html
+it has a MVC model aproach out of the box which is nice.
+
+
+export CFLAGS="`pkg-config --cflags goocanvas` -DHAVE_GOOCANVAS"
+export LDFLAGS=`pkg-config --libs goocanvas`
+./configure
+make
+
+I made a hello goo world xwidget so seems doable.
+I wanted to load a SVG which wasnt straightforward.
+*** clutter
+maybe clutter can be used as a canvas? seems to have a lot of traction atm.
+http://www.openismus.com/documents/clutter_tutorial/0.9/docs/tutorial/html/sec-stage-widget.html
+
+there is also cool stuff like this:
+http://gitorious.org/webkit-clutter/webkit-clutter which is an webkit actor for
+clutter! hmmmmm.
+
+I want to render svg. aparently:
+  librsvg rsvg_handle_render_cairo(h, cr);
+  ClutterCairoTexture
+  Clutter
+
+export CFLAGS="`pkg-config --cflags clutter-gtk-1.0` -DHAVE_CLUTTER"
+export LDFLAGS=`pkg-config --libs clutter-gtk-1.0`
+./configure
+make
+
+compiles but I get:
+Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in
+the same process is not supported
+
+export CFLAGS="`pkg-config --cflags clutter-gtk-0.10` -DHAVE_CLUTTER"
+export LDFLAGS=`pkg-config --libs clutter-gtk-0.10`
+./configure
+make
+
+
+** TODO mvc code crashes after a while
+seemingly only when compiling with optimizations
+
+** TODO delete xwidgets belonging to an emacs window
+when it closes
+** TODO xwidget-resize-at
+currently it rewrites the display spec. then it resizes the xwidget
+views. maybe rewriting the spec should be sufficient, and changes to
+it be picked up during redisplay somehow.
+
+** TODO display spec validation
+it is an error to reuse xwidgets in several buffers or in the same
+buffer. how do we catch these errors?
+
+
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index b9291c66853..2c73f4fd3ce 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -52,6 +52,11 @@
               (xwidget-insert (point-min)  'slider "slider" 500  100  5)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
+(xwidget-demo "a-canvas" 
+              (xwidget-insert (point-min)  'cairo "canvas" 1000  1000  5)
+              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
+
+
 
 (xwidget-demo "basic"
   (xwidget-insert (point-min)  'button "button" 40  50  1)
diff --git a/src/xterm.c b/src/xterm.c
index ea03c04ce50..9bdbc1f7d34 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9911,7 +9911,11 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
            https://bugzilla.gnome.org/show_bug.cgi?id=563627.  */
         id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
                                   | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
+#ifdef HAVE_CLUTTER
+        gtk_clutter_init (&argc, &argv2);
+#else        
         gtk_init (&argc, &argv2);
+#endif        
         g_log_remove_handler ("GLib", id);
 
         /* gtk_init does set_locale.  We must fix locale after calling it.  */
diff --git a/src/xwidget.c b/src/xwidget.c
index 427004029d4..870054469c0 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -72,6 +72,17 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
+#include <librsvg/rsvg.h>
+
+#ifdef HAVE_GOOCANVAS
+#include <goocanvas.h>
+#endif
+
+#ifdef HAVE_CLUTTER
+#include <clutter/clutter.h>
+#include <clutter-gtk/clutter-gtk.h>
+#endif
+
 #include "xwidget.h"
 
 //TODO should of course not be a hardcoded array but I can't be bothered atm
@@ -209,8 +220,8 @@ void xwidget_slider_changed (GtkRange *range,
   //correspondingly. but remember that changing value will again
   //trigger signal
 
-  //TODO view storage wont be an array futureish so the loop needs to change eventually
-  //TODO it would be nice if this code could be reusable but, alas, C is not a functional language
+  //TODO MVC view storage wont be an array futureish so the loop needs to change eventually
+  //TODO MVC it would be nice if this code could be reusable but, alas, C is not a functional language
   //issues are:
   // - the type of the controllers value (double, boolean etc)
   // - the getter and setter (but they can be func pointers)
@@ -245,7 +256,7 @@ int xwidget_view_index=0;
 /* initializes and does initial placement of an xwidget view on screen */
 struct xwidget_view*
 xwidget_init_view ( 
-                     struct xwidget *xww,
+                   struct xwidget *xww,
                    struct glyph_string *s,
                    int x, int y)
 {
@@ -282,6 +293,52 @@ xwidget_init_view (
       //Cairo view
       //uhm cairo is differentish in gtk 3. 
       //gdk_cairo_create (gtk_widget_get_window (f->gwfixed));
+#ifdef HAVE_GOOCANVAS
+    xv->widget = goo_canvas_new();
+    GooCanvasItem *root, *rect_item, *text_item;
+    goo_canvas_set_bounds (GOO_CANVAS (xv->widget), 0, 0, 1000, 1000);
+     root = goo_canvas_get_root_item (GOO_CANVAS (xv->widget));
+      rect_item = goo_canvas_rect_new (root, 100, 100, 400, 400,
+                                   "line-width", 10.0,
+                                   "radius-x", 20.0,
+                                   "radius-y", 10.0,
+                                   "stroke-color", "yellow",
+                                   "fill-color", "red",
+                                   NULL);
+
+  text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
+                                   GTK_ANCHOR_CENTER,
+                                   "font", "Sans 24",
+                                   NULL);
+  goo_canvas_item_rotate (text_item, 45, 300, 300);
+  
+#endif
+#ifdef HAVE_CLUTTER
+        xv->widget = gtk_clutter_embed_new ();;
+        ClutterActor *stage = NULL;
+        stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (        xv->widget));
+        ClutterColor stage_color = { 0xaa, 0xaa, 0xaa, 0xff }; /* Black */
+        clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+
+        ClutterActor *  texture =  clutter_cairo_texture_new (1000, 1000);
+        clutter_container_add_actor(stage, texture);
+        clutter_actor_set_position(texture, 0,0);
+        clutter_actor_show(texture);
+
+        cairo_t *cr;
+        cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (texture));
+
+        /* draw on the context */
+        RsvgHandle *h =  rsvg_handle_new_from_file  ("/tmp/tst.svg",
+                                                     NULL);
+        
+        rsvg_handle_render_cairo(h, cr);
+        cairo_destroy (cr);
+          
+        /* Show the stage: */
+        clutter_actor_show (stage);        
+#endif        
+        
   } else return NULL;
   
   //widget realization
@@ -468,7 +525,7 @@ DEFUN ("xwidget-embed-steal-window", Fxwidget_embed_steal_window, Sxwidget_embed
 
 
 DEFUN ("xwidget-resize-internal", Fxwidget_resize_internal, Sxwidget_resize_internal, 3, 3, 0, doc:
-       /* resize xwidgets */)
+       /* resize xwidgets internal use only, because the lisp specs need to be updated also*/)
   (Lisp_Object xwidget_id, Lisp_Object new_width, Lisp_Object new_height)
 {
   struct xwidget *xw;
@@ -486,12 +543,6 @@ DEFUN ("xwidget-resize-internal", Fxwidget_resize_internal, Sxwidget_resize_inte
   printf("resize xwidget %d (%d,%d)->(%d,%d)",xid,xw->width,xw->height,w,h);
   xw->width=w;
   xw->height=h;
-  /*
-    //this will be more complex, need to iterate all views and resize each. tedious TODO MVC
-  gtk_layout_set_size (GTK_LAYOUT (xw->widgetwindow), xw->width, xw->height);
-  gtk_widget_set_size_request (GTK_WIDGET (xw->widget), xw->width,
-                               xw->height);
-  */
   for (int i = 0; i < MAX_XWIDGETS; i++) //TODO MVC refactor lazy linear search
     {
       xv = &xwidget_views[i];
@@ -538,7 +589,7 @@ DEFUN ("xwidget-set-keyboard-grab", Fxwidget_set_keyboard_grab, Sxwidget_set_key
   xid = XFASTINT (xwidget_id);
   kbd_flag = XFASTINT (kbd_grab);
   xw = &xwidgets[xid];
-  if(xw->type != 3) return Qnil; //only relevant for xembed 
+  if(xw->type != 3) return Qnil; //only relevant for xembed  //TODO MVC
   
   printf ("kbd grab: %d %d\n", xid, kbd_flag);
   if (kbd_flag)