Added selection in list and tree widgets

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index 5bbc67a7e722620a9bcd78480d1fc5d5e80d8420..7864a12021fac625916da1622c1861741ff49cb1 100644 (file)
--- a/gtk/gtktree.lisp
+++ b/gtk/gtktree.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
 
 ;; 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: gtktree.lisp,v 1.2 2004-11-15 19:24:03 espen Exp $
+;; $Id: gtktree.lisp,v 1.3 2004-11-21 17:57:56 espen Exp $

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


@@ -54,7 +54,7 @@ (defbinding cell-layout-add-attribute (cell-layout cell attribute column) nil
   (column int))
 
 (def-callback-marshal %cell-layout-data-func 
   (column int))
 
 (def-callback-marshal %cell-layout-data-func 

-    (nil cell-layout cell-renderer tree-model tree-iter))
+    (nil cell-layout cell-renderer tree-model (copy-of tree-iter)))

 
 (defbinding cell-layout-set-cell-data-func (cell-layout cell function) nil
   (cell-layout cell-layout)
 
 (defbinding cell-layout-set-cell-data-func (cell-layout cell function) nil
   (cell-layout cell-layout)


@@ -93,10 +93,26 @@ (defbinding %list-store-set-column-types () nil
   ((length columns) unsigned-int)
   (columns (vector gtype)))
 
   ((length columns) unsigned-int)
   (columns (vector gtype)))
 

-(defbinding list-store-remove () boolean
+(defbinding %list-store-remove () boolean

   (list-store list-store)
   (tree-iter tree-iter))
 
   (list-store list-store)
   (tree-iter tree-iter))
 

+(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 av 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))))))
+
+

 (defbinding %list-store-insert () nil
   (list-store list-store)
   (tree-iter tree-iter)
 (defbinding %list-store-insert () nil
   (list-store list-store)
   (tree-iter tree-iter)


@@ -192,12 +208,12 @@ (defun %make-tree-path (path)
     (funcall (writer-function 'pointer) c-vector location (size-of 'int))
     location))
 
     (funcall (writer-function 'pointer) c-vector location (size-of 'int))
     location))
 

-(defun %tree-path-to-vector (location &optional (destroy-p t))
-  (prog1
-      (map-c-vector 'vector #'identity (%tree-path-get-indices location)
-                   'int (%tree-path-get-depth location))
-    (when destroy-p
-      (%tree-path-free location))))
+(defun %tree-path-to-vector (location)
+  (let ((indices (%tree-path-get-indices location))
+       (depth (%tree-path-get-depth location)))
+    (if (null-pointer-p indices)
+       #()
+      (map-c-vector 'vector #'identity indices 'int depth))))

 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defmethod alien-type ((type (eql 'tree-path)) &rest args)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defmethod alien-type ((type (eql 'tree-path)) &rest args)


@@ -212,25 +228,51 @@   (defmethod to-alien-form (path (type (eql 'tree-path)) &rest args)
     (declare (ignore type args))
     `(%make-tree-path ,path))
   
     (declare (ignore type args))
     `(%make-tree-path ,path))
   

-  (defmethod to-alien-function ((type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
-    #'%make-tree-path)
-  

   (defmethod from-alien-form (location (type (eql 'tree-path)) &rest args)
     (declare (ignore type args))
   (defmethod from-alien-form (location (type (eql 'tree-path)) &rest args)
     (declare (ignore type args))

-    `(%tree-path-to-vector ,location))
+    `(let ((location ,location))
+       (prog1
+           (%tree-path-to-vector location)
+        (%tree-path-free location))))

   
   

-  (defmethod from-alien-function ((type (eql 'tree-path)) &rest args)
+  (defmethod copy-from-alien-form (location (type (eql 'tree-path)) &rest args)

     (declare (ignore type args))
     (declare (ignore type args))

-    #'%tree-path-to-vector)
+    `(%tree-path-to-vector ,location))

   
   (defmethod cleanup-form (location (type (eql 'tree-path)) &rest args)
     (declare (ignore type args))
   
   (defmethod cleanup-form (location (type (eql 'tree-path)) &rest args)
     (declare (ignore type args))

-    `(%tree-path-free ,location))
+    `(%tree-path-free ,location)))
+
+(defmethod to-alien-function ((type (eql 'tree-path)) &rest args)
+  (declare (ignore type args))
+  #'%make-tree-path)

   
   

-  (defmethod cleanup-function ((type (eql 'tree-path)) &rest args)
-    (declare (ignore type args))
-    #'%tree-path-free))
+(defmethod from-alien-function ((type (eql 'tree-path)) &rest args)
+  (declare (ignore type args))
+  #'(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))
+  #'%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))
+  (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)))))

 
 
 (defbinding %tree-row-reference-new () pointer
 
 
 (defbinding %tree-row-reference-new () pointer


@@ -238,7 +280,6 @@ (defbinding %tree-row-reference-new () pointer
   (path tree-path))
 
 (defmethod initialize-instance ((reference tree-row-reference) &key model path)
   (path tree-path))
 
 (defmethod initialize-instance ((reference tree-row-reference) &key model path)

-  (declare (ignore initargs))

   (setf
    (slot-value reference 'location)
    (%tree-row-reference-new model path))
   (setf
    (slot-value reference 'location)
    (%tree-row-reference-new model path))


@@ -308,12 +349,8 @@ (defbinding tree-model-iter-parent
   (iter tree-iter :return)
   (child tree-iter))
 
   (iter tree-iter :return)
   (child tree-iter))
 

-(defbinding tree-model-get-string-from-iter () string
-  (tree-model tree-model)
-  (iter tree-iter))
-

 (def-callback-marshal %tree-model-foreach-func 
 (def-callback-marshal %tree-model-foreach-func 

-  (boolean tree-model tree-path tree-iter))
+  (boolean tree-model (path (copy-of tree-path)) (iter (copy-of tree-iter))))

 
 (defbinding %tree-model-foreach () nil
   (tree-model tree-model)
 
 (defbinding %tree-model-foreach () nil
   (tree-model tree-model)


@@ -420,6 +457,97 @@ (defun %tree-model-set (model iter data)
       while rest))))
 
 
       while rest))))
 
 

+;;; Tree Selection
+
+(def-callback-marshal %tree-selection-func (boolean tree-selection tree-model (path (copy-of tree-path)) (path-currently-selected boolean)))
+
+(defbinding tree-selection-set-select-function (selection function) nil
+  (selection tree-selection)
+  ((callback %tree-selection-func) pointer)
+  ((register-callback-function function) unsigned-int)
+  ((callback %destroy-user-data) pointer))
+
+(defbinding tree-selection-get-selected 
+    (selection &optional (iter (make-instance 'tree-iter))) boolean
+  (selection tree-selection)
+  (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))))
+
+(defbinding %tree-selection-selected-foreach () nil
+  (tree-selection tree-selection)
+  ((callback %tree-selection-foreach-func) pointer)
+  (callback-id unsigned-int))
+
+(defun tree-selection-selected-foreach (selection function)
+  (with-callback-function (id function)
+    (%tree-selection-selected-foreach selection id)))
+
+(defbinding tree-selection-get-selected-rows () (glist tree-path)
+  (tree-selection tree-selection)
+  (nil null))
+
+(defbinding tree-selection-count-selected-rows () int
+  (tree-selection tree-selection))
+
+(defbinding %tree-selection-select-path () nil
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defbinding %tree-selection-unselect-path () nil
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defbinding %tree-selection-path-is-selected () boolean
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defbinding %tree-selection-select-iter () nil
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defbinding %tree-selection-unselect-iter () nil
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defbinding %tree-selection-iter-is-selected () boolean
+  (tree-selection tree-selection)
+  (tree-path tree-path))
+
+(defun tree-selection-select (selection row)
+  (etypecase row
+    (tree-path (%tree-selection-select-path selection row))
+    (tree-iter (%tree-selection-select-iter selection row))))
+
+(defun tree-selection-unselect (selection row)
+  (etypecase row
+    (tree-path (%tree-selection-unselect-path selection row))
+    (tree-iter (%tree-selection-unselect-iter selection row))))
+
+(defun tree-selection-is-selected-p (selection row)
+  (etypecase row
+    (tree-path (%tree-selection-path-is-selected selection row))
+    (tree-iter (%tree-selection-iter-is-selected selection row))))
+
+(defbinding tree-selection-select-all () nil
+  (tree-selection tree-selection))
+
+(defbinding tree-selection-unselect-all () nil
+  (tree-selection tree-selection))
+
+(defbinding tree-selection-select-range () nil
+  (tree-selection tree-selection)
+  (start tree-path)
+  (end tree-path))
+
+(defbinding tree-selection-unselect-range () nil
+  (tree-selection tree-selection)
+  (start tree-path)
+  (end tree-path))
+
+
+

 ;;; Tree Store
 
 (defbinding %tree-store-set-column-types () nil
 ;;; Tree Store
 
 (defbinding %tree-store-set-column-types () nil


@@ -537,16 +665,14 @@ (defbinding tree-store-move-after () nil
 
 ;;; Tree View
 
 
 ;;; Tree View
 

-(defmethod initialize-instance ((tree-view tree-view) &key column)
+(defmethod initialize-instance ((tree-view tree-view) &rest initargs 
+                               &key column)

   (call-next-method)
   (mapc #'(lambda (column)
            (tree-view-append-column tree-view column))
        (get-all initargs :column)))
 
 
   (call-next-method)
   (mapc #'(lambda (column)
            (tree-view-append-column tree-view column))
        (get-all initargs :column)))
 
 

-(defbinding tree-view-get-selection () tree-selection
-  (tree-view tree-view))
-

 (defbinding tree-view-columns-autosize () nil
   (tree-view tree-view))
 
 (defbinding tree-view-columns-autosize () nil
   (tree-view tree-view))
 


@@ -629,7 +755,7 @@ (defbinding tree-view-collapse-row () nil
   (tree-view tree-view)
   (path tree-path))
 
   (tree-view tree-view)
   (path tree-path))
 

-(def-callback-marshal %tree-view-mapping-func (nil tree-view tree-path))
+(def-callback-marshal %tree-view-mapping-func (nil tree-view (path (copy-of tree-path))))

 
 (defbinding %tree-view-map-expanded-rows () nil
   (tree-view tree-view)
 
 (defbinding %tree-view-map-expanded-rows () nil
   (tree-view tree-view)

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 11741cecb8eebf91953151fddf9ec217e889716e..21517909733b62e58c3a86e4d6e90c21664da91f 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.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
 
 ;; 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: gtktypes.lisp,v 1.19 2004-11-15 19:24:11 espen Exp $
+;; $Id: gtktypes.lisp,v 1.20 2004-11-21 17:57:56 espen Exp $

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


@@ -123,7 +123,7 @@ (defclass tree-iter (boxed)
 ;;    (indices  :allocation :alien :type pointer))
 ;;   (:metaclass boxed-class))
 
 ;;    (indices  :allocation :alien :type pointer))
 ;;   (:metaclass boxed-class))
 

-(deftype tree-path () '(vector int))
+(deftype tree-path () '(vector integer))

 (register-type 'tree-path "GtkTreePath")
 
 
 (register-type 'tree-path "GtkTreePath")
 
 


@@ -679,7 +679,12 @@     (default-widget
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 

-     :type (glist tree-view-column))))
+     :type (glist tree-view-column))
+    (selection
+     :allocation :virtual
+     :getter "gtk_tree_view_get_selection"
+     :reader tree-view-selection
+     :type tree-selection)))

 
   ("GtkTreeModel"
    :slots
 
   ("GtkTreeModel"
    :slots


@@ -689,6 +694,21 @@     (default-widget
      :reader tree-model-n-columns 
      :type int)))
 
      :reader tree-model-n-columns 
      :type int)))
 

+  ("GtkTreeSelection"
+   :slots
+   ((mode
+     :allocation :virtual
+     :getter "gtk_tree_selection_get_mode"
+     :setter "gtk_tree_selection_set_mode"
+     :accessor tree-selection-mode
+     :initarg :mode
+     :type selection-mode)
+    (tree-view
+     :allocation :virtual
+     :getter "gtk_tree_selection_get_mode"
+     :reader tree-selection-mode
+     :type tree-view)))
+

   ("GtkComboBox"
    :slots
    ((active-iter
   ("GtkComboBox"
    :slots
    ((active-iter