X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/d9a7b2f889a946b9d91fd63fc687ed8dced85c62..906b440e0e0c31964cd556bcdd71ebfdfd254285:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index e266909..68c2db9 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.17 2004-10-31 14:44:05 espen Exp $ +;; $Id: gtkobject.lisp,v 1.27 2005-04-23 16:48:52 espen Exp $ (in-package "GTK") @@ -34,24 +39,24 @@ (in-package "GTK") ;;;; Superclass for the gtk class hierarchy (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "libgtk-x11-2.0.so" - :ignore ("gtk_window_get_type_hint")) + (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 signal) - (declare (ignore names signal)) +(defmethod initialize-instance ((object %object) &rest initargs &key signal) + (declare (ignore signal)) (call-next-method) - (object-ref object) ; inc ref count before sinking - (%object-sink object) + (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) +(defmethod initialize-instance :around ((object %object) &rest initargs) (declare (ignore initargs)) (call-next-method) (%object-sink object)) @@ -59,11 +64,11 @@ (defmethod initialize-proxy ((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) @@ -81,32 +86,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))) - -;;;; Initalization - -(defbinding (gtk-init "gtk_parse_args") () nil - "Initializes the library without opening the display." - (nil null) - (nil null)) - -(import 'gtk-system:clg-init) - -(defun clg-init (&optional display) - "Initializes the system and starts the event handling" - (unless (gdk:display-get-default) - (gdk:gdk-init) - (gtk-init) - (prog1 - (gdk:display-open display) - (system:add-fd-handler - (gdk:display-connection-number) :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 @@ -114,7 +96,7 @@ (defun clg-init (&optional display) (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) @@ -130,15 +112,6 @@ (defmethod shared-initialize ((class child-class) names &key container) (gethash (find-class (first container)) *container-to-child-class-mappings*) class)) -;; (defmethod initialize-instance ((slotd direct-child-slot-definition) -;; &rest initargs &key pname) -;; (declare (ignore initargs)) -;; (call-next-method) -;; (if pname -;; (setf (slot-value slotd 'pname) pname) -;; ; ??? -;; (error "Need pname for slot with allocation :property"))) - (defmethod direct-slot-definition-class ((class child-class) &rest initargs) (case (getf initargs :allocation) (:property (find-class 'direct-child-slot-definition)) @@ -157,81 +130,62 @@ (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))) - (unless (slot-boundp slotd 'reader-function) - (setf - (slot-value slotd 'reader-function) - #'(lambda (object) - (with-slots (parent child) object - (with-gc-disabled - (let ((gvalue (gvalue-new type-number))) - (%container-child-get-property parent child pname gvalue) - (unwind-protect - (funcall - (intern-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 - (with-gc-disabled - (let ((gvalue (gvalue-new type-number))) - (funcall - (intern-writer-function type) - value gvalue +gvalue-value-offset+) - (%container-child-set-property parent child pname gvalue) - (funcall - (intern-destroy-function type) - gvalue +gvalue-value-offset+) - (gvalue-free gvalue nil) - value)))))) + (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)))))) - (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))) + (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) @@ -252,23 +206,25 @@ (defun query-container-class-child-properties (type-number) (multiple-value-bind (array length) (%container-class-list-child-properties class) (unwind-protect - (map-c-array 'list #'identity array 'param length) + (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 &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)