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#47300: delete-window to select window with same position Date: Thu, 27 May 2021 00:29:36 +0300 Organization: LINKOV.NET Message-ID: <87v9752n4r.fsf@mail.linkov.net> References: <87a6qw43gg.fsf@mail.linkov.net> <87pmxodrmq.fsf@gnus.org> <7f870f9b-95ad-6b5d-82aa-1bcfe5cc880a@gmx.at> <87fsyk0w92.fsf@mail.linkov.net> <2ec3b911-4fb1-4b13-a5b8-28278a5c43ba@gmx.at> <87h7iyzvh5.fsf@mail.linkov.net> <0c239adb-e9d5-1fe9-4c4c-2da1603002f7@gmx.at> <87mtsmmpey.fsf@mail.linkov.net> <1032ab23-3905-1b3f-917c-60ccd12337b3@gmx.at> 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="17476"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: Lars Ingebrigtsen , 47300@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 26 23:53:09 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 1lm1Sf-0004Q9-BW for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 26 May 2021 23:53:09 +0200 Original-Received: from localhost ([::1]:41416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm1Se-0001CX-Cr for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 26 May 2021 17:53:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm1Gw-0004lJ-Q5 for bug-gnu-emacs@gnu.org; Wed, 26 May 2021 17:41:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lm1Gw-0003SX-6n for bug-gnu-emacs@gnu.org; Wed, 26 May 2021 17:41:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lm1Gw-0004Vq-4f for bug-gnu-emacs@gnu.org; Wed, 26 May 2021 17:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 May 2021 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47300 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 47300-submit@debbugs.gnu.org id=B47300.162206523117281 (code B ref 47300); Wed, 26 May 2021 21:41:02 +0000 Original-Received: (at 47300) by debbugs.gnu.org; 26 May 2021 21:40:31 +0000 Original-Received: from localhost ([127.0.0.1]:50059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lm1GR-0004Ue-Dn for submit@debbugs.gnu.org; Wed, 26 May 2021 17:40:31 -0400 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:38789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lm1GO-0004UO-FM for 47300@debbugs.gnu.org; Wed, 26 May 2021 17:40:29 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 80BE2C0006; Wed, 26 May 2021 21:40:20 +0000 (UTC) In-Reply-To: <1032ab23-3905-1b3f-917c-60ccd12337b3@gmx.at> (martin rudalics's message of "Tue, 25 May 2021 08:50:23 +0200") 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:207321 Archived-At: --=-=-= Content-Type: text/plain >> I don't know why, but sometimes `window-at' returns 'nil'. > > `window-at' is pretty useless anyway. Try the below instead. > > (defun window-at-pos (x y &optional frame) Thanks. Now after tweaking I finally found what changes would make the workable version: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=delete-window-use-posn.patch diff --git a/lisp/window.el b/lisp/window.el index fd1c617d6b..81a770ff32 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4140,6 +4140,23 @@ window--in-subtree-p (throw 'done t) (setq parent (window-parent parent)))))))) +(defun window-at-pos (x y &optional frame) + "Return live window at position X, Y on specified FRAME. +X and Y are counted in pixels from the origin at 0, 0 of FRAME's +native frame. FRAME must specify a live frame and defaults to +the selected one. Return nil if no such window can be found." + (setq frame (window-normalize-frame frame)) + (catch 'window + (walk-window-tree + (lambda (window) + (let ((edges (window-edges window nil nil t))) + (when (and (>= x (nth 0 edges)) (< x (nth 2 edges)) + (>= y (nth 1 edges)) (< y (nth 3 edges))) + (throw 'window window)))) + frame nil nil))) + +(defvar delete-window-use-posn-at-point t) + (defun delete-window (&optional window) "Delete WINDOW. WINDOW must be a valid window and defaults to the selected one. @@ -4162,7 +4179,7 @@ delete-window (let* ((frame (window-frame window)) (function (window-parameter window 'delete-window)) (parent (window-parent window)) - atom-root) + atom-root posn-at-point-x posn-at-point-y window-at-posn-at-point) (window--check frame) (catch 'done ;; Handle window parameters. @@ -4211,10 +4228,22 @@ delete-window (t ;; Can't do without resizing fixed-size windows. (window--resize-siblings window (- size) horizontal t))) + (when delete-window-use-posn-at-point + ;; Remember WINDOW's position at point. + (let ((edges (window-edges window nil nil t)) + (posn-at-point (nth 2 (posn-at-point nil window)))) + (when posn-at-point + (setq posn-at-point-x (+ (nth 0 edges) (car posn-at-point)) + posn-at-point-y (+ (nth 1 edges) (cdr posn-at-point)))))) ;; Actually delete WINDOW. (delete-window-internal window) (window--pixel-to-total frame horizontal) - (when (and frame-selected + (when (and posn-at-point-x posn-at-point-y + (setq window-at-posn-at-point + (window-at-pos posn-at-point-x posn-at-point-y frame))) + ;; Select window at WINDOW's position at point. + (select-window window-at-posn-at-point)) + (when (and frame-selected (window-parameter (frame-selected-window frame) 'no-other-window)) ;; `delete-window-internal' has selected a window that should --=-=-=--