Added generic function UNBOUND-VALUE

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 32917ead8732eb58c8c1ddceaddbfdc32e04eeb1..e97152e07d14bef889ad5c8c6313e6583cbd4893 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
 ;; Common Lisp bindings for GTK+ v2.0

-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Copyright (C) 1999-2001 Espen S. Johnsen <espen@users.sourceforge.org>

 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public


@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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: gtkobject.lisp,v 1.10 2001/10/21 23:18:11 espen Exp $
+;; $Id: gtkobject.lisp,v 1.21 2004/12/20 20:09:53 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -34,8 +34,9 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (init-types-in-library
-   "/opt/gnome/lib/libgtk-x11-1.3.so"
+  (init-types-in-library 
+   #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") 
+                         "/libgtk-x11-2.0.so")

    :ignore ("gtk_window_get_type_hint"))
 
   (defclass %object (gobject)
    :ignore ("gtk_window_get_type_hint"))
 
   (defclass %object (gobject)


@@ -44,16 +45,14 @@   (defclass %object (gobject)
     (:alien-name "GtkObject")))
 
 
     (:alien-name "GtkObject")))
 
 

-(defmethod shared-initialize ((object %object) names &rest initargs
-                             &allow-other-keys)
-  (declare (ignore names))
+(defmethod initialize-instance ((object %object) &rest initargs &key signal)
+  (declare (ignore signal))

   (call-next-method)
   (call-next-method)

-  (funcall (proxy-class-copy (class-of object)) nil (proxy-location object)) ; inc ref count before sinking
-  (%object-sink object)
+  (reference-foreign (class-of object) (proxy-location object))

   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 
   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 

-(defmethod initialize-proxy ((object %object) &rest initargs)
+(defmethod initialize-instance :around ((object %object) &rest initargs)

   (declare (ignore initargs))
   (call-next-method)
   (%object-sink object))
   (declare (ignore initargs))
   (call-next-method)
   (%object-sink object))


@@ -61,7 +60,6 @@ (defmethod initialize-proxy ((object %object) &rest initargs)
 (defbinding %object-sink () nil
   (object %object))
 
 (defbinding %object-sink () nil
   (object %object))
 

-

 ;;;; Main loop, timeouts and idle functions
 
 (declaim (inline events-pending-p main-iteration))
 ;;;; Main loop, timeouts and idle functions
 
 (declaim (inline events-pending-p main-iteration))


@@ -88,120 +86,99 @@ (defun main-iterate-all (&rest args)
     (main-iteration-do nil)
     (main-iterate-all)))
 
     (main-iteration-do nil)
     (main-iterate-all)))
 

-(system:add-fd-handler (gdk:connection-number) :input #'main-iterate-all)
-(setq lisp::*periodic-polling-function* #'main-iterate-all)
-(setq lisp::*max-event-to-sec* 0)
-(setq lisp::*max-event-to-usec* 1000)
-
-

 
 ;;;; Metaclass for child classes
  
 (defvar *container-to-child-class-mappings* (make-hash-table))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
 ;;;; Metaclass for child classes
  
 (defvar *container-to-child-class-mappings* (make-hash-table))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass child-class (virtual-slot-class))
+  (defclass child-class (virtual-slots-class)
+    ())

 
   (defclass direct-child-slot-definition (direct-virtual-slot-definition)
 
   (defclass direct-child-slot-definition (direct-virtual-slot-definition)

-    ((pname :reader slot-definition-pname)))
+    ((pname :reader slot-definition-pname :initarg :pname)))

 
 

-  (defclass effective-child-slot-definition
-    (effective-virtual-slot-definition)))
+  (defclass effective-child-slot-definition (effective-virtual-slot-definition)
+    ((pname :reader slot-definition-pname :initarg :pname)))

 
 
 
 

-(defmethod shared-initialize ((class child-class) names &rest initargs
-                             &key container)
-  (declare (ignore initargs))
+(defmethod shared-initialize ((class child-class) names &key container)

   (call-next-method)
   (setf
    (gethash (find-class (first container)) *container-to-child-class-mappings*)
     class))
 
   (call-next-method)
   (setf
    (gethash (find-class (first container)) *container-to-child-class-mappings*)
     class))
 

-(defmethod initialize-instance  ((slotd direct-child-slot-definition)
-                                &rest initargs &key pname)
-  (declare (ignore initargs))
-  (call-next-method)
-  (if pname
-      (setf (slot-value slotd 'pname) pname)
-    ; ???
-    (error "Need pname for slot with allocation :property")))
-
-(defmethod direct-slot-definition-class ((class child-class) initargs)
+(defmethod direct-slot-definition-class ((class child-class) &rest initargs)

   (case (getf initargs :allocation)
     (:property (find-class 'direct-child-slot-definition))
     (t (call-next-method))))
 
   (case (getf initargs :allocation)
     (:property (find-class 'direct-child-slot-definition))
     (t (call-next-method))))
 

-(defmethod effective-slot-definition-class ((class child-class) initargs)
+(defmethod effective-slot-definition-class ((class child-class) &rest initargs)

   (case (getf initargs :allocation)
     (:property (find-class 'effective-child-slot-definition))
     (t (call-next-method))))
 
   (case (getf initargs :allocation)
     (:property (find-class 'effective-child-slot-definition))
     (t (call-next-method))))
 

-(defbinding %container-child-get-property () nil
-  (container container)
-  (child widget)
-  (property-name string)
-  (value gvalue))
-
-(defbinding %container-child-set-property () nil
-  (container container)
-  (child widget)
-  (property-name string)
-  (value gvalue))
-  
-(defmethod compute-virtual-slot-accessors
-    ((class child-class) (slotd effective-child-slot-definition) direct-slotds)
-  (with-slots (type) slotd
-    (let ((pname (slot-definition-pname (first direct-slotds)))
-         (type-number (find-type-number type)))
-      (list
-       #'(lambda (object)
-          (with-slots (parent child) object       
-            (with-gc-disabled
-              (let ((gvalue (gvalue-new type-number)))
-                (%container-child-get-property parent child pname gvalue)
-                (unwind-protect
-                    (funcall
-                     (intern-reader-function type)
-                     gvalue +gvalue-value-offset+)
-                  (gvalue-free gvalue t))))))
-       #'(lambda (value object)
-          (with-slots (parent child) object       
-            (with-gc-disabled
-             (let ((gvalue (gvalue-new type-number)))
-               (funcall
-                (intern-writer-function type)
-                value gvalue +gvalue-value-offset+)
-               (%container-child-set-property parent child pname gvalue)
-               (funcall
-                (intern-destroy-function type)
-                gvalue +gvalue-value-offset+)
-               (gvalue-free gvalue nil)
-               value))))))))
+(defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds)
+  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+      (nconc 
+       (list :pname (most-specific-slot-value direct-slotds 'pname))
+       (call-next-method))
+    (call-next-method)))
+
+(progn
+  (declaim (optimize (ext:inhibit-warnings 3)))
+  (defun %container-child-get-property (parent child pname gvalue))
+  (defun %container-child-set-property (parent child pname gvalue)))
+
+
+(defmethod initialize-internal-slot-functions ((slotd effective-child-slot-definition))
+  (let* ((type (slot-definition-type slotd))
+        (pname (slot-definition-pname slotd))
+        (type-number (find-type-number type)))
+    (setf 
+     (slot-value slotd 'getter)
+     #'(lambda (object)
+        (with-slots (parent child) object         
+          (let ((gvalue (gvalue-new type-number)))
+            (%container-child-get-property parent child pname gvalue)
+            (unwind-protect
+                (funcall (reader-function type) gvalue +gvalue-value-offset+)
+              (gvalue-free gvalue t))))))
+    
+    (setf 
+     (slot-value slotd 'setter)
+     #'(lambda (value object)
+        (with-slots (parent child) object         
+          (let ((gvalue (gvalue-new type-number)))
+            (funcall (writer-function type) value gvalue +gvalue-value-offset+)
+            (%container-child-set-property parent child pname gvalue)
+            (gvalue-free gvalue t)
+            value)))))
+ 
+  (call-next-method)))

 
 
 (defmethod pcl::add-reader-method ((class child-class) generic-function slot-name)
   (add-method
    generic-function
    (make-instance 'standard-method
 
 
 (defmethod pcl::add-reader-method ((class child-class) generic-function slot-name)
   (add-method
    generic-function
    (make-instance 'standard-method

-                 :specializers (list (find-class 'widget))
-                 :lambda-list '(widget)
-                 :function #'(lambda (args next-methods)
-                               (declare (ignore next-methods))
-                               (child-slot-value (first args) slot-name)))))
+    :specializers (list (find-class 'widget))
+    :lambda-list '(widget)
+    :function #'(lambda (args next-methods)
+                 (declare (ignore next-methods))
+                 (child-property-value (first args) slot-name)))))

 
 (defmethod pcl::add-writer-method
     ((class child-class) generic-function slot-name)
   (add-method
    generic-function
    (make-instance 'standard-method
 
 (defmethod pcl::add-writer-method
     ((class child-class) generic-function slot-name)
   (add-method
    generic-function
    (make-instance 'standard-method

-                 :specializers (list (find-class t) (find-class 'widget))
-                 :lambda-list '(value widget)
-                 :function #'(lambda (args next-methods)
-                               (declare (ignore next-methods))
-                               (destructuring-bind (value widget) args
-                                 (setf
-                                  (child-slot-value widget slot-name)
-                                  value))))))
+    :specializers (list (find-class t) (find-class 'widget))
+    :lambda-list '(value widget)
+    :function #'(lambda (args next-methods)
+                 (declare (ignore next-methods))
+                 (destructuring-bind (value widget) args
+                   (setf (child-property-value widget slot-name) value))))))

 
 
 (defmethod validate-superclass ((class child-class) (super pcl::standard-class))
 
 
 (defmethod validate-superclass ((class child-class) (super pcl::standard-class))


@@ -225,50 +202,23 @@ (defun query-container-class-child-properties (type-number)
     (multiple-value-bind (array length)
        (%container-class-list-child-properties class)
       (unwind-protect
     (multiple-value-bind (array length)
        (%container-class-list-child-properties class)
       (unwind-protect

-         (map-c-array 'list #'identity array 'param length)
+         (map-c-vector 'list #'identity array 'param length)

        (deallocate-memory array)))))
 
 (defun default-container-child-name (container-class)
   (intern (format nil "~A-CHILD" container-class)))
 
        (deallocate-memory array)))))
 
 (defun default-container-child-name (container-class)
   (intern (format nil "~A-CHILD" container-class)))
 

-(defun expand-container-type (type-number &optional slots)
-  (let* ((class (type-from-number type-number))
-        (super (supertype type-number))
-        (child-class (default-container-child-name class))
-        (expanded-child-slots
-         (mapcar
-          #'(lambda (param)
-              (with-slots (name flags value-type documentation) param
-                (let* ((slot-name (default-slot-name name))
-                       (slot-type (type-from-number value-type #|t|#))
-                       (accessor
-                        (default-slot-accessor class slot-name slot-type)))
-                  `(,slot-name
-                    :allocation :property
-                    :pname ,name
-                    ,@(cond
-                       ((and
-                         (member :writable flags)
-                         (member :readable flags))
-                        (list :accessor accessor))
-                       ((member :writable flags)
-                        (list :writer `(setf ,accessor)))
-                       ((member :readable flags)
-                        (list :reader accessor)))
-                    ,@(when (or
-                             (member :construct flags)
-                             (member :writable flags))
-                        (list :initarg (intern (string slot-name) "KEYWORD")))
-                    :type ,slot-type
-                    ,@(when documentation
-                        (list :documentation documentation))))))
-          (query-container-class-child-properties type-number))))
+(defun expand-container-type (type &optional options)
+  (let* ((class (type-from-number type))
+        (super (supertype type))
+        (child-class (default-container-child-name class)))

     `(progn
     `(progn

-       ,(expand-gobject-type type-number slots)
-       (defclass ,child-class
-        (,(default-container-child-name super))
-        ,expanded-child-slots
+       ,(expand-gobject-type type options)
+       (defclass ,child-class (,(default-container-child-name super))
+        ,(slot-definitions child-class 
+          (query-container-class-child-properties type) nil)

         (:metaclass child-class)
         (:container ,class)))))
 
         (:metaclass child-class)
         (:container ,class)))))
 

+

 (register-derivable-type 'container "GtkContainer" 'expand-container-type)
 (register-derivable-type 'container "GtkContainer" 'expand-container-type)