Callbacks from C done properly

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 073dd3631fe8d55216fabf7d49c8679e48ea4dcd..530b1b495c2a655d0eb23d060f77bb955585cd37 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,21 +15,23 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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: gtkcontainer.lisp,v 1.6 2001-11-20 18:25:53 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.10 2004-11-01 00:08:50 espen Exp $

 
 (in-package "GTK")
             
 
 (in-package "GTK")
             

-(defmethod shared-initialize ((container container) names &rest initargs)
+(defmethod shared-initialize ((container container) names &rest initargs 
+                             &key child children child-args)
+  (declare (ignore child))

   (call-next-method)
   (call-next-method)

-  (dolist (child (get-all initargs :child))
-    (apply #'container-add container (mklist child))))
+  (dolist (child (append children (get-all initargs :child)))
+    (apply #'container-add container (append (mklist child) child-args))))

 
 
 (defbinding %container-add () nil
   (container container)
   (widget widget))
 
 
 
 (defbinding %container-add () nil
   (container container)
   (widget widget))
 

-(defun container-add (container widget &rest args)
+(defmethod container-add ((container container) (widget widget) &rest args)

   (%container-add container widget)
   (when args
     (setf
   (%container-add container widget)
   (when args
     (setf


@@ -44,7 +46,7 @@ (defbinding %container-remove () nil
   (container container)
   (widget widget))
 
   (container container)
   (widget widget))
 

-(defun container-remove (container widget)
+(defmethod container-remove ((container container) (widget widget))

   (%container-remove container widget)
   (slot-makunbound widget 'child-slots))
 
   (%container-remove container widget)
   (slot-makunbound widget 'child-slots))
 


@@ -65,30 +67,37 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
 (defbinding container-check-resize () nil
   (container container))
 

-(defbinding (%container-foreach "gtk_container_foreach_full")
-    (container function) nil
+(def-callback %foreach-callback (c-call:void (widget system-area-pointer) 
+                                           (callback-id c-call:unsigned-int))
+  (invoke-callback callback-id nil (ensure-proxy-instance 'widget widget nil)))
+
+(defbinding %container-foreach (container callback-id) nil

   (container container)
   (container container)

-  (0 unsigned-long)
-  (*callback-marshal* pointer)
-  ((register-callback-function function) pointer)
-  (*destroy-marshal* pointer))
+  ((callback %foreach-callback) pointer)
+  (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))))

 
 (defun map-container (seqtype func container)
   (case seqtype
     ((nil)
 
 (defun map-container (seqtype func container)
   (case seqtype
     ((nil)

-     (%container-foreach container func)
+     (container-foreach container func)

      nil)
     (list
      (let ((list nil))
      nil)
     (list
      (let ((list nil))

-       (%container-foreach
+       (container-foreach

        container
        #'(lambda (child)
            (push (funcall func child) list)))
        (nreverse list)))
     (t
        container
        #'(lambda (child)
            (push (funcall func child) list)))
        (nreverse list)))
     (t

-     (let ((seq (make-sequence seqtype (container-num-children container)))
+     (let ((seq (make-sequence seqtype (container-length container)))

           (index 0))
           (index 0))

-       (%container-foreach
+       (container-foreach

        container
        #'(lambda (child)
            (setf (elt seq index) (funcall func child))
        container
        #'(lambda (child)
            (setf (elt seq index) (funcall func child))


@@ -98,7 +107,7 @@ (defun map-container (seqtype func container)
 (defmacro do-container ((var container &optional (result nil)) &body body)
   (let ((continue (make-symbol "CONTINUE")))
     `(let ((,continue t))
 (defmacro do-container ((var container &optional (result nil)) &body body)
   (let ((continue (make-symbol "CONTINUE")))
     `(let ((,continue t))

-       (%container-foreach
+       (container-foreach

        ,container
        #'(lambda (,var)
            (when ,continue
        ,container
        #'(lambda (,var)
            (when ,continue


@@ -108,11 +117,12 @@ (defmacro do-container ((var container &optional (result nil)) &body body)
                (setq ,continue t)))))
        ,result)))
 
                (setq ,continue t)))))
        ,result)))
 

-(defbinding %container-get-children () (glist widget)
-  (container container))
+;; (defbinding %container-get-children () (glist widget)
+;;   (container container))

 
 (defmethod container-children ((container container))
 
 (defmethod container-children ((container container))

-  (%container-get-children container))
+;;   (%container-get-children container)
+  (map-container 'list #'identity container))

 
 (defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
 
 (defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))


@@ -121,9 +131,40 @@ (defmethod (setf container-children) (children (container container))
     (container-add container child))
   children)
 
     (container-add container child))
   children)
 

-;; Should be implemented as a foreign function
-(defun container-num-children (container)
-  (length (container-children container)))
+(defun container-length (container)
+  (let ((n 0))
+    (container-foreach container
+     #'(lambda (child)
+        (declare (ignore child))
+        (incf n)))
+    n))

 
 (defbinding container-resize-children () nil
   (container container))
 
 (defbinding container-resize-children () nil
   (container container))

+
+(defbinding container-propagate-expose () nil
+  (container container)
+  (child widget)
+  (event gdk:expose-event))
+
+
+(defbinding %container-get-focus-chain () boolean
+  (container container)
+  (focusable-widgets (glist widget) :out))
+
+(defun container-focus-chain (container)
+  (multiple-value-bind (chain-set-p focusable-widgets)
+      (%container-get-focus-chain container)
+    (and chain-set-p focusable-widgets)))
+
+(defbinding %container-set-focus-chain () nil
+  (container container)
+  (focusable-widgets (glist widget)))
+
+(defbinding %container-unset-focus-chain () nil
+  (container container))
+
+(defun (setf container-focus-chain) (focusable-widgets container)
+  (if (null focusable-widgets)
+      (%container-unset-focus-chain container)
+    (%container-set-focus-chain container focusable-widgets)))