From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: New function for explictly killing xwidgets Date: Sun, 14 Nov 2021 15:16:18 +0800 Message-ID: <87lf1r8awt.fsf@yahoo.com> References: <8735nz9vk9.fsf.ref@yahoo.com> <8735nz9vk9.fsf@yahoo.com> <83a6i7w6oj.fsf@gnu.org> 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="10812"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 14 08:18:43 2021 Return-path: Envelope-to: ged-emacs-devel@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 1mm9mk-0002Zh-AN for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Nov 2021 08:18:42 +0100 Original-Received: from localhost ([::1]:53516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mm9mi-0004jc-HQ for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Nov 2021 02:18:40 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mm9kh-0003GH-Qy for emacs-devel@gnu.org; Sun, 14 Nov 2021 02:16:35 -0500 Original-Received: from sonic301-30.consmr.mail.ne1.yahoo.com ([66.163.184.199]:34886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mm9kf-00045E-Sl for emacs-devel@gnu.org; Sun, 14 Nov 2021 02:16:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636874190; bh=AazsnnkfMmMjLM+YJfOE49lEWueLRBITYBur5/r0Ylw=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=mr4IBFVKbySU1E2sZf36dpjhpR9l/9WUFKHuNuu85nuqPzejqaghBlpShT3V31J/OjGn3uwfN4gSebC32qAuug3TGcr2VWFvT8e339SJOl4dxggnXFPG2ni8v8EphvoPlVZbBXAuM62x3sXzwXj+2Zf3w1G5Ynxc9ptgepmWsl0PnjjzoPSZXL0UkGxdp6C8FBwR7rGNCfgY3637+nVbweNry0WANMzIn1ZPDyGFH1j1YxmJNvJN2ov7nsDqw/A194BlIE9lsL31qKf+ETRSzjOQQMfn+Jfs0e9zMdNjNWXRRWH7mamw7i/buiCzF/rhijOkg/AYAsm6cRBrjaIpBQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636874190; bh=cWt0gODOvsSBO6vEO/k7V69pyUkTkbpkLgL5cs6WUDR=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mNXuKAkJRfvlIZTfEMIDNjjcO1rHzHp7bkDErStFvxl8PVp3y8yem3hB73dWQ5qk86rZBcpZoteoRwqi/IR1+H3eoZID6Eartkrm4fGL258Pd6zAtlCRrqTLeUPWQsRBDiZMHWBbb1SW3JhMqozh8Rek1UowCPkCFVJ1hAqy14pIXkbc74uBcoDP1y1SzrQILeKbqNUqTC0QOM+l4FrPAowbQEzXpdXATIDs/euU28K54aAsJ0ZPtkljHfTjKO1iog2Fe0kFrDkgm/AeJ7HLIV6X9/NXhJEcR3Cw8IceVrBsaQiA+tUay1c2MrAnRts6kJ+SL9xwyc4vaJUPp6I2vQ== X-YMail-OSG: K8tRFYsVM1khVSgbLWQgRsx_P5hZOur5l0gjdQXnA.aOoDXbUwz2apy4c8E.p_Y 9d_ssGNeiK9LedKk6didh4FjadpNQQtBO9u2OvlsSg1v9NQswjiRKbWGNogHfgiIpFptUfQ9dUgc cKHegdH8wPha7x09azTW_T3cb1hn8l2UjEuyL5BHNqAEpoJ.oh45lUYPDvWNzXUUVCxRzrldVINt n6JfsM8vW8egaH3KApLTvxl1zfEIgZA0s8v5rbK8dLTW2al5vTwzUmjA9pT5wPXsyZrYuHFcAflT 87RrGLZn5cKZQEpopYd4hmH3nwO.xnX5i4pC1XhVYaDWiUwZ7ZuJgRfpB7.mG4jMGTby.EiWWM9Y bkhuxUo0NP7xNmTn4TmnkFAlOLkFN7GDvb6SQ5YCGC9Uzf7WGANReY0yIspIqPTbOvlf5ioxh9R. cvpGYp9E5PtUFkOnsoQEoamqpllZzNgNfwUH69xjLQGShiBvm_JNpY5BMJIO2hAaH5hrSxngZ26P MURKN1Ut_EuPyfcZkYAtRodH.4fnZ6ksgXjUa487BEfXnJPQraUSs5EfLFIFuOUL1LFwzhaMr7d6 sdbGSgI6W5AQ8lNpF79HRnhQOMkoXBaWDZP_ih_Iz6B3mUhKupmWntAlNwamR.cTmuNVIyXrMWv8 uzrXuC4p7YZHCNOw4ETDXt6SzN5TLmPTKdnxCjzsDHQ9urmmuE2N3Pym_ysnT9bDNe0eFhPCbB2G rSSZ78gnAuB9OuP.i8EwhcnxfO.8MklXt4zgqYZTkPxtS6Y1obXl.M_aIz222KquER_E0c0r8jBf mnoK3HK3gggWjcM4iYTw5zVhhrkUcn.J_J6GPvAf1E X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ne1.yahoo.com with HTTP; Sun, 14 Nov 2021 07:16:30 +0000 Original-Received: by kubenode515.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 44931746cf2145407b21a8985996ec85; Sun, 14 Nov 2021 07:16:23 +0000 (UTC) In-Reply-To: <83a6i7w6oj.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 14 Nov 2021 09:13:48 +0200") X-Mailer: WebService/1.1.19306 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.184.199; envelope-from=luangruo@yahoo.com; helo=sonic301-30.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:279385 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Po Lu >> Date: Sun, 14 Nov 2021 13:04:54 +0800 >> >> * doc/lispref/display.texi (Xwidgets): Document changes. > > This should say "Document 'kill-xwidget'." > >> +DEFUN ("kill-xwidget", Fkill_xwidget, Skill_xwidget, >> + 1, 1, 0, >> + doc: /* Kill live xwidget XWIDGET. > > One of the two "xwidget"s is redundant. Our style in these cases is > like this: > > Kill the specified XWIDGET. > >> + if (!NILP (xw->script_callbacks)) >> + for (ptrdiff_t idx = 0; idx < ASIZE (xw->script_callbacks); idx++) > > It is better to use braces around the for-loop, although strictly > speaking they aren't needed here. But the code reads easier with > them. Thanks, how does this look to you? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-kill-xwidget.patch >From fc2282c058c58927afff78f42609a73583b4ddab Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 14 Nov 2021 13:02:41 +0800 Subject: [PATCH] Add `kill-xwidget' * doc/lispref/display.texi (Xwidgets): Document 'kill-xwidget'. * src/xwidget.c (kill_xwidget, Fkill_xwidget): New function. (syms_of_xwidget): Define new subr. (kill_buffer_xwidgets): Use `kill_xwidget' instead. --- doc/lispref/display.texi | 14 +++++-- src/xwidget.c | 81 ++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 28 deletions(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index a8a7837a4a..3ab29dc591 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6806,10 +6806,11 @@ Xwidgets subprocesses with. The xwidget that is returned will be killed alongside its buffer -(@pxref{Killing Buffers}). Once it is killed, the xwidget may -continue to exist as a Lisp object and act as a @code{display} -property until all references to it are gone, but most actions that -can be performed on live xwidgets will no longer be available. +(@pxref{Killing Buffers}). You can also kill it using +@code{xwidget-kill}. Once it is killed, the xwidget may continue to +exist as a Lisp object and act as a @code{display} property until all +references to it are gone, but most actions that can be performed on +live xwidgets will no longer be available. @end defun @defun xwidgetp object @@ -6822,6 +6823,11 @@ Xwidgets hasn't been killed, and @code{nil} otherwise. @end defun +@defun kill-xwidget xwidget +This function kills @var{xwidget}, by removing it from its buffer and +releasing window system resources it holds. +@end defun + @defun xwidget-plist xwidget This function returns the property list of @var{xwidget}. @end defun diff --git a/src/xwidget.c b/src/xwidget.c index 609a231d4b..344016ed74 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -76,6 +76,8 @@ #define XSETXWIDGET_VIEW(a, b) XSETPSEUDOVECTOR (a, b, PVEC_XWIDGET_VIEW) static struct xwidget_view *xwidget_view_lookup (struct xwidget *, struct window *); +static void kill_xwidget (struct xwidget *); + #ifdef USE_GTK static void webkit_view_load_changed_cb (WebKitWebView *, WebKitLoadEvent, @@ -2386,6 +2388,25 @@ DEFUN ("xwidget-webkit-finish-search", Fxwidget_webkit_finish_search, return Qnil; } +DEFUN ("kill-xwidget", Fkill_xwidget, Skill_xwidget, + 1, 1, 0, + doc: /* Kill the specified XWIDGET. +This releases all window system resources associated with XWIDGET, +removes it from `xwidget-list', and detaches it from its buffer. */) + (Lisp_Object xwidget) +{ + struct xwidget *xw; + + CHECK_LIVE_XWIDGET (xwidget); + xw = XXWIDGET (xwidget); + + block_input (); + kill_xwidget (xw); + unblock_input (); + + return Qnil; +} + #ifdef USE_GTK DEFUN ("xwidget-webkit-load-html", Fxwidget_webkit_load_html, Sxwidget_webkit_load_html, 2, 3, 0, @@ -2468,6 +2489,7 @@ syms_of_xwidget (void) #ifdef USE_GTK defsubr (&Sxwidget_webkit_load_html); #endif + defsubr (&Skill_xwidget); DEFSYM (QCxwidget, ":xwidget"); DEFSYM (QCtitle, ":title"); @@ -2708,6 +2730,40 @@ kill_frame_xwidget_views (struct frame *f) } #endif +static void +kill_xwidget (struct xwidget *xw) +{ +#ifdef USE_GTK + xw->buffer = Qnil; + + if (xw->widget_osr && xw->widgetwindow_osr) + { + gtk_widget_destroy (xw->widget_osr); + gtk_widget_destroy (xw->widgetwindow_osr); + } + + if (xw->find_text) + xfree (xw->find_text); + + if (!NILP (xw->script_callbacks)) + { + for (ptrdiff_t idx = 0; idx < ASIZE (xw->script_callbacks); idx++) + { + Lisp_Object cb = AREF (xw->script_callbacks, idx); + if (!NILP (cb)) + xfree (xmint_pointer (XCAR (cb))); + ASET (xw->script_callbacks, idx, Qnil); + } + } + + xw->widget_osr = NULL; + xw->widgetwindow_osr = NULL; + xw->find_text = NULL; +#elif defined NS_IMPL_COCOA + nsxwidget_kill (xw); +#endif +} + /* Kill all xwidget in BUFFER. */ void kill_buffer_xwidgets (Lisp_Object buffer) @@ -2721,31 +2777,8 @@ kill_buffer_xwidgets (Lisp_Object buffer) { CHECK_LIVE_XWIDGET (xwidget); struct xwidget *xw = XXWIDGET (xwidget); - xw->buffer = Qnil; - -#ifdef USE_GTK - if (xw->widget_osr && xw->widgetwindow_osr) - { - gtk_widget_destroy (xw->widget_osr); - gtk_widget_destroy (xw->widgetwindow_osr); - } - if (xw->find_text) - xfree (xw->find_text); - if (!NILP (xw->script_callbacks)) - for (ptrdiff_t idx = 0; idx < ASIZE (xw->script_callbacks); idx++) - { - Lisp_Object cb = AREF (xw->script_callbacks, idx); - if (!NILP (cb)) - xfree (xmint_pointer (XCAR (cb))); - ASET (xw->script_callbacks, idx, Qnil); - } - xw->widget_osr = NULL; - xw->widgetwindow_osr = NULL; - xw->find_text = NULL; -#elif defined NS_IMPL_COCOA - nsxwidget_kill (xw); -#endif + kill_xwidget (xw); } } } -- 2.31.1 --=-=-=--