From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#51883: 29.0.50; Command to get accidentally deleted frames back Date: Mon, 24 Jan 2022 20:12:48 +0200 Organization: LINKOV.NET Message-ID: <8635ld0zq7.fsf@mail.linkov.net> References: <87czn1gfb1.fsf@web.de> <838rxo0zk7.fsf@gnu.org> <86lez73auf.fsf@mail.linkov.net> <86y236vlfm.fsf@mail.linkov.net> <86zgnms469.fsf@mail.linkov.net> 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="37580"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: michael_heerdegen@web.de, Gregory Heytings , 51883@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 24 19:29:54 2022 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 1nC46C-0009bn-NT for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 24 Jan 2022 19:29:52 +0100 Original-Received: from localhost ([::1]:41396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC46B-0008K1-Pa for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 24 Jan 2022 13:29:51 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:41032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC3ul-0005IO-EQ for bug-gnu-emacs@gnu.org; Mon, 24 Jan 2022 13:18:07 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC3uk-0000QJ-LA for bug-gnu-emacs@gnu.org; Mon, 24 Jan 2022 13:18:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nC3uk-0003kA-IA for bug-gnu-emacs@gnu.org; Mon, 24 Jan 2022 13:18:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 24 Jan 2022 18:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51883 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51883-submit@debbugs.gnu.org id=B51883.164304824113233 (code B ref 51883); Mon, 24 Jan 2022 18:18:02 +0000 Original-Received: (at 51883) by debbugs.gnu.org; 24 Jan 2022 18:17:21 +0000 Original-Received: from localhost ([127.0.0.1]:45765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nC3u4-0003Qz-Sx for submit@debbugs.gnu.org; Mon, 24 Jan 2022 13:17:21 -0500 Original-Received: from relay10.mail.gandi.net ([217.70.178.230]:49347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nC3u3-0003L4-8w for 51883@debbugs.gnu.org; Mon, 24 Jan 2022 13:17:20 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id EDF3D24000B; Mon, 24 Jan 2022 18:17:10 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Sun, 23 Jan 2022 16:26:20 -0500") 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:225090 Archived-At: --=-=-= Content-Type: text/plain >> I didn't mean to keep actual frames around. I thought about keeping >> only the same data that is used by `clone-frame` to make a new frame >> identical to the original frame. In case of `undelete-frame` this data >> can be used to make a frame identical to the deleted frame. >> I.e. a lightweight version of framesets, that avoids loading frameset.el. >> This mostly means that after deleting the frame, only frame parameters >> are kept from garbage collection, that later can be reused when making >> a new frame on undeletion. > > Ah, got it, thanks. Then fully agreed. I was heading in the same > direction when I suggested to try and use as little as possible of > `frameset.el` and move the resulting code to `frame.el`. While copying some code from `clone-frame` to `undelete-frame`, I noticed that `clone-frame` doesn't work on non-GTK builds, because window-id frame parameters keep frame-specific X-windows, so `clone-frame` is broken in emacs-28. Eli, is it ok to push the first patch to the release branch? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=clone-frame-fix.patch diff --git a/lisp/frame.el b/lisp/frame.el index 599ffe591a..5de554eee6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -798,8 +798,9 @@ clone-frame (windows (unless no-windows (window-state-get (frame-root-window frame)))) (default-frame-alist - (seq-remove (lambda (elem) (eq (car elem) 'name)) - (frame-parameters frame))) + (seq-remove (lambda (elem) + (memq (car elem) '(name window-id outer-window-id parent-id))) + (frame-parameters frame))) (new-frame (make-frame))) (when windows (window-state-put windows (frame-root-window new-frame) 'safe)) --=-=-= Content-Type: text/plain Then the second patch for master removes the dependency on frameset.el: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=undelete-frame-without-frameset.patch diff --git a/lisp/frame.el b/lisp/frame.el index 599ffe591a..5de554eee6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -2529,8 +2530,6 @@ delete-other-frames (if iconify (iconify-frame this) (delete-frame this))) (setq this next)))) -(eval-when-compile (require 'frameset)) - (defvar undelete-frame--deleted-frames nil "Internal variable used by `undelete-frame--handle-delete-frame'.") @@ -2540,20 +2539,12 @@ undelete-frame--handle-delete-frame (when (frame-live-p frame) (setq undelete-frame--deleted-frames (cons - (cons + (list (display-graphic-p) - (frameset-save - (list frame) - ;; When the daemon is started from a graphical - ;; environment, TTY frames have a 'display' parameter set - ;; to the value of $DISPLAY (see the note in - ;; `server--on-display-p'). Do not store that parameter - ;; in the frameset, otherwise `frameset-restore' attempts - ;; to restore a graphical frame. - :filters (if (display-graphic-p) - frameset-filter-alist - (cons '(display . :never) - frameset-filter-alist)))) + (seq-remove (lambda (elem) + (memq (car elem) '(name window-id outer-window-id parent-id))) + (frame-parameters frame)) + (window-state-get (frame-root-window frame))) undelete-frame--deleted-frames)) (if (> (length undelete-frame--deleted-frames) 16) (setq undelete-frame--deleted-frames @@ -2583,26 +2574,25 @@ undelete-frame (if (consp arg) (user-error "Missing deleted frame number argument") (let* ((number (pcase arg ('nil 1) ('- -1) (_ arg))) - (frames (frame-list)) - (frameset (nth (1- number) undelete-frame--deleted-frames)) + (frame-data (nth (1- number) undelete-frame--deleted-frames)) (graphic (display-graphic-p))) (if (not (<= 1 number 16)) (user-error "%d is not a valid deleted frame number argument" number) - (if (not frameset) + (if (not frame-data) (user-error "No deleted frame with number %d" number) - (if (not (eq graphic (car frameset))) + (if (not (eq graphic (nth 0 frame-data))) (user-error "Cannot undelete a %s display frame on a %s display" (if graphic "non-graphic" "graphic") (if graphic "graphic" "non-graphic")) (setq undelete-frame--deleted-frames - (delq frameset undelete-frame--deleted-frames)) - (frameset-restore (cdr frameset)) - (let ((frame (car (seq-difference (frame-list) frames)))) - (when frame - (select-frame-set-input-focus frame) - frame))))))))) + (delq frame-data undelete-frame--deleted-frames)) + (let* ((default-frame-alist (nth 1 frame-data)) + (frame (make-frame))) + (window-state-put (nth 2 frame-data) (frame-root-window frame) 'safe) + (select-frame-set-input-focus frame) + frame)))))))) ;;; Window dividers. (defgroup window-divider nil --=-=-=--