aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorRicardo Wurmus2016-10-25 23:00:35 -0700
committerPaul Eggert2016-10-25 23:07:13 -0700
commitd781662873f228b110a128f7a2b6583a4d5e0a3a (patch)
tree4c35b387e57e4780c2276a6fe7b69a0ff36fc243 /lisp
parent1ea669d6f0269784b3e69238fd2813f55340d53a (diff)
downloademacs-d781662873f228b110a128f7a2b6583a4d5e0a3a.tar.gz
emacs-d781662873f228b110a128f7a2b6583a4d5e0a3a.zip
xwidget: Use WebKit2 API
* configure.ac: Check for webkit2gtk-4.0. * src/xwidget.c: Adjust to use WebKit2 API. * lisp/xwidget.el (xwidget-webkit-callback): Adjust matches for `xwidget-event-type'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/xwidget.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 7a0ca8bd551..1bae6bb8b47 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -187,7 +187,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the originating xwidget."
187 "error: callback called for xwidget with dead buffer") 187 "error: callback called for xwidget with dead buffer")
188 (with-current-buffer (xwidget-buffer xwidget) 188 (with-current-buffer (xwidget-buffer xwidget)
189 (let* ((strarg (nth 3 last-input-event))) 189 (let* ((strarg (nth 3 last-input-event)))
190 (cond ((eq xwidget-event-type 'document-load-finished) 190 (cond ((eq xwidget-event-type 'load-changed)
191 (xwidget-log "webkit finished loading: '%s'" 191 (xwidget-log "webkit finished loading: '%s'"
192 (xwidget-webkit-get-title xwidget)) 192 (xwidget-webkit-get-title xwidget))
193 ;;TODO - check the native/internal scroll 193 ;;TODO - check the native/internal scroll
@@ -196,8 +196,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the originating xwidget."
196 (rename-buffer (format "*xwidget webkit: %s *" 196 (rename-buffer (format "*xwidget webkit: %s *"
197 (xwidget-webkit-get-title xwidget))) 197 (xwidget-webkit-get-title xwidget)))
198 (pop-to-buffer (current-buffer))) 198 (pop-to-buffer (current-buffer)))
199 ((eq xwidget-event-type 199 ((eq xwidget-event-type 'decide-policy)
200 'navigation-policy-decision-requested)
201 (if (string-match ".*#\\(.*\\)" strarg) 200 (if (string-match ".*#\\(.*\\)" strarg)
202 (xwidget-webkit-show-id-or-named-element 201 (xwidget-webkit-show-id-or-named-element
203 xwidget 202 xwidget