X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/9adccb27da69b60d058aa37867d55ea20ecf97ca..af6d8c9a08ff89387edfb843e6863458e2d51b2c:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index 3d1c67c..e643681 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gtkobject.lisp,v 1.19 2004-11-06 21:39:58 espen Exp $ +;; $Id: gtkobject.lisp,v 1.23 2005-02-03 23:09:09 espen Exp $ (in-package "GTK") @@ -60,11 +60,11 @@ (defmethod initialize-instance :around ((object %object) &rest initargs) (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) @@ -82,9 +82,9 @@ (defbinding main-iteration-do (&optional (blocking t)) boolean (defun main-iterate-all (&rest args) (declare (ignore args)) - (when (events-pending-p) - (main-iteration-do nil) - (main-iterate-all))) + (loop + while (events-pending-p) + do (main-iteration-do nil))) ;;;; Metaclass for child classes @@ -126,7 +126,8 @@ (defmethod compute-effective-slot-definition-initargs ((class child-class) direc (call-next-method))) (progn - (declaim (optimize (ext:inhibit-warnings 3))) + #+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))) @@ -135,66 +136,53 @@ (defmethod initialize-internal-slot-functions ((slotd effective-child-slot-defin (let* ((type (slot-definition-type slotd)) (pname (slot-definition-pname slotd)) (type-number (find-type-number type))) - (unless (slot-boundp slotd 'reader-function) - (setf - (slot-value slotd 'reader-function) - #'(lambda (object) - (with-slots (parent child) object - (let ((gvalue (gvalue-new type-number))) - (%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 'getter) + #'(lambda (object) + (with-slots (parent child) object + (let ((gvalue (gvalue-new type-number))) + (%container-child-get-property parent child pname gvalue) + (unwind-protect + (funcall (reader-function type) gvalue +gvalue-value-offset+) + (gvalue-free gvalue t)))))) - (unless (slot-boundp slotd 'writer-function) - (setf - (slot-value slotd 'writer-function) - #'(lambda (value object) - (with-slots (parent child) object - (let ((gvalue (gvalue-new type-number))) - (funcall (writer-function type) value gvalue +gvalue-value-offset+) - (%container-child-set-property parent child pname gvalue) -;; (funcall -;; (destroy-function type) -;; gvalue +gvalue-value-offset+) - (gvalue-free gvalue t) - value))))) - - (unless (slot-boundp slotd 'boundp-function) - (setf - (slot-value slotd 'boundp-function) - #'(lambda (object) - (declare (ignore object)) - t)))) + (setf + (slot-value slotd 'setter) + #'(lambda (value object) + (with-slots (parent child) object + (let ((gvalue (gvalue-new type-number))) + (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 pcl::add-reader-method ((class child-class) generic-function slot-name) +(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)) +(defmethod validate-superclass ((class child-class) (super standard-class)) ;(subtypep (class-name super) 'container-child) t) @@ -221,17 +209,19 @@ (defun query-container-class-child-properties (type-number) (defun default-container-child-name (container-class) (intern (format nil "~A-CHILD" container-class))) -(defun expand-container-type (type &optional options) +(defun expand-container-type (type forward-p options) (let* ((class (type-from-number type)) (super (supertype type)) (child-class (default-container-child-name class))) - `(progn - ,(expand-gobject-type type 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" 'expand-container-type) + (if forward-p + (expand-gobject-type type t options) + `(progn + ,(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" 'expand-container-type 'gobject-dependencies)