Extract shackle defuns to defuns-popups.el
This commit is contained in:
Henrik Lissner
parent
951730930d
commit
aa37882f15
2 changed files with 89 additions and 82 deletions
|
|
@ -55,6 +55,9 @@
|
||||||
(with-current-buffer b repl-p)))))
|
(with-current-buffer b repl-p)))))
|
||||||
:popup t :align below :size 16)))
|
:popup t :align below :size 16)))
|
||||||
|
|
||||||
|
(defvar narf-popup-windows '()
|
||||||
|
"A list of windows that have been opened via shackle. Do not touch this!")
|
||||||
|
|
||||||
(after! ert
|
(after! ert
|
||||||
(add-hook! 'ert-results-mode-hook 'narf|hide-mode-line)
|
(add-hook! 'ert-results-mode-hook 'narf|hide-mode-line)
|
||||||
(map! (:map ert-results-mode-map
|
(map! (:map ert-results-mode-map
|
||||||
|
|
@ -209,88 +212,7 @@
|
||||||
(after! flycheck
|
(after! flycheck
|
||||||
(map! :map flycheck-error-list-mode-map
|
(map! :map flycheck-error-list-mode-map
|
||||||
:n "q" 'narf/popup-close
|
:n "q" 'narf/popup-close
|
||||||
:n [escape] 'narf/popup-close))
|
:n [escape] 'narf/popup-close)))
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defvar narf-popup-windows '()
|
|
||||||
"A list of windows that have been opened via shackle. Do not touch this!")
|
|
||||||
|
|
||||||
(defun narf*popup-add (&rest _)
|
|
||||||
(add-to-list 'narf-popup-windows (get-buffer-window shackle-last-buffer)))
|
|
||||||
(advice-add 'shackle-display-buffer :after 'narf*popup-add)
|
|
||||||
|
|
||||||
(defun narf--popup-remove (window)
|
|
||||||
(setq narf-popup-windows (delete window narf-popup-windows)))
|
|
||||||
|
|
||||||
(defun narf/popup-p (&optional window)
|
|
||||||
"Whether WINDOW is a shackle popup window or not."
|
|
||||||
(and narf-popup-windows
|
|
||||||
(-any? (lambda (w)
|
|
||||||
(if (window-live-p w) t (narf--popup-remove w) nil))
|
|
||||||
narf-popup-windows)
|
|
||||||
(if window
|
|
||||||
(-any? (lambda (w) (eq window w)) narf-popup-windows)
|
|
||||||
t)))
|
|
||||||
|
|
||||||
(defun narf/popup-buffer (buffer &optional plist)
|
|
||||||
"Display BUFFER in a shackle popup."
|
|
||||||
(let ((buffer-name (if (stringp buffer) buffer (buffer-name buffer))))
|
|
||||||
(shackle-display-buffer (get-buffer-create buffer-name)
|
|
||||||
nil (or plist (shackle-match buffer-name)))))
|
|
||||||
|
|
||||||
(defun narf/popup-close (&optional window dont-kill dont-close-all)
|
|
||||||
"Find and close the currently active popup (if available)."
|
|
||||||
(interactive)
|
|
||||||
(when (not window)
|
|
||||||
(if (narf/popup-p (selected-window))
|
|
||||||
(setq window (selected-window))
|
|
||||||
(unless dont-close-all
|
|
||||||
(narf/popup-close-all dont-kill))))
|
|
||||||
(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)))
|
|
||||||
(narf--popup-remove window)
|
|
||||||
(unless dont-kill
|
|
||||||
(kill-buffer (window-buffer window)))
|
|
||||||
(delete-window window)))
|
|
||||||
|
|
||||||
(defun narf/popup-close-all (&optional dont-kill-buffers)
|
|
||||||
"Closes all popup windows (and kills the buffers if DONT-KILL-BUFFERS is non-nil)"
|
|
||||||
(interactive)
|
|
||||||
(mapc (lambda (w) (narf/popup-close w dont-kill-buffers))
|
|
||||||
narf-popup-windows)
|
|
||||||
(setq narf-popup-windows nil))
|
|
||||||
|
|
||||||
;;
|
|
||||||
(defun narf/popup-toggle ()
|
|
||||||
"Toggles the popup window, reopening the last popup (if available)."
|
|
||||||
(interactive)
|
|
||||||
(if (narf/popup-p)
|
|
||||||
(narf/popup-close t)
|
|
||||||
(narf/popup-last-buffer)))
|
|
||||||
|
|
||||||
(defun narf/popup-last-buffer ()
|
|
||||||
"Pop up the last popup buffer."
|
|
||||||
(interactive)
|
|
||||||
(if shackle-last-buffer
|
|
||||||
(narf/popup-buffer shackle-last-buffer)
|
|
||||||
(narf/popup-messages)))
|
|
||||||
|
|
||||||
(defun narf/popup-messages ()
|
|
||||||
"Pop up the *Messages* buffer."
|
|
||||||
(interactive)
|
|
||||||
(narf/popup-buffer "*Messages*")
|
|
||||||
(with-current-buffer "*Messages*"
|
|
||||||
(narf|hide-mode-line)
|
|
||||||
(goto-char (point-max)))))
|
|
||||||
|
|
||||||
(provide 'core-popup)
|
(provide 'core-popup)
|
||||||
;;; core-popup.el ends here
|
;;; core-popup.el ends here
|
||||||
|
|
|
||||||
85
core/defuns/defuns-popups.el
Normal file
85
core/defuns/defuns-popups.el
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
;;; defuns-popups.el
|
||||||
|
|
||||||
|
(defun narf*popup-add (&rest _)
|
||||||
|
(add-to-list 'narf-popup-windows (get-buffer-window shackle-last-buffer)))
|
||||||
|
(advice-add 'shackle-display-buffer :after 'narf*popup-add)
|
||||||
|
|
||||||
|
(defun narf--popup-remove (window)
|
||||||
|
(setq narf-popup-windows (delete window narf-popup-windows)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-p (&optional window)
|
||||||
|
"Whether WINDOW is a shackle popup window or not."
|
||||||
|
(and narf-popup-windows
|
||||||
|
(-any? (lambda (w)
|
||||||
|
(if (window-live-p w) t (narf--popup-remove w) nil))
|
||||||
|
narf-popup-windows)
|
||||||
|
(if window
|
||||||
|
(-any? (lambda (w) (eq window w)) narf-popup-windows)
|
||||||
|
t)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-buffer (buffer &optional plist)
|
||||||
|
"Display BUFFER in a shackle popup."
|
||||||
|
(let ((buffer-name (if (stringp buffer) buffer (buffer-name buffer))))
|
||||||
|
(shackle-display-buffer (get-buffer-create buffer-name)
|
||||||
|
nil (or plist (shackle-match buffer-name)))))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-close (&optional window dont-kill dont-close-all)
|
||||||
|
"Find and close the currently active popup (if available)."
|
||||||
|
(interactive)
|
||||||
|
(when (not window)
|
||||||
|
(if (narf/popup-p (selected-window))
|
||||||
|
(setq window (selected-window))
|
||||||
|
(unless dont-close-all
|
||||||
|
(narf/popup-close-all dont-kill))))
|
||||||
|
(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)))
|
||||||
|
(narf--popup-remove window)
|
||||||
|
(unless dont-kill
|
||||||
|
(kill-buffer (window-buffer window)))
|
||||||
|
(delete-window window)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-close-all (&optional dont-kill-buffers)
|
||||||
|
"Closes all popup windows (and kills the buffers if DONT-KILL-BUFFERS is non-nil)"
|
||||||
|
(interactive)
|
||||||
|
(mapc (lambda (w) (narf/popup-close w dont-kill-buffers))
|
||||||
|
narf-popup-windows)
|
||||||
|
(setq narf-popup-windows nil))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-toggle ()
|
||||||
|
"Toggles the popup window, reopening the last popup (if available)."
|
||||||
|
(interactive)
|
||||||
|
(if (narf/popup-p)
|
||||||
|
(narf/popup-close t)
|
||||||
|
(narf/popup-last-buffer)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-last-buffer ()
|
||||||
|
"Pop up the last popup buffer."
|
||||||
|
(interactive)
|
||||||
|
(if shackle-last-buffer
|
||||||
|
(narf/popup-buffer shackle-last-buffer)
|
||||||
|
(narf/popup-messages)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun narf/popup-messages ()
|
||||||
|
"Pop up the *Messages* buffer."
|
||||||
|
(interactive)
|
||||||
|
(narf/popup-buffer "*Messages*")
|
||||||
|
(with-current-buffer "*Messages*"
|
||||||
|
(narf|hide-mode-line)
|
||||||
|
(goto-char (point-max))))
|
||||||
|
|
||||||
|
(provide 'defuns-popups)
|
||||||
|
;;; defuns-popups.el ends here
|
||||||
Loading…
Add table
Add a link
Reference in a new issue