Major cleanup of ffi abstraction layer

[clg] / gdk / gdkevents.lisp

diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index fe7e35727dd248c5dab40b8ac45d559b8fa290c6..7b0b6980ad8d1a093c1a8b1ffaaeee601f774072 100644 (file)
--- a/gdk/gdkevents.lisp
+++ b/gdk/gdkevents.lisp
@@ -15,19 +15,13 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdkevents.lisp,v 1.4 2004-10-31 11:53:30 espen Exp $
+;; $Id: gdkevents.lisp,v 1.5 2004-11-06 21:39:58 espen Exp $
 
 (in-package "GDK")
 
 
 (defvar *event-classes* (make-hash-table))
 
-(defun %type-of-event (location)
-  (class-name
-   (gethash
-    (funcall (intern-reader-function 'event-type) location 0)
-    *event-classes*)))
-
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass event (boxed)
     ((%type
@@ -52,32 +46,32 @@ (defmethod initialize-instance ((event event) &rest initargs)
   (call-next-method)
   (setf (slot-value event '%type) (event-class-type (class-of event))))
 
-(deftype-method translate-from-alien
-    event (type-spec location &optional weak-ref)
-  (declare (ignore type-spec))    
-  `(let ((location ,location))
-     (unless (null-pointer-p location)
-       (ensure-proxy-instance (%type-of-event location) location ,weak-ref))))
-
 
 ;;;; Metaclass for event classes
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass event-class (proxy-class)
+  (defclass event-class (boxed-class)
     ((event-type :reader event-class-type)))
 
+  (defmethod validate-superclass ((class event-class) (super standard-class))
+    (subtypep (class-name super) 'event)))
+
+
+(defmethod shared-initialize ((class event-class) names &key name type)
+  (call-next-method)
+  (setf (slot-value class 'event-type) (first type))
+  (setf (gethash (first type) *event-classes*) class)
+  (let ((class-name (or name (class-name class))))
+    (register-type class-name 'event)))
   
-  (defmethod shared-initialize ((class event-class) names &key name type)
-    (call-next-method)
-    (setf (slot-value class 'event-type) (first type))
-    (setf (gethash (first type) *event-classes*) class)
-    (let ((class-name (or name (class-name class))))
-      (register-type class-name 'event)))
-  
+(let ((reader (reader-function 'event-type)))
+  (defun %event-class (location)
+    (gethash (funcall reader location 0) *event-classes*)))
 
-  (defmethod validate-superclass
-    ((class event-class) (super pcl::standard-class))
-    (subtypep (class-name super) 'event)))
+(defmethod ensure-proxy-instance ((class event-class) location)
+  (declare (ignore class))
+  (let ((class (%event-class location)))
+    (make-instance class :location location)))
 
 
 ;;;;
@@ -88,13 +82,14 @@ (defclass timed-event (event)
     :accessor event-time
     :initarg :time
     :type (unsigned 32)))
-  (:metaclass proxy-class))
+  (:metaclass event-class))
   
 (defclass delete-event (event)
   ()
   (:metaclass event-class)
   (:type :delete))
 
+
 (defclass destroy-event (event)
   ()
   (:metaclass event-class)