;; 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: gtk.lisp,v 1.12 2002-04-02 15:03:47 espen Exp $
+;; $Id: gtk.lisp,v 1.27 2004-12-26 11:51:21 espen Exp $
(in-package "GTK")
;;; Gtk version
-(defbinding check-version () string
+(defbinding check-version () (copy-of string)
(required-major unsigned-int)
(required-minor unsigned-int)
(required-micro unsigned-int))
(format nil "Gtk+ v~A.~A" major minor)
(format nil "Gtk+ v~A.~A.~A" major minor micro))))
-(defbinding get-default-language () string)
+(defbinding get-default-language () (copy-of pango:language))
+
+
+;;;; Initalization
+
+(defbinding (gtk-init "gtk_parse_args") () nil
+ "Initializes the library without opening the display."
+ (nil null)
+ (nil null))
+
+(defun clg-init (&optional display)
+ "Initializes the system and starts the event handling"
+ (unless (gdk:display-get-default)
+ (gdk:gdk-init)
+ (gtk-init)
+ (prog1
+ (gdk:display-open display)
+ (system:add-fd-handler
+ (gdk:display-connection-number) :input #'main-iterate-all)
+ (setq lisp::*periodic-polling-function* #'main-iterate-all)
+ (setq lisp::*max-event-to-sec* 0)
+ (setq lisp::*max-event-to-usec* 1000))))
;;; Acccel group
+
;;; Acccel label
(defbinding accel-label-refetch () boolean
;;; Adjustment
+(defmethod shared-initialize ((adjustment adjustment) names &key value)
+ (prog1
+ (call-next-method)
+ ;; we need to make sure that the value is set last, otherwise it
+ ;; may be outside current limits
+ (when value
+ (setf (slot-value adjustment 'value) value))))
+
+
(defbinding adjustment-changed () nil
(adjustment adjustment))
(fill boolean)
(padding unsigned-int))
-(defun box-pack (box child &key from-end (expand t) (fill t) (padding 0))
- (if from-end
+(defun box-pack (box child &key end expand fill (padding 0))
+ (if end
(box-pack-end box child expand fill padding)
(box-pack-start box child expand fill padding)))
-;;; Combo
+;;;; Combo Box
-(defmethod shared-initialize ((combo combo) names &rest initargs
- &key popdown-strings)
- (call-next-method)
- (when popdown-strings
- (combo-set-popdown-strings combo popdown-strings)))
-
-(defbinding combo-set-popdown-strings () nil
- (combo combo)
- (strings (glist string)))
+(defmethod shared-initialize ((combo-box combo-box) names &key model content)
+ (unless model
+ (setf
+ (combo-box-model combo-box)
+ (make-instance 'list-store :column-types '(string)))
+ (unless (typep combo-box 'combo-box-entry)
+ (let ((cell (make-instance 'cell-renderer-text)))
+ (cell-layout-pack combo-box cell :expand t)
+ (cell-layout-add-attribute combo-box cell :text 0)))
+ (when content
+ (map 'nil #'(lambda (text)
+ (combo-box-append-text combo-box text))
+ content)))
+ (call-next-method))
-(defbinding combo-disable-activate () nil
- (combo combo))
+;; (defmethod shared-initialize :after ((combo-box combo-box) names &key active)
+;; (when active
+;; (signal-emit combo-box 'changed)))
+(defbinding combo-box-append-text () nil
+ (combo-box combo-box)
+ (text string))
+(defbinding combo-box-insert-text () nil
+ (combo-box combo-box)
+ (position int)
+ (text string))
+
+(defbinding combo-box-prepend-text () nil
+ (combo-box combo-box)
+ (text string))
+
+#+gtk2.6
+(defbinding combo-box-get-active-text () string
+ (combo-box combo-box))
+
+(defbinding combo-box-popup () nil
+ (combo-box combo-box))
+
+(defbinding combo-box-popdown () nil
+ (combo-box combo-box))
-;;;; Dialog
-(defmethod shared-initialize ((dialog dialog) names &rest initargs)
+
+;;;; Combo Box Entry
+
+(defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model)
(call-next-method)
- (dolist (button-definition (get-all initargs :button))
- (apply #'dialog-add-button dialog button-definition)))
-
+ (unless model
+ (setf (combo-box-entry-text-column combo-box-entry) 0)))
-(defvar %*response-id-key* (gensym))
-(defun %dialog-find-response-id-num (dialog response-id &optional create-p error-p)
+;;;; Dialog
+
+(defmethod shared-initialize ((dialog dialog) names &rest initargs
+ &key button buttons)
+ (declare (ignore button buttons))
+ (prog1
+ (call-next-method)
+ (initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
+
+
+(defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
(or
- (cadr (assoc response-id (rest (type-expand-1 'response-type))))
- (let* ((response-ids (object-data dialog %*response-id-key*))
- (response-id-num (position response-id response-ids)))
+ (cadr (assoc id (rest (type-expand-1 'response-type))))
+ (let ((response-ids (object-data dialog 'response-id-key)))
(cond
- (response-id-num)
- (create-p
- (cond
- (response-ids
- (setf (cdr (last response-ids)) (list response-id))
- (1- (length response-ids)))
- (t
- (setf (object-data dialog %*response-id-key*) (list response-id))
- 0)))
- (error-p
- (error "Invalid response: ~A" response-id))))))
+ ((and response-ids (position id response-ids :test #'equal)))
+ (create-p
+ (cond
+ (response-ids
+ (vector-push-extend id response-ids)
+ (1- (length response-ids)))
+ (t
+ (setf
+ (object-data dialog 'response-id-key)
+ (make-array 1 :adjustable t :fill-pointer t :initial-element id))
+ 0)))
+ (error-p
+ (error "Invalid response: ~A" id))))))
(defun %dialog-find-response-id (dialog response-id-num)
(if (< response-id-num 0)
(car
(rassoc
(list response-id-num)
- (rest (type-expand-1 'response-type)) :test #'equalp))
- (nth response-id-num (object-data dialog %*response-id-key*))))
+ (rest (type-expand-1 'response-type)) :test #'equal))
+ (aref (object-data dialog 'response-id-key) response-id-num )))
(defmethod signal-connect ((dialog dialog) signal function &key object after)
(object (funcall function object))
(t (funcall function)))))
:object t :after after))
- (t
- (call-next-method)))))
+ ((call-next-method)))))
(defbinding dialog-run () nil
(text string)
(response-id-num int))
-(defun dialog-add-button (dialog label &optional response-id default-p)
- (let* ((response-id-num
- (if response-id
- (%dialog-find-response-id-num dialog response-id t)
- (length (object-data dialog %*response-id-key*))))
- (button (%dialog-add-button dialog label response-id-num)))
- (unless response-id
- (%dialog-find-response-id-num dialog button t))
- (when default-p
- (%dialog-set-default-response dialog response-id-num))
+(defun dialog-add-button (dialog label &optional (response label)
+ &key default object after)
+ "Adds a button to the dialog."
+ (let* ((id (if (functionp response)
+ label
+ response))
+ (id-num (%dialog-find-response-id-num dialog id t))
+ (button (%dialog-add-button dialog label id-num)))
+ (when (functionp response)
+ (signal-connect dialog id response :object object :after after))
+ (when default
+ (%dialog-set-default-response dialog id-num))
button))
(action-widget widget)
(response-id-num int))
-(defun dialog-add-action-widget (dialog widget &optional (response-id widget)
- default-p)
- (let ((response-id-num (%dialog-find-response-id-num dialog response-id t)))
- (%dialog-add-action-widget dialog widget response-id-num)
- (when default-p
- (%dialog-set-default-response dialog response-id-num))
+(defun dialog-add-action-widget (dialog widget &optional (response widget)
+ &key default object after)
+ (let* ((id (if (functionp response)
+ widget
+ response))
+ (id-num (%dialog-find-response-id-num dialog id t)))
+ (%dialog-add-action-widget dialog widget id-num)
+ (when (functionp response)
+ (signal-connect dialog id response :object object :after after))
+ (when default
+ (%dialog-set-default-response dialog id-num))
widget))
((%dialog-find-response-id-num dialog response-id nil t) int)
(sensitive boolean))
+#+gtk2.6
+(defbinding alternative-dialog-button-order-p(&optional screen)
+ (screen (or null screen)))
+
+#+gtk2.6
+(defbinding (dialog-set-alternative-button-order
+ "gtk_dialog_set_alternative_button_order_from_array")
+ (dialog new-order)
+ (dialog dialog)
+ ((length new-order) int)
+ ((map 'vector #'(lambda (id)
+ (%dialog-find-response-id-num dialog id nil t))
+ new-order) (vector int)))
-;; Addition dialog functions
(defmethod container-add ((dialog dialog) (child widget) &rest args)
- (apply #'container-add (slot-value dialog 'main-area) child args))
+ (apply #'container-add (dialog-vbox dialog) child args))
(defmethod container-remove ((dialog dialog) (child widget))
- (container-remove (slot-value dialog 'main-area) child))
+ (container-remove (dialog-vbox dialog) child))
(defmethod container-children ((dialog dialog))
- (container-children (dialog-main-area dialog)))
+ (container-children (dialog-vbox dialog)))
(defmethod (setf container-children) (children (dialog dialog))
- (setf (container-children (dialog-main-area dialog)) children))
+ (setf (container-children (dialog-vbox dialog)) children))
-;;; Drawing area -- no functions
+;;; Drawing area
+
+(defbinding drawing-area-get-size () nil
+ (drawing-area drawing-area)
+ (width int :out)
+ (height int :out))
;;; Entry
(y int :out))
+;;; Entry Completion
+
+(def-callback-marshal %entry-completion-match-func
+ (boolean entry-completion string (copy-of tree-iter)))
+
+(defbinding entry-completion-set-match-func (completion function) nil
+ (completion entry-completion)
+ ((callback %entry-completion-match-func) pointer)
+ ((register-callback-function function) unsigned-int)
+ ((callback %destroy-user-data) pointer))
+
+(defbinding entry-completion-complete () nil
+ (completion entry-completion))
+
+#+gtk2.6
+(defbinding entry-completion-insert-prefix () nil
+ (completion entry-completion))
+
+(defbinding entry-completion-insert-action-text () nil
+ (completion entry-completion)
+ (index int)
+ (text string))
+
+(defbinding entry-completion-insert-action-markup () nil
+ (completion entry-completion)
+ (index int)
+ (markup string))
+
+(defbinding entry-completion-delete-action () nil
+ (completion entry-completion)
+ (index int))
+
+
+;;; Image
+
+(defbinding image-set-from-file () nil
+ (image image)
+ (filename pathname))
+
+(defbinding image-set-from-pixmap () nil
+ (image image)
+ (pixmap gdk:pixmap)
+ (mask gdk:bitmap))
+
+(defbinding image-set-from-stock () nil
+ (image image)
+ (stock-id string)
+ (icon-size icon-size))
+
+(defun image-set-from-pixmap-data (image pixmap-data)
+ (multiple-value-bind (pixmap mask) (gdk:pixmap-create pixmap-data)
+ (image-set-from-pixmap image pixmap mask)))
+
+(defun image-set-from-source (image source)
+ (etypecase source
+ (pathname (image-set-from-file image source))
+ (string (if (stock-lookup source)
+ (setf (image-stock image) source)
+ (image-set-from-file image source)))
+ (vector (image-set-from-pixmap-data image source))))
+
+
+(defmethod shared-initialize ((image image) names &rest initargs
+ &key file pixmap source)
+ (prog1
+ (if (vectorp pixmap)
+ (progn
+ (remf initargs :pixmap)
+ (apply #'call-next-method image names initargs))
+ (call-next-method))
+ (cond
+ (file (image-set-from-file image file))
+ ((vectorp pixmap) (image-set-from-pixmap-data image pixmap))
+ (source (image-set-from-source image source)))))
+
;;; Label
(defbinding label-get-layout-offsets () nil
- (labe label)
+ (label label)
(x int :out)
(y int :out))
(start int)
(end int))
-(defbinding label-get-text () string
+(defbinding label-get-text () string
(label label))
(defbinding label-get-layout () pango:layout
(label label))
-(defbinding label-get-selection-bounds () boolean
+(defbinding label-get-selection-bounds () boolean
(label label)
(start int :out)
(end int :out))
(radio-button-add-to-group button group-with)))
-;;; Option menu
-
-(defbinding %option-menu-set-menu () nil
- (option-menu option-menu)
- (menu widget))
-
-(defbinding %option-menu-remove-menu () nil
- (option-menu option-menu))
-
-(defun (setf option-menu-menu) (menu option-menu)
- (if (not menu)
- (%option-menu-remove-menu option-menu)
- (%option-menu-set-menu option-menu menu))
- menu)
-
-
-
;;; Item
(defbinding item-select () nil
(allocation int))
+;;; Message dialog
+
+(defmethod initialize-instance ((dialog message-dialog) &rest initargs
+ &key (type :info) (buttons :close) ; or :ok?
+ flags message parent)
+ (remf initargs :parent)
+ (setf
+ (slot-value dialog 'location)
+ (%message-dialog-new parent flags type buttons nil))
+ (message-dialog-set-markup dialog message)
+ (apply #'call-next-method dialog initargs))
+
+
+(defbinding %message-dialog-new () pointer
+ (parent (or null window))
+ (flags dialog-flags)
+ (type message-type)
+ (buttons buttons-type)
+ (message (or null string)))
+
+(defbinding %message-dialog-new-with-markup () pointer
+ (parent (or null window))
+ (flags dialog-flags)
+ (type message-type)
+ (buttons buttons-type)
+ (message string))
+
+(defbinding message-dialog-set-markup () nil
+ (message-dialog message-dialog)
+ (markup string))
+
+#+gtk2.6
+(defbinding message-dialog-format-secondary-text () nil
+ (message-dialog message-dialog)
+ (text string))
+
+#+gtk2.6
+(defbinding message-dialog-format-secondary-markup () nil
+ (message-dialog message-dialog)
+ (markup string))
+
+
;;; Radio menu item
;;; Window
+(defmethod initialize-instance ((window window) &rest initargs
+ &key accel-group accel-groups)
+ (declare (ignore accel-group accel-groups))
+ (prog1
+ (call-next-method)
+ (initial-add window #'window-add-accel-group
+ initargs :accel-group :accel-groups)))
+
+
(defbinding window-set-wmclass () nil
(window window)
(wmclass-name string)
((or width -1) int)
((or height -1) int))
-;(defbinding window-set-geometry-hints)
-
-(defbinding window-list-toplevels () (glist window))
+(defbinding %window-set-geometry-hints () nil
+ (window window)
+ (geometry gdk:geometry)
+ (geometry-mask gdk:window-hints))
+
+(defun window-set-geometry-hints (window &key min-width min-height
+ max-width max-height base-width base-height
+ width-inc height-inc min-aspect max-aspect
+ (gravity nil gravity-p) min-size max-size)
+ (let ((geometry (make-instance 'gdk:geometry
+ :min-width (or min-width -1)
+ :min-height (or min-height -1)
+ :max-width (or max-width -1)
+ :max-height (or max-height -1)
+ :base-width (or base-width 0)
+ :base-height (or base-height 0)
+ :width-inc (or width-inc 0)
+ :height-inc (or height-inc 0)
+ :min-aspect (or min-aspect 0)
+ :max-aspect (or max-aspect 0)
+ :gravity gravity))
+ (mask ()))
+ (when (or min-size min-width min-height)
+ (push :min-size mask))
+ (when (or max-size max-width max-height)
+ (push :max-size mask))
+ (when (or base-width base-height)
+ (push :base-size mask))
+ (when (or width-inc height-inc)
+ (push :resize-inc mask))
+ (when (or min-aspect max-aspect)
+ (push :aspect mask))
+ (when gravity-p
+ (push :win-gravity mask))
+ (%window-set-geometry-hints window geometry mask)))
+
+(defbinding window-list-toplevels () (glist (copy-of window))
+ "Returns a list of all existing toplevel windows.")
(defbinding window-add-mnemonic (window key target) nil
(window window)
((gdk:keyval-from-name key) unsigned-int)
(modifier gdk:modifier-type))
+(defbinding window-activate-key () boolean
+ (window window)
+ (event gdk:key-event))
+
+(defbinding window-propagate-key-event () boolean
+ (window window)
+ (event gdk:key-event))
+
(defbinding window-present () nil
(window window))
(defbinding window-unmaximize () nil
(window window))
+(defbinding window-fullscreen () nil
+ (window window))
+
+(defbinding window-unfullscreen () nil
+ (window window))
+
+(defbinding window-set-keep-above () nil
+ (window window)
+ (setting boolean))
+
+(defbinding window-set-keep-below () nil
+ (window window)
+ (setting boolean))
+
(defbinding window-begin-resize-drag () nil
(window window)
(edge gdk:window-edge)
(button int)
(root-x int) (root-y int)
- (timestamp (unsigned-int 32)))
+ (timestamp unsigned-int))
(defbinding window-begin-move-drag () nil
(window window)
(edge gdk:window-edge)
(button int)
(root-x int) (root-y int)
- (timestamp (unsigned-int 32)))
+ (timestamp unsigned-int))
(defbinding window-set-frame-dimensions () nil
(window window)
(left int) (top int) (rigth int) (bottom int))
-(defbinding (window-default-icons "gtk_window_get_default_icon_list")
- () (glist gdk:pixbuf))
-
(defbinding %window-get-default-size () nil
(window window)
(width int :out)
(defbinding %window-get-icon-list () (glist gdk:pixbuf)
(window window))
-(defmethod window-icon ((window window))
- (let ((icon-list (%window-get-icon-list window)))
- (if (endp (rest icon-list))
- (first icon-list)
- icon-list)))
-
(defbinding window-get-position () nil
(window window)
(root-x int :out)
(width int)
(heigth int))
-(defbinding %window-set-icon-list () nil
+(defbinding (window-default-icon-list "gtk_window_get_default_icon_list")
+ () (glist gdk:pixbuf))
+
+(defun window-default-icon ()
+ (first (window-default-icon-list)))
+
+(defbinding %window-set-default-icon-list () nil
+ (icons (glist gdk:pixbuf)))
+
+(defun (setf window-default-icon-list) (icons)
+ (%window-set-default-icon-list icons)
+ icons)
+
+(defbinding %window-set-default-icon () nil
+ (icons (glist gdk:pixbuf)))
+
+(defmethod (setf window-default-icon) ((icon gdk:pixbuf))
+ (%window-set-default-icon icon)
+ icon)
+
+(defmethod (setf window-group) ((group window-group) (window window))
+ (window-group-add-window group window)
+ group)
+
+(defbinding %window-set-default-icon-from-file () boolean
+ (filename pathname)
+ (nil null))
+
+(defmethod (setf window-default-icon) ((icon-file pathname))
+ (%window-set-default-icon-from-file icon-file)
+ icon-file)
+
+(defbinding %window-set-icon-from-file () boolean
+ (window window)
+ (filename pathname)
+ (nil null))
+
+(defmethod (setf window-icon) ((icon-file pathname) (window window))
+ (%window-set-icon-from-file window icon-file)
+ icon-file)
+
+(defbinding window-set-auto-startup-notification () nil
+ (setting boolean))
+
+(defbinding decorated-window-init () nil
+ (window window))
+
+(defbinding decorated-window-calculate-frame-size () nil
+ (window window))
+
+(defbinding decorated-window-set-title () nil
(window window)
- (icon-list (glist gdk:pixbuf)))
+ (title string))
-(defmethod (setf window-icon) (icon (window window))
- (%window-set-icon-list window (mklist icon)))
+(defbinding decorated-window-move-resize-window () nil
+ (window window)
+ (x int)
+ (y int)
+ (width int)
+ (heigth int))
+;;; Window group
+(defmethod initialize-instance ((window-group window-group) &rest initargs
+ &key window windows)
+ (declare (ignore window windows))
+ (prog1
+ (call-next-method)
+ (initial-add window-group #'window-group-add-window
+ initargs :window :windows)))
-;;; File selection
-(defbinding file-selection-complete () nil
- (file-selection file-selection)
- (pattern string))
+(defbinding window-group-add-window () nil
+ (window-group window-group)
+ (window window))
+(defbinding window-group-remove-window () nil
+ (window-group window-group)
+ (window window))
;;; Scrolled window
(keyword (case page
(:first 0)
(:last -1)
- (error "Invalid position keyword: ~A" page)))
+ (t (error "Invalid position keyword: ~A" page))))
(widget (notebook-page-num notebook page t))))
(defun %notebook-child (notebook position)
(defbinding notebook-remove-page (notebook page) nil
(notebook notebook)
- ((%notebook-position notebook position) int))
+ ((%notebook-position notebook page) int))
(defbinding %notebook-page-num () int
(notebook notebook)
(:last -1)
(t page)) int))
-(defbinding (notebook-current-page-num "gtk_notebook_get_current_page") () int
+
+(defbinding %notebook-get-current-page () int
(notebook notebook))
+(defun notebook-current-page-num (notebook)
+ (let ((num (%notebook-get-current-page notebook)))
+ (when (>= num 0)
+ num)))
+
(defun notebook-current-page (notebook)
- (notebook-nth-page-child notebook (notebook-current-page-num notebook)))
+ (let ((page-num (notebook-current-page-num notebook)))
+ (when page-num
+ (notebook-nth-page-child notebook page-num))))
(defbinding %notebook-set-current-page () nil
(notebook notebook)
page)
-;; (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
-;; (notebook page) widget
-;; (notebook notebook)
-;; ((%notebook-child notebook page) widget))
-
-;; (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
-;; (notebook page) string
-;; (notebook notebook)
-;; ((%notebook-child notebook page) widget))
-
-;; (defbinding %notebook-set-tab-label () nil
-;; (notebook notebook)
-;; (page widget)
-;; (tab-label widget))
+(defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
+ (notebook page) widget
+ (notebook notebook)
+ ((%notebook-child notebook page) widget))
-;; (defun (setf notebook-tab-label) (tab-label notebook page)
-;; (let ((widget (if (stringp tab-label)
-;; (make-instance 'label :label tab-label)
-;; tab-label)))
-;; (%notebook-set-tab-label notebook (%notebook-child notebook page) widget)
-;; widget))
+(defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
+ (notebook page) (copy-of string)
+ (notebook notebook)
+ ((%notebook-child notebook page) widget))
+(defbinding %notebook-set-tab-label () nil
+ (notebook notebook)
+ (page widget)
+ (tab-label widget))
+
+(defun (setf notebook-tab-label) (tab-label notebook page)
+ (let ((widget (if (stringp tab-label)
+ (make-instance 'label :label tab-label)
+ tab-label)))
+ (%notebook-set-tab-label notebook (%notebook-child notebook page) widget)
+ widget))
-;; (defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
-;; (notebook page) widget
-;; (notebook notebook)
-;; ((%notebook-child notebook page) widget))
-;; (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
-;; (notebook page) string
-;; (notebook notebook)
-;; ((%notebook-child notebook page) widget))
+(defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
+ (notebook page) widget
+ (notebook notebook)
+ ((%notebook-child notebook page) widget))
-;; (defbinding %notebook-set-menu-label () nil
-;; (notebook notebook)
-;; (page widget)
-;; (menu-label widget))
+(defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
+ (notebook page) (copy-of string)
+ (notebook notebook)
+ ((%notebook-child notebook page) widget))
-;; (defun (setf notebook-menu-label) (menu-label notebook page)
-;; (let ((widget (if (stringp menu-label)
-;; (make-instance 'label :label menu-label)
-;; menu-label)))
-;; (%notebook-set-menu-label notebook (%notebook-child notebook page) widget)
-;; widget))
+(defbinding %notebook-set-menu-label () nil
+ (notebook notebook)
+ (page widget)
+ (menu-label widget))
+
+(defun (setf notebook-menu-label) (menu-label notebook page)
+ (let ((widget (if (stringp menu-label)
+ (make-instance 'label :label menu-label)
+ menu-label)))
+ (%notebook-set-menu-label notebook (%notebook-child notebook page) widget)
+ widget))
(defbinding notebook-query-tab-label-packing (notebook page) nil
(resize boolean)
(shrink boolean))
-(defun (setf paned-child1) (child paned)
- (paned-pack1 paned child nil t)
- child)
-
-(defun (setf paned-child2) (child paned)
- (paned-pack2 paned child t t)
- child)
-
-;; Defined in gtkglue.c
-(defbinding paned-child1 () widget
- (paned paned)
- (resize boolean :out)
- (shrink boolean :out))
-
-;; Defined in gtkglue.c
-(defbinding paned-child2 () widget
- (paned paned)
- (resize boolean :out)
- (shrink boolean :out))
-
-
;;; Layout
(keyword (case child
(:first 0)
(:last -1)
- (error "Invalid position keyword: ~A" child)))
+ (t (error "Invalid position keyword: ~A" child))))
(widget (menu-child-position menu child))))
(menu-item menu-item)
((%menu-position menu position) int))
-(defvar *menu-position-callback-marshal*
- (system:foreign-symbol-address "gtk_menu_position_callback_marshal"))
+(def-callback-marshal %menu-popup-callback (nil (x int) (y int) (push-in boolean)))
(defbinding %menu-popup () nil
(menu menu)
(defun menu-popup (menu button activate-time &key callback parent-menu-shell
parent-menu-item)
(if callback
- (let ((callback-id (register-callback-function callback)))
- (unwind-protect
- (%menu-popup
- menu parent-menu-shell parent-menu-item
- *menu-position-callback-marshal* callback-id button activate-time)
- (destroy-user-data callback-id)))
+ (with-callback-function (id callback)
+ (%menu-popup
+ menu parent-menu-shell parent-menu-item
+ (callback %menu-popup-callback) id button activate-time))
(%menu-popup
menu parent-menu-shell parent-menu-item nil 0 button activate-time)))
(columns unsigned-int))
(defbinding table-attach (table child left right top bottom
- &key (x-options '(:expand :fill))
- (y-options '(:expand :fill))
- (x-padding 0) (y-padding 0)) nil
+ &key options x-options y-options
+ (x-padding 0) (y-padding 0)) nil
(table table)
(child widget)
(left unsigned-int)
(right unsigned-int)
(top unsigned-int)
(bottom unsigned-int)
- (x-options attach-options)
- (y-options attach-options)
+ ((append (mklist options) (mklist x-options)) attach-options)
+ ((append (mklist options) (mklist y-options)) attach-options)
(x-padding unsigned-int)
(y-padding unsigned-int))
&key tooltip-text tooltip-private-text
type icon group callback object)
(let* ((numpos (case position
- (:first 0)
- (:last -1)
+ (:first -1)
+ (:last 0)
(t position)))
(widget
(cond
((typep element 'string)
(%toolbar-insert-element
toolbar (or type :button) (when (eq type :radio-button) group)
- element tooltip-text tooltip-private-text icon numpos))
+ element tooltip-text tooltip-private-text
+ (etypecase icon
+ (null nil)
+ (widget icon)
+ ((or pathname string vector)
+ (make-instance 'image
+ :source icon ; :icon-size (toolbar-icon-size toolbar)
+ )))
+ numpos))
((error "Invalid element type: ~A" element)))))
(when callback
(signal-connect widget 'clicked callback :object object))
;;; Editable
-#|
+
(defbinding editable-select-region (editable &optional (start 0) end) nil
(editable editable)
(start int)
((or end -1) int))
+(defbinding editable-get-selection-bounds (editable) nil
+ (editable editable)
+ (start int :out)
+ (end int :out))
+
(defbinding editable-insert-text
(editable text &optional (position 0)) nil
(editable editable)
(defbinding editable-paste-clipboard () nil
(editable editable))
-; (defbinding editable-claim-selection () nil
-; (editable editable)
-; (claim boolean)
-; (time unsigned-int))
-
(defbinding editable-delete-selection () nil
(editable editable))
-; (defbinding editable-changed () nil
-; (editable editable))
-|#
;;; Spin button
;;; Range
-#|
-(defbinding range-draw-background () nil
- (range range))
-(defbinding range-clear-background () nil
- (range range))
+(defun range-lower (range)
+ (adjustment-lower (range-adjustment range)))
-(defbinding range-draw-trough () nil
- (range range))
+(defun range-upper (range)
+ (adjustment-upper (range-adjustment range)))
-(defbinding range-draw-slider () nil
- (range range))
+(defun (setf range-lower) (value range)
+ (setf (adjustment-lower (range-adjustment range)) value))
-(defbinding range-draw-step-forw () nil
- (range range))
+(defun (setf range-upper) (value range)
+ (setf (adjustment-upper (range-adjustment range)) value))
-(defbinding range-slider-update () nil
- (range range))
+(defun range-page-increment (range)
+ (adjustment-page-increment (range-adjustment range)))
-(defbinding range-trough-click () int
- (range range)
- (x int)
- (y int)
- (jump-perc single-float :out))
+(defun range-step-increment (range)
+ (adjustment-step-increment (range-adjustment range)))
-(defbinding range-default-hslider-update () nil
- (range range))
+(defun (setf range-page-increment) (value range)
+ (setf (adjustment-page-increment (range-adjustment range)) value))
-(defbinding range-default-vslider-update () nil
- (range range))
-
-(defbinding range-default-htrough-click () int
- (range range)
- (x int)
- (y int)
- (jump-perc single-float :out))
-
-(defbinding range-default-vtrough-click () int
- (range range)
- (x int)
- (y int)
- (jump-perc single-float :out))
+(defun (setf range-step-increment) (value range)
+ (setf (adjustment-step-increment (range-adjustment range)) value))
-(defbinding range-default-hmotion () int
+(defbinding range-set-range () nil
(range range)
- (x-delta int)
- (y-delta int))
+ (lower double-float)
+ (upper double-float))
-(defbinding range-default-vmotion () int
+(defbinding range-set-increments () nil
(range range)
- (x-delta int)
- (y-delta int))
-|#
+ (step double-float)
+ (page double-float))
;;; Scale
(progress-bar progress-bar))
+;;; Size group
+
+(defmethod initialize-instance ((size-group size-group) &rest initargs
+ &key widget widgets)
+ (declare (ignore widget widgets))
+ (prog1
+ (call-next-method)
+ (initial-add size-group #'size-group-add-widget
+ initargs :widget :widgets)))
+
+
+(defbinding size-group-add-widget () nil
+ (size-group size-group)
+ (widget widget))
+
+(defbinding size-group-remove-widget () nil
+ (size-group size-group)
+ (widget widget))
+
;;; Stock items
-(defbinding stock-lookup () boolean
+(defbinding %stock-item-copy () pointer
+ (location pointer))
+
+(defbinding %stock-item-free () nil
+ (location pointer))
+
+(defmethod reference-foreign ((class (eql (find-class 'stock-item))) location)
+ (%stock-item-copy location))
+
+(defmethod unreference-foreign ((class (eql (find-class 'stock-item))) location)
+ (%stock-item-free location))
+
+(defbinding stock-add (stock-item) nil
+ (stock-item stock-item)
+ (1 unsigned-int))
+
+(defbinding stock-list-ids () (gslist string))
+
+(defbinding %stock-lookup () boolean
(stock-id string)
- (stock-item stock-item :out))
-
+ (location pointer))
+(defun stock-lookup (stock-id)
+ (let ((location
+ (allocate-memory (proxy-instance-size (find-class 'stock-item)))))
+ (unwind-protect
+ (when (%stock-lookup stock-id location)
+ (ensure-proxy-instance 'stock-item (%stock-item-copy location)))
+ (deallocate-memory location))))
;;; Tooltips
;;; Accelerator Groups
#|
-(defbinding accel-group-get-default () accel-group)
-
-(deftype-method alien-ref accel-group (type-spec)
- (declare (ignore type-spec))
- '%accel-group-ref)
-
-(deftype-method alien-unref accel-group (type-spec)
- (declare (ignore type-spec))
- '%accel-group-unref)
-
-(defbinding %accel-group-ref () accel-group
- (accel-group (or accel-group pointer)))
-
-(defbinding %accel-group-unref () nil
- (accel-group (or accel-group pointer)))
-
(defbinding accel-group-activate (accel-group key modifiers) boolean
(accel-group accel-group)
((gdk:keyval-from-name key) unsigned-int)
~mdw / clg / blobdiff