experiment send key event to xwidget. this version had som bad merges from trunk so it seems unstble

7 files changed, 64 insertions, 186 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d96ad569543..a2169898670 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-pop-up-window)
+        (display-buffer-pop-up-side-window)
+        (display-buffer-in-side-window): Call display-buffer-set-height
+        and display-buffer-set-width after setting the new window's
+        buffer so `fit-window-to-buffer' and friends work on the right
+        buffer.
+
 2011-07-20  Sam Steingold  <sds@gnu.org>
 
         * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a1cb003a8ff..a8065fc5ca4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-tag-comment): Ignore HTML comments.
+
 2011-07-20  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el (gnus-group-make-nnir-group): Allow optional search query
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f8a85579b4f..8faa5071616 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -761,6 +761,9 @@ ones, in case fg and bg are nil."
 (defun shr-tag-script (cont)
   )
 
+(defun shr-tag-comment (cont)
+  )
+
 (defun shr-tag-sup (cont)
   (let ((start (point)))
     (shr-generic cont)
diff --git a/lisp/window.el b/lisp/window.el
index 12c9da85d57..905db8dc9b6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5051,14 +5051,22 @@ description."
                       (funcall side window)))))
 
             (when (window-live-p window)
-              ;; Adjust sizes if asked for.
-              (display-buffer-set-height window specifiers)
-              (display-buffer-set-width window specifiers)
+              ;; In `quit-restore' parameter record that we popped up
+              ;; this window, its buffer and which window was selected.
               (set-window-parameter
                window 'quit-restore (list 'new-window buffer selected-window))
+              ;; For `display-buffer-window' mark window as new.
               (setq display-buffer-window (cons window 'new-window))
+              ;; Install BUFFER in the new window.
               (display-buffer-in-window buffer window specifiers)
+              ;; Adjust sizes if asked for (for `fit-window-to-buffer'
+              ;; and friends BUFFER must be already shown in the new
+              ;; window).
+              (display-buffer-set-height window specifiers)
+              (display-buffer-set-width window specifiers)
+              ;; Reset list of window's previous buffers to nil.
               (set-window-prev-buffers window nil)
+              ;; Return the new window.
               (throw 'done window))))))))
 
 (defun display-buffer-pop-up-frame (buffer &optional graphic-only specifiers)
@@ -5113,26 +5121,33 @@ failed."
           (display-buffer-split-window main-or-root on-side specifiers))
          fun)
     (when window
+      ;; We were able to split off a new window.
       (unless main
         (walk-window-subtree
          (lambda (window)
            ;; Make all main-or-root subwindows main windows.
            (set-window-parameter window 'window-side 'none))
          main-or-root t))
-      ;; Make sure that parent's window-side is nil.
+      ;; Reset window-side parameter of new window's parent to nil.
       (set-window-parameter (window-parent window) 'window-side nil)
-      ;; Initialize side.
+      ;; Initialize window-side parameter of new window to SIDE.
       (set-window-parameter window 'window-side side)
-      ;; Adjust sizes if asked for.
-      (display-buffer-set-height window specifiers)
-      (display-buffer-set-width window specifiers)
-      ;; Set window parameters.
+      ;; Install window-slot parameter of new window.
+      (set-window-parameter window 'window-slot slot)
+      ;; In `quit-restore' parameter record that we popped up a new
+      ;; window.
       (set-window-parameter
        window 'quit-restore (list 'new-window buffer selected-window))
+      ;; For `display-buffer-window' mark window as new.
       (setq display-buffer-window (cons window 'new-window))
-      (set-window-parameter window 'window-slot slot)
+      ;; Install BUFFER in new window.
       (display-buffer-in-window buffer window specifiers)
+      ;; Adjust sizes of new window if asked for.
+      (display-buffer-set-height window specifiers)
+      (display-buffer-set-width window specifiers)
+      ;; Reset list of new window's previous buffers to nil.
       (set-window-prev-buffers window nil)
+      ;; Return the new window.
       window)))
 
 (defun display-buffer-in-side-window (buffer side &optional slot specifiers)
@@ -5160,7 +5175,7 @@ SPECIFIERS must be a list of buffer display specifiers."
                 window-sides-slots))
          (selected-window (selected-window))
          window this-window this-slot prev-window next-window
-         best-window best-slot abs-slot dedicated)
+         best-window best-slot abs-slot dedicated new-window)
 
     (unless (numberp slot)
       (setq slot 0))
@@ -5233,13 +5248,16 @@ SPECIFIERS must be a list of buffer display specifiers."
                           (setq window (display-buffer-split-window
                                         prev-window prev-side specifiers)))))
                (progn
-                 (display-buffer-set-height window specifiers)
-                 (display-buffer-set-width window specifiers)
+                 ;; In `quit-restore' parameter record that we popped up
+                 ;; this window, its buffer and the old selected window.
                  (set-window-parameter
                   window 'quit-restore
                   (list 'new-window buffer selected-window))
+                 ;; For `display-buffer-window' mark window as new.
                  (setq display-buffer-window (cons window 'new-window))
-                 window))
+                 ;; Record that window is new, we need this for
+                 ;; adjusting sizes below.
+                 (setq new-window window)))
           (and best-window
                (setq window best-window)
                ;; Reuse best window (the window nearest to SLOT).
@@ -5262,7 +5280,17 @@ SPECIFIERS must be a list of buffer display specifiers."
         (unless (window-parameter window 'window-slot)
           ;; Don't change exisiting slot value.
           (set-window-parameter window 'window-slot slot))
-        (display-buffer-in-window buffer window specifiers)))))
+        ;; Install BUFFER in the window.
+        (display-buffer-in-window buffer window specifiers)
+        (when new-window
+          ;; Adjust sizes if asked for (for `fit-window-to-buffer' and
+          ;; friends BUFFER must be already shown in the new window).
+          (display-buffer-set-height window specifiers)
+          (display-buffer-set-width window specifiers)
+          ;; Reset list of new window's previous buffers to nil.
+          (set-window-prev-buffers window nil))
+        ;; Return the window used.
+        window))))
 
 (defun window-normalize-buffer-to-display (buffer-or-name)
   "Normalize BUFFER-OR-NAME argument for buffer display functions.
@@ -6926,7 +6954,7 @@ WINDOW was scrolled."
     ;; `with-selected-window' should orderly restore the current buffer.
     (with-selected-window window
       ;; We are in WINDOW's buffer now.
-      (let* ( ;; Adjust MIN-HEIGHT.
+      (let* (;; Adjust MIN-HEIGHT.
              (min-height
               (if override
                   (window-min-size window nil window)
diff --git a/lisp/xwidget-screencast.el b/lisp/xwidget-screencast.el
deleted file mode 100644
index f85dbe8f247..00000000000
--- a/lisp/xwidget-screencast.el
+++ /dev/null
@@ -1,32 +0,0 @@
-;;(require 'screencast)
-(require 'xwidget)
-(defconst xwidget-screencast-webkit '("Hello, and welcome to a
-  short demo of the Emacs xwidget branch, and the Webkit
-  integration it provides." n
-  "Xwidgets are toolkit widgets that behave like images in an
-  Emacs buffer. Except they are actual widgets, so you can
-  interact with them." n
-  "There are several, but people seem to fancy the webkit the most so lets have a look!"
-  (insert "some text")
-  (xwidget-insert (point-min)  'webkit-osr "webkit-osr" 500  1000  5)
-  n
-  "Okay so thats an actual webkit instance in an Emacs buffer! " n
-  "Mouse-overs work" n
-  "Mouse-clicks work" n
-  (split-window-vertically)
-  "You can split the buffer and scroll the windows separately, as
-  usual in Emacs. This is however not so usual in the browser
-  world for some reason." n
-  "So, can you use the xwidget branch as your main Emacs instance?"n
-  "Not yet, its still not mature. There are many tricky issues
-  left. That being said, there are many simple tasks to help out
-  with also if you like!" ))
-
-
-(defun xwidget-screencast(&optional arg)
-  "Displays the screencast for xwidgets."
-  (interactive "P")
-  (apply (if arg
-             'screencast-record
-           'screencast)
-          xwidget-screencast-webkit "xvidgets" 1 ()))
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
deleted file mode 100644
index 087892244df..00000000000
--- a/lisp/xwidget-test.el
+++ /dev/null
@@ -1,138 +0,0 @@
-;;test like:
-;; cd /path/to/xwidgets-emacs-dir
-;; make   all&&  src/emacs -q --eval "(progn (load \"`pwd`/lisp/xwidget-test.el\") (xwidget-demo-basic))"
-
-
-;; you should see:
-;; - a gtk button
-;; - a gtk toggle button
-;; - a gtk slider button
-;; - an xembed window(using gtk_socket) showing another emacs instance
-;; - an xembed window(using gtk_socket) showing an uzbl web browser if its installed
-
-;;the widgets will move when you type in the buffer. good!
-
-;;there will be redrawing issues when widgets change rows, etc. bad!
-
-;;its currently difficult to give kbd focus to the xembedded emacs,
-;;but try evaling the following:
-
-;; (xwidget-set-keyboard-grab 3 1)
-
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; demo/test functions
-(require 'xwidget)
-
-(defmacro xwidget-demo (name &rest body)
-  `(defun ,(intern (concat "xwidget-demo-" name)) ()
-     (interactive)
-     (switch-to-buffer ,(format "*xwidget-demo-%s*" name))
-     (text-mode);;otherwise no local keymap
-     (insert "Some random text for xwidgets to be inserted in for demo purposes.\n")
-     ,@body))
-
-(xwidget-demo "a-button" 
-              (xwidget-insert (point-min) 'button  "button" 40  50)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-big-button" 
-              (xwidget-insert (point-min)  'button "button" 400  500)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-socket" 
-              (xwidget-insert (point-min)  'socket "socket" 500  500)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-
-(xwidget-demo "a-slider" 
-              (xwidget-insert (point-min)  'slider "slider" 500  100)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-canvas" 
-              (xwidget-insert (point-min)  'cairo "canvas" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-webkit" 
-              (xwidget-insert (point-min)  'webkit "webkit" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-webkit-osr" 
-              (xwidget-insert (point-min)  'webkit-osr "webkit-osr" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-
-
-(xwidget-demo "basic"
-  (xwidget-insert (point-min)  'button "button" 40  50 )
-  (xwidget-insert          15  'toggle "toggle" 60  30  )
-  (xwidget-insert          30  'socket "emacs"  400 200 )
-  (xwidget-insert          20  'slider "slider" 100 50  )
-  (xwidget-insert          40  'socket "uzbl-core"   400 400 )
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic)
-)
-
-
-;it doesnt seem gtk_socket_steal works very well. its deprecated.
-; xwininfo -int
-; then (xwidget-embed-steal 3 <winid>)
-(defun xwidget-demo-grab ()
-  (interactive)
-  (insert "0 <<< grabbed appp will appear here\n")
-  (xwidget-insert          1 1 3 "1" 1000 )
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-grab)  
-  )
-
-;ive basically found these xembeddable things:
-;openvrml
-;emacs
-;mplayer
-;surf
-;uzbl
-
-;try the openvrml:
-;/usr/libexec/openvrml-xembed 0 ~/Desktop/HelloWorld.wrl
-
-
-(defun xwidget-handler-demo-basic ()
-  (interactive)
-  (message "stuff happened to xwidget %S" last-input-event)
-  (let*
-      ((xwidget-event-type (nth 2 last-input-event))
-       (xwidget-id (nth 1 last-input-event)))
-    (cond ( (eq xwidget-event-type 'xembed-ready)
-            (let*
-                ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
-              ;;will start emacs/uzbl in a xembed socket when its ready
-              (cond
-               ((eq 3 xwidget-id)
-                (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" )  )
-               
-              )
-            )))))
-
-
-
-(defun xwidget-handler-demo-grab ()
-  (interactive)
-  (message "stuff happened to xwidget %S" last-input-event)
-  (let*
-      ((xwidget-event-type (nth 2 last-input-event)))
-    (cond ( (eq xwidget-event-type 'xembed-ready)
-            (let*
-                ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  %S" xembed-id)
-              )
-            ))))
-(defun xwidget-dummy-hook ()
-  (message "xwidget dummy hook called"))
-
-;  (xwidget-resize-hack 1 200 200)
-
-;(xwidget-demo-basic)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 837f8454671..7f1ffd56fb9 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -110,6 +110,10 @@ defaults to the string looking like a url around the cursor position."
   (interactive)
   ( xwidget-adjust-size-to-content ( xwidget-webkit-last-session)))
 
+(defun xwidget-webkit-adjust-size (w h)
+  (interactive "nWidth:\nnHeight:\n")
+  ( xwidget-resize ( xwidget-webkit-last-session) w h))
+
 
 (defun xwidget-webkit-new-session (url)