-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2005 Espen S. Johnsen <espen@users.sf.net>
+;; 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.9 2005/03/13 18:12:24 espen Exp $
+;; $Id: gtktree.lisp,v 1.18 2006/03/03 19:00:12 espen Exp $
(in-package "GTK")
((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)
(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))
(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)))))
-(defmethod destroy-function ((type (eql 'tree-path)) &rest args)
- (declare (ignore type args))
+(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)))))
(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))
(column int)
(gvalue gvalue))
-(defun tree-model-value (model row column)
+(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)
(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)
- ((progn %tree-model-foreach-func) callback)
+ (%tree-model-foreach-callback callback)
(callback-id unsigned-int))
(defun tree-model-foreach (model function)
(defun column-types (model columns)
+ (declare (ignore model))
(map 'vector
#'(lambda (column)
(find-type-number (first (mklist column))))
(funcall setter value iter))
row setters)))))))
-(defun (setf tree-model-value) (value model row column)
+(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 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
(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)
- ((progn %tree-selection-foreach-func) callback)
+ (%tree-selection-foreach-callback callback)
(callback-id unsigned-int))
(defun tree-selection-selected-foreach (selection function)
(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))
(defbinding %tree-sortable-set-sort-func (sortable column function) nil
(sortable tree-sortable)
((column-index sortable column) int)
- (%tree-iter-compare-func callback)
+ (%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
(%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
(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))
(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)
(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)
((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)))