-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 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: proxy.lisp,v 1.17 2004-12-26 11:40:14 espen Exp $
+;; $Id: proxy.lisp,v 1.22 2006-02-02 18:37:46 espen Exp $
(in-package "GLIB")
((setter :reader slot-definition-setter :initarg :setter)
(getter :reader slot-definition-getter :initarg :getter)
(unbound :reader slot-definition-unbound :initarg :unbound)
- (boundp :reader slot-definition-boundp :initarg :boundp)))
+ (boundp :reader slot-definition-boundp :initarg :boundp))))
(defvar *unbound-marker* (gensym "UNBOUND-MARKER-"))
instances)))
(if object
(slot-value object slot)
- default))))
+ default)));)
(internal *instance-cache*)
(defvar *instance-cache* (make-hash-table :test #'eql))
-(defun cache-instance (instance)
+(defun cache-instance (instance &optional (weak-ref t))
(setf
- (gethash (system:sap-int (proxy-location instance)) *instance-cache*)
- (ext:make-weak-pointer instance)))
+ (gethash (sap-int (proxy-location instance)) *instance-cache*)
+ (if weak-ref
+ (make-weak-pointer instance)
+ instance)))
(defun find-cached-instance (location)
- (let ((ref (gethash (system:sap-int location) *instance-cache*)))
+ (let ((ref (gethash (sap-int location) *instance-cache*)))
(when ref
- (ext:weak-pointer-value ref))))
+ (if (weak-pointer-p ref)
+ (weak-pointer-value ref)
+ ref))))
(defun instance-cached-p (location)
- (gethash (system:sap-int location) *instance-cache*))
+ (gethash (sap-int location) *instance-cache*))
(defun remove-cached-instance (location)
- (remhash (system:sap-int location) *instance-cache*))
+ (remhash (sap-int location) *instance-cache*))
;; For debuging
-(defun cached-instances ()
+(defun list-cached-instances ()
(let ((instances ()))
(maphash #'(lambda (location ref)
(declare (ignore location))
- (push (ext:weak-pointer-value ref) instances))
+ (push ref instances))
*instance-cache*)
instances))
(defclass proxy ()
((location :reader proxy-location :type system-area-pointer)))
-(defgeneric initialize-proxy (object &rest initargs))
(defgeneric instance-finalizer (object))
(defgeneric reference-foreign (class location))
(defgeneric unreference-foreign (class location))
(setf (slot-value instance 'location) location)
(call-next-method))
(cache-instance instance)
- (ext:finalize instance (instance-finalizer instance))
+ (finalize instance (instance-finalizer instance))
instance)
(defmethod instance-finalizer ((instance proxy))
;;;; Metaclass used for subclasses of proxy
+(defgeneric most-specific-proxy-superclass (class))
+(defgeneric direct-proxy-superclass (class))
+
+
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass proxy-class (virtual-slots-class)
((size :reader proxy-instance-size)))
(defclass effective-alien-slot-definition (effective-virtual-slot-definition)
((offset :reader slot-definition-offset :initarg :offset)))
-
(defmethod most-specific-proxy-superclass ((class proxy-class))
(find-if
#'(lambda (class)
(subtypep (class-name class) 'proxy))
(cdr (compute-class-precedence-list class))))
-
+
(defmethod direct-proxy-superclass ((class proxy-class))
(find-if
#'(lambda (class)
(defmethod proxy-instance-size (class)
(declare (ignore class))
0)
+
+ (defmethod proxy-instance-size ((class-name symbol))
+ (proxy-instance-size (find-class class-name)))
)
(defmethod alien-type ((class proxy-class) &rest args)
`(reference-foreign ',(class-name class) (proxy-location ,instance)))
(defmethod copy-to-alien-function ((class proxy-class) &rest args)
- (declare (ignore class args))
+ (declare (ignore args))
#'(lambda (instance)
(reference-foreign class (proxy-location instance))))
(unreference-foreign class (sap-ref-sap location offset))))
(defmethod unbound-value ((class proxy-class) &rest args)
- (declare (ignore type args))
+ (declare (ignore args))
(values t nil))
(defgeneric ensure-proxy-instance (class location)
(let ((size (proxy-instance-size (class-of struct))))
(if (zerop size)
(error "~A has zero size" (class-of struct))
- (setf (slot-value struct 'location) (allocate-memory size)))))
+ (setf (slot-value struct 'location) (allocate-memory size)))))
(call-next-method))
(defmethod unreference-foreign ((class static-struct-class) location)
(declare (ignore class location))
nil)
+
+
+;;; Pseudo type for structs which are inlined in other objects
+
+(defmethod size-of ((type (eql 'inlined)) &rest args)
+ (declare (ignore type))
+ (proxy-instance-size (first args)))
+
+(defmethod reader-function ((type (eql 'inlined)) &rest args)
+ (declare (ignore type))
+ (destructuring-bind (class) args
+ #'(lambda (location &optional (offset 0))
+ (ensure-proxy-instance class
+ (reference-foreign class (sap+ location offset))))))
+
+(defmethod destroy-function ((type (eql 'inlined)) &rest args)
+ (declare (ignore args))
+ #'(lambda (location &optional (offset 0))
+ (declare (ignore location offset))))
+
+(export 'inlined)
~mdw / clg / blobdiff