X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/cc7092e40b16bf9f938dded9c50fe9711119f076..62f128081bd450f55d7e4ffd6602fb518f8ea304:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index 0173ba6..d03e975 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.18 2004-11-03 16:54:24 espen Exp $ +;; $Id: gtkobject.lisp,v 1.22 2005-02-01 15:24:56 espen Exp $ (in-package "GTK") @@ -34,7 +34,9 @@ (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" + (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")) (defclass %object (gobject) @@ -43,15 +45,14 @@ (defclass %object (gobject) (:alien-name "GtkObject"))) -(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)) @@ -85,34 +86,13 @@ (defun main-iterate-all (&rest args) (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)) - -(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)))) - - ;;;; 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) @@ -128,15 +108,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)) @@ -164,43 +135,26 @@ (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 - (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)))))))) + (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 - (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)))))) - - (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))) @@ -208,25 +162,23 @@ (defmethod pcl::add-reader-method ((class child-class) generic-function slot-nam (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 ((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)) @@ -250,23 +202,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)