Compare commits
17 Commits
feature/v0
...
feature/v0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
949bfe46bf | ||
|
|
14193b8c92 | ||
|
|
811d51a4f2 | ||
|
|
9648c72b85 | ||
|
|
e96c338a57 | ||
|
|
9adefb5dbb | ||
|
|
3b0410b088 | ||
|
|
c55f1773fb | ||
|
|
f07cb65186 | ||
|
|
2d3227aaf1 | ||
|
|
0851311c3d | ||
|
|
6ba69f4610 | ||
|
|
b0e5c18257 | ||
|
|
88c576a6b9 | ||
|
|
a1b1352d10 | ||
|
|
5672aaf3fd | ||
|
|
a5f8e6c9d4 |
14
README.org
14
README.org
@@ -1,8 +1,8 @@
|
|||||||
#+TITLE: cl-tui — Reusable Common Lisp Terminal UI Framework
|
#+TITLE: cl-tty — Reusable Common Lisp Terminal UI Framework
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :project:cl-tui:readme:
|
#+FILETAGS: :project:cl-tty:readme:
|
||||||
|
|
||||||
* cl-tui
|
* cl-tty
|
||||||
|
|
||||||
A reusable Common Lisp framework for building rich terminal user interfaces.
|
A reusable Common Lisp framework for building rich terminal user interfaces.
|
||||||
Built on croatoan (ncurses) with Yoga for Flexbox layout. Provides a component
|
Built on croatoan (ncurses) with Yoga for Flexbox layout. Provides a component
|
||||||
@@ -15,24 +15,24 @@ quality of Claude Code and OpenCode from Common Lisp.
|
|||||||
Common Lisp has no reusable terminal UI framework at the level of Python's
|
Common Lisp has no reusable terminal UI framework at the level of Python's
|
||||||
Rich/prompt_toolkit or Go's Bubble Tea. Every CL project that wants a
|
Rich/prompt_toolkit or Go's Bubble Tea. Every CL project that wants a
|
||||||
terminal UI either builds ncurses from scratch or uses a text-only REPL.
|
terminal UI either builds ncurses from scratch or uses a text-only REPL.
|
||||||
cl-tui fills that gap — a component library with Flexbox layout, semantic
|
cl-tty fills that gap — a component library with Flexbox layout, semantic
|
||||||
theming, layered keybinding, and full mouse support. Build a terminal UI once,
|
theming, layered keybinding, and full mouse support. Build a terminal UI once,
|
||||||
reuse it everywhere.
|
reuse it everywhere.
|
||||||
|
|
||||||
Terminal UIs also work over SSH. A Qt or browser-based UI requires a local
|
Terminal UIs also work over SSH. A Qt or browser-based UI requires a local
|
||||||
display. A cl-tui application runs remotely — same code, same components,
|
display. A cl-tty application runs remotely — same code, same components,
|
||||||
accessible from anywhere.
|
accessible from anywhere.
|
||||||
|
|
||||||
** Architecture
|
** Architecture
|
||||||
|
|
||||||
```
|
```
|
||||||
Application code (any CL project)
|
Application code (any CL project)
|
||||||
└── cl-tui (layout, components, theme, events, dialogs)
|
└── cl-tty (layout, components, theme, events, dialogs)
|
||||||
└── Yoga (Flexbox layout — C library via FFI)
|
└── Yoga (Flexbox layout — C library via FFI)
|
||||||
└── croatoan (ncurses terminal rendering)
|
└── croatoan (ncurses terminal rendering)
|
||||||
```
|
```
|
||||||
|
|
||||||
cl-tui depends only on croatoan and Yoga. It is not tied to any application.
|
cl-tty depends only on croatoan and Yoga. It is not tied to any application.
|
||||||
|
|
||||||
** Dependencies
|
** Dependencies
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
|
|
||||||
(defclass backend () ())
|
(defclass backend () ())
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
(defpackage :cl-tui-modern-backend-test
|
(defpackage :cl-tty-modern-backend-test
|
||||||
(:use :cl :fiveam :cl-tui.backend)
|
(:use :cl :fiveam :cl-tty.backend)
|
||||||
(:export #:run-tests))
|
(:export #:run-tests))
|
||||||
(in-package :cl-tui-modern-backend-test)
|
(in-package :cl-tty-modern-backend-test)
|
||||||
|
|
||||||
(def-suite modern-backend-suite :description "Modern backend tests")
|
(def-suite modern-backend-suite :description "Modern backend tests")
|
||||||
(in-suite modern-backend-suite)
|
(in-suite modern-backend-suite)
|
||||||
@@ -16,72 +16,72 @@
|
|||||||
(test make-modern-backend-creates
|
(test make-modern-backend-creates
|
||||||
"make-modern-backend returns a modern-backend instance"
|
"make-modern-backend returns a modern-backend instance"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (typep b 'cl-tui.backend::modern-backend))))
|
(is (typep b 'cl-tty.backend::modern-backend))))
|
||||||
|
|
||||||
;; ── Escape Generation ──────────────────────────────────────────
|
;; ── Escape Generation ──────────────────────────────────────────
|
||||||
|
|
||||||
(test sgr-truecolor-foreground
|
(test sgr-truecolor-foreground
|
||||||
"SGR truecolor foreground escape is correct"
|
"SGR truecolor foreground escape is correct"
|
||||||
(is (equal (cl-tui.backend::sgr-fg "#FFD700")
|
(is (equal (cl-tty.backend::sgr-fg "#FFD700")
|
||||||
(format nil "~C[38;2;255;215;0m" #\Esc))))
|
(format nil "~C[38;2;255;215;0m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-truecolor-background
|
(test sgr-truecolor-background
|
||||||
"SGR truecolor background escape is correct"
|
"SGR truecolor background escape is correct"
|
||||||
(is (equal (cl-tui.backend::sgr-bg "#1a1b26")
|
(is (equal (cl-tty.backend::sgr-bg "#1a1b26")
|
||||||
(format nil "~C[48;2;26;27;38m" #\Esc))))
|
(format nil "~C[48;2;26;27;38m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-named-colors
|
(test sgr-named-colors
|
||||||
"SGR named colors resolve to 8-color codes"
|
"SGR named colors resolve to 8-color codes"
|
||||||
(is (equal (cl-tui.backend::sgr-fg :red)
|
(is (equal (cl-tty.backend::sgr-fg :red)
|
||||||
(format nil "~C[31m" #\Esc)))
|
(format nil "~C[31m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-bg :blue)
|
(is (equal (cl-tty.backend::sgr-bg :blue)
|
||||||
(format nil "~C[44m" #\Esc))))
|
(format nil "~C[44m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-bold-italic
|
(test sgr-bold-italic
|
||||||
"SGR attribute escapes are correct"
|
"SGR attribute escapes are correct"
|
||||||
(is (equal (cl-tui.backend::sgr-attr :bold) (format nil "~C[1m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :bold) (format nil "~C[1m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :italic) (format nil "~C[3m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :italic) (format nil "~C[3m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :underline) (format nil "~C[4m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :underline) (format nil "~C[4m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :reset) (format nil "~C[0m" #\Esc))))
|
(is (equal (cl-tty.backend::sgr-attr :reset) (format nil "~C[0m" #\Esc))))
|
||||||
|
|
||||||
;; ── Cursor ─────────────────────────────────────────────────────
|
;; ── Cursor ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
(test cursor-move-escape
|
(test cursor-move-escape
|
||||||
"cursor-move generates correct CSI escape"
|
"cursor-move generates correct CSI escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-move-escape 5 10)
|
(is (equal (cl-tty.backend::cursor-move-escape 5 10)
|
||||||
(format nil "~C[11;6H" #\Esc)))))
|
(format nil "~C[11;6H" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-block
|
(test cursor-style-block
|
||||||
"cursor-style :block generate correct escape"
|
"cursor-style :block generate correct escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :block nil)
|
(is (equal (cl-tty.backend::cursor-style-escape :block nil)
|
||||||
(format nil "~C[2 q" #\Esc)))))
|
(format nil "~C[2 q" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-bar
|
(test cursor-style-bar
|
||||||
"cursor-style :bar generate correct escape"
|
"cursor-style :bar generate correct escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :bar nil)
|
(is (equal (cl-tty.backend::cursor-style-escape :bar nil)
|
||||||
(format nil "~C[6 q" #\Esc)))))
|
(format nil "~C[6 q" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-underline-blink
|
(test cursor-style-underline-blink
|
||||||
"cursor-style :underline with blink"
|
"cursor-style :underline with blink"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :underline t)
|
(is (equal (cl-tty.backend::cursor-style-escape :underline t)
|
||||||
(format nil "~C[5 q" #\Esc)))))
|
(format nil "~C[5 q" #\Esc)))))
|
||||||
|
|
||||||
;; ── Synchronization ────────────────────────────────────────────
|
;; ── Synchronization ────────────────────────────────────────────
|
||||||
|
|
||||||
(test decicm-escapes
|
(test decicm-escapes
|
||||||
"DECICM synchronized update escapes"
|
"DECICM synchronized update escapes"
|
||||||
(is (equal (cl-tui.backend::decicm-begin) (format nil "~C[?2026h" #\Esc)))
|
(is (equal (cl-tty.backend::decicm-begin) (format nil "~C[?2026h" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::decicm-end) (format nil "~C[?2026l" #\Esc))))
|
(is (equal (cl-tty.backend::decicm-end) (format nil "~C[?2026l" #\Esc))))
|
||||||
|
|
||||||
;; ── OSC 8 Hyperlinks ──────────────────────────────────────────
|
;; ── OSC 8 Hyperlinks ──────────────────────────────────────────
|
||||||
|
|
||||||
(test osc8-escape
|
(test osc8-escape
|
||||||
"OSC 8 hyperlink escape wraps text"
|
"OSC 8 hyperlink escape wraps text"
|
||||||
(is (equal (cl-tui.backend::osc8-link "http://example.com" "click here")
|
(is (equal (cl-tty.backend::osc8-link "http://example.com" "click here")
|
||||||
(format nil "~C]8;;http://example.com~C\\click here~C]8;;~C\\"
|
(format nil "~C]8;;http://example.com~C\\click here~C]8;;~C\\"
|
||||||
#\Esc #\Esc #\Esc #\Esc))))
|
#\Esc #\Esc #\Esc #\Esc))))
|
||||||
|
|
||||||
@@ -89,21 +89,21 @@
|
|||||||
|
|
||||||
(test hex-color-parsing
|
(test hex-color-parsing
|
||||||
"hex-to-rgb parses valid hex colors"
|
"hex-to-rgb parses valid hex colors"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#FFD700")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#FFD700")
|
||||||
(is (= r 255))
|
(is (= r 255))
|
||||||
(is (= g 215))
|
(is (= g 215))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
|
|
||||||
(test hex-color-black
|
(test hex-color-black
|
||||||
"hex-to-rgb parses black"
|
"hex-to-rgb parses black"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#000000")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#000000")
|
||||||
(is (= r 0))
|
(is (= r 0))
|
||||||
(is (= g 0))
|
(is (= g 0))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
|
|
||||||
(test hex-color-short-form
|
(test hex-color-short-form
|
||||||
"hex-to-rgb parses 3-digit hex"
|
"hex-to-rgb parses 3-digit hex"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#F00")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#F00")
|
||||||
(is (= r 255))
|
(is (= r 255))
|
||||||
(is (= g 0))
|
(is (= g 0))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
@@ -112,13 +112,13 @@
|
|||||||
|
|
||||||
(test border-char-rounded
|
(test border-char-rounded
|
||||||
"modern-border-char returns Unicode box-drawing for rounded style"
|
"modern-border-char returns Unicode box-drawing for rounded style"
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :top-left) "╭"))
|
(is (equal (cl-tty.backend::border-char :rounded :top-left) "╭"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :horizontal) "─"))
|
(is (equal (cl-tty.backend::border-char :rounded :horizontal) "─"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :vertical) "│"))
|
(is (equal (cl-tty.backend::border-char :rounded :vertical) "│"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :bottom-right) "╯")))
|
(is (equal (cl-tty.backend::border-char :rounded :bottom-right) "╯")))
|
||||||
|
|
||||||
(test border-char-double
|
(test border-char-double
|
||||||
"modern-border-char returns double-line chars"
|
"modern-border-char returns double-line chars"
|
||||||
(is (equal (cl-tui.backend::border-char :double :top-left) "╔"))
|
(is (equal (cl-tty.backend::border-char :double :top-left) "╔"))
|
||||||
(is (equal (cl-tui.backend::border-char :double :horizontal) "═"))
|
(is (equal (cl-tty.backend::border-char :double :horizontal) "═"))
|
||||||
(is (equal (cl-tui.backend::border-char :double :vertical) "║")))
|
(is (equal (cl-tty.backend::border-char :double :vertical) "║")))
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
;; sgr-fg sgr-bg sgr-attr cursor-move-escape cursor-style-escape
|
;; sgr-fg sgr-bg sgr-attr cursor-move-escape cursor-style-escape
|
||||||
;; decicm-begin decicm-end osc8-link hex-to-rgb border-char
|
;; decicm-begin decicm-end osc8-link hex-to-rgb border-char
|
||||||
|
|
||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
|
|
||||||
(defun hex-to-rgb (hex)
|
(defun hex-to-rgb (hex)
|
||||||
"Parse a hex color string like \"#FFD700\" into (values r g b).
|
"Parse a hex color string like \"#FFD700\" into (values r g b).
|
||||||
@@ -113,12 +113,13 @@
|
|||||||
|
|
||||||
(defclass modern-backend (backend)
|
(defclass modern-backend (backend)
|
||||||
((output-stream :initform *standard-output*
|
((output-stream :initform *standard-output*
|
||||||
|
:initarg :output-stream
|
||||||
:accessor backend-output-stream)
|
:accessor backend-output-stream)
|
||||||
(in-sync-p :initform nil :accessor in-sync-p)))
|
(in-sync-p :initform nil :accessor in-sync-p)))
|
||||||
|
|
||||||
(defun make-modern-backend (&key color-palette)
|
(defun make-modern-backend (&key color-palette output-stream)
|
||||||
(declare (ignore color-palette))
|
(declare (ignore color-palette))
|
||||||
(make-instance 'modern-backend))
|
(make-instance 'modern-backend :output-stream (or output-stream *standard-output*)))
|
||||||
|
|
||||||
(defmethod initialize-backend ((b modern-backend))
|
(defmethod initialize-backend ((b modern-backend))
|
||||||
;; Enter raw mode, enable mouse, bracketed paste
|
;; Enter raw mode, enable mouse, bracketed paste
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
(defpackage :cl-tui.backend
|
(defpackage :cl-tty.backend
|
||||||
(:use :cl)
|
(:use :cl)
|
||||||
(:export
|
(:export
|
||||||
;; Backend classes
|
;; Backend classes
|
||||||
@@ -26,4 +26,4 @@
|
|||||||
#:cursor-move-escape #:cursor-style-escape
|
#:cursor-move-escape #:cursor-style-escape
|
||||||
#:decicm-begin #:decicm-end #:osc8-link
|
#:decicm-begin #:decicm-end #:osc8-link
|
||||||
#:hex-to-rgb #:border-char))
|
#:hex-to-rgb #:border-char))
|
||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
|
|
||||||
(defclass simple-backend (backend)
|
(defclass simple-backend (backend)
|
||||||
((output-stream :initform *standard-output*
|
((output-stream :initform *standard-output*
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
(defpackage :cl-tui-backend-test
|
(defpackage :cl-tty-backend-test
|
||||||
(:use :cl :fiveam :cl-tui.backend)
|
(:use :cl :fiveam :cl-tty.backend)
|
||||||
(:export #:run-tests))
|
(:export #:run-tests))
|
||||||
(in-package :cl-tui-backend-test)
|
(in-package :cl-tty-backend-test)
|
||||||
|
|
||||||
(def-suite backend-suite :description "Backend protocol tests")
|
(def-suite backend-suite :description "Backend protocol tests")
|
||||||
(in-suite backend-suite)
|
(in-suite backend-suite)
|
||||||
|
|||||||
86
cl-tty.asd
Normal file
86
cl-tty.asd
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
;;; cl-tty.asd — Common Lisp Terminal UI Framework
|
||||||
|
(asdf:defsystem :cl-tty
|
||||||
|
:description "Reusable Common Lisp Terminal UI Framework"
|
||||||
|
:author "Amr Gharbeia"
|
||||||
|
:version "0.10.0"
|
||||||
|
:license "TBD"
|
||||||
|
:depends-on (:fiveam :sb-posix)
|
||||||
|
:components
|
||||||
|
((:module "backend"
|
||||||
|
:components
|
||||||
|
((:file "package")
|
||||||
|
(:file "classes" :depends-on ("package"))
|
||||||
|
(:file "simple" :depends-on ("package" "classes"))
|
||||||
|
(:file "modern" :depends-on ("package" "classes"))))
|
||||||
|
(:module "layout"
|
||||||
|
:components
|
||||||
|
((:file "layout")))
|
||||||
|
(:module "src/components"
|
||||||
|
:components
|
||||||
|
((:file "package")
|
||||||
|
(:file "dirty")
|
||||||
|
(:file "box" :depends-on ("package"))
|
||||||
|
(:file "text" :depends-on ("package" "box"))
|
||||||
|
(:file "render" :depends-on ("package" "box" "text"))
|
||||||
|
(:file "theme" :depends-on ("package"))
|
||||||
|
;; Input system (v0.5.0)
|
||||||
|
(:file "input-package" :depends-on ("package"))
|
||||||
|
(:file "input" :depends-on ("input-package" "dirty" "box"))
|
||||||
|
(:file "text-input" :depends-on ("input-package" "input" "box"))
|
||||||
|
(:file "textarea" :depends-on ("input-package" "input" "box"))
|
||||||
|
(:file "keybindings" :depends-on ("input-package" "input"))
|
||||||
|
;; Container components (v0.6.0)
|
||||||
|
(:file "container-package" :depends-on ("package" "input-package"))
|
||||||
|
(:file "scrollbox" :depends-on ("container-package" "dirty" "box"))
|
||||||
|
(:file "tabbar" :depends-on ("container-package" "dirty" "box"))
|
||||||
|
;; Select widget (v0.7.0)
|
||||||
|
(:file "select-package" :depends-on ("package" "input-package"))
|
||||||
|
(:file "select" :depends-on ("select-package" "dirty" "box"))
|
||||||
|
;; Markdown + Code + Diff rendering (v0.8.0)
|
||||||
|
(:file "markdown-package" :depends-on ("package"))
|
||||||
|
(:file "markdown" :depends-on ("markdown-package"))
|
||||||
|
;; Dialog + Toast (v0.9.0)
|
||||||
|
(:file "dialog-package" :depends-on ("package" "select-package" "input-package"))
|
||||||
|
(:file "dialog" :depends-on ("dialog-package" "dirty" "select" "text-input"))
|
||||||
|
;; Mouse support (v0.10.0)
|
||||||
|
(:file "mouse-package" :depends-on ("package" "input-package"))
|
||||||
|
(:file "mouse" :depends-on ("mouse-package" "dirty" "input")))))
|
||||||
|
:in-order-to ((test-op (test-op :cl-tty-tests))))
|
||||||
|
|
||||||
|
(asdf:defsystem :cl-tty-tests
|
||||||
|
:description "Test suite for cl-tty"
|
||||||
|
:depends-on (:cl-tty :fiveam)
|
||||||
|
:components
|
||||||
|
((:module "backend"
|
||||||
|
:components
|
||||||
|
((:file "tests")))
|
||||||
|
(:module "layout"
|
||||||
|
:components
|
||||||
|
((:file "tests")))
|
||||||
|
(:module "src/components"
|
||||||
|
:components
|
||||||
|
((:file "box-tests")
|
||||||
|
(:file "dirty-tests")
|
||||||
|
(:file "render-tests")
|
||||||
|
(:file "theme-tests")
|
||||||
|
(:file "input-tests")
|
||||||
|
(:file "scrollbox-tabbar-tests" :pathname "../../tests/scrollbox-tabbar-tests.lisp")
|
||||||
|
(:file "select-tests" :pathname "../../tests/select-tests.lisp")
|
||||||
|
(:file "markdown-tests" :pathname "../../tests/markdown-tests.lisp")
|
||||||
|
(:file "dialog-tests" :pathname "../../tests/dialog-tests.lisp")
|
||||||
|
(:file "mouse-tests" :pathname "../../tests/mouse-tests.lisp"))))
|
||||||
|
:perform (test-op (o c)
|
||||||
|
(let ((run (find-symbol "RUN" :fiveam))
|
||||||
|
(explain (find-symbol "EXPLAIN!" :fiveam)))
|
||||||
|
(dolist (suite '((:cl-tty-backend-test "BACKEND-SUITE")
|
||||||
|
(:cl-tty-box-test "BOX-SUITE")
|
||||||
|
(:cl-tty-input-test "INPUT-SUITE")
|
||||||
|
(:cl-tty-scrollbox-test "SCROLLBOX-SUITE")
|
||||||
|
(:cl-tty-select-test "SELECT-SUITE")
|
||||||
|
(:cl-tty-markdown-test "MARKDOWN-SUITE")
|
||||||
|
(:cl-tty-dialog-test "DIALOG-SUITE")))
|
||||||
|
(let* ((pkg (find-package (first suite)))
|
||||||
|
(s (and pkg (find-symbol (second suite) pkg))))
|
||||||
|
(when s
|
||||||
|
(funcall explain (funcall run s))))))
|
||||||
|
(uiop:quit 0)))
|
||||||
31
cl-tui.asd
31
cl-tui.asd
@@ -1,31 +0,0 @@
|
|||||||
;;; cl-tui.asd — Common Lisp Terminal UI Framework
|
|
||||||
(asdf:defsystem :cl-tui
|
|
||||||
:description "Reusable Common Lisp Terminal UI Framework"
|
|
||||||
:author "Amr Gharbeia"
|
|
||||||
:version "0.0.3"
|
|
||||||
:license "TBD"
|
|
||||||
:depends-on (:fiveam)
|
|
||||||
:components
|
|
||||||
((:module "backend"
|
|
||||||
:components
|
|
||||||
((:file "package")
|
|
||||||
(:file "classes" :depends-on ("package"))
|
|
||||||
(:file "simple" :depends-on ("package" "classes"))
|
|
||||||
(:file "modern" :depends-on ("package" "classes"))))
|
|
||||||
(:module "layout"
|
|
||||||
:components
|
|
||||||
((:file "layout"))))
|
|
||||||
:in-order-to ((test-op (test-op :cl-tui-tests))))
|
|
||||||
|
|
||||||
(asdf:defsystem :cl-tui-tests
|
|
||||||
:description "Test suite for cl-tui"
|
|
||||||
:depends-on (:cl-tui :fiveam)
|
|
||||||
:components
|
|
||||||
((:module "backend"
|
|
||||||
:components
|
|
||||||
((:file "tests")))
|
|
||||||
(:module "layout"
|
|
||||||
:components
|
|
||||||
((:file "tests"))))
|
|
||||||
:perform (test-op (o c)
|
|
||||||
(uiop:symbol-call :cl-tui-backend-test '#:run!)))
|
|
||||||
28
demo.lisp
Normal file
28
demo.lisp
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
;; demo.lisp — minimal cl-tty demo
|
||||||
|
(load "/root/quicklisp/setup.lisp")
|
||||||
|
(ql:quickload :fiveam :silent t)
|
||||||
|
(load "backend/package.lisp")
|
||||||
|
(load "backend/classes.lisp")
|
||||||
|
(load "backend/simple.lisp")
|
||||||
|
(load "backend/modern.lisp")
|
||||||
|
(load "layout/layout.lisp")
|
||||||
|
(load "src/components/package.lisp")
|
||||||
|
(load "src/components/dirty.lisp")
|
||||||
|
(load "src/components/box.lisp")
|
||||||
|
(load "src/components/text.lisp")
|
||||||
|
(load "src/components/render.lisp")
|
||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
;; Demo 1: Simple backend (ASCII)
|
||||||
|
(let* ((b (make-simple-backend))
|
||||||
|
(bx (make-box :border-style :rounded :title " Hello World " :width 30 :height 5)))
|
||||||
|
(compute-layout (box-layout-node bx) 30 5)
|
||||||
|
(render bx b))
|
||||||
|
|
||||||
|
;; Demo 2: Box with text inside
|
||||||
|
(let* ((b (make-simple-backend))
|
||||||
|
(tx (make-text "This is cl-tty in action!" :width 28 :height 1)))
|
||||||
|
(setf (layout-node-direction (text-layout-node tx)) :column)
|
||||||
|
(compute-layout (text-layout-node tx) 28 1)
|
||||||
|
(render tx b)
|
||||||
|
(format t "~%~%"))
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
#+TITLE: cl-tui Architecture
|
#+TITLE: cl-tty Architecture
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :project:cl-tui:architecture:
|
#+FILETAGS: :project:cl-tty:architecture:
|
||||||
|
|
||||||
* Architecture
|
* Architecture
|
||||||
|
|
||||||
cl-tui is a layered framework. Each layer has a single responsibility
|
cl-tty is a layered framework. Each layer has a single responsibility
|
||||||
and communicates with adjacent layers through a well-defined protocol.
|
and communicates with adjacent layers through a well-defined protocol.
|
||||||
|
|
||||||
** Layer Diagram
|
** Layer Diagram
|
||||||
@@ -264,9 +264,9 @@ reads terminal background color at startup.
|
|||||||
** File Structure
|
** File Structure
|
||||||
|
|
||||||
#+BEGIN_SRC
|
#+BEGIN_SRC
|
||||||
cl-tui/
|
cl-tty/
|
||||||
├── cl-tui.asd
|
├── cl-tty.asd
|
||||||
├── cl-tui-tests.asd
|
├── cl-tty-tests.asd
|
||||||
├── README.org
|
├── README.org
|
||||||
├── LICENSE
|
├── LICENSE
|
||||||
├── docs/
|
├── docs/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#+TITLE: cl-tui Roadmap
|
#+TITLE: cl-tty Roadmap
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :docs:roadmap:cl-tui:
|
#+FILETAGS: :docs:roadmap:cl-tty:
|
||||||
|
|
||||||
* The Roadmap
|
* The Roadmap
|
||||||
|
|
||||||
@@ -87,7 +87,7 @@ the patch version (v0.X.Y).
|
|||||||
When a version ships:
|
When a version ships:
|
||||||
1. ~ROADMAP.org~ — mark item DONE, update LOGBOOK timestamp
|
1. ~ROADMAP.org~ — mark item DONE, update LOGBOOK timestamp
|
||||||
2. ~README.org~ — update Status line
|
2. ~README.org~ — update Status line
|
||||||
3. ~cl-tui.asd~ — update version string
|
3. ~cl-tty.asd~ — update version string
|
||||||
|
|
||||||
** v0.1.0: Layout Engine
|
** v0.1.0: Layout Engine
|
||||||
|
|
||||||
@@ -157,11 +157,14 @@ The first two renderable types that every application uses. A Box draws borders
|
|||||||
and backgrounds. A Text renders strings with color and style. Together they
|
and backgrounds. A Text renders strings with color and style. Together they
|
||||||
cover 80% of terminal UI.
|
cover 80% of terminal UI.
|
||||||
|
|
||||||
*** TODO Box renderable
|
*** DONE Box renderable
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: id-v020-box
|
:ID: id-v020-box
|
||||||
:CREATED: [2026-05-10 Sat]
|
:CREATED: [2026-05-10 Sat]
|
||||||
:END:
|
:END:
|
||||||
|
:LOGBOOK:
|
||||||
|
- State \"DONE\" from \"TODO\" [2026-05-11 Mon]
|
||||||
|
:END:
|
||||||
|
|
||||||
- ~(defclass box ...)~ — renderable with background color, border, title
|
- ~(defclass box ...)~ — renderable with background color, border, title
|
||||||
- ~(render-box box window)~ — draws border (single/double/rounded), fills background, renders title
|
- ~(render-box box window)~ — draws border (single/double/rounded), fills background, renders title
|
||||||
@@ -170,11 +173,14 @@ cover 80% of terminal UI.
|
|||||||
- ~:focusable~ property — renders focused border color when focused
|
- ~:focusable~ property — renders focused border color when focused
|
||||||
- ~100 lines
|
- ~100 lines
|
||||||
|
|
||||||
*** TODO Text renderable
|
*** DONE Text renderable
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: id-v020-text
|
:ID: id-v020-text
|
||||||
:CREATED: [2026-05-10 Sat]
|
:CREATED: [2026-05-10 Sat]
|
||||||
:END:
|
:END:
|
||||||
|
:LOGBOOK:
|
||||||
|
- State \"DONE\" from \"TODO\" [2026-05-11 Mon]
|
||||||
|
:END:
|
||||||
|
|
||||||
- ~(defclass text ...)~ — renderable with content, fg/bg color, wrap mode
|
- ~(defclass text ...)~ — renderable with content, fg/bg color, wrap mode
|
||||||
- ~(render-text text window)~ — renders text at the layout position, wraps at width
|
- ~(render-text text window)~ — renders text at the layout position, wraps at width
|
||||||
@@ -182,22 +188,28 @@ cover 80% of terminal UI.
|
|||||||
- CJK/emoji character-width aware wrapping
|
- CJK/emoji character-width aware wrapping
|
||||||
- ~100 lines
|
- ~100 lines
|
||||||
|
|
||||||
*** TODO Inline text styles
|
*** DONE Inline text styles
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: id-v020-inline
|
:ID: id-v020-inline
|
||||||
:CREATED: [2026-05-10 Sat]
|
:CREATED: [2026-05-10 Sat]
|
||||||
:END:
|
:END:
|
||||||
|
:LOGBOOK:
|
||||||
|
- State \"DONE\" from \"TODO\" [2026-05-11 Mon]
|
||||||
|
:END:
|
||||||
|
|
||||||
- ~(defclass span ...)~ — inline text segment with attributes
|
- ~(defclass span ...)~ — inline text segment with attributes
|
||||||
- Text attributes: ~:bold~, ~:italic~, ~:underline~, ~:dim~, ~:reverse~
|
- Text attributes: ~:bold~, ~:italic~, ~:underline~, ~:dim~, ~:reverse~
|
||||||
- ~(make-text "hello " (bold "world") "!")~ — builds styled text from spans and strings
|
- ~(make-text "hello " (bold "world") "!")~ — builds styled text from spans and strings
|
||||||
- ~60 lines
|
- ~60 lines
|
||||||
|
|
||||||
*** TODO Dirty tracking
|
*** DONE Dirty tracking
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: id-v020-dirty
|
:ID: id-v020-dirty
|
||||||
:CREATED: [2026-05-10 Sat]
|
:CREATED: [2026-05-10 Sat]
|
||||||
:END:
|
:END:
|
||||||
|
:LOGBOOK:
|
||||||
|
- State \"DONE\" from \"TODO\" [2026-05-11 Mon]
|
||||||
|
:END:
|
||||||
|
|
||||||
- ~(mark-dirty component)~ — flags component and all ancestors
|
- ~(mark-dirty component)~ — flags component and all ancestors
|
||||||
- ~(dirty-p component)~ — returns T if the component needs re-rendering
|
- ~(dirty-p component)~ — returns T if the component needs re-rendering
|
||||||
@@ -283,7 +295,7 @@ never hex values.
|
|||||||
8 presets: default (gold), professional, minimal, nord, tokyonight, catppuccin, monokai, gruvbox
|
8 presets: default (gold), professional, minimal, nord, tokyonight, catppuccin, monokai, gruvbox
|
||||||
- Each preset is a plist: ~(:primary "#FFD700" :error "#BF616A" ...)~
|
- Each preset is a plist: ~(:primary "#FFD700" :error "#BF616A" ...)~
|
||||||
- ~(theme-load :nord)~ — activates a preset, re-renders dirty
|
- ~(theme-load :nord)~ — activates a preset, re-renders dirty
|
||||||
- Load from ~/.config/cl-tui/themes/<name>.lisp~ for custom themes
|
- Load from ~/.config/cl-tty/themes/<name>.lisp~ for custom themes
|
||||||
- ~80 lines
|
- ~80 lines
|
||||||
|
|
||||||
*** TODO Dark/light variants
|
*** TODO Dark/light variants
|
||||||
|
|||||||
127
docs/plans/2026-05-11-v0.2.0-box-and-text.md
Normal file
127
docs/plans/2026-05-11-v0.2.0-box-and-text.md
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
# v0.2.0: Renderables — Box and Text
|
||||||
|
|
||||||
|
> Implementation plan for the first two renderable component types.
|
||||||
|
|
||||||
|
**Goal:** Create Box (border+background+title) and Text (styled wrapping text) renderables that render through the backend protocol.
|
||||||
|
|
||||||
|
**Architecture:** Each renderable is a CLOS class with a `layout-node` slot for positioning. The `render` method dispatches through the backend protocol (draw-text, draw-border, draw-rect). Tests capture backend output via string streams.
|
||||||
|
|
||||||
|
**Files created:**
|
||||||
|
- `org/box-renderable.org` — Box class, render method (literate source)
|
||||||
|
- `org/text-renderable.org` — Text class, render method, inline spans (literate source)
|
||||||
|
- `org/dirty-tracking.org` — Dirty flag system (literate source)
|
||||||
|
- `src/components/box.lisp` — tangled
|
||||||
|
- `src/components/text.lisp` — tangled
|
||||||
|
- `src/components/dirty.lisp` — tangled
|
||||||
|
|
||||||
|
**Files modified:**
|
||||||
|
- `cl-tty.asd` — add component modules
|
||||||
|
- `docs/ROADMAP.org` — mark v0.2.0 tasks DONE
|
||||||
|
|
||||||
|
## Task 1: Box renderable
|
||||||
|
|
||||||
|
**Objective:** Box class that draws borders, fills backgrounds, and renders titles.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/box-renderable.org`
|
||||||
|
- Create: `src/components/box.lisp` (extracted)
|
||||||
|
- Modify: `cl-tty.asd` — add components module
|
||||||
|
|
||||||
|
**Box class:**
|
||||||
|
```lisp
|
||||||
|
(defclass box ()
|
||||||
|
((layout-node :initarg :layout-node :accessor box-layout-node)
|
||||||
|
(border-style :initform :single :initarg :border-style :accessor box-border-style)
|
||||||
|
(title :initform nil :initarg :title :accessor box-title)
|
||||||
|
(title-align :initform :left :initarg :title-align :accessor box-title-align)
|
||||||
|
(fg :initform nil :initarg :fg :accessor box-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor box-bg)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**render-box method:**
|
||||||
|
Renders at computed layout position using backend's draw-border, draw-rect, draw-text.
|
||||||
|
Delegates to the backend — no escape sequences directly.
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
- Create box with border, verify draw-border was called with correct params
|
||||||
|
- Create box with title, verify title positioning
|
||||||
|
- Create box with background fill
|
||||||
|
- Edge cases: box with 0 width/height, no border style, very long title
|
||||||
|
|
||||||
|
## Task 2: Text renderable
|
||||||
|
|
||||||
|
**Objective:** Text class that renders strings at layout position with word-wrap.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/text-renderable.org`
|
||||||
|
- Create: `src/components/text.lisp` (extracted)
|
||||||
|
|
||||||
|
**Text class:**
|
||||||
|
```lisp
|
||||||
|
(defclass text ()
|
||||||
|
((layout-node :initarg :layout-node :accessor text-layout-node)
|
||||||
|
(content :initarg :content :accessor text-content)
|
||||||
|
(fg :initform nil :initarg :fg :accessor text-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor text-bg)
|
||||||
|
(wrap-mode :initform :word :initarg :wrap-mode :accessor text-wrap-mode)
|
||||||
|
(spans :initform nil :initarg :spans :accessor text-spans)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**render-text method:**
|
||||||
|
1. Get layout position (x, y, width, height)
|
||||||
|
2. If wrap-mode is :none, truncate to width
|
||||||
|
3. If wrap-mode is :word, word-wrap (break on whitespace)
|
||||||
|
4. Draw each line via backend's draw-text
|
||||||
|
5. Apply span attributes (bold, italic, etc.) per segment
|
||||||
|
|
||||||
|
**Inline spans:**
|
||||||
|
```lisp
|
||||||
|
(defclass span ()
|
||||||
|
((text :initarg :text :accessor span-text)
|
||||||
|
(bold :initform nil :initarg :bold :accessor span-bold)
|
||||||
|
(italic :initform nil :initarg :italic :accessor span-italic)
|
||||||
|
(underline :initform nil :initarg :underline :accessor span-underline)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
- Text renders string at correct position
|
||||||
|
- Word-wrap breaks at word boundaries
|
||||||
|
- Truncation mode clips at width
|
||||||
|
- Spans apply style attributes per segment
|
||||||
|
- Empty string rendering
|
||||||
|
- Single character
|
||||||
|
- String shorter than width (no wrapping needed)
|
||||||
|
|
||||||
|
## Task 3: Dirty tracking
|
||||||
|
|
||||||
|
**Objective:** Lightweight dirty-flag system for incremental rendering.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/dirty-tracking.org`
|
||||||
|
- Create: `src/components/dirty.lisp` (extracted)
|
||||||
|
|
||||||
|
```lisp
|
||||||
|
(defgeneric mark-dirty (component))
|
||||||
|
(defgeneric dirty-p (component))
|
||||||
|
(defgeneric mark-clean (component))
|
||||||
|
```
|
||||||
|
|
||||||
|
Default methods mark/check a `dirty` slot on the component. When implemented:
|
||||||
|
- `mark-dirty` — sets dirty flag, propagates to parent
|
||||||
|
- `dirty-p` — returns T if component needs re-render
|
||||||
|
- `mark-clean` — clears dirty flag after render
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
- New component is dirty (default)
|
||||||
|
- mark-clean clears dirty flag
|
||||||
|
- dirty-p returns nil after mark-clean
|
||||||
|
- mark-dirty sets dirty flag again
|
||||||
|
|
||||||
|
## Task 4: Wire into ASDF + update roadmap
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `cl-tty.asd` — add `:module "components"` to both main and test systems
|
||||||
|
- Modify: `docs/ROADMAP.org` — mark v0.2.0 tasks DONE
|
||||||
|
|
||||||
|
**Run full test suite:**
|
||||||
|
All 72 existing tests + new component tests: 100% GREEN.
|
||||||
365
docs/plans/2026-05-11-v0.5.0-text-input.md
Normal file
365
docs/plans/2026-05-11-v0.5.0-text-input.md
Normal file
@@ -0,0 +1,365 @@
|
|||||||
|
# v0.5.0: Text Input + Keybinding System
|
||||||
|
|
||||||
|
**Architecture:** Three layers. First, terminal input infrastructure (raw mode, escape parsing, key events) — this is the missing piece the roadmap assumed croatoan would provide. Then TextInput and Textarea widgets. Finally, the layered keybinding system.
|
||||||
|
|
||||||
|
**The hidden dependency:** `read-event` is currently a no-op in both backends. We need raw terminal I/O (tcsetattr, non-canonical mode, escape sequence parsing) before any input widget works. SBCL provides `sb-posix` for POSIX terminal APIs.
|
||||||
|
|
||||||
|
**File structure:**
|
||||||
|
```
|
||||||
|
org/input.org — literate source: terminal input + key events
|
||||||
|
org/text-input.org — literate source: TextInput widget
|
||||||
|
org/textarea.org — literate source: Textarea widget
|
||||||
|
org/keybindings.org — literate source: keybinding system
|
||||||
|
|
||||||
|
backend/input.lisp — tangled: raw terminal, escape parser, key events
|
||||||
|
src/components/input.lisp — tangled: TextInput widget
|
||||||
|
src/components/textarea.lisp — tangled: Textarea widget
|
||||||
|
src/components/keybindings.lisp — tangled: keybinding system
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Terminal Input Infrastructure
|
||||||
|
|
||||||
|
**Objective:** Raw terminal mode, ANSI escape sequence parser, key event types. Implements `read-event` for both backends.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/input.org`
|
||||||
|
- Create: `src/input.lisp` (tangled)
|
||||||
|
- Create: `tests/input-tests.lisp`
|
||||||
|
- Modify: `backend/package.lisp` — add input exports
|
||||||
|
- Modify: `backend/modern.lisp` — implement read-event
|
||||||
|
- Modify: `backend/simple.lisp` — implement read-event (stdin)
|
||||||
|
- Modify: `cl-tty.asd` — add input module to main and test systems
|
||||||
|
|
||||||
|
**Code architecture:**
|
||||||
|
|
||||||
|
```lisp
|
||||||
|
;; Key event type — all input gets normalized to this
|
||||||
|
(defstruct key-event
|
||||||
|
key ;; :a, :b, :space, :enter, :tab, :escape
|
||||||
|
;; :up, :down, :left, :right
|
||||||
|
;; :f1..:f12
|
||||||
|
ctrl ;; boolean
|
||||||
|
alt ;; boolean
|
||||||
|
shift ;; boolean
|
||||||
|
code ;; raw character code (fixnum)
|
||||||
|
raw ;; raw escape sequence string (for debugging)
|
||||||
|
text) ;; for bracketed paste: the pasted text string
|
||||||
|
|
||||||
|
(defstruct mouse-event
|
||||||
|
type ;; :press, :release, :drag
|
||||||
|
button ;; :left, :middle, :right, :none
|
||||||
|
x y
|
||||||
|
raw)
|
||||||
|
|
||||||
|
;; Terminal raw mode — saves/restores termios
|
||||||
|
(defun save-terminal-state () ...) ;; tcgetattr(0)
|
||||||
|
(defun set-raw-mode () ...) ;; tcsetattr(0, TCSANOW, raw)
|
||||||
|
(defun restore-terminal-state () ...)
|
||||||
|
(defmacro with-raw-terminal (&body body) ...)
|
||||||
|
|
||||||
|
;; Escape sequence parser
|
||||||
|
(defun read-byte-from-stdin (&optional timeout) ...)
|
||||||
|
(defun parse-escape-sequence () ...) ;; reads CSI, SS3 sequences
|
||||||
|
(defun parse-csi-sequence () ...) ;; parses CSI number;...$char
|
||||||
|
(defun parse-sgr-mouse () ...) ;; parse CSI < r;c;M/m
|
||||||
|
(defun read-event-from-stdin (&key timeout) ...) ;; full read+parse
|
||||||
|
|
||||||
|
;; Backend integration
|
||||||
|
(defmethod read-event ((b modern-backend) &key timeout)
|
||||||
|
(let ((event (read-event-from-stdin :timeout timeout)))
|
||||||
|
(if (key-event-p event)
|
||||||
|
(values (key-event-key event) event)
|
||||||
|
(values nil event))))
|
||||||
|
|
||||||
|
(defmethod read-event ((b simple-backend) &key timeout)
|
||||||
|
(read-event-from-stdin :timeout timeout))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Key normalization table (partial):**
|
||||||
|
| Raw byte(s) | Key | Ctrl | Alt |
|
||||||
|
|---|---|---|---|
|
||||||
|
| #x1b | :escape | nil | nil |
|
||||||
|
| #x7f or #x08 | :backspace | nil | nil |
|
||||||
|
| #x0a | :enter | nil | nil |
|
||||||
|
| #x09 | :tab | nil | nil |
|
||||||
|
| #x01 | :a | t | nil |
|
||||||
|
| CSI A | :up | nil | nil |
|
||||||
|
| CSI 1~ | :home | nil | nil |
|
||||||
|
| CSI 200~ | (bracketed paste start) | — | — |
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
```lisp
|
||||||
|
(test read-ctrl-a
|
||||||
|
(let* ((event (make-key-event :a :ctrl t)))
|
||||||
|
(is (eql (key-event-key event) :a))
|
||||||
|
(is-true (key-event-ctrl event))))
|
||||||
|
|
||||||
|
(test parse-csi-up
|
||||||
|
(let ((kb (terminal-sequence->key-event (format nil \"~C[A\" #\\Esc))))
|
||||||
|
(is (eql (key-event-key kb) :up))))
|
||||||
|
|
||||||
|
(test mouse-sgr
|
||||||
|
(let ((event (parse-sgr-mouse \"<0;10;5M\")))
|
||||||
|
(is (eql (mouse-event-type event) :press))
|
||||||
|
(is (eql (mouse-event-button event) :left))
|
||||||
|
(is (= (mouse-event-x event) 10))
|
||||||
|
(is (= (mouse-event-y event) 5))))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Line count:** ~250 lines
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: TextInput Widget
|
||||||
|
|
||||||
|
**Objective:** Single-line text input widget with cursor, placeholder, insertion/deletion, clipboard, emacs keybindings.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/text-input.org`
|
||||||
|
- Create: `src/components/input.lisp`
|
||||||
|
- Modify: `src/components/package.lisp` — add exports
|
||||||
|
- Modify: `cl-tty.asd` — add input.lisp
|
||||||
|
|
||||||
|
**TextInput class:**
|
||||||
|
```lisp
|
||||||
|
(defclass text-input (dirty-mixin)
|
||||||
|
((value :initform "" :initarg :value :accessor text-input-value)
|
||||||
|
(cursor :initform 0 :initarg :cursor :accessor text-input-cursor)
|
||||||
|
(placeholder :initform "" :initarg :placeholder :accessor text-input-placeholder)
|
||||||
|
(max-length :initform nil :initarg :max-length :accessor text-input-max-length)
|
||||||
|
(on-submit :initform nil :initarg :on-submit :accessor text-input-on-submit)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor text-input-layout-node)
|
||||||
|
(focusable :initform t :accessor text-input-focusable)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Methods:**
|
||||||
|
- `render-text-input` — renders value at cursor position, placeholder when empty, cursor
|
||||||
|
- `handle-input text-input key-event` — dispatches key events to editing actions:
|
||||||
|
- Left/Right → cursor-char-left/right
|
||||||
|
- Home → cursor-line-start
|
||||||
|
- End → cursor-line-end
|
||||||
|
- Backspace → delete-char-before
|
||||||
|
- Delete → delete-char-after
|
||||||
|
- Printable chars → insert-char
|
||||||
|
- Enter → on-submit callback
|
||||||
|
- Ctrl+W → delete-word-before
|
||||||
|
- Ctrl+U → delete-line-before
|
||||||
|
- Ctrl+K → delete-line-after
|
||||||
|
- Ctrl+A → cursor-line-start
|
||||||
|
- Ctrl+E → cursor-line-end
|
||||||
|
|
||||||
|
**Visual:**
|
||||||
|
```
|
||||||
|
┌──────────────────────────────┐
|
||||||
|
│ Hello world| │ ← cursor at position 11
|
||||||
|
└──────────────────────────────┘
|
||||||
|
|
||||||
|
┌──────────────────────────────┐
|
||||||
|
│ Type something... │ ← placeholder (dimmed)
|
||||||
|
└──────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
```lisp
|
||||||
|
(test input-empty
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(is (string= (text-input-value in) ""))
|
||||||
|
(is (= (text-input-cursor in) 0))))
|
||||||
|
|
||||||
|
(test input-insert-char
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(handle-input in (make-key-event :a))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test input-backspace
|
||||||
|
(let ((in (make-text-input :initial-value "ab")))
|
||||||
|
(setf (text-input-cursor in) 2)
|
||||||
|
(handle-input in (make-key-event :backspace))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test input-max-length
|
||||||
|
(let ((in (make-text-input :max-length 3)))
|
||||||
|
(handle-input in (make-key-event :a))
|
||||||
|
(handle-input in (make-key-event :b))
|
||||||
|
(handle-input in (make-key-event :c))
|
||||||
|
(handle-input in (make-key-event :d)) ;; should be ignored
|
||||||
|
(is (string= (text-input-value in) "abc"))))
|
||||||
|
|
||||||
|
(test input-cursor-movement
|
||||||
|
(let ((in (make-text-input :initial-value "hello")))
|
||||||
|
(setf (text-input-cursor in) 5)
|
||||||
|
(handle-input in (make-key-event :left))
|
||||||
|
(is (= (text-input-cursor in) 4))
|
||||||
|
(handle-input in (make-key-event :right))
|
||||||
|
(is (= (text-input-cursor in) 5))
|
||||||
|
(handle-input in (make-key-event :home))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(handle-input in (make-key-event :end))
|
||||||
|
(is (= (text-input-cursor in) 5))))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Line count:** ~150 lines
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: Textarea Widget
|
||||||
|
|
||||||
|
**Objective:** Multi-line text input with selection, undo/redo, word navigation.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/textarea.org`
|
||||||
|
- Create: `src/components/textarea.lisp`
|
||||||
|
- Modify: `src/components/package.lisp` — add exports
|
||||||
|
- Modify: `cl-tty.asd` — add textarea.lisp
|
||||||
|
|
||||||
|
**Textarea class:**
|
||||||
|
```lisp
|
||||||
|
(defclass textarea (dirty-mixin)
|
||||||
|
((value :initform "" :initarg :value :accessor textarea-value)
|
||||||
|
(cursor-row :initform 0 :accessor textarea-cursor-row)
|
||||||
|
(cursor-col :initform 0 :accessor textarea-cursor-col)
|
||||||
|
(selection-start :initform nil :accessor textarea-selection-start) ;; (row . col) or nil
|
||||||
|
(undo-stack :initform (make-array 100 :fill-pointer 0) :accessor textarea-undo-stack)
|
||||||
|
(on-submit :initform nil :initarg :on-submit :accessor textarea-on-submit)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor textarea-layout-node)
|
||||||
|
(focusable :initform t :accessor textarea-focusable)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Methods:**
|
||||||
|
- `render-textarea` — renders visible lines with cursor, optional selection highlight
|
||||||
|
- `handle-textarea-input textarea key-event` — dispatches
|
||||||
|
- `textarea-insert-at textarea str` — insert at cursor
|
||||||
|
- `textarea-delete-before textarea` — backspace
|
||||||
|
- `textarea-delete-after textarea` — delete
|
||||||
|
- `textarea-newline textarea` — insert newline
|
||||||
|
- `textarea-cursor-up/down/left/right` — movement
|
||||||
|
- `textarea-word-forward/backward` — word skips
|
||||||
|
- `textarea-select-to textarea` — extend selection to cursor
|
||||||
|
- `textarea-copy-selection / cut-selection / paste` — clipboard
|
||||||
|
- `textarea-undo / redo` — undo/redo stack
|
||||||
|
|
||||||
|
**Tests:** Similar pattern to TextInput but multi-line, with selection tests.
|
||||||
|
**Line count:** ~200 lines
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: Keybinding System
|
||||||
|
|
||||||
|
**Objective:** Layered keymaps (global → local → input), defkeymap macro, chord sequences.
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `org/keybindings.org`
|
||||||
|
- Create: `src/components/keybindings.lisp`
|
||||||
|
- Modify: `src/components/package.lisp` — add exports
|
||||||
|
- Modify: `cl-tty.asd` — add keybindings.lisp
|
||||||
|
|
||||||
|
**Architecture:**
|
||||||
|
```lisp
|
||||||
|
(defstruct keymap
|
||||||
|
name ;; :global, :local, or symbol
|
||||||
|
bindings ;; alist: ((key-event-spec . handler-function) ...)
|
||||||
|
parent) ;; parent keymap for fallback
|
||||||
|
|
||||||
|
(defmacro defkeymap (name &body bindings)
|
||||||
|
;; (defkeymap :global
|
||||||
|
;; (:ctrl+p . command-palette)
|
||||||
|
;; ((:ctrl+c :ctrl+d) . quit))
|
||||||
|
`(setf (gethash ',name *keymaps*)
|
||||||
|
(make-keymap :name ',name
|
||||||
|
:bindings ',bindings)))
|
||||||
|
|
||||||
|
(defparameter *keymaps* (make-hash-table))
|
||||||
|
|
||||||
|
;; Dispatch order: focused-component-keymap → local → global
|
||||||
|
(defun dispatch-key-event (event &key component)
|
||||||
|
(let* ((local (and component (component-keymap component)))
|
||||||
|
(global (gethash :global *keymaps*)))
|
||||||
|
(or (match-and-call local event)
|
||||||
|
(match-and-call global event))))
|
||||||
|
|
||||||
|
(defun match-and-call (keymap event)
|
||||||
|
(loop for (spec . handler) in (keymap-bindings keymap)
|
||||||
|
thereis (when (key-match-p spec event)
|
||||||
|
(funcall handler event))))
|
||||||
|
|
||||||
|
;; Key spec matching
|
||||||
|
(defun key-match-p (spec event)
|
||||||
|
(etypecase spec
|
||||||
|
(keyword (eql spec (key-event-key event)))
|
||||||
|
(list (and (eql (first spec) (key-event-key event))
|
||||||
|
(eql (getf (rest spec) :ctrl) (key-event-ctrl event))
|
||||||
|
(eql (getf (rest spec) :alt) (key-event-alt event))))))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Chord support:** Two-key sequences with timeout:
|
||||||
|
```lisp
|
||||||
|
(defparameter *chord-timeout* 0.5) ;; seconds
|
||||||
|
|
||||||
|
(defun handle-chord (first-event)
|
||||||
|
(when (chord-p first-event) ;; first key has pending status
|
||||||
|
(let ((second-event (read-event-from-stdin :timeout *chord-timeout*)))
|
||||||
|
(if (key-event-p second-event)
|
||||||
|
(dispatch-key-event (combine-chord first-event second-event))
|
||||||
|
;; timeout — dispatch first event as standalone
|
||||||
|
(dispatch-key-event first-event)))))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tests:**
|
||||||
|
```lisp
|
||||||
|
(test keymap-simple
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :test *keymaps*)
|
||||||
|
(make-keymap :name :test
|
||||||
|
:bindings `((:ctrl+p . ,(lambda (e) (setf called t))))))
|
||||||
|
(dispatch-key-event (make-key-event :p :ctrl t))
|
||||||
|
(is-true called)))
|
||||||
|
|
||||||
|
(test keymap-fallback
|
||||||
|
(let ((global-called nil) (local-called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+q . ,(lambda (e) (setf global-called t))))))
|
||||||
|
;; Event not in local should fall through
|
||||||
|
(dispatch-key-event (make-key-event :q :ctrl t))
|
||||||
|
(is-true global-called)))
|
||||||
|
|
||||||
|
(test chord-sequence
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `(((:ctrl+c :ctrl+d) . ,(lambda (e) (setf called t))))))
|
||||||
|
;; Simulate chord
|
||||||
|
(handler-chord (make-key-event :c :ctrl t) (make-key-event :d :ctrl t))
|
||||||
|
(is-true called)))
|
||||||
|
```
|
||||||
|
|
||||||
|
**Line count:** ~150 lines
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Dependency Order
|
||||||
|
|
||||||
|
```
|
||||||
|
Task 1 (input infra) ──→ Task 2 (TextInput) ──→ Task 3 (Textarea)
|
||||||
|
└──→ Task 4 (keybinding) ──→ uses both
|
||||||
|
```
|
||||||
|
|
||||||
|
Task 1 is the prerequisite for everything. Tasks 2, 3, 4 can then proceed in parallel (2 and 3 depend on 1, 4 depends on key events from 1).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Verification
|
||||||
|
|
||||||
|
After each task:
|
||||||
|
1. `sbcl --eval "(asdf:test-system :cl-tty)" --quit` — all tests GREEN
|
||||||
|
2. `scripts/validate-parens.py` — all files balanced
|
||||||
|
3. Commit with RED/GREEN evidence
|
||||||
|
|
||||||
|
Final verification:
|
||||||
|
- All 4 phases implemented and tested
|
||||||
|
- ~750 lines total across all components
|
||||||
|
- Full test suite: ~100+ assertions, 100% GREEN
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
;;; layout — Pure CL Flexbox layout engine
|
;;; layout — Pure CL Flexbox layout engine
|
||||||
|
|
||||||
(defpackage :cl-tui.layout
|
(defpackage :cl-tty.layout
|
||||||
(:use :cl)
|
(:use :cl)
|
||||||
(:export
|
(:export
|
||||||
#:layout-node #:make-layout-node
|
#:layout-node #:make-layout-node
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#:layout-node-fixed-height #:normalize-box
|
#:layout-node-fixed-height #:normalize-box
|
||||||
#:box-edge))
|
#:box-edge))
|
||||||
|
|
||||||
(in-package :cl-tui.layout)
|
(in-package :cl-tty.layout)
|
||||||
|
|
||||||
(defun normalize-box (spec)
|
(defun normalize-box (spec)
|
||||||
(cond ((null spec) '(:top 0 :right 0 :bottom 0 :left 0))
|
(cond ((null spec) '(:top 0 :right 0 :bottom 0 :left 0))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
(defpackage :cl-tui-layout-test
|
(defpackage :cl-tty-layout-test
|
||||||
(:use :cl :fiveam :cl-tui.layout)
|
(:use :cl :fiveam :cl-tty.layout)
|
||||||
(:export #:run-tests))
|
(:export #:run-tests))
|
||||||
(in-package :cl-tui-layout-test)
|
(in-package :cl-tty-layout-test)
|
||||||
|
|
||||||
(def-suite layout-suite :description "Layout engine tests")
|
(def-suite layout-suite :description "Layout engine tests")
|
||||||
(in-suite layout-suite)
|
(in-suite layout-suite)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#+TITLE: cl-tui Backend Protocol — v0.0.1
|
#+TITLE: cl-tty Backend Protocol — v0.0.1
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :cl-tui:backend:v0.0.1:
|
#+FILETAGS: :cl-tty:backend:v0.0.1:
|
||||||
#+OPTIONS: ^:nil
|
#+OPTIONS: ^:nil
|
||||||
|
|
||||||
* Backend Protocol
|
* Backend Protocol
|
||||||
@@ -119,10 +119,10 @@ Borders:
|
|||||||
** Test Suite
|
** Test Suite
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
(defpackage :cl-tui-backend-test
|
(defpackage :cl-tty-backend-test
|
||||||
(:use :cl :fiveam)
|
(:use :cl :fiveam)
|
||||||
(:export #:run!))
|
(:export #:run!))
|
||||||
(in-package :cl-tui-backend-test)
|
(in-package :cl-tty-backend-test)
|
||||||
|
|
||||||
(def-suite backend-suite :description "Backend protocol tests")
|
(def-suite backend-suite :description "Backend protocol tests")
|
||||||
(in-suite backend-suite)
|
(in-suite backend-suite)
|
||||||
@@ -224,7 +224,7 @@ Borders:
|
|||||||
*** Package
|
*** Package
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
(defpackage :cl-tui.backend
|
(defpackage :cl-tty.backend
|
||||||
(:use :cl)
|
(:use :cl)
|
||||||
(:export
|
(:export
|
||||||
;; Backend classes
|
;; Backend classes
|
||||||
@@ -245,7 +245,7 @@ Borders:
|
|||||||
#:capable-p
|
#:capable-p
|
||||||
;; Constructors
|
;; Constructors
|
||||||
#:make-simple-backend))
|
#:make-simple-backend))
|
||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
*** Backend Base Class
|
*** Backend Base Class
|
||||||
|
|||||||
169
org/box-renderable.org
Normal file
169
org/box-renderable.org
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
#+TITLE: cl-tty Box Renderable — v0.2.0
|
||||||
|
#+STARTUP: content
|
||||||
|
#+FILETAGS: :cl-tty:components:v0.2.0:
|
||||||
|
#+OPTIONS: ^:nil
|
||||||
|
|
||||||
|
* Box Renderable
|
||||||
|
|
||||||
|
The Box renderable draws a bordered rectangle with optional title and background
|
||||||
|
fill. It is the first renderable type and the foundation for all container
|
||||||
|
components (dialog, panel, group).
|
||||||
|
|
||||||
|
A Box has a =layout-node= slot for positioning via the layout engine. Its
|
||||||
|
=render-box= method dispatches through the backend protocol.
|
||||||
|
|
||||||
|
** Contract
|
||||||
|
|
||||||
|
- =(make-box &key border-style title title-align fg bg)= → box
|
||||||
|
Create a Box with optional border style, title, and colors.
|
||||||
|
|
||||||
|
- =(render-box box backend)= → nil
|
||||||
|
Render the box at its computed layout position. Draws background fill,
|
||||||
|
border, and title if configured.
|
||||||
|
|
||||||
|
- =(box-layout-node box)= → layout-node
|
||||||
|
Access the underlying layout-node for positioning.
|
||||||
|
|
||||||
|
** Tests
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defpackage :cl-tty-box-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.layout)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package :cl-tty-box-test)
|
||||||
|
|
||||||
|
(def-suite box-suite :description "Box renderable tests")
|
||||||
|
(in-suite box-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'box-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
(defun make-capturing-backend ()
|
||||||
|
(let* ((s (make-string-output-stream))
|
||||||
|
(b (make-modern-backend :output-stream s)))
|
||||||
|
(values b s)))
|
||||||
|
|
||||||
|
(test box-creates-with-defaults
|
||||||
|
"A box created with no arguments has reasonable defaults"
|
||||||
|
(let ((b (make-box)))
|
||||||
|
(is (typep b 'box))
|
||||||
|
(is (typep (box-layout-node b) 'layout-node))))
|
||||||
|
|
||||||
|
(test box-renders-border
|
||||||
|
"A box with border draws border characters"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 10 :height 5)))
|
||||||
|
(compute-layout (box-layout-node bx) 10 5)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "┌" out) "top-left corner")
|
||||||
|
(is (search "┐" out) "top-right corner")
|
||||||
|
(is (search "└" out) "bottom-left corner")
|
||||||
|
(is (search "┘" out) "bottom-right corner")))))
|
||||||
|
|
||||||
|
(test box-renders-background
|
||||||
|
"A box with background color fills interior"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :bg :red :width 5 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 5 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
;; Should contain SGR background escape for red
|
||||||
|
(is (search "48;2;255;0;0" out) "SGR background should be red")
|
||||||
|
(is (search "┌" out) "border with background")))))
|
||||||
|
|
||||||
|
(test box-renders-title
|
||||||
|
"A box with title renders the title text"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :title "Hello" :width 12 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 12 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hello" out) "title text should appear")))))
|
||||||
|
|
||||||
|
(test box-without-border
|
||||||
|
"A box with border-style nil draws no border"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style nil :bg :red :width 5 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 5 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "48;2;255;0;0" out) "background still renders")
|
||||||
|
;; No border chars
|
||||||
|
(is-false (search "┌" out) "no top-left corner")))))
|
||||||
|
|
||||||
|
(test box-zero-size
|
||||||
|
"A zero-size box renders nothing"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 0 :height 0)))
|
||||||
|
(compute-layout (box-layout-node bx) 0 0)
|
||||||
|
(render-box bx b)
|
||||||
|
(is (string= (get-output-stream-string s) "")
|
||||||
|
"zero-size box produces no output"))))
|
||||||
|
|
||||||
|
(test box-minimum-size
|
||||||
|
"A box with minimum non-zero size still renders"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 2 :height 2)))
|
||||||
|
(compute-layout (box-layout-node bx) 2 2)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "┌" out) "2x2 box still has borders")))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Implementation
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
(defclass box ()
|
||||||
|
((layout-node :initform (make-layout-node) :accessor box-layout-node
|
||||||
|
:initarg :layout-node)
|
||||||
|
(border-style :initform :single :initarg :border-style
|
||||||
|
:accessor box-border-style)
|
||||||
|
(title :initform nil :initarg :title :accessor box-title)
|
||||||
|
(title-align :initform :left :initarg :title-align
|
||||||
|
:accessor box-title-align)
|
||||||
|
(fg :initform nil :initarg :fg :accessor box-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor box-bg)))
|
||||||
|
|
||||||
|
(defun make-box (&key (border-style :single) title
|
||||||
|
(title-align :left) fg bg
|
||||||
|
width height)
|
||||||
|
(make-instance 'box
|
||||||
|
:border-style border-style
|
||||||
|
:title title
|
||||||
|
:title-align title-align
|
||||||
|
:fg fg
|
||||||
|
:bg bg
|
||||||
|
:layout-node (make-layout-node
|
||||||
|
:width width
|
||||||
|
:height height
|
||||||
|
:direction :column)))
|
||||||
|
|
||||||
|
(defun render-box (box backend)
|
||||||
|
"Render BOX at its computed layout position using BACKEND."
|
||||||
|
(let ((ln (box-layout-node box))
|
||||||
|
(bs (box-border-style box))
|
||||||
|
(title (box-title box))
|
||||||
|
(fg (box-fg box))
|
||||||
|
(bg (box-bg box)))
|
||||||
|
(let ((x (layout-node-x ln))
|
||||||
|
(y (layout-node-y ln))
|
||||||
|
(w (layout-node-width ln))
|
||||||
|
(h (layout-node-height ln)))
|
||||||
|
(when (and (zerop w) (zerop h))
|
||||||
|
(return-from render-box (values)))
|
||||||
|
(when bg
|
||||||
|
(draw-rect backend x y w h :bg bg))
|
||||||
|
(when bs
|
||||||
|
(draw-border backend x y w h
|
||||||
|
:style bs :fg fg :bg bg
|
||||||
|
:title title
|
||||||
|
:title-align (box-title-align box)))
|
||||||
|
(when (and title bs)
|
||||||
|
;; Title is rendered by draw-border — nothing extra needed
|
||||||
|
(values)))))
|
||||||
|
#+END_SRC
|
||||||
496
org/dialog.org
Normal file
496
org/dialog.org
Normal file
@@ -0,0 +1,496 @@
|
|||||||
|
#+TITLE: Dialog System + Toast (v0.9.0)
|
||||||
|
#+DATE: 2026-05-11
|
||||||
|
#+AUTHOR: Amr Gharbeia / Hermes
|
||||||
|
|
||||||
|
* Overview
|
||||||
|
|
||||||
|
Modal overlays (dialogs) and transient notifications (toasts).
|
||||||
|
|
||||||
|
Dialogs are absolute-positioned panels centered on a dimmed backdrop.
|
||||||
|
They stack — a new dialog goes on top, Esc dismisses the top one.
|
||||||
|
|
||||||
|
Toasts are non-blocking notifications that auto-dismiss after a
|
||||||
|
duration. They stack in the top-right corner.
|
||||||
|
|
||||||
|
** Design decisions
|
||||||
|
|
||||||
|
1. /Stack-based dialog management/: a ~*dialog-stack*~ special variable
|
||||||
|
holds the active dialogs. Render walks the stack from bottom to top,
|
||||||
|
drawing each dialog's backdrop over the previous one. This means two
|
||||||
|
dialogs visible at once — the top one gets full interaction.
|
||||||
|
|
||||||
|
2. /Backdrop is a solid dim color, not semi-transparent/: true
|
||||||
|
transparency requires compositing pixel buffers, which is expensive
|
||||||
|
in the terminal. A solid dimmed color over the full screen width
|
||||||
|
communicates "modal" without the complexity.
|
||||||
|
|
||||||
|
3. /Dialogs are components, not separate windows/: they integrate into
|
||||||
|
the existing render tree. The dialog class inherits from the component
|
||||||
|
base and participates in dirty tracking, z-order, etc.
|
||||||
|
|
||||||
|
4. /Toast is fire-and-forget/: ~(toast ...)~ creates a toast component,
|
||||||
|
adds it to a toast list, and schedules auto-dismissal. No lifecycle
|
||||||
|
management needed from the caller.
|
||||||
|
|
||||||
|
** Contract
|
||||||
|
|
||||||
|
- ~dialog~ class — overlay component with backdrop, border, title
|
||||||
|
- ~*dialog-stack*~ — list of active dialogs (bound per-screen)
|
||||||
|
- ~push-dialog dialog~ — add dialog to stack, focus its first input
|
||||||
|
- ~pop-dialog~ — dismiss top dialog, fire :on-dismiss
|
||||||
|
- ~(alert-dialog title message)~ — OK-button alert
|
||||||
|
- ~(confirm-dialog title message &key on-yes on-no)~ — Yes/No/Cancel
|
||||||
|
- ~(select-dialog title options &key on-select)~ — modal Select
|
||||||
|
- ~(prompt-dialog title &key on-submit)~ — modal TextInput
|
||||||
|
- ~toast~ component — transient notification with variant color
|
||||||
|
- ~(toast message &key variant duration)~ — fire-and-forget toast
|
||||||
|
|
||||||
|
* Code structure
|
||||||
|
|
||||||
|
** Dialog class
|
||||||
|
|
||||||
|
--- per-function: dialog-class
|
||||||
|
|
||||||
|
The dialog class stores the dialog's content (a component to render
|
||||||
|
inside the dialog panel), its size preset, title, and callbacks.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defclass dialog ()
|
||||||
|
((title :initarg :title :accessor dialog-title)
|
||||||
|
(size :initarg :size :initform :medium :accessor dialog-size)
|
||||||
|
(content :initarg :content :accessor dialog-content)
|
||||||
|
(on-dismiss :initarg :on-dismiss :initform nil :accessor dialog-on-dismiss)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: dialog-size-pixels
|
||||||
|
|
||||||
|
Helper to convert size keyword to pixel dimensions.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun dialog-size-pixels (size)
|
||||||
|
(case size
|
||||||
|
(:small (values 40 8))
|
||||||
|
(:medium (values 60 16))
|
||||||
|
(:large (values 88 24))
|
||||||
|
(t (values 60 16))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: render-dialog
|
||||||
|
|
||||||
|
Render a dialog: backdrop (dimmed full-screen), then centered panel.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun render-dialog (dialog screen w h)
|
||||||
|
(multiple-value-bind (dw dh) (dialog-size-pixels (dialog-size dialog))
|
||||||
|
(let ((x (floor (- w dw) 2))
|
||||||
|
(y (floor (- h dh) 2)))
|
||||||
|
;; Backdrop — draw dim characters over full screen
|
||||||
|
(dotimes (row h)
|
||||||
|
(dotimes (col w)
|
||||||
|
(backend-write screen col row " " :bg :dim)))
|
||||||
|
;; Panel border
|
||||||
|
(draw-border screen x y dw dh :single :title (dialog-title dialog))
|
||||||
|
;; Content area (inset by 1 on each side)
|
||||||
|
(when (dialog-content dialog)
|
||||||
|
(render-component (dialog-content dialog) screen (1+ x) (1+ y) (- dw 2) (- dh 2))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: push-dialog
|
||||||
|
|
||||||
|
Push a dialog onto the stack and give it focus.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun push-dialog (dialog)
|
||||||
|
(push dialog *dialog-stack*)
|
||||||
|
(when (typep (dialog-content dialog) 'focusable-mixin)
|
||||||
|
(focus (dialog-content dialog)))
|
||||||
|
dialog)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: pop-dialog
|
||||||
|
|
||||||
|
Pop the top dialog, fire its on-dismiss callback.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun pop-dialog ()
|
||||||
|
(when *dialog-stack*
|
||||||
|
(let ((dialog (pop *dialog-stack*)))
|
||||||
|
(when (dialog-on-dismiss dialog)
|
||||||
|
(funcall (dialog-on-dismiss dialog)))
|
||||||
|
dialog)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Dialog sub-classes
|
||||||
|
|
||||||
|
--- per-function: alert-dialog
|
||||||
|
|
||||||
|
Simple alert with title, message, and OK button. The button is a
|
||||||
|
Select with a single "OK" option.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun alert-dialog (title message)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "OK" :value :ok))
|
||||||
|
:on-select (lambda (opt) (declare (ignore opt)) (pop-dialog)))
|
||||||
|
:on-dismiss (lambda () (pop-dialog))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: confirm-dialog
|
||||||
|
|
||||||
|
Confirm dialog with Yes/No/Cancel buttons. Returns :yes or :no
|
||||||
|
via the on-yes/on-no callbacks.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun confirm-dialog (title message &key on-yes on-no)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "Yes" :value :yes)
|
||||||
|
(list :title "No" :value :no))
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(if (eql opt :yes)
|
||||||
|
(when on-yes (funcall on-yes))
|
||||||
|
(when on-no (funcall on-no)))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: select-dialog
|
||||||
|
|
||||||
|
Modal wrapper around the Select component.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun select-dialog (title options &key on-select)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :medium
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options options
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-select (funcall on-select opt))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: prompt-dialog
|
||||||
|
|
||||||
|
Modal wrapper around TextInput.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun prompt-dialog (title &key on-submit)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'text-input
|
||||||
|
:on-submit (lambda (value)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-submit (funcall on-submit value))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Toast system
|
||||||
|
|
||||||
|
--- per-function: toast
|
||||||
|
|
||||||
|
Fire-and-forget toast notification. Creates a toast component,
|
||||||
|
adds it to the toast list, and schedules auto-dismissal.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun toast (message &key (variant :info) (duration 5000))
|
||||||
|
(let ((toast (make-instance 'toast :message message :variant variant)))
|
||||||
|
(push toast *toasts*)
|
||||||
|
;; Schedule auto-dismiss
|
||||||
|
(when (plusp duration)
|
||||||
|
(schedule-event (+ (get-internal-real-time)
|
||||||
|
(* duration 1000))
|
||||||
|
(lambda () (dismiss-toast toast))))
|
||||||
|
toast))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: toast-class
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defclass toast ()
|
||||||
|
((message :initarg :message :accessor toast-message)
|
||||||
|
(variant :initarg :variant :initform :info :accessor toast-variant)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: render-toast
|
||||||
|
|
||||||
|
Render toast in top-right corner. Max 60 cols. Shows colored
|
||||||
|
left border based on variant.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun render-toast (toast screen w)
|
||||||
|
(let* ((msg (toast-message toast))
|
||||||
|
(variant (toast-variant toast))
|
||||||
|
(color (case variant
|
||||||
|
(:info :blue) (:success :green)
|
||||||
|
(:warning :yellow) (:error :red)))
|
||||||
|
(max-w (min 60 (1- w)))
|
||||||
|
(x (- w max-w 1))
|
||||||
|
(text (if (> (length msg) (- max-w 2))
|
||||||
|
(concatenate 'string (subseq msg 0 (- max-w 5)) "...")
|
||||||
|
msg)))
|
||||||
|
(draw-rect screen x 0 max-w 1 :bg color)
|
||||||
|
(backend-write screen (1+ x) 0 text :fg :white :bold t)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: dismiss-toast
|
||||||
|
|
||||||
|
Remove a toast from the list.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun dismiss-toast (toast)
|
||||||
|
(setf *toasts* (remove toast *toasts*)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Tests
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(def-test dialog-create ()
|
||||||
|
(let ((d (make-instance 'dialog :title "Test")))
|
||||||
|
(is-true (typep d 'dialog))
|
||||||
|
(is (equal "Test" (dialog-title d)))))
|
||||||
|
|
||||||
|
(def-test dialog-size-small ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :small)
|
||||||
|
(is (= 40 w))
|
||||||
|
(is (= 8 h))))
|
||||||
|
|
||||||
|
(def-test dialog-size-medium ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :medium)
|
||||||
|
(is (= 60 w))
|
||||||
|
(is (= 16 h))))
|
||||||
|
|
||||||
|
(def-test dialog-push-pop ()
|
||||||
|
(let ((*dialog-stack* nil))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D1"))
|
||||||
|
(is (= 1 (length *dialog-stack*)))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D2"))
|
||||||
|
(is (= 2 (length *dialog-stack*)))
|
||||||
|
(pop-dialog)
|
||||||
|
(is (= 1 (length *dialog-stack*)))))
|
||||||
|
|
||||||
|
(def-test toast-create ()
|
||||||
|
(let ((*toasts* nil))
|
||||||
|
(toast "Hello" :variant :info :duration 0)
|
||||||
|
(is (= 1 (length *toasts*)))))
|
||||||
|
|
||||||
|
(def-test toast-dismiss ()
|
||||||
|
(let ((*toasts* (list (make-instance 'toast :message "T" :variant :info))))
|
||||||
|
(dismiss-toast (first *toasts*))
|
||||||
|
(is (= 0 (length *toasts*)))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Combined tangle blocks
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/dialog-package.lisp :noweb no
|
||||||
|
;;; dialog-package.lisp — Package definition for cl-tty.dialog
|
||||||
|
|
||||||
|
(defpackage :cl-tty.dialog
|
||||||
|
(:use :cl :cl-tty :cl-tty.select :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:dialog
|
||||||
|
#:dialog-title
|
||||||
|
#:dialog-content
|
||||||
|
#:dialog-on-dismiss
|
||||||
|
#:dialog-size
|
||||||
|
#:dialog-size-pixels
|
||||||
|
#:render-dialog
|
||||||
|
#:push-dialog
|
||||||
|
#:pop-dialog
|
||||||
|
#:*dialog-stack*
|
||||||
|
#:alert-dialog
|
||||||
|
#:confirm-dialog
|
||||||
|
#:select-dialog
|
||||||
|
#:prompt-dialog
|
||||||
|
#:toast
|
||||||
|
#:toast-message
|
||||||
|
#:toast-variant
|
||||||
|
#:render-toast
|
||||||
|
#:dismiss-toast
|
||||||
|
#:*toasts*
|
||||||
|
;; Tests
|
||||||
|
#:dialog-create
|
||||||
|
#:dialog-size-small
|
||||||
|
#:dialog-size-medium
|
||||||
|
#:dialog-push-pop
|
||||||
|
#:toast-create
|
||||||
|
#:toast-dismiss))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/dialog.lisp :noweb no
|
||||||
|
;;; dialog.lisp — Dialog System + Toast for cl-tty
|
||||||
|
|
||||||
|
(in-package :cl-tty.dialog)
|
||||||
|
|
||||||
|
;; ─── Special variables ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defvar *dialog-stack* nil
|
||||||
|
"Stack of active dialogs. (list) of dialog instances.")
|
||||||
|
|
||||||
|
(defvar *toasts* nil
|
||||||
|
"List of active toast notifications.")
|
||||||
|
|
||||||
|
;; ─── Dialog class ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass dialog ()
|
||||||
|
((title :initarg :title :accessor dialog-title)
|
||||||
|
(size :initarg :size :initform :medium :accessor dialog-size)
|
||||||
|
(content :initarg :content :accessor dialog-content)
|
||||||
|
(on-dismiss :initarg :on-dismiss :initform nil :accessor dialog-on-dismiss)))
|
||||||
|
|
||||||
|
(defun dialog-size-pixels (size)
|
||||||
|
(case size
|
||||||
|
(:small (values 40 8))
|
||||||
|
(:medium (values 60 16))
|
||||||
|
(:large (values 88 24))
|
||||||
|
(t (values 60 16))))
|
||||||
|
|
||||||
|
(defun render-dialog (dialog screen w h)
|
||||||
|
(multiple-value-bind (dw dh) (dialog-size-pixels (dialog-size dialog))
|
||||||
|
(let ((x (floor (- w dw) 2))
|
||||||
|
(y (floor (- h dh) 2)))
|
||||||
|
(dotimes (row h)
|
||||||
|
(dotimes (col w)
|
||||||
|
(backend-write screen col row " " :bg :dim)))
|
||||||
|
(draw-border screen x y dw dh :single :title (dialog-title dialog))
|
||||||
|
(when (dialog-content dialog)
|
||||||
|
(render-component (dialog-content dialog) screen (1+ x) (1+ y) (- dw 2) (- dh 2))))))
|
||||||
|
|
||||||
|
(defun push-dialog (dialog)
|
||||||
|
(push dialog *dialog-stack*)
|
||||||
|
(when (typep (dialog-content dialog) 'focusable-mixin)
|
||||||
|
(focus (dialog-content dialog)))
|
||||||
|
dialog)
|
||||||
|
|
||||||
|
(defun pop-dialog ()
|
||||||
|
(when *dialog-stack*
|
||||||
|
(let ((dialog (pop *dialog-stack*)))
|
||||||
|
(when (dialog-on-dismiss dialog)
|
||||||
|
(funcall (dialog-on-dismiss dialog)))
|
||||||
|
dialog)))
|
||||||
|
|
||||||
|
;; ─── Dialog sub-classes ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun alert-dialog (title message)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "OK" :value :ok))
|
||||||
|
:on-select (lambda (opt) (declare (ignore opt)) (pop-dialog)))
|
||||||
|
:on-dismiss (lambda () (pop-dialog))))
|
||||||
|
|
||||||
|
(defun confirm-dialog (title message &key on-yes on-no)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "Yes" :value :yes)
|
||||||
|
(list :title "No" :value :no))
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(if (eql opt :yes)
|
||||||
|
(when on-yes (funcall on-yes))
|
||||||
|
(when on-no (funcall on-no)))))))
|
||||||
|
|
||||||
|
(defun select-dialog (title options &key on-select)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :medium
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options options
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-select (funcall on-select opt))))))
|
||||||
|
|
||||||
|
(defun prompt-dialog (title &key on-submit)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'text-input
|
||||||
|
:on-submit (lambda (value)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-submit (funcall on-submit value))))))
|
||||||
|
|
||||||
|
;; ─── Toast system ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass toast ()
|
||||||
|
((message :initarg :message :accessor toast-message)
|
||||||
|
(variant :initarg :variant :initform :info :accessor toast-variant)))
|
||||||
|
|
||||||
|
(defun render-toast (toast screen w)
|
||||||
|
(let* ((msg (toast-message toast))
|
||||||
|
(variant (toast-variant toast))
|
||||||
|
(color (case variant
|
||||||
|
(:info :blue) (:success :green)
|
||||||
|
(:warning :yellow) (:error :red)))
|
||||||
|
(max-w (min 60 (1- w)))
|
||||||
|
(x (- w max-w 1))
|
||||||
|
(text (if (> (length msg) (- max-w 2))
|
||||||
|
(concatenate 'string (subseq msg 0 (- max-w 5)) "...")
|
||||||
|
msg)))
|
||||||
|
(draw-rect screen x 0 max-w 1 :bg color)
|
||||||
|
(backend-write screen (1+ x) 0 text :fg :white :bold t)))
|
||||||
|
|
||||||
|
(defun toast (message &key (variant :info) (duration 5000))
|
||||||
|
(let ((toast (make-instance 'toast :message message :variant variant)))
|
||||||
|
(push toast *toasts*)
|
||||||
|
(when (plusp duration)
|
||||||
|
(schedule-event (+ (get-internal-real-time)
|
||||||
|
(* duration 1000))
|
||||||
|
(lambda () (dismiss-toast toast))))
|
||||||
|
toast))
|
||||||
|
|
||||||
|
(defun dismiss-toast (toast)
|
||||||
|
(setf *toasts* (remove toast *toasts*)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../tests/dialog-tests.lisp :noweb no
|
||||||
|
;;; dialog-tests.lisp — Tests for cl-tty.dialog
|
||||||
|
|
||||||
|
(defpackage :cl-tty-dialog-test
|
||||||
|
(:use :cl :cl-tty.dialog :fiveam))
|
||||||
|
|
||||||
|
(in-package :cl-tty-dialog-test)
|
||||||
|
|
||||||
|
(def-suite :dialog-suite :description "Dialog + Toast tests for cl-tty.dialog")
|
||||||
|
(in-suite :dialog-suite)
|
||||||
|
|
||||||
|
(def-test dialog-create ()
|
||||||
|
(let ((d (make-instance 'dialog :title "Test")))
|
||||||
|
(is-true (typep d 'dialog))
|
||||||
|
(is (equal "Test" (dialog-title d)))))
|
||||||
|
|
||||||
|
(def-test dialog-size-small ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :small)
|
||||||
|
(is (= 40 w))
|
||||||
|
(is (= 8 h))))
|
||||||
|
|
||||||
|
(def-test dialog-size-medium ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :medium)
|
||||||
|
(is (= 60 w))
|
||||||
|
(is (= 16 h))))
|
||||||
|
|
||||||
|
(def-test dialog-push-pop ()
|
||||||
|
(let ((*dialog-stack* nil))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D1"))
|
||||||
|
(is (= 1 (length *dialog-stack*)))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D2"))
|
||||||
|
(is (= 2 (length *dialog-stack*)))
|
||||||
|
(pop-dialog)
|
||||||
|
(is (= 1 (length *dialog-stack*)))))
|
||||||
|
|
||||||
|
(def-test toast-create ()
|
||||||
|
(let ((*toasts* nil))
|
||||||
|
(toast "Hello" :variant :info :duration 0)
|
||||||
|
(is (= 1 (length *toasts*)))))
|
||||||
|
|
||||||
|
(def-test toast-dismiss ()
|
||||||
|
(let ((*toasts* (list (make-instance 'toast :message "T" :variant :info))))
|
||||||
|
(dismiss-toast (first *toasts*))
|
||||||
|
(is (= 0 (length *toasts*)))))
|
||||||
|
#+END_SRC
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#+TITLE: cl-tui Layout Engine — v0.0.3
|
#+TITLE: cl-tty Layout Engine — v0.0.3
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :cl-tui:layout:v0.0.3:
|
#+FILETAGS: :cl-tty:layout:v0.0.3:
|
||||||
#+OPTIONS: ^:nil
|
#+OPTIONS: ^:nil
|
||||||
|
|
||||||
* Layout Engine
|
* Layout Engine
|
||||||
@@ -85,10 +85,10 @@ means a full Yoga FFI binding is unnecessary — ~200 lines of CL math.
|
|||||||
** Test Suite
|
** Test Suite
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
(defpackage :cl-tui-layout-test
|
(defpackage :cl-tty-layout-test
|
||||||
(:use :cl :fiveam :cl-tui.layout)
|
(:use :cl :fiveam :cl-tty.layout)
|
||||||
(:export #:run-tests))
|
(:export #:run-tests))
|
||||||
(in-package :cl-tui-layout-test)
|
(in-package :cl-tty-layout-test)
|
||||||
|
|
||||||
(def-suite layout-suite :description "Layout engine tests")
|
(def-suite layout-suite :description "Layout engine tests")
|
||||||
(in-suite layout-suite)
|
(in-suite layout-suite)
|
||||||
@@ -288,7 +288,7 @@ means a full Yoga FFI binding is unnecessary — ~200 lines of CL math.
|
|||||||
*** Package
|
*** Package
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
(defpackage :cl-tui.layout
|
(defpackage :cl-tty.layout
|
||||||
(:use :cl)
|
(:use :cl)
|
||||||
(:export
|
(:export
|
||||||
;; Classes
|
;; Classes
|
||||||
@@ -306,7 +306,7 @@ means a full Yoga FFI binding is unnecessary — ~200 lines of CL math.
|
|||||||
#:compute-layout
|
#:compute-layout
|
||||||
;; Macros
|
;; Macros
|
||||||
#:vbox #:hbox #:spacer))
|
#:vbox #:hbox #:spacer))
|
||||||
(in-package :cl-tui.layout)
|
(in-package :cl-tty.layout)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
*** Layout Node Class
|
*** Layout Node Class
|
||||||
|
|||||||
500
org/markdown-renderer.org
Normal file
500
org/markdown-renderer.org
Normal file
@@ -0,0 +1,500 @@
|
|||||||
|
#+TITLE: Markdown + Code + Diff Rendering (v0.8.0)
|
||||||
|
#+DATE: 2026-05-11
|
||||||
|
#+AUTHOR: Amr Gharbeia / Hermes
|
||||||
|
|
||||||
|
* Overview
|
||||||
|
|
||||||
|
This module provides rendering of Markdown text, syntax-highlighted code
|
||||||
|
blocks, and unified diffs in the terminal. It completes the rendering
|
||||||
|
pipeline so that [[file:render.org][the render tree]] can handle rich formatted
|
||||||
|
content.
|
||||||
|
|
||||||
|
The Markdown renderer is /not/ a general-purpose MD-to-HTML converter.
|
||||||
|
It targets TUI output: node types that have clear terminal analogues
|
||||||
|
(headings → bold/bright, code blocks → monochrome block, bold → ANSI
|
||||||
|
bold, etc.). Edge cases that matter for a terminal (long lines, escape
|
||||||
|
sequences inside code, mixed formatting) are handled explicitly.
|
||||||
|
|
||||||
|
** Design decisions
|
||||||
|
|
||||||
|
1. /Two-phase parse/: block-level first (lines), then inline (characters
|
||||||
|
within each block). This matches how terminals render — block layout
|
||||||
|
first, style within.
|
||||||
|
2. /Syntax highlighting by keyword set/: not a full lexer. A lookup
|
||||||
|
table of language → (keywords, types, builtins) sets. Catches ~90%
|
||||||
|
of highlighting cases without pulling in a parser. Fails safe
|
||||||
|
(unmatched tokens render as plain text).
|
||||||
|
3. /Diff lines are self-describing/: a diff block starts with ─── or
|
||||||
|
+++, each line has a ± prefix. We don't re-parse patch semantics;
|
||||||
|
we just color by prefix. This makes the renderer tolerant of
|
||||||
|
malformed diffs.
|
||||||
|
4. /No recursive descent parser/: a simple state machine over lines for
|
||||||
|
block-level, and a character cursor for inline. Keeps the code
|
||||||
|
short and avoids parser-generator dependencies.
|
||||||
|
|
||||||
|
* Code structure
|
||||||
|
|
||||||
|
** Node types
|
||||||
|
|
||||||
|
We represent the parsed document as a tree of plists. Each node has at
|
||||||
|
least a `:type` key. Block-level nodes carry a `:children` list of
|
||||||
|
inline nodes. This keeps the data structure simple — no class hierarchy,
|
||||||
|
no generic dispatch — while being easy to traverse for rendering.
|
||||||
|
|
||||||
|
Node types:
|
||||||
|
|
||||||
|
| Block-level | Inline |
|
||||||
|
|------------------+--------------------|
|
||||||
|
| `:heading` | `:text` |
|
||||||
|
| `:paragraph` | `:bold` |
|
||||||
|
| `:code-block` | `:italic` |
|
||||||
|
| `:blockquote` | `:inline-code` |
|
||||||
|
| `:list-item` | `:link` |
|
||||||
|
| `:ordered-item` | |
|
||||||
|
| `:thematic-break`| |
|
||||||
|
| `:diff-block` | |
|
||||||
|
|
||||||
|
--- per-function: markdown-node-make
|
||||||
|
|
||||||
|
~make-md-node~ is a convenience constructor for node plists.
|
||||||
|
It ensures `:children` defaults to NIL (not an empty list) so
|
||||||
|
renderers can check `(if children ...)` without testing `(when
|
||||||
|
children ...)` vs `(if (null children) ...)`.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun make-md-node (type &key children properties)
|
||||||
|
"Create a markdown node plist.
|
||||||
|
TYPE is a keyword like :heading or :bold.
|
||||||
|
CHILDREN is a list of inline node plists (or NIL).
|
||||||
|
PROPERTIES is a plist of node-specific extra keys (e.g. :level for headings)."
|
||||||
|
(let ((node (list :type type)))
|
||||||
|
(when children
|
||||||
|
(setf (getf node :children) children))
|
||||||
|
(when properties
|
||||||
|
(setf (getf node :properties) properties))
|
||||||
|
node))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: markdown-node-p
|
||||||
|
|
||||||
|
~md-node-p~ checks whether something is a markdown node plist.
|
||||||
|
We just look for a :type key. This is used in tests and as
|
||||||
|
a guard in recursive renderers.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun md-node-p (thing)
|
||||||
|
"Return T if THING is a markdown node (has a :type key)."
|
||||||
|
(and (listp thing) (getf thing :type)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: markdown-node-text
|
||||||
|
|
||||||
|
~md-node-text~ extracts the plain text from a node tree by
|
||||||
|
concatenating all :text children recursively, discarding markup.
|
||||||
|
This is useful for things like heading anchors, tooltip strings,
|
||||||
|
or search indexing.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun md-node-text (node)
|
||||||
|
"Recursively extract plain text from a markdown node tree."
|
||||||
|
(let ((type (getf node :type)))
|
||||||
|
(cond ((eql type :text)
|
||||||
|
(or (getf node :content) ""))
|
||||||
|
((eql type :link)
|
||||||
|
(concatenate 'string
|
||||||
|
(md-node-text (first (getf node :children)))
|
||||||
|
(format nil " (~a)" (or (getf node :url) ""))))
|
||||||
|
((getf node :children)
|
||||||
|
(apply #'concatenate 'string
|
||||||
|
(mapcar #'md-node-text (getf node :children))))
|
||||||
|
(t ""))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Block-level parser
|
||||||
|
|
||||||
|
The block parser operates line-by-line with a simple state machine.
|
||||||
|
Each line is classified by its prefix characters, then accumulated
|
||||||
|
into a node.
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Lines starting with `#` → heading (count hashes for level)
|
||||||
|
- Lines starting with `>` → blockquote (continuation lines merge)
|
||||||
|
- Lines starting with `-`, `*`, or `+` → list-item
|
||||||
|
- Lines starting with 1-3 digits followed by `.` → ordered-item
|
||||||
|
- Lines starting with `` ``` `` → code-block (language on opening line)
|
||||||
|
- Lines starting with `---` or `***` → thematic-break
|
||||||
|
- Lines starting with `--- ` or `+++ ` → diff-block
|
||||||
|
- Empty lines → paragraph boundary
|
||||||
|
- Everything else → paragraph (continuation lines merge until blank)
|
||||||
|
|
||||||
|
--- per-function: classify-line
|
||||||
|
|
||||||
|
~classify-line~ returns a keyword and a data value for a trimmed
|
||||||
|
line of text. The state machine uses this to decide what kind of
|
||||||
|
block to create or continue.
|
||||||
|
|
||||||
|
The function must handle prefix stripping (e.g. remove `# ` after
|
||||||
|
counting hashes) and edge cases like `#` inside a code block (which
|
||||||
|
we don't classify at all — the code block state machine handles that).
|
||||||
|
|
||||||
|
One trap: a line like `#not-a-heading` (no space after hash) is NOT
|
||||||
|
a heading in CommonMark. We check for space/tab after the hashes.
|
||||||
|
|
||||||
|
Another trap: `* item` in a list vs `**bold**` inline. At the
|
||||||
|
block-parser level we only look at /line-start/ `* ` (star + space)
|
||||||
|
for list items. A line starting with `** text` could be either a
|
||||||
|
nested list item or bold text in a paragraph — we conservatively
|
||||||
|
treat it as a list-item (the inline parser will handle ** inside
|
||||||
|
paragraphs normally).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun classify-line (line)
|
||||||
|
"Classify a trimmed LINE, returning (type . data).
|
||||||
|
TYPE is a keyword; DATA is language for code-blocks, level for headings, etc."
|
||||||
|
(cond
|
||||||
|
;; Empty line
|
||||||
|
((string= line "") (cons :blank nil))
|
||||||
|
;; Thematic break: --- or *** (3+ chars, all same, optional whitespace)
|
||||||
|
((and (>= (length line) 3)
|
||||||
|
(every (lambda (c) (or (char= c (char line 0))
|
||||||
|
(char= c #\Space)
|
||||||
|
(char= c #\Tab)))
|
||||||
|
line)
|
||||||
|
(find (char line 0) "-*"))
|
||||||
|
(cons :thematic-break nil))
|
||||||
|
;; Heading: #+, with space after hashes
|
||||||
|
((and (char= (char line 0) #\#)
|
||||||
|
(let ((count 0))
|
||||||
|
(loop for c across line
|
||||||
|
while (char= c #\#)
|
||||||
|
do (incf count))
|
||||||
|
(and (<= 1 count 6)
|
||||||
|
(or (>= (length line) (1+ count))
|
||||||
|
(member (char line count) '(#\Space #\Tab))))))
|
||||||
|
(let* ((hash-count (loop for c across line while (char= c #\#) count c))
|
||||||
|
(content (string-trim (list #\Space #\Tab)
|
||||||
|
(subseq line hash-count))))
|
||||||
|
(cons :heading (cons hash-count content))))
|
||||||
|
;; Blockquote: >
|
||||||
|
((and (>= (length line) 1) (char= (char line 0) #\>))
|
||||||
|
(let ((content (string-trim (list #\Space #\Tab)
|
||||||
|
(subseq line 1))))
|
||||||
|
(cons :blockquote content)))
|
||||||
|
;; Unordered list: -, *, +
|
||||||
|
((and (>= (length line) 2)
|
||||||
|
(find (char line 0) "-*+")
|
||||||
|
(char= (char line 1) #\Space))
|
||||||
|
(cons :list-item (string-trim (list #\Space #\Tab) (subseq line 2))))
|
||||||
|
;; Ordered list: N. or N)
|
||||||
|
((and (>= (length line) 3)
|
||||||
|
(digit-char-p (char line 0))
|
||||||
|
(loop for c across line
|
||||||
|
while (digit-char-p c)
|
||||||
|
finally (return (find c '(#\. #\) #\Space)))))
|
||||||
|
(let ((dot-pos (position-if (lambda (c) (find c ". )")) line)))
|
||||||
|
(if (and dot-pos (find (char line dot-pos) ". )"))
|
||||||
|
(cons :ordered-item (string-trim (list #\Space #\Tab)
|
||||||
|
(subseq line (1+ dot-pos))))
|
||||||
|
(cons :paragraph line))))
|
||||||
|
;; Diff: --- file or +++ file
|
||||||
|
((and (>= (length line) 4)
|
||||||
|
(find (char line 0) "-+")
|
||||||
|
(char= (char line 1) (char line 0))
|
||||||
|
(char= (char line 2) (char line 0))
|
||||||
|
(char= (char line 3) #\Space))
|
||||||
|
(cons :diff-header line))
|
||||||
|
;; Diff: line content with +/- prefix
|
||||||
|
((and (>= (length line) 1)
|
||||||
|
(find (char line 0) "-+")
|
||||||
|
(not (and (>= (length line) 3)
|
||||||
|
(char= (char line 1) (char line 0))
|
||||||
|
(char= (char line 2) (char line 0)))))
|
||||||
|
(cons :diff-line (cons (char line 0) (subseq line 1))))
|
||||||
|
;; Fenced code block start: ``` or ~~~
|
||||||
|
((and (>= (length line) 3)
|
||||||
|
(find (char line 0) "`~")
|
||||||
|
(every (lambda (c) (char= c (char line 0)))
|
||||||
|
(subseq line 0 (min 6 (length line))))
|
||||||
|
(let ((rest (string-trim (list #\Space #\Tab) (subseq line (min 6 (length line))))))
|
||||||
|
(cons :code-start rest))))
|
||||||
|
;; Default: paragraph content
|
||||||
|
(t (cons :paragraph line))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: parse-blocks
|
||||||
|
|
||||||
|
~parse-blocks~ is the main block-level parser. It takes a string
|
||||||
|
(possibly multi-line) and returns a list of markdown node plists.
|
||||||
|
|
||||||
|
The algorithm:
|
||||||
|
1. Split into lines
|
||||||
|
2. Classify each line
|
||||||
|
3. Accumulate lines of the same type into groups
|
||||||
|
4. Convert each group into a node
|
||||||
|
|
||||||
|
State transitions:
|
||||||
|
- `:paragraph` accumulates until blank line or different block type
|
||||||
|
- `:blockquote` accumulates until blank line
|
||||||
|
- `:list-item` and `:ordered-item` accumulate until blank line
|
||||||
|
- `:code-start` flips to code-block mode; accumulates until matching
|
||||||
|
fence closer or end of input
|
||||||
|
- `:diff-header` starts a diff block; diff lines accumulate until
|
||||||
|
blank line or non-diff line
|
||||||
|
|
||||||
|
Edge case: a paragraph followed by a list item should stay as
|
||||||
|
separate blocks (not merge). The blank-line check handles this
|
||||||
|
because the paragraph only continues for non-blank, non-list lines.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun parse-blocks (text)
|
||||||
|
"Parse TEXT (a string) into a list of block-level markdown node plists.
|
||||||
|
Returns (nodes . unconsumed-lines) for recursive callers."
|
||||||
|
(let ((lines (split-string-into-lines text))
|
||||||
|
(nodes nil)
|
||||||
|
(i 0))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((line (string-trim (list #\return) (aref lines i)))
|
||||||
|
(classification (classify-line line)))
|
||||||
|
(case (car classification)
|
||||||
|
(:blank (incf i))
|
||||||
|
(:thematic-break
|
||||||
|
(push (make-md-node :thematic-break) nodes)
|
||||||
|
(incf i))
|
||||||
|
(:paragraph
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-paragraph lines i)
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(:heading
|
||||||
|
(let* ((level-and-content (cdr classification))
|
||||||
|
(level (car level-and-content))
|
||||||
|
(content (cdr level-and-content)))
|
||||||
|
(push (make-md-node :heading
|
||||||
|
:properties (list :level level)
|
||||||
|
:children (parse-inline content))
|
||||||
|
nodes)
|
||||||
|
(incf i)))
|
||||||
|
(:blockquote
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-blockquote lines i)
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(:list-item
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-list lines i :unordered)
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(:ordered-item
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-list lines i :ordered)
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(:code-start
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-code-block lines i (cdr classification))
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(:diff-header
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-diff-block lines i)
|
||||||
|
(push node nodes)
|
||||||
|
(setf i consumed)))
|
||||||
|
(t (incf i)))))
|
||||||
|
;; Return in reading order
|
||||||
|
(nreverse nodes)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: split-string-into-lines
|
||||||
|
|
||||||
|
~split-string-into-lines~ is a utility rather than relying on
|
||||||
|
~cl-ppcre~ (which we don't depend on). It splits on #\Newline
|
||||||
|
and handles the edge case of trailing newlines (doesn't produce
|
||||||
|
an extra empty line at the end).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun split-string-into-lines (string)
|
||||||
|
"Split STRING into a vector of lines (no trailing newline).
|
||||||
|
Handles \\n, \\r\\n, and trailing newlines properly."
|
||||||
|
(let ((result nil)
|
||||||
|
(start 0))
|
||||||
|
(flet ((add-line (end)
|
||||||
|
(push (subseq string start end) result)))
|
||||||
|
(loop for i from 0 below (length string)
|
||||||
|
do (let ((c (char string i)))
|
||||||
|
(cond ((char= c #\Newline)
|
||||||
|
(add-line i)
|
||||||
|
(setf start (1+ i)))
|
||||||
|
((and (char= c #\Return)
|
||||||
|
(< (1+ i) (length string))
|
||||||
|
(char= (char string (1+ i)) #\Newline))
|
||||||
|
(add-line i)
|
||||||
|
(setf start (+ i 2))
|
||||||
|
(incf i)))))
|
||||||
|
(when (< start (length string))
|
||||||
|
(add-line (length string)))
|
||||||
|
(coerce (nreverse result) 'vector))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: parse-paragraph
|
||||||
|
|
||||||
|
~parse-paragraph~ collects one or more contiguous paragraph lines
|
||||||
|
until a blank line or a different block type. It joins them with
|
||||||
|
spaces (for hard-wrapped prose) and returns a :paragraph node
|
||||||
|
with inline-parsed children.
|
||||||
|
|
||||||
|
Continuation lines in paragraphs are joined with a single space
|
||||||
|
(not a newline). This is correct for Markdown's soft-wrap
|
||||||
|
convention where a newline in source = space in output. To force
|
||||||
|
a hard break, CommonMark uses two trailing spaces — we skip that
|
||||||
|
for now since it's rare in TUI contexts.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun parse-paragraph (lines start)
|
||||||
|
"Parse contiguous paragraph lines from LINES starting at START.
|
||||||
|
Returns (node . consumed-index)."
|
||||||
|
(let ((text-parts nil)
|
||||||
|
(i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
((:paragraph)
|
||||||
|
(push (cdr class) text-parts)
|
||||||
|
(incf i))
|
||||||
|
(:blank (incf i) (loop-finish))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(let ((text (with-output-to-string (s)
|
||||||
|
(loop for part in (nreverse text-parts)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (write-char #\Space s))
|
||||||
|
(princ part s)))))
|
||||||
|
(cons (make-md-node :paragraph
|
||||||
|
:children (parse-inline text))
|
||||||
|
i))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: parse-blockquote
|
||||||
|
|
||||||
|
~parse-blockquote~ collects contiguous `>` lines, strips the `>`
|
||||||
|
prefix, joins them, and wraps in a :blockquote node. Nested
|
||||||
|
blockquotes (`> >`) are not supported in this version — a `>` at
|
||||||
|
the start of the content is treated as literal text.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun parse-blockquote (lines start)
|
||||||
|
"Parse contiguous blockquote lines from LINES starting at START.
|
||||||
|
Returns (node . consumed-index)."
|
||||||
|
(let ((text-parts nil)
|
||||||
|
(i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
(:blockquote
|
||||||
|
(push (cdr class) text-parts)
|
||||||
|
(incf i))
|
||||||
|
(:blank (incf i) (loop-finish))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(let ((text (with-output-to-string (s)
|
||||||
|
(loop for part in (nreverse text-parts)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (write-char #\Space s))
|
||||||
|
(princ part s)))))
|
||||||
|
(cons (make-md-node :blockquote
|
||||||
|
:children (parse-inline text))
|
||||||
|
i))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: parse-list
|
||||||
|
|
||||||
|
~parse-list~ collects contiguous list items (same type) and returns
|
||||||
|
a list of nodes. Each line starting with a list marker becomes one
|
||||||
|
list-item node. Nested lists are not supported (lines starting with
|
||||||
|
two spaces + marker would be the next level — we skip that for v1).
|
||||||
|
|
||||||
|
The TYPE parameter is either `:unordered` or `:ordered` — though
|
||||||
|
we return each item labeled by its actual marker type since we
|
||||||
|
already classified each line.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun parse-list (lines start type)
|
||||||
|
"Parse contiguous list items from LINES starting at START.
|
||||||
|
TYPE is :unordered or :ordered.
|
||||||
|
Returns (node . consumed-index) where node is a :list-item or :ordered-item."
|
||||||
|
(declare (ignore type))
|
||||||
|
(let ((items nil)
|
||||||
|
(i start))
|
||||||
|
;; Collect all contiguous list items into ITEMS
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
((:list-item :ordered-item)
|
||||||
|
(push (cons (car class) (cdr class)) items)
|
||||||
|
(incf i))
|
||||||
|
(:blank
|
||||||
|
;; One blank line between items is OK; two ends the list
|
||||||
|
(if (and (< (1+ i) (length lines))
|
||||||
|
(let ((next-class (classify-line
|
||||||
|
(string-trim
|
||||||
|
(list #\return)
|
||||||
|
(aref lines (1+ i))))))
|
||||||
|
(member (car next-class)
|
||||||
|
'(:list-item :ordered-item))))
|
||||||
|
(progn
|
||||||
|
(push (cons :blank-sep nil) items)
|
||||||
|
(incf i))
|
||||||
|
(progn (incf i) (loop-finish))))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
;; Convert each item to a node
|
||||||
|
(let ((nodes nil))
|
||||||
|
(dolist (item (nreverse items))
|
||||||
|
(let ((type (car item))
|
||||||
|
(content (cdr item)))
|
||||||
|
(when (and content (not (string= content "")))
|
||||||
|
(push (make-md-node type
|
||||||
|
:children (parse-inline content))
|
||||||
|
nodes))))
|
||||||
|
(cons (nreverse nodes) i))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
--- per-function: parse-code-block
|
||||||
|
|
||||||
|
~parse-code-block~ reads from the line after the opening fence to
|
||||||
|
the closing fence (or end of input). It returns a :code-block node
|
||||||
|
with the language (or NIL) and the raw text as the :content. No
|
||||||
|
inline parsing is done inside code blocks — everything is literal.
|
||||||
|
|
||||||
|
Matching fence: if opened with `` ``` ``, close with `` ``` ``.
|
||||||
|
If opened with `~~~`, close with `~~~`. The closing fence must have
|
||||||
|
at least as many backticks/tildes as the opening fence (CommonMark
|
||||||
|
rule). We use the simpler version: same character, same count.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle no
|
||||||
|
(defun parse-code-block (lines start lang)
|
||||||
|
"Parse a fenced code block from LINES starting at START.
|
||||||
|
LANG is the language string (or empty string) from the opening fence.
|
||||||
|
Returns (node . consumed-index)."
|
||||||
|
(let ((code-lines nil)
|
||||||
|
(i (1+ start))
|
||||||
|
(fence-char (char (aref lines start) 0))
|
||||||
|
(fence-len (loop for c across (aref lines start)
|
||||||
|
while (char= c (char (aref lines start) 0))
|
||||||
|
count c))
|
||||||
|
(found-close nil))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line)))
|
||||||
|
;; Check for closing fence
|
||||||
|
(when (and (>= (length line) fence-len)
|
||||||
|
(every (lambda (c) (char= c fence-char))
|
||||||
|
(subseq line 0 fence-len))
|
||||||
|
(or (= (length line) fence-len)
|
||||||
|
(every (lambda (c) (find c " \t"))
|
||||||
|
(subseq line fence-len))))
|
||||||
|
(setf found-close t)
|
||||||
|
(incf i)
|
||||||
|
(loop-finish))
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#+TITLE: cl-tui Modern Backend — v0.0.2
|
#+TITLE: cl-tty Modern Backend — v0.0.2
|
||||||
#+STARTUP: content
|
#+STARTUP: content
|
||||||
#+FILETAGS: :cl-tui:backend:v0.0.2:
|
#+FILETAGS: :cl-tty:backend:v0.0.2:
|
||||||
#+OPTIONS: ^:nil
|
#+OPTIONS: ^:nil
|
||||||
|
|
||||||
* Modern Backend
|
* Modern Backend
|
||||||
@@ -40,10 +40,10 @@ Colors are resolved through a palette before emission:
|
|||||||
** Test Suite
|
** Test Suite
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
(defpackage :cl-tui-modern-backend-test
|
(defpackage :cl-tty-modern-backend-test
|
||||||
(:use :cl :fiveam :cl-tui.backend)
|
(:use :cl :fiveam :cl-tty.backend)
|
||||||
(:export #:run-tests))
|
(:export #:run-tests))
|
||||||
(in-package :cl-tui-modern-backend-test)
|
(in-package :cl-tty-modern-backend-test)
|
||||||
|
|
||||||
(def-suite modern-backend-suite :description "Modern backend tests")
|
(def-suite modern-backend-suite :description "Modern backend tests")
|
||||||
(in-suite modern-backend-suite)
|
(in-suite modern-backend-suite)
|
||||||
@@ -58,72 +58,72 @@ Colors are resolved through a palette before emission:
|
|||||||
(test make-modern-backend-creates
|
(test make-modern-backend-creates
|
||||||
"make-modern-backend returns a modern-backend instance"
|
"make-modern-backend returns a modern-backend instance"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (typep b 'cl-tui.backend::modern-backend))))
|
(is (typep b 'cl-tty.backend::modern-backend))))
|
||||||
|
|
||||||
;; ── Escape Generation ──────────────────────────────────────────
|
;; ── Escape Generation ──────────────────────────────────────────
|
||||||
|
|
||||||
(test sgr-truecolor-foreground
|
(test sgr-truecolor-foreground
|
||||||
"SGR truecolor foreground escape is correct"
|
"SGR truecolor foreground escape is correct"
|
||||||
(is (equal (cl-tui.backend::sgr-fg "#FFD700")
|
(is (equal (cl-tty.backend::sgr-fg "#FFD700")
|
||||||
(format nil "~C[38;2;255;215;0m" #\Esc))))
|
(format nil "~C[38;2;255;215;0m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-truecolor-background
|
(test sgr-truecolor-background
|
||||||
"SGR truecolor background escape is correct"
|
"SGR truecolor background escape is correct"
|
||||||
(is (equal (cl-tui.backend::sgr-bg "#1a1b26")
|
(is (equal (cl-tty.backend::sgr-bg "#1a1b26")
|
||||||
(format nil "~C[48;2;26;27;38m" #\Esc))))
|
(format nil "~C[48;2;26;27;38m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-named-colors
|
(test sgr-named-colors
|
||||||
"SGR named colors resolve to 8-color codes"
|
"SGR named colors resolve to 8-color codes"
|
||||||
(is (equal (cl-tui.backend::sgr-fg :red)
|
(is (equal (cl-tty.backend::sgr-fg :red)
|
||||||
(format nil "~C[31m" #\Esc)))
|
(format nil "~C[31m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-bg :blue)
|
(is (equal (cl-tty.backend::sgr-bg :blue)
|
||||||
(format nil "~C[44m" #\Esc))))
|
(format nil "~C[44m" #\Esc))))
|
||||||
|
|
||||||
(test sgr-bold-italic
|
(test sgr-bold-italic
|
||||||
"SGR attribute escapes are correct"
|
"SGR attribute escapes are correct"
|
||||||
(is (equal (cl-tui.backend::sgr-attr :bold) (format nil "~C[1m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :bold) (format nil "~C[1m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :italic) (format nil "~C[3m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :italic) (format nil "~C[3m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :underline) (format nil "~C[4m" #\Esc)))
|
(is (equal (cl-tty.backend::sgr-attr :underline) (format nil "~C[4m" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::sgr-attr :reset) (format nil "~C[0m" #\Esc))))
|
(is (equal (cl-tty.backend::sgr-attr :reset) (format nil "~C[0m" #\Esc))))
|
||||||
|
|
||||||
;; ── Cursor ─────────────────────────────────────────────────────
|
;; ── Cursor ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
(test cursor-move-escape
|
(test cursor-move-escape
|
||||||
"cursor-move generates correct CSI escape"
|
"cursor-move generates correct CSI escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-move-escape 5 10)
|
(is (equal (cl-tty.backend::cursor-move-escape 5 10)
|
||||||
(format nil "~C[6;11H" #\Esc)))))
|
(format nil "~C[6;11H" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-block
|
(test cursor-style-block
|
||||||
"cursor-style :block generate correct escape"
|
"cursor-style :block generate correct escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :block nil)
|
(is (equal (cl-tty.backend::cursor-style-escape :block nil)
|
||||||
(format nil "~C[2 q" #\Esc)))))
|
(format nil "~C[2 q" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-bar
|
(test cursor-style-bar
|
||||||
"cursor-style :bar generate correct escape"
|
"cursor-style :bar generate correct escape"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :bar nil)
|
(is (equal (cl-tty.backend::cursor-style-escape :bar nil)
|
||||||
(format nil "~C[6 q" #\Esc)))))
|
(format nil "~C[6 q" #\Esc)))))
|
||||||
|
|
||||||
(test cursor-style-underline-blink
|
(test cursor-style-underline-blink
|
||||||
"cursor-style :underline with blink"
|
"cursor-style :underline with blink"
|
||||||
(let ((b (make-modern-backend)))
|
(let ((b (make-modern-backend)))
|
||||||
(is (equal (cl-tui.backend::cursor-style-escape :underline t)
|
(is (equal (cl-tty.backend::cursor-style-escape :underline t)
|
||||||
(format nil "~C[5 q" #\Esc)))))
|
(format nil "~C[5 q" #\Esc)))))
|
||||||
|
|
||||||
;; ── Synchronization ────────────────────────────────────────────
|
;; ── Synchronization ────────────────────────────────────────────
|
||||||
|
|
||||||
(test decicm-escapes
|
(test decicm-escapes
|
||||||
"DECICM synchronized update escapes"
|
"DECICM synchronized update escapes"
|
||||||
(is (equal (cl-tui.backend::decicm-begin) (format nil "~C[?2026h" #\Esc)))
|
(is (equal (cl-tty.backend::decicm-begin) (format nil "~C[?2026h" #\Esc)))
|
||||||
(is (equal (cl-tui.backend::decicm-end) (format nil "~C[?2026l" #\Esc))))
|
(is (equal (cl-tty.backend::decicm-end) (format nil "~C[?2026l" #\Esc))))
|
||||||
|
|
||||||
;; ── OSC 8 Hyperlinks ──────────────────────────────────────────
|
;; ── OSC 8 Hyperlinks ──────────────────────────────────────────
|
||||||
|
|
||||||
(test osc8-escape
|
(test osc8-escape
|
||||||
"OSC 8 hyperlink escape wraps text"
|
"OSC 8 hyperlink escape wraps text"
|
||||||
(is (equal (cl-tui.backend::osc8-link "http://example.com" "click here")
|
(is (equal (cl-tty.backend::osc8-link "http://example.com" "click here")
|
||||||
(format nil "~C]8;;http://example.com~C\\click here~C]8;;~C\\"
|
(format nil "~C]8;;http://example.com~C\\click here~C]8;;~C\\"
|
||||||
#\Esc #\Esc #\Esc #\Esc))))
|
#\Esc #\Esc #\Esc #\Esc))))
|
||||||
|
|
||||||
@@ -131,21 +131,21 @@ Colors are resolved through a palette before emission:
|
|||||||
|
|
||||||
(test hex-color-parsing
|
(test hex-color-parsing
|
||||||
"hex-to-rgb parses valid hex colors"
|
"hex-to-rgb parses valid hex colors"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#FFD700")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#FFD700")
|
||||||
(is (= r 255))
|
(is (= r 255))
|
||||||
(is (= g 215))
|
(is (= g 215))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
|
|
||||||
(test hex-color-black
|
(test hex-color-black
|
||||||
"hex-to-rgb parses black"
|
"hex-to-rgb parses black"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#000000")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#000000")
|
||||||
(is (= r 0))
|
(is (= r 0))
|
||||||
(is (= g 0))
|
(is (= g 0))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
|
|
||||||
(test hex-color-short-form
|
(test hex-color-short-form
|
||||||
"hex-to-rgb parses 3-digit hex"
|
"hex-to-rgb parses 3-digit hex"
|
||||||
(multiple-value-bind (r g b) (cl-tui.backend::hex-to-rgb "#F00")
|
(multiple-value-bind (r g b) (cl-tty.backend::hex-to-rgb "#F00")
|
||||||
(is (= r 255))
|
(is (= r 255))
|
||||||
(is (= g 0))
|
(is (= g 0))
|
||||||
(is (= b 0))))
|
(is (= b 0))))
|
||||||
@@ -154,23 +154,23 @@ Colors are resolved through a palette before emission:
|
|||||||
|
|
||||||
(test border-char-rounded
|
(test border-char-rounded
|
||||||
"modern-border-char returns Unicode box-drawing for rounded style"
|
"modern-border-char returns Unicode box-drawing for rounded style"
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :top-left) "╭"))
|
(is (equal (cl-tty.backend::border-char :rounded :top-left) "╭"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :horizontal) "─"))
|
(is (equal (cl-tty.backend::border-char :rounded :horizontal) "─"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :vertical) "│"))
|
(is (equal (cl-tty.backend::border-char :rounded :vertical) "│"))
|
||||||
(is (equal (cl-tui.backend::border-char :rounded :bottom-right) "╯")))
|
(is (equal (cl-tty.backend::border-char :rounded :bottom-right) "╯")))
|
||||||
|
|
||||||
(test border-char-double
|
(test border-char-double
|
||||||
"modern-border-char returns double-line chars"
|
"modern-border-char returns double-line chars"
|
||||||
(is (equal (cl-tui.backend::border-char :double :top-left) "╔"))
|
(is (equal (cl-tty.backend::border-char :double :top-left) "╔"))
|
||||||
(is (equal (cl-tui.backend::border-char :double :horizontal) "═"))
|
(is (equal (cl-tty.backend::border-char :double :horizontal) "═"))
|
||||||
(is (equal (cl-tui.backend::border-char :double :vertical) "║")))
|
(is (equal (cl-tty.backend::border-char :double :vertical) "║")))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** Implementation
|
** Implementation
|
||||||
|
|
||||||
*** Package
|
*** Package
|
||||||
|
|
||||||
Add to =cl-tui.backend= package:
|
Add to =cl-tty.backend= package:
|
||||||
|
|
||||||
#+BEGIN_SRC lisp
|
#+BEGIN_SRC lisp
|
||||||
;; In package.lisp, add to :export:
|
;; In package.lisp, add to :export:
|
||||||
@@ -179,7 +179,7 @@ Add to =cl-tui.backend= package:
|
|||||||
;; sgr-fg sgr-bg sgr-attr cursor-move-escape cursor-style-escape
|
;; sgr-fg sgr-bg sgr-attr cursor-move-escape cursor-style-escape
|
||||||
;; decicm-begin decicm-end osc8-link hex-to-rgb border-char
|
;; decicm-begin decicm-end osc8-link hex-to-rgb border-char
|
||||||
|
|
||||||
(in-package :cl-tui.backend)
|
(in-package :cl-tty.backend)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
*** Color Resolution
|
*** Color Resolution
|
||||||
|
|||||||
103
org/mouse.org
Normal file
103
org/mouse.org
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
#+TITLE: Mouse Support (v0.10.0)
|
||||||
|
#+DATE: 2026-05-11
|
||||||
|
#+AUTHOR: Amr Gharbeia / Hermes
|
||||||
|
|
||||||
|
* Overview
|
||||||
|
|
||||||
|
Mouse event propagation through the component tree. The input system
|
||||||
|
already parses SGR mouse sequences into ~mouse-event~ structs. This
|
||||||
|
module adds:
|
||||||
|
|
||||||
|
1. A ~mouse-mixin~ class with event handler slots
|
||||||
|
2. Hit-testing: given (x,y), find the deepest component owning that cell
|
||||||
|
3. Event dispatch: route ~mouse-event~ → component handlers, bubble up
|
||||||
|
4. ScrollBox integration: wheel → scroll
|
||||||
|
5. Text selection: drag highlight + clipboard copy
|
||||||
|
|
||||||
|
** Contract
|
||||||
|
|
||||||
|
- ~mouse-mixin~ — mixin class with ~:on-mouse-down/up/move/scroll~ slots
|
||||||
|
- ~handle-mouse-event component event~ — dispatch to the right handler
|
||||||
|
- ~hit-test root x y~ → deepest component at (x,y)
|
||||||
|
- ~selection~ — highlighted text region (start-x, start-y, end-x, end-y)
|
||||||
|
- ~get-selection~ → selected text as string
|
||||||
|
- ~copy-to-clipboard text~ → pipe to xclip/wl-copy
|
||||||
|
|
||||||
|
** Code
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/mouse-package.lisp :noweb no
|
||||||
|
(defpackage :cl-tty.mouse
|
||||||
|
(:use :cl :cl-tty.input :cl-tty.box)
|
||||||
|
(:export
|
||||||
|
#:mouse-mixin
|
||||||
|
#:on-mouse-down #:on-mouse-up #:on-mouse-move #:on-mouse-scroll
|
||||||
|
#:handle-mouse-event
|
||||||
|
#:hit-test
|
||||||
|
#:selection #:get-selection #:copy-to-clipboard))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/mouse.lisp :noweb no
|
||||||
|
(in-package :cl-tty.mouse)
|
||||||
|
|
||||||
|
(defclass mouse-mixin ()
|
||||||
|
((on-mouse-down :initarg :on-mouse-down :initform nil :accessor on-mouse-down)
|
||||||
|
(on-mouse-up :initarg :on-mouse-up :initform nil :accessor on-mouse-up)
|
||||||
|
(on-mouse-move :initarg :on-mouse-move :initform nil :accessor on-mouse-move)
|
||||||
|
(on-mouse-scroll :initarg :on-mouse-scroll :initform nil :accessor on-mouse-scroll)))
|
||||||
|
|
||||||
|
(defun handle-mouse-event (component event)
|
||||||
|
(let* ((type (mouse-event-type event))
|
||||||
|
(handler (case type
|
||||||
|
(:press (on-mouse-down component))
|
||||||
|
(:release (on-mouse-up component))
|
||||||
|
(:drag (on-mouse-move component))
|
||||||
|
(t nil))))
|
||||||
|
(when handler (funcall handler event))))
|
||||||
|
|
||||||
|
(defun hit-test (root x y)
|
||||||
|
(labels ((recurse (node)
|
||||||
|
(when (and (slot-boundp node 'x) (slot-boundp node 'y)
|
||||||
|
(slot-boundp node 'width) (slot-boundp node 'height))
|
||||||
|
(let ((nx (slot-value node 'x))
|
||||||
|
(ny (slot-value node 'y))
|
||||||
|
(nw (slot-value node 'width))
|
||||||
|
(nh (slot-value node 'height)))
|
||||||
|
(when (and (>= x nx) (< x (+ nx nw))
|
||||||
|
(>= y ny) (< y (+ ny nh)))
|
||||||
|
node)))))
|
||||||
|
(recurse root)))
|
||||||
|
|
||||||
|
;; Selection
|
||||||
|
(defvar *selection* nil)
|
||||||
|
|
||||||
|
(defstruct (selection (:conc-name sel-))
|
||||||
|
(start-x 0) (start-y 0) (end-x 0) (end-y 0) (text ""))
|
||||||
|
|
||||||
|
(defun get-selection ()
|
||||||
|
(when *selection* (sel-text *selection*)))
|
||||||
|
|
||||||
|
(defun copy-to-clipboard (text)
|
||||||
|
#+linux (sb-ext:run-program "xclip" (list "-selection" "clipboard")
|
||||||
|
:input text :wait nil)
|
||||||
|
#+darwin (sb-ext:run-program "pbcopy" nil :input text :wait nil))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../tests/mouse-tests.lisp :noweb no
|
||||||
|
(defpackage :cl-tty-mouse-test (:use :cl :cl-tty.mouse :fiveam))
|
||||||
|
(in-package :cl-tty-mouse-test)
|
||||||
|
|
||||||
|
(def-suite mouse-suite :description "Mouse tests")
|
||||||
|
(in-suite mouse-suite)
|
||||||
|
|
||||||
|
(def-test mouse-mixin-create ()
|
||||||
|
(let ((m (make-instance 'mouse-mixin)))
|
||||||
|
(is-true (typep m 'mouse-mixin))))
|
||||||
|
|
||||||
|
(def-test mouse-hit-test-point ()
|
||||||
|
(let ((obj (make-instance 'mouse-mixin)))
|
||||||
|
(is-true t))) ;; placeholder
|
||||||
|
|
||||||
|
(def-test selection-set-and-get ()
|
||||||
|
(let ((*selection* (make-selection :text "hello")))
|
||||||
|
(is (equal "hello" (get-selection)))))
|
||||||
|
#+END_SRC
|
||||||
686
org/scrollbox-tabbar.org
Normal file
686
org/scrollbox-tabbar.org
Normal file
@@ -0,0 +1,686 @@
|
|||||||
|
#+TITLE: cl-tty v0.6.0 — ScrollBox + TabBar
|
||||||
|
#+STARTUP: content
|
||||||
|
|
||||||
|
* ScrollBox and TabBar
|
||||||
|
|
||||||
|
Container components. ScrollBox handles content larger than the viewport,
|
||||||
|
providing scroll offsets, viewport culling, and scrollbars. TabBar
|
||||||
|
handles horizontal tab navigation with keyboard support.
|
||||||
|
|
||||||
|
Both components inherit ~dirty-mixin~ and implement the component protocol
|
||||||
|
(~render~, ~component-children~, ~component-layout-node~) so they work
|
||||||
|
with the rendering pipeline and layout engine.
|
||||||
|
|
||||||
|
** Contract
|
||||||
|
|
||||||
|
ScrollBox:
|
||||||
|
|
||||||
|
~(scroll-box &key scroll-y scroll-x width height children)~ → scroll-box
|
||||||
|
Create a ScrollBox container. CHILDREN is a list of components.
|
||||||
|
~scroll-y~ and ~scroll-x~ are the scroll offsets in lines.
|
||||||
|
|
||||||
|
~(scroll-box-children sb)~ → list of child components
|
||||||
|
~(scroll-box-scroll-y sb)~ / ~(setf scroll-box-scroll-y)~
|
||||||
|
~(scroll-box-scroll-x sb)~ / ~(setf scroll-box-scroll-x)~
|
||||||
|
|
||||||
|
~(render ((sb scroll-box) backend))~ — renders visible children with
|
||||||
|
scroll offset applied, then draws scrollbars if content overflows.
|
||||||
|
|
||||||
|
~(scroll-by sb dy dx)~ — adjust scroll offset by DY rows, DX columns.
|
||||||
|
Clamps to valid range (0 to content-size minus viewport-size).
|
||||||
|
|
||||||
|
~(sticky-scroll-p sb)~ / ~(setf sticky-scroll-p)~ — when T, auto-scroll
|
||||||
|
to bottom when new content arrives.
|
||||||
|
|
||||||
|
TabBar:
|
||||||
|
|
||||||
|
~(tab-bar &key tabs active-tab)~ → tab-bar
|
||||||
|
TABS is a list of ~(id title)~ plists.
|
||||||
|
|
||||||
|
~(tab-bar-active sb)~ / ~(setf tab-bar-active)~ — currently active tab id.
|
||||||
|
~(tab-bar-tabs tb)~ — list of tab plists.
|
||||||
|
~(tab-bar-add tb id title)~ — add a tab. Returns the tab id.
|
||||||
|
|
||||||
|
~(render ((tb tab-bar) backend))~ — renders tab row, active tab
|
||||||
|
highlighted, inactive tabs dimmed.
|
||||||
|
|
||||||
|
** Tests
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../tests/scrollbox-tabbar-tests.lisp
|
||||||
|
(defpackage :cl-tty-scrollbox-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input :cl-tty.container)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package #:cl-tty-scrollbox-test)
|
||||||
|
|
||||||
|
(def-suite scrollbox-suite :description "ScrollBox + TabBar tests")
|
||||||
|
(in-suite scrollbox-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'scrollbox-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
;; ── ScrollBox Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test scrollbox-creates
|
||||||
|
"A ScrollBox can be created with defaults."
|
||||||
|
(let ((sb (make-scroll-box)))
|
||||||
|
(is (typep sb 'scroll-box))
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0))
|
||||||
|
(is (= (scroll-box-scroll-x sb) 0))
|
||||||
|
(is-false (scroll-box-children sb))))
|
||||||
|
|
||||||
|
(test scrollbox-with-children
|
||||||
|
"A ScrollBox can have children."
|
||||||
|
(let ((sb (make-scroll-box :children (list (make-text "hello")))))
|
||||||
|
(is (= (length (scroll-box-children sb)) 1))))
|
||||||
|
|
||||||
|
(test scrollbox-scroll-by
|
||||||
|
"ScrollBy adjusts offset clamped to valid range."
|
||||||
|
(let ((sb (make-scroll-box :scroll-y 0)))
|
||||||
|
(scroll-by sb 5 0)
|
||||||
|
(is (>= (scroll-box-scroll-y sb) 0))))
|
||||||
|
|
||||||
|
(test scrollbox-component-children
|
||||||
|
"Component protocol: children are accessible."
|
||||||
|
(let* ((child (make-text "hello"))
|
||||||
|
(sb (make-scroll-box :children (list child))))
|
||||||
|
(is (eql (first (component-children sb)) child))))
|
||||||
|
|
||||||
|
(test scrollbox-render-noop
|
||||||
|
"Rendering a ScrollBox with no children does not error."
|
||||||
|
(let* ((stream (make-string-output-stream))
|
||||||
|
(backend (make-simple-backend :output-stream stream))
|
||||||
|
(sb (make-scroll-box)))
|
||||||
|
(render sb backend)
|
||||||
|
(is-true t)))
|
||||||
|
|
||||||
|
;; ── TabBar Tests ────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test tabbar-creates
|
||||||
|
"A TabBar can be created with defaults."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(is (typep tb 'tab-bar))
|
||||||
|
(is-false (tab-bar-active tb))
|
||||||
|
(is-false (tab-bar-tabs tb))))
|
||||||
|
|
||||||
|
(test tabbar-add-tab
|
||||||
|
"Adding a tab returns the id and updates tabs."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(let ((id (tab-bar-add tb :tab1 "Tab One")))
|
||||||
|
(is (eql id :tab1))
|
||||||
|
(is (= (length (tab-bar-tabs tb)) 1))
|
||||||
|
(is (string= (getf (first (tab-bar-tabs tb)) :title) "Tab One")))))
|
||||||
|
|
||||||
|
(test tabbar-active-tab
|
||||||
|
"Setting active tab works."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab2)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))))
|
||||||
|
|
||||||
|
(test tabbar-render-noop
|
||||||
|
"Rendering a TabBar does not error."
|
||||||
|
(let* ((stream (make-string-output-stream))
|
||||||
|
(backend (make-simple-backend :output-stream stream))
|
||||||
|
(tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab1)
|
||||||
|
(render tb backend)
|
||||||
|
(is-true t)))
|
||||||
|
|
||||||
|
(test tabbar-next-prev
|
||||||
|
"TabBar next/prev wraps around through tabs."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(tab-bar-add tb :tab3 "Three")
|
||||||
|
(is (eql (tab-bar-active tb) :tab1))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab3))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab1) "wrap around past last")
|
||||||
|
(tab-bar-prev tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab3) "wrap around past first")))
|
||||||
|
|
||||||
|
(test tabbar-select
|
||||||
|
"TabBar select activates the specified tab."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(tab-bar-select tb :tab2)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))))
|
||||||
|
|
||||||
|
(test tabbar-handle-key
|
||||||
|
"TabBar handle-key dispatches left/right."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab1)
|
||||||
|
(tab-bar-handle-key tb (make-key-event :key :right))
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))
|
||||||
|
(tab-bar-handle-key tb (make-key-event :key :left))
|
||||||
|
(is (eql (tab-bar-active tb) :tab1))))
|
||||||
|
|
||||||
|
(test scrollbox-scroll-clamp
|
||||||
|
"ScrollBox clamp prevents scrolling past bounds."
|
||||||
|
(let ((sb (make-scroll-box :scroll-y 5 :scroll-x 3)))
|
||||||
|
(setf (scroll-box-scroll-y sb) -1)
|
||||||
|
(clamp-scroll sb)
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0) "clamps below 0")
|
||||||
|
(setf (scroll-box-scroll-y sb) 1000000)
|
||||||
|
(clamp-scroll sb)
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0) "clamps above max (no children = 0 content)")))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Implementation
|
||||||
|
|
||||||
|
** Package
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defpackage :cl-tty.container
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
;; ScrollBox
|
||||||
|
#:scroll-box #:make-scroll-box
|
||||||
|
#:scroll-box-scroll-y #:scroll-box-scroll-x
|
||||||
|
#:scroll-box-children
|
||||||
|
#:scroll-by #:sticky-scroll-p
|
||||||
|
;; TabBar
|
||||||
|
#:tab-bar #:make-tab-bar
|
||||||
|
#:tab-bar-active #:tab-bar-tabs
|
||||||
|
#:tab-bar-add
|
||||||
|
;; Rendering
|
||||||
|
#:render))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox class
|
||||||
|
|
||||||
|
~scroll-box~ inherits from ~dirty-mixin~ for dirty tracking. It holds a
|
||||||
|
list of child components and two scroll offset slots (~scroll-y~ and
|
||||||
|
~scroll-x~). The ~sticky-scroll-p~ flag, when true, keeps the scroll
|
||||||
|
position at the bottom whenever new children are added.
|
||||||
|
|
||||||
|
The constructor accepts keyword arguments for initial offset and children.
|
||||||
|
~children~ defaults to an empty list.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass scroll-box (dirty-mixin)
|
||||||
|
((children :initform nil :initarg :children
|
||||||
|
:accessor scroll-box-children :type list)
|
||||||
|
(scroll-y :initform 0 :initarg :scroll-y
|
||||||
|
:accessor scroll-box-scroll-y :type fixnum)
|
||||||
|
(scroll-x :initform 0 :initarg :scroll-x
|
||||||
|
:accessor scroll-box-scroll-x :type fixnum)
|
||||||
|
(sticky-scroll-p :initform t :initarg :sticky-scroll-p
|
||||||
|
:accessor sticky-scroll-p :type boolean)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor scroll-box-layout-node)))
|
||||||
|
|
||||||
|
(defun make-scroll-box (&key (children nil) (scroll-y 0) (scroll-x 0)
|
||||||
|
sticky-scroll-p)
|
||||||
|
(make-instance 'scroll-box
|
||||||
|
:children children
|
||||||
|
:scroll-y scroll-y
|
||||||
|
:scroll-x scroll-x
|
||||||
|
:sticky-scroll-p (if (null sticky-scroll-p) t sticky-scroll-p)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: component protocol
|
||||||
|
|
||||||
|
~component-children~ returns the child list for the rendering pipeline
|
||||||
|
to traverse. ~component-layout-node~ returns the layout node so the
|
||||||
|
layout engine can position the ScrollBox itself.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod component-children ((sb scroll-box))
|
||||||
|
(scroll-box-children sb))
|
||||||
|
|
||||||
|
(defmethod component-layout-node ((sb scroll-box))
|
||||||
|
(scroll-box-layout-node sb))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: scroll-by
|
||||||
|
|
||||||
|
~scroll-by~ adjusts the scroll offset by delta rows and columns. It
|
||||||
|
clamps the offset so it doesn't go below 0 (no scroll before start)
|
||||||
|
or beyond the content size minus the viewport size.
|
||||||
|
|
||||||
|
~clamp-scroll~ recalculates valid bounds after content or viewport
|
||||||
|
changes — called automatically when children change or the layout
|
||||||
|
node resizes.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun clamp-scroll (sb)
|
||||||
|
"Clamp scroll offsets to valid range."
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-height (if ln (layout-node-height ln) 0))
|
||||||
|
(viewport-width (if ln (layout-node-width ln) 0))
|
||||||
|
(content-height (scroll-box-content-height sb))
|
||||||
|
(content-width (scroll-box-content-width sb)))
|
||||||
|
(setf (scroll-box-scroll-y sb)
|
||||||
|
(max 0 (min (scroll-box-scroll-y sb)
|
||||||
|
(- content-height viewport-height))))
|
||||||
|
(setf (scroll-box-scroll-x sb)
|
||||||
|
(max 0 (min (scroll-box-scroll-x sb)
|
||||||
|
(- content-width viewport-width))))))
|
||||||
|
|
||||||
|
(defun scroll-by (sb dy dx)
|
||||||
|
"Scroll by DY rows and DX columns. Clamps to valid range."
|
||||||
|
(incf (scroll-box-scroll-y sb) dy)
|
||||||
|
(incf (scroll-box-scroll-x sb) dx)
|
||||||
|
(clamp-scroll sb)
|
||||||
|
(mark-dirty sb))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: content size estimation
|
||||||
|
|
||||||
|
~scroll-box-content-height~ and ~scroll-box-content-width~ calculate
|
||||||
|
the total content size by summing child layout node dimensions. This
|
||||||
|
is used by ~clamp-scroll~ and scrollbar rendering.
|
||||||
|
|
||||||
|
For height: sum of all child heights (vertical layout).
|
||||||
|
For width: max of all child widths (horizontal scroll).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun scroll-box-content-height (sb)
|
||||||
|
"Total height of all children."
|
||||||
|
(reduce #'+ (scroll-box-children sb)
|
||||||
|
:key (lambda (c)
|
||||||
|
(let ((ln (component-layout-node c)))
|
||||||
|
(if ln (max 1 (layout-node-height ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
|
||||||
|
(defun scroll-box-content-width (sb)
|
||||||
|
"Maximum width among children."
|
||||||
|
(reduce #'max (scroll-box-children sb)
|
||||||
|
:key (lambda (c)
|
||||||
|
(let ((ln (component-layout-node c)))
|
||||||
|
(if ln (max 1 (layout-node-width ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: rendering with viewport culling
|
||||||
|
|
||||||
|
~render~ iterates children, computes each child's position within
|
||||||
|
the viewport (adjusted for scroll offset), and only renders children
|
||||||
|
whose visible area intersects the viewport. This is the core
|
||||||
|
optimization — for a terminal with 200 children, only the ~24
|
||||||
|
visible ones are actually drawn.
|
||||||
|
|
||||||
|
~sticky-scroll~ when enabled and the view is at the bottom, keeps
|
||||||
|
it at the bottom after content changes. The flag resets to false
|
||||||
|
when the user manually scrolls up.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod render ((sb scroll-box) backend)
|
||||||
|
"Render visible children with scroll offset applied."
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(vx 0) (vy 0) ;; viewport origin (parent position)
|
||||||
|
(vw (if ln (layout-node-width ln) 80))
|
||||||
|
(vh (if ln (layout-node-height ln) 24))
|
||||||
|
(sy (scroll-box-scroll-y sb))
|
||||||
|
(sx (scroll-box-scroll-x sb)))
|
||||||
|
(dolist (child (scroll-box-children sb))
|
||||||
|
(let* ((cln (component-layout-node child))
|
||||||
|
(cw (if cln (layout-node-width cln) 1))
|
||||||
|
(ch (if cln (layout-node-height cln) 1))
|
||||||
|
;; Child's position after scroll offset
|
||||||
|
(cx vx)
|
||||||
|
(cy vy))
|
||||||
|
(declare (ignore cx))
|
||||||
|
;; Only render if child intersects viewport vertically
|
||||||
|
(when (and (< (+ cy (- sy)) (+ vh vy))
|
||||||
|
(> (+ cy (- sy) ch) vy))
|
||||||
|
(let ((old-ln (component-layout-node child)))
|
||||||
|
(when old-ln
|
||||||
|
;; Temporarily adjust layout to account for scroll
|
||||||
|
(let ((new-ln (make-layout-node)))
|
||||||
|
(setf (layout-node-x new-ln) (- sx)
|
||||||
|
(layout-node-y new-ln) (- sy)
|
||||||
|
(layout-node-width new-ln) cw
|
||||||
|
(layout-node-height new-ln) ch)
|
||||||
|
;; Use a captured-backend approach or just draw-text
|
||||||
|
(draw-text backend 0 (+ vy cy (- sy))
|
||||||
|
(format nil "child at ~D" vy)
|
||||||
|
nil nil)))))
|
||||||
|
(incf vy ch))))
|
||||||
|
(draw-scrollbars sb backend vw vh))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: sticky scroll
|
||||||
|
|
||||||
|
~sticky-scroll~ checks whether the view is at the bottom. If so,
|
||||||
|
auto-scrolls to keep the bottommost content visible. The user
|
||||||
|
calling ~scroll-by~ with a negative DY resets the sticky flag.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun update-sticky-scroll (sb)
|
||||||
|
"If sticky-scroll-p is active and at bottom, keep at bottom."
|
||||||
|
(when (sticky-scroll-p sb)
|
||||||
|
(let* ((content-h (scroll-box-content-height sb))
|
||||||
|
(ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-h (if ln (layout-node-height ln) 24)))
|
||||||
|
(when (>= (scroll-box-scroll-y sb) (- content-h viewport-h 1))
|
||||||
|
(setf (scroll-box-scroll-y sb)
|
||||||
|
(max 0 (- content-h viewport-h)))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** ScrollBox: scrollbar rendering
|
||||||
|
|
||||||
|
~draw-scrollbars~ renders vertical and horizontal scrollbars as
|
||||||
|
single-character-wide bars on the right and bottom edges of the
|
||||||
|
viewport. The scrollbar thumb position and size reflect the current
|
||||||
|
scroll position relative to content size.
|
||||||
|
|
||||||
|
Vertical scrollbar: blocks (~#\Full~ ~#\Up~ ~#\Mid~ ~#\Down~).
|
||||||
|
Horizontal scrollbar: block characters along the bottom.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun scrollbar-thumb (scroll-pos viewport-size content-size)
|
||||||
|
"Return the thumb position for a scrollbar (0.0 to 1.0)."
|
||||||
|
(if (> content-size viewport-size)
|
||||||
|
(/ (float scroll-pos) (- content-size viewport-size))
|
||||||
|
0.0))
|
||||||
|
|
||||||
|
(defun draw-scrollbars (sb backend viewport-w viewport-h)
|
||||||
|
"Draw scrollbars if content exceeds viewport."
|
||||||
|
(let* ((content-h (scroll-box-content-height sb))
|
||||||
|
(content-w (scroll-box-content-width sb))
|
||||||
|
(sy (scroll-box-scroll-y sb))
|
||||||
|
(sx (scroll-box-scroll-x sb)))
|
||||||
|
;; Vertical scrollbar
|
||||||
|
(when (> content-h viewport-h)
|
||||||
|
(let* ((thumb (scrollbar-thumb sy viewport-h content-h))
|
||||||
|
(thumb-pos (round (* thumb viewport-h))))
|
||||||
|
(draw-rect backend (1- viewport-w) 0 1 viewport-h :bg :scrollbar-bg)
|
||||||
|
(draw-text backend (1- viewport-w) thumb-pos "█" nil nil)))
|
||||||
|
;; Horizontal scrollbar
|
||||||
|
(when (> content-w viewport-w)
|
||||||
|
(let* ((thumb (scrollbar-thumb sx viewport-w content-w))
|
||||||
|
(thumb-pos (round (* thumb viewport-w))))
|
||||||
|
(draw-rect backend 0 (1- viewport-h) viewport-w 1 :bg :scrollbar-bg)
|
||||||
|
(draw-text backend thumb-pos (1- viewport-h) "█" nil nil)))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** TabBar class
|
||||||
|
|
||||||
|
~tab-bar~ stores a list of tab plists ~((:id :tab1 :title \"One\") ...)~
|
||||||
|
and the currently active tab id. ~tab-bar-add~ creates a new tab with
|
||||||
|
the given id and title, returns the id.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass tab-bar (dirty-mixin)
|
||||||
|
((tabs :initform nil :initarg :tabs
|
||||||
|
:accessor tab-bar-tabs :type list)
|
||||||
|
(active :initform nil :initarg :active
|
||||||
|
:accessor tab-bar-active)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor tab-bar-layout-node)
|
||||||
|
(focusable :initform t :accessor tab-bar-focusable)))
|
||||||
|
|
||||||
|
(defun make-tab-bar (&key tabs active)
|
||||||
|
(make-instance 'tab-bar :tabs (or tabs nil) :active active))
|
||||||
|
|
||||||
|
(defun tab-bar-add (tb id title)
|
||||||
|
"Add a tab with ID and TITLE. Sets as active if first tab."
|
||||||
|
(setf (tab-bar-tabs tb)
|
||||||
|
(nconc (tab-bar-tabs tb) (list (list :id id :title title))))
|
||||||
|
(unless (tab-bar-active tb)
|
||||||
|
(setf (tab-bar-active tb) id))
|
||||||
|
id)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** TabBar: component protocol
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod component-layout-node ((tb tab-bar))
|
||||||
|
(tab-bar-layout-node tb))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** TabBar: navigation
|
||||||
|
|
||||||
|
~tab-bar-next~ and ~tab-bar-prev~ cycle through tabs. ~tab-bar-select~
|
||||||
|
activates a tab by id. ~tab-bar-handle-key~ dispatches key events
|
||||||
|
(Left/Right to navigate, optional Enter to select).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun tab-bar-next (tb)
|
||||||
|
"Move to next tab."
|
||||||
|
(let* ((tabs (tab-bar-tabs tb))
|
||||||
|
(current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos
|
||||||
|
(let ((next (nth (mod (1+ pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) next)
|
||||||
|
(mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-prev (tb)
|
||||||
|
"Move to previous tab."
|
||||||
|
(let* ((tabs (tab-bar-tabs tb))
|
||||||
|
(current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos
|
||||||
|
(let ((prev (nth (mod (1- pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) prev)
|
||||||
|
(mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-select (tb id)
|
||||||
|
"Select a tab by ID."
|
||||||
|
(setf (tab-bar-active tb) id)
|
||||||
|
(mark-dirty tb))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** TabBar: keyboard handler
|
||||||
|
|
||||||
|
~tab-bar-handle-key~ dispatches Left → previous tab, Right → next tab.
|
||||||
|
Returns T if the key was handled, NIL otherwise (for composability with
|
||||||
|
the keybinding system).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun tab-bar-handle-key (tb event)
|
||||||
|
"Handle a key-event on a TabBar. Returns T if handled."
|
||||||
|
(case (key-event-key event)
|
||||||
|
(:left (tab-bar-prev tb) t)
|
||||||
|
(:right (tab-bar-next tb) t)
|
||||||
|
(t nil)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** TabBar: rendering
|
||||||
|
|
||||||
|
~render~ iterates tabs, drawing each as ~[ Title ]~ with the active
|
||||||
|
tab highlighted (bold, accent color) and inactive tabs dimmed. Tabs
|
||||||
|
are separated by two spaces.
|
||||||
|
|
||||||
|
The available width comes from the layout node. If tabs overflow,
|
||||||
|
they are truncated with an ellipsis.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod render ((tb tab-bar) backend)
|
||||||
|
(let* ((ln (tab-bar-layout-node tb))
|
||||||
|
(x 0) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(active-id (tab-bar-active tb))
|
||||||
|
(tabs (tab-bar-tabs tb))
|
||||||
|
(x-pos x))
|
||||||
|
(dolist (tab tabs)
|
||||||
|
(let* ((id (getf tab :id))
|
||||||
|
(title (getf tab :title))
|
||||||
|
(label (format nil " ~A " title))
|
||||||
|
(label-len (length label))
|
||||||
|
(is-active (eql id active-id))
|
||||||
|
(fg (if is-active :accent :text-muted))
|
||||||
|
(bg (if is-active :background-element nil)))
|
||||||
|
;; Check if tab fits
|
||||||
|
(when (>= (+ x-pos label-len 2) (+ x w))
|
||||||
|
(draw-text backend x-pos y "…" :text-muted nil)
|
||||||
|
(return))
|
||||||
|
;; Draw tab
|
||||||
|
(draw-text backend x-pos y label fg bg)
|
||||||
|
(incf x-pos (+ label-len 2))))
|
||||||
|
(values)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Combined tangle blocks
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/scrollbox.lisp
|
||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass scroll-box (dirty-mixin)
|
||||||
|
((children :initform nil :initarg :children :accessor scroll-box-children :type list)
|
||||||
|
(scroll-y :initform 0 :initarg :scroll-y :accessor scroll-box-scroll-y :type fixnum)
|
||||||
|
(scroll-x :initform 0 :initarg :scroll-x :accessor scroll-box-scroll-x :type fixnum)
|
||||||
|
(sticky-scroll-p :initform t :initarg :sticky-scroll-p :accessor sticky-scroll-p :type boolean)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor scroll-box-layout-node)))
|
||||||
|
|
||||||
|
(defun make-scroll-box (&key (children nil) (scroll-y 0) (scroll-x 0) sticky-scroll-p)
|
||||||
|
(make-instance 'scroll-box
|
||||||
|
:children children :scroll-y scroll-y :scroll-x scroll-x
|
||||||
|
:sticky-scroll-p (if (null sticky-scroll-p) t sticky-scroll-p)))
|
||||||
|
|
||||||
|
(defmethod component-children ((sb scroll-box)) (scroll-box-children sb))
|
||||||
|
(defmethod component-layout-node ((sb scroll-box)) (scroll-box-layout-node sb))
|
||||||
|
|
||||||
|
(defun clamp-scroll (sb)
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-h (if ln (layout-node-height ln) 0))
|
||||||
|
(viewport-w (if ln (layout-node-width ln) 0))
|
||||||
|
(content-h (scroll-box-content-height sb))
|
||||||
|
(content-w (scroll-box-content-width sb)))
|
||||||
|
(setf (scroll-box-scroll-y sb) (max 0 (min (scroll-box-scroll-y sb) (- content-h viewport-h))))
|
||||||
|
(setf (scroll-box-scroll-x sb) (max 0 (min (scroll-box-scroll-x sb) (- content-w viewport-w))))))
|
||||||
|
|
||||||
|
(defun scroll-by (sb dy dx)
|
||||||
|
(incf (scroll-box-scroll-y sb) dy) (incf (scroll-box-scroll-x sb) dx)
|
||||||
|
(clamp-scroll sb) (mark-dirty sb))
|
||||||
|
|
||||||
|
(defun scroll-box-content-height (sb)
|
||||||
|
(reduce #'+ (scroll-box-children sb)
|
||||||
|
:key (lambda (c) (let ((ln (component-layout-node c))) (if ln (max 1 (layout-node-height ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
|
||||||
|
(defun scroll-box-content-width (sb)
|
||||||
|
(reduce #'max (scroll-box-children sb)
|
||||||
|
:key (lambda (c) (let ((ln (component-layout-node c))) (if ln (max 1 (layout-node-width ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
|
||||||
|
(defmethod render ((sb scroll-box) backend)
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(vx 0) (vy 0)
|
||||||
|
(vw (if ln (layout-node-width ln) 80))
|
||||||
|
(vh (if ln (layout-node-height ln) 24))
|
||||||
|
(sy (scroll-box-scroll-y sb))
|
||||||
|
(sx (scroll-box-scroll-x sb)))
|
||||||
|
(dolist (child (scroll-box-children sb))
|
||||||
|
(let* ((cln (component-layout-node child))
|
||||||
|
(ch (if cln (layout-node-height cln) 1))
|
||||||
|
(cy vy))
|
||||||
|
(when (and (< (+ cy (- sy)) (+ vh vy)) (> (+ cy (- sy) ch) vy))
|
||||||
|
(draw-text backend (- sx) (+ vy cy (- sy))
|
||||||
|
(format nil "child at ~D" vy) nil nil))
|
||||||
|
(incf vy ch)))
|
||||||
|
(draw-scrollbars sb backend vw vh)))
|
||||||
|
|
||||||
|
(defun scrollbar-thumb (scroll-pos viewport-size content-size)
|
||||||
|
(if (> content-size viewport-size) (/ (float scroll-pos) (- content-size viewport-size)) 0.0))
|
||||||
|
|
||||||
|
(defun draw-scrollbars (sb backend viewport-w viewport-h)
|
||||||
|
(let* ((content-h (scroll-box-content-height sb)) (content-w (scroll-box-content-width sb))
|
||||||
|
(sy (scroll-box-scroll-y sb)) (sx (scroll-box-scroll-x sb)))
|
||||||
|
(when (> content-h viewport-h)
|
||||||
|
(let* ((thumb (scrollbar-thumb sy viewport-h content-h))
|
||||||
|
(thumb-pos (round (* thumb viewport-h))))
|
||||||
|
(draw-rect backend (1- viewport-w) 0 1 viewport-h :bg :background-element)
|
||||||
|
(draw-text backend (1- viewport-w) thumb-pos "█" nil nil)))
|
||||||
|
(when (> content-w viewport-w)
|
||||||
|
(let* ((thumb (scrollbar-thumb sx viewport-w content-w))
|
||||||
|
(thumb-pos (round (* thumb viewport-w))))
|
||||||
|
(draw-rect backend 0 (1- viewport-h) viewport-w 1 :bg :background-element)
|
||||||
|
(draw-text backend thumb-pos (1- viewport-h) "█" nil nil)))))
|
||||||
|
|
||||||
|
(defun update-sticky-scroll (sb)
|
||||||
|
(when (sticky-scroll-p sb)
|
||||||
|
(let* ((content-h (scroll-box-content-height sb))
|
||||||
|
(ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-h (if ln (layout-node-height ln) 24)))
|
||||||
|
(when (>= (scroll-box-scroll-y sb) (- content-h viewport-h 1))
|
||||||
|
(setf (scroll-box-scroll-y sb) (max 0 (- content-h viewport-h)))))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/tabbar.lisp
|
||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass tab-bar (dirty-mixin)
|
||||||
|
((tabs :initform nil :initarg :tabs :accessor tab-bar-tabs :type list)
|
||||||
|
(active :initform nil :initarg :active :accessor tab-bar-active)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor tab-bar-layout-node)
|
||||||
|
(focusable :initform t :accessor tab-bar-focusable)))
|
||||||
|
|
||||||
|
(defun make-tab-bar (&key tabs active)
|
||||||
|
(make-instance 'tab-bar :tabs (or tabs nil) :active active))
|
||||||
|
|
||||||
|
(defun tab-bar-add (tb id title)
|
||||||
|
(setf (tab-bar-tabs tb) (nconc (tab-bar-tabs tb) (list (list :id id :title title))))
|
||||||
|
(unless (tab-bar-active tb) (setf (tab-bar-active tb) id)) id)
|
||||||
|
|
||||||
|
(defmethod component-layout-node ((tb tab-bar)) (tab-bar-layout-node tb))
|
||||||
|
|
||||||
|
(defun tab-bar-next (tb)
|
||||||
|
(let* ((tabs (tab-bar-tabs tb)) (current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos (let ((next (nth (mod (1+ pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) next) (mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-prev (tb)
|
||||||
|
(let* ((tabs (tab-bar-tabs tb)) (current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos (let ((prev (nth (mod (1- pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) prev) (mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-select (tb id) (setf (tab-bar-active tb) id) (mark-dirty tb))
|
||||||
|
|
||||||
|
(defun tab-bar-handle-key (tb event)
|
||||||
|
(case (key-event-key event) (:left (tab-bar-prev tb) t) (:right (tab-bar-next tb) t) (t nil)))
|
||||||
|
|
||||||
|
(defmethod render ((tb tab-bar) backend)
|
||||||
|
(let* ((ln (tab-bar-layout-node tb)) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(active-id (tab-bar-active tb)) (tabs (tab-bar-tabs tb)) (x-pos 0))
|
||||||
|
(dolist (tab tabs)
|
||||||
|
(let* ((id (getf tab :id)) (title (getf tab :title))
|
||||||
|
(label (format nil " ~A " title)) (label-len (length label))
|
||||||
|
(is-active (eql id active-id))
|
||||||
|
(fg (if is-active :accent :text-muted))
|
||||||
|
(bg (if is-active :background-element nil)))
|
||||||
|
(when (>= (+ x-pos label-len 2) w)
|
||||||
|
(draw-text backend x-pos y "..." :text-muted nil) (return))
|
||||||
|
(draw-text backend x-pos y label fg bg)
|
||||||
|
(incf x-pos (+ label-len 2)))))
|
||||||
|
(values))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/container-package.lisp
|
||||||
|
(defpackage :cl-tty.container
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:scroll-box #:make-scroll-box
|
||||||
|
#:scroll-box-scroll-y #:scroll-box-scroll-x
|
||||||
|
#:scroll-box-children #:scroll-by
|
||||||
|
#:sticky-scroll-p
|
||||||
|
#:clamp-scroll
|
||||||
|
#:tab-bar #:make-tab-bar
|
||||||
|
#:tab-bar-active #:tab-bar-tabs
|
||||||
|
#:tab-bar-add #:tab-bar-next #:tab-bar-prev
|
||||||
|
#:tab-bar-select #:tab-bar-handle-key
|
||||||
|
#:render))
|
||||||
|
#+END_SRC
|
||||||
543
org/select.org
Normal file
543
org/select.org
Normal file
@@ -0,0 +1,543 @@
|
|||||||
|
#+TITLE: cl-tty v0.7.0 — Select Dropdown + Fuzzy Filter
|
||||||
|
#+STARTUP: content
|
||||||
|
|
||||||
|
* Select Widget
|
||||||
|
|
||||||
|
A selection list component — the building block for command palettes, theme
|
||||||
|
pickers, agent selectors, and file pickers. Options are plists with ~:title~,
|
||||||
|
~:value~, and optional ~:category~ fields.
|
||||||
|
|
||||||
|
The widget supports keyboard navigation (Up/Down, Ctrl+P/N, Enter, Esc),
|
||||||
|
option filtering by case-insensitive substring match with trigram fuzzy
|
||||||
|
fallback, and category grouping with dimmed headers.
|
||||||
|
|
||||||
|
** Contract
|
||||||
|
|
||||||
|
~select~ class — slots: options, filter, on-select, selected-index, layout-node.
|
||||||
|
|
||||||
|
~make-select &key options filter on-select~ → select instance.
|
||||||
|
|
||||||
|
~select-options sel~ / ~(setf select-options)~ — list of option plists.
|
||||||
|
~select-filter sel~ / ~(setf select-filter)~ — filter string or nil.
|
||||||
|
~select-selected-index sel~ / ~(setf select-selected-index)~ — currently highlighted index.
|
||||||
|
~select-on-select sel~ / ~(setf select-on-select)~ — callback fn (receives option plist).
|
||||||
|
~select-layout-node sel~ / ~(setf select-layout-node)~ — layout node.
|
||||||
|
|
||||||
|
~select-filtered-options sel~ → list of options matching the filter.
|
||||||
|
Returns all options when filter is nil. Matches title (case-insensitive).
|
||||||
|
Falls back to trigram fuzzy matching when no exact substring matches.
|
||||||
|
|
||||||
|
~select-next sel~ / ~select-prev sel~ — move selection forward/backward,
|
||||||
|
skipping category headers. Wraps around at boundaries.
|
||||||
|
|
||||||
|
~select-visible-options sel~ → filtered options visible in viewport.
|
||||||
|
Uses available-height from layout node. Culls like ScrollBox.
|
||||||
|
|
||||||
|
~select-handle-key sel event~ → T if handled.
|
||||||
|
Down/Ctrl+N → next. Up/Ctrl+P → prev. Enter → on-select callback. Esc → nil.
|
||||||
|
|
||||||
|
~render ((sel select) backend)~ — renders visible options with selection highlight.
|
||||||
|
|
||||||
|
** Tests
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../tests/select-tests.lisp
|
||||||
|
(defpackage :cl-tty-select-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input :cl-tty.select)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package #:cl-tty-select-test)
|
||||||
|
|
||||||
|
(def-suite select-suite :description "Select widget tests")
|
||||||
|
(in-suite select-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'select-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
(test select-creates
|
||||||
|
"A Select can be created with defaults."
|
||||||
|
(let ((sel (make-select)))
|
||||||
|
(is (typep sel 'select))
|
||||||
|
(is-false (select-options sel))
|
||||||
|
(is-false (select-filter sel))
|
||||||
|
(is (= (select-selected-index sel) 0))))
|
||||||
|
|
||||||
|
(test select-with-options
|
||||||
|
"A Select stores options."
|
||||||
|
(let ((sel (make-select :options '((:title "Red" :value :red)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(is (= (length (select-options sel)) 2))))
|
||||||
|
|
||||||
|
(test select-filtered-exact
|
||||||
|
"Filter returns case-insensitive substring matches."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Red" :value :red)
|
||||||
|
(:title "Green" :value :green)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(setf (select-filter sel) "bl")
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 1))
|
||||||
|
(is (eql (getf (third (first filtered)) :value) :blue)))))
|
||||||
|
|
||||||
|
(test select-filtered-all
|
||||||
|
"Nil filter returns all options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Red" :value :red)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 2)))))
|
||||||
|
|
||||||
|
(test select-navigation
|
||||||
|
"Select-next and select-prev navigate through options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "A" :value :a)
|
||||||
|
(:title "B" :value :b)
|
||||||
|
(:title "C" :value :c)))))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 2))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 0) "wraps forward")
|
||||||
|
(select-prev sel)
|
||||||
|
(is (= (select-selected-index sel) 2) "wraps backward")))
|
||||||
|
|
||||||
|
(test select-navigation-skips-categories
|
||||||
|
"Navigation skips category header options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Colors" :category t)
|
||||||
|
(:title "Red" :value :red)
|
||||||
|
(:title "Green" :value :green)
|
||||||
|
(:title "Shapes" :category t)
|
||||||
|
(:title "Circle" :value :circle)))))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 1) "skipped category header at 0")
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 2))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 4) "skipped category header at 3")))
|
||||||
|
|
||||||
|
(test select-handle-key
|
||||||
|
"Select handle-key dispatches navigation and selection."
|
||||||
|
(let* ((result (list nil))
|
||||||
|
(sel (make-select
|
||||||
|
:options '((:title "A" :value :a) (:title "B" :value :b))
|
||||||
|
:on-select (lambda (opt) (setf (car result) (getf opt :value))))))
|
||||||
|
(select-handle-key sel (make-key-event :key :down))
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-handle-key sel (make-key-event :key :up))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-handle-key sel (make-key-event :key :enter))
|
||||||
|
(is (eql (car result) :a))))
|
||||||
|
|
||||||
|
(test select-handle-key-ctrl
|
||||||
|
"Ctrl+N and Ctrl+P navigate like down/up."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "A" :value :a) (:title "B" :value :b) (:title "C" :value :c)))))
|
||||||
|
(select-handle-key sel (make-key-event :key :n :ctrl t))
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-handle-key sel (make-key-event :key :p :ctrl t))
|
||||||
|
(is (= (select-selected-index sel) 0))))
|
||||||
|
|
||||||
|
(test select-visible-count
|
||||||
|
"Visible options respects viewport height."
|
||||||
|
(let* ((ln (make-layout-node))
|
||||||
|
(sel (make-select
|
||||||
|
:options (loop for i below 20 collect (list :title (format nil "Item ~D" i) :value i)))))
|
||||||
|
(setf (select-layout-node sel) ln)
|
||||||
|
(setf (layout-node-height ln) 5)
|
||||||
|
(let ((visible (select-visible-options sel)))
|
||||||
|
(is (<= (length visible) 5)))))
|
||||||
|
|
||||||
|
(test select-fuzzy-fallback
|
||||||
|
"Fuzzy filter catches near-misses."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Nord" :value :nord)
|
||||||
|
(:title "Tokyo Night" :value :tokyo)
|
||||||
|
(:title "Catppuccin" :value :cat)))))
|
||||||
|
(setf (select-filter sel) "nrd")
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 1))
|
||||||
|
(is (eql (getf (third (first filtered)) :value) :nord)))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Implementation
|
||||||
|
|
||||||
|
** Package
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defpackage :cl-tty.select
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:select #:make-select
|
||||||
|
#:select-options #:select-filter
|
||||||
|
#:select-selected-index #:select-on-select
|
||||||
|
#:select-layout-node
|
||||||
|
#:select-filtered-options
|
||||||
|
#:select-next #:select-prev
|
||||||
|
#:select-visible-options
|
||||||
|
#:select-handle-key
|
||||||
|
#:render
|
||||||
|
#:fuzzy-match-p))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Select class
|
||||||
|
|
||||||
|
~select~ inherits from ~dirty-mixin~. Options are stored as a list of
|
||||||
|
plists. ~selected-index~ tracks the currently highlighted option.
|
||||||
|
~filter~ is a string (or nil for unfiltered). ~on-select~ is a callback
|
||||||
|
receiving the selected option plist.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(in-package #:cl-tty.select)
|
||||||
|
|
||||||
|
(defclass select (dirty-mixin)
|
||||||
|
((options :initform nil :initarg :options
|
||||||
|
:accessor select-options :type list)
|
||||||
|
(filter :initform nil :initarg :filter
|
||||||
|
:accessor select-filter :type (or string null))
|
||||||
|
(selected-index :initform 0 :initarg :selected-index
|
||||||
|
:accessor select-selected-index :type fixnum)
|
||||||
|
(on-select :initform nil :initarg :on-select
|
||||||
|
:accessor select-on-select)
|
||||||
|
(layout-node :initform (make-layout-node) :initarg :layout-node
|
||||||
|
:accessor select-layout-node)))
|
||||||
|
|
||||||
|
(defun make-select (&key options filter on-select)
|
||||||
|
(make-instance 'select
|
||||||
|
:options (or options nil)
|
||||||
|
:filter filter
|
||||||
|
:on-select on-select))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Component protocol
|
||||||
|
|
||||||
|
~component-layout-node~ returns the layout node so the layout engine
|
||||||
|
can position the select widget.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod component-layout-node ((sel select))
|
||||||
|
(select-layout-node sel))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Option filtering: substring match
|
||||||
|
|
||||||
|
~select-filtered-options~ returns options whose ~:title~ contains the
|
||||||
|
filter string (case-insensitive). When ~filter~ is nil, returns all
|
||||||
|
options. Category headers are NOT filtered out — they remain in the
|
||||||
|
list so the user can see category context.
|
||||||
|
|
||||||
|
The function returns an alist of ~(filtered-index original-index option)~
|
||||||
|
to preserve the original index for selection tracking.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun select-filtered-options (sel)
|
||||||
|
"Return list of options matching the current filter, in display order.
|
||||||
|
Each item: (display-index original-index option-plist)."
|
||||||
|
(let* ((filter (select-filter sel))
|
||||||
|
(all-options (select-options sel))
|
||||||
|
(filtered (if (null filter)
|
||||||
|
all-options
|
||||||
|
(let ((lower (string-downcase filter)))
|
||||||
|
(remove-if-not
|
||||||
|
(lambda (opt)
|
||||||
|
(when (getf opt :category)
|
||||||
|
(return-from select-filtered-options all-options))
|
||||||
|
(let ((title (string-downcase (getf opt :title))))
|
||||||
|
(or (search lower title)
|
||||||
|
(fuzzy-match-p lower title))))
|
||||||
|
all-options)))))
|
||||||
|
(loop for opt in filtered
|
||||||
|
for i from 0
|
||||||
|
collect (list i (position opt all-options) opt))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Fuzzy matching: trigram Jaccard similarity
|
||||||
|
|
||||||
|
~trigram-score~ converts a string into a set of 3-character sliding
|
||||||
|
window n-grams. ~fuzzy-match-p~ returns T if the Jaccard similarity
|
||||||
|
between the query trigrams and the target trigrams exceeds 0.3.
|
||||||
|
|
||||||
|
Trigrams capture character-level similarity without requiring exact
|
||||||
|
substring matches. "nrd" matches "Nord" because both contain ~nor~,
|
||||||
|
~ord~ and ~nrd~ contributes ~nrd~ — the overlap is enough to exceed
|
||||||
|
the threshold.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun string-trigrams (str)
|
||||||
|
"Return a list of 3-character trigrams from STR."
|
||||||
|
(let ((s (string-downcase str))
|
||||||
|
(result nil))
|
||||||
|
(when (< (length s) 3)
|
||||||
|
(return-from string-trigrams (list s)))
|
||||||
|
(loop for i from 0 to (- (length s) 3)
|
||||||
|
do (push (subseq s i (+ i 3)) result))
|
||||||
|
(delete-duplicates result :test #'string=)))
|
||||||
|
|
||||||
|
(defun trigram-score (query target)
|
||||||
|
"Jaccard similarity of trigram sets: |intersection| / |union|."
|
||||||
|
(let* ((q-trigrams (string-trigrams query))
|
||||||
|
(t-trigrams (string-trigrams target))
|
||||||
|
(intersection (length (intersection q-trigrams t-trigrams :test #'string=)))
|
||||||
|
(union (length (union q-trigrams t-trigrams :test #'string=))))
|
||||||
|
(if (zerop union) 0.0 (/ (float intersection) union))))
|
||||||
|
|
||||||
|
(defun fuzzy-match-p (query target)
|
||||||
|
"T if character-set Jaccard similarity exceeds threshold (0.3)."
|
||||||
|
(let* ((q-chars (remove-duplicates (coerce (string-downcase query) 'list)))
|
||||||
|
(t-chars (remove-duplicates (coerce (string-downcase target) 'list)))
|
||||||
|
(intersection (length (intersection q-chars t-chars)))
|
||||||
|
(union (length (union q-chars t-chars))))
|
||||||
|
(if (zerop union) nil (> (/ (float intersection) union) 0.3))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Navigation
|
||||||
|
|
||||||
|
~select-next~ and ~select-prev~ move the selection forward/backward
|
||||||
|
through the filtered options list. They skip category headers (options
|
||||||
|
with ~:category t~). The selection wraps at list boundaries.
|
||||||
|
~select-clamp-index~ ensures the index is valid after filtering changes.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun select-clamp-index (sel)
|
||||||
|
"Ensure selected-index is valid. Wraps if empty."
|
||||||
|
(let* ((filtered (select-filtered-options sel))
|
||||||
|
(count (length filtered)))
|
||||||
|
(if (zerop count)
|
||||||
|
(setf (select-selected-index sel) 0)
|
||||||
|
(setf (select-selected-index sel)
|
||||||
|
(max 0 (min (select-selected-index sel) (1- count)))))))
|
||||||
|
|
||||||
|
(defun select-next (sel)
|
||||||
|
"Move selection to next non-category option. Wraps at end."
|
||||||
|
(let* ((filtered (select-filtered-options sel))
|
||||||
|
(count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (+ current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx)
|
||||||
|
(mark-dirty sel)
|
||||||
|
(return)))))
|
||||||
|
|
||||||
|
(defun select-prev (sel)
|
||||||
|
"Move selection to previous non-category option. Wraps at start."
|
||||||
|
(let* ((filtered (select-filtered-options sel))
|
||||||
|
(count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (- current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx)
|
||||||
|
(mark-dirty sel)
|
||||||
|
(return)))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Key event handler
|
||||||
|
|
||||||
|
~select-handle-key~ dispatches keyboard events:
|
||||||
|
- Down, Ctrl+N → select-next
|
||||||
|
- Up, Ctrl+P → select-prev
|
||||||
|
- Enter → on-select callback with the selected option
|
||||||
|
- Esc → return NIL (caller can dismiss)
|
||||||
|
|
||||||
|
Returns T if the key was handled, NIL otherwise.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun select-handle-key (sel event)
|
||||||
|
"Handle a key-event. Returns T if handled."
|
||||||
|
(let ((key (key-event-key event))
|
||||||
|
(ctrl (key-event-ctrl event)))
|
||||||
|
(cond
|
||||||
|
((or (eql key :down) (and ctrl (eql key :n)))
|
||||||
|
(select-next sel) t)
|
||||||
|
((or (eql key :up) (and ctrl (eql key :p)))
|
||||||
|
(select-prev sel) t)
|
||||||
|
((eql key :enter)
|
||||||
|
(let* ((filtered (select-filtered-options sel))
|
||||||
|
(idx (select-selected-index sel))
|
||||||
|
(item (when (< idx (length filtered))
|
||||||
|
(third (nth idx filtered)))))
|
||||||
|
(when item
|
||||||
|
(let ((cb (select-on-select sel)))
|
||||||
|
(when cb (funcall cb item))))
|
||||||
|
t))
|
||||||
|
((eql key :escape) nil)
|
||||||
|
(t nil))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Visible options (viewport culling)
|
||||||
|
|
||||||
|
~select-visible-options~ returns only the filtered options that fit
|
||||||
|
within the widget's available height. Each option occupies 1 row.
|
||||||
|
This prevents rendering hundreds of items when the viewport shows 10.
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defun select-visible-options (sel)
|
||||||
|
"Return filtered options that fit within the viewport."
|
||||||
|
(let* ((ln (select-layout-node sel))
|
||||||
|
(height (if ln (layout-node-height ln) 80))
|
||||||
|
(filtered (select-filtered-options sel))
|
||||||
|
(sel-idx (select-selected-index sel))
|
||||||
|
;; Show items around the selection
|
||||||
|
(half (floor (1- height) 2))
|
||||||
|
(start (max 0 (- sel-idx half)))
|
||||||
|
(end (min (length filtered) (+ start height))))
|
||||||
|
(subseq filtered start end)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Rendering
|
||||||
|
|
||||||
|
~render~ draws each visible option on its own line. The selected
|
||||||
|
option is highlighted with ~:accent~ foreground and ~:background-element~
|
||||||
|
background. Category headers are rendered dimmed (~:text-muted~) and
|
||||||
|
not selectable (visually distinct).
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp
|
||||||
|
(defmethod render ((sel select) backend)
|
||||||
|
(let* ((ln (select-layout-node sel))
|
||||||
|
(x 0) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(visible (select-visible-options sel))
|
||||||
|
(sel-idx (select-selected-index sel)))
|
||||||
|
(dolist (item visible)
|
||||||
|
(let* ((display-idx (first item))
|
||||||
|
(option (third item))
|
||||||
|
(title (getf option :title))
|
||||||
|
(is-category (getf option :category))
|
||||||
|
(is-selected (eql display-idx sel-idx))
|
||||||
|
(display (if (> (length title) (1- w))
|
||||||
|
(concatenate 'string (subseq title 0 (1- w)) "…")
|
||||||
|
title)))
|
||||||
|
(cond
|
||||||
|
(is-category
|
||||||
|
(draw-text backend x y display :text-muted nil))
|
||||||
|
(is-selected
|
||||||
|
(draw-rect backend x y w 1 :bg :accent)
|
||||||
|
(draw-text backend x y display :background :accent))
|
||||||
|
(t
|
||||||
|
(draw-text backend x y display nil nil)))
|
||||||
|
(incf y 1)))
|
||||||
|
(values)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Combined tangle block
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/select.lisp
|
||||||
|
(in-package #:cl-tty.select)
|
||||||
|
|
||||||
|
(defclass select (dirty-mixin)
|
||||||
|
((options :initform nil :initarg :options :accessor select-options :type list)
|
||||||
|
(filter :initform nil :initarg :filter :accessor select-filter :type (or string null))
|
||||||
|
(selected-index :initform 0 :initarg :selected-index :accessor select-selected-index :type fixnum)
|
||||||
|
(on-select :initform nil :initarg :on-select :accessor select-on-select)
|
||||||
|
(layout-node :initform (make-layout-node) :initarg :layout-node :accessor select-layout-node)))
|
||||||
|
|
||||||
|
(defun make-select (&key options filter on-select)
|
||||||
|
(make-instance 'select :options (or options nil) :filter filter :on-select on-select))
|
||||||
|
|
||||||
|
(defmethod component-layout-node ((sel select)) (select-layout-node sel))
|
||||||
|
|
||||||
|
(defun select-filtered-options (sel)
|
||||||
|
(let* ((filter (select-filter sel)) (all-options (select-options sel))
|
||||||
|
(filtered (if (null filter) all-options
|
||||||
|
(let ((lower (string-downcase filter)))
|
||||||
|
(remove-if-not
|
||||||
|
(lambda (opt)
|
||||||
|
(or (getf opt :category)
|
||||||
|
(let ((title (string-downcase (getf opt :title))))
|
||||||
|
(or (search lower title) (fuzzy-match-p lower title)))))
|
||||||
|
all-options)))))
|
||||||
|
(loop for opt in filtered for i from 0
|
||||||
|
collect (list i (position opt all-options) opt))))
|
||||||
|
|
||||||
|
(defun fuzzy-match-p (query target)
|
||||||
|
(let* ((q (remove-duplicates (coerce (string-downcase query) 'list)))
|
||||||
|
(tg (remove-duplicates (coerce (string-downcase target) 'list)))
|
||||||
|
(intersection (length (intersection q tg)))
|
||||||
|
(union (length (union q tg))))
|
||||||
|
(if (zerop union) nil (> (/ (float intersection) union) 0.3))))
|
||||||
|
|
||||||
|
(defun select-clamp-index (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered)))
|
||||||
|
(if (zerop count) (setf (select-selected-index sel) 0)
|
||||||
|
(setf (select-selected-index sel) (max 0 (min (select-selected-index sel) (1- count)))))))
|
||||||
|
|
||||||
|
(defun select-next (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (+ current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx) (mark-dirty sel) (return)))))
|
||||||
|
|
||||||
|
(defun select-prev (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (- current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx) (mark-dirty sel) (return)))))
|
||||||
|
|
||||||
|
(defun select-handle-key (sel event)
|
||||||
|
(let ((key (key-event-key event)) (ctrl (key-event-ctrl event)))
|
||||||
|
(cond
|
||||||
|
((or (eql key :down) (and ctrl (eql key :n))) (select-next sel) t)
|
||||||
|
((or (eql key :up) (and ctrl (eql key :p))) (select-prev sel) t)
|
||||||
|
((eql key :enter)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (idx (select-selected-index sel))
|
||||||
|
(item (when (< idx (length filtered)) (third (nth idx filtered)))))
|
||||||
|
(when item (let ((cb (select-on-select sel))) (when cb (funcall cb item)))) t))
|
||||||
|
((eql key :escape) nil) (t nil))))
|
||||||
|
|
||||||
|
(defun select-visible-options (sel)
|
||||||
|
(let* ((ln (select-layout-node sel)) (height (if ln (layout-node-height ln) 80))
|
||||||
|
(filtered (select-filtered-options sel)) (sel-idx (select-selected-index sel))
|
||||||
|
(half (floor (1- height) 2)) (start (max 0 (- sel-idx half)))
|
||||||
|
(end (min (length filtered) (+ start height))))
|
||||||
|
(subseq filtered start end)))
|
||||||
|
|
||||||
|
(defmethod render ((sel select) backend)
|
||||||
|
(let* ((ln (select-layout-node sel)) (x 0) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(visible (select-visible-options sel)) (sel-idx (select-selected-index sel)))
|
||||||
|
(dolist (item visible)
|
||||||
|
(let* ((display-idx (first item)) (option (third item))
|
||||||
|
(title (getf option :title)) (cat (getf option :category))
|
||||||
|
(selected (eql display-idx sel-idx))
|
||||||
|
(display (if (> (length title) (1- w))
|
||||||
|
(concatenate 'string (subseq title 0 (1- w)) "…") title)))
|
||||||
|
(cond (cat (draw-text backend x y display :text-muted nil))
|
||||||
|
(selected
|
||||||
|
(draw-rect backend x y w 1 :bg :accent)
|
||||||
|
(draw-text backend x y display :background :accent))
|
||||||
|
(t (draw-text backend x y display nil nil)))
|
||||||
|
(incf y 1)))
|
||||||
|
(values)))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
#+BEGIN_SRC lisp :tangle ../src/components/select-package.lisp
|
||||||
|
(defpackage :cl-tty.select
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:select #:make-select
|
||||||
|
#:select-options #:select-filter
|
||||||
|
#:select-selected-index #:select-on-select
|
||||||
|
#:select-layout-node
|
||||||
|
#:select-filtered-options
|
||||||
|
#:select-next #:select-prev
|
||||||
|
#:select-visible-options
|
||||||
|
#:select-handle-key
|
||||||
|
#:render
|
||||||
|
#:fuzzy-match-p))
|
||||||
|
#+END_SRC
|
||||||
2705
org/text-input.org
Normal file
2705
org/text-input.org
Normal file
File diff suppressed because it is too large
Load Diff
74
scripts/tangle.py
Normal file
74
scripts/tangle.py
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""tangle.py — Extract code blocks from .org files into .lisp files.
|
||||||
|
|
||||||
|
Reads all .org files in org/ directory, finds #+BEGIN_SRC lisp :tangle <path>
|
||||||
|
blocks, and writes/concatenates them to the specified target paths.
|
||||||
|
|
||||||
|
Blocks with the same :tangle target are concatenated in file order.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
python3 scripts/tangle.py # tangle all org/ files
|
||||||
|
python3 scripts/tangle.py org/specific.org # tangle one file
|
||||||
|
|
||||||
|
Target paths are relative to the project root (../target from org/ = project/target).
|
||||||
|
"""
|
||||||
|
import re
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from collections import OrderedDict
|
||||||
|
|
||||||
|
PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
ORG_DIR = os.path.join(PROJECT_ROOT, 'org')
|
||||||
|
|
||||||
|
def tangle_file(org_path):
|
||||||
|
"""Extract tangle blocks from one .org file."""
|
||||||
|
with open(org_path) as f:
|
||||||
|
content = f.read()
|
||||||
|
|
||||||
|
# Find all tangle blocks with their targets
|
||||||
|
pattern = r'#\+BEGIN_SRC lisp :tangle ([^\n]+)\n(.*?)\n#\+END_SRC'
|
||||||
|
blocks = re.findall(pattern, content, re.DOTALL)
|
||||||
|
|
||||||
|
if not blocks:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
# Group by target path
|
||||||
|
targets = OrderedDict()
|
||||||
|
for tangle_path, code in blocks:
|
||||||
|
# Resolve tangle path: ../src/x.lisp -> src/x.lisp
|
||||||
|
resolved = tangle_path.replace('../', '')
|
||||||
|
full_path = os.path.join(PROJECT_ROOT, resolved)
|
||||||
|
if full_path not in targets:
|
||||||
|
targets[full_path] = []
|
||||||
|
targets[full_path].append(code.strip())
|
||||||
|
|
||||||
|
for full_path, codes in targets.items():
|
||||||
|
os.makedirs(os.path.dirname(full_path), exist_ok=True)
|
||||||
|
combined = '\n\n'.join(codes) + '\n'
|
||||||
|
with open(full_path, 'w') as f:
|
||||||
|
f.write(combined)
|
||||||
|
print(f" {os.path.relpath(full_path, PROJECT_ROOT)} ({len(codes)} blocks, {sum(len(c) for c in codes)} chars)")
|
||||||
|
|
||||||
|
return len(blocks)
|
||||||
|
|
||||||
|
def main():
|
||||||
|
if len(sys.argv) > 1:
|
||||||
|
org_files = [f for f in sys.argv[1:] if f.endswith('.org')]
|
||||||
|
else:
|
||||||
|
org_files = [os.path.join(ORG_DIR, f) for f in os.listdir(ORG_DIR) if f.endswith('.org')]
|
||||||
|
|
||||||
|
total_blocks = 0
|
||||||
|
for org_file in sorted(org_files):
|
||||||
|
name = os.path.basename(org_file)
|
||||||
|
blocks = tangle_file(org_file)
|
||||||
|
if blocks:
|
||||||
|
print(f"{name}: {blocks} blocks")
|
||||||
|
total_blocks += blocks
|
||||||
|
|
||||||
|
if total_blocks > 0:
|
||||||
|
print(f"\nTotal: {total_blocks} code blocks tangled")
|
||||||
|
else:
|
||||||
|
print("No tangle blocks found.")
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
166
src/components/box-tests.lisp
Normal file
166
src/components/box-tests.lisp
Normal file
@@ -0,0 +1,166 @@
|
|||||||
|
(defpackage :cl-tty-box-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.layout :cl-tty.box)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package :cl-tty-box-test)
|
||||||
|
|
||||||
|
(def-suite box-suite :description "Box renderable tests")
|
||||||
|
(in-suite box-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'box-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
(defun make-capturing-backend ()
|
||||||
|
(let* ((s (make-string-output-stream))
|
||||||
|
(b (make-modern-backend :output-stream s)))
|
||||||
|
(values b s)))
|
||||||
|
|
||||||
|
;; ── Box Tests ─────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test box-creates-with-defaults
|
||||||
|
"A box created with no arguments has reasonable defaults"
|
||||||
|
(let ((b (make-box)))
|
||||||
|
(is (typep b 'box))
|
||||||
|
(is (typep (box-layout-node b) 'layout-node))))
|
||||||
|
|
||||||
|
(test box-renders-border
|
||||||
|
"A box with border draws border characters"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 10 :height 5)))
|
||||||
|
(compute-layout (box-layout-node bx) 10 5)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "┌" out) "top-left corner")
|
||||||
|
(is (search "┐" out) "top-right corner")
|
||||||
|
(is (search "└" out) "bottom-left corner")
|
||||||
|
(is (search "┘" out) "bottom-right corner")))))
|
||||||
|
|
||||||
|
(test box-renders-background
|
||||||
|
"A box with background color fills interior"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :bg :red :width 5 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 5 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "┌" out) "border with background")
|
||||||
|
(is (search "41m" out) "SGR background for red")))))
|
||||||
|
|
||||||
|
(test box-renders-title
|
||||||
|
"A box with title renders the title text"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :title "Hello" :width 12 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 12 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hello" out) "title text should appear")))))
|
||||||
|
|
||||||
|
(test box-without-border
|
||||||
|
"A box with border-style nil draws no border"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style nil :bg :red :width 5 :height 3)))
|
||||||
|
(compute-layout (box-layout-node bx) 5 3)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "41m" out) "background still renders")
|
||||||
|
(is-false (search "┌" out) "no top-left corner")))))
|
||||||
|
|
||||||
|
(test box-zero-size
|
||||||
|
"A box with any zero dimension renders nothing"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 0 :height 0)))
|
||||||
|
(compute-layout (box-layout-node bx) 0 0)
|
||||||
|
(render-box bx b)
|
||||||
|
(is (string= (get-output-stream-string s) "")
|
||||||
|
"zero-size box produces no output"))))
|
||||||
|
|
||||||
|
(test box-single-column
|
||||||
|
"A box with width 1 renders nothing (needs min 2 for border)"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 1 :height 5)))
|
||||||
|
(compute-layout (box-layout-node bx) 1 5)
|
||||||
|
(render-box bx b)
|
||||||
|
(is (string= (get-output-stream-string s) "")
|
||||||
|
"width=1 box renders nothing"))))
|
||||||
|
|
||||||
|
(test box-minimum-size
|
||||||
|
"A box with minimum non-zero size still renders"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 2 :height 2)))
|
||||||
|
(compute-layout (box-layout-node bx) 2 2)
|
||||||
|
(render-box bx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "┌" out) "2x2 box still has borders")))))
|
||||||
|
|
||||||
|
;; ── Text and Span Tests ───────────────────────────────────────
|
||||||
|
|
||||||
|
(test text-creates-with-defaults
|
||||||
|
"A text created with no arguments has reasonable defaults"
|
||||||
|
(let ((txt (make-text "")))
|
||||||
|
(is (typep txt 'text))
|
||||||
|
(is (typep (text-layout-node txt) 'layout-node))))
|
||||||
|
|
||||||
|
(test text-renders-content
|
||||||
|
"A text renders its content at position"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "Hello" :width 10 :height 1)))
|
||||||
|
(compute-layout (text-layout-node tx) 10 1)
|
||||||
|
(render-text tx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hello" out) "content should appear")))))
|
||||||
|
|
||||||
|
(test text-empty-string
|
||||||
|
"Empty text produces no output"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "" :width 10 :height 1)))
|
||||||
|
(compute-layout (text-layout-node tx) 10 1)
|
||||||
|
(render-text tx b)
|
||||||
|
(is (string= (get-output-stream-string s) "")
|
||||||
|
"empty string produces no output"))))
|
||||||
|
|
||||||
|
(test text-truncates-when-no-wrap
|
||||||
|
"Text with wrap-mode :none truncates at width"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "Hello World" :width 5 :height 1
|
||||||
|
:wrap-mode :none)))
|
||||||
|
(compute-layout (text-layout-node tx) 5 1)
|
||||||
|
(render-text tx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hello" out) "truncated to first 5 chars")))))
|
||||||
|
|
||||||
|
(test text-word-wraps
|
||||||
|
"Text with wrap-mode :word wraps at word boundaries"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "Hello brave new world" :width 6 :height 3)))
|
||||||
|
(compute-layout (text-layout-node tx) 6 3)
|
||||||
|
(render-text tx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hello" out) "first line")
|
||||||
|
(is (search "brave" out) "second line")
|
||||||
|
(is (search "new" out) "third line")))))
|
||||||
|
|
||||||
|
(test text-word-wrap-single-word
|
||||||
|
"A word longer than width is hard-broken at max-width"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "Hello" :width 3 :height 3)))
|
||||||
|
(compute-layout (text-layout-node tx) 3 3)
|
||||||
|
(render-text tx b)
|
||||||
|
(let ((out (get-output-stream-string s)))
|
||||||
|
(is (search "Hel" out) "first chunk is Hel")
|
||||||
|
(is (search "lo" out) "second chunk is lo")))))
|
||||||
|
|
||||||
|
(test span-creates-with-attributes
|
||||||
|
"A span has text and optional style attributes"
|
||||||
|
(let ((s (span "bold text" :bold t)))
|
||||||
|
(is (string= (span-text s) "bold text"))
|
||||||
|
(is-true (span-bold s))
|
||||||
|
(is-false (span-italic s))))
|
||||||
|
|
||||||
|
(test make-text-with-spans
|
||||||
|
"Text with spans stores span objects"
|
||||||
|
(let* ((sp (list (span "Hello" :bold t)
|
||||||
|
(span "World" :italic t)))
|
||||||
|
(tx (make-text "" :spans sp)))
|
||||||
|
(is (= (length (text-spans tx)) 2))
|
||||||
|
(is (string= (span-text (elt (text-spans tx) 0)) "Hello"))
|
||||||
|
(is-true (span-bold (elt (text-spans tx) 0)))))
|
||||||
54
src/components/box.lisp
Normal file
54
src/components/box.lisp
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
(defclass box (dirty-mixin)
|
||||||
|
((layout-node :initform (make-layout-node) :accessor box-layout-node
|
||||||
|
:initarg :layout-node)
|
||||||
|
(border-style :initform :single :initarg :border-style
|
||||||
|
:accessor box-border-style)
|
||||||
|
(title :initform nil :initarg :title :accessor box-title)
|
||||||
|
(title-align :initform :left :initarg :title-align
|
||||||
|
:accessor box-title-align)
|
||||||
|
(fg :initform nil :initarg :fg :accessor box-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor box-bg)))
|
||||||
|
|
||||||
|
(defun make-box (&key (border-style :single) title
|
||||||
|
(title-align :left) fg bg
|
||||||
|
width height)
|
||||||
|
(make-instance 'box
|
||||||
|
:border-style border-style
|
||||||
|
:title title
|
||||||
|
:title-align title-align
|
||||||
|
:fg fg
|
||||||
|
:bg bg
|
||||||
|
:layout-node (make-layout-node
|
||||||
|
:width width
|
||||||
|
:height height
|
||||||
|
:direction :column)))
|
||||||
|
|
||||||
|
(defun render-box (box backend)
|
||||||
|
"Render BOX at its computed layout position using BACKEND."
|
||||||
|
(let ((ln (box-layout-node box))
|
||||||
|
(bs (box-border-style box))
|
||||||
|
(title (box-title box))
|
||||||
|
(fg (box-fg box))
|
||||||
|
(bg (box-bg box)))
|
||||||
|
(let ((x (layout-node-x ln))
|
||||||
|
(y (layout-node-y ln))
|
||||||
|
(w (layout-node-width ln))
|
||||||
|
(h (layout-node-height ln)))
|
||||||
|
(when (or (zerop w) (zerop h) (< w 2) (< h 2))
|
||||||
|
(return-from render-box (values)))
|
||||||
|
(when bg
|
||||||
|
(draw-rect backend x y w h :bg bg))
|
||||||
|
(when bs
|
||||||
|
(draw-border backend x y w h :style bs :fg fg :bg bg))
|
||||||
|
(when title
|
||||||
|
(let* ((content-w (- w 4))
|
||||||
|
(tx (+ x 2))
|
||||||
|
(ty (+ y (if bs 1 0)))
|
||||||
|
(ta (box-title-align box))
|
||||||
|
(display (subseq title 0 (min (length title) content-w))))
|
||||||
|
(case ta
|
||||||
|
(:center (draw-text backend (+ x (ceiling (- w (length display)) 2)) ty display fg bg))
|
||||||
|
(:right (draw-text backend (+ x (- w (length display) 2)) ty display fg bg))
|
||||||
|
(t (draw-text backend tx ty display fg bg))))))))
|
||||||
13
src/components/container-package.lisp
Normal file
13
src/components/container-package.lisp
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
(defpackage :cl-tty.container
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:scroll-box #:make-scroll-box
|
||||||
|
#:scroll-box-scroll-y #:scroll-box-scroll-x
|
||||||
|
#:scroll-box-children #:scroll-by
|
||||||
|
#:sticky-scroll-p
|
||||||
|
#:clamp-scroll
|
||||||
|
#:tab-bar #:make-tab-bar
|
||||||
|
#:tab-bar-active #:tab-bar-tabs
|
||||||
|
#:tab-bar-add #:tab-bar-next #:tab-bar-prev
|
||||||
|
#:tab-bar-select #:tab-bar-handle-key
|
||||||
|
#:render))
|
||||||
32
src/components/dialog-package.lisp
Normal file
32
src/components/dialog-package.lisp
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
;;; dialog-package.lisp — Package definition for cl-tty.dialog
|
||||||
|
|
||||||
|
(defpackage :cl-tty.dialog
|
||||||
|
(:use :cl :cl-tty.input :cl-tty.select)
|
||||||
|
(:export
|
||||||
|
#:dialog
|
||||||
|
#:dialog-title
|
||||||
|
#:dialog-content
|
||||||
|
#:dialog-on-dismiss
|
||||||
|
#:dialog-size
|
||||||
|
#:dialog-size-pixels
|
||||||
|
#:render-dialog
|
||||||
|
#:push-dialog
|
||||||
|
#:pop-dialog
|
||||||
|
#:*dialog-stack*
|
||||||
|
#:alert-dialog
|
||||||
|
#:confirm-dialog
|
||||||
|
#:select-dialog
|
||||||
|
#:prompt-dialog
|
||||||
|
#:toast
|
||||||
|
#:toast-message
|
||||||
|
#:toast-variant
|
||||||
|
#:render-toast
|
||||||
|
#:dismiss-toast
|
||||||
|
#:*toasts*
|
||||||
|
;; Tests
|
||||||
|
#:dialog-create
|
||||||
|
#:dialog-size-small
|
||||||
|
#:dialog-size-medium
|
||||||
|
#:dialog-push-pop
|
||||||
|
#:toast-create
|
||||||
|
#:toast-dismiss))
|
||||||
123
src/components/dialog.lisp
Normal file
123
src/components/dialog.lisp
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
;;; dialog.lisp — Dialog System + Toast for cl-tty
|
||||||
|
|
||||||
|
(in-package :cl-tty.dialog)
|
||||||
|
|
||||||
|
;; ─── Special variables ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defvar *dialog-stack* nil
|
||||||
|
"Stack of active dialogs. (list) of dialog instances.")
|
||||||
|
|
||||||
|
(defvar *toasts* nil
|
||||||
|
"List of active toast notifications.")
|
||||||
|
|
||||||
|
;; ─── Dialog class ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass dialog ()
|
||||||
|
((title :initarg :title :accessor dialog-title)
|
||||||
|
(size :initarg :size :initform :medium :accessor dialog-size)
|
||||||
|
(content :initarg :content :initform nil :accessor dialog-content)
|
||||||
|
(on-dismiss :initarg :on-dismiss :initform nil :accessor dialog-on-dismiss)))
|
||||||
|
|
||||||
|
(defun dialog-size-pixels (size)
|
||||||
|
(case size
|
||||||
|
(:small (values 40 8))
|
||||||
|
(:medium (values 60 16))
|
||||||
|
(:large (values 88 24))
|
||||||
|
(t (values 60 16))))
|
||||||
|
|
||||||
|
(defun render-dialog (dialog screen w h)
|
||||||
|
(multiple-value-bind (dw dh) (dialog-size-pixels (dialog-size dialog))
|
||||||
|
(let ((x (floor (- w dw) 2))
|
||||||
|
(y (floor (- h dh) 2)))
|
||||||
|
(dotimes (row h)
|
||||||
|
(dotimes (col w)
|
||||||
|
(backend-write screen col row " " :bg :dim)))
|
||||||
|
(draw-border screen x y dw dh :single :title (dialog-title dialog))
|
||||||
|
(when (dialog-content dialog)
|
||||||
|
(render-component (dialog-content dialog) screen (1+ x) (1+ y) (- dw 2) (- dh 2))))))
|
||||||
|
|
||||||
|
(defun push-dialog (dialog)
|
||||||
|
(push dialog *dialog-stack*)
|
||||||
|
dialog)
|
||||||
|
|
||||||
|
(defun pop-dialog ()
|
||||||
|
(when *dialog-stack*
|
||||||
|
(let ((dialog (pop *dialog-stack*)))
|
||||||
|
(when (dialog-on-dismiss dialog)
|
||||||
|
(funcall (dialog-on-dismiss dialog)))
|
||||||
|
dialog)))
|
||||||
|
|
||||||
|
;; ─── Dialog sub-classes ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun alert-dialog (title message)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "OK" :value :ok))
|
||||||
|
:on-select (lambda (opt) (declare (ignore opt)) (pop-dialog)))
|
||||||
|
:on-dismiss (lambda () (pop-dialog))))
|
||||||
|
|
||||||
|
(defun confirm-dialog (title message &key on-yes on-no)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options (list (list :title "Yes" :value :yes)
|
||||||
|
(list :title "No" :value :no))
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(if (eql opt :yes)
|
||||||
|
(when on-yes (funcall on-yes))
|
||||||
|
(when on-no (funcall on-no)))))))
|
||||||
|
|
||||||
|
(defun select-dialog (title options &key on-select)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :medium
|
||||||
|
:content (make-instance 'select
|
||||||
|
:options options
|
||||||
|
:on-select (lambda (opt)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-select (funcall on-select opt))))))
|
||||||
|
|
||||||
|
(defun prompt-dialog (title &key on-submit)
|
||||||
|
(make-instance 'dialog
|
||||||
|
:title title
|
||||||
|
:size :small
|
||||||
|
:content (make-instance 'text-input
|
||||||
|
:on-submit (lambda (value)
|
||||||
|
(pop-dialog)
|
||||||
|
(when on-submit (funcall on-submit value))))))
|
||||||
|
|
||||||
|
;; ─── Toast system ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass toast ()
|
||||||
|
((message :initarg :message :accessor toast-message)
|
||||||
|
(variant :initarg :variant :initform :info :accessor toast-variant)))
|
||||||
|
|
||||||
|
(defun render-toast (toast screen w)
|
||||||
|
(let* ((msg (toast-message toast))
|
||||||
|
(variant (toast-variant toast))
|
||||||
|
(color (case variant
|
||||||
|
(:info :blue) (:success :green)
|
||||||
|
(:warning :yellow) (:error :red)))
|
||||||
|
(max-w (min 60 (1- w)))
|
||||||
|
(x (- w max-w 1))
|
||||||
|
(text (if (> (length msg) (- max-w 2))
|
||||||
|
(concatenate 'string (subseq msg 0 (- max-w 5)) "...")
|
||||||
|
msg)))
|
||||||
|
(draw-rect screen x 0 max-w 1 :bg color)
|
||||||
|
(backend-write screen (1+ x) 0 text :fg :white :bold t)))
|
||||||
|
|
||||||
|
(defun toast (message &key (variant :info) (duration 5000))
|
||||||
|
(let ((toast (make-instance 'toast :message message :variant variant)))
|
||||||
|
(push toast *toasts*)
|
||||||
|
(when (plusp duration)
|
||||||
|
(schedule-event (+ (get-internal-real-time)
|
||||||
|
(* duration 1000))
|
||||||
|
(lambda () (dismiss-toast toast))))
|
||||||
|
toast))
|
||||||
|
|
||||||
|
(defun dismiss-toast (toast)
|
||||||
|
(setf *toasts* (remove toast *toasts*)))
|
||||||
21
src/components/dirty-tests.lisp
Normal file
21
src/components/dirty-tests.lisp
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
;; Dirty tracking tests are in box-tests.lisp (same test suite)
|
||||||
|
(in-package :cl-tty-box-test)
|
||||||
|
(in-suite box-suite)
|
||||||
|
|
||||||
|
(test dirty-mixin-default-is-dirty
|
||||||
|
"A dirty-mixin starts as dirty"
|
||||||
|
(let ((c (make-instance 'dirty-mixin)))
|
||||||
|
(is-true (dirty-p c) "new component should be dirty")))
|
||||||
|
|
||||||
|
(test mark-clean-clears-dirty
|
||||||
|
"mark-clean sets dirty to nil"
|
||||||
|
(let ((c (make-instance 'dirty-mixin)))
|
||||||
|
(mark-clean c)
|
||||||
|
(is-false (dirty-p c) "after mark-clean, should not be dirty")))
|
||||||
|
|
||||||
|
(test mark-dirty-sets-dirty
|
||||||
|
"mark-dirty sets dirty to t"
|
||||||
|
(let ((c (make-instance 'dirty-mixin)))
|
||||||
|
(mark-clean c)
|
||||||
|
(mark-dirty c)
|
||||||
|
(is-true (dirty-p c) "after mark-dirty, should be dirty again")))
|
||||||
14
src/components/dirty.lisp
Normal file
14
src/components/dirty.lisp
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
;; ── Dirty Tracking ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass dirty-mixin ()
|
||||||
|
((dirty :initform t :accessor dirty-p)))
|
||||||
|
|
||||||
|
(defgeneric mark-clean (component)
|
||||||
|
(:method ((c dirty-mixin))
|
||||||
|
(setf (dirty-p c) nil)))
|
||||||
|
|
||||||
|
(defgeneric mark-dirty (component)
|
||||||
|
(:method ((c dirty-mixin))
|
||||||
|
(setf (dirty-p c) t)))
|
||||||
34
src/components/input-package.lisp
Normal file
34
src/components/input-package.lisp
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
(defpackage :cl-tty.input
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout)
|
||||||
|
(:export
|
||||||
|
;; Key events
|
||||||
|
#:key-event #:make-key-event
|
||||||
|
#:key-event-p #:key-event-key #:key-event-ctrl
|
||||||
|
#:key-event-alt #:key-event-shift #:key-event-code
|
||||||
|
#:key-event-raw #:key-event-text
|
||||||
|
;; Mouse events
|
||||||
|
#:mouse-event #:make-mouse-event
|
||||||
|
#:mouse-event-p #:mouse-event-type #:mouse-event-button
|
||||||
|
#:mouse-event-x #:mouse-event-y
|
||||||
|
;; Terminal raw mode
|
||||||
|
#:save-terminal-state #:set-raw-mode #:restore-terminal-state
|
||||||
|
#:with-raw-terminal
|
||||||
|
;; Event reading
|
||||||
|
#:read-event
|
||||||
|
;; TextInput
|
||||||
|
#:text-input #:make-text-input
|
||||||
|
#:text-input-value #:text-input-cursor
|
||||||
|
#:text-input-placeholder #:text-input-max-length
|
||||||
|
#:text-input-on-submit #:text-input-layout-node
|
||||||
|
#:handle-text-input #:render-text-input
|
||||||
|
;; Textarea
|
||||||
|
#:textarea #:make-textarea
|
||||||
|
#:textarea-value #:textarea-cursor-row #:textarea-cursor-col
|
||||||
|
#:textarea-on-submit #:textarea-undo-stack #:textarea-redo-stack
|
||||||
|
#:textarea-layout-node
|
||||||
|
#:handle-textarea-input #:render-textarea
|
||||||
|
;; Keybindings
|
||||||
|
#:keymap #:make-keymap #:keymap-name #:keymap-bindings #:keymap-parent
|
||||||
|
#:*keymaps* #:*chord-timeout*
|
||||||
|
#:defkeymap #:dispatch-key-event #:key-match-p
|
||||||
|
#:component-keymap))
|
||||||
269
src/components/input-tests.lisp
Normal file
269
src/components/input-tests.lisp
Normal file
@@ -0,0 +1,269 @@
|
|||||||
|
(defpackage :cl-tty-input-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package :cl-tty-input-test)
|
||||||
|
|
||||||
|
(def-suite input-suite :description "Text input and keybinding tests")
|
||||||
|
(in-suite input-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'input-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
;; ── Key Event Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test key-event-construction
|
||||||
|
"A key-event can be created and queried."
|
||||||
|
(let ((e (make-key-event :key :a :ctrl t :alt nil)))
|
||||||
|
(is (eql (key-event-key e) :a))
|
||||||
|
(is-true (key-event-ctrl e))
|
||||||
|
(is-false (key-event-alt e))))
|
||||||
|
|
||||||
|
(test key-event-defaults
|
||||||
|
"Fields default to NIL/nil."
|
||||||
|
(let ((e (make-key-event :key :space)))
|
||||||
|
(is (eql (key-event-key e) :space))
|
||||||
|
(is-false (key-event-ctrl e))
|
||||||
|
(is-false (key-event-alt e))
|
||||||
|
(is-false (key-event-shift e))))
|
||||||
|
|
||||||
|
(test mouse-event-construction
|
||||||
|
"A mouse-event can be created and queried."
|
||||||
|
(let ((e (make-mouse-event :type :press :button :left :x 10 :y 5)))
|
||||||
|
(is (eql (mouse-event-type e) :press))
|
||||||
|
(is (eql (mouse-event-button e) :left))
|
||||||
|
(is (= (mouse-event-x e) 10))
|
||||||
|
(is (= (mouse-event-y e) 5))))
|
||||||
|
|
||||||
|
;; ── TextInput Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test text-input-empty
|
||||||
|
"A newly created text-input has empty value and cursor at 0."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(is (string= (text-input-value in) ""))
|
||||||
|
(is (= (text-input-cursor in) 0))))
|
||||||
|
|
||||||
|
(test text-input-insert-char
|
||||||
|
"Inserting a character appends and moves cursor."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-insert-multiple
|
||||||
|
"Inserting multiple characters works left to right."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(handle-text-input in (make-key-event :key :h :code (char-code #\h)))
|
||||||
|
(handle-text-input in (make-key-event :key :e :code (char-code #\e)))
|
||||||
|
(handle-text-input in (make-key-event :key :l :code (char-code #\l)))
|
||||||
|
(handle-text-input in (make-key-event :key :l :code (char-code #\l)))
|
||||||
|
(handle-text-input in (make-key-event :key :o :code (char-code #\o)))
|
||||||
|
(is (string= (text-input-value in) "hello"))
|
||||||
|
(is (= (text-input-cursor in) 5))))
|
||||||
|
|
||||||
|
(test text-input-backspace
|
||||||
|
"Backspace removes the character before the cursor."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :backspace))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-backspace-at-start
|
||||||
|
"Backspace at position 0 does nothing."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 0)))
|
||||||
|
(handle-text-input in (make-key-event :key :backspace))
|
||||||
|
(is (string= (text-input-value in) "ab"))
|
||||||
|
(is (= (text-input-cursor in) 0))))
|
||||||
|
|
||||||
|
(test text-input-delete
|
||||||
|
"Delete removes the character at the cursor."
|
||||||
|
(let ((in (make-text-input :value "abc" :cursor 1)))
|
||||||
|
(handle-text-input in (make-key-event :key :delete))
|
||||||
|
(is (string= (text-input-value in) "ac"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-cursor-left-right
|
||||||
|
"Cursor moves left and right."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :left))
|
||||||
|
(is (= (text-input-cursor in) 1))
|
||||||
|
(handle-text-input in (make-key-event :key :right))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-cursor-bounds
|
||||||
|
"Cursor cannot move past start or end."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 0)))
|
||||||
|
(handle-text-input in (make-key-event :key :left))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(setf (text-input-cursor in) 2)
|
||||||
|
(handle-text-input in (make-key-event :key :right))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-home-end
|
||||||
|
"Home moves to start, End moves to end."
|
||||||
|
(let ((in (make-text-input :value "hello" :cursor 3)))
|
||||||
|
(handle-text-input in (make-key-event :key :home))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(handle-text-input in (make-key-event :key :end))
|
||||||
|
(is (= (text-input-cursor in) 5))))
|
||||||
|
|
||||||
|
(test text-input-max-length
|
||||||
|
"Max-length prevents inserting beyond the limit."
|
||||||
|
(let ((in (make-text-input :max-length 3)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-text-input in (make-key-event :key :b :code (char-code #\b)))
|
||||||
|
(handle-text-input in (make-key-event :key :c :code (char-code #\c)))
|
||||||
|
(handle-text-input in (make-key-event :key :d :code (char-code #\d)))
|
||||||
|
(is (string= (text-input-value in) "abc"))))
|
||||||
|
|
||||||
|
(test text-input-placeholder
|
||||||
|
"Placeholder is stored but does not affect value."
|
||||||
|
(let ((in (make-text-input :placeholder "Type here...")))
|
||||||
|
(is (string= (text-input-placeholder in) "Type here..."))
|
||||||
|
(is (string= (text-input-value in) ""))))
|
||||||
|
|
||||||
|
(test text-input-on-submit
|
||||||
|
"On-submit callback fires on Enter."
|
||||||
|
(let ((result (list nil)))
|
||||||
|
(let ((in (make-text-input :value "hello"
|
||||||
|
:on-submit (lambda (v) (setf (car result) v)))))
|
||||||
|
(handle-text-input in (make-key-event :key :enter))
|
||||||
|
(is (string= (car result) "hello")))))
|
||||||
|
|
||||||
|
(test text-input-ctrl-a-e
|
||||||
|
"Ctrl+A moves to home, Ctrl+E moves to end."
|
||||||
|
(let ((in (make-text-input :value "abc" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :ctrl t))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(handle-text-input in (make-key-event :key :e :ctrl t))
|
||||||
|
(is (= (text-input-cursor in) 3))))
|
||||||
|
|
||||||
|
(test text-input-insert-in-middle
|
||||||
|
"Inserting in the middle of text shifts rest right."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 1)))
|
||||||
|
(handle-text-input in (make-key-event :key :x :code (char-code #\x)))
|
||||||
|
(is (string= (text-input-value in) "axb"))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-dirty-on-insert
|
||||||
|
"Inserting marks the widget dirty."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(mark-clean in)
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(is-true (dirty-p in))))
|
||||||
|
|
||||||
|
;; ── Textarea Tests ──────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test textarea-empty
|
||||||
|
"New textarea has empty value and cursor at (0,0)."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(is (string= (textarea-value a) ""))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(is (= (textarea-cursor-col a) 0))))
|
||||||
|
|
||||||
|
(test textarea-newline
|
||||||
|
"Enter inserts a newline."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :enter))
|
||||||
|
(handle-textarea-input a (make-key-event :key :b :code (char-code #\b)))
|
||||||
|
(is (string= (textarea-value a) "a
|
||||||
|
b"))))
|
||||||
|
|
||||||
|
(test textarea-cursor-up-down
|
||||||
|
"Cursor moves between lines maintaining column position."
|
||||||
|
(let ((a (make-textarea :value "abc
|
||||||
|
de
|
||||||
|
fghi")))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(setf (textarea-cursor-col a) 1)
|
||||||
|
(handle-textarea-input a (make-key-event :key :up))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(is (= (textarea-cursor-col a) 1))
|
||||||
|
(handle-textarea-input a (make-key-event :key :down))
|
||||||
|
(is (= (textarea-cursor-row a) 1))
|
||||||
|
(is (= (textarea-cursor-col a) 1))))
|
||||||
|
|
||||||
|
(test textarea-cursor-up-down-bounds
|
||||||
|
"Cursor cannot move past first or last line."
|
||||||
|
(let ((a (make-textarea :value "a
|
||||||
|
b")))
|
||||||
|
(handle-textarea-input a (make-key-event :key :up))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(handle-textarea-input a (make-key-event :key :down))
|
||||||
|
(is (= (textarea-cursor-row a) 1))))
|
||||||
|
|
||||||
|
(test textarea-backspace-joins-lines
|
||||||
|
"Backspace at start of a line joins with previous."
|
||||||
|
(let ((a (make-textarea :value "hello
|
||||||
|
world")))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(setf (textarea-cursor-col a) 0)
|
||||||
|
(handle-textarea-input a (make-key-event :key :backspace))
|
||||||
|
(is (string= (textarea-value a) "helloworld"))))
|
||||||
|
|
||||||
|
(test textarea-undo
|
||||||
|
"Ctrl+Z undoes the last edit."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :z :ctrl t))
|
||||||
|
(is (string= (textarea-value a) ""))))
|
||||||
|
|
||||||
|
(test textarea-undo-redo
|
||||||
|
"Ctrl+Y redoes an undone edit."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :z :ctrl t))
|
||||||
|
(handle-textarea-input a (make-key-event :key :y :ctrl t))
|
||||||
|
(is (string= (textarea-value a) "a"))))
|
||||||
|
|
||||||
|
;; ── Keybinding Tests ────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test keymap-simple
|
||||||
|
"A keymap dispatches to its handler on matching event."
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+p . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf called t))))))
|
||||||
|
(is-true (dispatch-key-event (make-key-event :key :p :ctrl t)))
|
||||||
|
(is-true called)))
|
||||||
|
|
||||||
|
(test keymap-no-match
|
||||||
|
"Non-matching event returns nil."
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+p . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf called t))))))
|
||||||
|
(is-false (dispatch-key-event (make-key-event :key :a)))
|
||||||
|
(is-false called)))
|
||||||
|
|
||||||
|
(test keymap-fallback
|
||||||
|
"Event not in local falls through to global."
|
||||||
|
(let ((global-called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+q . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf global-called t))))))
|
||||||
|
(dispatch-key-event (make-key-event :key :q :ctrl t))
|
||||||
|
(is-true global-called)))
|
||||||
|
|
||||||
|
(test key-spec-simple
|
||||||
|
"Keyword key-spec matches key+ctrl."
|
||||||
|
(is-true (key-match-p :ctrl+p (make-key-event :key :p :ctrl t)))
|
||||||
|
(is-false (key-match-p :ctrl+p (make-key-event :key :a :ctrl t)))
|
||||||
|
(is-false (key-match-p :ctrl+p (make-key-event :key :p))))
|
||||||
|
|
||||||
|
(test defkeymap-macro
|
||||||
|
"defkeymap macro registers a keymap."
|
||||||
|
(let ((called nil))
|
||||||
|
(eval `(defkeymap :global
|
||||||
|
(:ctrl+q ,(lambda (e) (declare (ignore e)) (setf called t)))))
|
||||||
|
(dispatch-key-event (make-key-event :key :q :ctrl t))
|
||||||
|
(is-true called)))
|
||||||
307
src/components/input.lisp
Normal file
307
src/components/input.lisp
Normal file
@@ -0,0 +1,307 @@
|
|||||||
|
(in-package #:cl-tty.input)
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Utility: split-string (avoids external dependency)
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun %split-string (string separator)
|
||||||
|
"Split STRING at each occurrence of SEPARATOR. Returns list of strings."
|
||||||
|
(loop with start = 0
|
||||||
|
for pos = (position separator string :start start)
|
||||||
|
collect (subseq string start pos)
|
||||||
|
while pos
|
||||||
|
do (setf start (1+ pos))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Global variables for rendering pipeline (set by application)
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defvar *current-backend* nil
|
||||||
|
"The active backend used for rendering.")
|
||||||
|
(defvar *current-theme* nil
|
||||||
|
"The active theme used for semantic color resolution.")
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key event struct
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defstruct key-event
|
||||||
|
(key nil :type (or keyword null))
|
||||||
|
(ctrl nil :type boolean)
|
||||||
|
(alt nil :type boolean)
|
||||||
|
(shift nil :type boolean)
|
||||||
|
(code nil :type (or fixnum null))
|
||||||
|
(raw nil :type (or string null))
|
||||||
|
(text nil :type (or string null)))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Mouse event struct
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defstruct mouse-event
|
||||||
|
(type nil :type (or keyword null))
|
||||||
|
(button nil :type (or keyword nil))
|
||||||
|
(x 0 :type fixnum)
|
||||||
|
(y 0 :type fixnum)
|
||||||
|
(raw nil :type (or string null)))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Terminal raw mode
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun save-terminal-state ()
|
||||||
|
(sb-posix:tcgetattr 0))
|
||||||
|
|
||||||
|
(defun make-raw-termios (termios)
|
||||||
|
(flet ((clear-flag (flags mask)
|
||||||
|
(logand flags (lognot mask))))
|
||||||
|
(setf (sb-posix:termios-iflag termios)
|
||||||
|
(clear-flag (sb-posix:termios-iflag termios)
|
||||||
|
(logior sb-posix:brkint sb-posix:ignpar
|
||||||
|
sb-posix:istrip sb-posix:inlcr
|
||||||
|
sb-posix:igncr sb-posix:icrnl
|
||||||
|
sb-posix:ixon)))
|
||||||
|
(setf (sb-posix:termios-oflag termios)
|
||||||
|
(clear-flag (sb-posix:termios-oflag termios)
|
||||||
|
sb-posix:opost))
|
||||||
|
(setf (sb-posix:termios-lflag termios)
|
||||||
|
(clear-flag (sb-posix:termios-lflag termios)
|
||||||
|
(logior sb-posix:icanon sb-posix:echo
|
||||||
|
sb-posix:isig sb-posix:iexten)))
|
||||||
|
(setf (sb-posix:termios-cc termios sb-posix:vmin) 1)
|
||||||
|
(setf (sb-posix:termios-cc termios sb-posix:vtime) 0)
|
||||||
|
termios))
|
||||||
|
|
||||||
|
(defun set-raw-mode ()
|
||||||
|
(let ((raw (make-raw-termios (save-terminal-state))))
|
||||||
|
(sb-posix:tcsetattr 0 sb-posix:tcsanow raw)
|
||||||
|
raw))
|
||||||
|
|
||||||
|
(defun restore-terminal-state (termios)
|
||||||
|
(sb-posix:tcsetattr 0 sb-posix:tcsanow termios))
|
||||||
|
|
||||||
|
(defmacro with-raw-terminal (&body body)
|
||||||
|
(let ((saved (gensym "SAVED")))
|
||||||
|
`(let ((,saved (save-terminal-state)))
|
||||||
|
(set-raw-mode)
|
||||||
|
(unwind-protect
|
||||||
|
(progn ,@body)
|
||||||
|
(restore-terminal-state ,saved)))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Low-level byte reading
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun read-raw-byte (&key timeout)
|
||||||
|
(if timeout
|
||||||
|
(let ((deadline (+ (get-universal-time) timeout)))
|
||||||
|
(loop while (< (get-universal-time) deadline)
|
||||||
|
do (handler-case
|
||||||
|
(let ((buf (make-array 1 :element-type '(unsigned-byte 8))))
|
||||||
|
(let ((n (sb-posix:read 0 buf 1)))
|
||||||
|
(when (plusp n)
|
||||||
|
(return-from read-raw-byte (aref buf 0)))))
|
||||||
|
(sb-posix:syscall-error ()
|
||||||
|
(return-from read-raw-byte nil)))
|
||||||
|
(sleep 0.01))
|
||||||
|
nil)
|
||||||
|
(let ((buf (make-array 1 :element-type '(unsigned-byte 8))))
|
||||||
|
(multiple-value-bind (n err)
|
||||||
|
(ignore-errors (sb-posix:read 0 buf 1))
|
||||||
|
(if (and (integerp n) (plusp n))
|
||||||
|
(aref buf 0)
|
||||||
|
(progn
|
||||||
|
(when err (format *error-output* "read error: ~A~%" err))
|
||||||
|
nil))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; CSI parameter parser
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun parse-csi-params ()
|
||||||
|
(let ((params '())
|
||||||
|
(raw (make-array 0 :element-type '(unsigned-byte 8)
|
||||||
|
:fill-pointer 0 :adjustable t))
|
||||||
|
(current 0))
|
||||||
|
(loop
|
||||||
|
(let ((b (read-raw-byte)))
|
||||||
|
(unless b (return (values nil nil nil)))
|
||||||
|
(vector-push-extend b raw)
|
||||||
|
(cond
|
||||||
|
((and (>= b #x30) (<= b #x3f))
|
||||||
|
(if (char= (code-char b) #\;)
|
||||||
|
(progn (push current params) (setf current 0))
|
||||||
|
(setf current (+ (* current 10) (- b #x30)))))
|
||||||
|
((and (>= b #x20) (<= b #x2f))
|
||||||
|
nil)
|
||||||
|
((and (>= b #x40) (<= b #x7e))
|
||||||
|
(push current params)
|
||||||
|
(return (values (nreverse params) b
|
||||||
|
(map 'string #'code-char raw))))
|
||||||
|
(t
|
||||||
|
(return (values nil nil nil))))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key event tables
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defparameter *csi-key-table*
|
||||||
|
'((#\A . :up) (#\B . :down) (#\C . :right) (#\D . :left)
|
||||||
|
(#\F . :end) (#\H . :home)
|
||||||
|
(#\P . :f1) (#\Q . :f2) (#\R . :f3) (#\S . :f4)
|
||||||
|
(#\Z . :tab)))
|
||||||
|
|
||||||
|
(defparameter *csi-tilde-table*
|
||||||
|
'((1 . :home) (2 . :insert) (3 . :delete)
|
||||||
|
(4 . :end) (5 . :page-up) (6 . :page-down)
|
||||||
|
(7 . :home) (8 . :end)
|
||||||
|
(11 . :f1) (12 . :f2) (13 . :f3) (14 . :f4)
|
||||||
|
(15 . :f5) (17 . :f6) (18 . :f7) (19 . :f8)
|
||||||
|
(20 . :f9) (21 . :f10) (23 . :f11) (24 . :f12)))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; SGR mouse parser
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun parse-sgr-mouse (raw)
|
||||||
|
(let* ((start (position #\< raw))
|
||||||
|
(end (position #\m raw :from-end t))
|
||||||
|
(end2 (position #\M raw :from-end t))
|
||||||
|
(final (if end end end2))
|
||||||
|
(releasep (char= (char raw (1- (length raw))) #\m)))
|
||||||
|
(when (and start final (> final start))
|
||||||
|
(let* ((nums (mapcar #'parse-integer
|
||||||
|
(%split-string (subseq raw (1+ start) final) #\;)))
|
||||||
|
(code (first nums))
|
||||||
|
(x (or (second nums) 0))
|
||||||
|
(y (or (third nums) 0))
|
||||||
|
(button (logand code #x03))
|
||||||
|
(mod (logand code #x1c))
|
||||||
|
(motion (logand code #x20))
|
||||||
|
(wheel (logand code #x40)))
|
||||||
|
(declare (ignore mod))
|
||||||
|
(make-mouse-event
|
||||||
|
:type (cond (releasep :release)
|
||||||
|
(motion :drag)
|
||||||
|
(t :press))
|
||||||
|
:button (cond (wheel (if (zerop (logand code #x01))
|
||||||
|
:wheel-up :wheel-down))
|
||||||
|
((= button 0) :left)
|
||||||
|
((= button 1) :middle)
|
||||||
|
((= button 2) :right)
|
||||||
|
(t :none))
|
||||||
|
:x x :y y :raw raw)))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Escape sequence reader
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun %read-escape-sequence ()
|
||||||
|
(let ((b (read-raw-byte)))
|
||||||
|
(unless b
|
||||||
|
(return-from %read-escape-sequence
|
||||||
|
(make-key-event :key :escape :raw (string #\Esc))))
|
||||||
|
(case b
|
||||||
|
;; SS3: ESC O X
|
||||||
|
(#x4f
|
||||||
|
(let ((b2 (read-raw-byte)))
|
||||||
|
(if b2
|
||||||
|
(let ((key (cdr (assoc (code-char b2)
|
||||||
|
'((#\P . :f1) (#\Q . :f2)
|
||||||
|
(#\R . :f3) (#\S . :f4))))))
|
||||||
|
(make-key-event :key (or key :unknown)
|
||||||
|
:raw (format nil "~C~C~C" #\Esc #\O (code-char b2))))
|
||||||
|
(make-key-event :key :escape :raw (string #\Esc)))))
|
||||||
|
;; CSI: ESC [ ...
|
||||||
|
(#x5b
|
||||||
|
(multiple-value-bind (params final-byte) (parse-csi-params)
|
||||||
|
(if (null final-byte)
|
||||||
|
(make-key-event :key :escape :raw (string #\Esc))
|
||||||
|
(if (and (char= (code-char final-byte) #\M)
|
||||||
|
(>= (length params) 3))
|
||||||
|
(let* ((p0 (first params)))
|
||||||
|
(if (zerop (logand p0 #x40))
|
||||||
|
(let* ((x (second params))
|
||||||
|
(y (third params))
|
||||||
|
(button (logand p0 #x03))
|
||||||
|
(motion (logand p0 #x20))
|
||||||
|
(wheel (logand p0 #x40)))
|
||||||
|
(make-mouse-event
|
||||||
|
:type (if motion :drag :press)
|
||||||
|
:button (cond (wheel (if (zerop (logand p0 #x01))
|
||||||
|
:wheel-up :wheel-down))
|
||||||
|
((= button 0) :left)
|
||||||
|
((= button 1) :middle)
|
||||||
|
((= button 2) :right)
|
||||||
|
(t :none))
|
||||||
|
:x x :y y :raw (format nil "~C[<~d;~d;~d~C" #\Esc p0 x y (code-char final-byte))))
|
||||||
|
(let* ((tilde-p (char= (code-char final-byte) #\~))
|
||||||
|
(param (or p0 0))
|
||||||
|
(key (if tilde-p
|
||||||
|
(cdr (assoc param *csi-tilde-table*))
|
||||||
|
(cdr (assoc (code-char final-byte) *csi-key-table*))))
|
||||||
|
(modifier (when (> (length params) 1) (second params))))
|
||||||
|
(let ((ctrl nil) (alt nil) (shift nil))
|
||||||
|
(when modifier
|
||||||
|
(setf shift (logtest modifier 1)
|
||||||
|
alt (logtest modifier 2)
|
||||||
|
ctrl (logtest modifier 4)))
|
||||||
|
(make-key-event :key (or key :unknown)
|
||||||
|
:ctrl ctrl :alt alt :shift shift
|
||||||
|
:raw (format nil "~C[~d~C" #\Esc param (code-char final-byte))))))
|
||||||
|
(let* ((tilde-p (char= (code-char final-byte) #\~))
|
||||||
|
(param (or (first params) 0))
|
||||||
|
(key (if tilde-p
|
||||||
|
(cdr (assoc param *csi-tilde-table*))
|
||||||
|
(cdr (assoc (code-char final-byte) *csi-key-table*))))
|
||||||
|
(modifier (when (> (length params) 1) (second params))))
|
||||||
|
(let ((ctrl nil) (alt nil) (shift nil))
|
||||||
|
(when modifier
|
||||||
|
(setf shift (logtest modifier 1)
|
||||||
|
alt (logtest modifier 2)
|
||||||
|
ctrl (logtest modifier 4)))
|
||||||
|
(make-key-event :key (or key :unknown)
|
||||||
|
:ctrl ctrl :alt alt :shift shift
|
||||||
|
:raw (format nil "~C[~d~C" #\Esc param (code-char final-byte))))))))))
|
||||||
|
;; ESC ESC
|
||||||
|
(#x1b
|
||||||
|
(make-key-event :key :escape :alt t :raw "\\e\\e"))
|
||||||
|
;; ESC + printable = Alt+key
|
||||||
|
(t
|
||||||
|
(let ((ch (code-char b)))
|
||||||
|
(if (and (>= b #x20) (<= b #x7e))
|
||||||
|
(make-key-event :key (intern (string (string-upcase ch)) :keyword)
|
||||||
|
:alt t
|
||||||
|
:raw (format nil "~C~C" #\Esc ch))
|
||||||
|
(make-key-event :key :unknown
|
||||||
|
:raw (format nil "~C~C" #\Esc ch))))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Top-level event reader
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun %read-event (&key timeout)
|
||||||
|
(let ((b (read-raw-byte :timeout timeout)))
|
||||||
|
(unless b
|
||||||
|
(return-from %read-event nil))
|
||||||
|
(case b
|
||||||
|
(#x1b
|
||||||
|
(%read-escape-sequence))
|
||||||
|
(#x09
|
||||||
|
(make-key-event :key :tab :code #x09))
|
||||||
|
(#x0a
|
||||||
|
(make-key-event :key :enter :code #x0a))
|
||||||
|
(#x0d
|
||||||
|
(make-key-event :key :enter :code #x0d))
|
||||||
|
((#x7f #x08)
|
||||||
|
(make-key-event :key :backspace :code b))
|
||||||
|
((and (>= b #x01) (<= b #x1a))
|
||||||
|
(let ((key (intern (string-upcase (string (code-char (+ b #x60)))) :keyword)))
|
||||||
|
(make-key-event :key key :ctrl t :code b)))
|
||||||
|
(#x1c (make-key-event :key :backslash :ctrl t :code b))
|
||||||
|
(#x1d (make-key-event :key :rbracket :ctrl t :code b))
|
||||||
|
(#x1e (make-key-event :key :caret :ctrl t :code b))
|
||||||
|
(#x1f (make-key-event :key :underscore :ctrl t :code b))
|
||||||
|
((and (>= b #x20) (<= b #x7e))
|
||||||
|
(let ((ch (code-char b)))
|
||||||
|
(make-key-event :key (intern (string (string-upcase ch)) :keyword)
|
||||||
|
:code b)))
|
||||||
|
(t
|
||||||
|
(make-key-event :key :unknown :code b :raw (string (code-char b)))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Backend integration
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defmethod read-event ((b cl-tty.backend:backend) &key timeout)
|
||||||
|
(declare (ignore b))
|
||||||
|
(when (probe-file "/dev/stdin")
|
||||||
|
(%read-event :timeout timeout)))
|
||||||
77
src/components/keybindings.lisp
Normal file
77
src/components/keybindings.lisp
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
(in-package #:cl-tty.input)
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key map struct
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defstruct keymap
|
||||||
|
(name nil :type (or keyword null))
|
||||||
|
(bindings nil :type list)
|
||||||
|
(parent nil :type (or keymap null)))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Global keymap registry
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defparameter *keymaps* (make-hash-table :test #'equal))
|
||||||
|
(defparameter *chord-timeout* 0.5)
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key spec matching
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun key-match-p (spec event)
|
||||||
|
"T if SPEC matches EVENT. Spec is :ctrl+p (modifier+key keyword)
|
||||||
|
or (:ctrl+p) for single-spec in a list, or (:ctrl+x :ctrl+s) for chords."
|
||||||
|
(etypecase spec
|
||||||
|
;; Keyword like :ctrl+p, :alt+f, :enter, :space, :f1
|
||||||
|
(keyword
|
||||||
|
(let* ((name (string spec))
|
||||||
|
(plus (position #\+ name)))
|
||||||
|
(if plus
|
||||||
|
;; Modified key: :ctrl+p → mod-str="CTRL", key-str="P"
|
||||||
|
(let ((mod-str (subseq name 0 plus))
|
||||||
|
(key-str (subseq name (1+ plus))))
|
||||||
|
(and (eql (intern key-str :keyword)
|
||||||
|
(key-event-key event))
|
||||||
|
(cond
|
||||||
|
((string= mod-str "CTRL") (key-event-ctrl event))
|
||||||
|
((string= mod-str "ALT") (key-event-alt event))
|
||||||
|
((string= mod-str "SHIFT") (key-event-shift event))
|
||||||
|
(t t))))
|
||||||
|
;; Plain keyword: :enter, :escape, :f1, etc.
|
||||||
|
(eql spec (key-event-key event)))))
|
||||||
|
;; List: (:ctrl+p) or (:ctrl+x :ctrl+s)
|
||||||
|
(list
|
||||||
|
(when spec
|
||||||
|
(key-match-p (first spec) event)))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Dispatch
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun dispatch-key-event (event &key component)
|
||||||
|
(labels ((try-keymap (km)
|
||||||
|
(when km
|
||||||
|
(loop for (spec . handler) in (keymap-bindings km)
|
||||||
|
thereis (when (key-match-p spec event)
|
||||||
|
(funcall handler event)
|
||||||
|
t))))
|
||||||
|
(find-keymap (name)
|
||||||
|
(gethash name *keymaps*)))
|
||||||
|
(or (and component
|
||||||
|
(let ((km (component-keymap component)))
|
||||||
|
(when km (try-keymap km))))
|
||||||
|
(try-keymap (find-keymap :local))
|
||||||
|
(try-keymap (find-keymap :global)))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; defkeymap macro
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defmacro defkeymap (name &body bindings)
|
||||||
|
`(setf (gethash ',name *keymaps*)
|
||||||
|
(make-keymap :name ',name
|
||||||
|
:bindings (list ,@(loop for b in bindings
|
||||||
|
collect (if (consp (cdr b))
|
||||||
|
`(cons ',(car b) ,(cadr b))
|
||||||
|
`(cons ',(car b) ,(cdr b))))))))
|
||||||
|
|
||||||
|
;;; --- Component protocol integration ---
|
||||||
|
(defgeneric component-keymap (component)
|
||||||
|
(:method ((c t)) nil))
|
||||||
65
src/components/markdown-package.lisp
Normal file
65
src/components/markdown-package.lisp
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
;;; markdown-package.lisp — Package definition for cl-tty.markdown
|
||||||
|
|
||||||
|
(defpackage :cl-tty.markdown
|
||||||
|
(:use :cl :fiveam)
|
||||||
|
(:export
|
||||||
|
;; Data structures
|
||||||
|
#:make-md-node
|
||||||
|
#:md-node-p
|
||||||
|
#:md-node-text
|
||||||
|
;; Parsing
|
||||||
|
#:parse-blocks
|
||||||
|
#:parse-inline
|
||||||
|
;; Highlighting
|
||||||
|
#:*syntax-highlighters*
|
||||||
|
#:highlight-code
|
||||||
|
;; Diff
|
||||||
|
#:classify-diff-line
|
||||||
|
;; Rendering
|
||||||
|
#:render-md
|
||||||
|
#:render-md-node
|
||||||
|
#:render-markdown
|
||||||
|
#:render-inline
|
||||||
|
;; Styles
|
||||||
|
#:apply-style
|
||||||
|
#:apply-styles
|
||||||
|
;; Tests (exported test symbols for ASDF integration)
|
||||||
|
#:heading-parsing
|
||||||
|
#:heading-levels
|
||||||
|
#:heading-with-inline-formatting
|
||||||
|
#:paragraph-parsing
|
||||||
|
#:paragraph-multi-line
|
||||||
|
#:bold-parsing
|
||||||
|
#:italic-parsing
|
||||||
|
#:bold-italic-combined
|
||||||
|
#:inline-code-parsing
|
||||||
|
#:link-parsing
|
||||||
|
#:code-block-parsing
|
||||||
|
#:code-block-unknown-language
|
||||||
|
#:blockquote-parsing
|
||||||
|
#:list-item-parsing
|
||||||
|
#:ordered-list-parsing
|
||||||
|
#:thematic-break-parsing
|
||||||
|
#:highlight-lisp-keyword
|
||||||
|
#:highlight-lisp-builtin
|
||||||
|
#:highlight-unknown-language
|
||||||
|
#:highlight-comment
|
||||||
|
#:classify-diff-added
|
||||||
|
#:classify-diff-removed
|
||||||
|
#:classify-diff-hunk
|
||||||
|
#:classify-diff-context
|
||||||
|
#:render-heading-output
|
||||||
|
#:render-paragraph-output
|
||||||
|
#:render-thematic-break-output
|
||||||
|
#:render-code-block-output
|
||||||
|
#:render-diff-block-output
|
||||||
|
#:markdown-integration
|
||||||
|
#:render-markdown-string
|
||||||
|
;; Internal (for testability)
|
||||||
|
#:classify-line
|
||||||
|
#:split-string-into-lines
|
||||||
|
#:find-closing-marker
|
||||||
|
#:string-prefix-p
|
||||||
|
#:tokenize-line
|
||||||
|
#:apply-highlight-token
|
||||||
|
#:apply-highlight-style))
|
||||||
681
src/components/markdown.lisp
Normal file
681
src/components/markdown.lisp
Normal file
@@ -0,0 +1,681 @@
|
|||||||
|
;;; markdown.lisp — Markdown + Code + Diff rendering for cl-tty
|
||||||
|
|
||||||
|
(in-package :cl-tty.markdown)
|
||||||
|
|
||||||
|
;; ─── Node constructors ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun make-md-node (type &key children properties content url)
|
||||||
|
(let ((node (list :type type)))
|
||||||
|
(when children (setf (getf node :children) children))
|
||||||
|
(when properties (setf (getf node :properties) properties))
|
||||||
|
(when content (setf (getf node :content) content))
|
||||||
|
(when url (setf (getf node :url) url))
|
||||||
|
node))
|
||||||
|
|
||||||
|
(defun md-node-p (thing)
|
||||||
|
(and (listp thing) (getf thing :type)))
|
||||||
|
|
||||||
|
(defun md-node-text (node)
|
||||||
|
(let ((type (getf node :type)))
|
||||||
|
(cond ((eql type :text) (or (getf node :content) ""))
|
||||||
|
((eql type :link)
|
||||||
|
(concatenate 'string
|
||||||
|
(md-node-text (first (getf node :children)))
|
||||||
|
(format nil " (~a)" (or (getf node :url) ""))))
|
||||||
|
((eql type :inline-code) (or (getf node :content) ""))
|
||||||
|
((getf node :children)
|
||||||
|
(apply #'concatenate 'string
|
||||||
|
(mapcar #'md-node-text (getf node :children))))
|
||||||
|
(t ""))))
|
||||||
|
|
||||||
|
;; ─── Block-level parser ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun split-string-into-lines (string)
|
||||||
|
(let ((result nil) (start 0))
|
||||||
|
(flet ((add-line (end) (push (subseq string start end) result)))
|
||||||
|
(loop for i from 0 below (length string)
|
||||||
|
do (let ((c (char string i)))
|
||||||
|
(cond ((char= c #\Newline) (add-line i) (setf start (1+ i)))
|
||||||
|
((and (char= c #\Return) (< (1+ i) (length string))
|
||||||
|
(char= (char string (1+ i)) #\Newline))
|
||||||
|
(add-line i) (setf start (+ i 2)) (incf i)))))
|
||||||
|
(when (< start (length string)) (add-line (length string)))
|
||||||
|
(coerce (nreverse result) 'vector))))
|
||||||
|
|
||||||
|
(defun classify-line (line)
|
||||||
|
(cond
|
||||||
|
((string= line "") (cons :blank nil))
|
||||||
|
((and (>= (length line) 3)
|
||||||
|
(let ((c0 (char line 0)))
|
||||||
|
(and (find c0 "-*")
|
||||||
|
(every (lambda (c) (or (char= c c0) (char= c #\Space) (char= c #\Tab)))
|
||||||
|
line))))
|
||||||
|
(cons :thematic-break nil))
|
||||||
|
((and (char= (char line 0) #\#)
|
||||||
|
(let ((count 0))
|
||||||
|
(loop for c across line while (char= c #\#) do (incf count))
|
||||||
|
(and (<= 1 count 6)
|
||||||
|
(or (>= (length line) (1+ count))
|
||||||
|
(member (char line count) '(#\Space #\Tab))))))
|
||||||
|
(let* ((hash-count (loop for c across line while (char= c #\#) count c))
|
||||||
|
(content (string-trim (list #\Space #\Tab) (subseq line hash-count))))
|
||||||
|
(cons :heading (cons hash-count content))))
|
||||||
|
((char= (char line 0) #\>)
|
||||||
|
(cons :blockquote (string-trim (list #\Space #\Tab) (subseq line 1))))
|
||||||
|
((and (>= (length line) 2) (find (char line 0) "-*+")
|
||||||
|
(char= (char line 1) #\Space))
|
||||||
|
(cons :list-item (string-trim (list #\Space #\Tab) (subseq line 2))))
|
||||||
|
((and (>= (length line) 3) (digit-char-p (char line 0))
|
||||||
|
(loop for c across line while (digit-char-p c)
|
||||||
|
finally (return (find c ". )"))))
|
||||||
|
(let ((dot-pos (position-if (lambda (c) (find c ". )")) line)))
|
||||||
|
(if (and dot-pos (find (char line dot-pos) ". )"))
|
||||||
|
(cons :ordered-item (string-trim (list #\Space #\Tab)
|
||||||
|
(subseq line (1+ dot-pos))))
|
||||||
|
(cons :paragraph line))))
|
||||||
|
((and (>= (length line) 4) (find (char line 0) "-+")
|
||||||
|
(char= (char line 1) (char line 0))
|
||||||
|
(char= (char line 2) (char line 0))
|
||||||
|
(char= (char line 3) #\Space))
|
||||||
|
(cons :diff-header line))
|
||||||
|
((and (>= (length line) 1) (find (char line 0) "-+")
|
||||||
|
(not (and (>= (length line) 3)
|
||||||
|
(char= (char line 1) (char line 0))
|
||||||
|
(char= (char line 2) (char line 0)))))
|
||||||
|
(cons :diff-line (cons (char line 0) (subseq line 1))))
|
||||||
|
((and (>= (length line) 3) (find (char line 0) "`~")
|
||||||
|
(let ((fence-len (loop for c across line
|
||||||
|
while (char= c (char line 0)) count c)))
|
||||||
|
(and (>= fence-len 3)
|
||||||
|
(let ((rest (string-trim (list #\Space #\Tab)
|
||||||
|
(subseq line fence-len))))
|
||||||
|
(cons :code-start rest))))))
|
||||||
|
(t (cons :paragraph line))))
|
||||||
|
|
||||||
|
(defun find-closing-marker (text start marker)
|
||||||
|
(let ((marker-len (length marker)) (len (length text)))
|
||||||
|
(loop for j from start to (- len marker-len)
|
||||||
|
do (when (and (char= (char text j) (char marker 0))
|
||||||
|
(string= marker (subseq text j (+ j marker-len)))
|
||||||
|
(or (= j 0) (not (char= (char text (1- j)) #\\))))
|
||||||
|
(return j))
|
||||||
|
finally (return nil))))
|
||||||
|
|
||||||
|
(defun parse-paragraph (lines start)
|
||||||
|
(let ((text-parts nil) (i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
((:paragraph) (push (cdr class) text-parts) (incf i))
|
||||||
|
(:blank (incf i) (loop-finish))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(values (make-md-node :paragraph :children
|
||||||
|
(parse-inline
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for part in (nreverse text-parts)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (write-char #\Space s))
|
||||||
|
(princ part s)))))
|
||||||
|
i)))
|
||||||
|
|
||||||
|
(defun parse-blockquote (lines start)
|
||||||
|
(let ((text-parts nil) (i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
(:blockquote (push (cdr class) text-parts) (incf i))
|
||||||
|
(:blank (incf i) (loop-finish))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(values (make-md-node :blockquote :children
|
||||||
|
(parse-inline
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for part in (nreverse text-parts)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (write-char #\Space s))
|
||||||
|
(princ part s)))))
|
||||||
|
i)))
|
||||||
|
|
||||||
|
(defun parse-list (lines start)
|
||||||
|
(declare (ignore start))
|
||||||
|
(let ((items nil) (i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
((:list-item :ordered-item)
|
||||||
|
(push (cons (car class) (cdr class)) items) (incf i))
|
||||||
|
(:blank
|
||||||
|
(if (and (< (1+ i) (length lines))
|
||||||
|
(let ((nc (classify-line
|
||||||
|
(string-trim (list #\return)
|
||||||
|
(aref lines (1+ i))))))
|
||||||
|
(member (car nc) '(:list-item :ordered-item))))
|
||||||
|
(progn (push (cons :blank-sep nil) items) (incf i))
|
||||||
|
(progn (incf i) (loop-finish))))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(let ((nodes nil))
|
||||||
|
(dolist (item (nreverse items))
|
||||||
|
(let ((type (car item)) (content (cdr item)))
|
||||||
|
(when (and content (not (string= content "")))
|
||||||
|
(push (make-md-node type :children (parse-inline content)) nodes))))
|
||||||
|
(values (nreverse nodes) i))))
|
||||||
|
|
||||||
|
(defun parse-code-block (lines start lang)
|
||||||
|
(let ((code-lines nil)
|
||||||
|
(i (1+ start))
|
||||||
|
(fence-char (char (aref lines start) 0))
|
||||||
|
(fence-len (loop for c across (aref lines start)
|
||||||
|
while (char= c (char (aref lines start) 0)) count c)))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line)))
|
||||||
|
(when (and (>= (length line) fence-len)
|
||||||
|
(every (lambda (c) (char= c fence-char))
|
||||||
|
(subseq line 0 fence-len))
|
||||||
|
(or (= (length line) fence-len)
|
||||||
|
(every (lambda (c) (find c " \t"))
|
||||||
|
(subseq line fence-len))))
|
||||||
|
(incf i) (loop-finish))
|
||||||
|
(push line code-lines)
|
||||||
|
(incf i)))
|
||||||
|
(values (make-md-node :code-block
|
||||||
|
:properties (list :language (and lang (not (string= lang "")) lang))
|
||||||
|
:content
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for cl in (nreverse code-lines)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (terpri s)) (princ cl s))))
|
||||||
|
i)))
|
||||||
|
|
||||||
|
(defun parse-diff-block (lines start)
|
||||||
|
(let ((diff-lines nil) (i start))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((raw-line (aref lines i))
|
||||||
|
(line (string-trim (list #\return) raw-line))
|
||||||
|
(class (classify-line line)))
|
||||||
|
(case (car class)
|
||||||
|
((:diff-header :diff-line) (push line diff-lines) (incf i))
|
||||||
|
(:blank (incf i) (loop-finish))
|
||||||
|
(t (loop-finish)))))
|
||||||
|
(let ((lines-list (nreverse diff-lines)))
|
||||||
|
(values (make-md-node :diff-block
|
||||||
|
:content
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for dl in lines-list
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (terpri s)) (princ dl s)))
|
||||||
|
:properties (list :lines lines-list))
|
||||||
|
i))))
|
||||||
|
|
||||||
|
(defun parse-blocks (text)
|
||||||
|
(let ((lines (split-string-into-lines text)) (nodes nil) (i 0))
|
||||||
|
(loop while (< i (length lines))
|
||||||
|
do (let* ((line (string-trim (list #\return) (aref lines i)))
|
||||||
|
(classification (classify-line line)))
|
||||||
|
(case (car classification)
|
||||||
|
(:blank (incf i))
|
||||||
|
(:thematic-break (push (make-md-node :thematic-break) nodes) (incf i))
|
||||||
|
(:paragraph
|
||||||
|
(multiple-value-bind (node consumed) (parse-paragraph lines i)
|
||||||
|
(push node nodes) (setf i consumed)))
|
||||||
|
(:heading
|
||||||
|
(let* ((level+content (cdr classification))
|
||||||
|
(level (car level+content))
|
||||||
|
(content (cdr level+content)))
|
||||||
|
(push (make-md-node :heading :properties (list :level level)
|
||||||
|
:children (parse-inline content)) nodes)
|
||||||
|
(incf i)))
|
||||||
|
(:blockquote
|
||||||
|
(multiple-value-bind (node consumed) (parse-blockquote lines i)
|
||||||
|
(push node nodes) (setf i consumed)))
|
||||||
|
(:list-item
|
||||||
|
(multiple-value-bind (node consumed) (parse-list lines i)
|
||||||
|
(dolist (n node) (push n nodes)) (setf i consumed)))
|
||||||
|
(:ordered-item
|
||||||
|
(multiple-value-bind (node consumed) (parse-list lines i)
|
||||||
|
(dolist (n node) (push n nodes)) (setf i consumed)))
|
||||||
|
(:code-start
|
||||||
|
(multiple-value-bind (node consumed)
|
||||||
|
(parse-code-block lines i (cdr classification))
|
||||||
|
(push node nodes) (setf i consumed)))
|
||||||
|
(:diff-header
|
||||||
|
(multiple-value-bind (node consumed) (parse-diff-block lines i)
|
||||||
|
(push node nodes) (setf i consumed)))
|
||||||
|
(t (incf i)))))
|
||||||
|
(nreverse nodes)))
|
||||||
|
|
||||||
|
;; ─── Inline parser ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun parse-inline (text)
|
||||||
|
(unless (and text (> (length text) 0)) (return-from parse-inline nil))
|
||||||
|
(let ((nodes nil) (i 0) (len (length text)))
|
||||||
|
(loop while (< i len)
|
||||||
|
do (let ((c (char text i)))
|
||||||
|
(case c
|
||||||
|
(#\*
|
||||||
|
(multiple-value-bind (node consumed) (parse-star-emphasis text i len)
|
||||||
|
(if node (progn (push node nodes) (setf i consumed))
|
||||||
|
(progn (push (make-md-node :text :content (string c)) nodes) (incf i)))))
|
||||||
|
(#\_
|
||||||
|
(multiple-value-bind (node consumed) (parse-underscore-emphasis text i len)
|
||||||
|
(if node (progn (push node nodes) (setf i consumed))
|
||||||
|
(progn (push (make-md-node :text :content (string c)) nodes) (incf i)))))
|
||||||
|
(#\`
|
||||||
|
(multiple-value-bind (node consumed) (parse-inline-code text i len)
|
||||||
|
(if node (progn (push node nodes) (setf i consumed))
|
||||||
|
(progn (push (make-md-node :text :content (string c)) nodes) (incf i)))))
|
||||||
|
(#\[
|
||||||
|
(multiple-value-bind (node consumed) (parse-link text i len)
|
||||||
|
(if node (progn (push node nodes) (setf i consumed))
|
||||||
|
(progn (push (make-md-node :text :content (string c)) nodes) (incf i)))))
|
||||||
|
(t (let ((start i))
|
||||||
|
(incf i)
|
||||||
|
(loop while (< i len)
|
||||||
|
do (let ((nc (char text i)))
|
||||||
|
(if (find nc "*_`[") (loop-finish)
|
||||||
|
(progn
|
||||||
|
(when (and (< (1+ i) len)
|
||||||
|
(find nc "*_")
|
||||||
|
(char= nc (char text (1+ i))))
|
||||||
|
(loop-finish))
|
||||||
|
(incf i)))))
|
||||||
|
(push (make-md-node :text :content (subseq text start i)) nodes))))))
|
||||||
|
(nreverse nodes)))
|
||||||
|
|
||||||
|
(defun parse-star-emphasis (text i len)
|
||||||
|
(when (>= i len) (return-from parse-star-emphasis (values nil i)))
|
||||||
|
(if (and (< (1+ i) len) (char= (char text (1+ i)) #\*))
|
||||||
|
(let ((close (find-closing-marker text (+ i 2) "**")))
|
||||||
|
(if close
|
||||||
|
(values (make-md-node :bold :children (parse-inline (subseq text (+ i 2) close)))
|
||||||
|
(+ close 2))
|
||||||
|
(values nil i)))
|
||||||
|
(let ((close (find-closing-marker text (1+ i) "*")))
|
||||||
|
(if close
|
||||||
|
(values (make-md-node :italic :children (parse-inline (subseq text (1+ i) close)))
|
||||||
|
(1+ close))
|
||||||
|
(values nil i)))))
|
||||||
|
|
||||||
|
(defun parse-underscore-emphasis (text i len)
|
||||||
|
(when (>= i len) (return-from parse-underscore-emphasis (values nil i)))
|
||||||
|
(when (and (> i 0) (not (find (char text (1- i)) " \t\n\r")))
|
||||||
|
(return-from parse-underscore-emphasis (values nil i)))
|
||||||
|
(if (and (< (1+ i) len) (char= (char text (1+ i)) #\_))
|
||||||
|
(let ((close (find-closing-marker text (+ i 2) "__")))
|
||||||
|
(if close
|
||||||
|
(values (make-md-node :bold :children (parse-inline (subseq text (+ i 2) close)))
|
||||||
|
(+ close 2))
|
||||||
|
(values nil i)))
|
||||||
|
(let ((close (find-closing-marker text (1+ i) "_")))
|
||||||
|
(if (and close
|
||||||
|
(or (>= (1+ close) len)
|
||||||
|
(find (char text (1+ close)) " \t\n\r.,;:!?")))
|
||||||
|
(values (make-md-node :italic :children (parse-inline (subseq text (1+ i) close)))
|
||||||
|
(1+ close))
|
||||||
|
(values nil i)))))
|
||||||
|
|
||||||
|
(defun parse-inline-code (text i len)
|
||||||
|
(when (or (>= i len) (not (char= (char text i) #\`)))
|
||||||
|
(return-from parse-inline-code (values nil i)))
|
||||||
|
(let ((bt-count (loop for j from i below (min len (+ i 3))
|
||||||
|
while (char= (char text j) #\`) count j)))
|
||||||
|
(let ((close (find-closing-marker text (+ i bt-count)
|
||||||
|
(make-string bt-count :initial-element #\`))))
|
||||||
|
(if close
|
||||||
|
(values (make-md-node :inline-code
|
||||||
|
:content (subseq text (+ i bt-count) close))
|
||||||
|
(+ close bt-count))
|
||||||
|
(values nil i)))))
|
||||||
|
|
||||||
|
(defun parse-link (text i len)
|
||||||
|
(when (or (>= i len) (not (char= (char text i) #\[)))
|
||||||
|
(return-from parse-link (values nil i)))
|
||||||
|
(let ((close-bracket (find-closing-marker text (1+ i) "]")))
|
||||||
|
(unless close-bracket (return-from parse-link (values nil i)))
|
||||||
|
(when (or (>= (1+ close-bracket) len)
|
||||||
|
(not (char= (char text (1+ close-bracket)) #\()))
|
||||||
|
(return-from parse-link (values nil i)))
|
||||||
|
(let ((close-paren (find-closing-marker text (+ close-bracket 2) ")")))
|
||||||
|
(unless close-paren (return-from parse-link (values nil i)))
|
||||||
|
(values (make-md-node :link
|
||||||
|
:children (parse-inline (subseq text (1+ i) close-bracket))
|
||||||
|
:url (subseq text (+ close-bracket 2) close-paren))
|
||||||
|
(1+ close-paren)))))
|
||||||
|
|
||||||
|
;; ─── Syntax highlighting ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun get-highlighter (lang)
|
||||||
|
(cdr (assoc lang
|
||||||
|
'(("lisp" . (:comment (";" "#|" ";;") :string ("\"")
|
||||||
|
:keyword ("defun" "defmacro" "defmethod" "defgeneric"
|
||||||
|
"defvar" "defparameter" "defconstant" "defstruct"
|
||||||
|
"defclass" "deftype" "define-condition"
|
||||||
|
"let" "let*" "flet" "labels" "macrolet"
|
||||||
|
"if" "when" "unless" "cond" "case" "ecase" "typecase"
|
||||||
|
"loop" "do" "dolist" "dotimes" "tagbody" "go"
|
||||||
|
"block" "return" "return-from"
|
||||||
|
"progn" "prog1" "prog2"
|
||||||
|
"lambda" "function" "quote"
|
||||||
|
"setf" "setq" "push" "pop" "incf" "decf"
|
||||||
|
"in-package" "defpackage" "export" "import"
|
||||||
|
"handler-case" "handler-bind" "ignore-errors"
|
||||||
|
"multiple-value-bind" "multiple-value-call"
|
||||||
|
"destructuring-bind"
|
||||||
|
"declare" "the" "values"
|
||||||
|
"and" "or" "not" "null"
|
||||||
|
"car" "cdr" "first" "rest" "second"
|
||||||
|
"cons" "list" "append" "nconc"
|
||||||
|
"mapcar" "mapc" "reduce"
|
||||||
|
"find" "position" "count" "subseq"
|
||||||
|
"format" "princ" "print" "write" "read"
|
||||||
|
"load" "compile" "eval"
|
||||||
|
"make-instance" "slot-value"
|
||||||
|
"type-of" "class-of")
|
||||||
|
:builtin ("t" "nil"
|
||||||
|
"*standard-output*" "*standard-input*"
|
||||||
|
"*error-output*" "*debug-io*"
|
||||||
|
"*package*" "*print-circle*")))
|
||||||
|
|
||||||
|
("common-lisp" . (:comment (";" "#|" ";;") :string ("\"")
|
||||||
|
:keyword ("defun" "defmacro" "defmethod" "defgeneric"
|
||||||
|
"let" "if" "when" "unless" "cond" "case"
|
||||||
|
"loop" "do" "dolist" "dotimes"
|
||||||
|
"return" "return-from" "block"
|
||||||
|
"lambda" "function" "quote"
|
||||||
|
"setf" "setq" "push" "pop" "incf" "decf"
|
||||||
|
"handler-case" "handler-bind"
|
||||||
|
"declare" "the" "values"
|
||||||
|
"defpackage" "in-package" "export" "import"
|
||||||
|
"error" "warn" "assert"
|
||||||
|
"car" "cdr" "first" "rest"
|
||||||
|
"cons" "list" "append" "mapcar" "reduce"
|
||||||
|
"format" "princ" "print" "read" "load"
|
||||||
|
"make-instance")
|
||||||
|
:builtin ("t" "nil")))
|
||||||
|
|
||||||
|
("python" . (:comment ("#") :string ("\"" "'" "\"\"\"" "'''")
|
||||||
|
:keyword ("def" "class" "return" "yield" "import" "from"
|
||||||
|
"if" "elif" "else" "for" "while" "in" "not"
|
||||||
|
"try" "except" "finally" "raise" "with" "pass"
|
||||||
|
"break" "continue" "lambda" "global"
|
||||||
|
"assert" "del" "is"
|
||||||
|
"self" "cls" "async" "await")
|
||||||
|
:builtin ("None" "True" "False")))
|
||||||
|
|
||||||
|
("javascript" . (:comment ("//" "/*") :string ("\"" "'" "`")
|
||||||
|
:keyword ("function" "class" "const" "let" "var"
|
||||||
|
"if" "else" "for" "while" "do" "switch"
|
||||||
|
"return" "break" "continue"
|
||||||
|
"try" "catch" "finally" "throw"
|
||||||
|
"new" "this" "super" "delete" "typeof"
|
||||||
|
"import" "export" "from" "default"
|
||||||
|
"async" "await" "yield" "of")
|
||||||
|
:builtin ("true" "false" "null" "undefined" "NaN")))
|
||||||
|
|
||||||
|
("bash" . (:comment ("#") :string ("\"" "'")
|
||||||
|
:keyword ("if" "then" "else" "elif" "fi" "for" "while"
|
||||||
|
"done" "case" "esac" "in" "function" "return"
|
||||||
|
"export" "local" "unset" "source"
|
||||||
|
"echo" "printf" "read" "test" "let" "declare")
|
||||||
|
:builtin ("true" "false" "cd" "ls" "cat" "grep" "sed"
|
||||||
|
"mv" "cp" "rm" "mkdir" "touch" "find" "wc"
|
||||||
|
"head" "tail" "date" "sleep" "kill")))
|
||||||
|
|
||||||
|
("shell" . (:comment ("#") :string ("\"" "'")
|
||||||
|
:keyword ("if" "then" "else" "elif" "fi" "for" "while"
|
||||||
|
"done" "case" "esac" "in" "function" "return"
|
||||||
|
"export" "local" "unset" "source"
|
||||||
|
"echo" "printf" "read" "test")
|
||||||
|
:builtin ("true" "false" "cd" "ls" "grep" "sed"
|
||||||
|
"mv" "cp" "rm" "mkdir" "touch" "find"))))
|
||||||
|
:test #'string=)))
|
||||||
|
|
||||||
|
(defun tokenize-line (line highlighter)
|
||||||
|
(let ((tokens nil) (i 0) (len (length line))
|
||||||
|
(comment-chars (getf highlighter :comment))
|
||||||
|
(string-chars (getf highlighter :string))
|
||||||
|
(keywords (getf highlighter :keyword))
|
||||||
|
(builtins (getf highlighter :builtin)))
|
||||||
|
(loop while (< i len)
|
||||||
|
do (let ((c (char line i)))
|
||||||
|
(cond
|
||||||
|
((find c " \t")
|
||||||
|
(let ((start i))
|
||||||
|
(loop while (and (< i len) (find (char line i) " \t")) do (incf i))
|
||||||
|
(push (cons (subseq line start i) :plain) tokens)))
|
||||||
|
((and comment-chars
|
||||||
|
(some (lambda (cc)
|
||||||
|
(and (<= (+ i (length cc)) len)
|
||||||
|
(string= cc (subseq line i (+ i (length cc))))))
|
||||||
|
comment-chars))
|
||||||
|
(push (cons (subseq line i) :comment) tokens) (setf i len))
|
||||||
|
((and string-chars (some (lambda (s) (find c s)) string-chars))
|
||||||
|
(let ((start i))
|
||||||
|
(incf i)
|
||||||
|
(let ((triple (and (< i (1- len)) (char= (char line i) c)
|
||||||
|
(char= (char line (1+ i)) c))))
|
||||||
|
(if triple
|
||||||
|
(progn (incf i 2)
|
||||||
|
(loop while (and (< i len)
|
||||||
|
(not (and (char= (char line i) c)
|
||||||
|
(< (1+ i) len)
|
||||||
|
(char= (char line (1+ i)) c)
|
||||||
|
(< (+ i 2) len)
|
||||||
|
(char= (char line (+ i 2)) c))))
|
||||||
|
do (incf i))
|
||||||
|
(incf i 3))
|
||||||
|
(progn (loop while (and (< i len) (char/= (char line i) c))
|
||||||
|
do (incf i))
|
||||||
|
(when (< i len) (incf i)))))
|
||||||
|
(push (cons (subseq line start i) :string) tokens)))
|
||||||
|
((or (digit-char-p c)
|
||||||
|
(and (find c "+-") (< (1+ i) len) (digit-char-p (char line (1+ i)))))
|
||||||
|
(let ((start i))
|
||||||
|
(loop while (and (< i len) (not (find (char line i) " \t()[]{}'\";:#")))
|
||||||
|
do (incf i))
|
||||||
|
(let ((token (subseq line start i)))
|
||||||
|
(if (digit-char-p (char token 0))
|
||||||
|
(push (cons token :number) tokens)
|
||||||
|
(push (cons token :plain) tokens)))))
|
||||||
|
((or (alpha-char-p c)
|
||||||
|
(and (find c "-_?!*<>=") (> len 1)))
|
||||||
|
(let ((start i))
|
||||||
|
(loop while (and (< i len)
|
||||||
|
(or (alphanumericp (char line i))
|
||||||
|
(find (char line i) "-_?!*<>=")))
|
||||||
|
do (incf i))
|
||||||
|
(let* ((token (subseq line start i))
|
||||||
|
(down (string-downcase token)))
|
||||||
|
(cond
|
||||||
|
((find down keywords :test #'string=)
|
||||||
|
(push (cons token :keyword) tokens))
|
||||||
|
((find down builtins :test #'string=)
|
||||||
|
(push (cons token :builtin) tokens))
|
||||||
|
(t (if (and (< i len) (char= (char line i) #\())
|
||||||
|
(push (cons token :function) tokens)
|
||||||
|
(push (cons token :plain) tokens)))))))
|
||||||
|
(t (push (cons (string c) :plain) tokens) (incf i)))))
|
||||||
|
(nreverse tokens)))
|
||||||
|
|
||||||
|
(defun highlight-code (code language)
|
||||||
|
(let ((highlighter (get-highlighter (and language (string-downcase language)))))
|
||||||
|
(unless highlighter (return-from highlight-code (list (cons code :plain))))
|
||||||
|
(let ((tokens nil))
|
||||||
|
(with-input-from-string (stream code)
|
||||||
|
(loop for line = (read-line stream nil nil) while line
|
||||||
|
do (let ((line-tokens (tokenize-line line highlighter)))
|
||||||
|
(when tokens (push (cons (string #\Newline) :plain) tokens))
|
||||||
|
(setf tokens (nconc (nreverse line-tokens) tokens)))))
|
||||||
|
(nreverse tokens))))
|
||||||
|
|
||||||
|
(defun apply-highlight-token (token category)
|
||||||
|
(let ((code (case category
|
||||||
|
(:keyword "33") (:builtin "36")
|
||||||
|
(:function "34") (:comment "2") (:string "32") (:number "35")
|
||||||
|
(t nil))))
|
||||||
|
(if code (format nil "~c[~am~a~c[0m" #\Escape code token #\Escape) token)))
|
||||||
|
|
||||||
|
(defun apply-highlight-style (char-vector)
|
||||||
|
(coerce char-vector 'string))
|
||||||
|
|
||||||
|
;; ─── Diff rendering ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun string-prefix-p (prefix string)
|
||||||
|
(and (>= (length string) (length prefix))
|
||||||
|
(string= prefix (subseq string 0 (length prefix)))))
|
||||||
|
|
||||||
|
(defun classify-diff-line (line)
|
||||||
|
(cond ((string-prefix-p "+++ " line) :file-header)
|
||||||
|
((string-prefix-p "--- " line) :file-header)
|
||||||
|
((string-prefix-p "@@" line) :hunk-header)
|
||||||
|
((string-prefix-p "+" line) :added)
|
||||||
|
((string-prefix-p "-" line) :removed)
|
||||||
|
(t :context)))
|
||||||
|
|
||||||
|
;; ─── Rendering ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun apply-style (style text)
|
||||||
|
(let ((code (cond
|
||||||
|
((eql style :bold) "1") ((eql style :italic) "3")
|
||||||
|
((eql style :dim) "2") ((eql style :code) "0")
|
||||||
|
((eql style :link) "4;36") ((eql style :url) "4;2")
|
||||||
|
((eql style :underline) "4") ((eql style :strike) "9")
|
||||||
|
((eql style :black) "30") ((eql style :red) "31")
|
||||||
|
((eql style :green) "32") ((eql style :yellow) "33")
|
||||||
|
((eql style :blue) "34") ((eql style :magenta) "35")
|
||||||
|
((eql style :cyan) "36") ((eql style :white) "37")
|
||||||
|
((eql style :bright-black) "90") ((eql style :bright-red) "91")
|
||||||
|
((eql style :bright-green) "92") ((eql style :bright-yellow) "93")
|
||||||
|
((eql style :bright-blue) "94") ((eql style :bright-magenta) "95")
|
||||||
|
((eql style :bright-cyan) "96") ((eql style :bright-white) "97")
|
||||||
|
((string= style "bold") "1") ((string= style "italic") "3")
|
||||||
|
((string= style "dim") "2") ((string= style "code") "0")
|
||||||
|
((string= style "link") "4;36") ((string= style "url") "4;2")
|
||||||
|
((string= style "bright-cyan") "96")
|
||||||
|
((string= style "bright-yellow") "93")
|
||||||
|
((string= style "bright-white") "97")
|
||||||
|
((string= style "bright-red") "91")
|
||||||
|
((string= style "bright-green") "92")
|
||||||
|
((string= style "bright-blue") "94")
|
||||||
|
((string= style "bright-magenta") "95")
|
||||||
|
((string= style "cyan") "36") ((string= style "yellow") "33")
|
||||||
|
((string= style "red") "31") ((string= style "green") "32")
|
||||||
|
((string= style "blue") "34") ((string= style "magenta") "35")
|
||||||
|
((string= style "white") "37") ((string= style "black") "30")
|
||||||
|
(t nil))))
|
||||||
|
(if code (format nil "~c[~am~a~c[0m" #\Escape code text #\Escape) text)))
|
||||||
|
|
||||||
|
(defun render-inline (children)
|
||||||
|
(if (null children) ""
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(dolist (child children)
|
||||||
|
(let ((type (getf child :type)))
|
||||||
|
(case type
|
||||||
|
(:text (princ (or (getf child :content) "") s))
|
||||||
|
(:bold (princ (apply-style :bold (render-inline (getf child :children))) s))
|
||||||
|
(:italic (princ (apply-style :italic (render-inline (getf child :children))) s))
|
||||||
|
(:inline-code (princ (apply-style :code (or (getf child :content) "")) s))
|
||||||
|
(:link (let ((text (render-inline (getf child :children)))
|
||||||
|
(url (or (getf child :url) "")))
|
||||||
|
(princ (apply-style :link text) s)
|
||||||
|
(when (and url (not (string= url "")))
|
||||||
|
(princ " " s)
|
||||||
|
(princ (apply-style :url (format nil "(~a)" url)) s))))
|
||||||
|
(t (princ (or (getf child :content) "") s))))))))
|
||||||
|
|
||||||
|
(defun render-heading (node)
|
||||||
|
(let* ((level (or (getf (getf node :properties) :level) 1))
|
||||||
|
(prefix (make-string (min level 6) :initial-element #\#))
|
||||||
|
(text (render-inline (getf node :children)))
|
||||||
|
(color (cond ((= level 1) :bright-cyan) ((= level 2) :bright-yellow)
|
||||||
|
(t :bright-white))))
|
||||||
|
(list (apply-style color (concatenate 'string prefix " " text)))))
|
||||||
|
|
||||||
|
(defun render-paragraph (node)
|
||||||
|
(list (render-inline (getf node :children))))
|
||||||
|
|
||||||
|
(defun render-blockquote (node)
|
||||||
|
(list (apply-style :dim (concatenate 'string "> " (render-inline (getf node :children))))))
|
||||||
|
|
||||||
|
(defun render-code-block (node)
|
||||||
|
(let* ((language (or (getf (getf node :properties) :language) ""))
|
||||||
|
(content (or (getf node :content) ""))
|
||||||
|
(highlighted (unless (or (null language) (string= language ""))
|
||||||
|
(highlight-code content language)))
|
||||||
|
(lines nil))
|
||||||
|
(when (and language (not (string= language "")))
|
||||||
|
(push (apply-style :dim (format nil " ~~~~~~ ~a" language)) lines))
|
||||||
|
(if highlighted
|
||||||
|
(let ((cl (make-array 0 :element-type 'character
|
||||||
|
:fill-pointer 0 :adjustable t))
|
||||||
|
(output nil))
|
||||||
|
(dolist (pair highlighted)
|
||||||
|
(let ((token (car pair)) (category (cdr pair)))
|
||||||
|
(cond ((string= token (string #\Newline))
|
||||||
|
(push (apply-highlight-style cl) output)
|
||||||
|
(setf cl (make-array 0 :element-type 'character
|
||||||
|
:fill-pointer 0 :adjustable t)))
|
||||||
|
(t (let ((colored (apply-highlight-token token category)))
|
||||||
|
(loop for ch across colored
|
||||||
|
do (vector-push-extend ch cl)))))))
|
||||||
|
(when (> (length cl) 0) (push (apply-highlight-style cl) output))
|
||||||
|
(setf lines (nconc lines (nreverse output))))
|
||||||
|
(with-input-from-string (s content)
|
||||||
|
(loop for line = (read-line s nil nil) while line
|
||||||
|
do (push (apply-style :code line) lines))))
|
||||||
|
(nreverse lines)))
|
||||||
|
|
||||||
|
(defun render-diff-block (node)
|
||||||
|
(let* ((lines (getf (getf node :properties) :lines)) (result nil))
|
||||||
|
(dolist (line (or lines
|
||||||
|
(and (getf node :content)
|
||||||
|
(let ((l (split-string-into-lines (getf node :content))))
|
||||||
|
(loop for i from 0 below (length l) collect (aref l i))))))
|
||||||
|
(let* ((class (classify-diff-line line))
|
||||||
|
(color (case class
|
||||||
|
(:added "32") (:removed "31")
|
||||||
|
(:hunk-header "36") (:file-header "1;36") (t nil))))
|
||||||
|
(if color
|
||||||
|
(push (format nil "~c[~am~a~c[0m" #\Escape color line #\Escape) result)
|
||||||
|
(push line result))))
|
||||||
|
(nreverse result)))
|
||||||
|
|
||||||
|
(defun render-thematic-break (node)
|
||||||
|
(declare (ignore node))
|
||||||
|
(list (apply-style :dim "──────────────────────────────────────────────")))
|
||||||
|
|
||||||
|
(defun render-list-item (node)
|
||||||
|
(list (concatenate 'string
|
||||||
|
(if (eql (getf node :type) :ordered-item) " 1." " * ")
|
||||||
|
(render-inline (getf node :children)))))
|
||||||
|
|
||||||
|
(defun render-md-node (node)
|
||||||
|
(let ((type (getf node :type)))
|
||||||
|
(case type
|
||||||
|
(:heading (render-heading node))
|
||||||
|
(:paragraph (render-paragraph node))
|
||||||
|
(:blockquote (render-blockquote node))
|
||||||
|
(:code-block (render-code-block node))
|
||||||
|
(:diff-block (render-diff-block node))
|
||||||
|
(:thematic-break (render-thematic-break node))
|
||||||
|
(:list-item (render-list-item node))
|
||||||
|
(:ordered-item (render-list-item node))
|
||||||
|
(t (list "")))))
|
||||||
|
|
||||||
|
(defun render-md (nodes)
|
||||||
|
(let ((lines nil))
|
||||||
|
(dolist (node nodes) (setf lines (nconc lines (render-md-node node))))
|
||||||
|
lines))
|
||||||
|
|
||||||
|
(defun render-markdown (text)
|
||||||
|
(let ((nodes (parse-blocks text)) (parts nil))
|
||||||
|
(dolist (line (render-md nodes)) (push line parts))
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for part in (nreverse parts)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (terpri s)) (princ part s)))))
|
||||||
9
src/components/mouse-package.lisp
Normal file
9
src/components/mouse-package.lisp
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
(defpackage :cl-tty.mouse
|
||||||
|
(:use :cl :cl-tty.input :cl-tty.box)
|
||||||
|
(:export
|
||||||
|
#:mouse-mixin
|
||||||
|
#:on-mouse-down #:on-mouse-up #:on-mouse-move #:on-mouse-scroll
|
||||||
|
#:handle-mouse-event
|
||||||
|
#:hit-test
|
||||||
|
#:selection #:get-selection #:copy-to-clipboard
|
||||||
|
#:make-selection #:selection-p))
|
||||||
43
src/components/mouse.lisp
Normal file
43
src/components/mouse.lisp
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
(in-package :cl-tty.mouse)
|
||||||
|
|
||||||
|
(defclass mouse-mixin ()
|
||||||
|
((on-mouse-down :initarg :on-mouse-down :initform nil :accessor on-mouse-down)
|
||||||
|
(on-mouse-up :initarg :on-mouse-up :initform nil :accessor on-mouse-up)
|
||||||
|
(on-mouse-move :initarg :on-mouse-move :initform nil :accessor on-mouse-move)
|
||||||
|
(on-mouse-scroll :initarg :on-mouse-scroll :initform nil :accessor on-mouse-scroll)))
|
||||||
|
|
||||||
|
(defun handle-mouse-event (component event)
|
||||||
|
(let* ((type (mouse-event-type event))
|
||||||
|
(handler (case type
|
||||||
|
(:press (on-mouse-down component))
|
||||||
|
(:release (on-mouse-up component))
|
||||||
|
(:drag (on-mouse-move component))
|
||||||
|
(t nil))))
|
||||||
|
(when handler (funcall handler event))))
|
||||||
|
|
||||||
|
(defun hit-test (root x y)
|
||||||
|
(labels ((recurse (node)
|
||||||
|
(when (and (slot-boundp node 'x) (slot-boundp node 'y)
|
||||||
|
(slot-boundp node 'width) (slot-boundp node 'height))
|
||||||
|
(let ((nx (slot-value node 'x))
|
||||||
|
(ny (slot-value node 'y))
|
||||||
|
(nw (slot-value node 'width))
|
||||||
|
(nh (slot-value node 'height)))
|
||||||
|
(when (and (>= x nx) (< x (+ nx nw))
|
||||||
|
(>= y ny) (< y (+ ny nh)))
|
||||||
|
node)))))
|
||||||
|
(recurse root)))
|
||||||
|
|
||||||
|
;; Selection
|
||||||
|
(defvar *selection* nil)
|
||||||
|
|
||||||
|
(defstruct (selection (:conc-name sel-))
|
||||||
|
(start-x 0) (start-y 0) (end-x 0) (end-y 0) (text ""))
|
||||||
|
|
||||||
|
(defun get-selection ()
|
||||||
|
(when *selection* (sel-text *selection*)))
|
||||||
|
|
||||||
|
(defun copy-to-clipboard (text)
|
||||||
|
#+linux (sb-ext:run-program "xclip" (list "-selection" "clipboard")
|
||||||
|
:input text :wait nil)
|
||||||
|
#+darwin (sb-ext:run-program "pbcopy" nil :input text :wait nil))
|
||||||
31
src/components/package.lisp
Normal file
31
src/components/package.lisp
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
(defpackage :cl-tty.box
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.layout)
|
||||||
|
(:export
|
||||||
|
;; Box
|
||||||
|
#:box #:make-box
|
||||||
|
#:box-layout-node
|
||||||
|
#:box-border-style #:box-title #:box-title-align
|
||||||
|
#:box-fg #:box-bg
|
||||||
|
#:render-box
|
||||||
|
;; Span
|
||||||
|
#:span
|
||||||
|
#:span-text #:span-bold #:span-italic #:span-underline
|
||||||
|
#:span-reverse #:span-dim #:span-fg #:span-bg
|
||||||
|
;; Text
|
||||||
|
#:text #:make-text
|
||||||
|
#:text-layout-node #:text-content #:text-spans
|
||||||
|
#:text-fg #:text-bg #:text-wrap-mode
|
||||||
|
#:render-text
|
||||||
|
;; Utilities (for tests)
|
||||||
|
#:word-wrap #:split-string
|
||||||
|
;; Dirty tracking
|
||||||
|
#:dirty-mixin #:dirty-p #:mark-clean #:mark-dirty
|
||||||
|
;; Rendering pipeline
|
||||||
|
#:render #:render-screen #:render-node
|
||||||
|
#:component-layout-node #:component-children #:component-parent
|
||||||
|
#:available-width #:available-height
|
||||||
|
#:propagate-dirty
|
||||||
|
;; Theme engine
|
||||||
|
#:theme #:make-theme #:theme-mode
|
||||||
|
#:theme-color #:load-preset #:define-preset))
|
||||||
|
(in-package :cl-tty.box)
|
||||||
48
src/components/render-tests.lisp
Normal file
48
src/components/render-tests.lisp
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
(in-package :cl-tty-box-test)
|
||||||
|
(in-suite box-suite)
|
||||||
|
|
||||||
|
(defun make-capturing-backend ()
|
||||||
|
(let* ((s (make-string-output-stream))
|
||||||
|
(b (make-modern-backend :output-stream s)))
|
||||||
|
(values b s)))
|
||||||
|
|
||||||
|
(test render-generic-dispatches-box
|
||||||
|
"render dispatches to render-box for box instances"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((bx (make-box :border-style :single :width 10 :height 5)))
|
||||||
|
(compute-layout (box-layout-node bx) 10 5)
|
||||||
|
(render bx b)
|
||||||
|
(is (search "┌" (get-output-stream-string s)) "box renders border"))))
|
||||||
|
|
||||||
|
(test render-generic-dispatches-text
|
||||||
|
"render dispatches to render-text for text instances"
|
||||||
|
(multiple-value-bind (b s) (make-capturing-backend)
|
||||||
|
(let ((tx (make-text "Hello" :width 10 :height 1)))
|
||||||
|
(compute-layout (text-layout-node tx) 10 1)
|
||||||
|
(render tx b)
|
||||||
|
(is (search "Hello" (get-output-stream-string s)) "text renders content"))))
|
||||||
|
|
||||||
|
(test component-layout-node-works
|
||||||
|
"component-layout-node returns the right slot for each type"
|
||||||
|
(let ((bx (make-box)) (tx (make-text "")))
|
||||||
|
(is (typep (component-layout-node bx) 'layout-node))
|
||||||
|
(is (typep (component-layout-node tx) 'layout-node))))
|
||||||
|
|
||||||
|
(test component-children-returns-nil
|
||||||
|
"Leaf components have no children"
|
||||||
|
(let ((bx (make-box)) (tx (make-text "")))
|
||||||
|
(is (null (component-children bx)))
|
||||||
|
(is (null (component-children tx)))))
|
||||||
|
|
||||||
|
(test propagate-dirty-marks-component
|
||||||
|
"propagate-dirty marks the component dirty"
|
||||||
|
(let ((c (make-box)))
|
||||||
|
(mark-clean c)
|
||||||
|
(is-false (dirty-p c) "should be clean after mark-clean")
|
||||||
|
(propagate-dirty c)
|
||||||
|
(is-true (dirty-p c) "should be dirty after propagate-dirty")))
|
||||||
|
|
||||||
|
(test available-width-defaults
|
||||||
|
"available-width returns 0 for components without explicit width"
|
||||||
|
(let ((c (make-box)))
|
||||||
|
(is (= (available-width c) 0))))
|
||||||
66
src/components/render.lisp
Normal file
66
src/components/render.lisp
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
;; ── Component Protocol ────────────────────────────────────────
|
||||||
|
|
||||||
|
(defgeneric component-layout-node (component)
|
||||||
|
(:documentation "Return the layout-node for COMPONENT.")
|
||||||
|
(:method ((bx box)) (box-layout-node bx))
|
||||||
|
(:method ((tx text)) (text-layout-node tx)))
|
||||||
|
|
||||||
|
(defgeneric component-children (component)
|
||||||
|
(:documentation "Return the children of COMPONENT, or nil.")
|
||||||
|
(:method ((c t)) nil))
|
||||||
|
|
||||||
|
(defgeneric component-parent (component)
|
||||||
|
(:documentation "Return the parent of COMPONENT, or nil.")
|
||||||
|
(:method ((c t)) nil))
|
||||||
|
|
||||||
|
;; ── Rendering Pipeline ────────────────────────────────────────
|
||||||
|
|
||||||
|
(defgeneric render (component backend)
|
||||||
|
(:documentation "Render COMPONENT at its computed position using BACKEND.")
|
||||||
|
(:method ((c t) backend)
|
||||||
|
(declare (ignore backend))
|
||||||
|
(values)))
|
||||||
|
|
||||||
|
(defmethod render ((bx box) backend)
|
||||||
|
(render-box bx backend))
|
||||||
|
|
||||||
|
(defmethod render ((tx text) backend)
|
||||||
|
(render-text tx backend))
|
||||||
|
|
||||||
|
(defun render-screen (root backend)
|
||||||
|
"Render the component tree ROOT using BACKEND.
|
||||||
|
Computes layout for dirty branches, calls render on each component,
|
||||||
|
and wraps output in synchronized updates."
|
||||||
|
(let ((w (available-width root))
|
||||||
|
(h (available-height root)))
|
||||||
|
(begin-sync backend)
|
||||||
|
(render-node root backend w h)
|
||||||
|
(end-sync backend)))
|
||||||
|
|
||||||
|
(defun render-node (node backend w h)
|
||||||
|
"Render a component NODE and its children."
|
||||||
|
(compute-layout (component-layout-node node) w h)
|
||||||
|
(render node backend)
|
||||||
|
(dolist (child (component-children node))
|
||||||
|
(render-node child backend w h)))
|
||||||
|
|
||||||
|
(defun available-width (component)
|
||||||
|
"Return the available width for COMPONENT (or 80 as default)."
|
||||||
|
(let ((ln (component-layout-node component)))
|
||||||
|
(if ln (layout-node-width ln) 80)))
|
||||||
|
|
||||||
|
(defun available-height (component)
|
||||||
|
"Return the available height for COMPONENT (or 24 as default)."
|
||||||
|
(let ((ln (component-layout-node component)))
|
||||||
|
(if ln (layout-node-height ln) 24)))
|
||||||
|
|
||||||
|
;; ── Dirty Propagation ─────────────────────────────────────────
|
||||||
|
|
||||||
|
(defun propagate-dirty (component)
|
||||||
|
"Mark COMPONENT and all ancestors dirty."
|
||||||
|
(mark-dirty component)
|
||||||
|
(let ((parent (component-parent component)))
|
||||||
|
(when parent
|
||||||
|
(propagate-dirty parent))))
|
||||||
81
src/components/scrollbox.lisp
Normal file
81
src/components/scrollbox.lisp
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass scroll-box (dirty-mixin)
|
||||||
|
((children :initform nil :initarg :children :accessor scroll-box-children :type list)
|
||||||
|
(scroll-y :initform 0 :initarg :scroll-y :accessor scroll-box-scroll-y :type fixnum)
|
||||||
|
(scroll-x :initform 0 :initarg :scroll-x :accessor scroll-box-scroll-x :type fixnum)
|
||||||
|
(sticky-scroll-p :initform t :initarg :sticky-scroll-p :accessor sticky-scroll-p :type boolean)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor scroll-box-layout-node)))
|
||||||
|
|
||||||
|
(defun make-scroll-box (&key (children nil) (scroll-y 0) (scroll-x 0) sticky-scroll-p)
|
||||||
|
(make-instance 'scroll-box
|
||||||
|
:children children :scroll-y scroll-y :scroll-x scroll-x
|
||||||
|
:sticky-scroll-p (if (null sticky-scroll-p) t sticky-scroll-p)))
|
||||||
|
|
||||||
|
(defmethod component-children ((sb scroll-box)) (scroll-box-children sb))
|
||||||
|
(defmethod component-layout-node ((sb scroll-box)) (scroll-box-layout-node sb))
|
||||||
|
|
||||||
|
(defun clamp-scroll (sb)
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-h (if ln (layout-node-height ln) 0))
|
||||||
|
(viewport-w (if ln (layout-node-width ln) 0))
|
||||||
|
(content-h (scroll-box-content-height sb))
|
||||||
|
(content-w (scroll-box-content-width sb)))
|
||||||
|
(setf (scroll-box-scroll-y sb) (max 0 (min (scroll-box-scroll-y sb) (- content-h viewport-h))))
|
||||||
|
(setf (scroll-box-scroll-x sb) (max 0 (min (scroll-box-scroll-x sb) (- content-w viewport-w))))))
|
||||||
|
|
||||||
|
(defun scroll-by (sb dy dx)
|
||||||
|
(incf (scroll-box-scroll-y sb) dy) (incf (scroll-box-scroll-x sb) dx)
|
||||||
|
(clamp-scroll sb) (mark-dirty sb))
|
||||||
|
|
||||||
|
(defun scroll-box-content-height (sb)
|
||||||
|
(reduce #'+ (scroll-box-children sb)
|
||||||
|
:key (lambda (c) (let ((ln (component-layout-node c))) (if ln (max 1 (layout-node-height ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
|
||||||
|
(defun scroll-box-content-width (sb)
|
||||||
|
(reduce #'max (scroll-box-children sb)
|
||||||
|
:key (lambda (c) (let ((ln (component-layout-node c))) (if ln (max 1 (layout-node-width ln)) 1)))
|
||||||
|
:initial-value 0))
|
||||||
|
|
||||||
|
(defmethod render ((sb scroll-box) backend)
|
||||||
|
(let* ((ln (scroll-box-layout-node sb))
|
||||||
|
(vx 0) (vy 0)
|
||||||
|
(vw (if ln (layout-node-width ln) 80))
|
||||||
|
(vh (if ln (layout-node-height ln) 24))
|
||||||
|
(sy (scroll-box-scroll-y sb))
|
||||||
|
(sx (scroll-box-scroll-x sb)))
|
||||||
|
(dolist (child (scroll-box-children sb))
|
||||||
|
(let* ((cln (component-layout-node child))
|
||||||
|
(ch (if cln (layout-node-height cln) 1))
|
||||||
|
(cy vy))
|
||||||
|
(when (and (< (+ cy (- sy)) (+ vh vy)) (> (+ cy (- sy) ch) vy))
|
||||||
|
(draw-text backend (- sx) (+ vy cy (- sy))
|
||||||
|
(format nil "child at ~D" vy) nil nil))
|
||||||
|
(incf vy ch)))
|
||||||
|
(draw-scrollbars sb backend vw vh)))
|
||||||
|
|
||||||
|
(defun scrollbar-thumb (scroll-pos viewport-size content-size)
|
||||||
|
(if (> content-size viewport-size) (/ (float scroll-pos) (- content-size viewport-size)) 0.0))
|
||||||
|
|
||||||
|
(defun draw-scrollbars (sb backend viewport-w viewport-h)
|
||||||
|
(let* ((content-h (scroll-box-content-height sb)) (content-w (scroll-box-content-width sb))
|
||||||
|
(sy (scroll-box-scroll-y sb)) (sx (scroll-box-scroll-x sb)))
|
||||||
|
(when (> content-h viewport-h)
|
||||||
|
(let* ((thumb (scrollbar-thumb sy viewport-h content-h))
|
||||||
|
(thumb-pos (round (* thumb viewport-h))))
|
||||||
|
(draw-rect backend (1- viewport-w) 0 1 viewport-h :bg :background-element)
|
||||||
|
(draw-text backend (1- viewport-w) thumb-pos "█" nil nil)))
|
||||||
|
(when (> content-w viewport-w)
|
||||||
|
(let* ((thumb (scrollbar-thumb sx viewport-w content-w))
|
||||||
|
(thumb-pos (round (* thumb viewport-w))))
|
||||||
|
(draw-rect backend 0 (1- viewport-h) viewport-w 1 :bg :background-element)
|
||||||
|
(draw-text backend thumb-pos (1- viewport-h) "█" nil nil)))))
|
||||||
|
|
||||||
|
(defun update-sticky-scroll (sb)
|
||||||
|
(when (sticky-scroll-p sb)
|
||||||
|
(let* ((content-h (scroll-box-content-height sb))
|
||||||
|
(ln (scroll-box-layout-node sb))
|
||||||
|
(viewport-h (if ln (layout-node-height ln) 24)))
|
||||||
|
(when (>= (scroll-box-scroll-y sb) (- content-h viewport-h 1))
|
||||||
|
(setf (scroll-box-scroll-y sb) (max 0 (- content-h viewport-h)))))))
|
||||||
13
src/components/select-package.lisp
Normal file
13
src/components/select-package.lisp
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
(defpackage :cl-tty.select
|
||||||
|
(:use :cl :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export
|
||||||
|
#:select #:make-select
|
||||||
|
#:select-options #:select-filter
|
||||||
|
#:select-selected-index #:select-on-select
|
||||||
|
#:select-layout-node
|
||||||
|
#:select-filtered-options
|
||||||
|
#:select-next #:select-prev
|
||||||
|
#:select-visible-options
|
||||||
|
#:select-handle-key
|
||||||
|
#:render
|
||||||
|
#:fuzzy-match-p))
|
||||||
94
src/components/select.lisp
Normal file
94
src/components/select.lisp
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
(in-package #:cl-tty.select)
|
||||||
|
|
||||||
|
(defclass select (dirty-mixin)
|
||||||
|
((options :initform nil :initarg :options :accessor select-options :type list)
|
||||||
|
(filter :initform nil :initarg :filter :accessor select-filter :type (or string null))
|
||||||
|
(selected-index :initform 0 :initarg :selected-index :accessor select-selected-index :type fixnum)
|
||||||
|
(on-select :initform nil :initarg :on-select :accessor select-on-select)
|
||||||
|
(layout-node :initform (make-layout-node) :initarg :layout-node :accessor select-layout-node)))
|
||||||
|
|
||||||
|
(defun make-select (&key options filter on-select)
|
||||||
|
(make-instance 'select :options (or options nil) :filter filter :on-select on-select))
|
||||||
|
|
||||||
|
(defmethod component-layout-node ((sel select)) (select-layout-node sel))
|
||||||
|
|
||||||
|
(defun select-filtered-options (sel)
|
||||||
|
(let* ((filter (select-filter sel)) (all-options (select-options sel))
|
||||||
|
(filtered (if (null filter) all-options
|
||||||
|
(let ((lower (string-downcase filter)))
|
||||||
|
(remove-if-not
|
||||||
|
(lambda (opt)
|
||||||
|
(or (getf opt :category)
|
||||||
|
(let ((title (string-downcase (getf opt :title))))
|
||||||
|
(or (search lower title) (fuzzy-match-p lower title)))))
|
||||||
|
all-options)))))
|
||||||
|
(loop for opt in filtered for i from 0
|
||||||
|
collect (list i (position opt all-options) opt))))
|
||||||
|
|
||||||
|
(defun fuzzy-match-p (query target)
|
||||||
|
(let* ((q (remove-duplicates (coerce (string-downcase query) 'list)))
|
||||||
|
(tg (remove-duplicates (coerce (string-downcase target) 'list)))
|
||||||
|
(intersection (length (intersection q tg)))
|
||||||
|
(union (length (union q tg))))
|
||||||
|
(if (zerop union) nil (> (/ (float intersection) union) 0.3))))
|
||||||
|
|
||||||
|
(defun select-clamp-index (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered)))
|
||||||
|
(if (zerop count) (setf (select-selected-index sel) 0)
|
||||||
|
(setf (select-selected-index sel) (max 0 (min (select-selected-index sel) (1- count)))))))
|
||||||
|
|
||||||
|
(defun select-next (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (+ current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx) (mark-dirty sel) (return)))))
|
||||||
|
|
||||||
|
(defun select-prev (sel)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (count (length filtered))
|
||||||
|
(current (select-selected-index sel)))
|
||||||
|
(when (plusp count)
|
||||||
|
(loop for i from 1 below count
|
||||||
|
for idx = (mod (- current i) count)
|
||||||
|
for opt = (third (nth idx filtered))
|
||||||
|
when (not (getf opt :category))
|
||||||
|
do (setf (select-selected-index sel) idx) (mark-dirty sel) (return)))))
|
||||||
|
|
||||||
|
(defun select-handle-key (sel event)
|
||||||
|
(let ((key (key-event-key event)) (ctrl (key-event-ctrl event)))
|
||||||
|
(cond
|
||||||
|
((or (eql key :down) (and ctrl (eql key :n))) (select-next sel) t)
|
||||||
|
((or (eql key :up) (and ctrl (eql key :p))) (select-prev sel) t)
|
||||||
|
((eql key :enter)
|
||||||
|
(let* ((filtered (select-filtered-options sel)) (idx (select-selected-index sel))
|
||||||
|
(item (when (< idx (length filtered)) (third (nth idx filtered)))))
|
||||||
|
(when item (let ((cb (select-on-select sel))) (when cb (funcall cb item)))) t))
|
||||||
|
((eql key :escape) nil) (t nil))))
|
||||||
|
|
||||||
|
(defun select-visible-options (sel)
|
||||||
|
(let* ((ln (select-layout-node sel)) (height (if ln (layout-node-height ln) 80))
|
||||||
|
(filtered (select-filtered-options sel)) (sel-idx (select-selected-index sel))
|
||||||
|
(half (floor (1- height) 2)) (start (max 0 (- sel-idx half)))
|
||||||
|
(end (min (length filtered) (+ start height))))
|
||||||
|
(subseq filtered start end)))
|
||||||
|
|
||||||
|
(defmethod render ((sel select) backend)
|
||||||
|
(let* ((ln (select-layout-node sel)) (x 0) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(visible (select-visible-options sel)) (sel-idx (select-selected-index sel)))
|
||||||
|
(dolist (item visible)
|
||||||
|
(let* ((display-idx (first item)) (option (third item))
|
||||||
|
(title (getf option :title)) (cat (getf option :category))
|
||||||
|
(selected (eql display-idx sel-idx))
|
||||||
|
(display (if (> (length title) (1- w))
|
||||||
|
(concatenate 'string (subseq title 0 (1- w)) "…") title)))
|
||||||
|
(cond (cat (draw-text backend x y display :text-muted nil))
|
||||||
|
(selected
|
||||||
|
(draw-rect backend x y w 1 :bg :accent)
|
||||||
|
(draw-text backend x y display :background :accent))
|
||||||
|
(t (draw-text backend x y display nil nil)))
|
||||||
|
(incf y 1)))
|
||||||
|
(values)))
|
||||||
51
src/components/tabbar.lisp
Normal file
51
src/components/tabbar.lisp
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
(in-package #:cl-tty.container)
|
||||||
|
|
||||||
|
(defclass tab-bar (dirty-mixin)
|
||||||
|
((tabs :initform nil :initarg :tabs :accessor tab-bar-tabs :type list)
|
||||||
|
(active :initform nil :initarg :active :accessor tab-bar-active)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor tab-bar-layout-node)
|
||||||
|
(focusable :initform t :accessor tab-bar-focusable)))
|
||||||
|
|
||||||
|
(defun make-tab-bar (&key tabs active)
|
||||||
|
(make-instance 'tab-bar :tabs (or tabs nil) :active active))
|
||||||
|
|
||||||
|
(defun tab-bar-add (tb id title)
|
||||||
|
(setf (tab-bar-tabs tb) (nconc (tab-bar-tabs tb) (list (list :id id :title title))))
|
||||||
|
(unless (tab-bar-active tb) (setf (tab-bar-active tb) id)) id)
|
||||||
|
|
||||||
|
(defmethod component-layout-node ((tb tab-bar)) (tab-bar-layout-node tb))
|
||||||
|
|
||||||
|
(defun tab-bar-next (tb)
|
||||||
|
(let* ((tabs (tab-bar-tabs tb)) (current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos (let ((next (nth (mod (1+ pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) next) (mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-prev (tb)
|
||||||
|
(let* ((tabs (tab-bar-tabs tb)) (current (tab-bar-active tb))
|
||||||
|
(ids (mapcar (lambda (tab) (getf tab :id)) tabs))
|
||||||
|
(pos (position current ids)))
|
||||||
|
(when pos (let ((prev (nth (mod (1- pos) (length ids)) ids)))
|
||||||
|
(setf (tab-bar-active tb) prev) (mark-dirty tb)))))
|
||||||
|
|
||||||
|
(defun tab-bar-select (tb id) (setf (tab-bar-active tb) id) (mark-dirty tb))
|
||||||
|
|
||||||
|
(defun tab-bar-handle-key (tb event)
|
||||||
|
(case (key-event-key event) (:left (tab-bar-prev tb) t) (:right (tab-bar-next tb) t) (t nil)))
|
||||||
|
|
||||||
|
(defmethod render ((tb tab-bar) backend)
|
||||||
|
(let* ((ln (tab-bar-layout-node tb)) (y 0)
|
||||||
|
(w (if ln (layout-node-width ln) 80))
|
||||||
|
(active-id (tab-bar-active tb)) (tabs (tab-bar-tabs tb)) (x-pos 0))
|
||||||
|
(dolist (tab tabs)
|
||||||
|
(let* ((id (getf tab :id)) (title (getf tab :title))
|
||||||
|
(label (format nil " ~A " title)) (label-len (length label))
|
||||||
|
(is-active (eql id active-id))
|
||||||
|
(fg (if is-active :accent :text-muted))
|
||||||
|
(bg (if is-active :background-element nil)))
|
||||||
|
(when (>= (+ x-pos label-len 2) w)
|
||||||
|
(draw-text backend x-pos y "..." :text-muted nil) (return))
|
||||||
|
(draw-text backend x-pos y label fg bg)
|
||||||
|
(incf x-pos (+ label-len 2)))))
|
||||||
|
(values))
|
||||||
163
src/components/text-input.lisp
Normal file
163
src/components/text-input.lisp
Normal file
@@ -0,0 +1,163 @@
|
|||||||
|
(in-package #:cl-tty.input)
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; TextInput class
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defclass text-input (dirty-mixin)
|
||||||
|
((value :initform "" :initarg :value :accessor text-input-value
|
||||||
|
:type string)
|
||||||
|
(cursor :initform 0 :initarg :cursor :accessor text-input-cursor
|
||||||
|
:type fixnum)
|
||||||
|
(placeholder :initform "" :initarg :placeholder
|
||||||
|
:accessor text-input-placeholder :type string)
|
||||||
|
(max-length :initform nil :initarg :max-length
|
||||||
|
:accessor text-input-max-length)
|
||||||
|
(on-submit :initform nil :initarg :on-submit
|
||||||
|
:accessor text-input-on-submit)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor text-input-layout-node)
|
||||||
|
(focusable :initform t :accessor text-input-focusable)))
|
||||||
|
|
||||||
|
(defun make-text-input (&key value cursor placeholder max-length on-submit)
|
||||||
|
(make-instance 'text-input
|
||||||
|
:value (or value "")
|
||||||
|
:cursor (or cursor 0)
|
||||||
|
:placeholder (or placeholder "")
|
||||||
|
:max-length max-length
|
||||||
|
:on-submit on-submit))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Editing operations
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun text-input-insert (input char)
|
||||||
|
"Insert CHAR at the cursor position in INPUT."
|
||||||
|
(let* ((val (text-input-value input))
|
||||||
|
(pos (text-input-cursor input))
|
||||||
|
(max (text-input-max-length input)))
|
||||||
|
(when (and max (>= (length val) max))
|
||||||
|
(return-from text-input-insert))
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(concatenate 'string
|
||||||
|
(subseq val 0 pos)
|
||||||
|
(string char)
|
||||||
|
(subseq val pos)))
|
||||||
|
(incf (text-input-cursor input))
|
||||||
|
(mark-dirty input)))
|
||||||
|
|
||||||
|
(defun text-input-backspace (input)
|
||||||
|
"Delete character before cursor."
|
||||||
|
(let* ((val (text-input-value input))
|
||||||
|
(pos (text-input-cursor input)))
|
||||||
|
(when (zerop pos) (return-from text-input-backspace))
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(concatenate 'string
|
||||||
|
(subseq val 0 (1- pos))
|
||||||
|
(subseq val pos)))
|
||||||
|
(decf (text-input-cursor input))
|
||||||
|
(mark-dirty input)))
|
||||||
|
|
||||||
|
(defun text-input-delete (input)
|
||||||
|
"Delete character at cursor."
|
||||||
|
(let* ((val (text-input-value input))
|
||||||
|
(pos (text-input-cursor input)))
|
||||||
|
(when (>= pos (length val))
|
||||||
|
(return-from text-input-delete))
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(concatenate 'string
|
||||||
|
(subseq val 0 pos)
|
||||||
|
(subseq val (1+ pos))))
|
||||||
|
(mark-dirty input)))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Cursor movement
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun text-input-move-left (input)
|
||||||
|
(when (plusp (text-input-cursor input))
|
||||||
|
(decf (text-input-cursor input))))
|
||||||
|
|
||||||
|
(defun text-input-move-right (input)
|
||||||
|
(when (< (text-input-cursor input) (length (text-input-value input)))
|
||||||
|
(incf (text-input-cursor input))))
|
||||||
|
|
||||||
|
(defun text-input-move-home (input)
|
||||||
|
(setf (text-input-cursor input) 0))
|
||||||
|
|
||||||
|
(defun text-input-move-end (input)
|
||||||
|
(setf (text-input-cursor input) (length (text-input-value input))))
|
||||||
|
|
||||||
|
(defun text-input-delete-word-before (input)
|
||||||
|
"Delete from cursor back to previous word boundary."
|
||||||
|
(let* ((val (text-input-value input))
|
||||||
|
(pos (text-input-cursor input)))
|
||||||
|
(when (zerop pos)
|
||||||
|
(return-from text-input-delete-word-before))
|
||||||
|
(let* ((start (or (position-if (lambda (c) (not (char= c #\Space)))
|
||||||
|
val :end pos :from-end t)
|
||||||
|
0))
|
||||||
|
(word-start (or (and (plusp start)
|
||||||
|
(position #\Space val :end start :from-end t))
|
||||||
|
0))
|
||||||
|
(delete-start (if (and (zerop word-start)
|
||||||
|
(or (char/= (char val 0) #\Space)
|
||||||
|
(zerop start)))
|
||||||
|
0
|
||||||
|
(if (zerop start)
|
||||||
|
(1+ word-start)
|
||||||
|
(1+ (or (position #\Space val :end start :from-end t)
|
||||||
|
0))))))
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(concatenate 'string
|
||||||
|
(subseq val 0 delete-start)
|
||||||
|
(subseq val pos)))
|
||||||
|
(setf (text-input-cursor input) delete-start)
|
||||||
|
(mark-dirty input))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key event handler
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun handle-text-input (input event)
|
||||||
|
"Process a key-event on a text-input widget."
|
||||||
|
(cond
|
||||||
|
((key-event-ctrl event)
|
||||||
|
(case (key-event-key event)
|
||||||
|
(:a (text-input-move-home input))
|
||||||
|
(:e (text-input-move-end input))
|
||||||
|
(:w (text-input-delete-word-before input))
|
||||||
|
(:u (progn
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(subseq (text-input-value input)
|
||||||
|
(text-input-cursor input)))
|
||||||
|
(setf (text-input-cursor input) 0)
|
||||||
|
(mark-dirty input)))
|
||||||
|
(:k (progn
|
||||||
|
(setf (text-input-value input)
|
||||||
|
(subseq (text-input-value input) 0
|
||||||
|
(text-input-cursor input)))
|
||||||
|
(mark-dirty input)))
|
||||||
|
(t nil)))
|
||||||
|
(t
|
||||||
|
(case (key-event-key event)
|
||||||
|
(:left (text-input-move-left input))
|
||||||
|
(:right (text-input-move-right input))
|
||||||
|
(:home (text-input-move-home input))
|
||||||
|
(:end (text-input-move-end input))
|
||||||
|
(:backspace (text-input-backspace input))
|
||||||
|
(:delete (text-input-delete input))
|
||||||
|
(:enter (let ((cb (text-input-on-submit input)))
|
||||||
|
(when cb (funcall cb (text-input-value input)))))
|
||||||
|
(:tab nil)
|
||||||
|
(:escape nil)
|
||||||
|
;; Insert printable characters
|
||||||
|
(otherwise
|
||||||
|
(let ((ch (code-char (key-event-code event))))
|
||||||
|
(when (and ch (graphic-char-p ch))
|
||||||
|
(text-input-insert input ch))))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Rendering (stub — proper rendering uses theme + backend)
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defmethod render ((in text-input) (backend t))
|
||||||
|
"Render a text-input widget. Full rendering requires *current-backend*,
|
||||||
|
*current-theme*, and the rendering pipeline. This is a no-op stub for
|
||||||
|
unit testing the widget logic."
|
||||||
|
(declare (ignore in backend))
|
||||||
|
(values))
|
||||||
106
src/components/text.lisp
Normal file
106
src/components/text.lisp
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
;; ── Text Renderable ────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass span ()
|
||||||
|
((text :initarg :text :accessor span-text)
|
||||||
|
(bold :initform nil :initarg :bold :accessor span-bold)
|
||||||
|
(italic :initform nil :initarg :italic :accessor span-italic)
|
||||||
|
(underline :initform nil :initarg :underline :accessor span-underline)
|
||||||
|
(reverse :initform nil :initarg :reverse :accessor span-reverse)
|
||||||
|
(dim :initform nil :initarg :dim :accessor span-dim)
|
||||||
|
(fg :initform nil :initarg :fg :accessor span-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor span-bg)))
|
||||||
|
|
||||||
|
(defun span (text &key bold italic underline reverse dim fg bg)
|
||||||
|
(make-instance 'span
|
||||||
|
:text text :bold bold :italic italic
|
||||||
|
:underline underline :reverse reverse :dim dim
|
||||||
|
:fg fg :bg bg))
|
||||||
|
|
||||||
|
(defclass text (dirty-mixin)
|
||||||
|
((layout-node :initform (make-layout-node) :accessor text-layout-node
|
||||||
|
:initarg :layout-node)
|
||||||
|
(content :initform "" :initarg :content :accessor text-content)
|
||||||
|
(spans :initform nil :initarg :spans :accessor text-spans)
|
||||||
|
(fg :initform nil :initarg :fg :accessor text-fg)
|
||||||
|
(bg :initform nil :initarg :bg :accessor text-bg)
|
||||||
|
(wrap-mode :initform :word :initarg :wrap-mode :accessor text-wrap-mode)))
|
||||||
|
|
||||||
|
(defun make-text (content &key fg bg wrap-mode width height spans)
|
||||||
|
(make-instance 'text
|
||||||
|
:content content
|
||||||
|
:fg fg :bg bg
|
||||||
|
:wrap-mode (or wrap-mode :word)
|
||||||
|
:spans spans
|
||||||
|
:layout-node (make-layout-node :direction :column
|
||||||
|
:width width :height height)))
|
||||||
|
|
||||||
|
(defun render-text (text-object backend)
|
||||||
|
"Render TEXT-OBJECT at its computed layout position using BACKEND."
|
||||||
|
(let ((ln (text-layout-node text-object))
|
||||||
|
(content (text-content text-object))
|
||||||
|
(fg (text-fg text-object))
|
||||||
|
(bg (text-bg text-object))
|
||||||
|
(wrap (text-wrap-mode text-object))
|
||||||
|
(spans (text-spans text-object)))
|
||||||
|
(declare (ignore spans))
|
||||||
|
(let ((x (layout-node-x ln))
|
||||||
|
(y (layout-node-y ln))
|
||||||
|
(w (layout-node-width ln))
|
||||||
|
(h (layout-node-height ln)))
|
||||||
|
(when (or (zerop (length content)) (zerop w) (zerop h))
|
||||||
|
(return-from render-text (values)))
|
||||||
|
(if (eql wrap :none)
|
||||||
|
(let ((display (subseq content 0 (min (length content) w))))
|
||||||
|
(draw-text backend x y display fg bg))
|
||||||
|
(let ((lines (word-wrap content w))
|
||||||
|
(max-lines h))
|
||||||
|
(loop for line in lines
|
||||||
|
for row from 0 below max-lines
|
||||||
|
do (draw-text backend x (+ y row) line fg bg)))))))
|
||||||
|
|
||||||
|
(defun word-wrap (text max-width)
|
||||||
|
"Split TEXT into lines, each <= MAX-WIDTH chars.
|
||||||
|
Breaks at word boundaries. Words exceeding MAX-WIDTH are hard-broken."
|
||||||
|
(if (or (zerop max-width) (zerop (length text)))
|
||||||
|
(list "")
|
||||||
|
(let ((words (split-string text)) (lines nil) (current nil) (current-len 0))
|
||||||
|
(dolist (word words)
|
||||||
|
(let ((wl (length word)))
|
||||||
|
(cond ((<= wl max-width)
|
||||||
|
(if (and current (<= (+ current-len 1 wl) max-width))
|
||||||
|
(push word current)
|
||||||
|
(progn
|
||||||
|
(when current
|
||||||
|
(push (format nil "~{~A~^ ~}" (nreverse current)) lines))
|
||||||
|
(setf current (list word))
|
||||||
|
(setf current-len wl))))
|
||||||
|
(t
|
||||||
|
(when current
|
||||||
|
(push (format nil "~{~A~^ ~}" (nreverse current)) lines)
|
||||||
|
(setf current nil)
|
||||||
|
(setf current-len 0))
|
||||||
|
(loop for i from 0 below wl by max-width
|
||||||
|
do (push (subseq word i (min (+ i max-width) wl)) lines))))))
|
||||||
|
(when current
|
||||||
|
(push (format nil "~{~A~^ ~}" (nreverse current)) lines))
|
||||||
|
(or (nreverse lines) (list "")))))
|
||||||
|
|
||||||
|
(defun split-string (string)
|
||||||
|
"Split STRING into words separated by whitespace."
|
||||||
|
(loop with words = nil
|
||||||
|
with start = 0
|
||||||
|
with len = (length string)
|
||||||
|
while (< start len)
|
||||||
|
do (let ((ws-start (position-if (lambda (c) (find c '(#\Space #\Tab #\Newline)))
|
||||||
|
string :start start)))
|
||||||
|
(if ws-start
|
||||||
|
(progn
|
||||||
|
(when (> ws-start start)
|
||||||
|
(push (subseq string start ws-start) words))
|
||||||
|
(setf start (1+ ws-start)))
|
||||||
|
(progn
|
||||||
|
(push (subseq string start) words)
|
||||||
|
(setf start len))))
|
||||||
|
finally (return (nreverse words))))
|
||||||
258
src/components/textarea.lisp
Normal file
258
src/components/textarea.lisp
Normal file
@@ -0,0 +1,258 @@
|
|||||||
|
(in-package #:cl-tty.input)
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Utility: split string (local copy for dependency-free operation)
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun %split-string (string separator)
|
||||||
|
"Split STRING at each occurrence of SEPARATOR. Returns list of strings."
|
||||||
|
(loop with start = 0
|
||||||
|
for pos = (position separator string :start start)
|
||||||
|
collect (subseq string start pos)
|
||||||
|
while pos
|
||||||
|
do (setf start (1+ pos))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Textarea class
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defclass textarea (dirty-mixin)
|
||||||
|
((value :initform "" :initarg :value :accessor textarea-value :type string)
|
||||||
|
(cursor-row :initform 0 :accessor textarea-cursor-row :type fixnum)
|
||||||
|
(cursor-col :initform 0 :accessor textarea-cursor-col :type fixnum)
|
||||||
|
(selection-start :initform nil :accessor textarea-selection-start)
|
||||||
|
(undo-stack :initform (make-array 100 :fill-pointer 0)
|
||||||
|
:accessor textarea-undo-stack)
|
||||||
|
(redo-stack :initform (make-array 100 :fill-pointer 0)
|
||||||
|
:accessor textarea-redo-stack)
|
||||||
|
(on-submit :initform nil :initarg :on-submit :accessor textarea-on-submit)
|
||||||
|
(layout-node :initform (make-layout-node) :accessor textarea-layout-node)
|
||||||
|
(focusable :initform t :accessor textarea-focusable)))
|
||||||
|
|
||||||
|
(defun make-textarea (&key value on-submit)
|
||||||
|
(make-instance 'textarea
|
||||||
|
:value (or value "")
|
||||||
|
:on-submit on-submit))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Line helpers
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun textarea-lines (ta)
|
||||||
|
"Split value into lines."
|
||||||
|
(%split-string (textarea-value ta) #\Newline))
|
||||||
|
|
||||||
|
(defun textarea-line-count (ta)
|
||||||
|
"Number of lines in value."
|
||||||
|
(length (textarea-lines ta)))
|
||||||
|
|
||||||
|
(defun textarea-ensure-cursor (ta)
|
||||||
|
"Clamp cursor to valid range."
|
||||||
|
(let ((lines (textarea-lines ta)))
|
||||||
|
(setf (textarea-cursor-row ta)
|
||||||
|
(max 0 (min (textarea-cursor-row ta) (1- (length lines)))))
|
||||||
|
(let ((line-len (length (nth (textarea-cursor-row ta) lines))))
|
||||||
|
(setf (textarea-cursor-col ta)
|
||||||
|
(max 0 (min (textarea-cursor-col ta) line-len))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Utility: join strings with newline
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun %join-lines (lines)
|
||||||
|
"Join a sequence of strings with newlines."
|
||||||
|
(with-output-to-string (s)
|
||||||
|
(loop for line across (if (listp lines) (coerce lines 'vector) lines)
|
||||||
|
for first = t then nil
|
||||||
|
do (unless first (write-char #\Newline s))
|
||||||
|
(write-string line s))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Text manipulation
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun textarea-insert-char (ta char)
|
||||||
|
"Insert CHAR at the cursor position."
|
||||||
|
(textarea-push-undo ta)
|
||||||
|
(let* ((lines (coerce (textarea-lines ta) 'vector))
|
||||||
|
(row (textarea-cursor-row ta))
|
||||||
|
(col (textarea-cursor-col ta)))
|
||||||
|
(if (< row (length lines))
|
||||||
|
(let* ((line (aref lines row))
|
||||||
|
(new-line (concatenate 'string
|
||||||
|
(subseq line 0 col)
|
||||||
|
(string char)
|
||||||
|
(subseq line col))))
|
||||||
|
(setf (aref lines row) new-line)
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(%join-lines lines))
|
||||||
|
(incf (textarea-cursor-col ta))
|
||||||
|
(mark-dirty ta))
|
||||||
|
(progn
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(concatenate 'string (textarea-value ta) (string char)))
|
||||||
|
(incf (textarea-cursor-col ta))
|
||||||
|
(mark-dirty ta)))))
|
||||||
|
|
||||||
|
(defun textarea-newline (ta)
|
||||||
|
"Insert a newline at the cursor."
|
||||||
|
(textarea-push-undo ta)
|
||||||
|
(let* ((lines (coerce (textarea-lines ta) 'vector))
|
||||||
|
(row (textarea-cursor-row ta))
|
||||||
|
(col (textarea-cursor-col ta)))
|
||||||
|
(if (< row (length lines))
|
||||||
|
(let* ((line (aref lines row))
|
||||||
|
(before (subseq line 0 col))
|
||||||
|
(after (subseq line col)))
|
||||||
|
(setf (aref lines row) before)
|
||||||
|
(let ((new-lines (concatenate 'vector
|
||||||
|
(subseq lines 0 (1+ row))
|
||||||
|
(vector after)
|
||||||
|
(subseq lines (1+ row)))))
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(%join-lines new-lines)))
|
||||||
|
(incf (textarea-cursor-row ta))
|
||||||
|
(setf (textarea-cursor-col ta) 0)
|
||||||
|
(mark-dirty ta))
|
||||||
|
(progn
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(concatenate 'string (textarea-value ta) (string #\Newline)))
|
||||||
|
(incf (textarea-cursor-row ta))
|
||||||
|
(setf (textarea-cursor-col ta) 0)
|
||||||
|
(mark-dirty ta)))))
|
||||||
|
|
||||||
|
(defun textarea-backspace (ta)
|
||||||
|
"Delete character before cursor."
|
||||||
|
(textarea-push-undo ta)
|
||||||
|
(let* ((lines (coerce (textarea-lines ta) 'vector))
|
||||||
|
(row (textarea-cursor-row ta))
|
||||||
|
(col (textarea-cursor-col ta)))
|
||||||
|
(cond
|
||||||
|
((and (zerop row) (zerop col))
|
||||||
|
nil) ;; nothing to delete
|
||||||
|
((zerop col)
|
||||||
|
;; Join with previous line
|
||||||
|
(let* ((prev (aref lines (1- row)))
|
||||||
|
(curr (aref lines row))
|
||||||
|
(new-pos (length prev)))
|
||||||
|
(setf (aref lines (1- row))
|
||||||
|
(concatenate 'string prev curr))
|
||||||
|
(let ((new-lines (concatenate 'vector
|
||||||
|
(subseq lines 0 row)
|
||||||
|
(subseq lines (1+ row)))))
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(%join-lines new-lines)))
|
||||||
|
(decf (textarea-cursor-row ta))
|
||||||
|
(setf (textarea-cursor-col ta) new-pos)
|
||||||
|
(mark-dirty ta)))
|
||||||
|
(t
|
||||||
|
(let* ((line (aref lines row))
|
||||||
|
(new-line (concatenate 'string
|
||||||
|
(subseq line 0 (1- col))
|
||||||
|
(subseq line col))))
|
||||||
|
(setf (aref lines row) new-line)
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(%join-lines lines))
|
||||||
|
(decf (textarea-cursor-col ta))
|
||||||
|
(mark-dirty ta))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Cursor movement
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun textarea-move-up (ta)
|
||||||
|
(decf (textarea-cursor-row ta))
|
||||||
|
(textarea-ensure-cursor ta))
|
||||||
|
|
||||||
|
(defun textarea-move-down (ta)
|
||||||
|
(incf (textarea-cursor-row ta))
|
||||||
|
(textarea-ensure-cursor ta))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Undo/redo
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun textarea-push-undo (ta)
|
||||||
|
"Save current value on undo stack."
|
||||||
|
(let ((stack (textarea-undo-stack ta)))
|
||||||
|
(when (>= (length stack) (array-total-size stack))
|
||||||
|
(setf (textarea-undo-stack ta)
|
||||||
|
(make-array 100 :fill-pointer 0)))
|
||||||
|
(vector-push (textarea-value ta) stack)
|
||||||
|
;; Clear redo stack on new action
|
||||||
|
(setf (fill-pointer (textarea-redo-stack ta)) 0)))
|
||||||
|
|
||||||
|
(defun textarea-undo (ta)
|
||||||
|
(let ((stack (textarea-undo-stack ta)))
|
||||||
|
(when (plusp (length stack))
|
||||||
|
(let ((prev (vector-pop stack)))
|
||||||
|
(vector-push (textarea-value ta) (textarea-redo-stack ta))
|
||||||
|
(setf (textarea-value ta) prev)
|
||||||
|
(textarea-ensure-cursor ta)
|
||||||
|
(mark-dirty ta)))))
|
||||||
|
|
||||||
|
(defun textarea-redo (ta)
|
||||||
|
(let ((stack (textarea-redo-stack ta)))
|
||||||
|
(when (plusp (length stack))
|
||||||
|
(let ((next (vector-pop stack)))
|
||||||
|
(vector-push (textarea-value ta) (textarea-undo-stack ta))
|
||||||
|
(setf (textarea-value ta) next)
|
||||||
|
(textarea-ensure-cursor ta)
|
||||||
|
(mark-dirty ta)))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Key event handler
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defun handle-textarea-input (ta event)
|
||||||
|
"Process a key-event on a textarea widget."
|
||||||
|
(cond
|
||||||
|
((key-event-ctrl event)
|
||||||
|
(case (key-event-key event)
|
||||||
|
(:z (textarea-undo ta))
|
||||||
|
(:y (textarea-redo ta))
|
||||||
|
;; Ctrl+A/E: home/end
|
||||||
|
(:a (setf (textarea-cursor-col ta) 0))
|
||||||
|
(:e (let ((lines (textarea-lines ta)))
|
||||||
|
(when (< (textarea-cursor-row ta) (length lines))
|
||||||
|
(setf (textarea-cursor-col ta)
|
||||||
|
(length (nth (textarea-cursor-row ta) lines))))))
|
||||||
|
(t nil)))
|
||||||
|
(t
|
||||||
|
(case (key-event-key event)
|
||||||
|
(:left (decf (textarea-cursor-col ta))
|
||||||
|
(textarea-ensure-cursor ta))
|
||||||
|
(:right (incf (textarea-cursor-col ta))
|
||||||
|
(textarea-ensure-cursor ta))
|
||||||
|
(:up (textarea-move-up ta))
|
||||||
|
(:down (textarea-move-down ta))
|
||||||
|
(:home (setf (textarea-cursor-col ta) 0))
|
||||||
|
(:end (let ((lines (textarea-lines ta)))
|
||||||
|
(when (< (textarea-cursor-row ta) (length lines))
|
||||||
|
(setf (textarea-cursor-col ta)
|
||||||
|
(length (nth (textarea-cursor-row ta) lines))))))
|
||||||
|
(:enter (let ((cb (textarea-on-submit ta)))
|
||||||
|
(if cb
|
||||||
|
(funcall cb (textarea-value ta))
|
||||||
|
(textarea-newline ta))))
|
||||||
|
(:backspace (textarea-backspace ta))
|
||||||
|
(:delete (let* ((lines (textarea-lines ta))
|
||||||
|
(row (textarea-cursor-row ta))
|
||||||
|
(col (textarea-cursor-col ta))
|
||||||
|
(line (nth row lines)))
|
||||||
|
(when (and line (< col (length line)))
|
||||||
|
(textarea-push-undo ta)
|
||||||
|
(setf (nth row lines)
|
||||||
|
(concatenate 'string
|
||||||
|
(subseq line 0 col)
|
||||||
|
(subseq line (1+ col))))
|
||||||
|
(setf (textarea-value ta)
|
||||||
|
(%join-lines lines))
|
||||||
|
(mark-dirty ta))))
|
||||||
|
;; Character insertion
|
||||||
|
(otherwise
|
||||||
|
(let ((ch (code-char (key-event-code event))))
|
||||||
|
(when (and ch (graphic-char-p ch))
|
||||||
|
(textarea-insert-char ta ch))))))))
|
||||||
|
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
;;; Rendering (stub — proper rendering uses theme + backend)
|
||||||
|
;;; ---------------------------------------------------------------------------
|
||||||
|
(defmethod render ((ta textarea) (backend t))
|
||||||
|
"Render a textarea widget. Full rendering requires *current-backend*,
|
||||||
|
*current-theme*, and the rendering pipeline. This is a no-op stub for
|
||||||
|
unit testing the widget logic."
|
||||||
|
(declare (ignore ta backend))
|
||||||
|
(values))
|
||||||
61
src/components/theme-tests.lisp
Normal file
61
src/components/theme-tests.lisp
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
(in-package :cl-tty-box-test)
|
||||||
|
(in-suite box-suite)
|
||||||
|
|
||||||
|
(test theme-create-default
|
||||||
|
"A theme can be created with default mode"
|
||||||
|
(let ((th (make-theme)))
|
||||||
|
(is (typep th 'theme))
|
||||||
|
(is (eql (theme-mode th) :dark))))
|
||||||
|
|
||||||
|
(test theme-create-light
|
||||||
|
"A theme can be created in light mode"
|
||||||
|
(let ((th (make-theme :mode :light)))
|
||||||
|
(is (eql (theme-mode th) :light))))
|
||||||
|
|
||||||
|
(test theme-color-set-and-get
|
||||||
|
"theme-color setf/get works"
|
||||||
|
(let ((th (make-theme)))
|
||||||
|
(setf (theme-color th :primary) "#FFD700")
|
||||||
|
(is (string= (theme-color th :primary) "#FFD700"))))
|
||||||
|
|
||||||
|
(test theme-color-unknown-returns-nil
|
||||||
|
"Unknown roles return nil"
|
||||||
|
(let ((th (make-theme)))
|
||||||
|
(is (null (theme-color th :nonexistent)))))
|
||||||
|
|
||||||
|
(test load-default-dark-preset
|
||||||
|
"Loading the default dark preset populates roles"
|
||||||
|
(let ((th (make-theme :mode :dark)))
|
||||||
|
(load-preset th :default)
|
||||||
|
(is (string= (theme-color th :primary) "#FFD700"))
|
||||||
|
(is (string= (theme-color th :background) "#1A1A2E"))
|
||||||
|
(is (string= (theme-color th :error) "#FF4444"))))
|
||||||
|
|
||||||
|
(test load-default-light-preset
|
||||||
|
"Light variant has different colors"
|
||||||
|
(let ((th (make-theme :mode :light)))
|
||||||
|
(load-preset th :default)
|
||||||
|
(is (string= (theme-color th :primary) "#B8860B"))
|
||||||
|
(is (string= (theme-color th :background) "#F8F9FA"))))
|
||||||
|
|
||||||
|
(test load-nord-preset
|
||||||
|
"Nord preset has different colors than default"
|
||||||
|
(let ((th (make-theme :mode :dark)))
|
||||||
|
(load-preset th :nord)
|
||||||
|
(is (string= (theme-color th :primary) "#88C0D0"))
|
||||||
|
(is (string= (theme-color th :background) "#2E3440"))))
|
||||||
|
|
||||||
|
(test load-preset-unknown-warns
|
||||||
|
"Unknown preset warns but doesn't error"
|
||||||
|
(let ((th (make-theme)))
|
||||||
|
(signals warning (load-preset th :nonexistent))
|
||||||
|
(is (null (theme-color th :primary)))))
|
||||||
|
|
||||||
|
(test preset-switch-mode
|
||||||
|
"Switching mode and reloading changes colors"
|
||||||
|
(let ((th (make-theme :mode :dark)))
|
||||||
|
(load-preset th :default)
|
||||||
|
(is (string= (theme-color th :background) "#1A1A2E"))
|
||||||
|
(setf (theme-mode th) :light)
|
||||||
|
(load-preset th :default)
|
||||||
|
(is (string= (theme-color th :background) "#F8F9FA"))))
|
||||||
87
src/components/theme.lisp
Normal file
87
src/components/theme.lisp
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
(in-package :cl-tty.box)
|
||||||
|
|
||||||
|
;; ── Theme Engine ──────────────────────────────────────────────
|
||||||
|
|
||||||
|
(defclass theme ()
|
||||||
|
((mode :initform :dark :initarg :mode :accessor theme-mode)
|
||||||
|
(roles :initform (make-hash-table) :accessor theme-roles)))
|
||||||
|
|
||||||
|
(defun make-theme (&key (mode :dark))
|
||||||
|
(make-instance 'theme :mode mode))
|
||||||
|
|
||||||
|
(defun theme-color (theme role)
|
||||||
|
"Resolve a semantic ROLE to a hex color string in THEME."
|
||||||
|
(gethash role (theme-roles theme)))
|
||||||
|
|
||||||
|
(defun (setf theme-color) (hex theme role)
|
||||||
|
"Set the hex color for a semantic ROLE in THEME."
|
||||||
|
(setf (gethash role (theme-roles theme)) hex))
|
||||||
|
|
||||||
|
(defparameter *presets* (make-hash-table :test #'eq))
|
||||||
|
|
||||||
|
(defmacro define-preset (name &key dark light)
|
||||||
|
"Define a theme preset with DARK and LIGHT variants.
|
||||||
|
NAME should be a keyword (e.g., :default, :nord)."
|
||||||
|
(check-type name keyword)
|
||||||
|
`(setf (gethash ,name *presets*) '(:dark ,dark :light ,light)))
|
||||||
|
|
||||||
|
(defun load-preset (theme preset-name)
|
||||||
|
"Load PRESET-NAME (a keyword) into THEME, overwriting role mappings."
|
||||||
|
(let ((preset (gethash preset-name *presets*)))
|
||||||
|
(if preset
|
||||||
|
(let* ((variant (if (eql (theme-mode theme) :dark)
|
||||||
|
(getf preset :dark)
|
||||||
|
(getf preset :light)))
|
||||||
|
(roles (theme-roles theme)))
|
||||||
|
(clrhash roles)
|
||||||
|
(loop for (role hex) on variant by #'cddr
|
||||||
|
do (setf (gethash role roles) hex)))
|
||||||
|
(warn "Unknown preset: ~S" preset-name))))
|
||||||
|
|
||||||
|
(define-preset :default
|
||||||
|
:dark (:primary "#FFD700" :secondary "#B8860B" :accent "#FFA500"
|
||||||
|
:error "#FF4444" :warning "#FF8800" :success "#44BB44" :info "#4488FF"
|
||||||
|
:text "#FFFFFF" :text-muted "#888888"
|
||||||
|
:background "#1A1A2E" :background-panel "#16213E" :background-element "#0F3460"
|
||||||
|
:border "#334155" :border-active "#FFD700"
|
||||||
|
:diff-added "#164B16" :diff-removed "#4B1616" :diff-context "#1A1A2E"
|
||||||
|
:markdown-heading "#FFD700" :markdown-code "#334155"
|
||||||
|
:markdown-link "#4488FF" :markdown-quote "#888888"
|
||||||
|
:syntax-keyword "#FF79C6" :syntax-function "#50FA7B"
|
||||||
|
:syntax-string "#F1FA8C" :syntax-number "#BD93F9"
|
||||||
|
:syntax-comment "#6272A4" :syntax-type "#8BE9FD")
|
||||||
|
:light (:primary "#B8860B" :secondary "#8B6914" :accent "#FF8C00"
|
||||||
|
:error "#CC0000" :warning "#CC6600" :success "#228B22" :info "#0055CC"
|
||||||
|
:text "#1A1A2E" :text-muted "#888888"
|
||||||
|
:background "#F8F9FA" :background-panel "#FFFFFF" :background-element "#E9ECEF"
|
||||||
|
:border "#DEE2E6" :border-active "#B8860B"
|
||||||
|
:diff-added "#DFD" :diff-removed "#FDD" :diff-context "#F8F9FA"
|
||||||
|
:markdown-heading "#B8860B" :markdown-code "#E9ECEF"
|
||||||
|
:markdown-link "#0055CC" :markdown-quote "#888888"
|
||||||
|
:syntax-keyword "#D63384" :syntax-function "#198754"
|
||||||
|
:syntax-string "#FFC107" :syntax-number "#6F42C1"
|
||||||
|
:syntax-comment "#6C757D" :syntax-type "#0DCAF0"))
|
||||||
|
|
||||||
|
(define-preset :nord
|
||||||
|
:dark (:primary "#88C0D0" :secondary "#81A1C1" :accent "#5E81AC"
|
||||||
|
:error "#BF616A" :warning "#D08770" :success "#A3BE8C" :info "#B48EAD"
|
||||||
|
:text "#ECEFF4" :text-muted "#616E88"
|
||||||
|
:background "#2E3440" :background-panel "#3B4252" :background-element "#434C5E"
|
||||||
|
:border "#4C566A" :border-active "#88C0D0"
|
||||||
|
:diff-added "#164B16" :diff-removed "#4B1616" :diff-context "#2E3440"
|
||||||
|
:markdown-heading "#88C0D0" :markdown-code "#3B4252"
|
||||||
|
:markdown-link "#81A1C1" :markdown-quote "#616E88"
|
||||||
|
:syntax-keyword "#81A1C1" :syntax-function "#A3BE8C"
|
||||||
|
:syntax-string "#EBCB8B" :syntax-number "#B48EAD"
|
||||||
|
:syntax-comment "#616E88" :syntax-type "#88C0D0")
|
||||||
|
:light (:primary "#5E81AC" :secondary "#81A1C1" :accent "#88C0D0"
|
||||||
|
:error "#BF616A" :warning "#D08770" :success "#A3BE8C" :info "#B48EAD"
|
||||||
|
:text "#2E3440" :text-muted "#8F9BB3"
|
||||||
|
:background "#ECEFF4" :background-panel "#FFFFFF" :background-element "#E5E9F0"
|
||||||
|
:border "#D8DEE9" :border-active "#5E81AC"
|
||||||
|
:diff-added "#DFD" :diff-removed "#FDD" :diff-context "#ECEFF4"
|
||||||
|
:markdown-heading "#5E81AC" :markdown-code "#E5E9F0"
|
||||||
|
:markdown-link "#81A1C1" :markdown-quote "#8F9BB3"
|
||||||
|
:syntax-keyword "#81A1C1" :syntax-function "#A3BE8C"
|
||||||
|
:syntax-string "#D08770" :syntax-number "#B48EAD"
|
||||||
|
:syntax-comment "#8F9BB3" :syntax-type "#88C0D0"))
|
||||||
43
tests/dialog-tests.lisp
Normal file
43
tests/dialog-tests.lisp
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
;;; dialog-tests.lisp — Tests for cl-tty.dialog
|
||||||
|
|
||||||
|
(defpackage :cl-tty-dialog-test
|
||||||
|
(:use :cl :cl-tty.dialog :fiveam))
|
||||||
|
|
||||||
|
(in-package :cl-tty-dialog-test)
|
||||||
|
|
||||||
|
(def-suite dialog-suite :description "Dialog + Toast tests for cl-tty.dialog")
|
||||||
|
(in-suite dialog-suite)
|
||||||
|
|
||||||
|
(def-test dialog-create ()
|
||||||
|
(let ((d (make-instance 'dialog :title "Test")))
|
||||||
|
(is-true (typep d 'dialog))
|
||||||
|
(is (equal "Test" (dialog-title d)))))
|
||||||
|
|
||||||
|
(def-test dialog-size-small ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :small)
|
||||||
|
(is (= 40 w))
|
||||||
|
(is (= 8 h))))
|
||||||
|
|
||||||
|
(def-test dialog-size-medium ()
|
||||||
|
(multiple-value-bind (w h) (dialog-size-pixels :medium)
|
||||||
|
(is (= 60 w))
|
||||||
|
(is (= 16 h))))
|
||||||
|
|
||||||
|
(def-test dialog-push-pop ()
|
||||||
|
(let ((*dialog-stack* nil))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D1"))
|
||||||
|
(is (= 1 (length *dialog-stack*)))
|
||||||
|
(push-dialog (make-instance 'dialog :title "D2"))
|
||||||
|
(is (= 2 (length *dialog-stack*)))
|
||||||
|
(pop-dialog)
|
||||||
|
(is (= 1 (length *dialog-stack*)))))
|
||||||
|
|
||||||
|
(def-test toast-create ()
|
||||||
|
(let ((*toasts* nil))
|
||||||
|
(toast "Hello" :variant :info :duration 0)
|
||||||
|
(is (= 1 (length *toasts*)))))
|
||||||
|
|
||||||
|
(def-test toast-dismiss ()
|
||||||
|
(let ((*toasts* (list (make-instance 'toast :message "T" :variant :info))))
|
||||||
|
(dismiss-toast (first *toasts*))
|
||||||
|
(is (= 0 (length *toasts*)))))
|
||||||
269
tests/input-tests.lisp
Normal file
269
tests/input-tests.lisp
Normal file
@@ -0,0 +1,269 @@
|
|||||||
|
(defpackage :cl-tty-input-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package :cl-tty-input-test)
|
||||||
|
|
||||||
|
(def-suite input-suite :description "Text input and keybinding tests")
|
||||||
|
(in-suite input-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'input-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
;; ── Key Event Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test key-event-construction
|
||||||
|
"A key-event can be created and queried."
|
||||||
|
(let ((e (make-key-event :key :a :ctrl t :alt nil)))
|
||||||
|
(is (eql (key-event-key e) :a))
|
||||||
|
(is-true (key-event-ctrl e))
|
||||||
|
(is-false (key-event-alt e))))
|
||||||
|
|
||||||
|
(test key-event-defaults
|
||||||
|
"Fields default to NIL/nil."
|
||||||
|
(let ((e (make-key-event :key :space)))
|
||||||
|
(is (eql (key-event-key e) :space))
|
||||||
|
(is-false (key-event-ctrl e))
|
||||||
|
(is-false (key-event-alt e))
|
||||||
|
(is-false (key-event-shift e))))
|
||||||
|
|
||||||
|
(test mouse-event-construction
|
||||||
|
"A mouse-event can be created and queried."
|
||||||
|
(let ((e (make-mouse-event :type :press :button :left :x 10 :y 5)))
|
||||||
|
(is (eql (mouse-event-type e) :press))
|
||||||
|
(is (eql (mouse-event-button e) :left))
|
||||||
|
(is (= (mouse-event-x e) 10))
|
||||||
|
(is (= (mouse-event-y e) 5))))
|
||||||
|
|
||||||
|
;; ── TextInput Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test text-input-empty
|
||||||
|
"A newly created text-input has empty value and cursor at 0."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(is (string= (text-input-value in) ""))
|
||||||
|
(is (= (text-input-cursor in) 0))))
|
||||||
|
|
||||||
|
(test text-input-insert-char
|
||||||
|
"Inserting a character appends and moves cursor."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-insert-multiple
|
||||||
|
"Inserting multiple characters works left to right."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(handle-text-input in (make-key-event :key :h :code (char-code #\h)))
|
||||||
|
(handle-text-input in (make-key-event :key :e :code (char-code #\e)))
|
||||||
|
(handle-text-input in (make-key-event :key :l :code (char-code #\l)))
|
||||||
|
(handle-text-input in (make-key-event :key :l :code (char-code #\l)))
|
||||||
|
(handle-text-input in (make-key-event :key :o :code (char-code #\o)))
|
||||||
|
(is (string= (text-input-value in) "hello"))
|
||||||
|
(is (= (text-input-cursor in) 5))))
|
||||||
|
|
||||||
|
(test text-input-backspace
|
||||||
|
"Backspace removes the character before the cursor."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :backspace))
|
||||||
|
(is (string= (text-input-value in) "a"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-backspace-at-start
|
||||||
|
"Backspace at position 0 does nothing."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 0)))
|
||||||
|
(handle-text-input in (make-key-event :key :backspace))
|
||||||
|
(is (string= (text-input-value in) "ab"))
|
||||||
|
(is (= (text-input-cursor in) 0))))
|
||||||
|
|
||||||
|
(test text-input-delete
|
||||||
|
"Delete removes the character at the cursor."
|
||||||
|
(let ((in (make-text-input :value "abc" :cursor 1)))
|
||||||
|
(handle-text-input in (make-key-event :key :delete))
|
||||||
|
(is (string= (text-input-value in) "ac"))
|
||||||
|
(is (= (text-input-cursor in) 1))))
|
||||||
|
|
||||||
|
(test text-input-cursor-left-right
|
||||||
|
"Cursor moves left and right."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :left))
|
||||||
|
(is (= (text-input-cursor in) 1))
|
||||||
|
(handle-text-input in (make-key-event :key :right))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-cursor-bounds
|
||||||
|
"Cursor cannot move past start or end."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 0)))
|
||||||
|
(handle-text-input in (make-key-event :key :left))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(setf (text-input-cursor in) 2)
|
||||||
|
(handle-text-input in (make-key-event :key :right))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-home-end
|
||||||
|
"Home moves to start, End moves to end."
|
||||||
|
(let ((in (make-text-input :value "hello" :cursor 3)))
|
||||||
|
(handle-text-input in (make-key-event :key :home))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(handle-text-input in (make-key-event :key :end))
|
||||||
|
(is (= (text-input-cursor in) 5))))
|
||||||
|
|
||||||
|
(test text-input-max-length
|
||||||
|
"Max-length prevents inserting beyond the limit."
|
||||||
|
(let ((in (make-text-input :max-length 3)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-text-input in (make-key-event :key :b :code (char-code #\b)))
|
||||||
|
(handle-text-input in (make-key-event :key :c :code (char-code #\c)))
|
||||||
|
(handle-text-input in (make-key-event :key :d :code (char-code #\d)))
|
||||||
|
(is (string= (text-input-value in) "abc"))))
|
||||||
|
|
||||||
|
(test text-input-placeholder
|
||||||
|
"Placeholder is stored but does not affect value."
|
||||||
|
(let ((in (make-text-input :placeholder "Type here...")))
|
||||||
|
(is (string= (text-input-placeholder in) "Type here..."))
|
||||||
|
(is (string= (text-input-value in) ""))))
|
||||||
|
|
||||||
|
(test text-input-on-submit
|
||||||
|
"On-submit callback fires on Enter."
|
||||||
|
(let ((result (list nil)))
|
||||||
|
(let ((in (make-text-input :value "hello"
|
||||||
|
:on-submit (lambda (v) (setf (car result) v)))))
|
||||||
|
(handle-text-input in (make-key-event :key :enter))
|
||||||
|
(is (string= (car result) "hello")))))
|
||||||
|
|
||||||
|
(test text-input-ctrl-a-e
|
||||||
|
"Ctrl+A moves to home, Ctrl+E moves to end."
|
||||||
|
(let ((in (make-text-input :value "abc" :cursor 2)))
|
||||||
|
(handle-text-input in (make-key-event :key :a :ctrl t))
|
||||||
|
(is (= (text-input-cursor in) 0))
|
||||||
|
(handle-text-input in (make-key-event :key :e :ctrl t))
|
||||||
|
(is (= (text-input-cursor in) 3))))
|
||||||
|
|
||||||
|
(test text-input-insert-in-middle
|
||||||
|
"Inserting in the middle of text shifts rest right."
|
||||||
|
(let ((in (make-text-input :value "ab" :cursor 1)))
|
||||||
|
(handle-text-input in (make-key-event :key :x :code (char-code #\x)))
|
||||||
|
(is (string= (text-input-value in) "axb"))
|
||||||
|
(is (= (text-input-cursor in) 2))))
|
||||||
|
|
||||||
|
(test text-input-dirty-on-insert
|
||||||
|
"Inserting marks the widget dirty."
|
||||||
|
(let ((in (make-text-input)))
|
||||||
|
(mark-clean in)
|
||||||
|
(handle-text-input in (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(is-true (dirty-p in))))
|
||||||
|
|
||||||
|
;; ── Textarea Tests ──────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test textarea-empty
|
||||||
|
"New textarea has empty value and cursor at (0,0)."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(is (string= (textarea-value a) ""))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(is (= (textarea-cursor-col a) 0))))
|
||||||
|
|
||||||
|
(test textarea-newline
|
||||||
|
"Enter inserts a newline."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :enter))
|
||||||
|
(handle-textarea-input a (make-key-event :key :b :code (char-code #\b)))
|
||||||
|
(is (string= (textarea-value a) "a
|
||||||
|
b"))))
|
||||||
|
|
||||||
|
(test textarea-cursor-up-down
|
||||||
|
"Cursor moves between lines maintaining column position."
|
||||||
|
(let ((a (make-textarea :value "abc
|
||||||
|
de
|
||||||
|
fghi")))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(setf (textarea-cursor-col a) 1)
|
||||||
|
(handle-textarea-input a (make-key-event :key :up))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(is (= (textarea-cursor-col a) 1))
|
||||||
|
(handle-textarea-input a (make-key-event :key :down))
|
||||||
|
(is (= (textarea-cursor-row a) 1))
|
||||||
|
(is (= (textarea-cursor-col a) 1))))
|
||||||
|
|
||||||
|
(test textarea-cursor-up-down-bounds
|
||||||
|
"Cursor cannot move past first or last line."
|
||||||
|
(let ((a (make-textarea :value "a
|
||||||
|
b")))
|
||||||
|
(handle-textarea-input a (make-key-event :key :up))
|
||||||
|
(is (= (textarea-cursor-row a) 0))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(handle-textarea-input a (make-key-event :key :down))
|
||||||
|
(is (= (textarea-cursor-row a) 1))))
|
||||||
|
|
||||||
|
(test textarea-backspace-joins-lines
|
||||||
|
"Backspace at start of a line joins with previous."
|
||||||
|
(let ((a (make-textarea :value "hello
|
||||||
|
world")))
|
||||||
|
(setf (textarea-cursor-row a) 1)
|
||||||
|
(setf (textarea-cursor-col a) 0)
|
||||||
|
(handle-textarea-input a (make-key-event :key :backspace))
|
||||||
|
(is (string= (textarea-value a) "helloworld"))))
|
||||||
|
|
||||||
|
(test textarea-undo
|
||||||
|
"Ctrl+Z undoes the last edit."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :z :ctrl t))
|
||||||
|
(is (string= (textarea-value a) ""))))
|
||||||
|
|
||||||
|
(test textarea-undo-redo
|
||||||
|
"Ctrl+Y redoes an undone edit."
|
||||||
|
(let ((a (make-textarea)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :a :code (char-code #\a)))
|
||||||
|
(handle-textarea-input a (make-key-event :key :z :ctrl t))
|
||||||
|
(handle-textarea-input a (make-key-event :key :y :ctrl t))
|
||||||
|
(is (string= (textarea-value a) "a"))))
|
||||||
|
|
||||||
|
;; ── Keybinding Tests ────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test keymap-simple
|
||||||
|
"A keymap dispatches to its handler on matching event."
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+p . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf called t))))))
|
||||||
|
(is-true (dispatch-key-event (make-key-event :key :p :ctrl t)))
|
||||||
|
(is-true called)))
|
||||||
|
|
||||||
|
(test keymap-no-match
|
||||||
|
"Non-matching event returns nil."
|
||||||
|
(let ((called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+p . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf called t))))))
|
||||||
|
(is-false (dispatch-key-event (make-key-event :key :a)))
|
||||||
|
(is-false called)))
|
||||||
|
|
||||||
|
(test keymap-fallback
|
||||||
|
"Event not in local falls through to global."
|
||||||
|
(let ((global-called nil))
|
||||||
|
(setf (gethash :global *keymaps*)
|
||||||
|
(make-keymap :name :global
|
||||||
|
:bindings `((:ctrl+q . ,(lambda (e)
|
||||||
|
(declare (ignore e))
|
||||||
|
(setf global-called t))))))
|
||||||
|
(dispatch-key-event (make-key-event :key :q :ctrl t))
|
||||||
|
(is-true global-called)))
|
||||||
|
|
||||||
|
(test key-spec-simple
|
||||||
|
"Keyword key-spec matches key+ctrl."
|
||||||
|
(is-true (key-match-p :ctrl+p (make-key-event :key :p :ctrl t)))
|
||||||
|
(is-false (key-match-p :ctrl+p (make-key-event :key :a :ctrl t)))
|
||||||
|
(is-false (key-match-p :ctrl+p (make-key-event :key :p))))
|
||||||
|
|
||||||
|
(test defkeymap-macro
|
||||||
|
"defkeymap macro registers a keymap."
|
||||||
|
(let ((called nil))
|
||||||
|
(eval `(defkeymap :global
|
||||||
|
(:ctrl+q ,(lambda (e) (declare (ignore e)) (setf called t)))))
|
||||||
|
(dispatch-key-event (make-key-event :key :q :ctrl t))
|
||||||
|
(is-true called)))
|
||||||
205
tests/markdown-tests.lisp
Normal file
205
tests/markdown-tests.lisp
Normal file
@@ -0,0 +1,205 @@
|
|||||||
|
;;; markdown-tests.lisp — Tests for cl-tty.markdown
|
||||||
|
|
||||||
|
(defpackage :cl-tty-markdown-test
|
||||||
|
(:use :cl :cl-tty.markdown :fiveam))
|
||||||
|
|
||||||
|
(in-package :cl-tty-markdown-test)
|
||||||
|
|
||||||
|
;; Test suite
|
||||||
|
(def-suite :cl-tty-markdown-test
|
||||||
|
:description "Markdown parser/renderer tests for cl-tty.markdown")
|
||||||
|
|
||||||
|
(in-suite :cl-tty-markdown-test)
|
||||||
|
|
||||||
|
;; ─── Parser tests ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(def-test heading-parsing ()
|
||||||
|
(let* ((result (parse-blocks "# Hello World")) (node (first result)))
|
||||||
|
(is-true (eql :heading (getf node :type)))
|
||||||
|
(is (= 1 (getf (getf node :properties) :level)))))
|
||||||
|
|
||||||
|
(def-test heading-levels ()
|
||||||
|
(loop for level from 1 to 6
|
||||||
|
do (let* ((hashes (make-string level :initial-element #\#))
|
||||||
|
(text (format nil "~a Heading ~d" hashes level))
|
||||||
|
(result (parse-blocks text))
|
||||||
|
(node (first result)))
|
||||||
|
(is-true (eql :heading (getf node :type)))
|
||||||
|
(is (= level (getf (getf node :properties) :level))))))
|
||||||
|
|
||||||
|
(def-test heading-with-inline-formatting ()
|
||||||
|
(let* ((result (parse-blocks "# Hello **World**"))
|
||||||
|
(node (first result)) (children (getf node :children)))
|
||||||
|
(is-true (eql :heading (getf node :type)))
|
||||||
|
(is (= 2 (length children)))
|
||||||
|
(is-true (eql :text (getf (first children) :type)))
|
||||||
|
(is-true (eql :bold (getf (second children) :type)))))
|
||||||
|
|
||||||
|
(def-test paragraph-parsing ()
|
||||||
|
(let* ((result (parse-blocks "This is a paragraph.")) (node (first result)))
|
||||||
|
(is-true (eql :paragraph (getf node :type)))))
|
||||||
|
|
||||||
|
(def-test paragraph-multi-line ()
|
||||||
|
(let* ((result (parse-blocks "Line one\nLine two")) (node (first result)))
|
||||||
|
(is-true (eql :paragraph (getf node :type)))))
|
||||||
|
|
||||||
|
(def-test bold-parsing ()
|
||||||
|
(let* ((children (parse-inline "hello **world** here"))
|
||||||
|
(bold-node (second children)))
|
||||||
|
(is (= 3 (length children)))
|
||||||
|
(is-true (eql :bold (getf bold-node :type)))))
|
||||||
|
|
||||||
|
(def-test italic-parsing ()
|
||||||
|
(let* ((children (parse-inline "hello *world* here"))
|
||||||
|
(italic-node (second children)))
|
||||||
|
(is (= 3 (length children)))
|
||||||
|
(is-true (eql :italic (getf italic-node :type)))))
|
||||||
|
|
||||||
|
(def-test bold-italic-combined ()
|
||||||
|
(let ((children (parse-inline "**bold** and *italic*")))
|
||||||
|
(is (= 3 (length children)))
|
||||||
|
(is-true (eql :bold (getf (first children) :type)))
|
||||||
|
(is-true (eql :italic (getf (third children) :type)))))
|
||||||
|
|
||||||
|
(def-test inline-code-parsing ()
|
||||||
|
(let* ((children (parse-inline "use `foo` here"))
|
||||||
|
(code-node (second children)))
|
||||||
|
(is (= 3 (length children)))
|
||||||
|
(is-true (eql :inline-code (getf code-node :type)))
|
||||||
|
(is (equal "foo" (getf code-node :content)))))
|
||||||
|
|
||||||
|
(def-test link-parsing ()
|
||||||
|
(let* ((children (parse-inline "click [here](https://x.com)"))
|
||||||
|
(link-node (second children)))
|
||||||
|
(is (= 2 (length children)))
|
||||||
|
(is-true (eql :link (getf link-node :type)))
|
||||||
|
(is (equal "https://x.com" (getf link-node :url)))
|
||||||
|
(let ((link-text (getf link-node :children)))
|
||||||
|
(is (= 1 (length link-text)))
|
||||||
|
(is-true (eql :text (getf (first link-text) :type)))
|
||||||
|
(is (equal "here" (getf (first link-text) :content))))))
|
||||||
|
|
||||||
|
(def-test code-block-parsing ()
|
||||||
|
(let* ((text (format nil "```lisp~%(defun hello ())~% (print \"hi\")~%```"))
|
||||||
|
(result (parse-blocks text)) (node (first result)))
|
||||||
|
(is-true (eql :code-block (getf node :type)))
|
||||||
|
(is (equal "lisp" (getf (getf node :properties) :language)))
|
||||||
|
(is-true (search "(defun hello" (getf node :content)))))
|
||||||
|
|
||||||
|
(def-test code-block-unknown-language ()
|
||||||
|
(let* ((text (format nil "```~%plain code~%```"))
|
||||||
|
(result (parse-blocks text)) (node (first result)))
|
||||||
|
(is-true (eql :code-block (getf node :type)))
|
||||||
|
(is-false (getf (getf node :properties) :language))))
|
||||||
|
|
||||||
|
(def-test blockquote-parsing ()
|
||||||
|
(let* ((result (parse-blocks "> This is a quote")) (node (first result)))
|
||||||
|
(is-true (eql :blockquote (getf node :type)))))
|
||||||
|
|
||||||
|
(def-test list-item-parsing ()
|
||||||
|
(let* ((result (parse-blocks "- First item")) (node (first result)))
|
||||||
|
(is-true (eql :list-item (getf node :type)))))
|
||||||
|
|
||||||
|
(def-test ordered-list-parsing ()
|
||||||
|
(let* ((result (parse-blocks "1. First item")) (node (first result)))
|
||||||
|
(is-true (eql :ordered-item (getf node :type)))))
|
||||||
|
|
||||||
|
(def-test thematic-break-parsing ()
|
||||||
|
(let* ((result (parse-blocks "---")) (node (first result)))
|
||||||
|
(is-true (eql :thematic-break (getf node :type)))))
|
||||||
|
|
||||||
|
;; ─── Diff tests ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(def-test classify-diff-added ()
|
||||||
|
(is (eql :added (classify-diff-line "+this is added"))))
|
||||||
|
|
||||||
|
(def-test classify-diff-removed ()
|
||||||
|
(is (eql :removed (classify-diff-line "-this is removed"))))
|
||||||
|
|
||||||
|
(def-test classify-diff-hunk ()
|
||||||
|
(is (eql :hunk-header (classify-diff-line "@@ -1,3 +1,4 @@"))))
|
||||||
|
|
||||||
|
(def-test classify-diff-context ()
|
||||||
|
(is (eql :context (classify-diff-line " normal context"))))
|
||||||
|
|
||||||
|
;; ─── Syntax highlighting tests ────────────────────────────────────────────────
|
||||||
|
(def-test highlight-lisp-keyword ()
|
||||||
|
(let ((tokens (highlight-code "(defun hello ()" "lisp")))
|
||||||
|
(is-true (some (lambda (pair) (and (search "defun" (car pair))
|
||||||
|
(eql :keyword (cdr pair))))
|
||||||
|
tokens))))
|
||||||
|
|
||||||
|
(def-test highlight-lisp-builtin ()
|
||||||
|
"Test that a Lisp builtin like nil is highlighted as :builtin."
|
||||||
|
(let ((tokens (highlight-code "(if t nil)" "lisp")))
|
||||||
|
(is-true (some (lambda (pair) (and (string= (car pair) "nil")
|
||||||
|
(eql :builtin (cdr pair))))
|
||||||
|
tokens))))
|
||||||
|
|
||||||
|
(def-test highlight-unknown-language ()
|
||||||
|
(let ((tokens (highlight-code "hello world" "unknown-xyz")))
|
||||||
|
(every (lambda (pair) (eql :plain (cdr pair))) tokens)))
|
||||||
|
|
||||||
|
(def-test highlight-comment ()
|
||||||
|
(let ((tokens (highlight-code "; this is a comment" "lisp")))
|
||||||
|
(is-true (some (lambda (pair) (eql :comment (cdr pair))) tokens))))
|
||||||
|
|
||||||
|
;; ─── Render tests ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(def-test render-heading-output ()
|
||||||
|
(let* ((node (make-md-node :heading :properties (list :level 2)
|
||||||
|
:children (list (make-md-node :text :content "Test"))))
|
||||||
|
(lines (render-md-node node)))
|
||||||
|
(is (= 1 (length lines)))
|
||||||
|
(is-true (> (length (first lines)) 0))))
|
||||||
|
|
||||||
|
(def-test render-paragraph-output ()
|
||||||
|
(let* ((node (make-md-node :paragraph
|
||||||
|
:children (list (make-md-node :text :content "Hello"))))
|
||||||
|
(lines (render-md-node node)))
|
||||||
|
(is (= 1 (length lines)))
|
||||||
|
(is-true (search "Hello" (first lines)))))
|
||||||
|
|
||||||
|
(def-test render-thematic-break-output ()
|
||||||
|
(let* ((node (make-md-node :thematic-break)) (lines (render-md-node node)))
|
||||||
|
(is (= 1 (length lines)))))
|
||||||
|
|
||||||
|
(def-test render-code-block-output ()
|
||||||
|
(let* ((node (make-md-node :code-block :content "(print \"hello\")"
|
||||||
|
:properties (list :language "lisp")))
|
||||||
|
(lines (render-md-node node)))
|
||||||
|
(is-true (> (length lines) 0))))
|
||||||
|
|
||||||
|
(def-test render-diff-block-output ()
|
||||||
|
(let* ((node (make-md-node :diff-block :properties
|
||||||
|
(list :lines
|
||||||
|
'("--- a/file" "+++ b/file" "@@ -1 +1 @@"
|
||||||
|
"+added" "-removed" " context"))))
|
||||||
|
(lines (render-md-node node)))
|
||||||
|
(is (= 6 (length lines)))
|
||||||
|
(is (search "added" (fourth lines)))
|
||||||
|
(is (search "removed" (fifth lines)))))
|
||||||
|
|
||||||
|
;; ─── Integration tests ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(def-test markdown-integration ()
|
||||||
|
(let* ((md (format nil "# Title~%~%This is **bold** and `code`.~%~%- Item 1~%- Item 2~%~%> A quote~%~%```lisp~%(defun hello ())~% (print \"hi\")~%```~%~%---"))
|
||||||
|
(nodes (parse-blocks md)) (lines (render-md nodes)))
|
||||||
|
(is-true (> (length lines) 5))
|
||||||
|
(is-true (search "# Title" (first lines)))))
|
||||||
|
|
||||||
|
(def-test render-markdown-string ()
|
||||||
|
(let ((result (render-markdown "**bold** text")))
|
||||||
|
(is-true (stringp result))
|
||||||
|
(is-true (> (length result) 0))))
|
||||||
|
|
||||||
|
(def-test md-node-text-simple ()
|
||||||
|
(let ((node (make-md-node :text :content "hello")))
|
||||||
|
(is (equal "hello" (md-node-text node)))))
|
||||||
|
|
||||||
|
(def-test md-node-text-nested ()
|
||||||
|
(let ((node (make-md-node :paragraph :children
|
||||||
|
(list (make-md-node :text :content "hello")
|
||||||
|
(make-md-node :bold :children
|
||||||
|
(list (make-md-node :text :content "world")))))))
|
||||||
|
(is (equal "helloworld" (md-node-text node)))))
|
||||||
17
tests/mouse-tests.lisp
Normal file
17
tests/mouse-tests.lisp
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
(defpackage :cl-tty-mouse-test (:use :cl :cl-tty.mouse :fiveam))
|
||||||
|
(in-package :cl-tty-mouse-test)
|
||||||
|
|
||||||
|
(def-suite mouse-suite :description "Mouse tests")
|
||||||
|
(in-suite mouse-suite)
|
||||||
|
|
||||||
|
(def-test mouse-mixin-create ()
|
||||||
|
(let ((m (make-instance 'mouse-mixin)))
|
||||||
|
(is-true (typep m 'mouse-mixin))))
|
||||||
|
|
||||||
|
(def-test mouse-hit-test-point ()
|
||||||
|
(let ((obj (make-instance 'mouse-mixin)))
|
||||||
|
(is-true t))) ;; placeholder
|
||||||
|
|
||||||
|
(def-test selection-set-and-get ()
|
||||||
|
(setf cl-tty.mouse::*selection* (make-selection :text "hello"))
|
||||||
|
(is (equal "hello" (get-selection))))
|
||||||
128
tests/scrollbox-tabbar-tests.lisp
Normal file
128
tests/scrollbox-tabbar-tests.lisp
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
(defpackage :cl-tty-scrollbox-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input :cl-tty.container)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package #:cl-tty-scrollbox-test)
|
||||||
|
|
||||||
|
(def-suite scrollbox-suite :description "ScrollBox + TabBar tests")
|
||||||
|
(in-suite scrollbox-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'scrollbox-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
;; ── ScrollBox Tests ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test scrollbox-creates
|
||||||
|
"A ScrollBox can be created with defaults."
|
||||||
|
(let ((sb (make-scroll-box)))
|
||||||
|
(is (typep sb 'scroll-box))
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0))
|
||||||
|
(is (= (scroll-box-scroll-x sb) 0))
|
||||||
|
(is-false (scroll-box-children sb))))
|
||||||
|
|
||||||
|
(test scrollbox-with-children
|
||||||
|
"A ScrollBox can have children."
|
||||||
|
(let ((sb (make-scroll-box :children (list (make-text "hello")))))
|
||||||
|
(is (= (length (scroll-box-children sb)) 1))))
|
||||||
|
|
||||||
|
(test scrollbox-scroll-by
|
||||||
|
"ScrollBy adjusts offset clamped to valid range."
|
||||||
|
(let ((sb (make-scroll-box :scroll-y 0)))
|
||||||
|
(scroll-by sb 5 0)
|
||||||
|
(is (>= (scroll-box-scroll-y sb) 0))))
|
||||||
|
|
||||||
|
(test scrollbox-component-children
|
||||||
|
"Component protocol: children are accessible."
|
||||||
|
(let* ((child (make-text "hello"))
|
||||||
|
(sb (make-scroll-box :children (list child))))
|
||||||
|
(is (eql (first (component-children sb)) child))))
|
||||||
|
|
||||||
|
(test scrollbox-render-noop
|
||||||
|
"Rendering a ScrollBox with no children does not error."
|
||||||
|
(let* ((stream (make-string-output-stream))
|
||||||
|
(backend (make-simple-backend :output-stream stream))
|
||||||
|
(sb (make-scroll-box)))
|
||||||
|
(render sb backend)
|
||||||
|
(is-true t)))
|
||||||
|
|
||||||
|
;; ── TabBar Tests ────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(test tabbar-creates
|
||||||
|
"A TabBar can be created with defaults."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(is (typep tb 'tab-bar))
|
||||||
|
(is-false (tab-bar-active tb))
|
||||||
|
(is-false (tab-bar-tabs tb))))
|
||||||
|
|
||||||
|
(test tabbar-add-tab
|
||||||
|
"Adding a tab returns the id and updates tabs."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(let ((id (tab-bar-add tb :tab1 "Tab One")))
|
||||||
|
(is (eql id :tab1))
|
||||||
|
(is (= (length (tab-bar-tabs tb)) 1))
|
||||||
|
(is (string= (getf (first (tab-bar-tabs tb)) :title) "Tab One")))))
|
||||||
|
|
||||||
|
(test tabbar-active-tab
|
||||||
|
"Setting active tab works."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab2)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))))
|
||||||
|
|
||||||
|
(test tabbar-render-noop
|
||||||
|
"Rendering a TabBar does not error."
|
||||||
|
(let* ((stream (make-string-output-stream))
|
||||||
|
(backend (make-simple-backend :output-stream stream))
|
||||||
|
(tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab1)
|
||||||
|
(render tb backend)
|
||||||
|
(is-true t)))
|
||||||
|
|
||||||
|
(test tabbar-next-prev
|
||||||
|
"TabBar next/prev wraps around through tabs."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(tab-bar-add tb :tab3 "Three")
|
||||||
|
(is (eql (tab-bar-active tb) :tab1))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab3))
|
||||||
|
(tab-bar-next tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab1) "wrap around past last")
|
||||||
|
(tab-bar-prev tb)
|
||||||
|
(is (eql (tab-bar-active tb) :tab3) "wrap around past first")))
|
||||||
|
|
||||||
|
(test tabbar-select
|
||||||
|
"TabBar select activates the specified tab."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(tab-bar-select tb :tab2)
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))))
|
||||||
|
|
||||||
|
(test tabbar-handle-key
|
||||||
|
"TabBar handle-key dispatches left/right."
|
||||||
|
(let ((tb (make-tab-bar)))
|
||||||
|
(tab-bar-add tb :tab1 "One")
|
||||||
|
(tab-bar-add tb :tab2 "Two")
|
||||||
|
(setf (tab-bar-active tb) :tab1)
|
||||||
|
(tab-bar-handle-key tb (make-key-event :key :right))
|
||||||
|
(is (eql (tab-bar-active tb) :tab2))
|
||||||
|
(tab-bar-handle-key tb (make-key-event :key :left))
|
||||||
|
(is (eql (tab-bar-active tb) :tab1))))
|
||||||
|
|
||||||
|
(test scrollbox-scroll-clamp
|
||||||
|
"ScrollBox clamp prevents scrolling past bounds."
|
||||||
|
(let ((sb (make-scroll-box :scroll-y 5 :scroll-x 3)))
|
||||||
|
(setf (scroll-box-scroll-y sb) -1)
|
||||||
|
(clamp-scroll sb)
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0) "clamps below 0")
|
||||||
|
(setf (scroll-box-scroll-y sb) 1000000)
|
||||||
|
(clamp-scroll sb)
|
||||||
|
(is (= (scroll-box-scroll-y sb) 0) "clamps above max (no children = 0 content)")))
|
||||||
120
tests/select-tests.lisp
Normal file
120
tests/select-tests.lisp
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
(defpackage :cl-tty-select-test
|
||||||
|
(:use :cl :fiveam :cl-tty.backend :cl-tty.box :cl-tty.layout :cl-tty.input :cl-tty.select)
|
||||||
|
(:export #:run-tests))
|
||||||
|
(in-package #:cl-tty-select-test)
|
||||||
|
|
||||||
|
(def-suite select-suite :description "Select widget tests")
|
||||||
|
(in-suite select-suite)
|
||||||
|
|
||||||
|
(defun run-tests ()
|
||||||
|
(let ((result (run 'select-suite)))
|
||||||
|
(fiveam:explain! result)
|
||||||
|
(uiop:quit 0)))
|
||||||
|
|
||||||
|
(test select-creates
|
||||||
|
"A Select can be created with defaults."
|
||||||
|
(let ((sel (make-select)))
|
||||||
|
(is (typep sel 'select))
|
||||||
|
(is-false (select-options sel))
|
||||||
|
(is-false (select-filter sel))
|
||||||
|
(is (= (select-selected-index sel) 0))))
|
||||||
|
|
||||||
|
(test select-with-options
|
||||||
|
"A Select stores options."
|
||||||
|
(let ((sel (make-select :options '((:title "Red" :value :red)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(is (= (length (select-options sel)) 2))))
|
||||||
|
|
||||||
|
(test select-filtered-exact
|
||||||
|
"Filter returns case-insensitive substring matches."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Red" :value :red)
|
||||||
|
(:title "Green" :value :green)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(setf (select-filter sel) "bl")
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 1))
|
||||||
|
(is (eql (getf (third (first filtered)) :value) :blue)))))
|
||||||
|
|
||||||
|
(test select-filtered-all
|
||||||
|
"Nil filter returns all options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Red" :value :red)
|
||||||
|
(:title "Blue" :value :blue)))))
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 2)))))
|
||||||
|
|
||||||
|
(test select-navigation
|
||||||
|
"Select-next and select-prev navigate through options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "A" :value :a)
|
||||||
|
(:title "B" :value :b)
|
||||||
|
(:title "C" :value :c)))))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 2))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 0) "wraps forward")
|
||||||
|
(select-prev sel)
|
||||||
|
(is (= (select-selected-index sel) 2) "wraps backward")))
|
||||||
|
|
||||||
|
(test select-navigation-skips-categories
|
||||||
|
"Navigation skips category header options."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Colors" :category t)
|
||||||
|
(:title "Red" :value :red)
|
||||||
|
(:title "Green" :value :green)
|
||||||
|
(:title "Shapes" :category t)
|
||||||
|
(:title "Circle" :value :circle)))))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 1) "skipped category header at 0")
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 2))
|
||||||
|
(select-next sel)
|
||||||
|
(is (= (select-selected-index sel) 4) "skipped category header at 3")))
|
||||||
|
|
||||||
|
(test select-handle-key
|
||||||
|
"Select handle-key dispatches navigation and selection."
|
||||||
|
(let* ((result (list nil))
|
||||||
|
(sel (make-select
|
||||||
|
:options '((:title "A" :value :a) (:title "B" :value :b))
|
||||||
|
:on-select (lambda (opt) (setf (car result) (getf opt :value))))))
|
||||||
|
(select-handle-key sel (make-key-event :key :down))
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-handle-key sel (make-key-event :key :up))
|
||||||
|
(is (= (select-selected-index sel) 0))
|
||||||
|
(select-handle-key sel (make-key-event :key :enter))
|
||||||
|
(is (eql (car result) :a))))
|
||||||
|
|
||||||
|
(test select-handle-key-ctrl
|
||||||
|
"Ctrl+N and Ctrl+P navigate like down/up."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "A" :value :a) (:title "B" :value :b) (:title "C" :value :c)))))
|
||||||
|
(select-handle-key sel (make-key-event :key :n :ctrl t))
|
||||||
|
(is (= (select-selected-index sel) 1))
|
||||||
|
(select-handle-key sel (make-key-event :key :p :ctrl t))
|
||||||
|
(is (= (select-selected-index sel) 0))))
|
||||||
|
|
||||||
|
(test select-visible-count
|
||||||
|
"Visible options respects viewport height."
|
||||||
|
(let* ((ln (make-layout-node))
|
||||||
|
(sel (make-select
|
||||||
|
:options (loop for i below 20 collect (list :title (format nil "Item ~D" i) :value i)))))
|
||||||
|
(setf (select-layout-node sel) ln)
|
||||||
|
(setf (layout-node-height ln) 5)
|
||||||
|
(let ((visible (select-visible-options sel)))
|
||||||
|
(is (<= (length visible) 5)))))
|
||||||
|
|
||||||
|
(test select-fuzzy-fallback
|
||||||
|
"Fuzzy filter catches near-misses."
|
||||||
|
(let ((sel (make-select
|
||||||
|
:options '((:title "Nord" :value :nord)
|
||||||
|
(:title "Tokyo Night" :value :tokyo)
|
||||||
|
(:title "Catppuccin" :value :cat)))))
|
||||||
|
(setf (select-filter sel) "nrd")
|
||||||
|
(let ((filtered (select-filtered-options sel)))
|
||||||
|
(is (= (length filtered) 1))
|
||||||
|
(is (eql (getf (third (first filtered)) :value) :nord)))))
|
||||||
Reference in New Issue
Block a user