X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/f5b67f2b6882561e4fd055f672de8d92a5ee55d4..aa9ceddc987ea92cb20b319ff7b1a51bc176b6e8:/gtk/gtk.lisp diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp index 7136731..0f7426d 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.12 2002-04-02 15:03:47 espen Exp $ +;; $Id: gtk.lisp,v 1.22 2004-12-20 00:51:38 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,12 +39,34 @@ (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 @@ -53,6 +75,15 @@ ;;; 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)) @@ -101,8 +132,8 @@ (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))) @@ -234,58 +265,98 @@ -;;; 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)) -;;;; Dialog +(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)) + + + +;;;; Combo Box Entry -(defmethod shared-initialize ((dialog dialog) names &rest initargs) +(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))) + + +;;;; 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))) (defvar %*response-id-key* (gensym)) -(defun %dialog-find-response-id-num (dialog response-id &optional create-p error-p) +(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) @@ -301,8 +372,7 @@ (object (funcall function object)) (t (funcall function))))) :object t :after after)) - (t - (call-next-method))))) + ((call-next-method))))) (defbinding dialog-run () nil @@ -318,16 +388,19 @@ (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. If no response is given, then label + will be used." + (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)) @@ -336,12 +409,17 @@ (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)) @@ -362,20 +440,25 @@ ;; 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 @@ -389,11 +472,53 @@ (y int :out)) +;;; 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)) @@ -402,13 +527,13 @@ (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)) @@ -437,23 +562,6 @@ (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 @@ -548,6 +656,15 @@ ;;; 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) @@ -574,7 +691,8 @@ ;(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) @@ -617,14 +735,14 @@ (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) @@ -692,11 +810,8 @@ -;;; File selection +;;; File chooser -(defbinding file-selection-complete () nil - (file-selection file-selection) - (pattern string)) @@ -761,7 +876,7 @@ (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) @@ -790,7 +905,7 @@ (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) @@ -828,11 +943,19 @@ (: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) @@ -843,50 +966,50 @@ 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 @@ -999,7 +1122,7 @@ (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)))) @@ -1008,8 +1131,7 @@ (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) @@ -1023,12 +1145,10 @@ (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))) @@ -1066,17 +1186,16 @@ (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)) @@ -1165,8 +1284,8 @@ &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 @@ -1193,7 +1312,15 @@ ((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)) @@ -1243,12 +1370,17 @@ ;;; 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) @@ -1290,17 +1422,9 @@ (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 @@ -1336,59 +1460,40 @@ ;;; Range -#| -(defbinding range-draw-background () nil - (range range)) - -(defbinding range-clear-background () nil - (range range)) -(defbinding range-draw-trough () nil - (range range)) +(defun range-lower (range) + (adjustment-lower (range-adjustment range))) -(defbinding range-draw-slider () nil - (range range)) +(defun range-upper (range) + (adjustment-upper (range-adjustment range))) -(defbinding range-draw-step-forw () nil - (range range)) +(defun (setf range-lower) (value range) + (setf (adjustment-lower (range-adjustment range)) value)) -(defbinding range-slider-update () nil - (range range)) - -(defbinding range-trough-click () int - (range range) - (x int) - (y int) - (jump-perc single-float :out)) +(defun (setf range-upper) (value range) + (setf (adjustment-upper (range-adjustment range)) value)) -(defbinding range-default-hslider-update () nil - (range range)) +(defun range-page-increment (range) + (adjustment-page-increment (range-adjustment range))) -(defbinding range-default-vslider-update () nil - (range range)) +(defun range-step-increment (range) + (adjustment-step-increment (range-adjustment range))) -(defbinding range-default-htrough-click () int - (range range) - (x int) - (y int) - (jump-perc single-float :out)) +(defun (setf range-page-increment) (value range) + (setf (adjustment-page-increment (range-adjustment range)) value)) -(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 @@ -1404,14 +1509,57 @@ (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 @@ -1458,22 +1606,6 @@ ;;; 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)