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: Thu, 27 Jan 2022 19:19:45 +0200 Organization: LINKOV.NET Message-ID: <86wnil85iy.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> <8635ld0zq7.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="11854"; 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 Thu Jan 27 18:48:20 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 1nD8sd-0002yc-5K for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 27 Jan 2022 18:48:19 +0100 Original-Received: from localhost ([::1]:56626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD8sb-0002er-Ns for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 27 Jan 2022 12:48:18 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD8W6-0000Pf-Qm for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2022 12:25:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35306) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD8W6-00067T-GO for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2022 12:25:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nD8W6-0003jw-At for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2022 12:25: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: Thu, 27 Jan 2022 17:25: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.164330428914333 (code B ref 51883); Thu, 27 Jan 2022 17:25:02 +0000 Original-Received: (at 51883) by debbugs.gnu.org; 27 Jan 2022 17:24:49 +0000 Original-Received: from localhost ([127.0.0.1]:56436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD8Vt-0003j7-8D for submit@debbugs.gnu.org; Thu, 27 Jan 2022 12:24:49 -0500 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:46249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD8Vr-0003if-Vs for 51883@debbugs.gnu.org; Thu, 27 Jan 2022 12:24:48 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id A0F30C0004; Thu, 27 Jan 2022 17:24:38 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Mon, 24 Jan 2022 18:00:12 -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:225372 Archived-At: --=-=-= Content-Type: text/plain >> - (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))) > > Could you move this list into a variable and then use it in > `frameset.el` when computing `frameset-persistent-filter-alist` (tho > I suspect they should be in `frameset-session-filter-alist` even they > currently aren't in there, which might be a bug in `frameset.el`). Done in this patch (for master): --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=frame-internal-parameters.patch diff --git a/src/frame.c b/src/frame.c index 8aaff949ba..b0b9d1184e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -6495,6 +6495,14 @@ focus (where a frame immediately loses focus when it's left by the mouse iconify the top level frame instead. */); iconify_child_frame = Qiconify_top_level; + DEFVAR_LISP ("frame-internal-parameters", frame_internal_parameters, + doc: /* Frame parameters specific to every frame. */); +#ifdef HAVE_X_WINDOWS + frame_internal_parameters = list4 (Qname, Qparent_id, Qwindow_id, Qouter_window_id); +#else + frame_internal_parameters = list3 (Qname, Qparent_id, Qwindow_id); +#endif + defsubr (&Sframep); defsubr (&Sframe_live_p); defsubr (&Swindow_system); diff --git a/lisp/frameset.el b/lisp/frameset.el index 10714af1fa..05884eed3a 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -436,10 +436,11 @@ frameset-prop ;;;###autoload (defvar frameset-session-filter-alist - '((name . :never) - (left . frameset-filter-iconified) - (minibuffer . frameset-filter-minibuffer) - (top . frameset-filter-iconified)) + (append + '((left . frameset-filter-iconified) + (minibuffer . frameset-filter-minibuffer) + (top . frameset-filter-iconified)) + (mapcar (lambda (p) (cons p :never)) frame-internal-parameters)) "Minimum set of parameters to filter for live (on-session) framesets. DO NOT MODIFY. See `frameset-filter-alist' for a full description.") @@ -468,14 +469,11 @@ frameset-persistent-filter-alist (GUI:height . frameset-filter-unshelve-param) (GUI:width . frameset-filter-unshelve-param) (height . frameset-filter-shelve-param) - (outer-window-id . :never) (parent-frame . :never) - (parent-id . :never) (mouse-wheel-frame . :never) (tty . frameset-filter-tty-to-GUI) (tty-type . frameset-filter-tty-to-GUI) (width . frameset-filter-shelve-param) - (window-id . :never) (window-system . :never)) frameset-session-filter-alist) "Parameters to filter for persistent framesets. diff --git a/lisp/frame.el b/lisp/frame.el index 599ffe591a..d9b21783b9 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) frame-internal-parameters)) + (frame-parameters frame))) (new-frame (make-frame))) (when windows (window-state-put windows (frame-root-window new-frame) 'safe)) @@ -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) frame-internal-parameters)) + (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 --=-=-=--