emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

popups: fix local ESC bindings; refactor popup defuns

Browse source
This commit is contained in:
Henrik Lissner 2016-06-17 23:52:06 -04:00
parent c9dffe6a64
commit a49c89ceba
1 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

72
core/defuns/defuns-popups.el
View file

@ -9,6 +9,7 @@
(defvar doom-popup-mode-map (defvar doom-popup-mode-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map [remap doom/kill-real-buffer] 'doom/popup-close) (define-key map [remap doom/kill-real-buffer] 'doom/popup-close)
(define-key map [remap evil-window-delete] 'doom/popup-close)
(define-key map [remap evil-window-move-very-bottom] 'ignore) (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-very-top] 'ignore)
(define-key map [remap evil-window-move-far-left] 'ignore) (define-key map [remap evil-window-move-far-left] 'ignore)
@ -18,6 +19,14 @@
map) map)
"Active keymap in popup windows.") "Active keymap in popup windows.")
(defvar doom-popup-mode-local-map
(let ((map (make-sparse-keymap)))
(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)
map)
"Active keymap in popup windows with ESC bindings.")
(advice-add 'doom/evil-window-move :around 'doom*popup-window-move) (advice-add 'doom/evil-window-move :around 'doom*popup-window-move)
;;;###autoload ;;;###autoload
@ -37,8 +46,7 @@ window. Returns nil or the popup window."
;;;###autoload ;;;###autoload
(defun doom/popups-p () (defun doom/popups-p ()
"Whether there is a popup window open and alive somewhere." "Whether there is a popup window open and alive somewhere."
(and doom-last-popup (and doom-last-popup (window-live-p (get-buffer-window doom-last-popup))))
(window-live-p (get-buffer-window doom-last-popup))))
;;;###autoload ;;;###autoload
(defmacro doom/popup-save (&rest body) (defmacro doom/popup-save (&rest body)
@ -50,18 +58,20 @@ window. Returns nil or the popup window."
(prog1 (prog1
,@body ,@body
(when popup-p (when popup-p
(if in-popup-p (let ((origin-win (selected-window)))
(doom/popup-last-buffer) (doom/popup-last-buffer)
(save-excursion (doom/popup-last-buffer))))))) (when in-popup-p
(select-window origin-win)))))))
;;;###autoload ;;;###autoload
(defun doom/popup-buffer (buffer &optional plist) (defun doom/popup-buffer (buffer &optional plist)
"Display BUFFER in a shackle popup." "Display BUFFER in a shackle popup."
(let ((buffer-name (cond ((stringp buffer) buffer) (let* ((buffer-name (cond ((stringp buffer) buffer)
((bufferp buffer) (buffer-name buffer)) ((bufferp buffer) (buffer-name buffer))
(t (error "Not a valid buffer"))))) (t (error "Not a valid buffer"))))
(buffer (get-buffer-create buffer-name)))
(shackle-display-buffer (shackle-display-buffer
(get-buffer-create buffer-name) buffer
nil (or plist (shackle-match buffer-name))))) nil (or plist (shackle-match buffer-name)))))
;;;###autoload ;;;###autoload
@ -79,18 +89,18 @@ window. Returns nil or the popup window."
(delq 'process-kill-buffer-query-function (delq 'process-kill-buffer-query-function
kill-buffer-query-functions))) kill-buffer-query-functions)))
(kill-buffer (window-buffer window))) (kill-buffer (window-buffer window)))
(doom-popup-mode -1)) (doom-popup-mode -1)))
(delete-window window) (delete-window window)
(when (< emacs-major-version 25) (unless dont-redraw (redraw-frame))))
(unless dont-redraw (redraw-frame))))))
;;;###autoload ;;;###autoload
(defun doom/popup-close-all (&optional dont-kill dont-redraw) (defun doom/popup-close-all (&optional dont-kill dont-redraw)
"Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil). Then redraw "Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil). Then redraw
the display (unless DONT-REDRAW is non-nil)." the display (unless DONT-REDRAW is non-nil)."
(interactive) (interactive)
(mapc (lambda (w) (doom/popup-close w dont-kill t)) (let ((orig-win (selected-window)))
(doom/get-visible-windows (buffer-list))) (mapc (lambda (w) (doom/popup-close w dont-kill t))
(--filter (and (doom/popup-p it) (not (eq it orig-win))) (window-list))))
(when (< emacs-major-version 25) (when (< emacs-major-version 25)
(unless dont-redraw (redraw-frame)))) (unless dont-redraw (redraw-frame))))
@ -114,7 +124,7 @@ the display (unless DONT-REDRAW is non-nil)."
(defun doom*popup-init (orig-fn &rest args) (defun doom*popup-init (orig-fn &rest args)
"Enable `doom-popup-mode' in every popup window and returns the window." "Enable `doom-popup-mode' in every popup window and returns the window."
(let ((window (apply orig-fn args))) (let ((window (apply orig-fn args)))
(with-current-buffer (window-buffer window) (with-selected-window window
(doom-popup-mode +1)) (doom-popup-mode +1))
;; NOTE orig-fn returns a window, so `doom*popup-init' must too ;; NOTE orig-fn returns a window, so `doom*popup-init' must too
window)) window))
@ -125,31 +135,27 @@ the display (unless DONT-REDRAW is non-nil)."
(doom/popup-save (apply orig-fun args))) (doom/popup-save (apply orig-fun args)))
(put 'doom-popup-mode 'permanent-local t) (put 'doom-popup-mode 'permanent-local t)
(put 'doom-popup-mode-map 'permanent-local t) (put 'doom-popup-rule 'permanent-local t)
;;;###autoload ;;;###autoload
(define-minor-mode doom-popup-mode (define-minor-mode doom-popup-mode
"Pop ups" "Pop ups"
:global nil
:init-value nil :init-value nil
:keymap doom-popup-mode-map :keymap doom-popup-mode-map
:global nil (let ((rules (--any (let ((key (car it)))
(let ((rules (or doom-popup-rule (when (cond ((symbolp key)
(--any (let ((key (car it))) (or (eq major-mode key)
(when (cond ((symbolp key) (derived-mode-p key)))
(or (eq major-mode key) ((stringp key)
(derived-mode-p key))) (string-match-p key (buffer-name))))
((and (stringp key) buffer-file-name) (cdr it)))
(string-match-p key buffer-file-name))) doom-popup-rules)))
(cdr it)))
doom-popup-rules))))
(setq doom-last-popup (current-buffer)) (setq doom-last-popup (current-buffer))
(setq-local doom-popup-rule rules) (setq-local doom-popup-rule rules)
(unless (memq :noesc rules) (let ((map doom-popup-mode-map))
(make-local-variable 'doom-popup-mode-map) (unless (memq :noesc rules)
(let ((map doom-popup-mode-map)) (use-local-map doom-popup-mode-local-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) (unless (memq :modeline rules)
(doom-hide-mode-line-mode (if doom-popup-mode +1 -1))))) (doom-hide-mode-line-mode (if doom-popup-mode +1 -1)))))