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: New function for explictly killing xwidgets Date: Sun, 14 Nov 2021 13:04:54 +0800 Message-ID: <8735nz9vk9.fsf@yahoo.com> References: <8735nz9vk9.fsf.ref@yahoo.com> 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="36347"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 14 06:06:21 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 1mm7if-0009GL-0I for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Nov 2021 06:06:21 +0100 Original-Received: from localhost ([::1]:32824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mm7id-0007Xk-8r for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Nov 2021 00:06:19 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mm7hT-0006fG-Du for emacs-devel@gnu.org; Sun, 14 Nov 2021 00:05:07 -0500 Original-Received: from sonic317-34.consmr.mail.ne1.yahoo.com ([66.163.184.45]:34219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mm7hP-0006qS-RG for emacs-devel@gnu.org; Sun, 14 Nov 2021 00:05:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636866301; bh=/bSNJf43WfA0x5lv4AUvSMtm2JUSmtZX8zNRoj9irew=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=ibh31DvHwTC8RtPWTFpdoG6cNiuYMlfuyPeptuu8MbSk/IJGQTy4re6Bz/Eh2xJuLaLg2PqDSPgrsDxcAY6BXIxFM3g5Y0981YpIzh6QoqUYKqj33TCHbdeobA4NNrhIjEWhmokiGE5aHs3Z2PxLSdlokCyHlMGp0kYcHx0zp8fPzICGweNa9k7vUJe6q51iBYpexsk5HydRnjiGErZ+8uBpktzEXx47YK7p6ilkrzDu7gQ0HpeeqSs1TWDtfztXLGur2suRzYYdEe12FRcwQAPC1UGKRDp95ran4V2H0BZZjC184WRBB0a0GXQN8pfnxzyj4/ihku0FqQYN5G/TlQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1636866301; bh=tKt9QTL6ziuEz0swh5wpGTFubaeyoOB72/vYnnMf1qk=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mGaiLXeZpukNvuha5t2hAr3TfZPl4Ddqd3dpJP18xzVS0oQWNIhwNBnyDUbmXFfbl0/7Pm4AT8cPlRCnWUi4a0Kfzz+yUyLu7CYE1vfJK+jE28mxyL6J2cdBtT8HiGz6Nws/SR7nzxLK6a1Y7lWANQyUg51WSHuh32xwvVn2QziLCPph02dz1Lz2e+B2esh3IMZPmXh54J7yF/Zxy4+Xj7xMFVRokzuWTcT/LDIufVDBkVOy4kNff25PDmgzSQbIbFrz2PYt9psBiMQxDCvHRyzY7JDpJg7/qbHU+BNYJvUU8SL081PHpMNr7xtN+eHGArWWxuDpI9G/OYQs5o9l9Q== X-YMail-OSG: gZutl4EVM1mMMGtulM8RvgvpCc4yGTYprZLxgWrkpHbpEZMMmRkrBlrFs250D9h AnY3v4gKNiJVsXtcix6eEx6Ds6_TDTcLOddU36GN2.xb3hAYUwrem1kUG4h1yAaz_eZFYXm7aryX JlREk2pRY5qFVzaWaIO1JGkdxsXrJ.Devj.u9NA9Iw2mwLt1KdGbY3FN5NbvWmQK7SQg32R9CTKK EBxqCAk56lVOT6WMRJgIkQ9c3DPE7dsisxw_QMzu1VEyp1U1eNgdwPV11ayTXOwPev5_sjpUixBE oKRoN2MXf6L3ZRVM.eXZQCjjzHNIkciL2.m_7O3cqEN_Ia4VGBsegLB3fwUFvPxD2yLzqlqHKHxO ljPlXFBRqs16ZTu.Ega0p5xw6qlsOkDbJ_24EIvqRkKQw6qSx2pFtQFFt6i4CYrgDC0YNzXhADKD _jtUpDuL6l8agB2akkhqxrFwaAla4tAq985lKPftFH1TFBiJZFQCv5S3SqBX9ExNobNIp0KZZTsP 29YT8usDurn01xFtIfS__wjDbJiwa6Hxki1Y4UVB4NocNN54mnUK8TBaMfKzzEdJ0KeGdY10oYh2 i_8VgOcl867J7iLETn1nBfUzs6cCwAtOEkvIRsL5295WDQf6RGzdY.P3KJ8KB5RrV4C0k48o5UN3 Ia0uifn6T8d19qu12otgGHov0muQyBXBSbGQI5qwLbu5JUC6hya7VCDfVHVs7SGF9YOX6lbmXDwH S2xykxlVr39KTnL4iW_7_QtMROSmTvQKOR0PKmD1dQkZiNdTN3IMIlz_ch42vNt1y2EDZoabLYyj xhecJ7tvglbpYz_aLzFAiqjqjsIMhuSBTunrfSpNro X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.ne1.yahoo.com with HTTP; Sun, 14 Nov 2021 05:05:01 +0000 Original-Received: by kubenode508.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID dd87cc9348d6c1e58961f61eaa91fd2a; Sun, 14 Nov 2021 05:04:58 +0000 (UTC) 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.45; envelope-from=luangruo@yahoo.com; helo=sonic317-34.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:279373 Archived-At: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-xwidget-kill.patch >From 60a3d0592c34a0fefc6246eb02b5f903273f49ab Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 14 Nov 2021 13:02:41 +0800 Subject: [PATCH] Add `xwidget-kill' * doc/lispref/display.texi (Xwidgets): Document changes. * 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 | 77 +++++++++++++++++++++++++++------------- 2 files changed, 63 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..00fd1e47ca 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 live xwidget 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,36 @@ 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 +2773,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 --=-=-= Content-Type: text/plain I would like to install this change if everyone thinks it's fine. It adds a function `kill-xwidget', which allows Lisp code to kill a single xwidget without killing the buffer it is attached to. Thanks. --=-=-=--