Stacken/c64-livecoding
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stacken:78487f1c24becbdee05b046128b5fdae14662cc0
Branches Tags
Stacken:main
Stacken:integration
...
compare: Stacken:34f705aef8d829c741212c6f12d292ac97979fef
Branches Tags
Stacken:main
Stacken:integration

2 commits
78487f1c24 ... 34f705aef8

Author SHA1 Message Date
John Lorentzson
34f705aef8 Improve UPDATE-BUFFER-CURSOR's means of getting a line into view 2025-07-18 21:07:06 +02:00
John Lorentzson
5ad61839c2 Make size of default view match size of target terminal 2025-07-18 21:06:26 +02:00
1 changed files with 16 additions and 12 deletions
Show stats Expand all files Collapse all files

28
wip-duuqnd/editor/editor.lisp
View file

@ -126,6 +126,7 @@ serial connection the editor normally runs under.")
(defun move-cursor (row col) (defun move-cursor (row col)
(assert (and (integerp row) (integerp col)))
(write-byte #x1B *eio*) (write-byte #x1B *eio*)
(write-char #\[ *eio*) (write-char #\[ *eio*)
(format *eio* "~D;~DH" row (1+ col)) (format *eio* "~D;~DH" row (1+ col))
@ -421,17 +422,8 @@ Additionally ensures correct line numbers on the way, as a bonus."
:do (ensure-correct-line-number line)) :do (ensure-correct-line-number line))
(let ((line-number (view-line-number (buffer-view buffer) (let ((line-number (view-line-number (buffer-view buffer)
(cursor-line (cursor buffer))))) (cursor-line (cursor buffer)))))
;; the ugly (of many, one) (when (null line-number)
(when (null line-number) ; line is off-screen (get-line-into-view (cursor-line (cursor buffer)) (buffer-view buffer))
(if (and (not (null (bottom-line (buffer-view buffer))))
(eql (next-line (bottom-line (buffer-view buffer)))
(cursor-line (cursor buffer))))
(setf (top-line (buffer-view buffer))
(next-line (top-line (buffer-view buffer)))
(bottom-line (buffer-view buffer)) nil)
(setf (top-line (buffer-view buffer)) (cursor-line (cursor buffer))
(bottom-line (buffer-view buffer)) nil))
(redisplay-view (buffer-view buffer))
(setf line-number (view-line-number (buffer-view buffer) (setf line-number (view-line-number (buffer-view buffer)
(cursor-line (cursor buffer))))) (cursor-line (cursor buffer)))))
(move-cursor line-number (cursor-column (cursor buffer))))) (move-cursor line-number (cursor-column (cursor buffer)))))
@ -474,7 +466,7 @@ Additionally ensures correct line numbers on the way, as a bonus."
((%buffer :accessor buffer :initarg :buffer) ((%buffer :accessor buffer :initarg :buffer)
(%top-line :accessor top-line :initform nil) (%top-line :accessor top-line :initform nil)
(%bottom-line :accessor bottom-line :initform nil) (%bottom-line :accessor bottom-line :initform nil)
(%height :accessor height :initform 20))) (%height :accessor height :initform 23)))
(defmacro do-view-lines ((line local-line-number) view &body body) (defmacro do-view-lines ((line local-line-number) view &body body)
`(loop :repeat (height ,view) `(loop :repeat (height ,view)
@ -553,6 +545,18 @@ Additionally ensures correct line numbers on the way, as a bonus."
(redisplay-line (top-line view)) (redisplay-line (top-line view))
(redisplay-status-line :completely-p t)) (redisplay-status-line :completely-p t))
(defmethod get-line-into-view ((line line) (view buffer-view))
;; Assuming it's not already.
(update-view-bottom view)
(cond ((eql line (prev-line (top-line view)))
(scroll-view-up view))
((eql line (next-line (bottom-line view)))
(scroll-view-down view))
(t
(setf (top-line view) line)
(redisplay-view view)))
(redisplay-status-line :completely-p nil))
(defmethod current-view ((obj editor)) (defmethod current-view ((obj editor))
(buffer-view (current-buffer obj))) (buffer-view (current-buffer obj)))