4 files changed, 94 insertions, 3 deletions

diff --git a/README.xwidget b/README.xwidget
index 6a6633b4b20..4477f53051c 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -187,6 +187,10 @@ there are some things that arent clear:
 - xwidget-views are by necessity coupled to a emacs window so it might
   be better to store them window locally rather than in an assoc
   coupled to the xwidget model
+- for some gtk widgets that resist an mvc approach, like the webkit
+  widgets, special operations are needed, similar to the old phantom
+  widgets aproach. so we need to differentiate live and phantom
+  instances for these troublesome widgets and let lisp manage all the trickery.
 
 stuff that needs to work:
 - do something for all views of a xwidget(resize, value change)
@@ -318,12 +322,24 @@ there is a webkit gtk port. there is no obvious mvc support.
 http://live.gnome.org/WebKitGtk
 http://webkitgtk.org/
 
+it might be possible to keep a set of webxits in artificial
+synchronisation by recursive deep copy of the DOM from one webkit to
+another. This will be error prone at best though. Another way might be
+to just use bitmap copy of the "live"instance to the "phantom"
+instances. the problem of transfering the live view remains though.
 
 export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT -g"
 export LDFLAGS=`pkg-config --libs webkit-1.0`
 ./configure
 make
 
+export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT_OSR -g"
+export LDFLAGS=`pkg-config --libs webkit-1.0`
+./configure
+make
+
+
+
 *** firefox
 http://www-archive.mozilla.org/unix/gtk-embedding.html
 seems to be severly bitrotted
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index 2e1cb033d8d..46caf749fa1 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -60,6 +60,10 @@
               (xwidget-insert (point-min)  'webkit "webkit" 1000  1000  5)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
+(xwidget-demo "a-webkit-osr" 
+              (xwidget-insert (point-min)  'webkit-osr "webkit-osr" 1000  1000  5)
+              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
+
 
 
 (xwidget-demo "basic"
diff --git a/src/xwidget.c b/src/xwidget.c
index 14110af7fce..627bd70e150 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -105,7 +105,8 @@ Lisp_Object Qxwidget_info;
 Lisp_Object Qxwidget_resize_internal;
 Lisp_Object Qxwidget_send_keyboard_event;
 
-Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, Qwebkit, QCplist;
+Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, Qwebkit,
+  Qwebkit_osr, QCplist;
 
 
 extern Lisp_Object  QCtype;   
@@ -251,6 +252,38 @@ void xwidget_slider_changed (GtkRange *range,
 
 }
 
+/* when the on-screen webkit peer view gets exposed this signal is called.
+   it copies the bitmap from the off-screen webkit instance */
+webkit_osr_expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) 
+ {                                                                               
+  struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);  
+  cairo_t *cr;
+  GdkPixmap *src_pixmap;
+  src_pixmap = xw->widget_osr->window;
+  printf("xwidget_composite_draw_widgetwindow xw.id:%d xw.type:%d window:%d\n", xw->id,xw->type, gtk_widget_get_window (widget));
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+  cairo_rectangle(cr, 0,0, xw->width, xw->height);
+  cairo_clip(cr);
+
+  /*
+  cairo_set_source_rgb(cr, 0.1, 1.0, 0.2);
+  cairo_rectangle(cr, 0,0, xw->width, xw->height);
+  cairo_fill(cr);
+  */
+  
+  gdk_cairo_set_source_pixmap (cr, src_pixmap,
+                               0,0);
+  
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  //cairo_paint_with_alpha (cr, 0.9);
+  cairo_paint(cr);
+  cairo_destroy (cr);
+  
+  return FALSE;
+ }                                                                               
+
 int xwidget_view_index=0;
 
 /* initializes and does initial placement of an xwidget view on screen */
@@ -344,6 +377,13 @@ xwidget_init_view (
         xv->widget = webkit_web_view_new();
         webkit_web_view_load_uri(xv->widget, "http://www.fsf.org"); 
 #endif        
+  } else if (EQ(xww->type, Qwebkit_osr)) {
+#ifdef HAVE_WEBKIT_OSR
+    xv->widget = gtk_drawing_area_new();
+    g_signal_connect (G_OBJECT (    xv->widget), "expose_event",                    
+                      G_CALLBACK (webkit_osr_expose_event_callback), NULL);                  
+
+#endif        
 
 
   } else return NULL;
@@ -503,6 +543,19 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
     }
 }
 
+#ifdef HAVE_WEBKIT
+DEFUN ("xwidget-webkit-goto-uri", Fxwidget_webkit_goto_uri,  Sxwidget_webkit_goto_uri, 2, 2, 0,
+       doc:     /* webkit goto uri.*/
+       )
+  (Lisp_Object xwidget_id, Lisp_Object uri)
+{
+/* now we have the same issue as always except worse. webkit resists an MVC approach!
+   for now, the 1st webkit view will be manipulated only
+ */
+  
+//webkit_web_view_load_uri(xv->widget, "http://www.fsf.org");
+}
+#endif        
 
 
 
@@ -721,6 +774,7 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_embed_steal_window);
 
   DEFSYM (Qxwidget ,"xwidget");
+
   DEFSYM (Qxwidget_id ,":xwidget-id");
   DEFSYM (Qtitle ,":title");
 
@@ -730,7 +784,7 @@ syms_of_xwidget (void)
   DEFSYM (Qsocket, "socket");
   DEFSYM (Qcairo, "cairo");
   DEFSYM (Qwebkit ,"webkit");
-    
+  DEFSYM (Qwebkit_osr ,"webkit-osr");    
   DEFSYM (QCplist, ":plist");  
 
   Fprovide (intern ("xwidget-internal"), Qnil);
@@ -836,7 +890,7 @@ int
 lookup_xwidget (Lisp_Object  spec)
 {
   /*when a xwidget lisp spec is found initialize the C struct that is used in the C code.
-
+    xwidget_init
    */
   int found = 0, found1 = 0, found2 = 0;
   Lisp_Object value;
@@ -866,6 +920,17 @@ lookup_xwidget (Lisp_Object  spec)
 
   assert_valid_xwidget_id (id, "lookup_xwidget");
 
+#ifdef HAVE_WEBKIT_OSR
+  //diy mvc. widget is rendered offscreen, later blitted onscreen
+  if (EQ(xw->type, Qwebkit_osr)){
+    xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ());
+    xw->widget_osr = webkit_web_view_new();
+    gtk_container_add (xw->widgetwindow_osr, xw->widget_osr);
+    gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr));
+    webkit_web_view_load_uri(xw->widget_osr, "http://www.fsf.org");
+
+  }
+#endif          
   return id;
 }
 
diff --git a/src/xwidget.h b/src/xwidget.h
index 3a7d92f70a7..d54d4e649d8 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -24,6 +24,12 @@ struct xwidget{
   int height;
   int width;
   int initialized;
+
+
+  //for offscreen widgets, unused if not osr
+  GtkWidget* widget_osr;
+  GtkContainer* widgetwindow_osr;
+
 };