cleanups. tentative webkit lisp interface, but i got annoyed now with the primitives.

3 files changed, 71 insertions, 22 deletions

diff --git a/README.xwidget b/README.xwidget
index 068ffa01bed..a47f57a4d04 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -144,9 +144,11 @@ this is aproach worked so-so.
   the attempt was further worked on, and the xlib calls replaced with
   gdk calls, this works better.
 
-** TODO  make the keyboard event code propagation code work. There is an attempt 
-to provide an api to send keyboard events to an xwidget, but it doesnt currently
-work very well.
+** TODO  make the keyboard event code propagation code work. 
+There is an attempt to provide an api to send keyboard events to an
+xwidget, but it doesnt currently work very well.
+
+try gtk event creation instead since that works fine in the webkit osr code.
 
 ** DONE remove the special-case for when the minibuffer is
   active.  I added some code to reduce the annoying problem display artefacts
@@ -159,19 +161,20 @@ work very well.
 ** DONE disable emacs cursor drawing on top of an active xwidget. 
   This ought to be rather simple and should improve the visuals a lot.
 
-** TODO  improve the xwidgets programming interface so its less of
-  hand-waving affair. This shouldnt be too hard, but I have deliberatley not
-spent any time on it, since getting the visuals right is much
-harder. Anyway, I sort of think the interface should be somewhat like
-it is, except symbols is used instead of integers.
+** TODO  improve the xwidgets programming interface 
+so its less of hand-waving affair. This shouldnt be too hard, but I
+  have deliberatley not spent any time on it, since getting the
+  visuals right is much harder. Anyway, I sort of think the interface
+  should be somewhat like it is, except symbols is used instead of
+  integers.
 *** DONE use symbols for xwidget types rather than ints
     CLOSED: [2011-06-27 Mon 12:52]
 
 
 *** TODO better lisp based structure for xwidgets
 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
+- make-xwidget returns an xwidget object, similar to a process
+  object. this object is used when creating the display spec(instead of
   the user defined id now used)
 
 the data structure would be something like this:
@@ -245,6 +248,14 @@ generates an event if I cant set the id beforehand?
 so, therefore, the first two aproach is used. 
 
 
+*** TODO xwidget creation interface actually
+conclusion of above ramblings:
+- should be similar to make-text-button
+- don't init from display spec, instead during make-xwidget call
+*** TODO callbacks would be nice 
+but they need to be handled initially with events for technical
+reasons. C code can't call Lisp easily. The event handler can call the
+callback though.
 
 ** TODO  more documentation
 There should be user docs, and xwidget contributor docs. The current README
@@ -349,15 +360,14 @@ export LDFLAGS=`pkg-config --libs clutter-gtk-0.10`
 make
 
 
-** TODO mvc code crashes after a while
+** DONE mvc code crashes after a while
+   CLOSED: [2011-07-12 Tue 18:52]
 seemingly only when compiling with optimizations.
 I have no idea why.
 
+Doesn't seem to happen after some code cleanups.
 ** 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.
-
+reimplement so display special is not involved
 ** 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?
@@ -657,7 +667,8 @@ parts of emacs must be very clean.
 *** TODO use FRAME_GTK_WIDGET (f)
 rather than gwfixed.
 
-*** TODO support configure
+*** DONE support configure
+    CLOSED: [2011-07-12 Tue 18:48]
 ** DONE translate clicks 
    CLOSED: [2011-07-03 Sun 22:12]
 on onscreen webkit peer to offscreen
@@ -665,7 +676,7 @@ 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
+turned out to be not so hard, captured events, copied them and
 forwarded them offscreen!
 
 ** TODO investigate gdk_window_redirect_to_drawable
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 71dcc15df69..6fbf10556bd 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -3,15 +3,13 @@
 
 (require 'xwidget-internal)
 
-
+;;TODO model after make-text-button instead!
 (defun xwidget-insert (pos type title width height  &optional id)
  "Insert an xwidget at POS, given ID, TYPE, TITLE WIDTH and HEIGHT.
 Return ID
 ID will be made optional, but it isnt implemented yet!
 
-currently interface is lame:
- :type 1=button, 2=toggle btn, 3=xembed socket(id will be printed to stdout)
- obviously these should be symbols
+see xwidget.c for types suitable for TYPE.
 
  :xwidget-id 1, MUST be unique and < 100 !
  if slightly wrong, emacs WILL CRASH
@@ -40,7 +38,7 @@ hand-wave issues like these until the hard parts are solved.
 
 
 (defun xwidget-socket-handler ()
-  "creates plug for socket."
+  "creates plug for socket. TODO"
   (interactive)
   (message "socket handler xwidget %S" last-input-event)
   (let*
@@ -62,6 +60,43 @@ hand-wave issues like these until the hard parts are solved.
             ))))
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; webkit support
+
+;;;###autoload
+(defun xwidget-webkit-browse-url (url &optional new-session)
+  "Ask xwidget-webkit to browse URL.
+NEW-SESSION specifies whether to create a new xwidget-webkit session.  URL
+defaults to the string looking like a url around the cursor position."
+  (interactive (progn
+                 (require 'browse-url)
+                 (browse-url-interactive-arg "xwidget-webkit URL: ")))
+  (when (stringp url)
+    (if new-session
+        (xwidget-webkit-new-session url)
+      (xwidget-webkit-goto-url url))))
+
+
+;;todo.
+;; - support browse-url with xwidget-webkit
+;; - check that the webkit support is compiled in
+(define-derived-mode xwidget-webkit-mode special-mode "xwidget-webkit" "xwidget webkit special mode" )
+(defun xwidget-webkit-new-session (url)
+  (save-excursion
+    (let*
+        ((bufname (generate-new-buffer-name "*xwidget-webkit*"))
+         (xwid 1))
+      (set-buffer (get-buffer-create bufname))
+      (insert " ")
+      (xwidget-insert 1 'webkit-osr  bufname 1000 1000 xwid)
+      (xwidget-webkit-mode)
+      (xwidget-webkit-goto-uri xwid url ))
+    )
+
+  )
+
+(defun xwidget-webkit-goto-url (url))
+
 
 ;; use declare here?
 ;; (declare-function xwidget-resize-internal "xwidget.c" )
diff --git a/src/xwidget.c b/src/xwidget.c
index ef9de279939..e82864e2220 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -986,6 +986,9 @@ lookup_xwidget (Lisp_Object  spec)
   /* When a xwidget lisp spec is found initialize the C struct that is used in the C code.
      This is done by redisplay so values change if the spec changes.
      So, take special care of one-shot events
+
+     TODO remove xwidget init from display spec. simply store an xwidget reference only and set
+     size etc when creating the xwidget, which should happen before insertion into buffer 
   */
   int found = 0, found1 = 0, found2 = 0;
   Lisp_Object value;