X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.tree-model.lisp;h=4b8f8131ca3a8f1eb921428368495a13a750ed47;hb=189a02521cbfc13465dc6c0c418cc6ce74d77d37;hp=8b6b6f58e520f31100229fc8765876b8a9e34fac;hpb=02c0f62d617212f4e51224a2f7e76074dac1378e;p=cl-gtk2.git diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp index 8b6b6f5..4b8f813 100644 --- a/gtk/gtk.tree-model.lisp +++ b/gtk/gtk.tree-model.lisp @@ -9,27 +9,130 @@ (:skip tree-model-row-deleted :pointer) (:skip tree-model-rows-reordered :pointer) ;;methods - (get-flags tree-model-flags (tree-model g-object)) - (get-n-columns :int (tree-model g-object)) - (get-column-type g-type-designator (tree-model g-object) (index :int)) - (get-iter :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (path (g-boxed-foreign tree-path))) - (get-path (g-boxed-foreign tree-path :return) (tree-model g-object) (iter (g-boxed-foreign tree-iter))) - (get-value :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (n :int) (value (:pointer g-value))) - (iter-next :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter))) - (iter-children :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter))) - (iter-has-child :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter))) - (iter-n-children :int (tree-model g-object) (iter (g-boxed-foreign tree-iter))) - (iter-nth-child :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter)) (n :int)) - (iter-parent :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (child (g-boxed-foreign tree-iter))) - (ref-node :void (tree-model g-object) (iter (g-boxed-foreign tree-iter))) - (unref-node :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)))) - -; TODO: GtkTreeSortable - -; TODO: GtkTreeModelSort + (get-flags (tree-model-flags (tree-model g-object))) + (get-n-columns (:int (tree-model g-object))) + (get-column-type (g-type-designator + (tree-model g-object) + (index :int))) + (get-iter (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)) + (path (g-boxed-foreign tree-path)))) + (get-path ((g-boxed-foreign tree-path :return) + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)))) + (get-value (:void + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)) + (n :int) + (value (:pointer g-value))) + :impl-call + ((tree-model iter n) + (multiple-value-bind (v type) (tree-model-get-value-impl tree-model iter n) + (set-g-value value v type)))) + (iter-next (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)))) + (iter-children (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)) + (parent (g-boxed-foreign tree-iter)))) + (iter-has-child (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)))) + (iter-n-children (:int + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)))) + (iter-nth-child (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)) + (parent (g-boxed-foreign tree-iter)) + (n :int))) + (iter-parent (:boolean + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)) + (child (g-boxed-foreign tree-iter)))) + (ref-node (:void + (tree-model g-object) + (iter (g-boxed-foreign tree-iter)))) + (unref-node (:void + (tree-model g-object) + (iter (g-boxed-foreign tree-iter))))) + +(define-vtable ("GtkTreeSortable" tree-sortable) + (:skip parent-instance g-type-interface) + ;; signal + (:skip sort-columns-changed :pointer) + ;; methods + (get-sort-column-id + (:boolean (sortable (g-object tree-sortable)) + (sort-column-id (:pointer :int)) + (order (:pointer sort-type))) + :impl-call ((sortable) + (multiple-value-bind (sorted-p r-sort-column-id r-order) (tree-sortable-get-sort-column-id-impl sortable) + (unless (null-pointer-p sort-column-id) + (setf (mem-ref sort-column-id :int) r-sort-column-id)) + (unless (null-pointer-p order) + (setf (mem-ref order 'sort-type) r-order)) + sorted-p))) + (set-sort-column-id (:void (sortable (g-object tree-sortable)) (sort-column-id :int) (order sort-type))) + (set-sort-func (:void (sortable (g-object tree-sortable)) (sort-column-id :int) (func :pointer) (data :pointer) (destroy-notify :pointer))) + (set-default-sort-func (:void (sortable (g-object tree-sortable)) (func :pointer) (data :pointer) (destroy-notify :pointer))) + (has-default-sort-func (:boolean (sortable (g-object tree-sortable))))) + +(defcfun (tree-model-sort-convert-child-path-to-path "gtk_tree_model_sort_convert_child_path_to_path") (g-boxed-foreign tree-path :return) + (tree-model-sort (g-object tree-model-sort)) + (child-path (g-boxed-foreign tree-path))) + +(export 'tree-model-sort-convert-child-path-to-path) + +(defcfun gtk-tree-model-sort-convert-child-iter-to-iter :boolean + (tree-model-sort (g-object tree-model-sort)) + (sort-iter (g-boxed-foreign tree-iter)) + (child-iter (g-boxed-foreign tree-iter))) + +(defun tree-model-sort-convert-child-iter-to-iter (tree-model-sort child-iter) + (let ((sort-iter (make-tree-iter))) + (when (gtk-tree-model-sort-convert-child-iter-to-iter tree-model-sort sort-iter child-iter) + sort-iter))) + +(export 'tree-model-sort-convert-child-iter-to-iter) + +(defcfun (tree-model-sort-convert-path-to-child-path "gtk_tree_model_sort_convert_path_to_child_path") (g-boxed-foreign tree-path :return) + (tree-model-sort (g-object tree-model-sort)) + (sort-path (g-boxed-foreign tree-path))) + +(export 'tree-model-sort-convert-path-to-child-path) + +(defcfun gtk-tree-model-sort-convert-iter-to-child-iter :void + (tree-model-sort (g-object tree-model-sort)) + (child-iter (g-boxed-foreign tree-iter)) + (sorted-iter (g-boxed-foreign tree-iter))) + +(defun tree-model-sort-convert-iter-to-child-iter (tree-model-sort sorted-iter) + (let ((child-iter (make-tree-iter))) + (gtk-tree-model-sort-convert-iter-to-child-iter tree-model-sort child-iter sorted-iter) + child-iter)) + +(export 'tree-model-sort-convert-iter-to-child-iter) + +(defcfun (tree-model-sort-reset-default-sort-func "gtk_tree_model_sort_reset_default_sort_func") :void + (tree-model-sort (g-object tree-model-sort))) + +(export 'tree-model-sort-reset-default-sort-func) + +(defcfun (tree-model-sort-clear-cache "gtk_tree_model_sort_clear_cache") :void + (tree-model-sort (g-object tree-model-sort))) + +(export 'tree-model-sort-clear-cached) + +(defcfun (tree-model-sort-iter-is-valid "gtk_tree_model_sort_iter_is_valid") :boolean + (tree-model-sort (g-object tree-model-sort)) + (iter (g-boxed-foreign tree-iter))) -; TODO: GtkTreeModelFilter +(export 'tree-model-sort-iter-is-valid) +; TODO: GtkTreeModelFilter (defclass array-list-store (tree-model) ((items :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-items) @@ -113,6 +216,10 @@ (tree-iter-user-data iter) n) t) +(defmethod tree-model-iter-children-impl ((model array-list-store) iter parent) + (declare (ignore iter parent)) + nil) + (defmethod tree-model-iter-n-children-impl ((model array-list-store) iter) (if (null iter) (length (store-items model)) @@ -139,12 +246,11 @@ (export 'tree-model-item) -(defmethod tree-model-get-value-impl ((model array-list-store) iter n value) +(defmethod tree-model-get-value-impl ((model array-list-store) iter n) (let ((n-row (tree-iter-user-data iter))) - (set-g-value value - (funcall (aref (store-getters model) n) - (aref (store-items model) n-row)) - (aref (store-types model) n)))) + (values (funcall (aref (store-getters model) n) + (aref (store-items model) n-row)) + (aref (store-types model) n)))) (defcfun (tree-model-flags "gtk_tree_model_get_flags") tree-model-flags (tree-model g-object)) @@ -269,11 +375,11 @@ (defcfun gtk-tree-model-iter-parent :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) - (parent (g-boxed-foreign tree-iter))) + (child (g-boxed-foreign tree-iter))) (defun tree-model-iter-parent (tree-model iter) (let ((parent (make-tree-iter))) - (if (gtk-tree-model-iter-parent tree-model iter parent) + (if (gtk-tree-model-iter-parent tree-model parent iter) parent nil))) @@ -456,11 +562,12 @@ (setf (tree-path-indices path) indices) path)) -(defmethod tree-model-get-value-impl ((store tree-lisp-store) iter n value) +(defmethod tree-model-get-value-impl ((store tree-lisp-store) iter n) (let* ((node (get-node-by-iter store iter)) (getter (aref (tree-lisp-store-getters store) n)) (type (aref (tree-lisp-store-types store) n))) - (set-g-value value (funcall getter (tree-node-item node)) type))) + (values (funcall getter (tree-node-item node)) + type))) (defmethod tree-model-iter-next-impl ((store tree-lisp-store) iter) (let* ((node (get-node-by-iter store iter))