summaryrefslogtreecommitdiff
path: root/src/xwidget.c
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-11-07 14:41:43 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2021-11-07 14:41:43 +0100
commit48a9621db7922a7da19ce401b40955fd9871e85e (patch)
tree567235f8e0e1b9abf2dea3d49da1c07ab4fd5d1e /src/xwidget.c
parentcbc14f9b4eb95268417d5baebd18b55fc70da7f1 (diff)
downloademacs-48a9621db7922a7da19ce401b40955fd9871e85e.tar.gz
emacs-48a9621db7922a7da19ce401b40955fd9871e85e.tar.bz2
emacs-48a9621db7922a7da19ce401b40955fd9871e85e.zip
Fix xwidget-webkit-goto-history
* src/xwidget.c (xwidget-webkit-goto-history): Use WebKitBackForwardList and XFIXNUM instead of XFIXNAT (bug#51651).
Diffstat (limited to 'src/xwidget.c')
-rw-r--r--src/xwidget.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index fb4619ee34d..b0700b61e54 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -1540,7 +1540,11 @@ DEFUN ("xwidget-webkit-goto-uri",
DEFUN ("xwidget-webkit-goto-history",
Fxwidget_webkit_goto_history, Sxwidget_webkit_goto_history,
2, 2, 0,
- doc: /* Make the XWIDGET webkit load REL-POS (-1, 0, 1) page in browse history. */)
+ doc: /* Make the XWIDGET webkit the REL-POSth element in load history.
+
+If REL-POS is 0, the widget will be just reload the current element in
+history. If REL-POS is more or less than 0, the widget will load the
+REL-POSth element around the current spot in the load history. */)
(Lisp_Object xwidget, Lisp_Object rel_pos)
{
WEBKIT_FN_INIT ();
@@ -1550,11 +1554,20 @@ DEFUN ("xwidget-webkit-goto-history",
#ifdef USE_GTK
WebKitWebView *wkwv = WEBKIT_WEB_VIEW (xw->widget_osr);
- switch (XFIXNAT (rel_pos))
+ WebKitBackForwardList *list;
+ WebKitBackForwardListItem *it;
+
+ if (XFIXNUM (rel_pos) == 0)
+ webkit_web_view_reload (wkwv);
+ else
{
- case -1: webkit_web_view_go_back (wkwv); break;
- case 0: webkit_web_view_reload (wkwv); break;
- case 1: webkit_web_view_go_forward (wkwv); break;
+ list = webkit_web_view_get_back_forward_list (wkwv);
+ it = webkit_back_forward_list_get_nth_item (list, XFIXNUM (rel_pos));
+
+ if (!it)
+ error ("There is no item at this index");
+
+ webkit_web_view_go_to_back_forward_list_item (wkwv, it);
}
#elif defined NS_IMPL_COCOA
nsxwidget_webkit_goto_history (xw, XFIXNAT (rel_pos));