support for disabling plugins(flash is undesirable) in webkit

3 files changed, 52 insertions, 18 deletions

diff --git a/README.xwidget b/README.xwidget
index 783e9605ad5..1ff79d958d6 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -24,7 +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/
+bzr co bzr+ssh://bzr.savannah.gnu.org/emacs/xwidget/
 export CFLAGS=" -g -DGLYPH_DEBUG=1"
 #export CFLAGS="-g"
 ./configure   --with-x-toolkit=gtk3 --with-xwidgets
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index b389265692e..93dafea7df9 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -12,12 +12,17 @@ see xwidget.c for types suitable for TYPE.
 "
   (goto-char pos)
   (let ((id (make-xwidget (point) (point)  type  title  width  height nil)))
-    (put-text-property (point) (+ 1 (point)) 'display (list 'xwidget ':xwidget id))
+    (put-text-property (point)
+                       (+ 1 (point)) 'display (list 'xwidget ':xwidget id))
+    
     id))
 
+
 (defun xwidget-at (pos)
-  (car (cdr (cdr  (get-text-property pos 'display)))
-))
+  (car (cdr (cdr  (get-text-property pos 'display)))))
+
+
+
          
 (defun xwidget-socket-handler ()
   "creates plug for socket. TODO"
@@ -37,9 +42,9 @@ see xwidget.c for types suitable for TYPE.
               ;;   (start-process "xembed" "*xembed*" (format "%ssrc/emacs" default-directory) "-q" "--parent-id" (number-to-string xembed-id) ) )
               ;;  ((eq 5 xwidget-id)
               ;;   (start-process "xembed2" "*xembed2*" "uzbl-core"  "-s" (number-to-string xembed-id)  "http://www.fsf.org" )  )
-               
-              )
-            ))))
+              )))))
+
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -59,20 +64,25 @@ defaults to the string looking like a url around the cursor position."
       (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 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'.")
 
+
+
+(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)
 
 (defun  xwidget-webkit-last-session ()
@@ -86,8 +96,8 @@ defaults to the string looking like a url around the cursor position."
   ;;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)))
-  )
+    (xwidget-resize xw (car size) (cadr size))))
+
 
 (defun xwidget-webkit-insert-string (xw str)
   (interactive (list (xwidget-webkit-last-session)
@@ -96,8 +106,8 @@ defaults to the string looking like a url around the cursor position."
 
 (defun xwidget-webkit-adjust-size-to-content ()
   (interactive)
-  ( xwidget-adjust-size-to-content ( xwidget-webkit-last-session))
-  )
+  ( xwidget-adjust-size-to-content ( xwidget-webkit-last-session)))
+
 
 (defun xwidget-webkit-new-session (url)
 
@@ -108,10 +118,8 @@ defaults to the string looking like a url around the cursor position."
     (insert " ")
     (xwidget-insert 1 'webkit-osr  bufname 1000 1000)
     (xwidget-webkit-mode)
-    (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url ))
-    
+    (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url )))
 
-  )
 
 (defun xwidget-webkit-goto-url (url)
   (if ( xwidget-webkit-last-session)
@@ -132,7 +140,18 @@ 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)
 
+(defvar xwidget-webkit-kill-flash-oneshot nil)
+(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
+    (xwidget-disable-plugin-for-mime "application/x-shockwave-flash")
+    (setq xwidget-webkit-kill-flash-oneshot t)))
+
+(xwidget-webkit-kill-flash)
+
 (provide 'xwidget)
diff --git a/src/xwidget.c b/src/xwidget.c
index 263e8553ca9..c75f9bbd83e 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -93,6 +93,9 @@
 
 #ifdef HAVE_WEBKIT_OSR
 #include <webkit/webkitwebview.h>
+#include <webkit/webkitwebplugindatabase.h>
+#include <webkit/webkitwebplugin.h>
+#include <webkit/webkitglobals.h>
 #endif
 
 #include "xwidget.h"
@@ -808,7 +811,18 @@ DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombie
   }
 }
 
-
+DEFUN("xwidget-disable-plugin-for-mime", Fxwidget_disable_plugin_for_mime , Sxwidget_disable_plugin_for_mime, 1,1,0, doc: /* */)
+  (Lisp_Object mime)
+{
+  WebKitWebPlugin *wp = webkit_web_plugin_database_get_plugin_for_mimetype
+    (webkit_get_web_plugin_database(),  SDATA(mime));
+  if(wp == NULL) return Qnil;
+  if(webkit_web_plugin_get_enabled (wp)){
+    webkit_web_plugin_set_enabled  (wp, FALSE);
+    return Qt;
+  }
+  return Qnil;
+}
 
 void
 syms_of_xwidget (void)
@@ -827,6 +841,7 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_webkit_get_title);
   defsubr (&Sxwidget_size_request  );
   defsubr (&Sxwidget_delete_zombies);
+  defsubr (&Sxwidget_disable_plugin_for_mime);
   DEFSYM (Qxwidget ,"xwidget");
 
   DEFSYM (Qcxwidget ,":xwidget");