X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/9adccb27da69b60d058aa37867d55ea20ecf97ca..3a63ef2a6c503a66bf1559fc60f5e3e07d0838be:/gtk/gtk.lisp diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp index 845fdd8..9d4a734 100644 --- a/gtk/gtk.lisp +++ b/gtk/gtk.lisp @@ -15,14 +15,14 @@ ;; 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.15 2004-11-06 21:39:58 espen Exp $ +;; $Id: gtk.lisp,v 1.26 2004-12-21 00:15:19 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)) @@ -39,7 +39,7 @@ (defun gtk-version () (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 @@ -132,8 +132,8 @@ (defbinding box-pack-end () nil (fill boolean) (padding unsigned-int)) -(defun box-pack (box child &key from-end expand fill (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))) @@ -265,39 +265,74 @@ (defbinding (color-selection-is-adjusting-p -;;; Combo +;;;; Combo Box -(defmethod shared-initialize ((combo combo) names &rest initargs - &key popdown-strings) - (declare (ignore initargs)) - (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 &key button) - (declare (ignore button)) + +;;;; 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 (mklist button-definition)))) - + (unless model + (setf (combo-box-entry-text-column combo-box-entry) 0))) + + +;;;; Dialog -(defvar %*response-id-key* (gensym)) +(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 id (rest (type-expand-1 'response-type)))) - (let ((response-ids (object-data dialog %*response-id-key*))) + (let ((response-ids (object-data dialog 'response-id-key))) (cond ((and response-ids (position id response-ids :test #'equal))) (create-p @@ -307,7 +342,7 @@ (defun %dialog-find-response-id-num (dialog id &optional create-p error-p) (1- (length response-ids))) (t (setf - (object-data dialog %*response-id-key*) + (object-data dialog 'response-id-key) (make-array 1 :adjustable t :fill-pointer t :initial-element id)) 0))) (error-p @@ -319,7 +354,7 @@ (defun %dialog-find-response-id (dialog response-id-num) (rassoc (list response-id-num) (rest (type-expand-1 'response-type)) :test #'equal)) - (aref (object-data dialog %*response-id-key*) response-id-num ))) + (aref (object-data dialog 'response-id-key) response-id-num ))) (defmethod signal-connect ((dialog dialog) signal function &key object after) @@ -353,8 +388,7 @@ (defbinding %dialog-add-button () button (defun dialog-add-button (dialog label &optional (response label) &key default object after) - "Adds a button to the dialog. If no response is given, then label - will be used." + "Adds a button to the dialog." (let* ((id (if (functionp response) label response)) @@ -399,8 +433,20 @@ (defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil ((%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 (dialog-vbox dialog) child args)) @@ -416,7 +462,12 @@ (defmethod (setf container-children) (children (dialog dialog)) -;;; Drawing area -- no functions +;;; Drawing area + +(defbinding drawing-area-get-size () nil + (drawing-area drawing-area) + (width int :out) + (height int :out)) ;;; Entry @@ -430,6 +481,39 @@ (defbinding entry-get-layout-offsets () nil (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 @@ -520,23 +604,6 @@ (defmethod initialize-instance ((button radio-button) (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 @@ -598,6 +665,48 @@ (defbinding menu-item-toggle-size-allocate () 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 @@ -631,6 +740,15 @@ (defbinding toggle-button-toggled () nil ;;; 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) @@ -657,7 +775,8 @@ (defbinding window-set-default-size (window width height) int ;(defbinding window-set-geometry-hints) -(defbinding window-list-toplevels () (glist window)) +(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) @@ -937,7 +1056,7 @@ (defbinding (notebook-tab-label "gtk_notebook_get_tab_label") ((%notebook-child notebook page) widget)) (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text") - (notebook page) string + (notebook page) (copy-of string) (notebook notebook) ((%notebook-child notebook page) widget)) @@ -960,7 +1079,7 @@ (defbinding (notebook-menu-label "gtk_notebook_get_menu_label") ((%notebook-child notebook page) widget)) (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text") - (notebook page) string + (notebook page) (copy-of string) (notebook notebook) ((%notebook-child notebook page) widget)) @@ -1008,27 +1127,6 @@ (defbinding paned-pack2 () 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 @@ -1096,10 +1194,7 @@ (defbinding menu-reorder-child (menu menu-item position) nil (menu-item menu-item) ((%menu-position menu position) int)) -(def-callback menu-position-callback-marshal - (c-call:void (x c-call:int) (y c-call:int) (push-in c-call:int) - (callback-id c-call:unsigned-int)) - (invoke-callback callback-id nil x y (not (zerop push-in)))) +(def-callback-marshal %menu-popup-callback (nil (x int) (y int) (push-in boolean))) (defbinding %menu-popup () nil (menu menu) @@ -1113,13 +1208,10 @@ (defbinding %menu-popup () nil (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 - (callback 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))) @@ -1157,17 +1249,16 @@ (defbinding table-resize () nil (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)) @@ -1481,14 +1572,57 @@ (defbinding progress-bar-pulse () nil (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 @@ -1535,22 +1669,6 @@ (defbinding rc-get-style () style ;;; 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)