X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b0bb0027b6a9a7f2df5e52d42ab8d7ecd4d4a3ce..a7d19b2a6d3e11b28842476b80ef68d81fb6b8ac:/glib/genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index 8200826..c1548e0 100644
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -1,49 +1,273 @@
-;; 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: genums.lisp,v 1.3 2001-10-21 22:02:01 espen Exp $
+;; $Id: genums.lisp,v 1.19 2006-02-26 15:30:01 espen Exp $
 
 (in-package "GLIB")
+  
+;;;; Generic enum type
+
+(defun %map-enum (mappings op)
+  (loop
+   as value = 0 then (1+ value)
+   for mapping in mappings
+   collect (let ((symbol (if (atom mapping) mapping (first mapping))))
+	     (unless (atom mapping)
+	       (setq value (second mapping)))
+	     (ecase op
+	       (:symbol-int `(,symbol ,value))
+	       (:int-symbol `(,value ,symbol))
+	       (:int-quoted-symbol `(,value ',symbol))
+	       (:symbols symbol)))))
 
+(deftype enum (&rest args)
+  `(member ,@(%map-enum args :symbols)))
+
+(define-type-method alien-type ((type enum))
+  (declare (ignore type))
+  (alien-type 'signed))
+
+(define-type-method size-of ((type enum))
+  (declare (ignore type))
+  (size-of 'signed))
+
+(define-type-method to-alien-form ((type enum) form )
+  `(case ,form
+    ,@(%map-enum (rest (type-expand-to 'enum type)) :symbol-int)
+    (t (error 'type-error :datum ,form :expected-type ',type))))
+
+(define-type-method from-alien-form ((type enum) form)
+  `(case ,form
+    ,@(%map-enum (rest (type-expand-to 'enum type)) :int-quoted-symbol)))
+
+(define-type-method to-alien-function ((type enum))
+  (let ((mappings (%map-enum (rest (type-expand-to 'enum type)) :symbol-int)))
+    #'(lambda (enum)
+	(or
+	 (second (assoc enum mappings))
+	 (error 'type-error :datum enum :expected-type type)))))
+
+(define-type-method from-alien-function ((type enum))
+  (let ((mappings (%map-enum (rest (type-expand-to 'enum type)) :int-symbol)))
+    #'(lambda (int)
+	(second (assoc int mappings)))))
+
+(define-type-method writer-function ((type enum))
+  (let ((writer (writer-function 'signed))
+	(function (to-alien-function (type-expand-to 'enum type))))
+    #'(lambda (enum location &optional (offset 0))
+	(funcall writer (funcall function enum) location offset))))
+    
+(define-type-method reader-function ((type enum))
+  (let ((reader (reader-function 'signed))
+	(function (from-alien-function (type-expand-to 'enum type))))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
+	(funcall function (funcall reader location offset)))))
+
+(defun enum-int (enum type)
+  (funcall (to-alien-function type) enum))
+
+(defun int-enum (int type)
+  (funcall (from-alien-function type) int))
+
+(defun enum-mapping (type)
+  (rest (type-expand-to 'enum type)))
+
+
+;;;; Named enum types
+
+(defmacro define-enum-type (name &rest args)
+  (let ((enum-int (intern (format nil "~A-TO-INT" name)))
+	(int-enum (intern (format nil "INT-TO-~A" name))))
+    `(progn
+       (deftype ,name () '(enum ,@args))
+       (defun ,enum-int (enum)
+	 (case enum
+	   ,@(%map-enum args :symbol-int)
+	   (t (error 'type-error :datum enum :expected-type ',name))))
+       (defun ,int-enum (value)
+	 (case value
+	   ,@(%map-enum args :int-quoted-symbol)))
+       (define-type-method to-alien-form ((type ,name) form)
+	 (declare (ignore type))
+	 (list ',enum-int form))
+       (define-type-method from-alien-form ((type ,name) form)
+	 (declare (ignore type))
+	 (list ',int-enum form))
+       (define-type-method to-alien-function ((type ,name))
+	 (declare (ignore type))
+	 #',enum-int)
+       (define-type-method from-alien-function ((type ,name))
+	 (declare (ignore type))
+	 #',int-enum)
+       (define-type-method writer-function ((type ,name))
+	 (declare (ignore type))
+	 (let ((writer (writer-function 'signed)))
+	   #'(lambda (enum location &optional (offset 0))
+	       (funcall writer (,enum-int enum) location offset))))    
+       (define-type-method reader-function ((type ,name))
+	 (declare (ignore type))
+	 (let ((reader (reader-function 'signed)))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
+	       (,int-enum (funcall reader location offset))))))))
+
+
+;;;;  Generic flags type
+
+(defun %map-flags (mappings op)
+  (loop
+   as value = 1 then (ash value 1)
+   for mapping in mappings
+   collect (let ((symbol (if (atom mapping) mapping (first mapping))))
+	     (unless (atom mapping)
+	       (setq value (second mapping)))
+	     (ecase op
+	       (:symbol-int `(,symbol ,value))
+	       (:int-symbol `(,value ,symbol))
+	       (:symbols symbol)))))
 
-(defun %map-mappings (args op)
-  (let ((current-value 0))
-    (map
-     'list 
-     #'(lambda (mapping)
-	 (destructuring-bind (symbol &optional (value current-value))
-	     (mklist mapping)
-	   (setf current-value (1+ value))
-	   (case op
-	     (:enum-int (list symbol value))
-	     (:flags-int (list symbol value #|(ash 1 value)|#))
-	     (:int-enum (list value symbol))
-	     (:int-flags (list value #|(ash 1 value)|# symbol))
-	     (:symbols symbol))))
-     (if (integerp (first args))
-	 (rest args)
-       args))))
+(deftype flags (&rest args)
+  `(or (member ,@(%map-flags args :symbols)) list))
+
+(define-type-method alien-type ((type flags))
+  (declare (ignore type))
+  (alien-type 'unsigned))
+
+(define-type-method size-of ((type flags))
+  (declare (ignore type))
+  (size-of 'unsigned))
+
+(define-type-method to-alien-form ((type flags) flags)
+  `(reduce #'logior (mklist ,flags)
+    :key #'(lambda (flag)
+	     (case flag
+	       ,@(%map-flags (rest (type-expand-to 'flags type)) :symbol-int)
+	       (t (error 'type-error :datum ,flags :expected-type ',type))))))
+
+(define-type-method from-alien-form ((type flags) value)
+  `(loop
+    for (int symbol) in ',(%map-flags (rest (type-expand-to 'flags type)) :int-symbol)
+    when (= (logand ,value int) int)
+    collect symbol))
+
+(define-type-method to-alien-function ((type flags))
+  (let ((mappings (%map-flags (rest (type-expand-to 'flags type)) :symbol-int)))
+    #'(lambda (flags)
+	(reduce #'logior (mklist flags)
+	 :key #'(lambda (flag)
+		  (or
+		   (second (assoc flag mappings))
+		   (error 'type-error :datum flags :expected-type type)))))))
+
+(define-type-method from-alien-function ((type flags))
+  (let ((mappings (%map-flags (rest (type-expand-to 'flags type)) :int-symbol)))
+    #'(lambda (value)
+	(loop
+	 for (int symbol) in mappings
+	 when (= (logand value int) int)
+	 collect symbol))))
+
+(define-type-method writer-function ((type flags))
+  (let ((writer (writer-function 'unsigned))
+	(function (to-alien-function (type-expand-to 'flags type))))
+    #'(lambda (flags location &optional (offset 0))
+	(funcall writer (funcall function flags) location offset))))
+    
+(define-type-method reader-function ((type flags))
+  (let ((reader (reader-function 'unsigned))
+	(function (from-alien-function (type-expand-to 'flags type))))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
+	(funcall function (funcall reader location offset)))))
+
+
+;;;; Named flags types
+
+(defmacro define-flags-type (name &rest args)
+  (let ((flags-int (intern (format nil "~A-TO-INT" name)))
+	(int-flags (intern (format nil "INT-TO-~A" name)))
+	(satisfies  (intern (format nil "~A-P" name))))
+    `(progn
+       (deftype ,name () '(satisfies ,satisfies))
+       (defun ,satisfies (object)
+	 (flet ((valid-p (ob)
+		  (find ob ',(%map-flags args :symbols))))
+	   (typecase object
+	     (symbol (valid-p object))
+	     (list (every #'valid-p object)))))
+       (defun ,flags-int (flags)
+	 (reduce #'logior (mklist flags)
+	  :key #'(lambda (flag)
+		   (case flag
+		     ,@(%map-flags args :symbol-int)
+		     (t (error 'type-error :datum flags 
+		         :expected-type ',name))))))
+       (defun ,int-flags (value)
+	 (loop
+	  for (int symbol) in ',(%map-flags args :int-symbol)
+	  when(= (logand value int) int)
+	  collect symbol))
+       (define-type-method alien-type ((type ,name))
+	 (declare (ignore type))
+	 (alien-type 'flags))
+       (define-type-method size-of ((type ,name))
+	 (declare (ignore type))
+	 (size-of 'flags))
+       (define-type-method to-alien-form ((type ,name) form)
+	 (declare (ignore type))
+	 (list ',flags-int form))
+       (define-type-method from-alien-form ((type ,name) form)
+	 (declare (ignore type))
+	 (list ',int-flags form))
+       (define-type-method to-alien-function ((type ,name))
+	 (declare (ignore type))
+	 #',flags-int)
+       (define-type-method from-alien-function ((type ,name))
+	 (declare (ignore type))
+	 #',int-flags)
+       (define-type-method writer-function ((type ,name))
+	 (declare (ignore type))
+	 (let ((writer (writer-function 'signed)))
+	   #'(lambda (flags location &optional (offset 0))
+	       (funcall writer (,flags-int flags) location offset))))
+       (define-type-method reader-function ((type ,name))
+	 (declare (ignore type))
+	 (let ((reader (reader-function 'signed)))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
+	       (,int-flags (funcall reader location offset))))))))
+
+
+
+;;;; Type definition by introspection
 
 (defun %query-enum-or-flags-values (query-function class type)
   (multiple-value-bind (sap length)
       (funcall query-function (type-class-ref type))
     (let ((values nil)
-	  (size (proxy-class-size (find-class class)))
-	  (proxy (make-proxy-instance class sap nil)))
+	  (size (foreign-size (find-class class)))
+	  (proxy (ensure-proxy-instance class sap)))
       (dotimes (i length)
 	(with-slots (location nickname value) proxy
 	  (setf location sap)
@@ -54,44 +278,13 @@ (defun %query-enum-or-flags-values (query-function class type)
 	    value)
 	   values)))
       values)))
-   
-  
-;;;; Enum type
 
-(deftype enum (&rest args)
-  `(member ,@(%map-mappings args :symbols)))
-
-(deftype-method translate-type-spec enum (type-spec)
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    (if (integerp (first args))
-	(translate-type-spec `(signed ,(first args)))
-      (translate-type-spec 'signed))))
-
-(deftype-method size-of enum (type-spec)
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    (if (integerp (first args))
-	(size-of `(signed ,(first args)))
-      (size-of 'signed))))
-
-(deftype-method translate-to-alien enum (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    `(ecase ,expr
-       ,@(%map-mappings args :enum-int))))
-
-(deftype-method translate-from-alien enum (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'enum type-spec)
-    (declare (ignore name))
-    `(ecase ,expr
-       ,@(%map-mappings args :int-enum))))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %enum-value (static)
-    ((value :allocation :alien :type int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class)))
+
+(defclass %enum-value (struct)
+  ((value :allocation :alien :type int)
+   (name :allocation :alien :type string)
+   (nickname :allocation :alien :type string))
+  (:metaclass static-struct-class))
 
 (defbinding %enum-class-values () pointer
   (class pointer)
@@ -101,57 +294,11 @@ (defun query-enum-values (type)
   (%query-enum-or-flags-values #'%enum-class-values '%enum-value type))
 
 
-
-;;;;  Flags type
-
-(deftype flags (&rest args)
-  `(or
-    null
-    (cons
-     (member ,@(%map-mappings args :symbols))
-     list)))
-
-(deftype-method translate-type-spec flags (type-spec)
-  (let ((args (cdr (type-expand-to 'flags type-spec))))
-    (if (integerp (first args))
-	(translate-type-spec `(unsigned ,(first args)))
-      (translate-type-spec 'unsigned))))
-
-(deftype-method size-of flags (type-spec)
-  (let ((args (cdr (type-expand-to 'flags type-spec))))
-    (if (integerp (first args))
-	(size-of `(unsigned ,(first args)))
-      (size-of 'unsigned))))
-
-(deftype-method translate-to-alien flags (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
-    (declare (ignore name))
-    (let ((mappings (%map-mappings args :flags-int))
-	  (value (make-symbol "VALUE")))
-      `(let ((,value 0))
-	 (dolist (flag ,expr ,value)
-	   (setq ,value (logior ,value (second (assoc flag ',mappings)))))))))
-
-(deftype-method translate-from-alien flags (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
-    (declare (ignore name))
-    (let ((mappings (%map-mappings args :int-flags))
-	  (result (make-symbol "RESULT")))
-      `(let ((,result nil))
-	 (dolist (mapping ',mappings ,result)
-	   (unless (zerop (logand ,expr (first mapping)))
-	     (push (second mapping) ,result)))))))
-
-
-
-;(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %flags-value (static)
-    ((value :allocation :alien :type unsigned-int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class));)
+(defclass %flags-value (struct)
+  ((value :allocation :alien :type unsigned-int)
+   (name :allocation :alien :type string)
+   (nickname :allocation :alien :type string))
+  (:metaclass static-struct-class))
 
 (defbinding %flags-class-values () pointer
   (class pointer)
@@ -161,10 +308,8 @@ (defun query-flags-values (type)
   (%query-enum-or-flags-values #'%flags-class-values '%flags-value type))
 
 
-
-;;;;
-
-(defun expand-enum-type (type-number &optional options)
+(defun expand-enum-type (type-number forward-p options)
+  (declare (ignore forward-p))
   (let* ((super (supertype type-number))
 	 (type (type-from-number type-number))
 	 (mappings (getf options :mappings))
@@ -181,8 +326,10 @@ (defun expand-enum-type (type-number &optional options)
 	   (remove-if
 	    #'(lambda (mapping) (eq (second mapping) nil)) mappings))))
     `(progn
-       (register-type ',type ,(find-type-name type-number))
-       (deftype ,type () '(,super ,@expanded-mappings)))))
+       (register-type ',type ',(find-type-init-function type-number))
+       ,(ecase super
+	  (enum `(define-enum-type ,type ,@expanded-mappings))
+	  (flags `(define-flags-type ,type ,@expanded-mappings))))))
 
 
 (register-derivable-type 'enum "GEnum" 'expand-enum-type)