From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#51712: 29.0.50; [PATCH] New function `xwidget-webkit-load-html' Date: Wed, 10 Nov 2021 08:14:13 +0800 Message-ID: <87czn8yii2.fsf@yahoo.com> References: <878rxx8w1i.fsf.ref@yahoo.com> <878rxx8w1i.fsf@yahoo.com> <83h7cl5urs.fsf@gnu.org> <87y25x5tu9.fsf@yahoo.com> <831r3p5sn4.fsf@gnu.org> <87wnlgyjcd.fsf@yahoo.com> <87r1bolvx1.fsf@gnus.org> Reply-To: Po Lu Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16302"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: Eli Zaretskii , 51712@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Nov 10 01:15:17 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mkbGn-00040Y-5s for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Nov 2021 01:15:17 +0100 Original-Received: from localhost ([::1]:54854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkbGl-0004vT-97 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 09 Nov 2021 19:15:15 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkbGY-0004vK-TF for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 19:15:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkbGY-0007qG-Kw for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 19:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkbGY-0002s1-1q for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 19:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Po Lu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Nov 2021 00:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51712 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51712-submit@debbugs.gnu.org id=B51712.163650327010980 (code B ref 51712); Wed, 10 Nov 2021 00:15:02 +0000 Original-Received: (at 51712) by debbugs.gnu.org; 10 Nov 2021 00:14:30 +0000 Original-Received: from localhost ([127.0.0.1]:36288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkbG1-0002r1-Pl for submit@debbugs.gnu.org; Tue, 09 Nov 2021 19:14:30 -0500 Original-Received: from sonic308-10.consmr.mail.ne1.yahoo.com ([66.163.187.33]:42460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkbFy-0002qn-DP for 51712@debbugs.gnu.org; Tue, 09 Nov 2021 19:14:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636503258; bh=1yPT3667B9lqn4n0NrEtZYXaPt/LRSn0zJ3nSC1kV58=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=sGFZJRmSVMMcOxeTue+s3irmHCCYnIbPdH2jz+M9xJenEmt4Xfb2ChPHBMBEraepV3tP8SD5oL/hfpdTMiIM8mnJ3uATo4aKBbieRvOPBJk/MiZFCtTP8HZbLWqWJV6CkDnFHdoO55Ia0WGiDtPr9zLpmeIRfCc7ZbW2zThf44XN8Yi9U3klcj57bt/tpBzP4V3ZOhahVmYHXvUkRfhVHc+vR9LUti3tIUtnLPoCobdcC3PsNSbAxj+zDSlcliLnx17WYk4fAuNbMENo+YUYTFu8wES087J9KjbxZdLsKTbIB+zrUwjvQyrg4MRSzN9teh9rFoYa2nptv83EgRwk3A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636503258; bh=qc2nEqUUkAJNfqxhRaYOCo2R+gMp+BaNlpVpq6sqJCl=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=bckMcKnEwX+raAxOc8qBDNWgxdoZZBLyljIsx52CkHfBUtT0nnoqijR6mHT6T62Pvfjdgx+oSCxDL4kBfa7pGGvXqzFmMKZpRD5kESP1NBexjZB9/hbsqMn0fMuPKwjbiRNa3kOjpfIWPiNXnINFPTEfhGC3MkmLUrxCb3ZSqw07eEBPjUQq741r2ugEHw+N8mN9TyIfNgoHXbRcHzseds29X3TIS9OMx16ohVVvXCFf/4K3GwuxAw71+L8U+9d4zR95k6xhEqwG7rbjMQHuM5+COrsqMMJ++vot1mN1rsfnBn8nMTjnfZAs/ZOJm9oyPAzF84QtHmyJPDy1P40M2Q== X-YMail-OSG: IJo4KWcVM1l8u_ahTHyRlsuPYNtbFLIsKkzgj9zuX8xbfwfJpvmAJeWbXL_mZPJ PcjG2v.9KHL8MBZ5.w3qnDz7IPZOnd8uwxkMIiasJ3OPu3JEQLoy9LOmO_Tr1EEZz3zmMHm2do8f t4cQX1gEVVsx9SjDjG295Sg_lBz3KhkJDo0wX7_p8vB.b9ZoMmntbOPn9OaLdigRUQXqM6efdwAH NQA0acz8fYVImPJUc4k7y5NJTfMWReqrTQb3Nfe5kj1CFLVhIKKH_gqLgmvGMcHhaPV5dHEjr4gA gjKuAlfgtGBgq1JhKMRrz1rgeEYi_6V0y6nVA3xoJXpda.CSCOq0KbNm0ddNRZj5MM8u1Wifeo7f ONi7kuCLZD_Wev6_jJyes4D2O7QqfXtj3p2AuVz.LH41l3ZMlMb9RpV5Dmz9SPKaeNhp0MzTTaj5 0MRUYDZZTlzTuVgOE3LHcr5l8Qhvlr03CCavoWfxKB3z4DAajBCPWkbqHaYTM6o1ERqHGwRXxWUq eJ2jX6.WdlPNULQ_q3IwiMAvtEwfLZjDixQCapuRMLVJ1fKs1zftdBT0NtuiT2MLihJOs0dsogiK gjda7nZGMiBN_PQ4K4yCieJkkmKDvxDmjd2At2tBkbDYnG2OUtxjWiieFH3gMaNe_fH1KDU_T8V4 LA2eM93SfIgWUonxGcl8CtBoc5vTM38UnfGGqwqjfscO_KFc6RRL2mUHOGnxLsA4Ad5fGQrzU0me 2l9QYSvsNUeHQTLK3mJB_uzPPkWE8TETyd19y3zDEGPRO.AUC3reWV4HwJC1BPOJ.CufhRwX5FM1 YpUdT.naj0N92hcsfcyfxakce9GKznyoJg1QrBqJjR X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ne1.yahoo.com with HTTP; Wed, 10 Nov 2021 00:14:18 +0000 Original-Received: by kubenode511.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID cb1e5a73f26b952405e7f13c26154eaa; Wed, 10 Nov 2021 00:14:16 +0000 (UTC) In-Reply-To: <87r1bolvx1.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 10 Nov 2021 01:02:50 +0100") X-Mailer: WebService/1.1.19306 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:219487 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > Po Lu writes: > >>> Hmm... this is better, but at least I am still in the dark regarding >>> the need for this optional argument. E.g., what would happen if you >>> use that tag, but don't specify the URI? >> >> I'm in the dark too. I am not a web developer, and browser engines are >> remarkably lax about these things, but hopefully Lars can explain better >> (after all, shr must deal with these things too), so I added him to the >> Ccs. > > The base URI is used when expanding relative links. So if you have HTML > that looks like > > > > then the browser can't resolve those two URLs without having the base > URI. So you'd pass in a base URI of https://example.com/foo/bar/zot if > that's where the HTML snippet is from. > > When the URLs are absolute, the base URI is irrelevant. Thanks, does this look OK to you? And I'm afraid I'm not terribly good at phrasing this into words, so I would really appreciate it if you could help write that section of the manual. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-xwidget-webkit-load-html.patch >From 1d701339df5ed91ed730fb134976137bcf1e0ce6 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 9 Nov 2021 21:36:40 +0800 Subject: [PATCH] Add `xwidget-webkit-load-html' * doc/lispref/display.texi (Xwidgets): Document new function. * etc/NEWS: Announce new function. * src/xwidget.c (Fxwidget_webkit_load_html): New function. (syms_of_xwidget): Define new subr. --- doc/lispref/display.texi | 11 +++++++++++ etc/NEWS | 5 +++++ src/xwidget.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b6bd14f887..aa7d64493c 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6943,6 +6943,17 @@ Xwidgets signals an error. @end defun +@defun xwidget-webkit-load-html xwidget text &optional base-uri +Load @var{text}, a string, into @var{xwidget}, which should be a +WebKit xwidget. It treats @var{text} as HTML markup, which will be +rendered by @var{xwidget}. + +Optional argument @var{base-uri}, which should be a string, specifies +the location of web resources specified through relative links, such +as the resource @samp{foo.png} in the HTML tag @samp{}. It defaults to @samp{about:blank}. +@end defun + @node Buttons @section Buttons @cindex buttons in buffers diff --git a/etc/NEWS b/etc/NEWS index 3cad0995ac..ae318be1c0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -796,6 +796,11 @@ what the widget will actually receive. On GTK+, only key and function key events are implemented. ++++ +*** New function 'xwidget-webkit-load-html'. +This function is used to load HTML text into WebKit xwidgets, without +having to create a temporary file to store the markup. + +++ *** New functions for performing searches on WebKit xwidgets. Some new functions, such as 'xwidget-webkit-search', have been added diff --git a/src/xwidget.c b/src/xwidget.c index fc76ce307e..2587b658e7 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -2139,6 +2139,43 @@ DEFUN ("xwidget-webkit-finish-search", Fxwidget_webkit_finish_search, return Qnil; } +#ifdef USE_GTK +DEFUN ("xwidget-webkit-load-html", Fxwidget_webkit_load_html, + Sxwidget_webkit_load_html, 2, 3, 0, + doc: /* Make XWIDGET's WebKit widget render TEXT. +XWIDGET should be a WebKit xwidget, that will receive TEXT. TEXT +should be a string that will be displayed by XWIDGET as HTML markup. +BASE_URI should be a string containing a URI that is used to fetch +resources, and if not specified, defaults to `about:blank'. */) + (Lisp_Object xwidget, Lisp_Object text, Lisp_Object base_uri) +{ + struct xwidget *xw; + WebKitWebView *webview; + char *data, *uri; + + CHECK_XWIDGET (xwidget); + CHECK_STRING (text); + if (NILP (base_uri)) + base_uri = build_string ("about:blank"); + else + CHECK_STRING (base_uri); + + base_uri = ENCODE_UTF_8 (base_uri); + text = ENCODE_UTF_8 (text); + xw = XXWIDGET (xwidget); + + data = SSDATA (text); + uri = SSDATA (base_uri); + webview = WEBKIT_WEB_VIEW (xw->widget_osr); + + block_input (); + webkit_web_view_load_html (webview, data, uri); + unblock_input (); + + return Qnil; +} +#endif + void syms_of_xwidget (void) { @@ -2177,6 +2214,9 @@ syms_of_xwidget (void) defsubr (&Sxwidget_webkit_next_result); defsubr (&Sxwidget_webkit_previous_result); defsubr (&Sset_xwidget_buffer); +#ifdef USE_GTK + defsubr (&Sxwidget_webkit_load_html); +#endif DEFSYM (QCxwidget, ":xwidget"); DEFSYM (QCtitle, ":title"); -- 2.31.1 --=-=-=--