7 files changed, 57 insertions, 53 deletions
diff --git a/src/core-units/affine.lisp b/src/core/affine.lisp
index cabe17c..cabe17c 100644
--- a/src/core-units/affine.lisp
+++ b/src/core/affine.lisp
diff --git a/src/core-units/container.lisp b/src/core/container.lisp
index af01ff1..af01ff1 100644
--- a/src/core-units/container.lisp
+++ b/src/core/container.lisp
diff --git a/src/core-units/unit.lisp b/src/core/unit.lisp
index 20e05e2..20e05e2 100644
--- a/src/core-units/unit.lisp
+++ b/src/core/unit.lisp
diff --git a/src/events/listener.lisp b/src/events/listener.lisp
new file mode 100644
index 0000000..3e195ff
--- /dev/null
+++ b/src/events/listener.lisp
@@ -0,0 +1,56 @@
+;;;; listener.lisp
+
+(in-package #:wheelwork)
+
+(defclass/std listener ()
+  ((keydown
+    keyup
+    mousedown
+    mouseup
+    mousemotion
+    mousewheel
+    focus
+    blur
+    perframe
+    after-added
+    before-added
+    before-dropped
+    :r :with :type (or null event-handler) :std nil)
+   (keydown-table
+    keyup-table
+    mousedown-table
+    mouseup-table
+    mousemotion-table
+    mousewheel-table
+    focus-table
+    blur-table
+    perframe-table
+    after-added-table
+    before-added-table
+    before-dropped-table
+    :static
+    :std (make-hash-table :synchronized t)
+    :doc "Keyed by DISPLAY-UNIT instance, holds an EVENT-HANDLER if
+    handler is defined for unit."))
+  (:documentation "Event handlers per object. The static hash tables
+  are keyed by UNIT and hold Event-Handler instances."))
+
+(defun listener-table-for (listener event-type)
+  (ecase event-type
+    (keydown (keydown-table listener))
+    (keyup   (keyup-table listener))
+    (mousedown (mousewheel-table listener))
+    (mouseup (mouseup-table listener))
+    (mousemotion (mousemotion-table listener))
+    (mousewheel (mousewheel-table listener))
+    (focus (focus-table listener))
+    (blur (blur-table listener))
+    (perframe (perframe-table listener))
+    (after-added (after-added-table listener))
+    (before-added (before-added-table listener))
+    (after-dropped (after-dropped-table listener))
+    (before-dropped (before-dropped-table listener))))
+
+(defun should-listen-for-p (event-type app)
+  (plusp (hash-table-count (listener-table-for (listener app) event-type))))
+
diff --git a/src/interactive-units/bitmap.lisp b/src/interactive/bitmap.lisp
index cc4b4f7..cc4b4f7 100644
--- a/src/interactive-units/bitmap.lisp
+++ b/src/interactive/bitmap.lisp
diff --git a/src/events/listener-and-interactive.lisp b/src/interactive/interactive.lisp
index e5bdce3..a8fa7fd 100644
--- a/src/events/listener-and-interactive.lisp
+++ b/src/interactive/interactive.lisp
@@ -1,59 +1,7 @@
-;;;; listener.lisp
+;;;; interactive.lisp
 
 (in-package #:wheelwork)
 
-(defclass/std listener ()
-  ((keydown
-    keyup
-    mousedown
-    mouseup
-    mousemotion
-    mousewheel
-    focus
-    blur
-    perframe
-    after-added
-    before-added
-    before-dropped
-    :r :with :type (or null event-handler) :std nil)
-   (keydown-table
-    keyup-table
-    mousedown-table
-    mouseup-table
-    mousemotion-table
-    mousewheel-table
-    focus-table
-    blur-table
-    perframe-table
-    after-added-table
-    before-added-table
-    before-dropped-table
-    :static
-    :std (make-hash-table :synchronized t)
-    :doc "Keyed by DISPLAY-UNIT instance, holds an EVENT-HANDLER if
-    handler is defined for unit."))
-  (:documentation "Event handlers per object. The static hash tables
-  are keyed by UNIT and hold Event-Handler instances."))
-
-(defun listener-table-for (listener event-type)
-  (ecase event-type
-    (keydown (keydown-table listener))
-    (keyup   (keyup-table listener))
-    (mousedown (mousewheel-table listener))
-    (mouseup (mouseup-table listener))
-    (mousemotion (mousemotion-table listener))
-    (mousewheel (mousewheel-table listener))
-    (focus (focus-table listener))
-    (blur (blur-table listener))
-    (perframe (perframe-table listener))
-    (after-added (after-added-table listener))
-    (before-added (before-added-table listener))
-    (after-dropped (after-dropped-table listener))
-    (before-dropped (before-dropped-table listener))))
-
-(defun should-listen-for-p (event-type app)
-  (plusp (hash-table-count (listener-table-for (listener app) event-type))))
-
 (defclass/std interactive ()
   ((listener :type (or null listener) :std nil :a)
    (focusablep :std t :doc "Whether or not this object can receive application focus."))
diff --git a/src/interactive-units/text.lisp b/src/interactive/text.lisp
index caba48e..caba48e 100644
--- a/src/interactive-units/text.lisp
+++ b/src/interactive/text.lisp