fix: use :input :inherit for stty size subprocess
:input :inherit preserves the parent's fd 0 (the terminal) in the child process, so stty can query it via ioctl. Previous approaches (:input :interactive, /dev/tty) all failed because uiop's process setup redirects stdin away from the terminal.
This commit is contained in:
@@ -162,21 +162,20 @@ as a fallback when a keyword is not in *named-colors*.")
|
|||||||
(values))
|
(values))
|
||||||
|
|
||||||
(defmethod backend-size ((b modern-backend))
|
(defmethod backend-size ((b modern-backend))
|
||||||
(or ;; tput lines / tput cols via subprocess — most reliable across
|
(or ;; stty size with :input :inherit — preserves the parent's fd 0
|
||||||
;; all systems. Each outputs a single number. Works in any
|
;; (the terminal) so stty can query it via ioctl.
|
||||||
;; subprocess context, no parsing complexity.
|
|
||||||
(multiple-value-bind (cols rows)
|
(multiple-value-bind (cols rows)
|
||||||
(values
|
|
||||||
(ignore-errors
|
(ignore-errors
|
||||||
(parse-integer
|
(let* ((out (uiop:run-program '("stty" "size") :output :string
|
||||||
(string-trim '(#\newline #\space)
|
:input :inherit
|
||||||
(uiop:run-program '("tput" "cols") :output :string
|
:ignore-error-status t))
|
||||||
:ignore-error-status t))))
|
(parts (and out (uiop:split-string
|
||||||
(ignore-errors
|
(string-trim '(#\newline #\space) out)))))
|
||||||
(parse-integer
|
(when (and parts (= (length parts) 2))
|
||||||
(string-trim '(#\newline #\space)
|
(let ((r (parse-integer (first parts) :junk-allowed t))
|
||||||
(uiop:run-program '("tput" "lines") :output :string
|
(c (parse-integer (second parts) :junk-allowed t)))
|
||||||
:ignore-error-status t)))))
|
(when (and r c (> r 0) (> c 0))
|
||||||
|
(values c r))))))
|
||||||
(when (and cols rows (> cols 0) (> rows 0))
|
(when (and cols rows (> cols 0) (> rows 0))
|
||||||
(values cols rows)))
|
(values cols rows)))
|
||||||
;; ioctl on stdout fd — fast, correct after SIGWINCH at runtime.
|
;; ioctl on stdout fd — fast, correct after SIGWINCH at runtime.
|
||||||
|
|||||||
@@ -22,19 +22,19 @@
|
|||||||
(values))
|
(values))
|
||||||
|
|
||||||
(defmethod backend-size ((b simple-backend))
|
(defmethod backend-size ((b simple-backend))
|
||||||
(or ;; tput cols / tput lines via subprocess
|
(or ;; stty size with :input :inherit — preserves parent's fd 0.
|
||||||
(multiple-value-bind (cols rows)
|
(multiple-value-bind (cols rows)
|
||||||
(values
|
|
||||||
(ignore-errors
|
(ignore-errors
|
||||||
(parse-integer
|
(let* ((out (uiop:run-program '("stty" "size") :output :string
|
||||||
(string-trim '(#\newline #\space)
|
:input :inherit
|
||||||
(uiop:run-program '("tput" "cols") :output :string
|
:ignore-error-status t))
|
||||||
:ignore-error-status t))))
|
(parts (and out (uiop:split-string
|
||||||
(ignore-errors
|
(string-trim '(#\newline #\space) out)))))
|
||||||
(parse-integer
|
(when (and parts (= (length parts) 2))
|
||||||
(string-trim '(#\newline #\space)
|
(let ((r (parse-integer (first parts) :junk-allowed t))
|
||||||
(uiop:run-program '("tput" "lines") :output :string
|
(c (parse-integer (second parts) :junk-allowed t)))
|
||||||
:ignore-error-status t)))))
|
(when (and r c (> r 0) (> c 0))
|
||||||
|
(values c r))))))
|
||||||
(when (and cols rows (> cols 0) (> rows 0))
|
(when (and cols rows (> cols 0) (> rows 0))
|
||||||
(values cols rows)))
|
(values cols rows)))
|
||||||
;; ioctl on stdout fd — fast, correct after SIGWINCH at runtime.
|
;; ioctl on stdout fd — fast, correct after SIGWINCH at runtime.
|
||||||
|
|||||||
Reference in New Issue
Block a user