scsh-conservatory
/
commander-s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the "terminal emulation" for ascii codes cr and nl. Don't pass 

strings containing cr or nl to ncurses (leads to garbled output).
This commit is contained in:
eknauel 2005-06-07 19:50:43 +00:00
parent 7d0c566c0b
commit f5c808e10a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scheme/termbuf.scm
View File

@ -1,3 +1,7 @@
;; turn off debugging for the moment
(define debug-message
(lambda args #f))
(define-record-type terminal-buffer :terminal-buffer (define-record-type terminal-buffer :terminal-buffer
(really-make-terminal-buffer width height view-index (really-make-terminal-buffer width height view-index
x y buffer repaint? x y buffer repaint?
@ -100,18 +104,20 @@
(set-terminal-buffer-x! termbuf 0)) (set-terminal-buffer-x! termbuf 0))
(define (terminal-buffer-add-char termbuf char) (define (terminal-buffer-add-char termbuf char)
(debug-message "add-char " termbuf) (debug-message "add-char " termbuf " '" char "' "
(char->ascii char))
(cond (cond
((not (string=? "" (terminal-buffer-esc-code termbuf))) ((not (string=? "" (terminal-buffer-esc-code termbuf)))
(read-escape-code termbuf char)) (read-escape-code termbuf char))
((char=? char (ascii->char 27)) ((char=? char (ascii->char 27))
(set-terminal-buffer-esc-code! termbuf (string char))) (set-terminal-buffer-esc-code! termbuf (string char)))
((char=? char (ascii->char 13))
(goto-beginning-of-line termbuf))
((char=? char #\newline) ((char=? char #\newline)
(if (cursor-on-last-line? termbuf) (if (cursor-on-last-line? termbuf)
(append-empty-line termbuf)) (append-empty-line termbuf))
(goto-next-line termbuf) (goto-next-line termbuf))
(goto-beginning-of-line termbuf)) ((char-set-contains? char-set:printing char)
(else
(add-normal-char termbuf char)))) (add-normal-char termbuf char))))
(define (add-normal-char termbuf char) (define (add-normal-char termbuf char)
@ -123,7 +129,10 @@
(insert-char termbuf char)) (insert-char termbuf char))
(else (else
(insert-char termbuf char) (insert-char termbuf char)
(goto-next-char termbuf)))) (goto-next-char termbuf)))
(debug-message "add-normal-char "
(string-length (line-at-cursor-position termbuf))
"'" (line-at-cursor-position termbuf) "'"))
(define (curses-paint-terminal-buffer termbuf win) (define (curses-paint-terminal-buffer termbuf win)
(if (terminal-buffer-repaint? termbuf) (if (terminal-buffer-repaint? termbuf)
@ -139,6 +148,7 @@
(if (zero? i) (if (zero? i)
'blorf 'blorf
(begin (begin
(debug-message y ": '" (car lines) "'")
(mvwaddstr win y 0 (car lines)) (mvwaddstr win y 0 (car lines))
(lp (- i 1) (cdr lines) (+ y 1))))) (lp (- i 1) (cdr lines) (+ y 1)))))
(position-cursor termbuf win)) (position-cursor termbuf win))