-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-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: gtkcontainer.lisp,v 1.11 2004-11-07 01:23:38 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.26 2008-05-06 00:04:42 espen Exp $
(in-package "GTK")
-
+
+(defgeneric container-add (container widget &rest args))
+(defgeneric container-remove (container widget))
+(defgeneric container-all-children (container))
+(defgeneric container-internal-children (container))
+(defgeneric (setf container-children) (children container))
+
+
+(defun initial-add (object function initargs key pkey)
+ (loop
+ as (initarg value . rest) = initargs then rest
+ do (cond
+ ((eq initarg key) (funcall function object value))
+ ((eq initarg pkey) (mapc #'(lambda (value)
+ (funcall function object value))
+ value)))
+ while rest))
+
+(defun initial-apply-add (object function initargs key pkey)
+ (initial-add object #'(lambda (object value)
+ (apply function object (mklist value)))
+ initargs key pkey))
+
+
(defmethod shared-initialize ((container container) names &rest initargs
- &key child children child-args)
- (declare (ignore child))
+ &key child children child-args
+ (show-children nil show-children-p))
+ (declare (ignore names child children))
+ (when show-children-p
+ (if (not show-children)
+ (setf (user-data container 'show-recursive-p) nil)
+ (signal-connect container 'show #'container-show-recursive
+ :object t :remove t)))
+
(call-next-method)
- (dolist (child (append children (get-all initargs :child)))
- (apply #'container-add container (append (mklist child) child-args))))
+ (initial-add container
+ #'(lambda (container args)
+ (apply #'container-add container (append (mklist args) child-args)))
+ initargs :child :children))
+
+
+(defmethod compute-signal-function ((container container) signal function object args)
+ (declare (ignore signal))
+ (if (eq object :children)
+ #'(lambda (container &rest emission-args)
+ (let ((all-args (nconc emission-args args)))
+ (container-foreach container
+ #'(lambda (child)
+ (apply function child all-args)))))
+ (call-next-method)))
(defbinding %container-add () nil
(container container)
(widget widget))
-(defmethod container-add ((container container) (widget widget) &rest args)
- (%container-add container widget)
+(defun find-child-class (container-class)
+ (or
+ (gethash container-class *container-to-child-class-mappings*)
+ (setf (gethash container-class *container-to-child-class-mappings*)
+ (or
+ (when (eq container-class (find-class 'container))
+ (find-class 'container-child))
+ (find-child-class (find-class (supertype container-class)))))))
+
+(defun init-child-slots (container child args)
(when args
(setf
- (slot-value widget 'child-slots)
+ (slot-value child 'child-properties)
(apply
- #'make-instance
- (gethash (class-of container) *container-to-child-class-mappings*)
- :parent container :child widget args))))
+ #'make-instance (find-child-class (class-of container))
+ :parent container :child child args))))
+
+(defmethod container-add ((container container) (widget widget) &rest args)
+ (%container-add container widget)
+ (init-child-slots container widget args)
+ widget)
+(defmethod container-add ((container container) (widgets list) &rest args)
+ (dolist (widget widgets)
+ (apply #'container-add container widget args)))
(defbinding %container-remove () nil
(container container)
(defmethod container-remove ((container container) (widget widget))
(%container-remove container widget)
- (slot-makunbound widget 'child-slots))
+ (slot-makunbound widget 'child-properties))
(defbinding %container-child-get-property () nil
(defbinding container-check-resize () nil
(container container))
-(def-callback-marshal %foreach-callback (nil widget))
+(define-callback-marshal %foreach-callback nil (widget))
(defbinding %container-foreach (container callback-id) nil
(container container)
- ((callback %foreach-callback) pointer)
+ (%foreach-callback callback)
(callback-id unsigned-int))
(defun container-foreach (container function)
- (let ((callback-id (register-callback-function function)))
- (unwind-protect
- (%container-foreach container callback-id)
- (destroy-user-data callback-id))))
+ (with-callback-function (id function)
+ (%container-foreach container id)))
+
+(defbinding %container-forall (container callback-id) nil
+ (container container)
+ (%foreach-callback callback)
+ (callback-id unsigned-int))
+
+(defun container-forall (container function)
+ (with-callback-function (id function)
+ (%container-forall container id)))
(defun map-container (seqtype func container)
(case seqtype
nil)
(list
(let ((list nil))
- (container-foreach
- container
+ (container-foreach container
#'(lambda (child)
(push (funcall func child) list)))
(nreverse list)))
(t
(let ((seq (make-sequence seqtype (container-length container)))
(index 0))
- (container-foreach
- container
+ (container-foreach container
#'(lambda (child)
(setf (elt seq index) (funcall func child))
(incf index)))
seq))))
-(defmacro do-container ((var container &optional (result nil)) &body body)
- (let ((continue (make-symbol "CONTINUE")))
- `(let ((,continue t))
- (container-foreach
- ,container
- #'(lambda (,var)
- (when ,continue
- (setq ,continue nil)
- (block nil
- ,@body
- (setq ,continue t)))))
- ,result)))
-
-;; (defbinding %container-get-children () (glist widget)
-;; (container container))
-
-(defmethod container-children ((container container))
-;; (%container-get-children container)
- (map-container 'list #'identity container))
+(defmethod container-all-children ((container container))
+ (let ((internal ()))
+ (container-forall container
+ #'(lambda (child)
+ (push child internal)))
+ (nreverse internal)))
+
+(defmethod container-internal-children ((container container))
+ (let ((external-children (container-children container))
+ (all-children (container-all-children container)))
+ (loop
+ for child in all-children
+ unless (find child external-children)
+ collect child)))
(defmethod (setf container-children) (children (container container))
(dolist (child (container-children container))
(container-remove container child))
(dolist (child children)
- (container-add container child))
+ (apply #'container-add container (mklist child)))
children)
(defun container-length (container)
(if (null focusable-widgets)
(%container-unset-focus-chain container)
(%container-set-focus-chain container focusable-widgets)))
+
+(defgeneric container-show-recursive (container))
+
+(defmethod container-show-recursive ((container container))
+ "Recursively show any child widgets except widgets explicit hidden during construction."
+ (labels ((recursive-show (widget)
+ (when (typep widget 'container)
+ (if (not (user-data-p widget 'show-recursive-p))
+ (container-foreach widget #'recursive-show)
+ (unset-user-data widget 'show-recursive-p)))
+ (unless (widget-hidden-p widget)
+ (widget-show widget))))
+ (container-foreach container #'recursive-show)))
~mdw / clg / blobdiff