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 14:08:59 +0800 Message-ID: <87zgqcczk4.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> 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="33328"; 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 07:10:36 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 1mkgod-0008U9-Po for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Nov 2021 07:10:35 +0100 Original-Received: from localhost ([::1]:56474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkgoc-00040B-IJ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Nov 2021 01:10:34 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:52932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkgo6-0003zB-UZ for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 01:10:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkgo6-0002Zk-Lm for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 01:10:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkgo6-0006GN-GW for bug-gnu-emacs@gnu.org; Wed, 10 Nov 2021 01:10: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 06:10: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.163652455724011 (code B ref 51712); Wed, 10 Nov 2021 06:10:02 +0000 Original-Received: (at 51712) by debbugs.gnu.org; 10 Nov 2021 06:09:17 +0000 Original-Received: from localhost ([127.0.0.1]:36733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkgnN-0006FD-3p for submit@debbugs.gnu.org; Wed, 10 Nov 2021 01:09:17 -0500 Original-Received: from sonic301-30.consmr.mail.ne1.yahoo.com ([66.163.184.199]:39593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkgnK-0006Ex-EP for 51712@debbugs.gnu.org; Wed, 10 Nov 2021 01:09:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636524548; bh=SzZF3ofo8CBkZ3CarJ67Ho2fk5tsXeIBdLnZkpG7jTg=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=ar6CpF4jq3aGMr3/FxiRYgFdeHQWXR+zlYi24aa8rcSVto3rMvXb1XEP6x1zDP865kQDg7MmNx/8HLPpV78uzS251RTGb0ua/Ik5ZtqeuovC3ZhdNeZt1yhL8mAu9IzYvcOd15eW4HP6cTN5tl4hw4t3rIBpoD/bFkbfsqaU2uif/jtiTh776q04jqsbRtmHwCrSBAaoa8ygMEmf8qq3bYpwdIX7B8W4hgy5K18bferiuWDipf2QR7bbxpt6tsXMCprGt/YuYlQN0JtT1PAYcseXm/zcx2Z5H9DM3yyGlRu3651PpGw3P8p7Mb8XHH/oEouQMNgnDnQCFZ7toZVH1g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636524548; bh=pofANrrM+F6Vx2YXnMeQP/+7kJM42DcFEq3eW/Bi+Hk=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Q7jX+Y2i4QfJsZIE1OCDJPDije6NLCfOoMrSV9WW1edxgZppM6zWdNP+bhMSnqtl8hgqfop+ynpdp9pHSyGI9TuPC/1NsYqTrPxJyI5Ztinxe9XpfMGfyvfWQQvWwANxhA5lQa783EDFTqSIJttUE+OtSfG4eRGtbYZXXk3NMO959Nf+AteKVzPC4ljBlkw2jAExuEkN9m3H13je1lsRLXwQ+hR2zaE8n/IQZEt3OBXFMobzE72b6jHAoIigiFh2+o+tD1UeEizst6eB63e/AHDh8kBbMp6d/BwCVqJ/3amDGz228J1ouiHllIulO8+25LsGFsJfgCAdU4oemDZ0mg== X-YMail-OSG: qfx8d9EVM1mcaB7irtp8zvuVdWL1yDN0BcH.8yEDlFyJAsTnUwfwVH7z8tZwOwX vg1xVa9HZ73alBur5qKMV2BKZ8GM61l3BAoi1hQ3SZonssYR2LFKAUEIxD0JNp1X70kAS9BignPR VGE_bGwvlfh4A.L8.UQYWdGfXK97w1ReSezDZnjrxxCOiKE1okySfWuYqa1yUrLsImEKZd3VVfW7 OBSeMiE6yxJuQomU4S..KVrAnfXy_gqi25O2KaHEgamiRVGgZwMhMS5st9PE8_vzsPFp45Oo89Jw go4V62l0d9VQmHZ.t0yENvW1co6B0QutCkDTiHj3.0c2uknJsmqzciU.wrnVwqkfYhEEMomxb1u1 fCGPEg7ervPxICnMhoh2fcH_aeo57jdmPDy8KZ2wMhqx6Tw_ZGGf0j8YXciWd1JrpR6m9kcGUO2R vy0AhAXVvG5RjZWD8L9GeJd5K8boDA0ldi4IF59ceBVgMF9JsbMGZmVcqEIG4kRy4cVMotDQMrF7 Ap4XwVAmdsE50MlFMt_HZSzGhY4gjX8SIT7Uv1npNtsCSrRT4nchGkxmY4kMAFP5L7pd7xpcOpRv pSWhuQwq6YzyUNwe8gi8fpujHPogjt40aeQCm4rNUr0XPyE_ihmI.URg9h5.HnTQJ141cH_1DoKI ARx2pRZiKU9kzSRw3I4WE.6IHcD76iTJAX.fxfBH5fPnF7tnxxhF55f_5iLzwBnaxqPRtitSoAdT OiIfuqyX_vI0CqRar7gYgzoEY9MciM38OA5_T65.gry2wOEKv0cbf.GF5DOqrqDFb60Yt4YKgCBQ 5S3ME7sUMn1wUE2VkkgFTOtc1jevbUUFloXJFfeKFt X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ne1.yahoo.com with HTTP; Wed, 10 Nov 2021 06:09:08 +0000 Original-Received: by kubenode515.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID dad8584078955b3105c56876d20b773c; Wed, 10 Nov 2021 06:09:02 +0000 (UTC) In-Reply-To: <87sfw4h7pt.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 10 Nov 2021 06:59:10 +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:219522 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > That should be \"about:blank\" instead, since it's a string and not a > symbol. Thanks, how's this? Eli, does this look good to you? --=-=-= 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,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 described by 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) { @@ -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 --=-=-=--