From: espen <espen>
Date: Tue, 25 Apr 2006 20:52:09 +0000 (+0000)
Subject: Moved to the gffi directory
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/b5fb399c7af5e996626e8eba86648cdab2226d4b

Moved to the gffi directory
---

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
deleted file mode 100644
index 7fe85ab..0000000
--- a/glib/ffi.lisp
+++ /dev/null
@@ -1,1075 +0,0 @@
-;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
-;;
-;; 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:
-;;
-;; The above copyright notice and this permission notice shall be
-;; included in all copies or substantial portions of the Software.
-;;
-;; 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: ffi.lisp,v 1.30 2006-03-03 20:31:24 espen Exp $
-
-(in-package "GLIB")
-
-
-;;;; Foreign function call interface
-
-(defvar *package-prefix* nil)
-
-(defun set-package-prefix (prefix &optional (package *package*))
-  (let ((package (find-package package)))
-    (setq *package-prefix* (delete package *package-prefix* :key #'car))
-    (push (cons package prefix) *package-prefix*))
-  prefix)
-
-(defun package-prefix (&optional (package *package*))
-  (let ((package (find-package package)))
-    (or
-     (cdr (assoc package *package-prefix*))
-     (substitute #\_ #\- (string-downcase (package-name package))))))
-
-(defun find-prefix-package (prefix)
-  (or
-   (car (rassoc (string-downcase prefix) *package-prefix* :test #'string=))
-   (find-package (string-upcase prefix))))
-
-(defmacro use-prefix (prefix &optional (package *package*))
-  `(eval-when (:compile-toplevel :load-toplevel :execute)
-     (set-package-prefix ,prefix ,package)))
-
-
-(defun default-alien-fname (lisp-name)
-  (let* ((name (substitute #\_ #\- (string-downcase lisp-name)))
-	 (stripped-name
-	  (cond
-	   ((and 
-	     (char= (char name 0) #\%)
-	     (string= "_p" name :start2 (- (length name) 2)))
-	    (subseq name 1 (- (length name) 2)))
-	   ((char= (char name 0) #\%)
-	    (subseq name 1))
-	   ((string= "_p" name :start2 (- (length name) 2))
-	    (subseq name 0 (- (length name) 2)))
-	   (name)))
-	 (prefix (package-prefix *package*)))
-    (if (or (not prefix) (string= prefix ""))
-	stripped-name
-      (format nil "~A_~A" prefix stripped-name))))
-
-(defun default-alien-type-name (type-name)
-  (let ((prefix (package-prefix *package*)))
-    (apply
-     #'concatenate
-     'string
-     (mapcar
-      #'string-capitalize    
-      (cons prefix (split-string (symbol-name type-name) #\-))))))
-
-(defun default-type-name (alien-name)
-  (let ((parts
-	 (mapcar
-	  #'string-upcase
-	  (split-string-if alien-name #'upper-case-p))))
-    (intern
-     (concatenate-strings
-      (rest parts) #\-) (find-prefix-package (first parts)))))
-    
-	 
-(defmacro defbinding (name lambda-list return-type &rest docs/args)
-  (multiple-value-bind (lisp-name c-name)
-      (if (atom name)
- 	  (values name (default-alien-fname name))
- 	(values-list name))
-		       
-    (let ((supplied-lambda-list lambda-list)
-	  (docs nil)
-	  (args nil))
-      (dolist (doc/arg docs/args)
-	(if (stringp doc/arg)
-	    (push doc/arg docs)
-	  (progn
-	    (destructuring-bind (expr type &optional (style :in)) doc/arg
-	      (unless (member style '(:in :out :in-out :return))
-		(error "Bogus argument style ~S in ~S." style doc/arg))
-	      (when (and
-		     (not supplied-lambda-list)
-		     (namep expr) (member style '(:in :in-out :return)))
-		(push expr lambda-list))
-	      (push (list (cond 
-			   ((and (namep expr) (eq style :out)) expr)
-			   ((namep expr) (make-symbol (string expr)))
-			   ((gensym)))
-			  expr type style) args)))))
-      
-      (%defbinding
-       c-name lisp-name (or supplied-lambda-list (nreverse lambda-list))
-       return-type (reverse docs) (reverse args)))))
-
-#+(or cmu sbcl)
-(defun %defbinding (foreign-name lisp-name lambda-list return-type docs args)
-  (collect ((alien-types) (alien-bindings) (alien-parameters) 
-	    (return-values) (cleanup-forms))
-    (dolist (arg args)
-      (destructuring-bind (var expr type style) arg
-	(let ((declaration (alien-type type))
-	      (cleanup (cleanup-form type var)))
-
-	  (cond
-	    ((member style '(:out :in-out))
-	     (alien-types `(* ,declaration))
-	     (alien-parameters `(addr ,var))
-	     (alien-bindings
-	      `(,var ,declaration
-		,@(cond 
-		   ((eq style :in-out) (list (to-alien-form type expr)))
-		   ((eq declaration 'system-area-pointer) 
-		    (list '(make-pointer 0))))))
-	     (return-values (from-alien-form type var)))
-	    ((eq style :return)
-	     (alien-types declaration)
-	     (alien-bindings
-	      `(,var ,declaration ,(to-alien-form type expr)))
-	     (alien-parameters var)
-	     (return-values (from-alien-form type var)))
-	    (cleanup
-	     (alien-types declaration)
-	     (alien-bindings
-	      `(,var ,declaration ,(to-alien-form type expr)))
-	     (alien-parameters var)
-	     (cleanup-forms cleanup))
-	    (t
-	     (alien-types declaration)
-	     (alien-parameters (to-alien-form type expr)))))))
-
-    (let* ((alien-name (make-symbol (string lisp-name)))
-	   (alien-funcall `(alien-funcall ,alien-name ,@(alien-parameters))))
-      `(defun ,lisp-name ,lambda-list
-	 ,@docs
-	 #+cmu(declare (optimize (inhibit-warnings 3)))
-	 #+sbcl(declare (muffle-conditions compiler-note))
-	 (with-alien ((,alien-name
-		       (function
-			,(alien-type return-type)
-			,@(alien-types))
-		       :extern ,foreign-name)
-		      ,@(alien-bindings))
-	   ,(if return-type
-		`(values
-		  (unwind-protect 
-		      ,(from-alien-form return-type alien-funcall)
-		    ,@(cleanup-forms))
-		  ,@(return-values))
-	      `(progn
-		(unwind-protect 
-		     ,alien-funcall
-		  ,@(cleanup-forms))
-		(values ,@(return-values)))))))))
-
-
-;;; Creates bindings at runtime
-(defun mkbinding (name return-type &rest arg-types)
-  #+cmu(declare (optimize (inhibit-warnings 3)))
-  #+sbcl(declare (muffle-conditions compiler-note))
-  (let* ((ftype 
-	  `(function ,@(mapcar #'alien-type (cons return-type arg-types))))
-	 (alien
-	  (%heap-alien
-	   (make-heap-alien-info
-	    :type (parse-alien-type ftype #+sbcl nil)
-	    :sap-form (let ((address (foreign-symbol-address name)))
-			(etypecase address
-			  (integer (int-sap address))
-			  (system-area-pointer address))))))
-	 (translate-arguments (mapcar #'to-alien-function arg-types))
-	 (translate-return-value (from-alien-function return-type))
-	 (cleanup-arguments (mapcar #'cleanup-function arg-types)))
-        
-    #'(lambda (&rest args)
-	(map-into args #'funcall translate-arguments args)
-	(prog1
-	    (funcall translate-return-value 
-	     (apply #'alien-funcall alien args))
-	  (mapc #'funcall cleanup-arguments args)))))
-
-
-
-;;;; C callbacks
-
-(defmacro define-callback (name return-type args &body body)
-  (let ((define-callback 
-	  #+cmu'alien:def-callback 	              
-	  #+(and sbcl alien-callbacks)'sb-alien::define-alien-callback
-	  #+(and sbcl (not alien-callbacks))'sb-alien:define-alien-function))
-    (multiple-value-bind (doc declaration body)
-	(cond
-	 ((and (stringp (first body)) (eq (cadr body) 'declare))
-	  (values (first body) (second body) (cddr body)))
-	 ((stringp (first body))
-	  (values (first body) nil (rest body)))
-	 ((eq (caar body) 'declare)
-	  (values nil (first body) (rest body)))
-	 (t (values nil nil body)))
-      `(progn
-	 #+cmu(defparameter ,name nil)
-	 (,define-callback ,name 
-	   #+(and sbcl alien-callbacks),(alien-type return-type) 
-	   (#+(or cmu (and sbcl (not alien-callbacks))),(alien-type return-type)
-	   ,@(mapcar #'(lambda (arg)
-			 (destructuring-bind (name type) arg
-			   `(,name ,(alien-type type))))
-		     args))
-	   ,@(when doc (list doc))
-	   ,(to-alien-form return-type
-	     `(let (,@(loop
-		       for (name type) in args
-		       as from-alien-form = (callback-from-alien-form type name)
-		       collect `(,name ,from-alien-form)))
-		,@(when declaration (list declaration))
-		(unwind-protect
-		    (progn ,@body)
-		  ,@(loop 
-		     for (name type) in args
-		     do (callback-cleanup-form type name))))))))))
-
-(defun callback-address (callback)
-  #+cmu(alien::callback-trampoline callback)
-  #+(and sbcl (not alien-callbacks))(sb-alien:alien-function-sap callback)
-  #+(and sbcl alien-callbacks)(sb-alien:alien-sap callback))
-
-#+sbcl
-(deftype callback () 
-  #-alien-callbacks'sb-alien:alien-function
-  #+alien-callbacks'sb-alien:alien)
-
-
-;;; These are for backward compatibility
-
-(defmacro defcallback (name (return-type &rest args) &body body)
-  `(define-callback ,name ,return-type ,args ,@body))
-
-#-cmu
-(defun callback (callback)
-  (callback-address callback))
-
-
-
-;;;; The "type method" system
-
-(defun find-applicable-type-method (name type-spec &optional (error-p t))
-  (let ((type-methods (get name 'type-methods)))
-    (labels ((search-method-in-cpl-order (classes)
-	       (when classes
-		 (or 
-		  (gethash (class-name (first classes)) type-methods)
-		  (search-method-in-cpl-order (rest classes)))))
-	     (lookup-method (type-spec)
-	       (if (and (symbolp type-spec) (find-class type-spec nil))
-		   (search-method-in-cpl-order
-		    (class-precedence-list (find-class type-spec)))
-		 (or 
-		  (let ((specifier (etypecase type-spec
-				     (symbol type-spec)
-				     (list (first type-spec)))))
-		    (gethash specifier type-methods))
-		  (multiple-value-bind (expanded-type expanded-p) 
-		      (type-expand-1 type-spec)
-		    (when expanded-p
-		      (lookup-method expanded-type))))))
-	     (search-built-in-type-hierarchy (sub-tree)
-               (when (subtypep type-spec (first sub-tree))
-		 (or
-		  (search-nodes (cddr sub-tree))
-		  (second sub-tree))))
-	     (search-nodes (nodes)
-	       (loop
-		for node in nodes
-		as function = (search-built-in-type-hierarchy node)
-		until function
-		finally (return function))))
-    (or 
-     (lookup-method type-spec)
-     ;; This is to handle unexpandable types whichs doesn't name a class
-     (unless (and (symbolp type-spec) (find-class type-spec nil))
-       (search-nodes (get name 'built-in-type-hierarchy)))
-     (and 
-      error-p
-      (error "No applicable type method for ~A when call width type specifier ~A" name type-spec))))))
-
-
-(defun insert-type-in-hierarchy (specifier function nodes)
-  (cond
-   ((let ((node (find specifier nodes :key #'first)))
-      (when node
-	(setf (second node) function)
-	nodes)))
-   ((let ((node
-	   (find-if 
-	    #'(lambda (node)
-		(subtypep specifier (first node)))
-	    nodes)))
-      (when node
-	(setf (cddr node) 
-	 (insert-type-in-hierarchy specifier function (cddr node)))
-	nodes)))
-   ((let ((sub-nodes (remove-if-not 
-		      #'(lambda (node)
-			  (subtypep (first node) specifier))
-		      nodes)))
-      (cons
-       (list* specifier function sub-nodes)
-       (nset-difference nodes sub-nodes))))))
-
-
-(defun add-type-method (name specifier function)
-  (setf (gethash specifier (get name 'type-methods)) function)
-  (when (typep (find-class specifier nil) 'built-in-class)
-    (setf (get name 'built-in-type-hierarchy)
-     (insert-type-in-hierarchy specifier function 
-      (get name 'built-in-type-hierarchy)))))
-
-
-;; TODO: handle optional, key and rest arguments
-(defmacro define-type-generic (name lambda-list &optional documentation)
-  (if (or 
-       (not lambda-list) 
-       (find (first lambda-list) '(&optional &key &rest &allow-other-keys)))
-      (error "A type generic needs at least one required argument")
-    `(progn 
-       (unless (get ',name 'type-methods)
-	 (setf (get ',name 'type-methods) (make-hash-table))
-	 (setf (get ',name 'built-in-type-hierarchy) ()))
-       (defun ,name ,lambda-list
-	 ,documentation
-	 (funcall 
-	  (find-applicable-type-method ',name ,(first lambda-list))
-	  ,@lambda-list)))))
-
-
-(defmacro define-type-method (name lambda-list &body body)
-  (let ((specifier (cadar lambda-list))
-	(args (cons (caar lambda-list) (rest lambda-list))))
-    `(progn
-       (add-type-method ',name ',specifier #'(lambda ,args ,@body))
-       ',name)))
-
-
-
-;;;; Definitons and translations of fundamental types    
-
-(define-type-generic alien-type (type-spec))
-(define-type-generic size-of (type-spec))
-(define-type-generic to-alien-form (type-spec form))
-(define-type-generic from-alien-form (type-spec form))
-(define-type-generic cleanup-form (type-spec form)
-  "Creates a form to clean up after the alien call has finished.")
-(define-type-generic callback-from-alien-form (type-spec form))
-(define-type-generic callback-cleanup-form (type-spec form))
-
-(define-type-generic to-alien-function (type-spec))
-(define-type-generic from-alien-function (type-spec))
-(define-type-generic cleanup-function (type-spec))
-
-(define-type-generic copy-to-alien-form (type-spec form))
-(define-type-generic copy-to-alien-function (type-spec))
-(define-type-generic copy-from-alien-form (type-spec form))
-(define-type-generic copy-from-alien-function (type-spec))
-(define-type-generic writer-function (type-spec))
-(define-type-generic reader-function (type-spec))
-(define-type-generic destroy-function (type-spec))
-
-(define-type-generic unbound-value (type-spec)
-  "Returns a value which should be intepreted as unbound for slots with virtual allocation")
-
-
-#+sbcl
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun sb-sizeof-bits (type)
-    (sb-alien-internals:alien-type-bits
-     (sb-alien-internals:parse-alien-type type nil)))
-
-  (defun sb-sizeof (type)
-    (/ (sb-sizeof-bits type) 8)))
-
-
-;; Sizes of fundamental C types in bytes (8 bits)
-(defconstant +size-of-short+
-  #+sbcl (sb-sizeof 'sb-alien:short)
-  #-sbcl 2)
-(defconstant +size-of-int+
-  #+sbcl (sb-sizeof 'sb-alien:int)
-  #-sbcl 4)
-(defconstant +size-of-long+
-  #+sbcl (sb-sizeof 'sb-alien:long)
-  #-sbcl 4)
-(defconstant +size-of-pointer+
-  #+sbcl (sb-sizeof 'sb-alien:system-area-pointer)
-  #-sbcl 4)
-(defconstant +size-of-float+
-  #+sbcl (sb-sizeof 'sb-alien:float)
-  #-sbcl 4)
-(defconstant +size-of-double+
-  #+sbcl (sb-sizeof 'sb-alien:double)
-  #-sbcl 8)
-
-
-;; Sizes of fundamental C types in bits
-(defconstant +bits-of-byte+ 8)
-(defconstant +bits-of-short+
-  #+sbcl (sb-sizeof-bits 'sb-alien:short)
-  #-sbcl 16)
-(defconstant +bits-of-int+
-  #+sbcl (sb-sizeof-bits 'sb-alien:int)
-  #-sbcl 32)
-(defconstant +bits-of-long+
-  #+sbcl (sb-sizeof-bits 'sb-alien:long)
-  #-sbcl 32)
-
-
-(deftype int () '(signed-byte #.+bits-of-int+))
-(deftype unsigned-int () '(unsigned-byte #.+bits-of-int+))
-(deftype long () '(signed-byte #.+bits-of-long+))
-(deftype unsigned-long () '(unsigned-byte #.+bits-of-long+))
-(deftype short () '(signed-byte #.+bits-of-short+))
-(deftype unsigned-short () '(unsigned-byte #.+bits-of-short+))
-(deftype signed (&optional (size '*)) `(signed-byte ,size))
-(deftype unsigned (&optional (size '*)) `(unsigned-byte ,size))
-(deftype char () 'base-char)
-(deftype pointer () 'system-area-pointer)
-(deftype boolean (&optional (size '*)) (declare (ignore size)) t)
-(deftype copy-of (type) type)
-
-(define-type-method alien-type ((type t))
-  (error "No alien type corresponding to the type specifier ~A" type))
-
-(define-type-method to-alien-form ((type t) form)
-  (declare (ignore form))
-  (error "Not a valid type specifier for arguments: ~A" type))
-
-(define-type-method to-alien-function ((type t))
-  (error "Not a valid type specifier for arguments: ~A" type))
-
-(define-type-method from-alien-form ((type t) form)
-  (declare (ignore form))
-  (error "Not a valid type specifier for return values: ~A" type))
-
-(define-type-method from-alien-function ((type t))
-  (error "Not a valid type specifier for return values: ~A" type))
- 
-(define-type-method cleanup-form ((type t) form)
-  (declare (ignore form type))
-  nil)
-
-(define-type-method cleanup-function ((type t))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method callback-from-alien-form ((type t) form)
-  (copy-from-alien-form type form))
-
-(define-type-method callback-cleanup-form ((type t) form)
-  (declare (ignore form type))
-  nil)
-
-(define-type-method destroy-function ((type t))
-  (declare (ignore type))
-  #'(lambda (location &optional offset)
-      (declare (ignore location offset))))
-
-(define-type-method copy-to-alien-form ((type t) form)
-  (to-alien-form type form))
-
-(define-type-method copy-to-alien-function ((type t))
-  (to-alien-function type))
-
-(define-type-method copy-from-alien-form ((type t) form)
-  (from-alien-form type  form))
-
-(define-type-method copy-from-alien-function ((type t))
-  (from-alien-function type))
-
-
-(define-type-method to-alien-form ((type real) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method to-alien-function ((type real))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method from-alien-form ((type real) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method from-alien-function ((type real))
-  (declare (ignore type))
-  #'identity)
-
-
-(define-type-method alien-type ((type integer))
-  (declare (ignore type))
-  (alien-type 'signed-byte))
-
-(define-type-method size-of ((type integer))
-  (declare (ignore type))
-  (size-of 'signed-byte))
-
-(define-type-method writer-function ((type integer))
-  (declare (ignore type))
-  (writer-function 'signed-byte))
-
-(define-type-method reader-function ((type integer))
-  (declare (ignore type))
-  (reader-function 'signed-byte))
-
-  
-(define-type-method alien-type ((type signed-byte))
-  (destructuring-bind (&optional (size '*)) 
-      (rest (mklist (type-expand-to 'signed-byte type)))
-    (ecase size
-      (#.+bits-of-byte+ #+cmu'(alien:signed 8) #+sbcl'(sb-alien:signed 8))
-      (#.+bits-of-short+ #+cmu 'c-call:short #+sbcl 'sb-alien:short)
-      ((* #.+bits-of-int+) #+cmu 'c-call:int #+sbcl 'sb-alien:int)
-      (#.+bits-of-long+ #+cmu 'c-call:long #+sbcl 'sb-alien:long))))
-
-(define-type-method size-of ((type signed-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'signed-byte type)))
-    (ecase size
-      (#.+bits-of-byte+ 1)
-      (#.+bits-of-short+ +size-of-short+)
-      ((* #.+bits-of-int+) +size-of-int+)
-      (#.+bits-of-long+ +size-of-long+))))
-
-(define-type-method writer-function ((type signed-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'signed-byte type)))
-    (let ((size (if (eq size '*) +bits-of-int+ size)))
-      (ecase size
-	(8 #'(lambda (value location &optional (offset 0))
-	       (setf (signed-sap-ref-8 location offset) value)))
-	(16 #'(lambda (value location &optional (offset 0))
-		(setf (signed-sap-ref-16 location offset) value)))
-	(32 #'(lambda (value location &optional (offset 0))
-		(setf (signed-sap-ref-32 location offset) value)))
-	(64 #'(lambda (value location &optional (offset 0))
-		(setf (signed-sap-ref-64 location offset) value)))))))
-  
-(define-type-method reader-function ((type signed-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'signed-byte type)))
-    (let ((size (if (eq size '*) +bits-of-int+ size)))
-      (ecase size
-	(8 #'(lambda (sap &optional (offset 0) weak-p) 
-	       (declare (ignore weak-p))
-	       (signed-sap-ref-8 sap offset)))
-	(16 #'(lambda (sap &optional (offset 0) weak-p)
-		(declare (ignore weak-p))
-		(signed-sap-ref-16 sap offset)))
-	(32 #'(lambda (sap &optional (offset 0) weak-p) 
-		(declare (ignore weak-p)) 
-		(signed-sap-ref-32 sap offset)))
-	(64 #'(lambda (sap &optional (offset 0) weak-p) 
-		(declare (ignore weak-p))
-		(signed-sap-ref-64 sap offset)))))))
-
-
-(define-type-method alien-type ((type unsigned-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'unsigned-byte type)))
-    (ecase size
-      (#.+bits-of-byte+ #+cmu'(alien:unsigned 8) #+sbcl'(sb-alien:unsigned 8))
-      (#.+bits-of-short+ #+cmu 'c-call:unsigned-short 
-			 #+sbcl 'sb-alien:unsigned-short)
-      ((* #.+bits-of-int+) #+cmu 'c-call:unsigned-int 
-                           #+sbcl 'sb-alien:unsigned-int)
-      (#.+bits-of-long+ #+cmu 'c-call:unsigned-long 
-			#+sbcl 'sb-alien:unsigned-long))))
-
-
-(define-type-method size-of ((type unsigned-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'unsigned-byte type)))
-  (size-of `(signed ,size))))
-
-(define-type-method writer-function ((type unsigned-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'unsigned-byte type)))
-    (let ((size (if (eq size '*) +bits-of-int+ size)))
-      (ecase size
-	(8 #'(lambda (value location &optional (offset 0))
-	       (setf (sap-ref-8 location offset) value)))
-	(16 #'(lambda (value location &optional (offset 0))
-		(setf (sap-ref-16 location offset) value)))
-	(32 #'(lambda (value location &optional (offset 0))
-		(setf (sap-ref-32 location offset) value)))
-	(64 #'(lambda (value location &optional (offset 0))
-		(setf (sap-ref-64 location offset) value)))))))
-      
-(define-type-method reader-function ((type unsigned-byte))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'unsigned-byte type)))
-    (let ((size (if (eq size '*) +bits-of-int+ size)))
-      (ecase size
-	(8 #'(lambda (sap &optional (offset 0) weak-p)
-	       (declare (ignore weak-p))
-	       (sap-ref-8 sap offset)))
-	(16 #'(lambda (sap &optional (offset 0) weak-p)
-		(declare (ignore weak-p)) 
-		(sap-ref-16 sap offset)))
-	(32 #'(lambda (sap &optional (offset 0) weak-p)
-		(declare (ignore weak-p)) 
-		(sap-ref-32 sap offset)))
-	(64 #'(lambda (sap &optional (offset 0) weak-p)
-		(declare (ignore weak-p))
-		(sap-ref-64 sap offset)))))))
-
-(define-type-method alien-type ((type single-float))
-  (declare (ignore type))
-  #+cmu 'alien:single-float #+sbcl 'sb-alien:single-float)
-
-(define-type-method size-of ((type single-float))
-  (declare (ignore type))
-  +size-of-float+)
-
-(define-type-method to-alien-form ((type single-float) form)
-  (declare (ignore type))
-  `(coerce ,form 'single-float))
-
-(define-type-method to-alien-function ((type single-float))
-  (declare (ignore type))
-  #'(lambda (number)
-      (coerce number 'single-float)))
-
-(define-type-method writer-function ((type single-float))
-  (declare (ignore type))
-  #'(lambda (value location &optional (offset 0))
-      (setf (sap-ref-single location offset) (coerce value 'single-float))))
-
-(define-type-method reader-function ((type single-float))
-  (declare (ignore type))
-  #'(lambda (sap &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (sap-ref-single sap offset)))
-
-
-(define-type-method alien-type ((type double-float))
-  (declare (ignore type))
-  #+cmu 'alien:double-float #+sbcl 'sb-alien:double-float)
-
-(define-type-method size-of ((type double-float))
-  (declare (ignore type))
-  +size-of-double+)
-
-(define-type-method to-alien-form ((type double-float) form)
-  (declare (ignore type))
-  `(coerce ,form 'double-float))
-
-(define-type-method to-alien-function ((type double-float))
-  (declare (ignore type))
-  #'(lambda (number)
-      (coerce number 'double-float)))
-
-(define-type-method writer-function ((type double-float))
-  (declare (ignore type))
-  #'(lambda (value location &optional (offset 0))
-      (setf (sap-ref-double location offset) (coerce value 'double-float))))
-
-(define-type-method reader-function ((type double-float))
-  (declare (ignore type))
-  #'(lambda (sap &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (sap-ref-double sap offset)))
-
-
-(define-type-method alien-type ((type base-char))
-  (declare (ignore type))
-  #+cmu 'c-call:char #+sbcl 'sb-alien:char)
-
-(define-type-method size-of ((type base-char))
-  (declare (ignore type))
-  1)
-
-(define-type-method to-alien-form ((type base-char) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method to-alien-function ((type base-char))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method from-alien-form ((type base-char) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method from-alien-function ((type base-char))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method writer-function ((type base-char))
-  (declare (ignore type))
-  #'(lambda (char location &optional (offset 0))
-      (setf (sap-ref-8 location offset) (char-code char))))
-
-(define-type-method reader-function ((type base-char))
-  (declare (ignore type))
-  #'(lambda (location &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (code-char (sap-ref-8 location offset))))
-
-
-(define-type-method alien-type ((type string))
-  (declare (ignore type))
-  (alien-type 'pointer))
-
-(define-type-method size-of ((type string))
-  (declare (ignore type))
-  (size-of 'pointer))
-
-(define-type-method to-alien-form ((type string) string)
-  (declare (ignore type))
-  `(let ((string ,string))
-     ;; Always copy strings to prevent seg fault due to GC
-     #+cmu
-     (copy-memory
-      (vector-sap (coerce string 'simple-base-string))
-      (1+ (length string)))
-     #+sbcl
-     (let ((utf8 (%deport-utf8-string string)))
-       (copy-memory (vector-sap utf8) (length utf8)))))
-  
-(define-type-method to-alien-function ((type string))
-  (declare (ignore type))
-  #'(lambda (string)
-      #+cmu
-      (copy-memory
-       (vector-sap (coerce string 'simple-base-string))
-       (1+ (length string)))
-      #+sbcl
-      (let ((utf8 (%deport-utf8-string string)))
-	(copy-memory (vector-sap utf8) (length utf8)))))
-
-(define-type-method from-alien-form ((type string) string)
-  (declare (ignore type))
-  `(let ((string ,string))
-    (unless (null-pointer-p string)
-      (prog1
-	  #+cmu(%naturalize-c-string string)
-	  #+sbcl(%naturalize-utf8-string string)
-	(deallocate-memory string)))))
-
-(define-type-method from-alien-function ((type string))
-  (declare (ignore type))
-  #'(lambda (string)
-      (unless (null-pointer-p string)
-	(prog1
-	    #+cmu(%naturalize-c-string string)
-	    #+sbcl(%naturalize-utf8-string string)
-	  (deallocate-memory string)))))
-
-(define-type-method cleanup-form ((type string) string)
-  (declare (ignore type))
-  `(let ((string ,string))
-    (unless (null-pointer-p string)
-      (deallocate-memory string))))
-
-(define-type-method cleanup-function ((type string))
-  (declare (ignore type))
-  #'(lambda (string)
-      (unless (null-pointer-p string)
-	(deallocate-memory string))))
-
-(define-type-method copy-from-alien-form ((type string) string)
-  (declare (ignore type))
-  `(let ((string ,string))
-    (unless (null-pointer-p string)
-      #+cmu(%naturalize-c-string string)
-      #+sbcl(%naturalize-utf8-string string))))
-
-(define-type-method copy-from-alien-function ((type string))
-  (declare (ignore type))
-  #'(lambda (string)
-      (unless (null-pointer-p string)
-	#+cmu(%naturalize-c-string string)
-	#+sbcl(%naturalize-utf8-string string))))
-
-(define-type-method writer-function ((type string))
-  (declare (ignore type))
-  #'(lambda (string location &optional (offset 0))
-      (assert (null-pointer-p (sap-ref-sap location offset)))
-      (setf (sap-ref-sap location offset)
-       #+cmu
-       (copy-memory
-	(vector-sap (coerce string 'simple-base-string))
-	(1+ (length string)))
-       #+sbcl
-       (let ((utf8 (%deport-utf8-string string)))
-	 (copy-memory (vector-sap utf8) (length utf8))))))
-
-(define-type-method reader-function ((type string))
-  (declare (ignore type))
-  #'(lambda (location &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (unless (null-pointer-p (sap-ref-sap location offset))
-	#+cmu(%naturalize-c-string (sap-ref-sap location offset))
-	#+sbcl(%naturalize-utf8-string (sap-ref-sap location offset)))))
-
-(define-type-method destroy-function ((type string))
-  (declare (ignore type))
-  #'(lambda (location &optional (offset 0))
-      (unless (null-pointer-p (sap-ref-sap location offset))
-	(deallocate-memory (sap-ref-sap location offset))
-	(setf (sap-ref-sap location offset) (make-pointer 0)))))
-
-(define-type-method unbound-value ((type string))
-  (declare (ignore type))
-  nil)
-
-
-(define-type-method alien-type ((type pathname))
-  (declare (ignore type))
-  (alien-type 'string))
-
-(define-type-method size-of ((type pathname))
-  (declare (ignore type))
-  (size-of 'string))
-
-(define-type-method to-alien-form ((type pathname) path)
-  (declare (ignore type))
-  (to-alien-form 'string `(namestring (translate-logical-pathname ,path))))
-
-(define-type-method to-alien-function ((type pathname))
-  (declare (ignore type))
-  (let ((string-function (to-alien-function 'string)))
-    #'(lambda (path)
-	(funcall string-function (namestring path)))))
-
-(define-type-method from-alien-form ((type pathname) string)
-  (declare (ignore type))
-  `(parse-namestring ,(from-alien-form 'string string)))
-
-(define-type-method from-alien-function ((type pathname))
-  (declare (ignore type))
-  (let ((string-function (from-alien-function 'string)))
-    #'(lambda (string)
-	(parse-namestring (funcall string-function string)))))
-
-(define-type-method cleanup-form ((type pathnanme) string)
-  (declare (ignore type))
-  (cleanup-form 'string string))
-
-(define-type-method cleanup-function ((type pathnanme))
-  (declare (ignore type))
-  (cleanup-function 'string))
-
-(define-type-method writer-function ((type pathname))
-  (declare (ignore type))
-  (let ((string-writer (writer-function 'string)))
-    #'(lambda (path location &optional (offset 0))
-	(funcall string-writer (namestring path) location offset))))
-
-(define-type-method reader-function ((type pathname))
-  (declare (ignore type))
-  (let ((string-reader (reader-function 'string)))
-  #'(lambda (location &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (let ((string (funcall string-reader location offset)))
-	(when string
-	  (parse-namestring string))))))
-
-(define-type-method destroy-function ((type pathname))
-  (declare (ignore type))
-  (destroy-function 'string))
-
-(define-type-method unbound-value ((type pathname))
-  (declare (ignore type))
-  (unbound-value 'string))
-
-
-(define-type-method alien-type ((type boolean))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'boolean type)))
-    (alien-type `(signed-byte ,size))))
-
-(define-type-method size-of ((type boolean))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'boolean type)))
-    (size-of `(signed-byte ,size))))
-
-(define-type-method to-alien-form ((type boolean) boolean)
-  (declare (ignore type))
-  `(if ,boolean 1 0))
-
-(define-type-method to-alien-function ((type boolean))
-  (declare (ignore type))
-  #'(lambda (boolean)
-      (if boolean 1 0)))
-
-(define-type-method from-alien-form ((type boolean) boolean)
-  (declare (ignore type))
-  `(not (zerop ,boolean)))
-
-(define-type-method from-alien-function ((type boolean))
-  (declare (ignore type))
-  #'(lambda (boolean)
-      (not (zerop boolean))))
-
-(define-type-method writer-function ((type boolean))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'boolean type)))
-    (let ((writer (writer-function `(signed-byte ,size))))
-      #'(lambda (boolean location &optional (offset 0))
-	  (funcall writer (if boolean 1 0) location offset)))))
-
-(define-type-method reader-function ((type boolean))
-  (destructuring-bind (&optional (size '*))
-      (rest (mklist (type-expand-to 'boolean type)))
-    (let ((reader (reader-function `(signed-byte ,size))))
-      #'(lambda (location &optional (offset 0) weak-p)
-	  (declare (ignore weak-p))
-	  (not (zerop (funcall reader location offset)))))))
-
-
-(define-type-method alien-type ((type or))
-  (let* ((expanded-type (type-expand-to 'or type))
-	 (alien-type (alien-type (second expanded-type))))
-    (unless (every #'(lambda (type)
-		       (eq alien-type (alien-type type)))
-		   (cddr expanded-type))
-      (error "No common alien type specifier for union type: ~A" type))
-    alien-type))
-
-(define-type-method size-of ((type or))
-  (size-of (second (type-expand-to 'or type))))
-
-(define-type-method to-alien-form ((type or) form)
-  `(let ((value ,form))
-     (etypecase value
-       ,@(mapcar	 
-	  #'(lambda (type)
-	      `(,type ,(to-alien-form type 'value)))
-	  (rest (type-expand-to 'or type))))))
-
-(define-type-method to-alien-function ((type or))
-  (let* ((expanded-type (type-expand-to 'or type))
-	 (functions (mapcar #'to-alien-function (rest expanded-type))))
-    #'(lambda (value)
-	(loop
-	 for function in functions
-	 for alt-type in (rest expanded-type)
-	 when (typep value alt-type)
-	 do (return (funcall function value))
-	 finally (error "~S is not of type ~A" value type)))))
-
-
-(define-type-method alien-type ((type pointer))
-  (declare (ignore type))
-  'system-area-pointer)
-
-(define-type-method size-of ((type pointer))
-  (declare (ignore type))
-  +size-of-pointer+)
-
-(define-type-method to-alien-form ((type pointer) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method to-alien-function ((type pointer))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method from-alien-form ((type pointer) form)
-  (declare (ignore type))
-  form)
-
-(define-type-method from-alien-function ((type pointer))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method writer-function ((type pointer))
-  (declare (ignore type))
-  #'(lambda (sap location &optional (offset 0))
-      (setf (sap-ref-sap location offset) sap)))
-
-(define-type-method reader-function ((type pointer))
-  (declare (ignore type))
-  #'(lambda (location &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (sap-ref-sap location offset)))
-
-
-(define-type-method alien-type ((type null))
-  (declare (ignore type))
-  (alien-type 'pointer))
-
-(define-type-method size-of ((type null))
-  (declare (ignore type))
-  (size-of 'pointer))
-
-(define-type-method to-alien-form ((type null) null)
-  (declare (ignore null type))
-  `(make-pointer 0))
-
-(define-type-method to-alien-function ((type null))
-  (declare (ignore type))
-  #'(lambda (null)
-      (declare (ignore null))
-      (make-pointer 0)))
-
-
-(define-type-method alien-type ((type nil))
-  (declare (ignore type))
-  'void)
-
-(define-type-method from-alien-function ((type nil))
-  (declare (ignore type))
-  #'(lambda (value)
-      (declare (ignore value))
-      (values)))
-
-(define-type-method to-alien-form ((type nil) form)
-  (declare (ignore type))
-  form)
-
-
-(define-type-method to-alien-form ((type copy-of) form)
-  (copy-to-alien-form (second (type-expand-to 'copy-of type)) form))
-
-(define-type-method to-alien-function ((type copy-of))
-  (copy-to-alien-function (second (type-expand-to 'copy-of type))))
-
-(define-type-method from-alien-form ((type copy-of) form)
-  (copy-from-alien-form (second (type-expand-to 'copy-of type)) form))
-
-(define-type-method from-alien-function ((type copy-of))
-  (copy-from-alien-function (second (type-expand-to 'copy-of type))))
-
-(define-type-method cleanup-function ((type copy-of))
-  (declare (ignore type))
-  #'identity)
-
-(define-type-method destroy-function ((type copy-of))
-  (declare (ignore type))
-  #'(lambda (location &optional offset)
-      (declare (ignore location offset))))
-
-
-(define-type-method alien-type ((type callback))
-  (declare (ignore type))
-  (alien-type 'pointer))
-
-(define-type-method to-alien-form ((type callback) callback)
-  (declare (ignore type ))
-  `(callback-address ,callback))
diff --git a/glib/pcl.lisp b/glib/pcl.lisp
deleted file mode 100644
index 334fc28..0000000
--- a/glib/pcl.lisp
+++ /dev/null
@@ -1,121 +0,0 @@
-;;; *************************************************************************
-;;; Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990 Xerox Corporation.
-;;; All rights reserved.
-;;;
-;;; Use and copying of this software and preparation of derivative works
-;;; based upon this software are permitted.  Any distribution of this
-;;; software or derivative works must comply with all applicable United
-;;; States export control laws.
-;;; 
-;;; This software is made available AS IS, and Xerox Corporation makes no
-;;; warranty about the software, its performance or its conformity to any
-;;; specification.
-;;; 
-;;; Any person obtaining a copy of this software is requested to send their
-;;; name and post office or electronic mail address to:
-;;;   CommonLoops Coordinator
-;;;   Xerox PARC
-;;;   3333 Coyote Hill Rd.
-;;;   Palo Alto, CA 94304
-;;; (or send Arpanet mail to CommonLoops-Coordinator.pa@Xerox.arpa)
-;;;
-;;; Suggestions, comments and requests for improvements are also welcome.
-;;; *************************************************************************
-;;;
-
-;;; Modifications for better AMOP conformance
-;;; by Espen S. Johnsen <espen@users.sf.net>
-
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (setf (ext:package-lock (find-package "PCL")) nil))
-
-(in-package "PCL")
-
-(defstruct slot-info
-  (name nil :type symbol)
-  ;;
-  ;; Specified slot allocation.or :INSTANCE.
-  (allocation :instance :type (or (member :class :instance) t))
-  ;;
-  ;; Specified slot type or T.
-  (type t :type (or symbol list)))
-
-
-(defmethod compute-slots :around ((class standard-class))
-  (loop with slotds = (call-next-method) and location = -1
-	for slot in slotds do
-	  (setf (slot-definition-location slot)
-		(case (slot-definition-allocation slot)
-		  (:instance
-		   (incf location))
-		  (:class
-		   (let* ((name (slot-definition-name slot))
-			  (from-class (slot-definition-allocation-class slot))
-			  (cell (assq name (class-slot-cells from-class))))
-		     (assert (consp cell))
-		     cell))))
-	  (initialize-internal-slot-functions slot)
-	finally
-	  (return slotds)))
-
-
-
-(defun update-slots (class eslotds)
-  (collect ((instance-slots) (class-slots))
-    (dolist (eslotd eslotds)
-      (case (slot-definition-allocation eslotd)
-	(:instance (instance-slots eslotd))
-	(:class (class-slots eslotd))))
-    ;;
-    ;; If there is a change in the shape of the instances then the
-    ;; old class is now obsolete.
-    (let* ((nlayout (mapcar #'slot-definition-name
-			    (sort (instance-slots) #'<
-				  :key #'slot-definition-location)))
-	   (nslots (length nlayout))
-	   (nwrapper-class-slots (compute-class-slots (class-slots)))
-	   (owrapper (when (class-finalized-p class)
-		       (class-wrapper class)))
-	   (olayout (when owrapper
-		      (wrapper-instance-slots-layout owrapper)))
-	   (nwrapper
-	    (cond ((null owrapper)
-		   (make-wrapper nslots class))
-		  ;;
-		  ;; We cannot reuse the old wrapper easily when it
-		  ;; has class slot cells, even if these cells are
-		  ;; EQUAL to the ones used in the new wrapper.  The
-		  ;; class slot cells of OWRAPPER may be referenced
-		  ;; from caches, and if we don't change the wrapper,
-		  ;; the caches won't notice that something has
-		  ;; changed.  We could do something here manually,
-		  ;; but I don't think it's worth it.
-		  ((and (equal nlayout olayout)
-			(null (wrapper-class-slots owrapper)))
-		   owrapper)
-		  (t
-		   ;;
-		   ;; This will initialize the new wrapper to have the same
-		   ;; state as the old wrapper.  We will then have to change
-		   ;; that.  This may seem like wasted work (it is), but the
-		   ;; spec requires that we call make-instances-obsolete.
-		   (make-instances-obsolete class)
-		   (class-wrapper class)))))
-
-      (with-slots (wrapper slots finalized-p) class
-	(update-lisp-class-layout class nwrapper)
-	(setf slots eslotds
-	      (wrapper-instance-slots-layout nwrapper) nlayout
-	      (wrapper-class-slots nwrapper) nwrapper-class-slots
-	      (wrapper-no-of-instance-slots nwrapper) nslots
-	      wrapper nwrapper
-	      finalized-p t))
-
-      (unless (eq owrapper nwrapper)
-	(update-inline-access class)
-	(update-pv-table-cache-info class)
-	(maybe-update-standard-class-locations class)))))
-
-
-(pushnew :non-broken-pcl *features*)
diff --git a/glib/proxy.lisp b/glib/proxy.lisp
deleted file mode 100644
index f43b806..0000000
--- a/glib/proxy.lisp
+++ /dev/null
@@ -1,699 +0,0 @@
-;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
-;;
-;; 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:
-;;
-;; The above copyright notice and this permission notice shall be
-;; included in all copies or substantial portions of the Software.
-;;
-;; 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.39 2006-03-06 14:28:03 espen Exp $
-
-(in-package "GLIB")
-
-;;;; Superclass for all metaclasses implementing some sort of virtual slots
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass virtual-slots-class (standard-class) 
-    ())
-
-  (defclass direct-virtual-slot-definition (standard-direct-slot-definition)
-    ((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)))
-  
-  (defclass effective-virtual-slot-definition (standard-effective-slot-definition)
-    ((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)))
-
-  (defclass direct-special-slot-definition (standard-direct-slot-definition)
-    ((special :initarg :special :accessor slot-definition-special)))
-  
-  (defclass effective-special-slot-definition (standard-effective-slot-definition)
-    ((special :initarg :special :accessor slot-definition-special))))
-
-(defvar *unbound-marker* (gensym "UNBOUND-MARKER-"))
-
-(defun most-specific-slot-value (instances slot &optional (default *unbound-marker*))
-  (let ((object (find-if
-		 #'(lambda (ob)
-		     (and (slot-exists-p ob slot) (slot-boundp ob slot)))
-		 instances)))
-    (if object
-	(slot-value object slot)
-      default)))
-
-
-(defmethod direct-slot-definition-class ((class virtual-slots-class) &rest initargs)
-  (cond
-   ((eq (getf initargs :allocation) :virtual)
-    (find-class 'direct-virtual-slot-definition))
-   ((getf initargs :special)
-    (find-class 'direct-special-slot-definition))
-   (t (call-next-method))))
-
-(defmethod effective-slot-definition-class ((class virtual-slots-class) &rest initargs)
-  (cond
-   ((eq (getf initargs :allocation) :virtual)
-    (find-class 'effective-virtual-slot-definition))
-   ((getf initargs :special)
-    (find-class 'effective-special-slot-definition))
-   (t (call-next-method))))
-
-
-(defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))
-  (if (not (slot-boundp slotd 'getter))
-      (setf
-       (slot-value slotd 'reader-function)
-       #'(lambda (object)
-	   (declare (ignore object))
-	   (error "Slot is not readable: ~A" (slot-definition-name slotd)))
-       (slot-value slotd 'boundp-function)
-       #'(lambda (object) (declare (ignore object)) nil))
-
-    (let ((getter-function
-	   (let ((getter (slot-value slotd 'getter)))
-	     (etypecase getter
-	       (function getter)
-	       (symbol 
-		#'(lambda (object)
-		    (funcall getter object)))
-	       (string 
-		(let ((reader nil))
-		  (setf (slot-value slotd 'reader-function)
-			#'(lambda (object)
-			    (unless reader
-			      (setq reader
-			       (mkbinding getter 
-				(slot-definition-type slotd) 'pointer)))
-			    (funcall reader (foreign-location object))))))))))
-
-      (setf 
-       (slot-value slotd 'boundp-function)
-       (cond
-	((slot-boundp slotd 'unbound)
-	 (let ((unbound-value (slot-value slotd 'unbound)))
-	   #'(lambda (object)
-	       (not (eq (funcall getter-function object) unbound-value)))))
-	((slot-boundp slotd 'boundp)
-	 (let ((boundp (slot-value slotd 'boundp)))
-	   (etypecase boundp
-	     (function boundp)
-	     (symbol #'(lambda (object)
-			 (funcall boundp object)))
-	     (string (let ((reader ()))
-		       #'(lambda (object)
-			   (unless reader
-			     (setq reader
-			      (mkbinding boundp
-			       (slot-definition-type slotd) 'pointer)))
-			   (funcall reader (foreign-location object))))))))
-	((let ((unbound-value-method
-		(find-applicable-type-method 'unbound-value 
-		 (slot-definition-type slotd) nil)))
-	   (when unbound-value-method
-	     (let ((unbound-value 
-		    (funcall unbound-value-method (slot-definition-type slotd))))
-	       #'(lambda (object)
-		   (not (eq (funcall getter-function object) unbound-value)))))))
-	(#'(lambda (object) (declare (ignore object)) t))))
-
-      (setf
-       (slot-value slotd 'reader-function)
-       (cond
-	((slot-boundp slotd 'unbound)
-	 (let ((unbound (slot-value slotd 'unbound))
-	       (slot-name (slot-definition-name slotd)))
-	   #'(lambda (object)
-	       (let ((value (funcall getter-function object)))
-		 (if (eq value unbound)
-		     (slot-unbound (class-of object) object slot-name)
-		   value)))))
-	((slot-boundp slotd 'boundp)
-	 (let ((boundp-function (slot-value slotd 'boundp-function)))
-	   #'(lambda (object)
-	       (and
-		(funcall boundp-function object)
-		(funcall getter-function object)))))
-	((let ((unbound-value-method
-		(find-applicable-type-method 'unbound-value 
-		 (slot-definition-type slotd) nil)))
-	   (when unbound-value-method
-	     (let ((unbound-value 
-		    (funcall unbound-value-method (slot-definition-type slotd)))
-		   (slot-name (slot-definition-name slotd)))
-	       #'(lambda (object)
-		   (let ((value (funcall getter-function object)))
-		     (if (eq value unbound-value)
-			 (slot-unbound (class-of object) object slot-name)
-			 value)))))))
-	(getter-function)))))
-
-  (setf 
-   (slot-value slotd 'writer-function)
-   (if (not (slot-boundp slotd 'setter))
-       #'(lambda (value object)
-	   (declare (ignore value object))
-	   (error "Slot is not writable: ~A" (slot-definition-name slotd)))
-     (with-slots (setter) slotd
-       (etypecase setter
-	 (function setter)
-	 ((or symbol cons) 
-	  #'(lambda (value object)
-	      (funcall (fdefinition setter) value object)))
-	 (string
-	  (let ((writer ()))
-	    (setf
-	     (slot-value slotd 'writer-function)
-	     #'(lambda (value object)
-		 (unless writer
-		   (setq writer
-		    (mkbinding setter 'nil 'pointer 
-		     (slot-definition-type slotd))))
-		 (funcall writer (foreign-location object) value)))))))))
-
-  #-sbcl>=0.9.8(initialize-internal-slot-gfs (slot-definition-name slotd)))
-
-
-
-(defmethod compute-slot-accessor-info ((slotd effective-virtual-slot-definition) type gf)
-  nil)
-
-(defmethod compute-effective-slot-definition-initargs ((class virtual-slots-class) direct-slotds)
-  (typecase (first direct-slotds)
-    (direct-virtual-slot-definition
-     (let ((initargs ()))
-       (let ((getter (most-specific-slot-value direct-slotds 'getter)))
-	 (unless (eq getter *unbound-marker*)
-	   (setf (getf initargs :getter) getter)))
-       (let ((setter (most-specific-slot-value direct-slotds 'setter)))
-	 (unless (eq setter *unbound-marker*)
-	   (setf (getf initargs :setter) setter)))
-       (let ((unbound (most-specific-slot-value direct-slotds 'unbound)))
-	 (unless (eq unbound *unbound-marker*)
-	   (setf (getf initargs :unbound) unbound)))
-       (let ((boundp (most-specific-slot-value direct-slotds 'boundp)))
-	 (unless (eq boundp *unbound-marker*)
-	   (setf (getf initargs :boundp) boundp)))
-       ;; This is needed to avoid type expansion in SBCL version >= 0.9.8
-       #+sbcl>=0.9.8
-       (let ((type (most-specific-slot-value direct-slotds #-sbcl>=0.9.10'type #+sbcl>=0.9.10'sb-pcl::%type)))
-	 (unless (eq type *unbound-marker*)
-	   (setf (getf initargs :type) type)))
-       (nconc initargs (call-next-method))))
-    (direct-special-slot-definition
-     (append '(:special t) (call-next-method)))
-    (t (call-next-method))))
-
-
-(defmethod slot-value-using-class
-    ((class virtual-slots-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-  (if (funcall (slot-value slotd 'boundp-function) object)
-      (funcall (slot-value slotd 'reader-function) object)
-    (slot-unbound class object (slot-definition-name slotd))))
-
-(defmethod slot-boundp-using-class
-    ((class virtual-slots-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-  (funcall (slot-value slotd 'boundp-function) object))
-  
-(defmethod (setf slot-value-using-class) 
-    (value (class virtual-slots-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-  (funcall (slot-value slotd 'writer-function) value object))
-
-  
-(defmethod validate-superclass
-    ((class virtual-slots-class) (super standard-class))
-  t)
-
-
-(defmethod slot-definition-special ((slotd standard-direct-slot-definition))
-  (declare (ignore slotd))
-  nil)
-
-(defmethod slot-definition-special ((slotd standard-effective-slot-definition))
-  (declare (ignore slotd))
-  nil)
-
-
-;;;; Proxy cache
-
-(defvar *instance-cache* (make-hash-table :test #'eql))
-
-(defun cache-instance (instance &optional (weak-ref t))
-  (setf
-   (gethash (sap-int (foreign-location instance)) *instance-cache*)
-   (if weak-ref
-       (make-weak-pointer instance)
-     instance)))
-
-(defun find-cached-instance (location)
-  (let ((ref (gethash (sap-int location) *instance-cache*)))
-    (when ref
-      (if (weak-pointer-p ref)
-	  (weak-pointer-value ref)
-	ref))))
-
-(defun instance-cached-p (location)
-  (gethash (sap-int location) *instance-cache*))
-
-(defun remove-cached-instance (location)
-  (remhash (sap-int location) *instance-cache*))
-
-;; For debuging
-(defun list-cached-instances ()
-  (let ((instances ()))
-    (maphash #'(lambda (location ref)
-		 (declare (ignore location))
-		 (push ref instances))
-	     *instance-cache*)
-    instances))
-			
-;; Instances that gets invalidated tend to be short lived, but created
-;; in large numbers. So we're keeping them in a hash table to be able
-;; to reuse them (and thus reduce consing)
-(defvar *invalidated-instance-cache* (make-hash-table :test #'eql))
-
-(defun cache-invalidated-instance (instance)
-  (push instance
-   (gethash (class-of instance) *invalidated-instance-cache*)))
-
-(defun find-invalidated-instance (class)
-  (when (gethash class *invalidated-instance-cache*)
-    (pop (gethash class *invalidated-instance-cache*))))
-
-(defun list-invalidated-instances ()
-  (let ((instances ()))
-    (maphash #'(lambda (location ref)
-		 (declare (ignore location))
-		 (push ref instances))
-	     *invalidated-instance-cache*)
-    instances))
-
-
-
-;;;; Proxy for alien instances
-
-;; TODO: add a ref-counted-proxy subclass
-(defclass proxy ()
-  ((location :special t :type pointer))
-  (:metaclass virtual-slots-class))
-
-(defgeneric instance-finalizer (object))
-(defgeneric reference-foreign (class location))
-(defgeneric unreference-foreign (class location))
-(defgeneric invalidate-instance (object))
-(defgeneric allocate-foreign (object &key &allow-other-keys))
-
-(defun foreign-location (instance)
-  (slot-value instance 'location))
-
-(defun (setf foreign-location) (location instance)
-  (setf (slot-value instance 'location) location))
-
-(defun proxy-valid-p (instance)
-  (slot-boundp instance 'location))
-
-(defmethod reference-foreign ((name symbol) location)
-  (reference-foreign (find-class name) location))
-
-(defmethod unreference-foreign ((name symbol) location)
-  (unreference-foreign (find-class name) location))
-
-(defmethod unreference-foreign :around ((class class) location)
-  (unless (null-pointer-p location)
-    (call-next-method)))
-
-(defmethod print-object ((instance proxy) stream)
-  (print-unreadable-object (instance stream :type t :identity nil)
-    (if (slot-boundp instance 'location)
-	(format stream "at 0x~X" (sap-int (foreign-location instance)))
-      (write-string "at <unbound>" stream))))
-
-(defmethod initialize-instance :around ((instance proxy) &rest initargs &key &allow-other-keys) 
-  (setf  
-   (foreign-location instance)
-   (apply #'allocate-foreign instance initargs))
-  (prog1
-      (call-next-method)
-    (cache-instance instance)
-    (finalize instance (instance-finalizer instance))))
-
-(defmethod instance-finalizer ((instance proxy))
-  (let ((location (foreign-location instance))
-	(class (class-of instance)))    
-;;     (unless (find-method #'unreference-foreign nil (list (class-of class) t) nil)
-;;       (error "No matching method for UNREFERENCE-INSTANCE when called with class ~A" class))
-    #'(lambda ()
-	(remove-cached-instance location)
-	(unreference-foreign class location))))
-
-;; Any reference to the foreign object the instance may have held
-;; should be released before this method is invoked
-(defmethod invalidate-instance ((instance proxy))
-  (remove-cached-instance (foreign-location instance))
-  (slot-makunbound instance 'location)
-  (cancel-finalization instance)
-  (cache-invalidated-instance instance))
-
-
-;;;; 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 foreign-size)))
-
-  (defclass direct-alien-slot-definition (direct-virtual-slot-definition)
-    ((offset :reader slot-definition-offset :initarg :offset))
-    (:default-initargs :allocation :alien))
-  
-  (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)
-	 (subtypep (class-name class) 'proxy))
-     (class-direct-superclasses class)))
-  
-  (defmethod shared-initialize ((class proxy-class) names &key size)
-    (call-next-method)
-    (cond
-      (size (setf (slot-value class 'size) (first size)))
-      ((slot-boundp class 'size) (slot-makunbound class 'size))))
-
-  (defmethod direct-slot-definition-class ((class proxy-class) &rest initargs)
-    (case (getf initargs :allocation)
-      (:alien (find-class 'direct-alien-slot-definition))
-      (t (call-next-method))))
-  
-  (defmethod effective-slot-definition-class ((class proxy-class) &rest initargs)
-    (case (getf initargs :allocation)
-      (:alien (find-class 'effective-alien-slot-definition))
-      (t (call-next-method))))
-  
-  
-  (defmethod compute-effective-slot-definition-initargs ((class proxy-class) direct-slotds)
-    (if (eq (slot-definition-allocation (first direct-slotds)) :alien)
-	(nconc 
-	 (list :offset (most-specific-slot-value direct-slotds 'offset))
-	 (call-next-method))
-      (call-next-method)))
-  
-
-  (defmethod initialize-internal-slot-functions ((slotd effective-alien-slot-definition))
-    (with-slots (offset) slotd
-      (let ((type (slot-definition-type slotd)))
-	(unless (slot-boundp slotd 'getter)
-	  (let ((reader (reader-function type)))
-	    (setf 
-	     (slot-value slotd 'getter)
-	     #'(lambda (object)
-		 (funcall reader (foreign-location object) offset)))))
-
-	(unless (slot-boundp slotd 'setter)
-	  (let ((writer (writer-function type))
-		(destroy (destroy-function type)))
-	    (setf 
-	     (slot-value slotd 'setter)
-	     #'(lambda (value object)
-		 (let ((location (foreign-location object)))
-		   (funcall destroy location offset) ; destroy old value
-		   (funcall writer value location offset))))))))
-
-    (call-next-method))
-  
-  (defconstant +struct-alignmen+
-    #+sbcl (/ (sb-alien-internals:alien-type-alignment
-               (sb-alien-internals:parse-alien-type
-		'system-area-pointer nil))
-	      8)
-    #-sbcl 4)
-
-  (defun align-offset (size)
-    (if (zerop (mod size +struct-alignmen+))
-	size
-      (+ size (- +struct-alignmen+ (mod size +struct-alignmen+)))))
-
-  (defmethod compute-slots ((class proxy-class))
-    (let ((alien-slots 
-	   (remove-if-not
-	    #'(lambda (slotd)
-		(eq (slot-definition-allocation slotd) :alien))
-	    (class-direct-slots class))))      
-      (when alien-slots
-	(loop 
-	 as offset = (align-offset (foreign-size 
-				    (most-specific-proxy-superclass class)))
-	             then (align-offset 
-			   (+ 
-			    (slot-definition-offset slotd)
-			    (size-of (slot-definition-type slotd))))
-       for slotd in alien-slots
-       unless (slot-boundp slotd 'offset)
-       do (setf (slot-value slotd 'offset) offset))))
-    (call-next-method))
-
-  (defmethod validate-superclass ((class proxy-class) (super standard-class))
-    (subtypep (class-name super) 'proxy))
-  
-  (defmethod foreign-size ((class-name symbol))
-    (foreign-size (find-class class-name))))
-
-(defmethod foreign-size ((object proxy))
-  (foreign-size (class-of object)))
-  
-
-(define-type-method alien-type ((class proxy))
-  (declare (ignore class))
-  (alien-type 'pointer))
-
-(define-type-method size-of ((class proxy))
-  (declare (ignore class))
-  (size-of 'pointer))
-
-(define-type-method from-alien-form ((type proxy) location)
-  (let ((class (type-expand type)))
-    `(ensure-proxy-instance ',class ,location)))
-
-(define-type-method from-alien-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (location)
-	(ensure-proxy-instance class location))))
-
-(define-type-method to-alien-form ((type proxy) instance)
-  (declare (ignore type))
-  `(foreign-location ,instance))
-
-(define-type-method to-alien-function ((type proxy))
-  (declare (ignore type))
-  #'foreign-location)
-
-(define-type-method copy-from-alien-form ((type proxy) location)
-  (let ((class (type-expand type)))
-    `(ensure-proxy-instance ',class (reference-foreign ',class ,location))))
-
-(define-type-method copy-from-alien-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (location)
-	(ensure-proxy-instance class (reference-foreign class location)))))
-
-(define-type-method copy-to-alien-form ((type proxy) instance)
-  (let ((class (type-expand type)))
-    `(reference-foreign ',class (foreign-location ,instance))))
-
-(define-type-method copy-to-alien-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (instance)
-	(reference-foreign class (foreign-location instance)))))
-
-(define-type-method writer-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (instance location &optional (offset 0))
-	(assert (null-pointer-p (sap-ref-sap location offset)))
-	(setf 
-	 (sap-ref-sap location offset)
-	 (reference-foreign class (foreign-location instance))))))
-
-(define-type-method reader-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (location &optional (offset 0) weak-p)
-	(declare (ignore weak-p))
-	(let ((instance (sap-ref-sap location offset)))
-	  (unless (null-pointer-p instance)
-	    (ensure-proxy-instance class (reference-foreign class instance)))))))
-
-(define-type-method destroy-function ((type proxy))
-  (let ((class (type-expand type)))
-    #'(lambda (location &optional (offset 0))
-	(unreference-foreign class (sap-ref-sap location offset)))))
-
-(define-type-method unbound-value ((type proxy))
-  (declare (ignore type))
-  nil)
-
-(defun ensure-proxy-instance (class location &rest initargs)
-  "Returns a proxy object representing the foreign object at the give
-location. If an existing object is not found in the cache
-MAKE-PROXY-INSTANCE is called to create one."
-  (unless (null-pointer-p location)
-    (or 
-     #-debug-ref-counting(find-cached-instance location)
-     #+debug-ref-counting
-     (let ((instance (find-cached-instance location)))
-       (when instance
-	 (format t "Object found in cache: ~A~%" instance)
-	 instance))
-     (let ((instance (apply #'make-proxy-instance class location initargs)))
-       (cache-instance instance)
-       instance))))
-
-(defgeneric make-proxy-instance (class location &key weak)
-  (:documentation "Creates a new proxy object representing the foreign
-object at the give location. If WEAK is non NIL the foreign memory
-will not be released when the proxy is garbage collected."))
-
-(defmethod make-proxy-instance ((class symbol) location &rest initargs)
-  (apply #'make-proxy-instance (find-class class) location initargs))
-
-(defmethod make-proxy-instance ((class proxy-class) location &key weak)
-  (let ((instance
-	 (or
-	  (find-invalidated-instance class)
-	  (allocate-instance class))))
-    (setf (foreign-location instance) location)
-    (unless weak
-      (finalize instance (instance-finalizer instance)))
-    instance))
-
-
-;;;; Superclasses for wrapping of C structures
-
-(defclass struct (proxy)
-  ()
-  (:metaclass proxy-class)
-  (:size 0))
-
-(defmethod allocate-foreign ((struct struct) &rest initargs)
-  (declare (ignore initargs))
-  (let ((size (foreign-size (class-of struct))))
-    (if (zerop size)
-	(error "~A has zero size" (class-of struct))
-      (allocate-memory size))))
-
-
-;;;; Metaclasses used for subclasses of struct
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass struct-class (proxy-class)
-    ()))
-
-(defmethod direct-slot-definition-class ((class struct-class) &rest initargs)
-  (if (not (getf initargs :allocation))
-      (find-class 'direct-alien-slot-definition)
-    (call-next-method)))
-
-(defmethod reference-foreign ((class struct-class) location)
-  (copy-memory location (foreign-size class)))
-
-(defmethod unreference-foreign ((class struct-class) location)
-  (deallocate-memory location))
-
-(defmethod compute-slots :around ((class struct-class))
-    (let ((slots (call-next-method)))
-      (when (and 
-	     #-sbcl>=0.9.8(class-finalized-p class)
-	     (not (slot-boundp class 'size)))
-        (let ((size (loop
-		     for slotd in slots
-		     when (eq (slot-definition-allocation slotd) :alien)
-		     maximize (+ 
-			       (slot-definition-offset slotd)
-			       (size-of (slot-definition-type slotd))))))
-	  (setf (slot-value class 'size) (+ size (mod size +struct-alignmen+)))))
-      slots))
-
-(define-type-method callback-from-alien-form ((type struct) form)
-  (let ((class (type-expand type)))
-    `(ensure-proxy-instance ',class ,form :weak t)))
-
-(define-type-method callback-cleanup-form ((type struct) form)
-  (declare (ignore type))
-  `(invalidate-instance ,form))
-
-(define-type-method reader-function ((type struct))
-  (let ((class (type-expand type)))
-    #'(lambda (location &optional (offset 0) weak-p)
-	(let ((instance (sap-ref-sap location offset)))
-	  (unless (null-pointer-p instance)
-	    (if weak-p
-		(ensure-proxy-instance class instance :weak t)
-	      (ensure-proxy-instance class (reference-foreign class instance))))))))
-
-
-(defclass static-struct-class (struct-class)
-  ())
-
-(defmethod reference-foreign ((class static-struct-class) location)
-  (declare (ignore class))
-  location)
-
-(defmethod unreference-foreign ((class static-struct-class) location)
-  (declare (ignore class location))
-  nil)
-
-;;; Pseudo type for structs which are inlined in other objects
-
-(deftype inlined (type) type)
-
-(define-type-method size-of ((type inlined))
-  (let ((class (second (type-expand-to 'inlined type))))
-    (foreign-size class)))
-
-(define-type-method reader-function ((type inlined))
-  (let ((class (second (type-expand-to 'inlined type))))
-    #'(lambda (location &optional (offset 0) weak-p)
-	(declare (ignore weak-p))
-	(ensure-proxy-instance class 
-	 (reference-foreign class (sap+ location offset))))))
-
-(define-type-method writer-function ((type inlined))
-  (let ((class (second (type-expand-to 'inlined type))))
-    #'(lambda (instance location &optional (offset 0))
-	(copy-memory (foreign-location instance) (foreign-size class) (sap+ location offset)))))
-
-(define-type-method destroy-function ((type inlined))
-  (declare (ignore type))
-  #'(lambda (location &optional offset)
-      (declare (ignore location offset))))
-
-
-(export 'inlined)
diff --git a/glib/utils.lisp b/glib/utils.lisp
deleted file mode 100644
index 87d019b..0000000
--- a/glib/utils.lisp
+++ /dev/null
@@ -1,196 +0,0 @@
-;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
-;;
-;; 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:
-;;
-;; The above copyright notice and this permission notice shall be
-;; included in all copies or substantial portions of the Software.
-;;
-;; 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: utils.lisp,v 1.5 2005-04-23 16:48:51 espen Exp $
-
-
-(in-package "GLIB")
-
-(defun type-expand-1 (form)
-  (let ((def (cond ((symbolp form)
-		    #+cmu(kernel::info type expander form)
-		    #+sbcl(sb-impl::info :type :expander form))
-		   ((and (consp form) (symbolp (car form)))
-		    #+cmu(kernel::info type expander (car form))
-		    #+sbcl(sb-impl::info :type :expander (car form)))
-		   (t nil))))
-    (if def
-	(values (funcall def (if (consp form) form (list form))) t)
-      (values form nil))))
-
-
-(defun type-expand-to (type form)
-  (labels ((expand (form0)
-             (if (eq (first (mklist form0)) type)
-		 form0
-	       (multiple-value-bind (expanded-form expanded-p)
-		   (type-expand-1 form0)
-		 (if expanded-p
-		     (expand expanded-form)
-		   (error "~A can not be expanded to ~A" form type))))))
-    (expand form)))
-
-(defmacro with-gc-disabled (&body body)
-  #+cmu`(system:without-gcing ,@body)
-  #+sbcl`(sb-impl::without-gcing ,@body))
-
-(defun mklist (obj)
-  (if (and obj (atom obj)) (list obj) obj))
-
-(defun namep (obj)
-  (and (symbolp obj) (not (member obj '(t nil)))))
-
-(defun all-equal (&rest objects)
-  (or
-   (null objects)
-   (null (rest objects))
-   (and
-    (equal (first objects) (second objects))
-    (apply #'all-equal (rest objects)))))
-
-(defun neq (obj1 obj2)
-  (not (eq obj1 obj2)))
-
-(defmacro return-if (form)
-  (let ((result (make-symbol "RESULT")))
-    `(let ((,result ,form))
-       (when ,result
-	 (return ,result)))))
-
-(defun make-pointer (address)
-  (int-sap address))
-  
-(defun null-pointer-p (pointer)
-  (zerop (sap-int pointer)))
-  
-
-(defmacro when-bind ((var expr) &body body)
-  `(let ((,var ,expr))
-     (when ,var
-       ,@body)))
-
-
-(defmacro assoc-ref (key alist &key (test #'eq))
-  `(cdr (assoc ,key ,alist :test ,test)))
-
-
-(defmacro assoc-lref (key alist &key (test #'eq))
-  `(cadr (assoc ,key ,alist :test ,test)))
-
-
-(defun assoc-rem (key alist &key (test #'eq))
-  (remove-if #'(lambda (element) (funcall test key (car element))) alist))
-
-
-(defun assoc-delete (key alist &key (test #'eq))
-  (delete-if #'(lambda (element) (funcall test key (car element))) alist))
-
-
-(defun funcallable (object)
-  (if (consp object)
-      (fdefinition object)
-    object))
-
-(defun intersection-p (list1 list2 &key (test #'eq))
-  (dolist (obj list1 nil)
-    (when (member obj list2 :test test)
-      (return-from intersection-p t))))
-
-
-(defun split-string (string delimiter)
-  (declare (simple-string string) (character delimiter))
-  (let ((pos (position delimiter string)))
-   (if (not pos)
-        (list string)
-      (cons
-       (subseq string 0 pos)
-       (split-string (subseq string (1+ pos)) delimiter)))))
-
-(defun split-string-if (string predicate)
-  (declare (simple-string string))
-  (let ((pos (position-if predicate string :start 1)))
-    (if (not pos)
-        (list string)
-      (cons
-       (subseq string 0 pos)
-       (split-string-if (subseq string pos) predicate)))))
-
-(defun concatenate-strings (strings &optional delimiter)
-  (if (not (rest strings))
-      (first strings)
-    (concatenate
-     'string
-     (first strings)
-     (if delimiter (string delimiter) "")
-     (concatenate-strings (rest strings) delimiter))))
-
-(defun string-prefix-p (prefix string)
-  (and
-   (>= (length string) (length prefix))
-   (string= prefix string :end2 (length prefix))))
-
-(defun get-all (plist property)
-  (multiple-value-bind (property value tail)
-      (get-properties plist (list property))
-    (when tail
-      (cons value (get-all (cddr tail) property)))))
-
-(defun plist-remove (plist property)
-  (when plist
-    (if (eq (first plist) property)
-	(plist-remove (cddr plist) property)
-      (list*
-       (first plist) (second plist) (plist-remove (cddr plist) property)))))
-
-
-;;;
-
-(defun utf-8-encode (code)
-  (labels ((encode-bytes (bit)
-             (unless (zerop bit)
-	       (cons
-		(deposit-field 
-                 #x80 (byte 7 6) (ldb (byte bit (- bit 6)) code))
-		(encode-bytes (- bit 6)))))
-           (encode-string (length)
-             (map 'string #'code-char
-              (cons
-               (deposit-field
-	        (mask-field (byte 7 (- 7 length)) #xFF)
-		(byte 7 (- 6 length))
-		(ldb (byte (+ (* length 6) 6) (* length 6)) code))
-	       (encode-bytes (* length 6))))))
-    (cond
-     ((< code #x80) (string (code-char code)))
-     ((< code #x800) (encode-string 1))
-     ((< code #x10000) (encode-string 2))
-     ((< code #x200000) (encode-string 3)) 
-     ((< code #x4000000) (encode-string 4))
-     ((< code #x80000000) (encode-string 5))
-     (t (error "Invalid char code ~A" code)))))
-
-
-(defun latin1-to-unicode (string)
-  (reduce
-   #'(lambda (str1 str2)
-       (concatenate 'string str1 str2))
-   (map 'list #'(lambda (char) (utf-8-encode (char-code char))) string)))