example webkit signal handler for document-loaded. upstream has changed display code so there are some visual glitches. i dont think xwidget code is to blame.

2 files changed, 47 insertions, 6 deletions

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index be251fa3401..3a9a58a5173 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -74,15 +74,24 @@ defaults to the string looking like a url around the cursor position."
     (define-key map "b" 'xwidget-webkit-back )
     (define-key map "r" 'xwidget-webkit-reload )    
     (define-key map "\C-m" 'xwidget-webkit-insert-string)
+    (define-key map [xwidget-event] 'xwidget-webkit-event-handler)
     map)
   
   "Keymap for `xwidget-webkit-mode'.")
 
+(defun xwidget-webkit-event-handler ()
+  (interactive)
+  (message "stuff happened to webkit xwidget %S" last-input-event)
+  (let*
+      ((xwidget-event-type (nth 2 last-input-event))
+       (xwidget (nth 1 last-input-event)))
+    (cond ( (eq xwidget-event-type 'document-load-finished)
+            (message "webkit loaded %s" xwidget))
+          )))
 
-
-(define-derived-mode xwidget-webkit-mode
-  special-mode "xwidget-webkit" "xwidget webkit view mode"
-    (setq buffer-read-only t))
+    (define-derived-mode xwidget-webkit-mode
+      special-mode "xwidget-webkit" "xwidget webkit view mode"
+      (setq buffer-read-only t))))
 
 (defvar xwidget-webkit-last-session-buffer nil)
 
@@ -174,7 +183,7 @@ defaults to the string looking like a url around the cursor position."
 ;;this is a workaround because I cant find the right place to put it in C
 (add-hook 'window-configuration-change-hook 'xwidget-cleanup)
 
-(defvar xwidget-webkit-kill-flash-oneshot nil)
+(defvar xwidget-webkit-kill-flash-oneshot t)
 (defun xwidget-webkit-kill-flash ()
   ;;you can only call this once or webkit crashes and takes emacs with it. odd.
   (unless xwidget-webkit-kill-flash-oneshot
diff --git a/src/xwidget.c b/src/xwidget.c
index c8e025db579..c2dc1ac8cf8 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -142,6 +142,9 @@ extern Lisp_Object QCwidth, QCheight;
 struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *w);
 Lisp_Object xwidget_spec_value ( Lisp_Object spec, Lisp_Object  key,  int *found);
 gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) ;
+void     webkit_osr_document_load_finished_callback (WebKitWebView  *webkitwebview,
+                                                     WebKitWebFrame *arg1,
+                                                     gpointer        user_data);
 
 DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
          doc: /* xw */
@@ -191,7 +194,12 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
     /* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. */
     g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw));
     g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw));
-    g_signal_connect (G_OBJECT (    xw->widgetwindow_osr), "damage-event",    G_CALLBACK (webkit_osr_damage_event_callback), NULL);
+    /* signals */
+    g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event",    G_CALLBACK (webkit_osr_damage_event_callback), NULL);
+    g_signal_connect (G_OBJECT ( xw->widget_osr),
+                      "document-load-finished",
+                      G_CALLBACK (webkit_osr_document_load_finished_callback),
+                      xw);    
 
     webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org");
     UNBLOCK_INPUT;
@@ -379,6 +387,30 @@ gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *ev
 }
 
 
+void     webkit_osr_document_load_finished_callback (WebKitWebView  *webkitwebview,
+                                                     WebKitWebFrame *arg1,
+                                                     gpointer        data)
+{
+  //TODO this event sending code should be refactored
+  struct input_event event;
+  //  struct xwidget *xw = (struct xwidget *) data;
+  struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webkitwebview), XG_XWIDGET);  
+  printf("webkit finished loading\n");
+
+  EVENT_INIT (event);
+  event.kind = XWIDGET_EVENT;
+  event.frame_or_window = Qnil; //frame; //how to get the frame here? //TODO i store it in the xwidget now
+
+  event.arg = Qnil;
+  //event.arg = Fcons (make_number (xembedid), event.arg);
+  event.arg = Fcons (xw, event.arg); //TODO
+  event.arg = Fcons (intern ("document-load-finished"), event.arg);
+
+
+  kbd_buffer_store_event (&event);
+
+}
+
 //for gtk3 webkit_osr
 gboolean
 xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)