-;; 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: gtype.lisp,v 1.30 2005-03-12 19:38:12 espen Exp $
+;; $Id: gtype.lisp,v 1.36 2006-02-01 22:48:39 espen Exp $
(in-package "GLIB")
(defun type-from-number (type-number &optional error)
(multiple-value-bind (type found)
(gethash type-number *type-number-to-lisp-type*)
- (when (and error (not found))
+ (if found
+ type
(let ((name (find-foreign-type-name type-number)))
- (if name
- (error "Type number not registered: ~A (~A)" type-number name)
- (error "Invalid type number: ~A" type-number))))
- type))
+ (cond
+ ((and name (not (= (type-number-from-glib-name name nil) type-number)))
+ ;; This is a hack because GdkEvent seems to be registered
+ ;; multiple times
+ (type-from-number (type-number-from-glib-name name)))
+ ((and error name)
+ (error "Type number not registered: ~A (~A)" type-number name))
+ ((and error)
+ (error "Invalid type number: ~A" type-number)))))))
(defbinding (find-foreign-type-name "g_type_name") (type) (copy-of string)
((find-type-number type t) type-number))
(substitute #\_ #\- (string-downcase type)))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defclass type-info (struct)
+ ((class-size :allocation :alien :type (unsigned 16) :initarg :class-size)
+ (base-init :allocation :alien :type pointer)
+ (base-finalize :allocation :alien :type pointer)
+ (class-init :allocation :alien :type pointer)
+ (class-finalize :allocation :alien :type pointer)
+ (class-data :allocation :alien :type pointer)
+ (instance-size :allocation :alien :type (unsigned 16)
+ :initarg :instance-size)
+ (n-preallocs :allocation :alien :type (unsigned 16))
+ (instance-init :allocation :alien :type pointer)
+ (value-table :allocation :alien :type pointer))
+ (:metaclass struct-class)))
+
+(defbinding %type-register-static () type-number
+ (parent-type type-number)
+ (name string)
+ (info type-info)
+ (0 unsigned-int))
+
+(defun register-new-type (type parent &optional foreign-name)
+ (let ((parent-info (type-query parent)))
+ (with-slots ((parent-number type-number) class-size instance-size) parent-info
+ (let ((type-number
+ (%type-register-static
+ parent-number
+ (or foreign-name (default-alien-type-name type))
+ (make-instance 'type-info :class-size class-size :instance-size instance-size))))
+ (setf (gethash type *lisp-type-to-type-number*) type-number)
+ (setf (gethash type-number *type-number-to-lisp-type*) type)
+ type-number))))
+
+
;;;; Metaclass for subclasses of ginstance
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass ginstance-class (proxy-class)
- ()))
+ ((foreign-init))))
+
+(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
+ (call-next-method)
+ (setf
+ (slot-value class 'foreign-init)
+ (or (first gtype) (default-type-init-name (or name (class-name class))))))
-(defmethod shared-initialize ((class ginstance-class) names &rest initargs &key name gtype)
- (declare (ignore names))
- (let* ((class-name (or name (class-name class)))
- (type-number
+
+(defmethod finalize-inheritance ((class ginstance-class))
+ (call-next-method)
+ (let* ((class-name (class-name class))
+ (super (most-specific-proxy-superclass class))
+ (foreign-init (slot-value class 'foreign-init))
+ (type-number
(or
(find-type-number class-name)
- (register-type class-name
- (or (first gtype) (default-type-init-name class-name))))))
- (if (getf initargs :size)
- (call-next-method)
- (let ((size (type-instance-size type-number)))
- (apply #'call-next-method class names :size (list size) initargs)))))
+ (if (or
+ (symbolp foreign-init)
+ (type-number-from-glib-name foreign-init nil))
+ (register-type class-name foreign-init)
+ (register-new-type class-name (class-name super) foreign-init)))))
+ (unless (eq (class-name super) (supertype type-number))
+ (warn "~A is the super type for ~A in the gobject type system."
+ (supertype type-number) class-name))
+
+ (unless (slot-boundp class 'size)
+ (setf (slot-value class 'size) (type-instance-size type-number)))))
(defmethod validate-superclass ((class ginstance-class) (super standard-class))
(register-type 'unsigned-char "guchar")
(register-type 'boolean "gboolean")
(register-type 'int "gint")
+(register-type-alias 'integer 'int)
(register-type-alias 'fixnum 'int)
(register-type 'unsigned-int "guint")
(register-type 'long "glong")
~mdw / clg / blobdiff