Skip to content

Refine frame handler logic for frame name and geometry #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shipmints wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refine frame handler logic for frame name and geometry #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,11 @@ bufferlo. Refer to each option's documentation for additional
settings.

#+begin_src emacs-lisp
;; make a new frame to hold loaded frame bookmarks
;; make a new frame, or reuse the current frame to hold loaded frame bookmarks
(setq bufferlo-bookmark-frame-load-make-frame nil) ; reuse the current frame
(setq bufferlo-bookmark-frame-load-make-frame t) ; default is nil for backward compatibility
(setq bufferlo-bookmark-frame-load-make-frame 'restore-geometry)
(setq bufferlo-bookmark-frame-load-make-frame 'restore-geometry) ; make a new frame and restore geometry
(setq bufferlo-bookmark-frame-load-make-frame 'reuse-restore-geometry) ; reuse the current frame and restore geometry
#+end_src
#+begin_src emacs-lisp
;; policy when loading onto an already bookmarked frame
Expand Down
54 changes: 35 additions & 19 deletions bufferlo.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,22 @@ This overrides buffers excluded by `bufferlo-bookmark-buffers-exclude-filters'."
:type '(repeat regexp))

(defcustom bufferlo-bookmark-frame-load-make-frame nil
"If non-nil, create a new frame to hold a loaded frame bookmark.
Set to \\='restore-geometry to restore the frame geometry to that
when it was last saved."
"Frame bookmark loading frame and geometry policy.
If nil, reuse the existing frame.

If non-nil, create a new frame to hold a loaded frame bookmark.

If \\='restore-geometry, create a new frame and restore the frame
geometry to that when it was last saved.

If \\='reuse-restore-geometry, reuse the existing frame and restore the
frame geometry to that when it was last saved."
:package-version '(bufferlo . "1.1")
:type '(radio (const :tag "Make a new frame" t)
(const :tag "Make a new frame and restore its geometry"
restore-geometry)
(const :tag "Reuse the current frame, and restore its geometry"
reuse-restore-geometry)
(const :tag "Reuse the current frame" nil)))

(defcustom bufferlo-delete-frame-kill-buffers-prompt nil
Expand Down Expand Up @@ -2954,7 +2963,12 @@ Returns nil on success, non-nil on abort."
(let* ((bookmark-name (bookmark-name-from-full-record bookmark))
(abm (assoc bookmark-name (bufferlo--active-bookmarks)))
(fbm (frame-parameter nil 'bufferlo-bookmark-frame-name))
(new-frame-p (and bufferlo-bookmark-frame-load-make-frame ; nil if set loading
(new-frame-p (and (not bufferlo--bookmark-set-loading)
(or
(eq bufferlo-bookmark-frame-load-make-frame
'restore-geometry)
(eq bufferlo-bookmark-frame-load-make-frame
t))
;; User make-frame suppression
(not (consp current-prefix-arg))
;; make-frame implied by functions like
Expand Down Expand Up @@ -3013,17 +3027,20 @@ Returns nil on success, non-nil on abort."
'restore-geometry))
(selected-frame))))
(with-selected-frame frame
(when new-frame-p
;; Restore name
(when bufferlo-bookmark-frame-persist-frame-name
(when-let* ((frame-name (alist-get 'bufferlo--frame-name bookmark)))
(set-frame-name frame-name)))
;; Restore geometry
(when (and (display-graphic-p)
(eq bufferlo-bookmark-frame-load-make-frame
'restore-geometry))
(when-let* ((fg (alist-get 'bufferlo--frame-geometry bookmark)))
(funcall bufferlo-set-frame-geometry-function fg))))
;; Restore name
(when bufferlo-bookmark-frame-persist-frame-name
(when-let* ((frame-name (alist-get 'bufferlo--frame-name bookmark)))
(set-frame-name frame-name)))
;; Restore geometry
(when (and (display-graphic-p)
(or (and new-frame-p
(eq bufferlo-bookmark-frame-load-make-frame
'restore-geometry))
(and (not new-frame-p)
(eq bufferlo-bookmark-frame-load-make-frame
'reuse-restore-geometry))))
(when-let* ((fg (alist-get 'bufferlo--frame-geometry bookmark)))
(funcall bufferlo-set-frame-geometry-function fg)))

;; Clear existing tabs unless merging
(unless (eq load-policy 'merge)
Expand Down Expand Up @@ -3079,10 +3096,10 @@ Returns nil on success, non-nil on abort."
'bufferlo-bookmark-frame-handler-functions
bookmark-name
fbm
new-frame-p
(or new-frame-p bufferlo--bookmark-set-loading)
frame)))

(unless (or new-frame-p pop-up-frames)
(unless (or new-frame-p bufferlo--bookmark-set-loading pop-up-frames)
;; Switch to the to-be-selected buffer in the current frame.
;; This is a workaround for bookmark-jump if called with display-func
;; set to something like pop-to-buffer-same-window (the default).
Expand Down Expand Up @@ -3451,8 +3468,7 @@ Returns nil on success, non-nil on abort."
(if (and ignore-already-active
(member fbm-name already-abm-names))
(delete-frame)
(let ((bufferlo-bookmark-frame-load-make-frame nil)
(bufferlo-bookmark-frame-load-policy
(let ((bufferlo-bookmark-frame-load-policy
'replace-frame-adopt-loaded-bookmark)
(bufferlo--bookmark-handler-no-message t))
;; NOTE: bufferlo--bookmark-frame-handler disallows raise
Expand Down