docs and webkit usability

2 files changed, 47 insertions, 1 deletions

diff --git a/README.xwidget b/README.xwidget
index 0a5f7ac09b0..783e9605ad5 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -24,6 +24,7 @@ The xwidget code attempts to keep the visual appearance of the views
 in sync with through an Observer pattern implementation.
 
 ** building
+bzr co bzr+ssh://jave@bzr.savannah.gnu.org/emacs/xwidget/
 export CFLAGS=" -g -DGLYPH_DEBUG=1"
 #export CFLAGS="-g"
 ./configure   --with-x-toolkit=gtk3 --with-xwidgets
@@ -139,6 +140,22 @@ this is aproach worked so-so.
 ;; make   all&&  src/emacs -q --eval "(progn (load \"`pwd`/lisp/xwidget-test.el\") (xwidget-demo-basic))"
 
 * ToDo:s
+** TODO webkit flashkiller by default
+while its possible to support plugins in the webkit xwidget, flash has
+issues on 64 bit, and slows down emacs to a halt with off screen
+rendering, and of course is not free software. its in the way for real
+world usage even if its interesting to watch flash animations inside
+emacs. which should be achieved with Gnash or other free software
+instead.
+
+http://stackoverflow.com/questions/4885513/prevent-flash-in-cocoa-webview
+
+simply use this api:
+http://webkitgtk.org/reference/WebKitWebPluginDatabase.html
+
+** TODO allow xwidgets to report thoir size
+now we just hard code sizes. but webkit widgets for instance can
+report sizes that suit the content. support that.
 ** TODO BUG xwidget view ghosts
 - xwidget-webkit-browse-url somewhere
 - split window.
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 967577a4e98..436e7b614a4 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -62,7 +62,16 @@ defaults to the string looking like a url around the cursor position."
 ;;todo.
 ;; - support browse-url with xwidget-webkit
 ;; - check that the webkit support is compiled in
-(define-derived-mode xwidget-webkit-mode view-mode "xwidget-webkit" "xwidget webkit view mode" )
+(define-derived-mode xwidget-webkit-mode
+  special-mode "xwidget-webkit" "xwidget webkit view mode"
+    (setq buffer-read-only t))
+(defvar xwidget-webkit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "g" 'xwidget-webkit-browse-url)
+    (define-key map "a" 'xwidget-webkit-adjust-size-to-content)
+    (define-key map "\C-m" 'xwidget-webkit-insert-string)
+    map)
+  "Keymap for `xwidget-webkit-mode'.")
 
 (defvar xwidget-webkit-last-session-buffer nil)
 
@@ -73,6 +82,23 @@ defaults to the string looking like a url around the cursor position."
         (xwidget-at 1))
     nil))
 
+(defun xwidget-adjust-size-to-content (xw)
+  ;;xwidgets doesnt support widgets that have thoir own opinions about size well yet
+  ;;this reads the size and sets it back
+  (let ((size (xwidget-size-request xw)))
+    (xwidget-resize xw (car size) (cadr size)))
+  )
+
+(defun xwidget-webkit-insert-string (xw str)
+  (interactive (list (xwidget-webkit-last-session)
+                     (read-string "string:")))
+  (xwidget-webkit-execute-script xw (format "document.activeElement.value='%s'" str)))
+
+(defun xwidget-webkit-adjust-size-to-content ()
+  (interactive)
+  ( xwidget-adjust-size-to-content ( xwidget-webkit-last-session))
+  )
+
 (defun xwidget-webkit-new-session (url)
 
   (let*
@@ -106,4 +132,7 @@ defaults to the string looking like a url around the cursor position."
   (redraw-display);;redraw display otherwise ghost of zombies  will remain to haunt the screen
   )
 
+;;this is a workaround because I cant find the right place to put it in C
+(add-hook 'window-configuration-change-hook 'xwidget-cleanup)
+
 (provide 'xwidget)