X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/62f128081bd450f55d7e4ffd6602fb518f8ea304..a7d19b2a6d3e11b28842476b80ef68d81fb6b8ac:/glib/ginterface.lisp diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp index 17ced81..a0fde4d 100644 --- a/glib/ginterface.lisp +++ b/glib/ginterface.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2001-2005 Espen S. Johnsen ;; -;; 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: ginterface.lisp,v 1.6 2005-02-01 15:24:52 espen Exp $ +;; $Id: ginterface.lisp,v 1.15 2006-02-26 15:30:01 espen Exp $ (in-package "GLIB") @@ -43,67 +48,69 @@ (defmethod effective-slot-definition-class ((class ginterface-class) &rest inita (t (call-next-method)))) (defmethod compute-effective-slot-definition-initargs ((class ginterface-class) direct-slotds) - (if (eq (most-specific-slot-value direct-slotds 'allocation) :property) + (if (eq (slot-definition-allocation (first direct-slotds)) :property) (nconc (list :pname (signal-name-to-string (most-specific-slot-value direct-slotds 'pname)) :readable (most-specific-slot-value direct-slotds 'readable) :writable (most-specific-slot-value direct-slotds 'writable) - :construct (most-specific-slot-value direct-slotds 'construct)) + :construct-only (most-specific-slot-value direct-slotds 'construct)) (call-next-method)) (call-next-method))) -(defmethod shared-initialize ((class ginterface-class) names - &rest initargs &key name alien-name) - (declare (ignore initargs names)) +(defmethod shared-initialize ((class ginterface-class) names &key name gtype) + (declare (ignore names)) (let* ((class-name (or name (class-name class))) - (type-number - (find-type-number - (or (first alien-name) (default-alien-type-name class-name)) t))) - (register-type class-name type-number)) +;; (type-number +;; (or +;; (find-type-number class-name) +;; (register-type class-name +;; (or (first gtype) (default-type-init-name class-name))))) + ) +; (type-default-interface-ref type-number) + ) (call-next-method)) -(defmethod validate-superclass - ((class ginterface-class) (super pcl::standard-class)) +(defmethod validate-superclass ((class ginterface-class) (super standard-class)) (subtypep (class-name super) 'ginterface)) -(defmethod alien-type ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method alien-type ((type ginterface)) + (declare (ignore type)) (alien-type 'gobject)) -(defmethod size-of ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method size-of ((type ginterface)) + (declare (ignore type)) (size-of 'gobject)) -(defmethod from-alien-form (location (class ginterface-class) &rest args) - (declare (ignore class args)) - (from-alien-form location 'gobject)) +(define-type-method from-alien-form ((type ginterface) location) + (declare (ignore type)) + (from-alien-form 'gobject location)) -(defmethod from-alien-function ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method from-alien-function ((type ginterface)) + (declare (ignore type)) (from-alien-function 'gobject)) -(defmethod to-alien-form (instance (class ginterface-class) &rest args) - (declare (ignore class args)) - (to-alien-form instance 'gobject)) +(define-type-method to-alien-form ((type ginterface) instance) + (declare (ignore type)) + (to-alien-form 'gobject instance)) -(defmethod to-alien-function ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method to-alien-function ((type ginterface)) + (declare (ignore type)) (to-alien-function 'gobject)) -(defmethod reader-function ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method reader-function ((type ginterface)) + (declare (ignore type)) (reader-function 'gobject)) -(defmethod writer-function ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method writer-function ((type ginterface)) + (declare (ignore type)) (writer-function 'gobject)) -(defmethod destroy-function ((class ginterface-class) &rest args) - (declare (ignore class args)) +(define-type-method destroy-function ((type ginterface)) + (declare (ignore type)) (destroy-function 'gobject)) @@ -129,9 +136,10 @@ (defun query-object-interface-properties (type &optional inherited-p) (unwind-protect (multiple-value-bind (array length) (%object-interface-list-properties iface) - (unwind-protect - (%map-params array length type-number inherited-p) - (deallocate-memory array))) + (unless (null-pointer-p array) + (unwind-protect + (%map-params array length type-number inherited-p) + (deallocate-memory array)))) ; (type-default-interface-unref type-number) ))) @@ -144,9 +152,12 @@ (defun expand-ginterface-type (type forward-p options &rest args) ,(unless forward-p (slot-definitions class (query-object-interface-properties type) slots)) (:metaclass ginterface-class) - (:alien-name ,(find-type-name type))))) + (:gtype ,(register-type-as type))))) (defun ginterface-dependencies (type) - (delete-duplicates (mapcar #'param-value-type (query-object-interface-properties type)))) + (delete-duplicates + (cons + (supertype type) + (mapcar #'param-value-type (query-object-interface-properties type))))) (register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type 'ginterface-dependencies)