X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/c289d0845a6b7307eab27e92590a03daf200f7c8..7ce4015bab6f4366baf5b9321fb3fad094625305:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index eb6cdb2..ab645e4 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 1999-2005 Espen S. Johnsen ;; -;; 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.21 2004-12-20 20:09:53 espen Exp $ +;; $Id: gtkobject.lisp,v 1.29 2006-02-04 12:17:45 espen Exp $ (in-package "GTK") @@ -36,35 +41,36 @@ (in-package "GTK") (eval-when (:compile-toplevel :load-toplevel :execute) (init-types-in-library #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") - "/libgtk-x11-2.0.so") - :ignore ("gtk_window_get_type_hint")) + "/libgtk-x11-2.0.so")) (defclass %object (gobject) () (:metaclass gobject-class) - (:alien-name "GtkObject"))) + (:gtype |gtk_object_get_type|))) (defmethod initialize-instance ((object %object) &rest initargs &key signal) (declare (ignore signal)) (call-next-method) - (reference-foreign (class-of object) (proxy-location object)) (dolist (signal-definition (get-all initargs :signal)) (apply #'signal-connect object signal-definition))) (defmethod initialize-instance :around ((object %object) &rest initargs) (declare (ignore initargs)) (call-next-method) + ;; Add a temorary reference which will be removed when the object is + ;; sinked + (reference-foreign (class-of object) (foreign-location object)) (%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) @@ -82,9 +88,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,20 +132,20 @@ (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))) (defmethod initialize-internal-slot-functions ((slotd effective-child-slot-definition)) - (let* ((type (slot-definition-type slotd)) - (pname (slot-definition-pname slotd)) - (type-number (find-type-number type))) + (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-number))) + (let ((gvalue (gvalue-new type))) (%container-child-get-property parent child pname gvalue) (unwind-protect (funcall (reader-function type) gvalue +gvalue-value-offset+) @@ -149,7 +155,7 @@ (defmethod initialize-internal-slot-functions ((slotd effective-child-slot-defin (slot-value slotd 'setter) #'(lambda (value object) (with-slots (parent child) object - (let ((gvalue (gvalue-new type-number))) + (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) @@ -158,7 +164,7 @@ (defmethod initialize-internal-slot-functions ((slotd effective-child-slot-defin (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 @@ -168,7 +174,7 @@ (defmethod pcl::add-reader-method ((class child-class) generic-function slot-nam (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 @@ -181,7 +187,7 @@ (defmethod pcl::add-writer-method (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) @@ -208,17 +214,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)