From 08a29ff775cf841a80ed2433ab219ccc953835ef Mon Sep 17 00:00:00 2001
From: Colin Okay <colin@cicadas.surf>
Date: Fri, 1 Jul 2022 19:18:22 -0500
Subject: [remove] [dep] lambda-riffs and hyperquirks

---
 src/interactive/text.lisp | 7 ++++++-
 src/package.lisp          | 1 -
 src/wheelwork.lisp        | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

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))) 
-- 
cgit v1.2.3