-;; 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.20 2006/04/25 21:59:37 espen Exp $
(in-package "GLIB")
-
-
-(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))))
-
-(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)))
- (dotimes (i length)
- (with-slots (location nickname value) proxy
- (setf location sap)
- (setq sap (sap+ sap size))
- (push
- (list
- (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD")
- 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))))
+;;;; Definition of enums and flags by introspection
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass %enum-value (static)
+ (defclass enum-value (struct)
((value :allocation :alien :type int)
(name :allocation :alien :type string)
(nickname :allocation :alien :type string))
- (:metaclass proxy-class)))
-
-(defbinding %enum-class-values () pointer
+ (:metaclass struct-class)))
+
+(defun map-enum-values (values)
+ (map 'list
+ #'(lambda (enum-value)
+ (with-slots (nickname value) enum-value
+ (list
+ (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD")
+ value)))
+ values))
+
+(defbinding enum-class-values () (static (vector (inlined enum-value) n-values))
(class pointer)
(n-values unsigned-int :out))
-(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));)
-
-(defbinding %flags-class-values () pointer
+(defbinding flags-class-values () (static (vector (inlined enum-value) n-values))
(class pointer)
(n-values unsigned-int :out))
-(defun query-flags-values (type)
- (%query-enum-or-flags-values #'%flags-class-values '%flags-value type))
-
-
-
-;;;;
-
-(defun expand-enum-type (type-number &optional options)
- (let* ((super (supertype type-number))
- (type (type-from-number type-number))
+(defun query-enum-values (type)
+ (let ((class (type-class-ref type)))
+ (map-enum-values (if (eq (supertype type) 'enum)
+ (enum-class-values class)
+ (flags-class-values class)))))
+
+(defun expand-enum-type (type-number forward-p options)
+ (declare (ignore forward-p))
+ (let* ((type (type-from-number type-number))
(mappings (getf options :mappings))
(expanded-mappings
(append
(or
(assoc (first mapping) mappings)
(rassoc (cdr mapping) mappings :test #'equal)))
- (if (eq super 'enum)
- (query-enum-values type-number)
- (query-flags-values type-number)))
+ (query-enum-values type-number))
(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 (supertype type-number)
+ (enum `(define-enum-type ,type ,@expanded-mappings))
+ (flags `(define-flags-type ,type ,@expanded-mappings))))))
(register-derivable-type 'enum "GEnum" 'expand-enum-type)
~mdw / clg / blobdiff