aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-05-27 20:48:12 -0500
committerCraig Jennings <c@cjennings.net>2026-05-27 20:48:12 -0500
commit7833fb8bc0e3f9ece01ab2fe6fe07ded0efc4af4 (patch)
tree28234f51c546258fa57d40fe02bf0d30280182f1 /modules
parent822e7a3798d431910eeff677ae751eff8b48731a (diff)
downloaddotemacs-7833fb8bc0e3f9ece01ab2fe6fe07ded0efc4af4.tar.gz
dotemacs-7833fb8bc0e3f9ece01ab2fe6fe07ded0efc4af4.zip
fix(vterm): never reopen the F9/F12 windows from the top
F9 brought the agent window down from the top of the frame. The toggle remembers where the window last sat and replays it, and "above" was a position it could capture and replay: move the window to the top with the buffer-move keys, toggle off, and the next toggle reopened it up there. The host default never picks the top, so a remembered "above" was the only way in. I added an optional allowed-directions list to cj/window-toggle-capture-state, the helper both F9 (ai-vterm) and F12 (vterm-config) share. When the captured direction isn't in the list, it falls back to the default direction and clears the saved size, since that size was measured on the disallowed axis and wouldn't transfer. Both dispatchers now pass (right below left), so neither can remember a top placement. They go through the same helper, so the rule stays in one place. Three tests cover the new branch: a permitted direction is kept, a disallowed one falls back with the size cleared, and an omitted list preserves the old unconstrained behavior so existing callers are unaffected.
Diffstat (limited to 'modules')
-rw-r--r--modules/ai-vterm.el14
-rw-r--r--modules/cj-window-toggle-lib.el23
-rw-r--r--modules/vterm-config.el9
3 files changed, 33 insertions, 13 deletions
diff --git a/modules/ai-vterm.el b/modules/ai-vterm.el
index d932b0e9..70395ecc 100644
--- a/modules/ai-vterm.el
+++ b/modules/ai-vterm.el
@@ -391,10 +391,13 @@ on a desktop -- pairing with the axis chosen by
(defvar cj/--ai-vterm-last-direction nil
"Last user-chosen direction for the AI-vterm display.
-Symbol: right, below, left, or above. nil means no agent window
-has been toggled off yet this session, so the default direction
-applies. Captured at toggle-off by `cj/--ai-vterm-capture-state'
-and consumed by `cj/--ai-vterm-display-saved'.")
+Symbol: right, below, or left. `above' is never stored -- the agent
+window must not be remembered at the top of the frame, so a top
+placement falls back to the host default at capture time. nil means no
+agent window has been toggled off yet this session, so the default
+direction applies. Captured at toggle-off by
+`cj/--ai-vterm-capture-state' and consumed by
+`cj/--ai-vterm-display-saved'.")
(defvar cj/--ai-vterm-last-was-bury nil
"Non-nil when the last F9 toggle-off used `bury-buffer'.
@@ -444,7 +447,8 @@ is not live."
(cj/window-toggle-capture-state
window (cj/--ai-vterm-default-direction)
'cj/--ai-vterm-last-direction
- 'cj/--ai-vterm-last-size))
+ 'cj/--ai-vterm-last-size
+ '(right below left)))
(defun cj/--ai-vterm-reuse-existing-agent (buffer _alist)
"Display-buffer action: reuse any window in this frame already showing
diff --git a/modules/cj-window-toggle-lib.el b/modules/cj-window-toggle-lib.el
index ef57e5cf..9874a134 100644
--- a/modules/cj-window-toggle-lib.el
+++ b/modules/cj-window-toggle-lib.el
@@ -20,7 +20,8 @@
(require 'cj-window-geometry-lib)
(defun cj/window-toggle-capture-state (window default-direction
- direction-var size-var)
+ direction-var size-var
+ &optional allowed)
"Write WINDOW's direction and body size into DIRECTION-VAR and SIZE-VAR.
DEFAULT-DIRECTION is the symbol used by `cj/window-direction' when
@@ -28,12 +29,24 @@ WINDOW fills its frame's root area. DIRECTION-VAR and SIZE-VAR are
the symbols of the consumer's state variables; they receive the
captured values via `set'.
+ALLOWED, when non-nil, is a list of permitted direction symbols. If
+WINDOW's captured direction isn't in it, fall back to DEFAULT-DIRECTION
+and clear SIZE-VAR (set to nil) so the consumer's default size applies --
+the captured body size was measured on the disallowed axis and wouldn't
+transfer meaningfully. A consumer that wants to forbid a placement (e.g.
+an agent window that should never be remembered at the top of the frame)
+passes the directions it does allow. Omit ALLOWED to keep every
+direction.
+
No-op when WINDOW is nil or not live."
(when (window-live-p window)
- (let* ((dir (cj/window-direction window default-direction))
- (size (cj/window-body-size window dir)))
- (set direction-var dir)
- (set size-var size))))
+ (let ((dir (cj/window-direction window default-direction)))
+ (if (or (null allowed) (memq dir allowed))
+ (progn
+ (set direction-var dir)
+ (set size-var (cj/window-body-size window dir)))
+ (set direction-var default-direction)
+ (set size-var nil)))))
(defun cj/window-toggle-display-saved (buffer alist
direction-var default-direction
diff --git a/modules/vterm-config.el b/modules/vterm-config.el
index e7965c65..c8a57d30 100644
--- a/modules/vterm-config.el
+++ b/modules/vterm-config.el
@@ -341,8 +341,10 @@ Used as the size fallback when `cj/--vterm-toggle-last-size' is nil
(defvar cj/--vterm-toggle-last-direction nil
"Last user-chosen direction for the F12 vterm display.
-Symbol: right, left, below, above. nil means use the default
-`below' for F12's traditional bottom split.")
+Symbol: right, left, or below. `above' is never stored -- a top
+placement falls back to `below' at capture time, so F12 never reopens
+from the top. nil means use the default `below' for F12's traditional
+bottom split.")
(defvar cj/--vterm-toggle-last-size nil
"Last user-chosen body size for the F12 vterm display.
@@ -384,7 +386,8 @@ split when WINDOW fills the frame's root area."
(cj/window-toggle-capture-state
window 'below
'cj/--vterm-toggle-last-direction
- 'cj/--vterm-toggle-last-size))
+ 'cj/--vterm-toggle-last-size
+ '(right below left)))
(defun cj/--vterm-toggle-display-saved (buffer alist)
"Display-buffer action: split per saved direction and body size.