Bug fixes

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index f3a14a8f80e72cc25495032e21d7ce0419bc56ae..c098921459276ee8f256c50d2b90c91dee44fd8f 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -1,71 +1,65 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <espen@users.sourceforge.org>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>

 ;;
 ;;

-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:

 ;;
 ;;

-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.

 ;;
 ;;

-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 
 

-;; $Id: gtkobject.lisp,v 1.15 2002-04-02 15:07:33 espen Exp $
+;; $Id: gtkobject.lisp,v 1.47 2008-03-06 22:02:08 espen Exp $

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

-;;;; Misc utils
-
-; (defun name-to-string (name)
-;   (substitute #\_ #\- (string-downcase (string name))))
-
-; (defun string-to-name (name &optional (package "KEYWORD"))
-;   (intern (substitute #\- #\_ (string-upcase name)) package))
-
-
-

 ;;;; 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 "libgtk-x11-2.0.so"
-   :ignore ("gtk_window_get_type_hint"))
+  (init-types-in-library gtk "libgtk-2.0")

 
   (defclass %object (gobject)
     ()
     (:metaclass gobject-class)
 
   (defclass %object (gobject)
     ()
     (:metaclass gobject-class)

-    (:alien-name "GtkObject")))
+    (:gtype |gtk_object_get_type|)))

 
 
 
 

-(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)

-  (object-ref object) ; inc ref count before sinking
-  (%object-sink 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)
   (declare (ignore initargs))
   (call-next-method)

+  ;; Add a temorary reference which will be removed when the object is
+  ;; sinked
+  (funcall (reference-function '%object) (foreign-location object))

   (%object-sink object))
 
 (defbinding %object-sink () nil
   (object %object))
 
   (%object-sink object))
 
 (defbinding %object-sink () nil
   (object %object))
 

+;;;; Main loop and event handling

 
 

-;;;; Main loop, timeouts and idle functions
-
-(declaim (inline events-pending-p main-iteration))
+(defparameter *reentrant-main-iteration* t)
+(defvar *running-main-iteration* nil)

 
 

-(defbinding (events-pending-p "gtk_events_pending") () boolean)
+(defbinding events-pending-p () boolean)

 
 (defbinding get-current-event () gdk:event)
 
 
 (defbinding get-current-event () gdk:event)
 


@@ -83,15 +77,25 @@ (defbinding main-iteration-do (&optional (blocking t)) boolean
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))

-  (when (events-pending-p)
-    (main-iteration-do nil)
-    (main-iterate-all)))
+  (unless (and (not *reentrant-main-iteration*) *running-main-iteration*)
+    (let ((*running-main-iteration* t))
+      (loop
+       while (events-pending-p)
+       do (main-iteration-do nil))))
+  #+clisp 0)
+

 
 

-(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)
+(define-callback fd-source-callback-marshal nil 
+    ((callback-id unsigned-int) (fd unsigned-int))
+  (glib::invoke-source-callback callback-id fd))

 
 

+(defbinding (input-add "gtk_input_add_full") (fd condition function) unsigned-int
+  (fd unsigned-int)
+  (condition gdk:input-condition)
+  (fd-source-callback-marshal callback)
+  (nil null)
+  ((register-callback-function function) unsigned-long)
+  (user-data-destroy-callback callback))

 
 
 ;;;; Metaclass for child classes
 
 
 ;;;; Metaclass for child classes


@@ -99,111 +103,119 @@ (setq lisp::*max-event-to-usec* 1000)
 (defvar *container-to-child-class-mappings* (make-hash-table))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 (defvar *container-to-child-class-mappings* (make-hash-table))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass child-class (virtual-slot-class))
+  (defclass container-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 container-child-class) names &key container)
+  (declare (ignore names))

   (call-next-method)
   (setf
    (gethash (find-class (first container)) *container-to-child-class-mappings*)
   (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)
+    class)
+  #+clisp
+  (loop
+   for slotd in (class-direct-slots class)
+   when (typep slotd 'direct-child-slot-definition)
+   do (loop
+       for reader in (slot-definition-readers slotd)
+       do (add-reader-method class 
+          (ensure-generic-function reader :lambda-list '(object)) 
+          (slot-definition-name slotd)))
+      (loop
+       for writer in (slot-definition-writers slotd)
+       do (add-writer-method class 
+          (ensure-generic-function writer :lambda-list '(value object)) 
+          (slot-definition-name slotd)))))
+
+(defmethod direct-slot-definition-class ((class container-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 container-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))))
 

-(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 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 pcl::add-reader-method ((class child-class) generic-function slot-name)
+(defmethod compute-effective-slot-definition-initargs ((class container-child-class) direct-slotds)
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
+      (nconc 
+       (list :pname (most-specific-slot-value direct-slotds 'pname))
+       (call-next-method))
+    (call-next-method)))
+
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
+  (let* ((type (slot-definition-type slotd))
+        (pname (slot-definition-pname slotd))
+        (reader (reader-function type :ref :get)))
+    #'(lambda (object)
+       (with-slots (parent child) object          
+         (with-memory (gvalue +gvalue-size+)
+           (glib::%gvalue-init gvalue (find-type-number type))
+           (%container-child-get-property parent child pname gvalue)
+           (funcall reader gvalue +gvalue-value-offset+))))))
+
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
+  (let* ((type (slot-definition-type slotd))
+        (pname (slot-definition-pname slotd))
+        (writer (writer-function type :temp t))
+        (destroy (destroy-function type :temp t)))
+    #'(lambda (value object)
+       (with-slots (parent child) object          
+         (with-memory (gvalue +gvalue-size+)
+           (glib::%gvalue-init gvalue (find-type-number type))
+           (funcall writer value gvalue +gvalue-value-offset+)
+           (%container-child-set-property parent child pname gvalue)
+           (funcall destroy gvalue +gvalue-value-offset+))
+         value))))
+
+
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)

   (add-method
    generic-function
    (make-instance 'standard-method
   (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)))))
-
-(defmethod pcl::add-writer-method
-    ((class child-class) generic-function slot-name)
+    :specializers (list (find-class 'widget))
+    :lambda-list '(widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
+    :function #'(lambda (args next-methods)
+                 (declare (ignore next-methods))
+                 (child-property-value (first args) slot-name)))))
+
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)

   (add-method
    generic-function
    (make-instance 'standard-method
   (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)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
+    :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 container-child-class) (super standard-class))

   ;(subtypep (class-name super) 'container-child)
   t)
 
 
   ;(subtypep (class-name super) 'container-child)
   t)
 
 

-(defclass container-child ()
+(defclass container-child (virtual-slots-object)

   ((parent :initarg :parent :type container)
    (child :initarg :child :type widget)))
 
   ((parent :initarg :parent :type container)
    (child :initarg :child :type widget)))
 


@@ -214,55 +226,65 @@ (defbinding %container-class-list-child-properties () pointer
   (class pointer)
   (n-properties unsigned-int :out))
 
   (class pointer)
   (n-properties unsigned-int :out))
 

-(defun query-container-class-child-properties (type-number)
+(defun query-container-class-child-properties (type-number &optional owner-only-p)

   (let ((class (type-class-ref type-number)))
     (multiple-value-bind (array length)
        (%container-class-list-child-properties class)
       (unwind-protect
   (let ((class (type-class-ref type-number)))
     (multiple-value-bind (array length)
        (%container-class-list-child-properties class)
       (unwind-protect

-         (map-c-array 'list #'identity array 'param length)
+         (let ((properties (map-c-vector 'list #'identity array 'param length)))
+           (if owner-only-p
+               (delete-if 
+                 #'(lambda (property)
+                     (not (eql (slot-value property 'glib::owner-type) type-number)))
+                 properties)
+             properties))

        (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
-                                   child-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))))
-    `(progn
-       ,(expand-gobject-type type-number slots)
-       (defclass ,child-class
-        (,(default-container-child-name super))
-        ,expanded-child-slots
-        (:metaclass child-class)
-        (:container ,class)))))
-
-(register-derivable-type 'container "GtkContainer" 'expand-container-type)
+(defun expand-container-type (type forward-p options)
+  (let* ((class (type-from-number type))
+        (super (supertype type))
+        (child-class (default-container-child-name class)))
+    (if forward-p 
+       (expand-gobject-type type t options)
+      `(progn
+        ,(expand-gobject-type type nil options)
+        ,(let ((child-properties (query-container-class-child-properties type t)))
+           (when child-properties
+             `(defclass ,child-class (,(default-container-child-name super))
+                ,(slot-definitions child-class child-properties nil)
+                (:metaclass container-child-class)
+                (:container ,class))))))))
+
+(defun container-child-class (container-class)
+  (gethash container-class *container-to-child-class-mappings*))
+
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)
+
+
+(defmacro define-callback-setter (name arg return-type &rest rest-args)
+  (let ((callback (gensym)))
+    (if arg
+       `(progn 
+          (define-callback-marshal ,callback ,return-type 
+            ,(cons arg rest-args))
+          (defbinding ,name () nil
+            ,arg
+            (,callback callback)
+            (function user-callback)
+            (user-data-destroy-callback callback)))
+      `(progn 
+        (define-callback-marshal ,callback ,return-type ,rest-args)
+        (defbinding ,name () nil
+          (,callback callback)
+          (function user-callback)
+          (user-data-destroy-callback callback))))))
+