Rewrite popup handling + new minor mode: doom-hide-mode-line-mode
This commit is contained in:
Henrik Lissner
parent
774d61be68
commit
8a666aedfe
15 changed files with 366 additions and 379 deletions
|
|
@ -170,5 +170,83 @@
|
|||
(hs-toggle-hiding)
|
||||
(call-interactively 'evilmi-jump-items)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*evil-command-window (hist cmd-key execute-fn)
|
||||
"The evil command window has a mind of its own (uses `switch-to-buffer'). We
|
||||
monkey patch it to use pop-to-buffer."
|
||||
(when (eq major-mode 'evil-command-window-mode)
|
||||
(user-error "Cannot recursively open command line window"))
|
||||
(dolist (win (window-list))
|
||||
(when (equal (buffer-name (window-buffer win))
|
||||
"*Command Line*")
|
||||
(kill-buffer (window-buffer win))
|
||||
(delete-window win)))
|
||||
(setq evil-command-window-current-buffer (current-buffer))
|
||||
(ignore-errors (kill-buffer "*Command Line*"))
|
||||
(with-current-buffer (pop-to-buffer "*Command Line*")
|
||||
(setq-local evil-command-window-execute-fn execute-fn)
|
||||
(setq-local evil-command-window-cmd-key cmd-key)
|
||||
(evil-command-window-mode)
|
||||
(evil-command-window-insert-commands hist)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*evil-esc-quit ()
|
||||
"Close popups, disable search highlights and quit the minibuffer if open."
|
||||
(let ((minib-p (minibuffer-window-active-p (minibuffer-window)))
|
||||
(evil-hl-p (evil-ex-hl-active-p 'evil-ex-search)))
|
||||
(when minib-p (abort-recursive-edit))
|
||||
(when evil-hl-p (evil-ex-nohighlight))
|
||||
;; Close non-repl popups and clean up `doom-popup-windows'
|
||||
(unless (or minib-p evil-hl-p (bound-and-true-p doom-popup-mode))
|
||||
(doom/popup-close-all))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*evil-ex-replace-special-filenames (file-name)
|
||||
"Replace special symbols in FILE-NAME."
|
||||
(let ((case-fold-search nil)
|
||||
(regexp (concat "\\(?:^\\|[^\\\\]\\)"
|
||||
"\\([#%@]\\)"
|
||||
"\\(\\(?::\\(?:[phtreS~.]\\|g?s[^: $]+\\)\\)*\\)")))
|
||||
(dolist (match (s-match-strings-all regexp file-name))
|
||||
(let ((flags (split-string (caddr match) ":" t))
|
||||
(path (file-relative-name
|
||||
(pcase (cadr match)
|
||||
("@" (doom/project-root))
|
||||
("%" (buffer-file-name))
|
||||
("#" (and (other-buffer) (buffer-file-name (other-buffer)))))
|
||||
default-directory))
|
||||
flag global)
|
||||
(when path
|
||||
(while flags
|
||||
(setq flag (pop flags))
|
||||
(when (string-suffix-p "\\" flag)
|
||||
(setq flag (concat flag (pop flags))))
|
||||
(when (string-prefix-p "gs" flag)
|
||||
(setq global t flag (string-remove-prefix "g" flag)))
|
||||
(setq path
|
||||
(or (pcase (substring flag 0 1)
|
||||
("p" (expand-file-name path))
|
||||
("~" (file-relative-name path "~"))
|
||||
("." (file-relative-name path default-directory))
|
||||
("h" (directory-file-name path))
|
||||
("t" (file-name-nondirectory (directory-file-name path)))
|
||||
("r" (file-name-sans-extension path))
|
||||
("e" (file-name-extension path))
|
||||
("s" (let* ((args (evil-delimited-arguments (substring flag 1) 2))
|
||||
(pattern (evil-transform-vim-style-regexp (car args)))
|
||||
(replace (cadr args)))
|
||||
(replace-regexp-in-string
|
||||
(if global pattern (concat "\\(" pattern "\\).*\\'"))
|
||||
(evil-transform-vim-style-regexp replace) path t t
|
||||
(unless global 1))))
|
||||
("S" (shell-quote-argument path))
|
||||
(t path))
|
||||
"")))
|
||||
(setq file-name
|
||||
(replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)"
|
||||
(string-trim-left (car match)))
|
||||
path file-name t t 1)))))
|
||||
(setq file-name (replace-regexp-in-string regexp "\\1" file-name t))))
|
||||
|
||||
(provide 'defuns-evil)
|
||||
;;; defuns-evil.el ends here
|
||||
|
|
|
|||
|
|
@ -82,8 +82,7 @@ buffers."
|
|||
|
||||
;;;###autoload
|
||||
(defun doom*helm-hide-header (source &optional force)
|
||||
(setq header-line-format nil)
|
||||
(doom|hide-mode-line))
|
||||
(doom-hide-mode-line-mode +1))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*helm-hide-source-header-maybe ()
|
||||
|
|
|
|||
|
|
@ -1,133 +1,159 @@
|
|||
;;; defuns-popups.el
|
||||
|
||||
(defvar doom-last-popup nil
|
||||
"The last popup buffer open (or group thereof).")
|
||||
|
||||
(defvar-local doom-popup-rule nil
|
||||
"A list of rules applied to this popup.")
|
||||
|
||||
(defvar doom-popup-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map [remap doom/kill-real-buffer] 'doom/popup-close)
|
||||
(define-key map [remap evil-window-move-very-bottom] 'ignore)
|
||||
(define-key map [remap evil-window-move-very-top] 'ignore)
|
||||
(define-key map [remap evil-window-move-far-left] 'ignore)
|
||||
(define-key map [remap evil-window-move-far-right] 'ignore)
|
||||
(define-key map [remap evil-window-split] 'ignore)
|
||||
(define-key map [remap evil-window-vsplit] 'ignore)
|
||||
map)
|
||||
"Active keymap in popup windows.")
|
||||
|
||||
(advice-add 'doom/evil-window-move :around 'doom*popup-window-move)
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-remove (window)
|
||||
(setq doom-popup-windows (delete window doom-popup-windows))
|
||||
(unless (and doom-prev-buffer (not (buffer-live-p doom-prev-buffer)))
|
||||
(setq doom-prev-buffer nil)))
|
||||
(defun doom*popup-window-move (orig-fn &rest args)
|
||||
(unless (doom/popup-p)
|
||||
(apply orig-fn args)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-p (&optional window)
|
||||
"Whether WINDOW is a shackle popup window or not."
|
||||
(and doom-popup-windows
|
||||
(--any? (if (window-live-p it) t (doom/popup-remove it) nil)
|
||||
doom-popup-windows)
|
||||
(if window
|
||||
(memq window doom-popup-windows)
|
||||
t)))
|
||||
"Whether WINDOW is a shackle popup window or not. If WINDOW is nil, use
|
||||
current window."
|
||||
(let ((window (or window (selected-window))))
|
||||
(and (window-live-p window)
|
||||
(with-selected-window window (bound-and-true-p doom-popup-mode))
|
||||
window)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popups-p ()
|
||||
"Whether there is a popup window open and alive somewhere."
|
||||
(and doom-last-popup
|
||||
(window-live-p (get-buffer-window doom-last-popup))))
|
||||
|
||||
;;;###autoload
|
||||
(defmacro doom/popup-save (&rest body)
|
||||
`(let ((popup-p (doom/popup-p)))
|
||||
(when popup-p (doom/popup-close-all t t))
|
||||
,@body
|
||||
"Close popups before BODY and restore them afterwards."
|
||||
`(let ((popup-p (doom/popups-p))
|
||||
(in-popup-p (doom/popup-p)))
|
||||
(when popup-p
|
||||
(save-selected-window
|
||||
(doom/popup-last-buffer)))))
|
||||
(doom/popup-close-all t t))
|
||||
(prog1
|
||||
,@body
|
||||
(when popup-p
|
||||
(if in-popup-p
|
||||
(doom/popup-last-buffer)
|
||||
(save-excursion (doom/popup-last-buffer)))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-buffer (buffer &optional plist)
|
||||
"Display BUFFER in a shackle popup."
|
||||
(let* ((buffer-name (if (stringp buffer) buffer (buffer-name buffer)))
|
||||
(buffer (get-buffer-create buffer-name)))
|
||||
(shackle-display-buffer buffer nil (or plist (shackle-match buffer-name)))
|
||||
(setq doom-last-popup buffer)))
|
||||
(let ((buffer-name (cond ((stringp buffer) buffer)
|
||||
((bufferp buffer) (buffer-name buffer))
|
||||
(t (error "Not a valid buffer")))))
|
||||
(shackle-display-buffer
|
||||
(get-buffer-create buffer-name)
|
||||
nil (or plist (shackle-match buffer-name)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-close (&optional window dont-kill dont-redraw)
|
||||
"Find and close the currently active popup (if available)."
|
||||
(interactive)
|
||||
(let ((dont-kill (or doom-popup-protect dont-kill)))
|
||||
(when (and (not window) (doom/popup-p (selected-window)))
|
||||
(setq window (selected-window)))
|
||||
(when (and window (window-live-p window))
|
||||
;; REPL buffer
|
||||
(cond ((and (derived-mode-p 'comint-mode)
|
||||
(featurep 'repl-toggle)
|
||||
repl-toggle-mode)
|
||||
(setq rtog/--last-buffer nil))
|
||||
((eq major-mode 'messages-buffer-mode)
|
||||
(bury-buffer)
|
||||
(setq dont-kill t)))
|
||||
(doom/popup-remove window)
|
||||
(unless dont-kill
|
||||
(let ((kill-buffer-query-functions
|
||||
(delq 'process-kill-buffer-query-function
|
||||
kill-buffer-query-functions)))
|
||||
(kill-buffer (window-buffer window))))
|
||||
(setq window (or window (selected-window)))
|
||||
(when (doom/popup-p window)
|
||||
(with-selected-window window
|
||||
;; If REPL...
|
||||
(when (bound-and-true-p repl-toggle-mode)
|
||||
(setq rtog/--last-buffer nil))
|
||||
(if (not (or dont-kill (memq :nokill doom-popup-rule)))
|
||||
(let ((kill-buffer-query-functions
|
||||
(delq 'process-kill-buffer-query-function
|
||||
kill-buffer-query-functions)))
|
||||
(kill-buffer (window-buffer window)))
|
||||
(doom-popup-mode -1))
|
||||
(delete-window window)
|
||||
(unless (or dont-redraw (>= emacs-major-version 25))
|
||||
(unless (and (< emacs-major-version 25) (not dont-redraw))
|
||||
(redraw-frame)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-close-all (&optional dont-kill-buffers dont-redraw)
|
||||
"Closes all popup windows (and kills the buffers if DONT-KILL-BUFFERS is non-nil)"
|
||||
(defun doom/popup-close-all (&optional dont-kill dont-redraw)
|
||||
"Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil). Then redraw
|
||||
the display (unless DONT-REDRAW is non-nil)."
|
||||
(interactive)
|
||||
(mapc (lambda (w) (doom/popup-close w dont-kill-buffers t))
|
||||
doom-popup-windows)
|
||||
(unless (or dont-redraw (>= emacs-major-version 25))
|
||||
(redraw-frame))
|
||||
(setq doom-popup-windows nil))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-toggle ()
|
||||
"Toggles the popup window, reopening the last popup (if available)."
|
||||
(interactive)
|
||||
(if (doom/popup-p)
|
||||
(doom/popup-close t)
|
||||
(doom/popup-last-buffer)))
|
||||
(mapc (lambda (w) (doom/popup-close w dont-kill t))
|
||||
(doom/get-visible-windows (buffer-list)))
|
||||
(when (< emacs-major-version 25)
|
||||
(unless dont-redraw
|
||||
(redraw-frame))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-last-buffer ()
|
||||
"Pop up the last popup buffer."
|
||||
"Restore the last popup."
|
||||
(interactive)
|
||||
(unless (and doom-last-popup
|
||||
(buffer-live-p doom-last-popup))
|
||||
(unless (buffer-live-p doom-last-popup)
|
||||
(setq doom-last-popup nil)
|
||||
(error "No popup to restore"))
|
||||
(doom/popup-buffer doom-last-popup))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-messages ()
|
||||
"Pop up the *Messages* buffer."
|
||||
"Pop up the messages buffer."
|
||||
(interactive)
|
||||
(doom/popup-buffer "*Messages*")
|
||||
(with-current-buffer "*Messages*"
|
||||
(doom|hide-mode-line)
|
||||
(goto-char (point-max))))
|
||||
(doom/popup-buffer (messages-buffer))
|
||||
(goto-char (point-max)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*run-popup-pre-hooks (&rest _)
|
||||
(unless (and doom-prev-buffer
|
||||
(doom/popup-p (get-buffer-window doom-prev-buffer)))
|
||||
(setq doom-prev-buffer (current-buffer))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*run-popup-post-hooks (&rest _)
|
||||
(with-current-buffer shackle-last-buffer
|
||||
(run-hooks 'doom-popup-post-hook)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom|popup-init ()
|
||||
(add-to-list 'doom-popup-windows (get-buffer-window))
|
||||
(unless (one-window-p)
|
||||
(ignore-errors
|
||||
(local-set-key [escape escape] 'doom/popup-close)
|
||||
(let ((map evil-normal-state-local-map))
|
||||
(define-key map [escape escape] 'doom/popup-close)
|
||||
(unless (and (apply #'derived-mode-p doom-popup-inescapable-modes)
|
||||
(--any? (string-match-p it (buffer-name)) (-filter 'stringp doom-popup-inescapable-modes)))
|
||||
(define-key map [escape] 'doom/popup-close)
|
||||
(define-key map (kbd "ESC") 'doom/popup-close)))
|
||||
(when (or (apply #'derived-mode-p doom-popup-protect-modes)
|
||||
(--any? (string-match-p it buffer-name) (-filter 'stringp doom-popup-protect-modes)))
|
||||
(setq-local doom-popup-protect t)
|
||||
(setq doom-last-popup (current-buffer))))))
|
||||
(defun doom*popup-init (orig-fn &rest args)
|
||||
"Enable `doom-popup-mode' in every popup window and returns the window."
|
||||
(let ((window (apply orig-fn args)))
|
||||
(with-current-buffer (window-buffer window)
|
||||
(doom-popup-mode +1))
|
||||
;; NOTE orig-fn returns a window, so `doom*popup-init' must too
|
||||
window))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom*save-popup (orig-fun &rest args)
|
||||
"Prevents messing up a popup buffer on window changes"
|
||||
(doom/popup-save (apply orig-fun args)))
|
||||
|
||||
(put 'doom-popup-mode 'permanent-local t)
|
||||
(put 'doom-popup-mode-map 'permanent-local t)
|
||||
|
||||
;;;###autoload
|
||||
(define-minor-mode doom-popup-mode
|
||||
"Pop ups"
|
||||
:init-value nil
|
||||
:keymap doom-popup-mode-map
|
||||
:global nil
|
||||
(let ((rules (or doom-popup-rule
|
||||
(--any (let ((key (car it)))
|
||||
(when (cond ((symbolp key)
|
||||
(or (eq major-mode key)
|
||||
(derived-mode-p key)))
|
||||
((and (stringp key) buffer-file-name)
|
||||
(string-match-p key buffer-file-name)))
|
||||
(cdr it)))
|
||||
doom-popup-rules))))
|
||||
(setq doom-last-popup (current-buffer))
|
||||
(setq-local doom-popup-rule rules)
|
||||
;; (set-window-dedicated-p (selected-window) doom-popup-mode)
|
||||
(unless (memq :noesc rules)
|
||||
(make-local-variable 'doom-popup-mode-map)
|
||||
(let ((map doom-popup-mode-map))
|
||||
(define-key map [remap evil-force-normal-state] 'doom/popup-close)
|
||||
(define-key map [escape] 'doom/popup-close)
|
||||
(define-key map (kbd "ESC") 'doom/popup-close)))
|
||||
(unless (memq :modeline rules)
|
||||
(doom-hide-mode-line-mode (if doom-popup-mode +1 -1)))))
|
||||
|
||||
(provide 'defuns-popups)
|
||||
;;; defuns-popups.el ends here
|
||||
|
|
|
|||
|
|
@ -61,10 +61,6 @@
|
|||
(imenu-list-minor-mode -1))))
|
||||
(doom/get-visible-buffers (doom/get-real-buffers))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom|hide-mode-line (&rest _)
|
||||
(setq mode-line-format nil))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/eldoc-show-in-mode-line (input)
|
||||
"Display string STR in the mode-line next to minibuffer."
|
||||
|
|
@ -92,5 +88,23 @@
|
|||
(sit-for eldoc-show-in-mode-line-delay))))
|
||||
(force-mode-line-update)))
|
||||
|
||||
(defvar-local doom-hide-mode-line nil)
|
||||
(defvar-local doom--mode-line nil)
|
||||
;;;###autoload
|
||||
(define-minor-mode doom-hide-mode-line-mode
|
||||
"Minor mode to hide the mode-line in the current buffer."
|
||||
:init-value nil
|
||||
:global nil
|
||||
:variable doom-hide-mode-line
|
||||
(if doom-hide-mode-line
|
||||
(setq doom--mode-line mode-line-format
|
||||
mode-line-format nil)
|
||||
(setq mode-line-format doom--mode-line
|
||||
doom--mode-line nil))
|
||||
(force-mode-line-update)
|
||||
;; Apparently force-mode-line-update is not always enough to
|
||||
;; redisplay the mode-line
|
||||
(redraw-display))
|
||||
|
||||
(provide 'defuns-ui)
|
||||
;;; defuns-ui.el ends here
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; defuns-window.el --- library for acting on windows
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/evil-window-split ()
|
||||
(defun doom*evil-window-split (orig-fn &rest args)
|
||||
(interactive)
|
||||
(doom/neotree-save
|
||||
(call-interactively 'evil-window-split)
|
||||
(apply orig-fn args)
|
||||
(evil-window-down 1)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/evil-window-vsplit ()
|
||||
(defun doom*evil-window-vsplit (orig-fn &rest args)
|
||||
(interactive)
|
||||
(doom/neotree-save
|
||||
(call-interactively 'evil-window-vsplit)
|
||||
(apply orig-fn args)
|
||||
(evil-window-right 1)))
|
||||
|
||||
;;;###autoload
|
||||
|
|
|
|||
|
|
@ -194,15 +194,15 @@
|
|||
;;;###autoload
|
||||
(defun doom/close-window-or-workgroup ()
|
||||
(interactive)
|
||||
(if (memq (get-buffer-window) doom-popup-windows)
|
||||
(if (doom/popup-p)
|
||||
(doom/popup-close)
|
||||
(doom/kill-real-buffer)
|
||||
(if (and (one-window-p t)
|
||||
(> (length (wg-workgroup-list)) 1))
|
||||
(if (string= (wg-workgroup-name (wg-current-workgroup)) wg-first-wg-name)
|
||||
(evil-window-delete)
|
||||
(doom:workgroup-delete))
|
||||
(evil-window-delete))))
|
||||
(when (doom/kill-real-buffer)
|
||||
(if (and (one-window-p t)
|
||||
(> (length (wg-workgroup-list)) 1))
|
||||
(if (string= (wg-workgroup-name (wg-current-workgroup)) wg-first-wg-name)
|
||||
(evil-window-delete)
|
||||
(doom:workgroup-delete))
|
||||
(evil-window-delete)))))
|
||||
|
||||
(provide 'defuns-workgroup)
|
||||
;;; defuns-workgroup.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue