inject javascript in embeddeb webkit instance

2 files changed, 63 insertions, 12 deletions

diff --git a/README.xwidget b/README.xwidget
index 59ddf9d2435..bc01ad95d66 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -317,7 +317,8 @@ although embedding a browser is not my primary concern many are
 interested in this. some suitable browser component needs to be found
 supporting gtk.
 
-*** webkit
+*** DONE webkit
+    CLOSED: [2011-07-03 Sun 22:13]
 there is a webkit gtk port. there is no obvious mvc support.
 http://live.gnome.org/WebKitGtk
 http://webkitgtk.org/
@@ -370,7 +371,8 @@ idea is that whatever oddness webkit does so that offscreen rendering
 doesnt work, doesnt happen on-screen. the window could be opened
 somewhere not in the way.
 
-*** firefox
+*** CANCELLED firefox
+    CLOSED: [2011-07-03 Sun 22:13]
 http://www-archive.mozilla.org/unix/gtk-embedding.html
 seems to be severly bitrotted
 
@@ -379,7 +381,33 @@ http://hg.mozilla.org/incubator/embedding/file/29ac0fe51754/gtk/tests/test.cpp
 
 while webkit clearly has the best traction as an embeddee, the
 offscreen rendering issues makes it interesting to see what ff brings
-to the table.
+to the table. turns out webkit has as good offscreen support as anyone.
+
+
+*** TODO text field support
+Emacs captures all keyboard events so text field support isn't super
+straightforward. 
+
+**** propagate keyboard events
+I have some old hacks for this and they are not good.
+**** use the DOM model
+expose document.activeElement to lisp. This is potentially more
+interesting than just forwarding keyboard events.
+
+webkit_web_view_get_dom_document ()
+
+**** DONE inject javascript
+     CLOSED: [2011-07-03 Sun 22:50]
+webkit_web_view_execute_script ()
+
+this works now:
+(xwidget-webkit-execute-script 5 "document.activeElement.value='test'")
+
+so it should be possible to do some interesting stuff.
+execute-script does however not return anything at the interface level
+so satisfaction is not total.
+
+http://markmail.org/message/4yowmdgras73z3x5
 
 
 ** TODO clipping of controllers
@@ -479,13 +507,18 @@ the needed data is private to the base class. to overcome this:
 ** TODO use FRAME_GTK_WIDGET (f)
 rather than gwfixed
 
-** TODO translate clicks 
+** DONE translate clicks 
+   CLOSED: [2011-07-03 Sun 22:12]
 on onscreen webkit peer to offscreen
 
 maybe
 http://developer.gnome.org/gdk/stable/gdk-Windows.html#GdkWindow-from-embedder
 
+turned out tell be not so hard, captured events, copied them and
+forwarded them offscreen!
 
 ** TODO investigate gdk_window_redirect_to_drawable
 http://developer.gnome.org/gdk/stable/gdk-Windows.html#gdk-offscreen-window-set-embedder
 maybe control be used in place of my own copy hacks?
+
+
diff --git a/src/xwidget.c b/src/xwidget.c
index a47d6c12dbc..c4e4f2c5ba2 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -540,26 +540,21 @@ xwidget_init_view (
   } else if (EQ(xww->type, Qwebkit_osr)) {
 #ifdef HAVE_WEBKIT_OSR
     xv->widget = gtk_drawing_area_new();
-    gtk_widget_set_app_paintable (    xv->widget, TRUE); //because expose event handling
+    gtk_widget_set_app_paintable ( xv->widget, TRUE); //because expose event handling
 #endif        
 #ifdef HAVE_GTK3 //and webkit_osr
     gtk_widget_add_events(xv->widget,
                           GDK_BUTTON_PRESS_MASK
                           | GDK_BUTTON_RELEASE_MASK
-                          | GDK_POINTER_MOTION_MASK
-                          );
-
+                          | GDK_POINTER_MOTION_MASK);
     g_signal_connect (G_OBJECT (    xv->widget), "draw",                    
                       G_CALLBACK (xwidget_osr_draw_callback), NULL);
-
     g_signal_connect (G_OBJECT (    xv->widget), "button-press-event",                    
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
     g_signal_connect (G_OBJECT (    xv->widget), "button-release-event",                    
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
     g_signal_connect (G_OBJECT (    xv->widget), "motion-notify-event",                    
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
-
-    
 #else
     g_signal_connect (G_OBJECT (    xv->widget), "expose_event",                    
                       G_CALLBACK (webkit_osr_expose_event_callback), NULL);                  
@@ -774,6 +769,27 @@ DEFUN ("xwidget-webkit-goto-uri", Fxwidget_webkit_goto_uri,  Sxwidget_webkit_got
     
   webkit_web_view_load_uri(xw->widget_osr, SDATA(uri));
 }
+
+DEFUN ("xwidget-webkit-execute-script", Fxwidget_webkit_execute_script,  Sxwidget_webkit_execute_script, 2, 2, 0,
+       doc:     /* webkit exec js.*/
+       )
+  (Lisp_Object xwidget_id, Lisp_Object script)
+{
+
+  //TODO refactor this crap to something sane
+  struct xwidget *xw;
+  int xid;
+
+  CHECK_NUMBER (xwidget_id);
+  xid = XFASTINT (xwidget_id);
+  xw = &xwidgets[xid];
+
+  //TODO check xw actually is of the correct type before trying stuff with it
+    
+  webkit_web_view_execute_script(xw->widget_osr, SDATA(script));
+  return Qnil;
+}
+
 #endif        
 
 
@@ -868,7 +884,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  //TODO MVC
+
   
   printf ("kbd grab: %d %d\n", xid, kbd_flag);
   if (kbd_flag)
@@ -991,7 +1007,9 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_info);
   defsubr (&Sxwidget_resize_internal);
   defsubr (&Sxwidget_embed_steal_window);
+
   defsubr (&Sxwidget_webkit_goto_uri);
+  defsubr (&Sxwidget_webkit_execute_script);
   
   DEFSYM (Qxwidget ,"xwidget");