X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/f4175703fcb0b913a124d9391161fd735cd6a230..e9de85978fd997e7412502ad5977b013c3fca93f:/gtk/gtktree.lisp

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index 7864a12..81d6474 100644
--- a/gtk/gtktree.lisp
+++ b/gtk/gtktree.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2004-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: gtktree.lisp,v 1.3 2004-11-21 17:57:56 espen Exp $
+;; $Id: gtktree.lisp,v 1.18 2006-03-03 19:00:12 espen Exp $
 
 
 (in-package "GTK")
@@ -53,15 +58,15 @@
   ((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)
-  ((callback %cell-layout-data-func) pointer)
+  (%cell-layout-data-callback callback)
   ((register-callback-function function) unsigned-int)
-  ((callback %destroy-user-data) pointer))
+  (user-data-destroy-callback callback))
 
 (defbinding cell-layout-clear-attributes () nil
   (cell-layout cell-layout)
@@ -76,13 +81,16 @@
   (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 
+     (object-data list-store 'column-names) 
+     (coerce column-names 'vector)))
   (when initial-content
     (loop
      with iter = (make-instance 'tree-iter)
      for row in initial-content
      do (list-store-append list-store row iter))))
 
+(defgeneric column-setter-name (store))
 
 (defmethod column-setter-name ((list-store list-store))
   (declare (ignore list-store))
@@ -105,7 +113,7 @@
      (multiple-value-bind (valid iter) (tree-model-get-iter store row)
        (if valid
 	   (%list-store-remove store iter)
-	   (error "~A not poiniting to av valid iterator in ~A" row store))))
+	   (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
@@ -216,74 +224,78 @@
       (map-c-vector 'vector #'identity indices 'int depth))))
 
 (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))
+    (declare (ignore type))
     (size-of 'pointer))
   
-  (defmethod to-alien-form (path (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method to-alien-form ((type tree-path) path)
+    (declare (ignore type))
     `(%make-tree-path ,path))
   
-  (defmethod from-alien-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method from-alien-form ((type tree-path) location)
+    (declare (ignore type))
     `(let ((location ,location))
        (prog1
            (%tree-path-to-vector location)
 	 (%tree-path-free location))))
   
-  (defmethod copy-from-alien-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method copy-from-alien-form ((type tree-path) location)
+    (declare (ignore type))
     `(%tree-path-to-vector ,location))
   
-  (defmethod cleanup-form (location (type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
+  (define-type-method cleanup-form ((type tree-path) location)
+    (declare (ignore type))
     `(%tree-path-free ,location)))
 
-(defmethod to-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method to-alien-function ((type tree-path))
+  (declare (ignore type))
   #'%make-tree-path)
   
-(defmethod from-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-function ((type tree-path))
+  (declare (ignore type))
   #'(lambda (location)
       (prog1
 	  (%tree-path-to-vector location)
 	(%tree-path-free location))))
 
-(defmethod copy-from-alien-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method copy-from-alien-function ((type tree-path))
+  (declare (ignore type ))
   #'%tree-path-to-vector)
   
-(defmethod cleanup-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method cleanup-function ((type tree-path))
+  (declare (ignore type))
   #'%tree-path-free)
 
-(defmethod writer-function ((type (eql 'tree-path)) &rest args)
-  (declare (ignore type args))
+(define-type-method writer-function ((type tree-path))
+  (declare (ignore type))
   (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))
+(define-type-method reader-function ((type tree-path))
+  (declare (ignore type))
   (let ((reader (reader-function 'pointer)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(%tree-path-to-vector (funcall reader location offset)))))
 
+(define-type-method destroy-function ((type tree-path))
+  (declare (ignore type))
+  (let ((reader (reader-function 'pointer)))
+    #'(lambda (location &optional (offset 0))
+	(%tree-path-free (funcall reader location offset)))))
+
 
 (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))
@@ -292,7 +304,7 @@
   (reference tree-row-reference))
 
 
-(defbinding tree-model-get-column-type () type-number
+(defbinding tree-model-get-column-type () gtype ;type-number
   (tree-model tree-model)
   (index int))
 
@@ -312,9 +324,18 @@
   (column int)
   (gvalue gvalue))
 
-(defun tree-model-get-column-value (model iter column)
-  (let ((index (column-index model column)))
-    (with-gvalue (gvalue (tree-model-get-column-type model index))
+(defgeneric tree-model-value (model row column))
+
+(defmethod tree-model-value ((model tree-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)))))))
+    (with-gvalue (gvalue)
       (%tree-model-get-value model iter index gvalue))))
 
 (defbinding tree-model-iter-next () boolean
@@ -337,7 +358,7 @@
   (iter tree-iter))
 
 (defbinding tree-model-iter-nth-child
-    (tree-model parent &optional (iter (make-instance 'tree-iter))) boolean
+    (tree-model parent n &optional (iter (make-instance 'tree-iter))) boolean
   (tree-model tree-model)
   (iter tree-iter :return)
   (parent (or null tree-iter))
@@ -349,12 +370,12 @@
   (iter tree-iter :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)
-  ((callback %tree-model-foreach-func) pointer)
+  (%tree-model-foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun tree-model-foreach (model function)
@@ -389,6 +410,7 @@
 
 
 (defun column-types (model columns)
+  (declare (ignore model))
   (map 'vector 
        #'(lambda (column)
 	   (find-type-number (first (mklist column))))
@@ -403,6 +425,9 @@
 		   :test #'string=)))
    (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)
@@ -418,7 +443,8 @@
       (let ((setter 
 	     (mkbinding (column-setter-name model)
 	      nil (type-of model) 'tree-iter 'int
-	      (type-from-number (tree-model-get-column-type model index))
+;	      (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))))))))
@@ -439,9 +465,18 @@
 			 (funcall setter value iter))
 		 row setters)))))))
 
-(defun (setf tree-model-column-value) (value model iter column)
-  (funcall (tree-model-column-value-setter model column) value iter)
-  value)
+(defgeneric (setf tree-model-value) (value model row column))
+
+(defmethod (setf tree-model-value) (value (model tree-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)
@@ -453,19 +488,20 @@
     (cons 
      (loop
       as (column value . rest) = data then rest
-      do (setf (tree-model-column-value model iter column) value)
+      do (setf (tree-model-value model iter column) value)
       while rest))))
 
 
 ;;; 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)
-  ((callback %tree-selection-func) pointer)
+  (%tree-selection-callback callback)
   ((register-callback-function function) unsigned-int)
-  ((callback %destroy-user-data) pointer))
+  (user-data-destroy-callback callback))
 
 (defbinding tree-selection-get-selected 
     (selection &optional (iter (make-instance 'tree-iter))) boolean
@@ -473,11 +509,11 @@
   (nil null) 
   (iter tree-iter :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)
-  ((callback %tree-selection-foreach-func) pointer)
+  (%tree-selection-foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun tree-selection-selected-foreach (selection function)
@@ -547,6 +583,73 @@
   (end tree-path))
 
 
+;;; Tree Sortable
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (define-enum-type sort-column (:default -1) (:unsorted -2))
+  (define-enum-type sort-order (:before -1) (:equal 0) (:after 1)))
+
+
+(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))
+
+(defbinding %tree-sortable-get-sort-column-id () boolean
+  (sortable tree-sortable)
+  (column int :out)
+  (order sort-type :out))
+
+(defun tree-sortable-get-sort-column (sortable)
+  (multiple-value-bind (special-p column order) 
+      (%tree-sortable-get-sort-column-id sortable)
+    (values
+     (if special-p
+	 (int-to-sort-order column)
+       (column-name sortable column))
+     order)))
+
+(defbinding (tree-sortable-set-sort-column 
+	     "gtk_tree_sortable_set_sort_column_id") 
+    (sortable column order) nil
+  (sortable tree-sortable)
+  ((etypecase column
+     ((or integer sort-column) column)
+     (symbol (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-callback callback)
+  ((register-callback-function function) unsigned-int)
+  (user-data-destroy-callback callback))
+
+(defbinding %tree-sortable-set-default-sort-func () nil
+  (sortable tree-sortable)
+  (compare-func (or null callback))
+  (callback-id unsigned-int)
+  (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
+the current sort column of SORTABLE is the same as COLUMN,
+then the model will sort using this function."
+  (cond
+   ((and (eq column :default) (not function))
+    (%tree-sortable-set-default-sort-func sortable nil 0 nil))
+   ((eq column :default) 
+    (%tree-sortable-set-default-sort-func sortable 
+     %tree-iter-compare-callback
+     (register-callback-function function)
+     user-data-destroy-callback))
+   ((%tree-sortable-set-sort-func sortable column function))))
+
+(defbinding tree-sortable-has-default-sort-func-p () boolean
+  (sortable tree-sortable))
+
 
 ;;; Tree Store
 
@@ -588,7 +691,7 @@
   (parent (or null tree-iter))
   (sibling (or null tree-iter)))
 
-(defun tree-store-insert-after 
+(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))
@@ -667,6 +770,7 @@
 
 (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))
@@ -684,7 +788,7 @@
   (tree-view tree-view)
   (tree-view-column tree-view-column))
 
-(defbinding tree-view-insert-column (view columnd position) int
+(defbinding tree-view-insert-column (view column position) int
   (view tree-view)
   (column tree-view-column)
   ((if (eq position :end) -1 position) int))
@@ -755,11 +859,11 @@
   (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)
-  ((callback %tree-view-mapping-func) pointer)
+  (%tree-view-mapping-callback callback)
   (callback-id unsigned-int))
 
 (defun map-expanded-rows (function tree-view)
@@ -799,5 +903,126 @@
 ;; and many more functions which we'll add later
 
 
-;;; Tree View Column
+;;;; Icon View
 
+#+gtk2.6
+(progn
+  (defbinding icon-view-get-path-at-pos () tree-path
+    (icon-view icon-view)
+    (x int) (y int))
+
+  (define-callback-marshal %icon-view-foreach-callback nil (icon-view tree-path))
+
+  (defbinding %icon-view-selected-foreach (icon-view callback-id) tree-path
+    (icon-view icon-view)
+    (%icon-view-foreach-callback callback)
+    (callback-id unsigned-int))
+  
+  (defun icon-view-foreach (icon-view function)
+    (with-callback-function (id function)
+      (%icon-view-selected-foreach icon-view id)))
+
+  (defbinding icon-view-select-path () nil
+    (icon-view icon-view)
+    (path tree-path))
+
+  (defbinding icon-view-unselect-path () nil
+    (icon-view icon-view)
+    (path tree-path))
+
+  (defbinding icon-view-path-is-selected-p () boolean
+    (icon-view icon-view)
+    (path tree-path))
+
+  (defbinding icon-view-get-selected-items () (glist tree-path)
+    (icon-view icon-view))
+
+  (defbinding icon-view-select-all () nil
+    (icon-view icon-view))
+
+  (defbinding icon-view-unselect-all () nil
+    (icon-view icon-view))
+  
+  (defbinding icon-view-item-activated () nil
+    (icon-view icon-view)
+    (path tree-path))
+
+  (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))
+
+  (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))
+
+  (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)))
+
+#+gtk2.8
+(progn
+  (defbinding icon-view-get-item-at-pos () boolean
+    (icon-view icon-view)
+    (x int)
+    (y int)
+    (tree-path tree-path :out)
+    (cell cell-renderer :out))
+
+  (defbinding icon-view-set-cursor (icon-view path &key cell start-editing) nil
+    (icon-view icon-view)
+    (path tree-path)
+    (cell (or null cell-renderer))
+    (start-editing boolean))
+  
+  (defbinding icon-view-get-cursor () boolean
+    (icon-view icon-view)
+    (path tree-path :out)
+    (cell cell-renderer :out))
+
+  (defbinding icon-view-get-dest-item-at-pos () boolean
+    (icon-view icon-view)
+    (drag-x int)
+    (drag-y int)
+    (tree-path tree-path :out)
+    (pos drop-position :out))
+
+  (defbinding icon-view-create-drag-icon () gdk:pixmap
+    (icon-view icon-view)
+    (tree-path tree-path))
+
+  (defbinding icon-view-scroll-to-path (icon-view tree-path &key row-align column-align) nil
+    (icon-view icon-view)
+    (tree-path tree-path)
+    ((or row-align column-align) boolean)
+    (row-align single-float)
+    (column-align single-float))
+
+  (defbinding icon-view-get-visible-range () boolean
+    (icon-view icon-view)
+    (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-unset-model-drag-source () nil
+    (icon-view icon-view))
+
+  (defbinding icon-view-unset-model-drag-dest () nil
+    (icon-view icon-view)))