-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-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: gtkobject.lisp,v 1.9 2001/05/29 16:00:52 espen Exp $
+;; $Id: gtkobject.lisp,v 1.27 2005/04/23 16:48:52 espen Exp $
(in-package "GTK")
; (intern (substitute #\- #\_ (string-upcase name)) package))
-;;; Argument stuff - to be removed soon
-
-(deftype arg () 'pointer)
-
-(defconstant +arg-type-offset+ 0)
-(defconstant +arg-name-offset+ 4)
-(defconstant +arg-value-offset+ 8)
-(defconstant +arg-size+ 16)
-
-(defbinding arg-new () arg
- (type type-number))
-
-(defbinding %arg-free () nil
- (arg arg)
- (free-contents boolean))
-
-(defun arg-free (arg free-contents &optional alien)
- (cond
- (alien (%arg-free arg free-contents))
- (t
- (unless (null-pointer-p arg)
- (when free-contents
- (funcall
- (intern-destroy-function (type-from-number (arg-type arg)))
- arg +arg-value-offset+))
- (deallocate-memory arg)))))
-
-(defbinding %arg-reset () nil
- (arg arg))
-
-(defun arg-name (arg)
- (funcall (intern-reader-function 'string) arg +arg-name-offset+))
-
-(defun (setf arg-name) (name arg)
- (funcall (intern-writer-function 'string) name arg +arg-name-offset+)
- name)
-
-(defun arg-type (arg)
- (system:sap-ref-32 arg +arg-type-offset+))
-
-(defun (setf arg-type) (type arg)
- (setf (system:sap-ref-32 arg +arg-type-offset+) type))
-
-(defun arg-value (arg &optional (type (type-from-number (arg-type arg))))
- (funcall (intern-reader-function type) arg +arg-value-offset+))
-
-;; One should never call this function on an arg whose value is already set
-(defun (setf arg-value)
- (value arg &optional (type (type-from-number (arg-type arg))))
- (funcall (intern-writer-function type) value arg +arg-value-offset+)
- value)
-
-(defun (setf return-arg-value)
- (value arg &optional (type (type-from-number (arg-type arg))))
- ; this is probably causing a memory leak
- (funcall (intern-writer-function type) value (arg-value arg 'pointer) 0)
- value)
-
-(defun arg-array-ref (arg0 index)
- (system:sap+ arg0 (* index +arg-size+)))
-
;;;; Superclass for the gtk class hierarchy
(eval-when (:compile-toplevel :load-toplevel :execute)
- (init-types-in-library "/opt/gnome/lib/libgtk-x11-1.3.so")
+ (init-types-in-library
+ #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir")
+ "/libgtk-x11-2.0.so"))
(defclass %object (gobject)
()
(:metaclass gobject-class)
- (:alien-name "GtkObject")))
+ (:gtype |gtk_object_get_type|)))
-(defmethod shared-initialize ((object %object) names &rest initargs
- &key signals)
- (declare (ignore initargs names))
+(defmethod initialize-instance ((object %object) &rest initargs &key signal)
+ (declare (ignore signal))
(call-next-method)
- (%object-sink object)
- (dolist (signal signals)
- (apply #'signal-connect object signal)))
+ (reference-foreign (class-of object) (proxy-location object))
+ (dolist (signal-definition (get-all initargs :signal))
+ (apply #'signal-connect object signal-definition)))
-(defmethod initialize-proxy ((object %object) &rest initargs &key location)
+(defmethod initialize-instance :around ((object %object) &rest initargs)
(declare (ignore initargs))
(call-next-method)
- (%object-sink location))
+ (%object-sink object))
(defbinding %object-sink () nil
(object %object))
-
-;;;; Main loop, timeouts and idle functions
+;;;; Main loop and event handling
(declaim (inline events-pending-p main-iteration))
-(defbinding (events-pending-p "gtk_events_pending") () boolean)
+(defbinding events-pending-p () boolean)
(defbinding get-current-event () gdk:event)
(defun main-iterate-all (&rest args)
(declare (ignore args))
- (when (events-pending-p)
- (main-iteration-do nil)
- (main-iterate-all)))
-
-(system:add-fd-handler (gdk:event-poll-fd) :input #'main-iterate-all)
-(setq lisp::*periodic-polling-function* #'main-iterate-all)
-(setq lisp::*max-event-to-sec* 0)
-(setq lisp::*max-event-to-usec* 1000)
-
+ (loop
+ while (events-pending-p)
+ do (main-iteration-do nil)))
;;;; Metaclass for child classes
(defvar *container-to-child-class-mappings* (make-hash-table))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass child-class (virtual-slot-class))
+ (defclass child-class (virtual-slots-class)
+ ())
(defclass direct-child-slot-definition (direct-virtual-slot-definition)
- ((arg-name :reader slot-definition-arg-name)))
+ ((pname :reader slot-definition-pname :initarg :pname)))
- (defclass effective-child-slot-definition
- (effective-virtual-slot-definition)))
+ (defclass effective-child-slot-definition (effective-virtual-slot-definition)
+ ((pname :reader slot-definition-pname :initarg :pname)))
-(defmethod shared-initialize ((class child-class) names &rest initargs
- &key container)
- (declare (ignore initargs))
+(defmethod shared-initialize ((class child-class) names &key container)
(call-next-method)
(setf
(gethash (find-class (first container)) *container-to-child-class-mappings*)
class))
-(defmethod initialize-instance ((slotd direct-child-slot-definition)
- &rest initargs &key arg-name)
- (declare (ignore initargs))
- (call-next-method)
- (if arg-name
- (setf (slot-value slotd 'arg-name) arg-name)
- (error "Need argument name for slot with allocation :arg")))
-
-(defmethod direct-slot-definition-class ((class child-class) initargs)
+(defmethod direct-slot-definition-class ((class child-class) &rest initargs)
(case (getf initargs :allocation)
- (:arg (find-class 'direct-child-slot-definition))
+ (:property (find-class 'direct-child-slot-definition))
(t (call-next-method))))
-(defmethod effective-slot-definition-class ((class child-class) initargs)
+(defmethod effective-slot-definition-class ((class child-class) &rest initargs)
(case (getf initargs :allocation)
- (:arg (find-class 'effective-child-slot-definition))
+ (:property (find-class 'effective-child-slot-definition))
(t (call-next-method))))
-(defmethod compute-virtual-slot-accessor
- ((class child-class) (slotd effective-child-slot-definition) direct-slotds)
- (with-slots (type) slotd
- (let ((arg-name (slot-definition-arg-name (first direct-slotds)))
- (type-number (find-type-number type))
-; (reader (intern-reader-function type))
-; (writer (intern-writer-function type))
-; (destroy (intern-destroy-function type))
- )
- (list
- #'(lambda (object)
- (with-slots (parent child) object
- (with-gc-disabled
- (let ((arg (arg-new type-number)))
- (setf (arg-name arg) arg-name)
- (%container-child-getv parent child arg)
- (prog1
- (funcall
- (intern-reader-function type)
- arg +arg-value-offset+)
- (arg-free arg t t))))))
- #'(lambda (value object)
- (with-slots (parent child) object
- (with-gc-disabled
- (let ((arg (arg-new type-number)))
- (setf (arg-name arg) arg-name)
- (funcall
- (intern-writer-function type)
- value arg +arg-value-offset+)
- (%container-child-setv parent child arg)
- (funcall
- (intern-destroy-function type)
- arg +arg-value-offset+)
- (arg-free arg nil)
- value))))))))
-
-
-(defmethod pcl::add-reader-method ((class child-class) generic-function slot-name)
+(defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds)
+ (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+ (nconc
+ (list :pname (most-specific-slot-value direct-slotds 'pname))
+ (call-next-method))
+ (call-next-method)))
+
+(progn
+ #+cmu(declaim (optimize (inhibit-warnings 3)))
+ #+sbcl(declaim (muffle-conditions compiler-note))
+ (defun %container-child-get-property (parent child pname gvalue))
+ (defun %container-child-set-property (parent child pname gvalue)))
+
+
+(defmethod initialize-internal-slot-functions ((slotd effective-child-slot-definition))
+ (let ((type (slot-definition-type slotd))
+ (pname (slot-definition-pname slotd)))
+ (setf
+ (slot-value slotd 'getter)
+ #'(lambda (object)
+ (with-slots (parent child) object
+ (let ((gvalue (gvalue-new type)))
+ (%container-child-get-property parent child pname gvalue)
+ (unwind-protect
+ (funcall (reader-function type) gvalue +gvalue-value-offset+)
+ (gvalue-free gvalue t))))))
+
+ (setf
+ (slot-value slotd 'setter)
+ #'(lambda (value object)
+ (with-slots (parent child) object
+ (let ((gvalue (gvalue-new type)))
+ (funcall (writer-function type) value gvalue +gvalue-value-offset+)
+ (%container-child-set-property parent child pname gvalue)
+ (gvalue-free gvalue t)
+ value)))))
+
+ (call-next-method)))
+
+
+(defmethod add-reader-method ((class child-class) generic-function slot-name)
(add-method
generic-function
(make-instance 'standard-method
- :specializers (list (find-class 'widget))
- :lambda-list '(widget)
- :function #'(lambda (args next-methods)
- (declare (ignore next-methods))
- (child-slot-value (first args) slot-name)))))
+ :specializers (list (find-class 'widget))
+ :lambda-list '(widget)
+ :function #'(lambda (args next-methods)
+ (declare (ignore next-methods))
+ (child-property-value (first args) slot-name)))))
-(defmethod pcl::add-writer-method
+(defmethod add-writer-method
((class child-class) generic-function slot-name)
(add-method
generic-function
(make-instance 'standard-method
- :specializers (list (find-class t) (find-class 'widget))
- :lambda-list '(value widget)
- :function #'(lambda (args next-methods)
- (declare (ignore next-methods))
- (destructuring-bind (value widget) args
- (setf
- (child-slot-value widget slot-name)
- value))))))
+ :specializers (list (find-class t) (find-class 'widget))
+ :lambda-list '(value widget)
+ :function #'(lambda (args next-methods)
+ (declare (ignore next-methods))
+ (destructuring-bind (value widget) args
+ (setf (child-property-value widget slot-name) value))))))
-(defmethod validate-superclass ((class child-class) (super pcl::standard-class))
- (subtypep (class-name super) 'container-child))
+(defmethod validate-superclass ((class child-class) (super standard-class))
+ ;(subtypep (class-name super) 'container-child)
+ t)
(defclass container-child ()
;;;;
-(defbinding %container-query-child-args () arg
- (type-number type-number)
- (nil null)
- (n-args unsigned-int :out))
+(defbinding %container-class-list-child-properties () pointer
+ (class pointer)
+ (n-properties unsigned-int :out))
-(defun query-container-type-dependencies (type-number)
- (let ((child-slot-types ()))
- (multiple-value-bind (args n-args)
- (%container-query-child-args type-number)
- (dotimes (i n-args)
- (push (arg-type (arg-array-ref args i)) child-slot-types)))
- (delete-duplicates
- (append (query-object-type-dependencies type-number) child-slot-types))))
+(defun query-container-class-child-properties (type-number)
+ (let ((class (type-class-ref type-number)))
+ (multiple-value-bind (array length)
+ (%container-class-list-child-properties class)
+ (unwind-protect
+ (map-c-vector 'list #'identity array 'param length)
+ (deallocate-memory array)))))
(defun default-container-child-name (container-class)
(intern (format nil "~A-CHILD" container-class)))
-(defun expand-container-type (type-number &optional slots)
- (let* ((class (type-from-number type-number))
- (super (supertype type-number))
- (child-class (default-container-child-name class))
- (child-slots ()))
- (multiple-value-bind (args n-args)
- (%container-query-child-args type-number)
- (dotimes (i n-args)
- (let* ((arg (arg-array-ref args i))
- (arg-name (arg-name arg))
- (slot-name (default-slot-name
- (subseq arg-name (+ (position #\: arg-name) 2))))
- (type (type-from-number (arg-type arg) #|t|#)))
- (push
- `(,slot-name
- :allocation :arg
- :arg-name ,arg-name
- :accessor ,(default-slot-accessor child-class slot-name type)
- :initarg ,(intern (string slot-name) "KEYWORD")
- :type ,type)
- child-slots)))
+(defun expand-container-type (type forward-p options)
+ (let* ((class (type-from-number type))
+ (super (supertype type))
+ (child-class (default-container-child-name class)))
+ (if forward-p
+ (expand-gobject-type type t options)
`(progn
- ,(expand-gobject-type type-number slots)
- (defclass ,child-class
- (,(default-container-child-name super))
- ,child-slots
+ ,(expand-gobject-type type nil options)
+ (defclass ,child-class (,(default-container-child-name super))
+ ,(slot-definitions child-class
+ (query-container-class-child-properties type) nil)
(:metaclass child-class)
(:container ,class))))))
-(register-derivable-type
- 'container "GtkContainer"
- :query 'query-container-type-dependencies
- :expand 'expand-container-type)
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
~mdw / clg / blobdiff