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 21:03:26 +0800 Message-ID: <87fss440yp.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> <87czn8yii2.fsf@yahoo.com> <877ddgluzr.fsf@gnus.org> <87fss4ohjv.fsf@yahoo.com> <87sfw4h7pt.fsf@gnus.org> <87zgqcczk4.fsf@yahoo.com> <83bl2s41kb.fsf@gnu.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="27842"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: larsi@gnus.org, 51712@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Nov 10 14:04:11 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 1mknGt-00073P-EQ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Nov 2021 14:04:11 +0100 Original-Received: from localhost ([::1]:47810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mknGs-0000Pr-7U for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Nov 2021 08:04:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:52958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mknGj-0000PN-Uq for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 08:04:01 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mknGj-0006YY-My for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 08:04:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mknGj-0005QJ-Im for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 08:04:01 -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 13:04:01 +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.163654942220816 (code B ref 51712); Wed, 10 Nov 2021 13:04:01 +0000 Original-Received: (at 51712) by debbugs.gnu.org; 10 Nov 2021 13:03:42 +0000 Original-Received: from localhost ([127.0.0.1]:37284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mknGQ-0005Pf-41 for submit@debbugs.gnu.org; Wed, 10 Nov 2021 08:03:42 -0500 Original-Received: from sonic308-56.consmr.mail.ne1.yahoo.com ([66.163.187.31]:43320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mknGN-0005PS-Da for 51712@debbugs.gnu.org; Wed, 10 Nov 2021 08:03:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636549411; bh=c50/QSQPwpm1VcjP28TGGeEdf1WsXuJnSX8rqiPeQSk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=nION+qol1PK9UVwYd6z6RAYqtbOMmsf+O/x1viMM6yhyMRTxFIPCIrxNM7HwkG4RxGCNV1K8owp3htesAE5JW8Mj6ZDX0S9GWnLy1tdpBnUTwpMLrOQ2JMdM6nO8PeFtFj80FVEPQQQyB+GsbBs1psyWe1RxBJLfcsdCuoUXSQmkonDSjARUAVLSr8ck2r0kDtr5VsrJbjSeYeBjcz2Z7y1DOy1smbgI0WyEFoLrzdkHSCqkge4U8DLtKD1mGpaVvfEHCXAydAhVtPFuJD2ujgvUCeZCsYjCu4CqmBlxgQQ4W5F85qJC6Al9zYVOuHJQlBymWxdyWiFHCizZLkUj5g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636549411; bh=SrtV10yKpTZ9yPzHcoGv87gAgd3GhKwFlpd6kKmpql+=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=NEbJY4zqjlBo1GvvGaEibtl2u88g8embTHJDCnbbADCcTxFlUXhFJ3/IQmIu9eNZNR4CgFbbls3kCgoFXprC/Wpoy/kW5UdWbJqy0i1pP3PECDSooqL7vD3GbGdtsekDPOSjDurLygm6xTMTj4+S0akMcp2YfZkoTxo1JKhrUpd+xxqACOgBTBu/PIwsc/yrqPBgYGjNJlQ5oEpoJWfkDNWRrd6rkKD20YycbA5x2hSQ9WXV6fGvBKFHwMlq/EfR0voeGusjYU3dDOK7EPqlIdlNBMTxUcSeVhl/tANx8LUIWjdtKMwUucFgGFo/ARXThOYInGW+oWOF4qY6Yz+Ndw== X-YMail-OSG: NunqzCEVM1k2.V6VeKDLDAFLaVU9Kqpcd6thuAR0MFHzutBlhiMsqaMaSKo78fW p56QjOP4TURwh23CU0Tr_UybxY6yuxla9Ghqm3r25Leq_lWkQtnpx_wlfyK_l0NKyx8z_tHzljhb UiktY9CFNByYVRbM7A6J2X4c.8Z3ZY8ZMC6EVmo1kSguEb9niIUFSd5xVfSOON1xSCZ4U6kDNiyw MxUB3.SZ8Tn0pmNM2ocIj6hEXFB.QuTqg9_CxZjPhq8epc0axBswHyOPCkZwcbvnUwkcbp1GcUHa qp5CR_JA2D_Sw8gzg6NkxnufIagEAvAOMSz8TXaWyaKdjIQynlQXEK1f5h8QRI.iL5eEvLgdVNtJ dn0hcJlwK3A.9ttBQ1AfZazhs9b66sCRzxqQ.X8iQ911WnCe0Tp7d9MT8ImDB0Yy69Hg2rIsLvf_ eDARyNNwPw39boJFaiMwp1j7antnJz.dS3yyxrZ1LhwpTsO_e1jtdugYwAEyDiqy93BDTOvJcSgc aE0BuUCdp7Ax6U3SF26hWnokICCeIh2T2wsanl0mE3di71JihXt74VOLy_ih7QMj38Gqhw.6v6rM T0RcKVpNq6E.rxuy5rE4_yNtZdxnckKaRhUmaOOOFFLULid9AAd5s6HZESXaXc.NG0tfCC3JARN6 sKVZ.Ng.YpyxxXUmJ0mXES0GX3P04c9k5lvgYc__4BiyQ2Wbg5AAfBVA__wz0Tg3P21hVkVv_olR KNI_EFbJiK1FgfL4wvTuVsoPNKGNF_weEG4y4nWKJoNwscG4a0KEZMPeWjqPwybs2q7ZIl_8N.t1 bif6aUyeNBBR4SgKkVWnCoaFZXgzOqhIg1UxnORq0o 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 13:03:31 +0000 Original-Received: by kubenode509.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID fcef8ce912cf23bea6d32dcfdcbbb8ab; Wed, 10 Nov 2021 13:03:30 +0000 (UTC) In-Reply-To: <83bl2s41kb.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 10 Nov 2021 14:50:28 +0200") 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:219541 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: > Thanks. Thank you! How does the attached patch look to you? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-xwidget-webkit-load-html.patch >From ae73e4478a3fd7de2fc279122dc61e02ea66b217 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 10 Nov 2021 21:01: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 | 9 +++++++++ etc/NEWS | 7 +++++++ src/xwidget.c | 41 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b6bd14f887..b7d12269ae 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6943,6 +6943,15 @@ 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. Any HTML markup in @var{text} will be processed +by @var{xwidget} while rendering the text. + +Optional argument @var{base-uri}, which should be a string, specifies +the absolute location of the web resources referenced by @var{text}, +to be used for resolving relative links in @var{text}. + @node Buttons @section Buttons @cindex buttons in buffers diff --git a/etc/NEWS b/etc/NEWS index 3cad0995ac..bc693b3205 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -796,6 +796,13 @@ 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 +directly, in contrast to creating a temporary file to hold the +markup, and passing the URI of the file as an argument to +'xwidget-webkit-goto-uri'. + +++ *** 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 2ae635092d..fc05f4f570 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -2278,6 +2278,44 @@ 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 locate +resources with relative URLs, 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) { @@ -2316,6 +2354,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 --=-=-=--