X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.tree-model.lisp;h=d7a4bdc80e2f5fe13b2a3fd4a7111f9247e0e799;hb=280cc197440f3dec31bcbcd88b001b740be6e697;hp=e9f5c38686eab1b4b123da2bbec29d5b6868521c;hpb=6fe3afe05d8cb169fb62276820a8c04e3c85e3be;p=cl-gtk2.git diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp index e9f5c38..d7a4bdc 100644 --- a/gtk/gtk.tree-model.lisp +++ b/gtk/gtk.tree-model.lisp @@ -12,17 +12,17 @@ (tree-model-get-flags-impl tree-model-get-flags-cb tree-model-flags (tree-model g-object)) (tree-model-get-n-columns-impl tree-model-get-n-columns-cb :int (tree-model g-object)) (tree-model-get-column-type-impl tree-model-get-column-type-cb g-type-designator (tree-model g-object) (index :int)) - (tree-model-get-iter-impl tree-model-get-iter-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter)) (path (g-boxed-ref tree-path))) - (tree-model-get-path-impl tree-model-get-path-cb (g-boxed-ref tree-path) (tree-model g-object) (iter (g-boxed-ref tree-iter))) - (tree-model-get-value-impl tree-model-get-value-cb :void (tree-model g-object) (iter (g-boxed-ref tree-iter)) (n :int) (value (:pointer g-value))) - (tree-model-iter-next-impl tree-model-iter-next-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter))) - (tree-model-iter-children-impl tree-model-iter-children-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter)) (parent (g-boxed-ref tree-iter))) - (tree-model-iter-has-child-impl tree-model-iter-has-child-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter))) - (tree-model-iter-n-children-impl tree-model-iter-n-children-cb :int (tree-model g-object) (iter (g-boxed-ref tree-iter))) - (tree-model-iter-nth-child-impl tree-model-iter-nth-child-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter)) (parent (g-boxed-ref tree-iter)) (n :int)) - (tree-model-iter-parent-impl tree-model-iter-parent-cb :boolean (tree-model g-object) (iter (g-boxed-ref tree-iter)) (child (g-boxed-ref tree-iter))) - (tree-model-ref-node-impl tree-model-ref-node-cb :void (tree-model g-object) (iter (g-boxed-ref tree-iter))) - (tree-model-unref-node-impl tree-model-unref-node-cb :void (tree-model g-object) (iter (g-boxed-ref tree-iter)))) + (tree-model-get-iter-impl tree-model-get-iter-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (path (g-boxed-foreign tree-path))) + (tree-model-get-path-impl tree-model-get-path-cb (g-boxed-foreign tree-path :return) (tree-model g-object) (iter (g-boxed-foreign tree-iter))) + (tree-model-get-value-impl tree-model-get-value-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (n :int) (value (:pointer g-value))) + (tree-model-iter-next-impl tree-model-iter-next-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter))) + (tree-model-iter-children-impl tree-model-iter-children-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter))) + (tree-model-iter-has-child-impl tree-model-iter-has-child-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter))) + (tree-model-iter-n-children-impl tree-model-iter-n-children-cb :int (tree-model g-object) (iter (g-boxed-foreign tree-iter))) + (tree-model-iter-nth-child-impl tree-model-iter-nth-child-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter)) (n :int)) + (tree-model-iter-parent-impl tree-model-iter-parent-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (child (g-boxed-foreign tree-iter))) + (tree-model-ref-node-impl tree-model-ref-node-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter))) + (tree-model-unref-node-impl tree-model-unref-node-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)))) ; TODO: GtkTreeSortable @@ -34,7 +34,9 @@ (defclass array-list-store (g-object tree-model) ((items :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-items) (columns-getters :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-getters) - (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-types))) + (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-types)) + (:metaclass gobject-class) + (:g-type-name . "LispArrayListStore")) (export 'array-list-store) @@ -52,8 +54,8 @@ (defun store-add-item (store item) (vector-push-extend item (store-items store)) - (using* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (let* ((path (make-instance 'tree-path)) + (iter (make-tree-iter))) (setf (tree-path-indices path) (list (1- (length (store-items store))))) (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (1- (length (store-items store)))) (emit-signal store "row-inserted" path iter))) @@ -65,9 +67,9 @@ (let ((index (position item items :test test))) (unless index (error "No such item~%~A~%in list-store~%~A" item store)) (setf items (delete item items :test test)) - (using (path (make-instance 'tree-path)) - (setf (tree-path-indices path) (list index)) - (emit-signal store "row-deleted" path))))) + (let ((path (make-instance 'tree-path))) + (setf (tree-path-indices path) (list index)) + (emit-signal store "row-deleted" path))))) (export 'store-remove-item) @@ -88,28 +90,28 @@ (aref (store-types tree-model) index)) (defmethod tree-model-get-iter-impl ((model array-list-store) iter path) - (using* (iter path) - (let ((indices (tree-path-indices path))) - (when (and (= 1 (length indices)) - (< (first indices) (length (store-items model)))) - (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (first indices)) - t)))) + (let ((indices (tree-path-indices path))) + (when (and (= 1 (length indices)) + (< (first indices) (length (store-items model)))) + (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (first indices)) + t))) -(defmethod tree-model-ref-node-impl ((model array-list-store) iter) (release iter)) -(defmethod tree-model-unref-node-impl ((model array-list-store) iter) (release iter)) +(defmethod tree-model-ref-node-impl ((model array-list-store) iter) + (declare (ignorable model iter))) +(defmethod tree-model-unref-node-impl ((model array-list-store) iter) + (declare (ignorable model iter))) (defmethod tree-model-iter-next-impl ((model array-list-store) iter) - (using* (iter) - (let ((n (tree-iter-user-data iter))) - (when (< n (1- (length (store-items model)))) - (setf (tree-iter-user-data iter) (1+ n)) - t)))) + (let ((n (tree-iter-user-data iter))) + (when (< n (1- (length (store-items model)))) + (setf (tree-iter-user-data iter) (1+ n)) + t))) (defmethod tree-model-iter-nth-child-impl ((model array-list-store) iter parent n) - (using* (iter parent) - (setf (tree-iter-stamp iter) 0 - (tree-iter-user-data iter) n) - t)) + (declare (ignorable parent)) + (setf (tree-iter-stamp iter) 0 + (tree-iter-user-data iter) n) + t) (defmethod tree-model-iter-n-children-impl ((model array-list-store) iter) (if (null iter) @@ -117,14 +119,12 @@ 0)) (defmethod tree-model-get-path-impl ((model array-list-store) iter) - (using* (iter) - (let ((path (make-instance 'tree-path))) - (setf (tree-path-indices path) (list (tree-iter-user-data iter))) - (disown-boxed-ref path) - path))) + (let ((path (make-instance 'tree-path))) + (setf (tree-path-indices path) (list (tree-iter-user-data iter))) + path)) (defmethod tree-model-iter-has-child-impl ((model array-list-store) iter) - (release iter) + (declare (ignorable iter)) nil) (defgeneric tree-model-item (model iter-or-path)) @@ -140,17 +140,16 @@ (export 'tree-model-item) (defmethod tree-model-get-value-impl ((model array-list-store) iter n value) - (using (iter) - (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))))) + (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)))) (defcfun (tree-model-flags "gtk_tree_model_get_flags") tree-model-flags (tree-model g-object)) -(export 'tree-modelg-flags) +(export 'tree-model-flags) (defcfun (tree-model-n-columns "gtk_tree_model_get_n_columns") :int (tree-model g-object)) @@ -165,51 +164,51 @@ (defcfun (tree-model-set-iter-to-path "gtk_tree_model_get_iter") :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter)) - (path (g-boxed-ref tree-path))) + (iter (g-boxed-foreign tree-iter)) + (path (g-boxed-foreign tree-path))) (defun tree-model-iter-by-path (tree-model tree-path) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-to-path tree-model iter tree-path) iter - (progn (release iter) nil)))) + nil))) (export 'tree-model-iter-by-path) (defcfun (tree-model-set-iter-from-string "gtk_tree_model_get_iter_from_string") :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter)) + (iter (g-boxed-foreign tree-iter)) (path-string :string)) (defun tree-model-iter-from-string (tree-model path-string) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-from-string tree-model iter path-string) iter - (progn (release iter) nil)))) + nil))) (export 'tree-model-iter-from-string) (defcfun (tree-model-set-iter-to-first "gtk_tree_model_get_iter_first") :boolean (model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (defun tree-model-iter-first (tree-model) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-to-first tree-model iter) iter - (progn (release iter) nil)))) + nil))) (export 'tree-model-iter-first) -(defcfun (tree-model-path "gtk_tree_model_get_path") (g-boxed-ref tree-path :owner :lisp) +(defcfun (tree-model-path "gtk_tree_model_get_path") (g-boxed-foreign tree-path :return) (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-path) (defcfun gtk-tree-model-get-value :void (model g-object) - (iter (g-boxed-ref tree-iter)) + (iter (g-boxed-foreign tree-iter)) (column :int) (value (:pointer g-value))) @@ -224,81 +223,81 @@ (defcfun (tree-model-iter-next "gtk_tree_model_iter_next") :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-iter-next) (defcfun gtk-tree-model-iter-children :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter)) - (parent (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter)) + (parent (g-boxed-foreign tree-iter))) (defun tree-model-iter-first-child (tree-model parent) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (gtk-tree-model-iter-children tree-model iter parent) iter - (progn (release iter) nil)))) + nil))) (export 'tree-model-iter-first-child) (defcfun (tree-model-iter-has-child "gtk_tree_model_iter_has_child") :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-iter-has-child) (defcfun (tree-model-iter-n-children "gtk_tree_model_iter_n_children") :int (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-iter-n-children) (defcfun gtk-tree-model-iter-nth-child :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter)) - (parent (g-boxed-ref tree-iter)) + (iter (g-boxed-foreign tree-iter)) + (parent (g-boxed-foreign tree-iter)) (n :int)) (defun tree-model-iter-nth-child (tree-model parent n) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (gtk-tree-model-iter-nth-child tree-model iter parent n) iter - (progn (release iter) n)))) + n))) (export 'tree-model-iter-nth-child) (defcfun gtk-tree-model-iter-parent :boolean (tree-model g-object) - (iter (g-boxed-ref tree-iter)) - (parent (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter)) + (parent (g-boxed-foreign tree-iter))) (defun tree-model-iter-parent (tree-model iter) - (let ((parent (make-instance 'tree-iter))) + (let ((parent (make-tree-iter))) (if (gtk-tree-model-iter-parent tree-model iter parent) parent - (progn (release parent) nil)))) + nil))) (export 'tree-model-iter-parent) (defcfun (tree-model-iter-to-string "gtk_tree_model_get_string_from_iter") (g-string :free-from-foreign t) (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-iter-to-string) (defcfun (tree-model-ref-node "gtk_tree_model_ref_node") :void (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-ref-node) (defcfun (tree-model-unref-node "gtk_tree_model_unref_node") :void (tree-model g-object) - (iter (g-boxed-ref tree-iter))) + (iter (g-boxed-foreign tree-iter))) (export 'tree-model-unref-node) -(defcallback gtk-tree-model-foreach-cb :boolean ((model g-object) (path (g-boxed-ref tree-path)) (iter (g-boxed-ref tree-iter)) (data :pointer)) +(defcallback gtk-tree-model-foreach-cb :boolean ((model g-object) (path (g-boxed-foreign tree-path)) (iter (g-boxed-foreign tree-iter)) (data :pointer)) (let ((fn (get-stable-pointer-value data))) (restart-case (funcall fn model path iter) @@ -333,25 +332,27 @@ (adjust-array array (1- (length array)) :fill-pointer t) array) +(defstruct tree-node + (tree nil) + (parent nil) + (id nil) + (item nil) + (children (make-array 0 :element-type 'tree-node :adjustable t :fill-pointer t))) + (defclass tree-lisp-store (g-object tree-model) ((columns-getters :initform (make-array 0 :adjustable t :fill-pointer t) :reader tree-lisp-store-getters) (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader tree-lisp-store-types) (root :initform (make-tree-node) :reader tree-lisp-store-root) (id-map :initform (make-hash-table) :reader tree-lisp-store-id-map) - (next-id-value :initform 0 :accessor tree-lisp-store-next-id-value))) + (next-id-value :initform 0 :accessor tree-lisp-store-next-id-value)) + (:metaclass gobject-class) + (:g-type-name . "LispTreeStore")) (defmethod initialize-instance :after ((object tree-lisp-store) &key &allow-other-keys) (setf (tree-node-tree (tree-lisp-store-root object)) object)) (register-object-type-implementation "LispTreeStore" tree-lisp-store "GObject" ("GtkTreeModel") nil) -(defstruct tree-node - (tree nil) - (parent nil) - (id nil) - (item nil) - (children (make-array 0 :element-type 'tree-node :adjustable t :fill-pointer t))) - (defun map-subtree (node fn) (funcall fn node) (iter (for child in-vector (tree-node-children node)) @@ -440,95 +441,85 @@ (gethash id (tree-lisp-store-id-map tree))) (defmethod tree-model-get-iter-impl ((store tree-lisp-store) iter path) - (using* (iter path) - (let* ((node (get-node-by-path store path)) - (node-idx (get-assigned-id store node))) - (setf (tree-iter-stamp iter) 0 - (tree-iter-user-data iter) node-idx)))) + (let* ((node (get-node-by-path store path)) + (node-idx (get-assigned-id store node))) + (setf (tree-iter-stamp iter) 0 + (tree-iter-user-data iter) node-idx))) (defun get-node-by-iter (tree iter) (get-node-by-id tree (tree-iter-user-data iter))) -(defmethod tree-model-get-path-impl ((store array-list-store) iter) - (using* (iter) - (let* ((path (make-instance 'tree-path)) - (node (get-node-by-iter store iter)) - (indices (get-node-path node))) - (setf (tree-path-indices path) indices) - (disown-boxed-ref path) - path))) +(defmethod tree-model-get-path-impl ((store tree-lisp-store) iter) + (let* ((path (make-instance 'tree-path)) + (node (get-node-by-iter store iter)) + (indices (get-node-path node))) + (setf (tree-path-indices path) indices) + path)) (defmethod tree-model-get-value-impl ((store tree-lisp-store) iter n value) - (using* (iter) - (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)))) + (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))) (defmethod tree-model-iter-next-impl ((store tree-lisp-store) iter) - (using* (iter) - (let* ((node (get-node-by-iter store iter)) - (parent (tree-node-parent node)) - (index (position node (tree-node-children parent)))) - (when (< (1+ index) (length (tree-node-children parent))) - (setf (tree-iter-stamp iter) - 0 - (tree-iter-user-data iter) - (get-assigned-id store (tree-node-child-at parent (1+ index)))) - t)))) + (let* ((node (get-node-by-iter store iter)) + (parent (tree-node-parent node)) + (index (position node (tree-node-children parent)))) + (when (< (1+ index) (length (tree-node-children parent))) + (setf (tree-iter-stamp iter) + 0 + (tree-iter-user-data iter) + (get-assigned-id store (tree-node-child-at parent (1+ index)))) + t))) (defmethod tree-model-iter-children-impl ((store tree-lisp-store) iter parent) - (using* (iter parent) - (let* ((node (if parent - (get-node-by-iter store parent) - (tree-lisp-store-root store)))) - (when (plusp (length (tree-node-children node))) - (setf (tree-iter-stamp iter) - 0 - (tree-iter-user-data iter) - (get-assigned-id store (tree-node-child-at node 0))) - t)))) + (let* ((node (if parent + (get-node-by-iter store parent) + (tree-lisp-store-root store)))) + (when (plusp (length (tree-node-children node))) + (setf (tree-iter-stamp iter) + 0 + (tree-iter-user-data iter) + (get-assigned-id store (tree-node-child-at node 0))) + t))) (defmethod tree-model-iter-has-child-impl ((store tree-lisp-store) iter) - (using* (iter) - (let ((node (get-node-by-iter store iter))) - (plusp (length (tree-node-children node)))))) + (let ((node (get-node-by-iter store iter))) + (plusp (length (tree-node-children node))))) (defmethod tree-model-iter-n-children-impl ((store tree-lisp-store) iter) - (using* (iter) - (let* ((node (if iter - (get-node-by-iter store iter) - (tree-lisp-store-root store)))) - (length (tree-node-children node))))) + (let* ((node (if iter + (get-node-by-iter store iter) + (tree-lisp-store-root store)))) + (length (tree-node-children node)))) (defmethod tree-model-iter-nth-child-impl ((store tree-lisp-store) iter parent n) - (using* (iter parent) - (let* ((node (if parent - (get-node-by-iter store parent) - (tree-lisp-store-root store))) - (requested-node (tree-node-child-at node n))) - (setf (tree-iter-stamp iter) 0 - (tree-iter-user-data iter) (get-assigned-id store requested-node)) - t))) + (let* ((node (if parent + (get-node-by-iter store parent) + (tree-lisp-store-root store))) + (requested-node (tree-node-child-at node n))) + (setf (tree-iter-stamp iter) 0 + (tree-iter-user-data iter) (get-assigned-id store requested-node)) + t)) (defmethod tree-model-iter-parent-impl ((store tree-lisp-store) iter child) - (using* (iter child) - (let ((node (get-node-by-iter store child))) - (when (tree-node-parent node) - (setf (tree-iter-stamp iter) 0 - (tree-iter-user-data iter) (get-assigned-id store (tree-node-parent node))))))) + (let ((node (get-node-by-iter store child))) + (when (tree-node-parent node) + (setf (tree-iter-stamp iter) 0 + (tree-iter-user-data iter) (get-assigned-id store (tree-node-parent node)))))) (defmethod tree-model-ref-node-impl ((store tree-lisp-store) iter) - ) + (declare (ignorable iter))) (defmethod tree-model-unref-node-impl ((store tree-lisp-store) iter) - ) + (declare (ignorable iter))) (defun notice-tree-node-insertion (tree node child index) (declare (ignore node index)) (when tree - (using* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (let* ((path (make-instance 'tree-path)) + (iter (make-tree-iter))) (setf (tree-path-indices path) (get-node-path child) (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (get-assigned-id tree child)) @@ -539,12 +530,12 @@ (defun notice-tree-node-removal (tree node child index) (declare (ignore child)) (when tree - (using (path (make-instance 'tree-path)) + (let ((path (make-instance 'tree-path))) (setf (tree-path-indices path) (nconc (get-node-path node) (list index))) (emit-signal tree "row-deleted" path)) (when (zerop (length (tree-node-children node))) - (using* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (let* ((path (make-instance 'tree-path)) + (iter (make-tree-iter))) (setf (tree-path-indices path) (get-node-path node) (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (get-assigned-id tree node))