diff options
| author | Colin Okay <colin@cicadas.surf> | 2022-07-01 19:18:22 -0500 |
|---|---|---|
| committer | Colin Okay <colin@cicadas.surf> | 2022-07-01 19:18:22 -0500 |
| commit | 08a29ff775cf841a80ed2433ab219ccc953835ef (patch) | |
| tree | 20020ed9ba6e8ab229925cad1432fe4b3f54a857 | |
| parent | 59f5cb6c28399c84221b728daf4bd8461ab1e230 (diff) | |
[remove] [dep] lambda-riffs and hyperquirks
| -rw-r--r-- | src/interactive/text.lisp | 7 | ||||
| -rw-r--r-- | src/package.lisp | 1 | ||||
| -rw-r--r-- | src/wheelwork.lisp | 3 | ||||
| -rw-r--r-- | wheelwork.asd | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/interactive/text.lisp b/src/interactive/text.lisp index caba48e..a7c0582 100644 --- a/src/interactive/text.lisp +++ b/src/interactive/text.lisp @@ -56,7 +56,12 @@ (setf vao vao% elem-count count%)) (setf newlines (count #\newline content)) - (hq:with-plist ((l :l) (r :r)) (cl-fond:compute-extent (font-object font) content) + (let* ((extent + (cl-fond:compute-extent (font-object font) content)) + (l + (getf extent :l)) + (r + (getf extent :r))) (setf base-width (- r l) base-height (* (cl-fond:text-height (font-object font)) (1+ newlines)))))) diff --git a/src/package.lisp b/src/package.lisp index 74c9477..5a59057 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -5,7 +5,6 @@ (:nicknames #:ww) (:local-nicknames (#:mat #:3d-matrices) (#:vec #:3d-vectors)) - (:import-from #:hyperquirks #:?>) (:import-from #:defclass-std #:defclass/std) (:import-from #:alexandria #:when-let #:when-let* #:if-let)) diff --git a/src/wheelwork.lisp b/src/wheelwork.lisp index 6b32119..ffcb242 100644 --- a/src/wheelwork.lisp +++ b/src/wheelwork.lisp @@ -43,7 +43,8 @@ TARGET is FOCUSABLEP" (defun get-handlers-for (unit event-type) "EVENT-TYPE must be one of the slot value names for WHEELWORK::LISTENER." - (?> (unit) listener #$(slot-value $listener event-type))) + (when-let (listener (listener unit)) + (slot-value listener event-type))) (defun eventloop-keydown (app sdl-keysym) (let ((target (get-focus app))) diff --git a/wheelwork.asd b/wheelwork.asd index af2b10a..8cec8d9 100644 --- a/wheelwork.asd +++ b/wheelwork.asd @@ -12,10 +12,8 @@ #:defclass-std #:3d-vectors #:3d-matrices - #:hyperquirks #:pngload #:closer-mop - #:lambda-riffs #:cl-fond) :pathname "src/" :components ((:file "package") |