X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/bdc0e300667f589ecdbee0ae6bf6dc51c06c73ae..d53cf0ec9ee3dc48b13ff1048953d6d365fc3203:/gtk/gtktree.lisp

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index 1ba05f5..8469b04 100644
--- a/gtk/gtktree.lisp
+++ b/gtk/gtktree.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtktree.lisp,v 1.11 2005-09-26 21:34:53 espen Exp $
+;; $Id: gtktree.lisp,v 1.28 2007-08-20 10:33:05 espen Exp $
 
 
 (in-package "GTK")
@@ -58,21 +58,29 @@ (defbinding cell-layout-add-attribute (cell-layout cell attribute column) nil
   ((string-downcase attribute) string)
   (column int))
 
-(def-callback-marshal %cell-layout-data-func 
-    (nil cell-layout cell-renderer tree-model (copy-of tree-iter)))
+(define-callback-marshal %cell-layout-data-callback nil 
+  (cell-layout cell-renderer tree-model tree-iter))
 
 (defbinding cell-layout-set-cell-data-func (cell-layout cell function) nil
   (cell-layout cell-layout)
   (cell cell-renderer)
-  (%cell-layout-data-func callback)
+  (%cell-layout-data-callback callback)
   ((register-callback-function function) unsigned-int)
-  (user-data-destroy-func callback))
+  (user-data-destroy-callback callback))
 
 (defbinding cell-layout-clear-attributes () nil
   (cell-layout cell-layout)
   (cell cell-renderer))
 
 
+;;;; Cell Renderer
+
+(defmethod compute-signal-function ((gobject cell-renderer-toggle) (signal (eql 'toggled)) function object args)
+  (declare (ignore gobject signal function object args))
+  (let ((function (call-next-method)))
+    #'(lambda (object path)
+	(funcall function object (ensure-tree-path path)))))
+
 
 ;;;; List Store
 
@@ -81,7 +89,9 @@ (defmethod initialize-instance ((list-store list-store) &key column-types
   (call-next-method)
   (%list-store-set-column-types list-store column-types)
   (when column-names
-    (setf (object-data list-store 'column-names) column-names))
+    (setf 
+     (user-data list-store 'column-names) 
+     (coerce column-names 'vector)))
   (when initial-content
     (loop
      with iter = (make-instance 'tree-iter)
@@ -89,44 +99,75 @@ (defmethod initialize-instance ((list-store list-store) &key column-types
      do (list-store-append list-store row iter))))
 
 
-(defmethod column-setter-name ((list-store list-store))
-  (declare (ignore list-store))
-  "gtk_list_store_set")
-
 (defbinding %list-store-set-column-types () nil
   (list-store list-store)
   ((length columns) unsigned-int)
   (columns (vector gtype)))
 
-(defbinding %list-store-remove () boolean
+(defbinding list-store-remove (store row) boolean
+  (store list-store)
+  ((ensure-tree-iter store row) tree-iter))
+
+(defbinding %list-store-set-value () nil
   (list-store list-store)
-  (tree-iter tree-iter))
+  (tree-iter tree-iter)
+  (column int)
+  (gvalue gvalue))
 
-(defun list-store-remove (store row)
-  (etypecase row
-    (tree-iter 
-     (%list-store-remove store row))
-    (tree-path 
-     (multiple-value-bind (valid iter) (tree-model-get-iter store row)
-       (if valid
-	   (%list-store-remove store iter)
-	   (error "~A not poiniting to a valid iterator in ~A" row store))))
-    (tree-row-reference 
-     (let ((path (tree-row-reference-get-path row)))
-       (if path
-	   (list-store-remove store path)
-	 (error "~A not valid" row))))))
+(defmethod (setf tree-model-value) (value (store list-store) row column)
+  (let* ((index (tree-model-column-index store column))
+	 (type (tree-model-get-column-type store index)))
+    (with-gvalue (gvalue type value)
+      (%list-store-set-value store (ensure-tree-iter store row) index gvalue)))
+  value)
 
+(defbinding %list-store-insert-with-valuesv () nil
+  (list-store list-store)
+  (tree-iter tree-iter)
+  (position int)
+  (columns (vector int))
+  (gvalues pointer)
+  ((length columns) int))
 
 (defbinding %list-store-insert () nil
   (list-store list-store)
   (tree-iter tree-iter)
   (position int))
 
-(defun list-store-insert
-    (store position &optional data (iter (make-instance 'tree-iter)))
-  (%list-store-insert store iter position)
-  (when data (%tree-model-set store iter data))
+(defun list-store-insert (store position &optional data (iter (make-instance 'tree-iter)))
+  (etypecase data
+    (null (%list-store-insert store iter position))
+
+    (list (with-memory (gvalues (* (/ (length data) 2) +gvalue-size+))
+	    (let ((columns
+		   (loop
+		    for (column value) on data by #'cddr
+		    as index = (tree-model-column-index store column)
+		    as type = (tree-model-get-column-type store index)
+		    as gvalue = gvalues then (pointer+ gvalue  +gvalue-size+)
+		    do (gvalue-init gvalue type value)
+		    collect index)))
+		(unwind-protect
+		    (%list-store-insert-with-valuesv store iter position columns gvalues)
+		  (loop
+		   repeat (length columns)
+		   as gvalue = gvalues then (pointer+ gvalue  +gvalue-size+)
+		   do (gvalue-unset gvalue))))))
+
+    (vector (with-memory (gvalues (* (length data) +gvalue-size+))
+	      (let ((columns
+		     (loop
+		      for index below (length data)
+		      as type = (tree-model-get-column-type store index)
+		      as gvalue = gvalues then (pointer+ gvalue  +gvalue-size+)
+		      do (gvalue-init gvalue type (aref data index))
+		      collect index)))
+		(unwind-protect
+		    (%list-store-insert-with-valuesv store iter position columns gvalues))
+		(loop
+		 repeat (length data)
+		 as gvalue = gvalues then (pointer+ gvalue  +gvalue-size+)
+		 do (gvalue-unset gvalue))))))
   iter)
 
 (defbinding %list-store-insert-before () nil
@@ -137,11 +178,10 @@ (defbinding %list-store-insert-before () nil
 (defun list-store-insert-before
     (store sibling &optional data (iter (make-instance 'tree-iter)))
   (%list-store-insert-before store iter sibling)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
-(defbinding %list-store-insert-after 
-    (list-store &optional sibling (tree-iter (make-instance 'tree-iter))) nil
+(defbinding %list-store-insert-after () nil
   (list-store list-store)
   (tree-iter tree-iter)
   (sibling (or null tree-iter)))
@@ -149,7 +189,7 @@ (defbinding %list-store-insert-after
 (defun list-store-insert-after
     (store sibling &optional data (iter (make-instance 'tree-iter)))
   (%list-store-insert-after store iter sibling)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %list-store-prepend () nil
@@ -159,7 +199,7 @@ (defbinding %list-store-prepend () nil
 (defun list-store-prepend 
     (store &optional data (iter (make-instance 'tree-iter)))
   (%list-store-prepend store iter)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %list-store-append () nil
@@ -169,7 +209,7 @@ (defbinding %list-store-append () nil
 (defun list-store-append 
     (store &optional data (iter (make-instance 'tree-iter)))
   (%list-store-append store iter)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding list-store-clear () nil
@@ -195,7 +235,7 @@ (defbinding list-store-move-after () nil
   (psoition tree-iter))
 
 
-;;; Tree Model
+;;; Tree Path
 
 (defbinding %tree-path-free () nil
   (location pointer))
@@ -207,10 +247,11 @@ (defbinding %tree-path-get-depth () int
   (location pointer))
 
 (defun %make-tree-path (path)
-  (let ((c-vector (make-c-vector 'int (length path) path))
-	(location (allocate-memory (+ (size-of 'int) (size-of 'pointer)))))
+  (let* ((c-vector (make-c-vector 'int (length path) :content path))
+	 (pointer-offset (adjust-offset (size-of 'int) 'pointer))
+	 (location (allocate-memory (+ pointer-offset (size-of 'pointer)))))
     (funcall (writer-function 'int) (length path) location)
-    (funcall (writer-function 'pointer) c-vector location (size-of 'int))
+    (funcall (writer-function 'pointer) c-vector location pointer-offset)
     location))
 
 (defun %tree-path-to-vector (location)
@@ -220,81 +261,112 @@ (defun %tree-path-to-vector (location)
 	#()
       (map-c-vector 'vector #'identity indices 'int depth))))
 
+(defmacro %with-tree-path ((var path) &body body)
+  (let* ((pointer-offset (adjust-offset (size-of 'int) 'pointer))
+	 (vector-offset (adjust-offset (+ pointer-offset (size-of 'pointer)) 'int)))
+    `(with-memory (,var (+ ,vector-offset (* ,(size-of 'int) (length ,path))))
+      (funcall (writer-function 'int) (length ,path) ,var)
+      (setf (ref-pointer ,var ,pointer-offset) (pointer+ ,var ,vector-offset))
+      (make-c-vector 'int (length ,path) :content ,path :location (pointer+ ,var ,vector-offset))
+      ,@body)))
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defmethod alien-type ((type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method alien-type ((type tree-path))
+    (declare (ignore type))
     (alien-type 'pointer))
   
-  (defmethod size-of ((type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method size-of ((type tree-path) &key inlined)
+    (assert-not-inlined type inlined)
     (size-of 'pointer))
   
-  (defmethod to-alien-form (path (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method alien-arg-wrapper ((type tree-path) var path style form &optional copy-in-p)
+    (declare (ignore type))
+    (cond
+     ((and (in-arg-p style) copy-in-p)
+      `(with-pointer (,var (%make-tree-path ,path))
+         ,form))
+     ((and (in-arg-p style) (not (out-arg-p style)))
+      `(%with-tree-path (,var ,path)
+         ,form))
+     ((and (in-arg-p style) (out-arg-p style))
+      (let ((tree-path (make-symbol "SYMBOL")))
+	`(%with-tree-path (,tree-path ,path)
+	   (with-pointer (,var ,tree-path)
+             ,form))))
+     ((and (out-arg-p style) (not (in-arg-p style)))
+      `(with-pointer (,var)
+         ,form))))
+
+  (define-type-method to-alien-form ((type tree-path) path &optional copy-p)
+    (declare (ignore type copy-p))
     `(%make-tree-path ,path))
   
-  (defmethod from-alien-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
-    `(let ((location ,location))
-       (prog1
-           (%tree-path-to-vector location)
-	 (%tree-path-free location))))
+  (define-type-method from-alien-form ((type tree-path) location &key (ref :free))
+    (declare (ignore type))
+    `(prog1
+	 (%tree-path-to-vector ,location)
+       ,(when (eq ref :free)
+	  `(%tree-path-free ,location)))))
   
-  (defmethod copy-from-alien-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
-    `(%tree-path-to-vector ,location))
-  
-  (defmethod cleanup-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
-    `(%tree-path-free ,location)))
-
-(defmethod to-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  #'%make-tree-path)
-  
-(defmethod from-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  #'(lambda (location)
-      (prog1
-	  (%tree-path-to-vector location)
+(define-type-method to-alien-function ((type tree-path) &optional copy-p)
+  (declare (ignore type))
+  #'%make-tree-path
+  (unless copy-p
+    #'(lambda (tree-path location)
+	(declare (ignore tree-path))
 	(%tree-path-free location))))
-
-(defmethod copy-from-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  #'%tree-path-to-vector)
   
-(defmethod cleanup-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  #'%tree-path-free)
-
-(defmethod writer-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-function ((type tree-path) &key (ref :free))
+  (declare (ignore type))
+  (if (eq ref :free)
+      #'(lambda (location)
+	  (prog1
+	      (%tree-path-to-vector location)
+	    (%tree-path-free location)))
+    #'(lambda (location)
+	(%tree-path-to-vector location))))
+  
+(define-type-method writer-function ((type tree-path) &key temp inlined)
+  (declare (ignore temp))
+  (assert-not-inlined type inlined)
   (let ((writer (writer-function 'pointer)))
     #'(lambda (path location &optional (offset 0))
 	(funcall writer (%make-tree-path path) location offset))))
 
-(defmethod reader-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  (let ((reader (reader-function 'pointer)))
-    #'(lambda (location &optional (offset 0))
-	(%tree-path-to-vector (funcall reader location offset)))))
+(define-type-method reader-function ((type tree-path) &key ref inlined)
+  (declare (ignore ref))
+  (assert-not-inlined type inlined)
+  #'(lambda (location &optional (offset 0))
+      (%tree-path-to-vector (ref-pointer location offset))))
+
+(define-type-method destroy-function ((type tree-path) &key temp inlined)
+  (declare (ignore temp))
+  (assert-not-inlined type inlined)
+  #'(lambda (location &optional (offset 0))
+      (%tree-path-free (ref-pointer location offset))))
+
+(defun ensure-tree-path (path)
+  (etypecase path
+    (string (coerce (clg-utils:split-string path :delimiter #\:) 'vector))
+    (vector path)))
+
 
-(defmethod destroy-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
-  (let ((reader (reader-function 'pointer)))
-    #'(lambda (location &optional (offset 0))
-	(%tree-path-free (funcall reader location offset)))))
+;;; Tree Model
+
+(defgeneric tree-model-value (model row column))
+(defgeneric (setf tree-model-value) (value model row column))
+(defgeneric tree-model-row-data (model row))
+(defgeneric (setf tree-model-row-data) (data model row))
+(defgeneric tree-model-column-index (model column))
+(defgeneric tree-model-column-name (model index))
 
 
 (defbinding %tree-row-reference-new () pointer
   (model tree-model)
   (path tree-path))
 
-(defmethod initialize-instance ((reference tree-row-reference) &key model path)
-  (setf
-   (slot-value reference 'location)
-   (%tree-row-reference-new model path))
-  (call-next-method))
+(defmethod allocate-foreign ((reference tree-row-reference) &key model path)
+  (%tree-row-reference-new model path))
 
 (defbinding tree-row-reference-get-path () tree-path
   (reference tree-row-reference))
@@ -303,16 +375,29 @@ (defbinding (tree-row-reference-valid-p "gtk_tree_row_reference_valid") () boole
   (reference tree-row-reference))
 
 
-(defbinding tree-model-get-column-type () gtype ;type-number
+(defbinding tree-model-get-column-type () gtype
   (tree-model tree-model)
   (index int))
 
-(defbinding tree-model-get-iter 
-    (model path &optional (iter (make-instance 'tree-iter))) boolean
+(defbinding tree-model-get-iter (model path &optional (iter (make-instance 'tree-iter))) boolean
   (model tree-model)
-  (iter tree-iter :return)
+  (iter tree-iter :in/return)
   (path tree-path))
  
+(defun ensure-tree-iter (model row)
+  (etypecase row
+    (tree-iter row)
+    (tree-path 
+     (multiple-value-bind (valid-p iter) (tree-model-get-iter model row)
+       (if valid-p
+	   iter
+	 (error "Invalid tree path for ~A: ~A" model row))))
+    (tree-row-reference 
+     (let ((path (tree-row-reference-get-path row)))
+       (if path
+	   (ensure-tree-iter model path)
+	 (error "~A not valid" row))))))
+
 (defbinding tree-model-get-path () tree-path
   (tree-model tree-model)
   (iter tree-iter))
@@ -323,26 +408,28 @@ (defbinding %tree-model-get-value () nil
   (column int)
   (gvalue gvalue))
 
-(defun tree-model-value (model row column)
-  (let ((index (column-index model column))
-	(iter (etypecase row
-		(tree-iter row)
-		(tree-path (multiple-value-bind (valid iter)
-			       (tree-model-get-iter model row)
-			     (if valid
-				 iter
-			       (error "Invalid tree path: ~A" row)))))))
+(defmethod tree-model-value ((model tree-model) row column)
+  (let ((index (tree-model-column-index model column)))
     (with-gvalue (gvalue)
-      (%tree-model-get-value model iter index gvalue))))
+      (%tree-model-get-value model (ensure-tree-iter model row) index gvalue))))
+
+(defmethod tree-model-row-data ((model tree-model) row)
+  (coerce
+   (loop
+    with iter = (ensure-tree-iter model row)
+    for index from 0 to (tree-model-n-columns model)
+    collect (tree-model-value model iter index))
+   'vector))
+
 
 (defbinding tree-model-iter-next () boolean
   (tree-model tree-model)
-  (iter tree-iter :return))
+  (iter tree-iter :in/return))
 
 (defbinding tree-model-iter-children 
     (tree-model parent &optional (iter (make-instance 'tree-iter))) boolean
   (tree-model tree-model)
-  (iter tree-iter :return)
+  (iter tree-iter :in/return)
   (parent (or null tree-iter)))
 
 (defbinding (tree-model-iter-has-child-p "gtk_tree_model_iter_has_child") 
@@ -350,29 +437,29 @@ (defbinding (tree-model-iter-has-child-p "gtk_tree_model_iter_has_child")
   (tree-model tree-model)
   (iter tree-iter))
 
-(defbinding tree-model-iter-n-children () int
+(defbinding tree-model-iter-n-children (tree-model &optional iter) int
   (tree-model tree-model)
-  (iter tree-iter))
+  (iter (or null tree-iter)))
 
 (defbinding tree-model-iter-nth-child
     (tree-model parent n &optional (iter (make-instance 'tree-iter))) boolean
   (tree-model tree-model)
-  (iter tree-iter :return)
+  (iter tree-iter :in/return)
   (parent (or null tree-iter))
   (n int))
 
 (defbinding tree-model-iter-parent
     (tree-model child &optional (iter (make-instance 'tree-iter))) boolean
   (tree-model tree-model)
-  (iter tree-iter :return)
+  (iter tree-iter :in/return)
   (child tree-iter))
 
-(def-callback-marshal %tree-model-foreach-func 
-  (boolean tree-model (path (copy-of tree-path)) (iter (copy-of tree-iter))))
+(define-callback-marshal %tree-model-foreach-callback boolean 
+  (tree-model tree-path tree-iter))
 
-(defbinding %tree-model-foreach () nil
+(defbinding %tree-model-foreach (tree-model callback-id) nil
   (tree-model tree-model)
-  ((progn %tree-model-foreach-func) callback)
+  (%tree-model-foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun tree-model-foreach (model function)
@@ -405,108 +492,55 @@ (defbinding tree-model-rows-reordered () nil
   (iter tree-iter)
   (new-order int))
 
-
-(defun column-types (model columns)
-  (map 'vector 
-       #'(lambda (column)
-	   (find-type-number (first (mklist column))))
-       columns))
-	       
-(defun column-index (model column)
+(defmethod tree-model-column-index ((model tree-model) column)
   (or
    (etypecase column
      (number column)
-     (symbol (position column (object-data model 'column-names)))
-     (string (position column (object-data model 'column-names)
-		   :test #'string=)))
+     (string (position column (user-data model 'column-names) :test #'string=))
+     (symbol (position column (user-data model 'column-names))))
    (error "~A has no column ~S" model column)))
 
-(defun column-name (model index)
-  (svref (object-data model 'column-names) index))
-
-(defun tree-model-column-value-setter (model column)
-  (let ((setters (or
-		  (object-data model 'column-setters)
-		  (setf 
-		   (object-data model 'column-setters)
-		   (make-array (tree-model-n-columns model) 
-		    :initial-element nil)))))
-    (let ((index (column-index model column)))
-    (or
-     (svref setters index)
-     (setf 
-      (svref setters index)
-      (let ((setter 
-	     (mkbinding (column-setter-name model)
-	      nil (type-of model) 'tree-iter 'int
-;	      (type-from-number (tree-model-get-column-type model index))
-	      (tree-model-get-column-type model index)
-	      'int)))
-	#'(lambda (value iter)
-	    (funcall setter model iter index value -1))))))))
-
-(defun tree-model-row-setter (model)
-  (or 
-   (object-data model 'row-setter)
-   (progn
-     ;; This will create any missing column setter
-     (loop 
-      for i from 0 below (tree-model-n-columns model)
-      do (tree-model-column-value-setter model i))
-     (let ((setters (object-data model 'column-setters)))
-       (setf    
-	(object-data model 'row-setter)
-	#'(lambda (row iter)
-	    (map nil #'(lambda (value setter)
-			 (funcall setter value iter))
-		 row setters)))))))
-
-(defun (setf tree-model-value) (value model row column)
-  (let ((iter (etypecase row
-		(tree-iter row)
-		(tree-path (multiple-value-bind (valid iter)
-			       (tree-model-get-iter model row)
-			     (if valid
-				 iter
-			       (error "Invalid tree path: ~A" row)))))))
-    (funcall (tree-model-column-value-setter model column) value iter)
-    value))
-
-(defun (setf tree-model-row-data) (data model iter)
-  (funcall (tree-model-row-setter model) data iter)
+(defmethod tree-model-column-name ((model tree-model) index)
+  (svref (user-data model 'column-names) index))
+
+
+(defmethod (setf tree-model-row-data) ((data list) (model tree-model) (iter tree-iter))
+  (loop
+   for (column value) on data by #'cddr
+   do (setf (tree-model-value model iter column) value))
   data)
 
-(defun %tree-model-set (model iter data)
-  (etypecase data
-    (vector (setf (tree-model-row-data model iter) data))
-    (cons 
-     (loop
-      as (column value . rest) = data then rest
-      do (setf (tree-model-value model iter column) value)
-      while rest))))
+(defmethod (setf tree-model-row-data) ((data vector) (model tree-model) row)
+  (loop
+   with iter = (ensure-tree-iter model row)
+   for index from 0
+   for value across data
+   do (setf (tree-model-value model iter index) value))
+  data)
 
 
 ;;; Tree Selection
 
-(def-callback-marshal %tree-selection-func (boolean tree-selection tree-model (path (copy-of tree-path)) (path-currently-selected boolean)))
+(define-callback-marshal %tree-selection-callback boolean 
+  (tree-selection tree-model tree-path (path-currently-selected boolean)))
 
 (defbinding tree-selection-set-select-function (selection function) nil
   (selection tree-selection)
-  (%tree-selection-func callback)
+  (%tree-selection-callback callback)
   ((register-callback-function function) unsigned-int)
-  (user-data-destroy-func callback))
+  (user-data-destroy-callback callback))
 
 (defbinding tree-selection-get-selected 
     (selection &optional (iter (make-instance 'tree-iter))) boolean
   (selection tree-selection)
   (nil null) 
-  (iter tree-iter :return))
+  (iter tree-iter :in/return))
 
-(def-callback-marshal %tree-selection-foreach-func (nil tree-model (path (copy-of tree-path)) (iter (copy-of tree-iter))))
+(define-callback-marshal %tree-selection-foreach-callback nil (tree-model tree-path tree-iter))
 
-(defbinding %tree-selection-selected-foreach () nil
+(defbinding %tree-selection-selected-foreach (tree-selection callback-id) nil
   (tree-selection tree-selection)
-  ((progn %tree-selection-foreach-func) callback)
+  (%tree-selection-foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun tree-selection-selected-foreach (selection function)
@@ -583,8 +617,8 @@   (define-enum-type sort-column (:default -1) (:unsorted -2))
   (define-enum-type sort-order (:before -1) (:equal 0) (:after 1)))
 
 
-(def-callback-marshal %tree-iter-compare-func 
-  ((or int sort-order) tree-model (a (copy-of tree-iter)) (b (copy-of tree-iter))))
+(define-callback-marshal %tree-iter-compare-callback (or int sort-order)
+  (tree-model (a tree-iter) (b tree-iter)))
 
 (defbinding tree-sortable-sort-column-changed () nil
   (sortable tree-sortable))
@@ -600,7 +634,7 @@ (defun tree-sortable-get-sort-column (sortable)
     (values
      (if special-p
 	 (int-to-sort-order column)
-       (column-name sortable column))
+       (tree-model-column-name sortable column))
      order)))
 
 (defbinding (tree-sortable-set-sort-column 
@@ -609,22 +643,22 @@ (defbinding (tree-sortable-set-sort-column
   (sortable tree-sortable)
   ((etypecase column
      ((or integer sort-column) column)
-     (symbol (column-index sortable column))) 
+     (symbol (tree-model-column-index sortable column))) 
    (or sort-column int))
   (order sort-type))
 
 (defbinding %tree-sortable-set-sort-func (sortable column function) nil
   (sortable tree-sortable)
-  ((column-index sortable column) int)
-  (%tree-iter-compare-func callback)
+  ((tree-model-column-index sortable column) int)
+  (%tree-iter-compare-callback callback)
   ((register-callback-function function) unsigned-int)
-  (user-data-destroy-func callback))
+  (user-data-destroy-callback callback))
 
 (defbinding %tree-sortable-set-default-sort-func () nil
   (sortable tree-sortable)
-  (compare-func (or null pointer))
+  (compare-func (or null callback))
   (callback-id unsigned-int)
-  (destroy-func (or null pointer)))
+  (destroy-func (or null callback)))
 
 (defun tree-sortable-set-sort-func (sortable column function)
   "Sets the comparison function used when sorting to be FUNCTION. If
@@ -635,9 +669,9 @@ (defun tree-sortable-set-sort-func (sortable column function)
     (%tree-sortable-set-default-sort-func sortable nil 0 nil))
    ((eq column :default) 
     (%tree-sortable-set-default-sort-func sortable 
-     (callback %tree-iter-compare-func)
+     %tree-iter-compare-callback
      (register-callback-function function)
-     (callback user-data-destroy-func)))
+     user-data-destroy-callback))
    ((%tree-sortable-set-sort-func sortable column function))))
 
 (defbinding tree-sortable-has-default-sort-func-p () boolean
@@ -656,11 +690,22 @@ (defmethod initialize-instance ((tree-store tree-store) &key column-types
   (call-next-method)
   (%tree-store-set-column-types tree-store column-types)
   (when column-names
-    (setf (object-data tree-store 'column-names) column-names)))
+    (setf (user-data tree-store 'column-names) column-names)))
+
+
+(defbinding %tree-store-set-value () nil
+  (tree-store tree-store)
+  (tree-iter tree-iter)
+  (column int)
+  (gvalue gvalue))
+
+(defmethod (setf tree-model-value) (value (store tree-store) row column)
+  (let* ((index (tree-model-column-index store column))
+	 (type (tree-model-get-column-type store index)))
+    (with-gvalue (gvalue type value)
+      (%tree-store-set-value store (ensure-tree-iter store row) index gvalue)))
+  value)
 
-(defmethod column-setter-name ((tree-store tree-store))
-  (declare (ignore tree-store))
-  "gtk_tree_store_set")
 
 (defbinding tree-store-remove () boolean
   (tree-store tree-store)
@@ -675,7 +720,7 @@ (defbinding %tree-store-insert () nil
 (defun tree-store-insert 
     (store parent position &optional data (iter (make-instance 'tree-iter)))
   (%tree-store-insert store iter parent position)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %tree-store-insert-before () nil
@@ -687,7 +732,7 @@ (defbinding %tree-store-insert-before () nil
 (defun tree-store-insert-before 
     (store parent sibling &optional data (iter (make-instance 'tree-iter)))
   (%tree-store-insert-before store iter parent sibling)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %tree-store-insert-after () nil
@@ -699,7 +744,7 @@ (defbinding %tree-store-insert-after () nil
 (defun tree-store-insert-after 
     (store parent sibling &optional data (iter (make-instance 'tree-iter)))
   (%tree-store-insert-after store iter parent sibling)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %tree-store-prepend () nil
@@ -710,7 +755,7 @@ (defbinding %tree-store-prepend () nil
 (defun tree-store-prepend 
     (store parent &optional data (iter (make-instance 'tree-iter)))
   (%tree-store-prepend store iter parent)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding %tree-store-append () nil
@@ -721,7 +766,7 @@ (defbinding %tree-store-append () nil
 (defun tree-store-append 
     (store parent &optional data (iter (make-instance 'tree-iter)))
   (%tree-store-append store iter parent)
-  (when data (%tree-model-set store iter data))
+  (when data (setf (tree-model-row-data store iter) data))
   iter)
 
 (defbinding (tree-store-is-ancestor-p "gtk_tree_store_is_ancestor") () boolean
@@ -763,6 +808,7 @@ (defbinding tree-store-move-after () nil
 
 (defmethod initialize-instance ((tree-view tree-view) &rest initargs 
 				&key column)
+  (declare (ignore column))
   (call-next-method)
   (mapc #'(lambda (column)
 	    (tree-view-append-column tree-view column))
@@ -794,7 +840,10 @@ (defbinding tree-view-move-column-after () nil
   (column tree-view-column)
   (base-column (or null tree-view-column)))
 
-;;(defbinding tree-view-set-column drag-function ...)
+(define-callback-setter tree-view-set-column-drag-function tree-view boolean
+  (column tree-view-column) 
+  (prev tree-view-column) 
+  (next tree-view-column))
 
 (defbinding tree-view-scroll-to-point () nil
   (tree-view tree-view)
@@ -809,13 +858,8 @@ (defbinding tree-view-scroll-to-cell () nil
   (row-align single-float)
   (col-align single-float))
 
-(defbinding tree-view-set-cursor () nil
-  (tree-view tree-view)
-  (path tree-path)
-  (focus-column tree-view-column)
-  (start-editing boolean))
-
-(defbinding tree-view-set-cursor-on-cell () nil
+(defbinding (tree-view-set-cursor "gtk_tree_view_set_cursor_on_cell") 
+    (tree-view path &key focus-column focus-cell start-editing) nil
   (tree-view tree-view)
   (path tree-path)
   (focus-column (or null tree-view-column))
@@ -851,11 +895,11 @@ (defbinding tree-view-collapse-row () nil
   (tree-view tree-view)
   (path tree-path))
 
-(def-callback-marshal %tree-view-mapping-func (nil tree-view (path (copy-of tree-path))))
+(define-callback-marshal %tree-view-mapping-callback nil (tree-view tree-path))
 
-(defbinding %tree-view-map-expanded-rows () nil
+(defbinding %tree-view-map-expanded-rows (tree-view callback-id) nil
   (tree-view tree-view)
-  ((progn %tree-view-mapping-func) callback)
+  (%tree-view-mapping-callback callback)
   (callback-id unsigned-int))
 
 (defun map-expanded-rows (function tree-view)
@@ -880,35 +924,34 @@ (defbinding tree-view-get-cell-area () nil
   (tree-view tree-view)
   (path (or null tree-path))
   (column (or null tree-view-column))
-  ((make-instance 'gdk:rectangle) gdk:rectangle :return))
+  ((make-instance 'gdk:rectangle) gdk:rectangle :in/return))
 
 (defbinding tree-view-get-background-area () nil
   (tree-view tree-view)
   (path (or null tree-path))
   (column (or null tree-view-column))
-  ((make-instance 'gdk:rectangle) gdk:rectangle :return))
+  ((make-instance 'gdk:rectangle) gdk:rectangle :in/return))
 
 (defbinding tree-view-get-visible-rect () nil
   (tree-view tree-view)
-  ((make-instance 'gdk:rectangle) gdk:rectangle :return))
+  ((make-instance 'gdk:rectangle) gdk:rectangle :in/return))
 
 ;; and many more functions which we'll add later
 
 
 ;;;; Icon View
 
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (progn
   (defbinding icon-view-get-path-at-pos () tree-path
     (icon-view icon-view)
     (x int) (y int))
 
-  (def-callback-marshal %icon-view-foreach-func 
-    (nil icon-view (path (copy-of tree-path))))
+  (define-callback-marshal %icon-view-foreach-callback nil (icon-view tree-path))
 
-  (defbinding %icon-view-selected-foreach () tree-path
+  (defbinding %icon-view-selected-foreach (icon-view callback-id) tree-path
     (icon-view icon-view)
-    ((progn %icon-view-foreach-func) callback)
+    (%icon-view-foreach-callback callback)
     (callback-id unsigned-int))
   
   (defun icon-view-foreach (icon-view function)
@@ -944,21 +987,57 @@   (defbinding %icon-view-set-text-column (column icon-view) nil
     (icon-view icon-view)
     ((if (integerp column) 
 	 column 
-       (column-index (icon-view-model icon-view) column)) int))
+       (tree-model-column-index (icon-view-model icon-view) column)) int))
+
+  (defbinding %%icon-view-get-text-column () int
+    (icon-view icon-view))
+
+  (defun %icon-view-get-text-column (icon-view)
+    (tree-model-column-index 
+     (icon-view-model icon-view) 
+     (%%icon-view-get-text-column icon-view)))
+
+  (defun %icon-view-text-column-boundp (icon-view)
+    (not (eql (%%icon-view-get-text-column icon-view) -1)))
+
 
   (defbinding %icon-view-set-markup-column (column icon-view) nil
     (icon-view icon-view)
     ((if (integerp column) 
 	 column 
-       (column-index (icon-view-model icon-view) column)) int))
+       (tree-model-column-index (icon-view-model icon-view) column)) int))
+
+  (defbinding %%icon-view-get-markup-column () int
+    (icon-view icon-view))
+
+  (defun %icon-view-get-markup-column (icon-view)
+    (tree-model-column-index 
+     (icon-view-model icon-view) 
+     (%%icon-view-get-markup-column icon-view)))
+
+  (defun %icon-view-markup-column-boundp (icon-view)
+    (not (eql (%%icon-view-get-markup-column icon-view) -1)))
+
 
   (defbinding %icon-view-set-pixbuf-column (column icon-view) nil
     (icon-view icon-view)
     ((if (integerp column) 
 	 column 
-       (column-index (icon-view-model icon-view) column)) int)))
+       (tree-model-column-index (icon-view-model icon-view) column)) int)))
+
+  (defbinding %%icon-view-get-pixbuf-column () int
+    (icon-view icon-view))
+
+  (defun %icon-view-get-pixbuf-column (icon-view)
+    (tree-model-column-index 
+     (icon-view-model icon-view) 
+     (%%icon-view-get-pixbuf-column icon-view)))
+
+  (defun %icon-view-pixbuf-column-boundp (icon-view)
+    (not (eql (%%icon-view-get-pixbuf-column icon-view) -1)))
 
-#+gtk2.8
+
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
 (progn
   (defbinding icon-view-get-item-at-pos () boolean
     (icon-view icon-view)
@@ -1001,18 +1080,18 @@   (defbinding icon-view-get-visible-range () boolean
     (start-path tree-path :out)
     (end-path tree-path :out))
 
-;;   (defbinding icon-view-enable-model-drag-source () nil
-;;     (icon-view icon-view)
-;;     (start-button-mask gdk:modifier-type)
-;;     (targets (vector target-entry))
-;;     ((length targets) unsigned-int)
-;;     (actions gdk:drag-action))
-
-;;   (defbinding icon-view-enable-model-drag-dest () nil
-;;     (icon-view icon-view)
-;;     (targets (vector target-entry))
-;;     ((length targets) unsigned-int)
-;;     (actions gdk:drag-action))
+  (defbinding icon-view-enable-model-drag-source () nil
+    (icon-view icon-view)
+    (start-button-mask gdk:modifier-type)
+    (targets (vector (inlined target-entry)))
+    ((length targets) unsigned-int)
+    (actions gdk:drag-action))
+
+  (defbinding icon-view-enable-model-drag-dest () nil
+    (icon-view icon-view)
+    (targets (vector (inlined target-entry)))
+    ((length targets) unsigned-int)
+    (actions gdk:drag-action))
 
   (defbinding icon-view-unset-model-drag-source () nil
     (icon-view icon-view))