aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2011-08-16 09:12:16 +0200
committerJoakim Verona2011-08-16 09:12:16 +0200
commit58cc0fbabd892bf129c8217a73deb255bbfabccd (patch)
treef43bbce708e652474c99553137a14126824de85d
parent3acc41955214be77a2035476e82e21e348bf3da5 (diff)
downloademacs-58cc0fbabd892bf129c8217a73deb255bbfabccd.tar.gz
emacs-58cc0fbabd892bf129c8217a73deb255bbfabccd.zip
event to callback maping code works better now
-rw-r--r--lisp/xwidget.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index b6371cbfde5..643306085e8 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -144,14 +144,14 @@ defaults to the string looking like a url around the cursor position."
144 (interactive) 144 (interactive)
145 (message "stuff happened to xwidget %S" last-input-event) 145 (message "stuff happened to xwidget %S" last-input-event)
146 (let* 146 (let*
147 ((xwidget-event-type (nth 2 last-input-event)) 147 ((xwidget-event-type (nth 1 last-input-event))
148 (xwidget (nth 1 last-input-event)) 148 (xwidget (nth 2 last-input-event))
149 (xwidget-callback (xwidget-get xwidget 'callback))) 149 (xwidget-callback (xwidget-get xwidget 'callback)))
150 (funcall xwidget-callback xwidget xwidget-event-type))) 150 (funcall xwidget-callback xwidget xwidget-event-type)))
151 151
152(defun xwdiget-webkit-callback (xwidget xwidget-event-type) 152(defun xwidget-webkit-callback (xwidget xwidget-event-type)
153 (cond ((eq xwidget-event-type 'document-load-finished) 153 (cond ((eq xwidget-event-type 'document-load-finished)
154 (message "webkit loaded %s" xwidget) 154 (message "webkit finished loading %s" xwidget)
155 (xwidget-adjust-size-to-content xwidget)) 155 (xwidget-adjust-size-to-content xwidget))
156 )) 156 ))
157 157
@@ -224,7 +224,7 @@ Argument H height."
224 (setq xwidget-webkit-last-session-buffer (switch-to-buffer (get-buffer-create bufname))) 224 (setq xwidget-webkit-last-session-buffer (switch-to-buffer (get-buffer-create bufname)))
225 (insert " ") 225 (insert " ")
226 (setq xw (xwidget-insert 1 'webkit-osr bufname 1000 1000)) 226 (setq xw (xwidget-insert 1 'webkit-osr bufname 1000 1000))
227 (xwidget-put xw 'callback 'xwdiget-webkit-callback) 227 (xwidget-put xw 'callback 'xwidget-webkit-callback)
228 (xwidget-webkit-mode) 228 (xwidget-webkit-mode)
229 (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url ))) 229 (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url )))
230 230