-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-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: gobject.lisp,v 1.33 2005-02-27 15:14:38 espen Exp $
+;; $Id: gobject.lisp,v 1.40 2006-02-03 00:41:01 espen Exp $
(in-package "GLIB")
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass gobject-class (ginstance-class)
- ())
+ ((instance-slots-p :initform nil
+ :documentation "Non NIL if the class has slots with instance allocation")))
(defmethod validate-superclass ((class gobject-class) (super standard-class))
; (subtypep (class-name super) 'gobject)
(defbinding %object-unref () nil
(location pointer))
+(defcallback toggle-ref-callback (nil (data pointer) (location pointer) (last-ref-p boolean))
+ (if last-ref-p
+ (cache-instance (find-cached-instance location) t)
+ (cache-instance (find-cached-instance location) nil)))
+
+#+glib2.8
+(defbinding %object-add-toggle-ref () pointer
+ (location pointer)
+ ((callback toggle-ref-callback) pointer)
+ (nil null))
+
+#+glib2.8
+(defbinding %object-remove-toggle-ref () pointer
+ (location pointer)
+ ((callback toggle-ref-callback) pointer)
+ (nil null))
+
(defmethod reference-foreign ((class gobject-class) location)
(declare (ignore class))
+ #+glib2.8
+ (if (slot-value class 'instance-slots-p)
+ (%object-add-toggle-ref location)
+ (%object-ref location))
+ #-glib2.8
(%object-ref location))
(defmethod unreference-foreign ((class gobject-class) location)
(declare (ignore class))
- (%object-unref location))
+ (error "Should never be called on a GOBJECT-CLASS (if this is ever needed some redesigning would have to be done)")
+; (%object-unref location)
+)
+
; (defbinding object-class-install-param () nil
(defmethod initialize-internal-slot-functions ((slotd effective-property-slot-definition))
- (let* ((type (slot-definition-type slotd))
- (pname (slot-definition-pname slotd))
- (type-number (find-type-number type)))
+ (let ((type (slot-definition-type slotd))
+ (pname (slot-definition-pname slotd)))
(when (and (not (slot-boundp slotd 'getter)) (slot-readable-p slotd))
(setf
(slot-value slotd 'getter)
- (let ((reader nil)) ;(reader-function type)))
+ (let ((reader nil))
#'(lambda (object)
(unless reader
(setq reader (reader-function type)))
- (let ((gvalue (gvalue-new type-number)))
+ (let ((gvalue (gvalue-new type)))
(%object-get-property object pname gvalue)
(unwind-protect
(funcall reader gvalue +gvalue-value-offset+)
(when (and (not (slot-boundp slotd 'setter)) (slot-writable-p slotd))
(setf
(slot-value slotd 'setter)
- (let ((writer nil)) ;(writer-function type)))
+ (let ((writer nil))
#'(lambda (value object)
(unless writer
(setq writer (writer-function type)))
- (let ((gvalue (gvalue-new type-number)))
+ (let ((gvalue (gvalue-new type)))
(funcall writer value gvalue +gvalue-value-offset+)
(%object-set-property object pname gvalue)
(gvalue-free gvalue t)
(user-data-p object slot-name)))))
(call-next-method))
+(defmethod shared-initialize :after ((class gobject-class) names &rest initargs)
+ (declare (ignore initargs))
+ (when (some #'(lambda (slotd)
+ (and
+ (eq (slot-definition-allocation slotd) :instance)
+ (not (typep slotd 'effective-special-slot-definition))))
+ (class-slots class))
+ (setf (slot-value class 'instance-slots-p) t)))
+
+
;;;; Super class for all classes in the GObject type hierarchy
(defclass gobject (ginstance)
()
(:metaclass gobject-class)
- (:alien-name "GObject")))
+ (:gtype "GObject")))
(defun initial-add (object function initargs key pkey)
(defmethod initialize-instance ((object gobject) &rest initargs)
(unless (slot-boundp object 'location)
- ;; Extract initargs which we should pass directly to the GObeject
+ ;; Extract initargs which we should pass directly to the GObject
;; constructor
(let* ((slotds (class-slots (class-of object)))
(args (when initargs
(defmethod instance-finalizer ((instance gobject))
(let ((location (proxy-location instance)))
+ #+glib2.8
+ (if (slot-value (class-of instance) 'instance-slots-p)
+ #'(lambda ()
+ (remove-cached-instance location)
+ (%object-remove-toggle-ref location))
+ #'(lambda ()
+ (remove-cached-instance location)
+ (%object-unref location)))
+ #-glib2.8
#'(lambda ()
(remove-cached-instance location)
- (%object-unref location))))
+ (%object-unref location))))
(defbinding (%gobject-new "g_object_new") () pointer
(nreverse properties))))
(defun query-object-class-properties (type &optional inherited-p)
- (let* ((type-number (find-type-number type))
+ (let* ((type-number (find-type-number type t))
(class (type-class-ref type-number)))
(unwind-protect
(multiple-value-bind (array length)
`(,slot-name
:allocation :property :pname ,name
- ,@(cond
- ((find :unbound args) (list :unbound (getf args :unbound))))
+ ,@(when (find :unbound args) (list :unbound (getf args :unbound)))
+ ,@(when (find :getter args) (list :getter (getf args :getter)))
+ ,@(when (find :setter args) (list :setter (getf args :setter)))
;; accessors
,@(cond
(class (type-from-number type))
(slots (getf options :slots)))
`(defclass ,class ,supers
- ,(unless forward-p
- (slot-definitions class (query-object-class-properties type) slots))
- (:metaclass ,metaclass)
- (:alien-name ,(find-type-name type)))))
+ ,(unless forward-p
+ (slot-definitions class (query-object-class-properties type) slots))
+ (:metaclass ,metaclass)
+ (:gtype ,(register-type-as type)))))
(defun gobject-dependencies (type)
(delete-duplicates
~mdw / clg / blobdiff