Luj/eat-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run hooks on terminal update and process exit

Browse source 
* eat.el (eat-exit-hook, eat-update-hook, eat-eshell-exit-hook)
(eat-eshell-update-hook): New user option.
* eat.el (eat-reset, eat--process-output-queue): Run
'eat-update-hook'.
* eat.el (eat--sentinel): Don't test 'eat-kill-buffer-on-exit',
run 'eat-exit-hook'.
* eat.el (eat--adjust-process-window-size): Run
'eat-update-hook' when the major mode is 'eat-mode'.  Run
'eat-eshell-update-hook' in 'eshell-mode' buffers.
* eat.el (eat-exec): Don't let-bind 'eat-kill-buffer-on-exit'
while killing old process, remove 'kill-buffer' from hook
'eat-exit-hook' instead.  When 'eat-kill-buffer-on-exit' is
non-nil, add 'kill-buffer' to 'eat-exit-hook' with priority 90.
Run 'eat-exec-hook' outside any let-block.
* eat.el (eat--eshell-output-filter): Run
'eat-eshell-update-hook'.
* eat.el (eat--eshell-cleanup): Run 'eat-eshell-exit-hook'.
This commit is contained in:
Akib Azmain Turja 2023-04-07 17:45:48 +06:00
parent 5c373094cc
commit f7fd7694a9
No known key found for this signature in database
GPG key ID: 5535FCF54D88616B
1 changed files with 73 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
eat.el
View file

@ -351,8 +351,28 @@ prompt annotation."
:type 'hook :type 'hook
:group 'eat-ui) :group 'eat-ui)
(defcustom eat-update-hook nil
"Hook run after the terminal in a Eat buffer is updated."
:type 'hook
:group 'eat-ui)
(defcustom eat-exit-hook nil
"Hook run after the command executed by `eat' exits."
:type 'hook
:group 'eat-ui)
(defcustom eat-eshell-exec-hook nil (defcustom eat-eshell-exec-hook nil
"Hook run after `eat' executes a commamnd." "Hook run after a terminal is created in Eshell."
:type 'hook
:group 'eat-eshell)
(defcustom eat-eshell-update-hook nil
"Hook run after the terminal in a Eshell buffer is updated."
:type 'hook
:group 'eat-eshell)
(defcustom eat-eshell-exit-hook nil
"Hook run after the terminal in Eshell is deleted."
:type 'hook :type 'hook
:group 'eat-eshell) :group 'eat-eshell)
@ -4636,7 +4656,8 @@ return \"eat-color\", otherwise return \"eat-mono\"."
(when eat--terminal (when eat--terminal
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(eat-term-reset eat--terminal) (eat-term-reset eat--terminal)
(eat-term-redisplay eat--terminal)))) (eat-term-redisplay eat--terminal))
(run-hooks 'eat-update-hook)))
(defun eat--set-cursor (_ state) (defun eat--set-cursor (_ state)
"Set cursor type according to STATE. "Set cursor type according to STATE.
@ -5456,7 +5477,8 @@ OS's."
eat-shell-prompt-annotation-correction-delay eat-shell-prompt-annotation-correction-delay
nil #'eat--correct-shell-prompt-mark-overlays nil #'eat--correct-shell-prompt-mark-overlays
buffer)) buffer))
(funcall eat--synchronize-scroll-function sync-windows))))) (funcall eat--synchronize-scroll-function sync-windows))
(run-hooks 'eat-update-hook))))
(defun eat--filter (process output) (defun eat--filter (process output)
"Handle OUTPUT from PROCESS." "Handle OUTPUT from PROCESS."
@ -5489,35 +5511,34 @@ to it."
(let ((buffer (process-buffer process))) (let ((buffer (process-buffer process)))
(when (memq (process-status process) '(signal exit)) (when (memq (process-status process) '(signal exit))
(if (buffer-live-p buffer) (if (buffer-live-p buffer)
(if eat-kill-buffer-on-exit (with-current-buffer buffer
(kill-buffer buffer) (let ((inhibit-read-only t))
(with-current-buffer buffer (when eat--process-output-queue-timer
(let ((inhibit-read-only t)) (cancel-timer eat--process-output-queue-timer)
(when eat--process-output-queue-timer (setq eat--process-output-queue-timer nil))
(cancel-timer eat--process-output-queue-timer) (eat--process-output-queue buffer)
(setq eat--process-output-queue-timer nil)) (when eat--shell-prompt-annotation-correction-timer
(eat--process-output-queue buffer) (cancel-timer
(when eat--shell-prompt-annotation-correction-timer eat--shell-prompt-annotation-correction-timer)
(cancel-timer (setq eat--shell-prompt-annotation-correction-timer
eat--shell-prompt-annotation-correction-timer) nil))
(setq eat--shell-prompt-annotation-correction-timer (when eat-enable-shell-prompt-annotation
nil)) (eat--correct-shell-prompt-mark-overlays buffer)
(when eat-enable-shell-prompt-annotation (setq eat--shell-command-status 0)
(eat--correct-shell-prompt-mark-overlays buffer) (setq eat--shell-prompt-begin nil)
(setq eat--shell-command-status 0) (setq eat--shell-prompt-mark nil)
(setq eat--shell-prompt-begin nil) (setq eat--shell-prompt-mark-overlays nil))
(setq eat--shell-prompt-mark nil) (eat-emacs-mode)
(setq eat--shell-prompt-mark-overlays nil)) (delete-process process)
(eat-emacs-mode) (eat-term-delete eat--terminal)
(delete-process process) (setq eat--terminal nil)
(eat-term-delete eat--terminal) (eat--set-cursor nil :default)
(setq eat--terminal nil) (eat--grab-mouse nil nil)
(eat--set-cursor nil :default) (goto-char (point-max))
(eat--grab-mouse nil nil) (insert "\nProcess " (process-name process) " "
(goto-char (point-max)) message)
(insert "\nProcess " (process-name process) " " (setq buffer-read-only nil))
message) (run-hooks 'eat-exit-hook))
(setq buffer-read-only nil))))
(set-process-buffer process nil))))) (set-process-buffer process nil)))))
(defun eat--adjust-process-window-size (process windows) (defun eat--adjust-process-window-size (process windows)
@ -5534,7 +5555,12 @@ of window displaying PROCESS's buffer."
(sync-windows (eat--synchronize-scroll-windows))) (sync-windows (eat--synchronize-scroll-windows)))
(eat-term-resize eat--terminal width height) (eat-term-resize eat--terminal width height)
(eat-term-redisplay eat--terminal) (eat-term-redisplay eat--terminal)
(funcall eat--synchronize-scroll-function sync-windows))) (funcall eat--synchronize-scroll-function sync-windows))
(pcase major-mode
('eat-mode
(run-hooks 'eat-update-hook))
('eshell-mode
(run-hooks 'eat-eshell-update-hook))))
size)) size))
;; Adapted from Term. ;; Adapted from Term.
@ -5547,11 +5573,11 @@ mode. You can use this to cheaply run a series of processes in the
same Eat buffer. The hook `eat-exec-hook' is run after each exec." same Eat buffer. The hook `eat-exec-hook' is run after each exec."
(with-current-buffer buffer (with-current-buffer buffer
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(when-let* (when-let* ((eat--terminal)
((eat--terminal) (proc (eat-term-parameter
(proc (eat-term-parameter eat--terminal 'eat--process))) eat--terminal 'eat--process)))
(let ((eat-kill-buffer-on-exit nil)) (remove-hook 'eat-exit-hook #'kill-buffer t)
(delete-process proc))) (delete-process proc))
;; Ensure final newline. ;; Ensure final newline.
(goto-char (point-max)) (goto-char (point-max))
(unless (or (= (point-min) (point-max)) (unless (or (= (point-min) (point-max))
@ -5624,6 +5650,8 @@ same Eat buffer. The hook `eat-exec-hook' is run after each exec."
process) process)
(setf (eat-term-parameter eat--terminal 'eat--output-process) (setf (eat-term-parameter eat--terminal 'eat--output-process)
process) process)
(when eat-kill-buffer-on-exit
(add-hook 'eat-exit-hook #'kill-buffer 90 t))
;; Feed it the startfile. ;; Feed it the startfile.
(when startfile (when startfile
;; This is guaranteed to wait long enough ;; This is guaranteed to wait long enough
@ -5636,9 +5664,9 @@ same Eat buffer. The hook `eat-exec-hook' is run after each exec."
(insert-file-contents startfile) (insert-file-contents startfile)
(process-send-string (process-send-string
process (delete-and-extract-region (point) (point-max))))) process (delete-and-extract-region (point) (point-max)))))
(eat-term-redisplay eat--terminal) (eat-term-redisplay eat--terminal))
(run-hooks 'eat-exec-hook) (run-hooks 'eat-exec-hook)
buffer))) buffer))
;;;;; Entry Points. ;;;;; Entry Points.
@ -5857,7 +5885,8 @@ PROGRAM can be a shell command."
(set-marker eshell-last-output-end end) (set-marker eshell-last-output-end end)
(set-marker (process-mark (eat-term-parameter (set-marker (process-mark (eat-term-parameter
eat--terminal 'eat--output-process)) eat--terminal 'eat--output-process))
end)))) end)))
(run-hooks 'eat-eshell-update-hook))
(defun eat--eshell-setup-proc-and-term (proc) (defun eat--eshell-setup-proc-and-term (proc)
"Setup process PROC and a new terminal for it." "Setup process PROC and a new terminal for it."
@ -5916,7 +5945,8 @@ PROGRAM can be a shell command."
(eat--eshell-semi-char-mode -1) (eat--eshell-semi-char-mode -1)
(eat--eshell-char-mode -1) (eat--eshell-char-mode -1)
(eat--eshell-process-running-mode -1) (eat--eshell-process-running-mode -1)
(setq buffer-read-only nil)))) (setq buffer-read-only nil))
(run-hooks 'eat-eshell-exit-hook)))
(declare-function eshell-output-filter "esh-mode" (process string)) (declare-function eshell-output-filter "esh-mode" (process string))