X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1a1949c751306b0f02c8e76df425ffbae58c6e5d..HEAD:/gtk/gtk.lisp diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp index e195ab8..f193114 100644 --- a/gtk/gtk.lisp +++ b/gtk/gtk.lisp @@ -1,28 +1,33 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 1999-2006 Espen S. Johnsen ;; -;; 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: gtk.lisp,v 1.17 2004-11-07 17:55:29 espen Exp $ +;; $Id: gtk.lisp,v 1.98 2008-11-25 22:11:08 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,47 +44,474 @@ (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) +(defun clg-version () + "clg 0.94") -;;;; Initalization +;;;; Initalization and display handling -(defbinding (gtk-init "gtk_parse_args") () nil +(defparameter *event-polling-interval* 0.01) + +#?(or (featurep :clisp) (featurep :cmu) (and (sbcl>= 1 0 6) (sbcl< 1 0 15 6))) +(defun decompose-time (time) + (multiple-value-bind (sec subsec) (truncate *event-polling-interval*) + (values sec (truncate (* subsec 1e6))))) + +(defbinding (gtk-init "gtk_parse_args") () boolean "Initializes the library without opening the display." (nil null) (nil null)) -(defun clg-init (&optional display) - "Initializes the system and starts the event handling" +(defun clg-init (&optional display multi-threading-p) + "Initializes the system and starts 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)))) + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") + (progn + #+sbcl(sb-int:set-floating-point-modes :traps nil) + #+cmu(ext:set-floating-point-modes :traps nil)) + + (gdk:gdk-init) + (unless (gtk-init) + (error "Initialization of GTK+ failed.")) + + (if (not multi-threading-p) + (%init-async-event-handling display) + #+sb-thread(%init-multi-threaded-event-handling display) + #-sb-thread(error "Multi threading not supported on this platform"))) + (gdk:ensure-display display t)) + +(defun clg-init-with-threading (&optional display) + (clg-init display t)) + + +#?(and (sbcl>= 1 0 6) (sbcl< 1 0 15 6)) +;; A very minimal implementation of CLISP's socket-status +(defun socket-status (socket seconds microseconds) + (sb-alien:with-alien ((read-fds (sb-alien:struct sb-unix:fd-set))) + (let ((fd (sb-sys:fd-stream-fd (car socket)))) + (sb-unix:fd-zero read-fds) + (sb-unix:fd-set fd read-fds) + + (let ((num-fds-changed + (sb-unix:unix-fast-select + (1+ fd) (sb-alien:addr read-fds) nil nil + seconds microseconds))) + (unless (or (not num-fds-changed) (zerop num-fds-changed)) + (if (peek-char nil (car socket) nil) + :input + :eof)))))) + +(defun %init-async-event-handling (display) + (let ((style + #?(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 6)) :fd-handler + #?-(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 6)) nil)) + (when (and + (find-package "SWANK") + (not (eq (symbol-value (find-symbol "*COMMUNICATION-STYLE*" "SWANK")) style))) + (error "When running clg in Slime, the communication style ~S must be used in combination with asynchronous event handling on this platform. See the README file and for more information." style))) + + #+(or cmu sbcl) + (signal-connect (gdk:display-manager) 'display-opened + #'(lambda (display) + (let ((fd (gdk:display-connection-number display))) + (unless (< fd 0) + (let ((handler (add-fd-handler + (gdk:display-connection-number display) + :input #'main-iterate-all))) + (signal-connect display 'closed + #'(lambda (is-error-p) + (declare (ignore is-error-p)) + (remove-fd-handler handler)))))))) + + #?(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 6)) + (progn + (setq *periodic-polling-function* #'main-iterate-all) + #?(or (featurep :cmu) (sbcl< 1 0 6)) + (multiple-value-setq (*max-event-to-sec* *max-event-to-usec*) + (decompose-time *event-polling-interval*)) + #?(sbcl>= 1 0 15 6) + (setq *periodic-polling-period* *event-polling-interval*)) + + #?(or (featurep :clisp) (and (sbcl>= 1 0 6) (sbcl< 1 0 15 6))) + ;; When running in CLISP or certain versions of SBCL in Slime we need + ;; to hook into the Swank server to handle events asynchronously. + (cond + ((and (find-package "SWANK") (find-symbol "CHECK-SLIME-INTERRUPTS" "SWANK")) + (let ((check-slime-interrupts + (symbol-function (find-symbol "CHECK-SLIME-INTERRUPTS" "SWANK")))) + (setf + (symbol-function (find-symbol "CHECK-SLIME-INTERRUPTS" "SWANK")) + #'(lambda () + (main-iterate-all) + (funcall check-slime-interrupts))))) + ((and (find-package "SWANK") + (find-symbol "READ-FROM-EMACS" "SWANK") + (find-symbol "*EMACS-CONNECTION*" "SWANK") + (find-symbol "CONNECTION.SOCKET-IO" "SWANK")) + (let ((connection (symbol-value (find-symbol "*EMACS-CONNECTION*" "SWANK")))) + (when connection + (let ((read-from-emacs (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK"))) + (stream (funcall (find-symbol "CONNECTION.SOCKET-IO" "SWANK") connection))) + (multiple-value-bind (sec usec) + (decompose-time *event-polling-interval*) + (setf (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK")) + #'(lambda () + (loop + (case (socket-status (cons stream :input) sec usec) + ((:input :eof) (return (funcall read-from-emacs))) + (otherwise (main-iterate-all))))))))))) + ((flet ((warn-main-loop () + (warn "Asynchronous event handling not supported on this platform. An explicit main loop has to be started."))) + #+(and clisp readline) + (if (find-package "SWANK") + (warn-main-loop) ; assuming we're running in SLIME + ;; Readline will call the event hook at most ten times per second + (setf readline:event-hook #'main-iterate-all)) + #-(and clisp readline)(warn-main-loop)))) + + (gdk:display-open display)) + +#+sb-thread +(progn + (defvar *main-thread* nil) + + ;; Hopefully, when threading support is added to the Win32 port of + ;; SBCL in the future, this will work just out of the box. + #+win32 + (let ((done (sb-thread:make-waitqueue)) + (functions ()) + (results ())) + + ;; In Win32 all GDK calls have to be made from the main loop + ;; thread, so we add a timeout function which will poll for code and + ;; execute it. + + (defun funcall-in-main (function) + (if (or + (not *main-thread*) + (eq sb-thread:*current-thread* *main-thread*)) + (funcall function) + (gdk:with-global-lock + (push function functions) + (sb-thread:condition-wait done gdk:*global-lock*) + (pop results)))) + + ;; Will lock REPL on error, need to be fixed! + (defun %funcall-in-main-poll () + (when functions + (loop + for n from 0 + while functions + do (push (funcall (pop functions)) results) + finally (sb-thread:condition-notify done n))) + t)) + + (defmacro within-main-loop (&body body) + #-win32 `(gdk:with-global-lock ,@body) + #+win32 `(funcall-in-main #'(lambda () ,@body))) + + (defun %init-multi-threaded-event-handling (display) + (when (and + (find-package "SWANK") + (not (eq (symbol-value (find-symbol "*COMMUNICATION-STYLE*" "SWANK")) :spawn))) + (error "When running clg in Slime, the communication style :spawn must be used in combination with multi threaded event handling. See the README file and for more information.")) + (gdk:threads-init) + (let ((main-running (sb-thread:make-waitqueue))) + (gdk:with-global-lock + (setf *main-thread* + (sb-thread:make-thread + #'(lambda () + (gdk:with-global-lock + (gdk:display-open display) + #+win32(gdk:timeout-add-with-lock (/ *event-poll-interval* 1000) + #'%funcall-in-main-poll) + (sb-thread:condition-notify main-running) + (main))) + :name "gtk event loop")) + (sb-thread:condition-wait main-running gdk:*global-lock*))) + + ;; We need to hook into the Swank server to protect calls to GDK properly. + ;; This will *only* protect code entered directly in the REPL. + (when (find-package "SWANK") + (let ((repl-eval-hook (find-symbol "*SLIME-REPL-EVAL-HOOKS*" "SWANK"))) + (if repl-eval-hook + (push #'(lambda (form) + (within-main-loop (eval form))) + (symbol-value (find-symbol "*SLIME-REPL-EVAL-HOOKS*" "SWANK"))) + (warn "Your version of Slime does not have *SLIME-REPL-EVAL-HOOKS* so all calls to Gtk+ functions have to be explicit protected by wrapping them in a WITHIN-MAIN-LOOP form")))))) + +#-sb-thread +(defmacro within-main-loop (&body body) + `(progn ,@body)) + + + +;;; Generic functions + +(defgeneric add-to-radio-group (item1 item2)) +(defgeneric activate-radio-widget (item)) +(defgeneric (setf tool-item-tip-text) (tip-text tool-item)) +(defgeneric (setf tool-item-tip-private) (tip-private tool-item)) + + + +;;; Misc + +(defbinding grab-add () nil + (widget widget)) + +(defbinding grab-get-current () widget) + +(defbinding grab-remove () nil + (widget widget)) + +(defbinding get-default-language () (copy-of pango:language)) + + +;;; About dialog + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(progn + (define-callback-marshal %about-dialog-activate-link-callback nil + (about-dialog (link string))) + + (defbinding about-dialog-set-email-hook (function) nil + (%about-dialog-activate-link-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback)) + + (defbinding about-dialog-set-url-hook (function) nil + (%about-dialog-activate-link-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback))) ;;; Acccel group +(defbinding %accel-group-connect () nil + (accel-group accel-group) + (key unsigned-int) + (modifiers gdk:modifier-type) + (flags accel-flags) + (gclosure gclosure)) + +(defun accel-group-connect (group accelerator function &optional flags) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (let ((gclosure (make-callback-closure function))) + (%accel-group-connect group key modifiers flags gclosure) + gclosure))) + +(defbinding accel-group-connect-by-path (group path function) nil + (group accel-group) + (path string) + ((make-callback-closure function) gclosure :in/return)) + +(defbinding %accel-group-disconnect (group gclosure) boolean + (group accel-group) + (gclosure gclosure)) + +(defbinding %accel-group-disconnect-key () boolean + (group accel-group) + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defun accel-group-disconnect (group accelerator) + (etypecase accelerator + (gclosure (%accel-group-disconnect group accelerator)) + (string + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-group-disconnect-key group key modifiers))))) + +(defbinding %accel-group-query () (copy-of (vector (inlined accel-group-entry) n)) + (accel-group accel-group) + (key unsigned-int) + (modifiers gdk:modifier-type) + (n int :out)) + +(defun accel-group-query (accel-group accelerator) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-group-query accel-group key modifiers))) + +(defbinding %accel-group-activate () boolean + (accel-group accel-group) + (acceleratable gobject) + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defun accel-group-activate (accel-group acceleratable accelerator) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-group-activate accel-group acceleratable key modifiers))) + +(defbinding accel-group-lock () nil + (accel-group accel-group)) + +(defbinding accel-group-unlock () nil + (accel-group accel-group)) + +(defbinding accel-group-from-accel-closure () accel-group + (closure gclosure)) + +(defbinding %accel-groups-activate () boolean + (object gobject) + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defun accel-groups-activate (object accelerator) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-groups-activate object key modifiers))) + +(defbinding accel-groups-from-object () (gslist accel-group) + (object gobject)) + +(defbinding accelerator-valid-p (key &optional modifiers) boolean + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defbinding %accelerator-parse () nil + (accelerator string) + (key unsigned-int :out) + (modifiers gdk:modifier-type :out)) + +(defgeneric parse-accelerator (accelerator)) + +(defmethod parse-accelerator ((accelerator string)) + (multiple-value-bind (key modifiers) (%accelerator-parse accelerator) + (if (zerop key) + (error "Invalid accelerator: ~A" accelerator) + (values key modifiers)))) + +(defmethod parse-accelerator ((accelerator cons)) + (destructuring-bind (key modifiers) accelerator + (values + (etypecase key + (integer key) + (string + (or + (gdk:keyval-from-name key) + (error "Invalid key name: ~A" key))) + (character (parse-accelerator key))) + modifiers))) + +(defmethod parse-accelerator ((key integer)) + key) + +(defmethod parse-accelerator ((key character)) + (or + (gdk:keyval-from-name (string key)) + (error "Invalid key name: ~A" key))) + + +(defbinding accelerator-name () string + (key unsigned-int) + (modifiers gdk:modifier-type)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding accelerator-get-label () string + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defbinding %accelerator-set-default-mod-mask () nil + (default-modifiers gdk:modifier-type)) + +(defun (setf accelerator-default-modifier-mask) (default-modifiers) + (%accelerator-set-default-mod-mask default-modifiers)) + +(defbinding (accelerator-default-modifier-mask "gtk_accelerator_get_default_mod_mask") () gdk:modifier-type) ;;; Acccel label +(defbinding accel-label-get-accel-width () unsigned-int + (accel-label accel-label)) + (defbinding accel-label-refetch () boolean (accel-label accel-label)) + +;;; Accel map + +(defbinding %accel-map-add-entry () nil + (path string) + (key unsigned-int) + (modifiers gdk:modifier-type)) + +(defun accel-map-add-entry (path accelerator) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-map-add-entry path key modifiers))) + +(defbinding %accel-map-lookup-entry () boolean + (path string) + ((make-instance 'accel-key) accel-key :in/return)) + +(defun accel-map-lookup-entry (path) + (multiple-value-bind (found-p accel-key) (%accel-map-lookup-entry path) + (when found-p + (values + (slot-value accel-key 'key) + (slot-value accel-key 'modifiers) + (slot-value accel-key 'flags))))) + +(defbinding %accel-map-change-entry () boolean + (path string) + (key unsigned-int) + (modifiers gdk:modifier-type) + (replace boolean)) + +(defun accel-map-change-entry (path accelerator &optional replace) + (multiple-value-bind (key modifiers) (parse-accelerator accelerator) + (%accel-map-change-entry path key modifiers replace))) + +(defbinding accel-map-load () nil + (filename pathname)) + +(defbinding accel-map-save () nil + (filename pathname)) + +(define-callback-marshal %accel-map-foreach-callback nil + ((accel-path string) (key unsigned-int) + (modifiers gdk:modifier-type) (changed boolean)) :callback-id :first) + +(defbinding %accel-map-foreach (callback-id) nil + (callback-id unsigned-int) + (%accel-map-foreach-callback callback)) + +(defbinding %accel-map-foreach-unfiltered (callback-id) nil + (callback-id unsigned-int) + (%accel-map-foreach-callback callback)) + +(defun accel-map-foreach (function &optional (filter-p t)) + (with-callback-function (id function) + (if filter-p + (%accel-map-foreach id) + (%accel-map-foreach-unfiltered id)))) + +(defbinding accel-map-add-filter () nil + (filter string)) + +(defbinding accel-map-get () accel-map) + +(defbinding accel-map-lock-path () nil + (path string)) + +(defbinding accel-map-unlock-path () nil + (path string)) + + + +;;; Accessibility + +(defbinding accessible-connect-widget-destroyed () nil + (accessible accessible)) + + ;;; Adjustment -(defmethod shared-initialize ((adjustment adjustment) names &key value) +(defmethod initialize-instance ((adjustment adjustment) &key value) (prog1 (call-next-method) ;; we need to make sure that the value is set last, otherwise it - ;; may be outside current limits + ;; may be outside current limits and ignored (when value (setf (slot-value adjustment 'value) value)))) @@ -96,7 +528,77 @@ (defbinding adjustment-clamp-page () nil (upper single-float)) -;;; Arrow -- no functions +;;; Alignment + +(defbinding alignment-set () nil + (alognment alignment) + (x-align single-float) + (y-align single-float) + (x-scale single-float) + (y-scale single-float)) + +(defbinding alignment-get-padding () nil + (alognment alignment) + (top unsigned-int :out) + (bottom unsigned-int :out) + (left unsigned-int :out) + (right unsigned-int :out)) + +(defbinding alignment-set-padding () nil + (alognment alignment) + (top unsigned-int) + (bottom unsigned-int) + (left unsigned-int) + (right unsigned-int)) + + +;;; Assistant + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0") +(progn + (defbinding assistant-get-nth-page () widget + (assistant assistant) + (page-num int)) + + (defbinding %assistant-insert-page () int + (assistant assistant) + (page widget) + (pos int)) + + (defun assistant-insert-page (assistant page position &rest child-args) + (let ((pos (case position + (:first 0) + (:last -1) + (t position)))) + (prog1 + (%assistant-insert-page assistant page pos) + (init-child-slots assistant page child-args)))) + + (defun assistant-append-page (assistant page &rest child-args) + (apply #'assistant-insert-page assistant page :last child-args)) + + (defun assistant-prepend-page (assistant page &rest child-args) + (apply #'assistant-insert-page assistant page :first child-args)) + + (define-callback-marshal %assistant-page-func-callback int + ((current-page int))) + + (defbinding assistant-set-forward-page-func (assistant function) nil + (assistant assistant) + (%assistant-page-func-callback callback) + ((register-callback-function function) pointer-data) + (user-data-destroy-callback callback)) + + (defbinding assistant-add-action-widget () nil + (assistant assistant) + (child widget)) + + (defbinding assistant-remove-action-widget () nil + (assistant assistant) + (child widget)) + + (defbinding assistant-update-buttons-state () nil + (assistant assistant))) @@ -111,9 +613,12 @@ (defun (setf bin-child) (child bin) (container-add bin child) child) - -;;; Binding - +(defmethod compute-signal-function ((bin bin) signal function object args) + (declare (ignore signal)) + (if (eq object :child) + #'(lambda (bin &rest emission-args) + (apply function (bin-child bin) (nconc emission-args args))) + (call-next-method))) ;;; Box @@ -132,7 +637,7 @@ (defbinding box-pack-end () nil (fill boolean) (padding unsigned-int)) -(defun box-pack (box child &key end expand fill (padding 0)) +(defun box-pack (box child &key end (expand t) (fill t) (padding 0)) (if end (box-pack-end box child expand fill padding) (box-pack-start box child expand fill padding))) @@ -162,6 +667,13 @@ (defbinding box-set-child-packing () nil ;;; Button +(defmethod initialize-instance ((button button) &rest initargs &key stock) + (if stock + (apply #'call-next-method button + :label stock :use-stock t :use-underline t initargs) + (call-next-method))) + + (defbinding button-pressed () nil (button button)) @@ -201,11 +713,7 @@ (defbinding calendar-unmark-day () int (defbinding calendar-clear-marks () nil (calendar calendar)) -(defbinding calendar-display-options () nil - (calendar calendar) - (options calendar-display-options)) - -(defbinding (calendar-date "gtk_calendar_get_date") () nil +(defbinding calendar-get-date () nil (calendar calendar) (year unsigned-int :out) (month unsigned-int :out) @@ -218,47 +726,21 @@ (defbinding calendar-thaw () nil (calendar calendar)) - -;;; Cell editable - - - -;;; Cell renderer - - - -;;; Cell renderer pixbuf -- no functions - - - -;;; Cell renderer text - - - -;;; Cell renderer toggle -- no functions - - - -;;; Check button -- no functions - - - ;;; Check menu item (defbinding check-menu-item-toggled () nil (check-menu-item check-menu-item)) - -;;; Clipboard - - ;;; Color selection -(defbinding (color-selection-is-adjusting-p - "gtk_color_selection_is_adjusting") () boolean +(defbinding color-selection-is-adjusting-p () boolean (colorsel color-selection)) +(defbinding (color-selection-previous-color + "gtk_color_selection_get_previous_color") () nil + (colorsel color-selection) + ((make-instance 'gdk:color) gdk:color :in/return)) ;;; Color selection dialog -- no functions @@ -267,20 +749,26 @@ (defbinding (color-selection-is-adjusting-p ;;;; Combo Box -(defmethod shared-initialize ((combo-box combo-box) names &key model content) - (unless model - (setf - (combo-box-model combo-box) - (make-instance 'list-store :columns '(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)) +(defmethod initialize-instance ((combo-box combo-box) &rest initargs + &key model content active) + (remf initargs :active) + (if model + (apply #'call-next-method combo-box initargs) + (progn + (apply #'call-next-method combo-box + :model (make-instance 'list-store :column-types '(string)) + initargs) + (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 + (mapc #'(lambda (text) + (combo-box-append-text combo-box text)) + content)) + (when active + (setf (combo-box-active combo-box) active))) + ;; (defmethod shared-initialize :after ((combo-box combo-box) names &key active) ;; (when active @@ -299,8 +787,8 @@ (defbinding combo-box-prepend-text () nil (combo-box combo-box) (text string)) -#+gtk2.6 -(defbinding combo-box-get-active-text () string +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding combo-box-get-active-text () (or null string) (combo-box combo-box)) (defbinding combo-box-popup () nil @@ -313,7 +801,7 @@ (defbinding combo-box-popdown () nil ;;;; Combo Box Entry -(defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model) +(defmethod initialize-instance ((combo-box-entry combo-box-entry) &key model) (call-next-method) (unless model (setf (combo-box-entry-text-column combo-box-entry) 0))) @@ -321,126 +809,156 @@ (defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model ;;;; Dialog -(defmethod shared-initialize ((dialog dialog) names &rest initargs &key button) - (declare (ignore button)) - (call-next-method) - (dolist (button-definition (get-all initargs :button)) - (apply #'dialog-add-button dialog (mklist button-definition)))) +(defmethod shared-initialize ((dialog dialog) names &rest initargs + &key button buttons) + (declare (ignore names 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 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*))) - (cond - ((and response-ids (position id response-ids :test #'equal))) - (create-p +(defun dialog-response-id (dialog response &optional create-p error-p) + "Returns a numeric response id" + (if (typep response 'response-type) + (response-type-to-int response) + (let ((responses (user-data dialog 'responses))) + (cond + ((and responses (position response responses :test #'equal))) + (create-p (cond - (response-ids - (vector-push-extend id response-ids) - (1- (length response-ids))) + (responses + (vector-push-extend response responses) + (1- (length responses))) (t (setf - (object-data dialog %*response-id-key*) - (make-array 1 :adjustable t :fill-pointer t :initial-element id)) + (user-data dialog 'responses) + (make-array 1 :adjustable t :fill-pointer t + :initial-element response)) 0))) (error-p - (error "Invalid response: ~A" id)))))) + (error "Invalid response: ~A" response)))))) + +(defun dialog-find-response (dialog id) + "Finds a symbolic response given a numeric id" + (cond + ((not (numberp id)) id) + ((< id 0) (int-to-response-type id)) + ((aref (user-data dialog 'responses) 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 #'equal)) - (aref (object-data dialog %*response-id-key*) response-id-num ))) +(defmethod compute-signal-id ((dialog dialog) signal) + (if (dialog-response-id dialog signal) + (ensure-signal-id 'response dialog) + (call-next-method))) -(defmethod signal-connect ((dialog dialog) signal function &key object after) - (let ((response-id-num (%dialog-find-response-id-num dialog signal))) +(defmethod compute-signal-function ((dialog dialog) signal function object args) + (declare (ignore function object args)) + (let ((callback (call-next-method)) + (id (dialog-response-id dialog signal))) (cond - (response-id-num - (call-next-method - dialog 'response - #'(lambda (dialog id) - (when (= id response-id-num) - (cond - ((eq object t) (funcall function dialog)) - (object (funcall function object)) - (t (funcall function))))) - :object t :after after)) - ((call-next-method))))) - - -(defbinding dialog-run () nil + (id + #'(lambda (dialog response) + (when (= response id) + (funcall callback dialog)))) + ((string-equal signal "response") + #'(lambda (dialog response) + (funcall callback dialog (dialog-find-response dialog response)))) + (callback)))) + +(defbinding %dialog-run () int (dialog dialog)) +(defun dialog-run (dialog) + (dialog-find-response dialog (%dialog-run dialog))) -(defbinding dialog-response (dialog response-id) nil +(defbinding dialog-response (dialog response) nil (dialog dialog) - ((%dialog-find-response-id-num dialog response-id nil t) int)) + ((dialog-response-id dialog response nil t) int)) -(defbinding %dialog-add-button () button +(defbinding %dialog-add-button () bin (dialog dialog) (text string) - (response-id-num int)) + (response-id int)) (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))) + "Adds a button to the dialog." + (let* ((signal (if (functionp response) + label + response)) + (id (dialog-response-id dialog signal t)) + (button (%dialog-add-button dialog label id))) (when (functionp response) - (signal-connect dialog id response :object object :after after)) + (signal-connect dialog signal response :object object :after after)) (when default - (%dialog-set-default-response dialog id-num)) + (%dialog-set-default-response dialog id)) button)) -(defbinding %dialog-add-action-widget () button +(defbinding %dialog-add-action-widget () nil (dialog dialog) (action-widget widget) - (response-id-num int)) + (response-id int)) (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) + (let* ((signal (if (functionp response) + widget + response)) + (id (dialog-response-id dialog signal t))) + (unless (widget-hidden-p widget) + (widget-show widget)) + (%dialog-add-action-widget dialog widget id) (when (functionp response) - (signal-connect dialog id response :object object :after after)) + (signal-connect dialog signal response :object object :after after)) (when default - (%dialog-set-default-response dialog id-num)) + (setf (widget-can-default-p widget) t) + (%dialog-set-default-response dialog id)) widget)) (defbinding %dialog-set-default-response () nil (dialog dialog) - (response-id-num int)) + (response-id int)) -(defun dialog-set-default-response (dialog response-id) +(defun dialog-set-default-response (dialog response) (%dialog-set-default-response - dialog (%dialog-find-response-id-num dialog response-id nil t))) + dialog (dialog-response-id dialog response nil t))) -(defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil +(defbinding dialog-set-response-sensitive (dialog response sensitive) nil (dialog dialog) - ((%dialog-find-response-id-num dialog response-id nil t) int) + ((dialog-response-id dialog response nil t) int) (sensitive boolean)) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding alternative-dialog-button-order-p (&optional screen) boolean + (screen (or null gdk:screen))) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding (dialog-set-alternative-button-order + "gtk_dialog_set_alternative_button_order_from_array") + (dialog new-order) nil + (dialog dialog) + ((length new-order) int) + ((map 'vector #'(lambda (response) + (dialog-response-id dialog response nil t)) + new-order) (vector int))) + + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") +(progn + (defbinding %dialog-get-response-for-widget () int + (dialog dialog) + (widget widget)) + + (defun dialog-get-response-for-widget (dialog widget) + (dialog-find-response dialog (dialog-get-response-for-widget dialog widget)))) -;; Addition dialog functions (defmethod container-add ((dialog dialog) (child widget) &rest args) (apply #'container-add (dialog-vbox dialog) child args)) + (defmethod container-remove ((dialog dialog) (child widget)) (container-remove (dialog-vbox dialog) child)) @@ -451,20 +969,197 @@ (defmethod (setf container-children) (children (dialog dialog)) (setf (container-children (dialog-vbox dialog)) children)) +;;; Drawing Area -;;; Drawing area -- no functions +(defun drawing-area-scroll (drawing-area dx dy) + (gdk:window-scroll (widget-window drawing-area) dx dy)) ;;; Entry -(defbinding entry-get-layout () pango:layout - (entry entry)) - (defbinding entry-get-layout-offsets () nil (entry entry) (x int :out) (y int :out)) +(defbinding entry-layout-index-to-text-index () int + (entry entry) + (layout-index int)) + +(defbinding entry-text-index-to-layout-index () int + (entry entry) + (text-index int)) + + +;;; Entry Completion + +(define-callback-marshal %entry-completion-match-callback boolean + (entry-completion string tree-iter)) + +(defbinding entry-completion-set-match-func (completion function) nil + (completion entry-completion) + (%entry-completion-match-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback)) + +(defbinding entry-completion-complete () nil + (completion entry-completion)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0") +(defbinding entry-completion-get-completion-prefix () string + (completion entry-completion)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(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)) + + +;;; File Chooser + +(defmethod initialize-instance ((file-chooser file-chooser) &rest initargs + &key filter filters shortcut-folder + shortcut-folders shortcut-folder-uti + shortcut-folder-uris) + (declare (ignore filter filters shortcut-folder shortcut-folders + shortcut-folder-uti shortcut-folder-uris)) + (prog1 + (call-next-method) + (initial-add file-chooser #'file-chooser-add-filter + initargs :filer :filters) + (initial-add file-chooser #'file-chooser-add-shortcut-folder + initargs :shortcut-folder :shortcut-folders) + (initial-add file-chooser #'file-chooser-add-shortcut-folder-uri + initargs :shortcut-folder-uri :shortcut-folders-uris))) + + +(defbinding file-chooser-select-filename () boolean + (file-chooser file-chooser) + (filename string)) + +(defbinding file-chooser-unselect-filename () nil + (file-chooser file-chooser) + (filename string)) + +(defbinding file-chooser-select-all () boolean + (file-chooser file-chooser)) + +(defbinding file-chooser-unselect-all () boolean + (file-chooser file-chooser)) + +(defbinding file-chooser-get-filenames () (gslist string) + (file-chooser file-chooser)) + +(defbinding file-chooser-select-uri () boolean + (file-chooser file-chooser) + (uri string)) + +(defbinding file-chooser-unselect-uri () nil + (file-chooser file-chooser) + (uri string)) + +(defbinding file-chooser-get-uris () (gslist string) + (file-chooser file-chooser)) + +(defbinding file-chooser-add-filter () nil + (file-chooser file-chooser) + (filter file-filter)) + +(defbinding file-chooser-remove-filter () nil + (file-chooser file-chooser) + (filter file-filter)) + +(defbinding file-chooser-list-filters () (gslist file-filter) + (file-chooser file-chooser)) + +(defbinding file-chooser-add-shortcut-folder () boolean + (file-chooser file-chooser) + (folder string) + (nil null)) + +(defbinding file-chooser-remove-shortcut-folder () nil + (file-chooser file-chooser) + (folder string) + (nil null)) + +(defbinding file-chooser-list-shortcut-folders () (gslist string) + (file-chooser file-chooser)) + +(defbinding file-chooser-add-shortcut-folder-uri () boolean + (file-chooser file-chooser) + (uri string) + (nil null)) + +(defbinding file-chooser-remove-shortcut-folder-uri () nil + (file-chooser file-chooser) + (uri string) + (nil null)) + +(defbinding file-chooser-list-shortcut-folder-uris () (gslist string) + (file-chooser file-chooser)) + + +;;; File Filter + +(defmethod initialize-instance ((file-filter file-filter) &rest initargs + &key mime-type mime-types pattern patterns + pixbuf-formats) + (declare (ignore mime-type mime-types pattern patterns)) + (prog1 + (call-next-method) + (when pixbuf-formats + #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") + (warn "Initarg :PIXBUF-FORMATS not supportet in this version of Gtk") + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") + (file-filter-add-pixbuf-formats file-filter)) + (initial-add file-filter #'file-filter-add-mime-type + initargs :mime-type :mime-types) + (initial-add file-filter #'file-filter-add-pattern + initargs :pattern :patterns))) + + +(defbinding file-filter-add-mime-type () nil + (filter file-filter) + (mime-type string)) + +(defbinding file-filter-add-pattern () nil + (filter file-filter) + (pattern string)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding file-filter-add-pixbuf-formats () nil + (filter file-filter)) + +(define-callback-marshal %file-filter-callback boolean (file-filter-info)) + +(defbinding file-filter-add-custom (filter needed function) nil + (filter file-filter) + (needed file-filter-flags) + (%file-filter-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback)) + +(defbinding file-filter-get-needed () file-filter-flags + (filter file-filter)) + +(defbinding file-filter-filter () boolean + (filter file-filter) + (filter-info file-filter-info)) + + ;;; Image @@ -472,45 +1167,59 @@ (defbinding image-set-from-file () nil (image image) (filename pathname)) -(defbinding image-set-from-pixmap () nil - (image image) - (pixmap gdk:pixmap) - (mask gdk:bitmap)) +(defmethod (setf image-pixmap) ((data vector) (image image)) + (multiple-value-bind (pixmap mask) (gdk:pixmap-create data) + (setf (image-pixmap image) pixmap) + (setf (image-mask image) mask))) + +(defmethod initialize-instance ((image image) &rest initargs &key pixmap file) + (cond + ((typep pixmap 'vector) + (multiple-value-bind (pixmap mask) (gdk:pixmap-create pixmap) + (apply #'call-next-method image :pixmap pixmap :mask mask initargs))) + (file + (prog1 + (call-next-method) + (image-set-from-file image file))) + ((call-next-method)))) -(defbinding image-set-from-stock () nil - (image image) - (stock-id string) - (icon-size icon-size)) +(defun create-image-widget (source &optional mask) + (etypecase source + (gdk:pixbuf (make-instance 'image :pixbuf source)) + (string (make-instance 'image :stock source)) + (pathname (make-instance 'image :file source)) + ((or list vector) (make-instance 'image :pixmap source)) + (gdk:pixmap (make-instance 'image :pixmap source :mask mask)))) -(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))) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") +(defbinding image-clear () nil + (image image)) -(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))))) +;;; Image menu item + +(defmethod initialize-instance ((item image-menu-item) &rest initargs &key image) + (if (and image (not (typep image 'widget))) + (apply #'call-next-method item :image (create-image-widget image) initargs) + (call-next-method))) + + +(defmethod (setf image-menu-item-image) ((widget widget) (item image-menu-item)) + (setf (slot-value item 'image) widget)) + +(defmethod (setf image-menu-item-image) (image (item image-menu-item)) + (setf (image-menu-item-image item) (create-image-widget image))) ;;; Label +(defmethod shared-initialize ((label label) names &key pattern) + (declare (ignore names)) + (call-next-method) + (when pattern + (setf (label-pattern label) pattern))) + (defbinding label-get-layout-offsets () nil (label label) (x int :out) @@ -521,12 +1230,6 @@ (defbinding label-select-region () nil (start int) (end int)) -(defbinding label-get-text () string - (label label)) - -(defbinding label-get-layout () pango:layout - (label label)) - (defbinding label-get-selection-bounds () boolean (label label) (start int :out) @@ -543,17 +1246,36 @@ (defbinding %radio-button-set-group () nil (radio-button radio-button) (group pointer)) -(defun radio-button-add-to-group (button1 button2) +(defmethod add-to-radio-group ((button1 radio-button) (button2 radio-button)) "Add BUTTON1 to the group which BUTTON2 belongs to." (%radio-button-set-group button1 (%radio-button-get-group button2))) +(defun %add-activate-callback (widget signal function object after) + (if object + (signal-connect widget signal + #'(lambda (object) + (when (slot-value widget 'active) + (funcall function object (slot-value widget 'value)))) + :object object :after after) + (signal-connect widget signal + #'(lambda () + (when (slot-value widget 'active) + (funcall function (slot-value widget 'value)))) + :after after))) -(defmethod initialize-instance ((button radio-button) - &rest initargs &key group-with) - (declare (ignore initargs)) - (call-next-method) - (when group-with - (radio-button-add-to-group button group-with))) +(defmethod activate-radio-widget ((button radio-button)) + (signal-emit button 'clicked)) + +(defgeneric add-activate-callback (action function &key object after)) + +(defmethod add-activate-callback ((button radio-button) function &key object after) + (%add-activate-callback button 'clicked function object after)) + +(defmethod initialize-instance ((button radio-button) &key group) + (prog1 + (call-next-method) + (when group + (add-to-radio-group button group)))) ;;; Item @@ -571,30 +1293,28 @@ (defbinding item-toggle () nil ;;; Menu item +(defmethod initialize-instance ((item menu-item) &key label) + (prog1 + (call-next-method) + (when label + (setf (menu-item-label item) label)))) + + (defun (setf menu-item-label) (label menu-item) (make-instance 'accel-label :label label :xalign 0.0 :yalign 0.5 :accel-widget menu-item - :visible t :parent menu-item) + :use-underline (menu-item-use-underline-p menu-item) + :visible t :parent menu-item) label) (defun menu-item-label (menu-item) - (with-slots (child) menu-item - (when (typep child 'label) - (label-label child)))) - -(defbinding %menu-item-set-submenu () nil - (menu-item menu-item) - (submenu menu)) + (when (and (slot-boundp menu-item 'child) + (typep (bin-child menu-item) 'label)) + (label-label (bin-child menu-item)))) -(defbinding %menu-item-remove-submenu () nil +(defbinding menu-item-remove-submenu () nil (menu-item menu-item)) -(defun (setf menu-item-submenu) (submenu menu-item) - (if (not submenu) - (%menu-item-remove-submenu menu-item) - (%menu-item-set-submenu menu-item submenu)) - submenu) - (defbinding menu-item-set-accel-path () nil (menu-item menu-item) (accel-path string)) @@ -617,6 +1337,75 @@ (defbinding menu-item-toggle-size-allocate () nil (allocation int)) +;;; Menu tool button + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding menu-tool-button-set-arrow-tooltip () nil + (menu-tool-button menu-tool-button) + (tooltips tooltips) + (tip-text string) + (tip-private string)) + + +;;; Message dialog + +(defmethod allocate-foreign ((dialog message-dialog) &key (message-type :info) + button buttons flags transient-parent) + (let ((stock-buttons + (cond + ((and (not buttons) (not button)) + (case message-type + (:question :yes-no) + (t :ok))) + ((listp buttons) :none) + (t buttons)))) + (%message-dialog-new transient-parent flags message-type stock-buttons))) + + +(defmethod shared-initialize ((dialog message-dialog) names &rest initargs + &key message-type buttons button text + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") + secondary-text) + (declare (ignore names)) + (when text + (message-dialog-set-markup dialog text)) + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") + (when secondary-text + (message-dialog-format-secondary-markup dialog secondary-text)) + (when (and (not buttons) (not button)) + (loop + for (key value) on initargs by #'cddr + when (and (eq key :signal) (eq (first value) :close)) + do (warn "Default button configuration changed from ~A to ~A" :close + (if (eq message-type :question) :yes-no :ok)) + (loop-finish))) + (if (typep buttons 'buttons-type) + (apply #'call-next-method dialog names (plist-remove :buttons initargs)) + (call-next-method))) + + +(defbinding %message-dialog-new () pointer + (parent (or null window)) + (flags dialog-flags) + (type message-type) + (buttons buttons-type) + (nil null)) + +(defbinding message-dialog-set-markup () nil + (message-dialog message-dialog) + (markup string)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding message-dialog-format-secondary-text () nil + (message-dialog message-dialog) + (text string)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding message-dialog-format-secondary-markup () nil + (message-dialog message-dialog) + (markup string)) + + ;;; Radio menu item @@ -627,19 +1416,49 @@ (defbinding %radio-menu-item-set-group () nil (radio-menu-item radio-menu-item) (group pointer)) -(defun radio-menu-item-add-to-group (item1 item2) +(defmethod activate-radio-widget ((item radio-menu-item)) + (menu-item-activate item)) + +(defmethod add-to-radio-group ((item1 radio-menu-item) (item2 radio-menu-item)) "Add ITEM1 to the group which ITEM2 belongs to." (%radio-menu-item-set-group item1 (%radio-menu-item-get-group item2))) -(defmethod initialize-instance ((item radio-menu-item) - &rest initargs &key group-with) - (declare (ignore initargs)) +(defmethod add-activate-callback ((item radio-menu-item) function &key object after) + (%add-activate-callback item 'activate function object after)) + +(defmethod initialize-instance ((item radio-menu-item) &key group) (prog1 (call-next-method) - (when group-with - (radio-menu-item-add-to-group item group-with)))) + (when group + (add-to-radio-group item group)))) + +;;; Radio tool button + +(defbinding %radio-tool-button-get-group () pointer + (radio-tool-button radio-tool-button)) + +(defbinding %radio-tool-button-set-group () nil + (radio-tool-button radio-tool-button) + (group pointer)) + +(defmethod activate-radio-widget ((button radio-tool-button)) + (signal-emit button 'clicked)) + +(defmethod add-to-radio-group ((button1 radio-tool-button) (button2 radio-tool-button)) + "Add BUTTON1 to the group which BUTTON2 belongs to." + (%radio-tool-button-set-group button1 (%radio-tool-button-get-group button2))) +(defmethod add-activate-callback ((button radio-tool-button) function &key object after) + (%add-activate-callback button 'clicked function object after)) + +(defmethod initialize-instance ((button radio-tool-button) &key group) + (prog1 + (call-next-method) + (when group + (add-to-radio-group button group)))) + + ;;; Toggle button @@ -647,9 +1466,30 @@ (defbinding toggle-button-toggled () nil (toggle-button toggle-button)) - ;;; Window +(defmethod initialize-instance ((window window) &rest initargs + &key display accel-group accel-groups) + (declare (ignore accel-group accel-groups)) + (prog1 + (if display + (apply #'call-next-method + window :screen (gdk:display-get-default-screen (gdk:ensure-display display)) initargs) + (call-next-method)) + (initial-add window #'window-add-accel-group + initargs :accel-group :accel-groups))) + +#-debug-ref-counting +(defmethod print-object ((window window) stream) + (if (and + (proxy-valid-p window) + (slot-boundp window 'title) + (not (zerop (length (window-title window))))) + (print-unreadable-object (window stream :type t :identity nil) + (format stream "~S at 0x~X" + (window-title window) (pointer-address (foreign-location window)))) + (call-next-method))) + (defbinding window-set-wmclass () nil (window window) (wmclass-name string) @@ -674,9 +1514,45 @@ (defbinding window-set-default-size (window width height) int ((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) + (widget (or widget null)) + (geometry gdk:geometry) + (geometry-mask gdk:window-hints)) + +(defun window-set-geometry-hints (window &key widget min-width min-height + max-width max-height base-width base-height + width-inc height-inc gravity + aspect (min-aspect aspect) (max-aspect aspect)) + (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))) + (mask ())) + (when (or min-width min-height) + (push :min-size mask)) + (when (or 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 + (push :win-gravity mask) + (setf (gdk:geometry-gravity geometry) gravity)) + (%window-set-geometry-hints window widget 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) @@ -693,9 +1569,32 @@ (defbinding window-mnemonic-activate (window key modifier) nil ((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)) + +#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (defbinding window-present () nil (window window)) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") +(progn + (defbinding %window-present () nil + (window window)) + + (defbinding %window-present-with-time () nil + (window window) + (timespamp unsigned-int)) + + (defun window-present (window &optional timestamp) + (if timestamp + (%window-present-with-time window timestamp) + (%window-present window)))) + (defbinding window-iconify () nil (window window)) @@ -714,6 +1613,20 @@ (defbinding window-maximize () nil (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) @@ -732,9 +1645,6 @@ (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) @@ -748,15 +1658,9 @@ (defbinding window-get-frame-dimensions () nil (window window) (left int :out) (top int :out) (rigth int :out) (bottom int :out)) -(defbinding %window-get-icon-list () (glist gdk:pixbuf) +(defbinding %window-get-icon-list () (glist (copy-of 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) @@ -784,19 +1688,90 @@ (defbinding window-resize () nil (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 + (icon gdk:pixbuf)) + +(defgeneric (setf window-default-icon) (icon)) + +(defmethod (setf window-default-icon) ((icon gdk:pixbuf)) + (%window-set-default-icon icon) + icon) + +(defgeneric (setf window-group) (group window)) + +(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) - (icon-list (glist gdk:pixbuf))) + (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)) -(defmethod (setf window-icon) (icon (window window)) - (%window-set-icon-list window (mklist icon))) +(defbinding decorated-window-init () nil + (window window)) +(defbinding decorated-window-calculate-frame-size () nil + (window window)) +(defbinding decorated-window-set-title () nil + (window window) + (title string)) +(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 chooser +(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 @@ -809,16 +1784,17 @@ (defbinding scrolled-window-add-with-viewport () nil (scrolled-window scrolled-window) (child widget)) - - - - +(defmethod shared-initialize ((window scrolled-window) names &key policy) + (declare (ignore names)) + (when policy + (setf (slot-value window 'hscrollbar-policy) policy) + (setf (slot-value window 'vscrollbar-policy) policy)) + (call-next-method)) ;;; Statusbar -(defbinding (statusbar-context-id "gtk_statusbar_get_context_id") - () unsigned-int +(defbinding statusbar-get-context-id () unsigned-int (statusbar statusbar) (context-description string)) @@ -854,42 +1830,37 @@ (defbinding fixed-move () nil ;;; Notebook -(defun %notebook-position (notebook page) +(defun %ensure-notebook-position (notebook page) (etypecase page - (int page) - (keyword (case page - (:first 0) - (:last -1) - (t (error "Invalid position keyword: ~A" page)))) + (position page) (widget (notebook-page-num notebook page t)))) -(defun %notebook-child (notebook position) +(defun %ensure-notebook-child (notebook position) (typecase position (widget position) - (t (notebook-nth-page-child notebook position)))) - + (t (notebook-get-nth-page notebook position)))) (defbinding (notebook-insert "gtk_notebook_insert_page_menu") - (notebook position child tab-label &optional menu-label) nil + (notebook position child &optional tab-label menu-label) nil (notebook notebook) (child widget) ((if (stringp tab-label) (make-instance 'label :label tab-label) - tab-label) widget) + tab-label) (or null widget)) ((if (stringp menu-label) (make-instance 'label :label menu-label) menu-label) (or null widget)) - ((%notebook-position notebook position) int)) + ((%ensure-notebook-position notebook position) position)) -(defun notebook-append (notebook child tab-label &optional menu-label) +(defun notebook-append (notebook child &optional tab-label menu-label) (notebook-insert notebook :last child tab-label menu-label)) -(defun notebook-prepend (notebook child tab-label &optional menu-label) +(defun notebook-prepend (notebook child &optional tab-label menu-label) (notebook-insert notebook :first child tab-label menu-label)) (defbinding notebook-remove-page (notebook page) nil (notebook notebook) - ((%notebook-position notebook page) int)) + ((%ensure-notebook-position notebook page) position)) (defbinding %notebook-page-num () int (notebook notebook) @@ -899,7 +1870,7 @@ (defun notebook-page-num (notebook child &optional error-p) (let ((page-num (%notebook-page-num notebook child))) (if (= page-num -1) (when error-p - (error "~A is not a child of ~A" child notebook)) + (error "~A is not a page in ~A" child notebook)) page-num))) (defbinding notebook-next-page () nil @@ -911,7 +1882,7 @@ (defbinding notebook-prev-page () nil (defbinding notebook-reorder-child (notebook child position) nil (notebook notebook) (child widget) - ((%notebook-position notebook position) int)) + ((%ensure-notebook-position notebook position) int)) (defbinding notebook-popup-enable () nil (notebook notebook)) @@ -919,46 +1890,26 @@ (defbinding notebook-popup-enable () nil (defbinding notebook-popup-disable () nil (notebook notebook)) -(defbinding (notebook-nth-page-child "gtk_notebook_get_nth_page") - (notebook page) widget +(defbinding notebook-get-nth-page () widget (notebook notebook) - ((case page - (:first 0) - (:last -1) - (t page)) int)) - + (page position)) -(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) - (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-num int)) +(defun %notebook-current-page (notebook) + (when (slot-boundp notebook 'current-page-num) + (notebook-get-nth-page notebook (notebook-current-page-num notebook)))) (defun (setf notebook-current-page) (page notebook) - (%notebook-set-current-page notebook (%notebook-position notebook page)) - page) - + (setf (notebook-current-page-num notebook) (notebook-page-num notebook page))) (defbinding (notebook-tab-label "gtk_notebook_get_tab_label") (notebook page) widget (notebook notebook) - ((%notebook-child notebook page) widget)) + ((%ensure-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)) + ((%ensure-notebook-child notebook page) widget)) (defbinding %notebook-set-tab-label () nil (notebook notebook) @@ -969,19 +1920,19 @@ (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) + (%notebook-set-tab-label notebook (%ensure-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)) + ((%ensure-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)) + ((%ensure-notebook-child notebook page) widget)) (defbinding %notebook-set-menu-label () nil (notebook notebook) @@ -992,13 +1943,13 @@ (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) + (%notebook-set-menu-label notebook (%ensure-notebook-child notebook page) widget) widget)) (defbinding notebook-query-tab-label-packing (notebook page) nil (notebook notebook) - ((%notebook-child notebook page) widget) + ((%ensure-notebook-child notebook page) widget) (expand boolean :out) (fill boolean :out) (pack-type pack-type :out)) @@ -1006,7 +1957,7 @@ (defbinding notebook-query-tab-label-packing (notebook page) nil (defbinding notebook-set-tab-label-packing (notebook page expand fill pack-type) nil (notebook notebook) - ((%notebook-child notebook page) widget) + ((%ensure-notebook-child notebook page) widget) (expand boolean) (fill boolean) (pack-type pack-type)) @@ -1027,42 +1978,30 @@ (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 (defbinding layout-put () nil (layout layout) - (widget widget) + (child widget) (x int) (y int)) (defbinding layout-move () nil (layout layout) - (widget widget) + (child widget) (x int) (y int)) +(defbinding layout-set-size () nil + (layout layout) + (width unsigned-int) + (height unsigned-int)) + +(defbinding layout-get-size () nil + (layout layout) + (width unsigned-int :out) + (height unsigned-int :out)) ;;; Menu shell @@ -1088,6 +2027,10 @@ (defbinding menu-shell-select-item () nil (menu-shell menu-shell) (menu-item menu-item)) +(defbinding menu-shell-select-first () nil + (menu-shell menu-shell) + (search-sensitive boolean)) + (defbinding menu-shell-deselect () nil (menu-shell menu-shell)) @@ -1096,6 +2039,8 @@ (defbinding menu-shell-activate-item () nil (menu-item menu-item) (fore-deactivate boolean)) +(defbinding menu-shell-cancel () nil + (menu-shell menu-shell)) ;;; Menu @@ -1115,13 +2060,22 @@ (defbinding menu-reorder-child (menu menu-item position) nil (menu-item menu-item) ((%menu-position menu position) int)) -(def-callback-marshal %menu-popup-callback (nil (x int) (y int) (push-in boolean))) +(defbinding menu-attach () nil + (menu menu) + (menu-item menu-item) + (left-attach unsigned-int) + (right-attach unsigned-int) + (top-attach unsigned-int) + (bottom-attach unsigned-int)) + +(define-callback-marshal %menu-position-callback nil + (menu (x int) (y int) (push-in boolean))) (defbinding %menu-popup () nil (menu menu) (parent-menu-shell (or null menu-shell)) (parent-menu-item (or null menu-item)) - (callback-func (or null pointer)) + (callback (or null callback)) (callback-id unsigned-int) (button unsigned-int) (activate-time (unsigned 32))) @@ -1132,7 +2086,7 @@ (defun menu-popup (menu button activate-time &key callback parent-menu-shell (with-callback-function (id callback) (%menu-popup menu parent-menu-shell parent-menu-item - (callback %menu-popup-callback) id button activate-time)) + %menu-position-callback id button activate-time)) (%menu-popup menu parent-menu-shell parent-menu-item nil 0 button activate-time))) @@ -1160,6 +2114,28 @@ (defun (setf menu-active) (menu child) (%menu-set-active menu (%menu-position menu child)) child) +(define-callback %menu-detach-callback nil ((widget widget) (menu menu)) + (funcall (user-data menu 'detach-func) widget menu)) + +(defbinding %menu-attach-to-widget (menu widget) nil + (menu menu) + (widget widget) + (%menu-detach-callback callback)) + +(defun menu-attach-to-widget (menu widget function) + (setf (user-data menu 'detach-func) function) + (%menu-attach-to-widget menu widget)) + +(defbinding menu-detach () nil + (menu menu)) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding menu-get-for-attach-widget () (copy-of (glist widget)) + (widget widget)) + +(defbinding menu-set-monitor () nil + (menu menu) + (monitor-num int)) ;;; Table @@ -1170,17 +2146,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)) @@ -1222,12 +2197,16 @@ (defbinding %table-set-col-spacings () nil (table table) (spacing unsigned-int)) -(defun (setf table-col-spacing) (spacing table &optional col) - (if col - (%table-set-col-spacing table col spacing) +(defun (setf table-column-spacing) (spacing table &optional column) + (if column + (%table-set-col-spacing table column spacing) (%table-set-col-spacings table spacing)) spacing) +(defun (setf table-col-spacing) (spacing table &optional col) + (warn "TABLE-COL-SPACING is deprecatet, use TABLE-COLUMN-SPACING instead") + (setf (table-column-spacing table col) spacing)) + (defbinding %table-get-col-spacing () unsigned-int (table table) (col unsigned-int)) @@ -1235,123 +2214,117 @@ (defbinding %table-get-col-spacing () unsigned-int (defbinding %table-get-default-col-spacing () unsigned-int (table table)) -(defun table-col-spacing (table &optional col) - (if col - (%table-get-col-spacing table col) +(defun table-column-spacing (table &optional column) + (if column + (%table-get-col-spacing table column) (%table-get-default-col-spacing table))) +(defun table-col-spacing (table &optional col) + (warn "TABLE-COL-SPACING is deprecatet, use TABLE-COLUMN-SPACING instead") + (table-column-spacing table col)) + ;;; Toolbar -(defbinding %toolbar-insert-element () widget +(defmethod initialize-instance ((toolbar toolbar) &rest initargs &key tooltips) + (if (eq tooltips t) + (apply #'call-next-method toolbar + :tooltips (make-instance 'tooltips) initargs) + (call-next-method))) + +(defbinding %toolbar-insert () nil (toolbar toolbar) - (type toolbar-child-type) - (widget (or null widget)) - (text string) - (tooltip-text string) - (tooltip-private-text string) - (icon (or null widget)) - (nil null) - (nil null) - (position int)) + (tool-item tool-item) + (position position)) -(defbinding %toolbar-insert-stock () widget +(defun toolbar-insert (toolbar tool-item &optional (position :end)) + (%toolbar-insert toolbar tool-item position) + (%tool-item-update-tooltips tool-item)) + +(defbinding toolbar-get-item-index () int (toolbar toolbar) - (stock-id string) - (tooltip-text string) - (tooltip-private-text string) - (nil null) - (nil null) - (position int)) + (item tool-item)) -(defun toolbar-insert (toolbar position element - &key tooltip-text tooltip-private-text - type icon group callback object) - (let* ((numpos (case position - (:first -1) - (:last 0) - (t position))) - (widget - (cond - ((or - (eq type :space) - (and (not type) (eq element :space))) - (%toolbar-insert-element - toolbar :space nil nil - tooltip-text tooltip-private-text nil numpos)) - ((or - (eq type :widget) - (and (not type) (typep element 'widget))) - (%toolbar-insert-element - toolbar :widget element nil - tooltip-text tooltip-private-text nil numpos)) - ((or - (eq type :stock) - (and - (not type) - (typep element 'string) - (stock-lookup element))) - (%toolbar-insert-stock - toolbar element tooltip-text tooltip-private-text numpos)) - ((typep element 'string) - (%toolbar-insert-element - toolbar (or type :button) (when (eq type :radio-button) group) - 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)) - widget)) +(defbinding toolbar-get-nth-item () tool-item + (toolbar toolbar) + (n int)) + +(defbinding toolbar-get-drop-index () int + (toolbar toolbar) + (x int) (y int)) + +(defbinding toolbar-set-drop-highlight-item () nil + (toolbar toolbar) + (tool-item tool-item) + (index int)) -(defun toolbar-append (toolbar element &key tooltip-text tooltip-private-text - type icon group callback object) - (toolbar-insert - toolbar :first element :type type :icon icon :group group - :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text - :callback callback :object object)) -(defun toolbar-prepend (toolbar element &key tooltip-text tooltip-private-text - type icon group callback object) - (toolbar-insert - toolbar :last element :type type :icon icon :group group - :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text - :callback callback :object object)) +;;; Tool button +(defmethod initialize-instance ((button tool-button) &rest initargs &key icon) + (if (and icon (not (typep icon 'widget))) + (apply #'call-next-method button :icon (create-image-widget icon) initargs) + (call-next-method))) -(defun toolbar-insert-space (toolbar position) - (toolbar-insert toolbar position :space)) -(defun toolbar-append-space (toolbar) - (toolbar-append toolbar :space)) +;;; Tool item -(defun toolbar-prepend-space (toolbar) - (toolbar-prepend toolbar :space)) +(defbinding tool-item-set-tooltip () nil + (tool-item tool-item) + (tooltips tooltips) + (tip-text string) + (tip-private string)) -(defun toolbar-enable-tooltips (toolbar) - (setf (toolbar-tooltips-p toolbar) t)) +(defun %tool-item-update-tooltips (tool-item) + (when (and + (slot-boundp tool-item 'parent) + (or + (user-data-p tool-item 'tip-text) + (user-data-p tool-item 'tip-private))) + (tool-item-set-tooltip + tool-item (toolbar-tooltips (widget-parent tool-item)) + (or (user-data tool-item 'tip-text) "") + (or (user-data tool-item 'tip-private) "")))) + +(defmethod (setf tool-item-tip-text) ((tip-text string) (tool-item tool-item)) + (setf (user-data tool-item 'tip-text) tip-text) + (%tool-item-update-tooltips tool-item) + tip-text) + +(defmethod (setf tool-item-tip-private) ((tip-private string) (tool-item tool-item)) + (setf (user-data tool-item 'tip-private) tip-private) + (%tool-item-update-tooltips tool-item) + tip-private) + +(defmethod container-add ((toolbar toolbar) (tool-item tool-item) &rest args) + (declare (ignore args)) + (prog1 + (call-next-method) + (%tool-item-update-tooltips tool-item))) -(defun toolbar-disable-tooltips (toolbar) - (setf (toolbar-tooltips-p toolbar) nil)) +(defbinding tool-item-retrieve-proxy-menu-item () widget + (tool-item tool-item)) -(defbinding toolbar-remove-space () nil - (toolbar toolbar) - (position int)) +(defbinding (tool-item-proxy-menu-item + "gtk_tool_item_get_proxy_menu_item") () menu-item + (tool-item tool-item) + (menu-item-id string)) -(defbinding toolbar-unset-icon-size () nil - (toolbar toolbar)) +(defbinding %tool-item-set-proxy-menu-item () nil + (tool-item tool-item) + (menu-item-id string) + (menu-item menu-item)) + +(defun (setf tool-item-proxy-menu-item) (menu-item menu-item-id tool-item) + (%tool-item-set-proxy-menu-item menu-item-id tool-item menu-item) + menu-item) -(defbinding toolbar-unset-style () nil - (toolbar toolbar)) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") +(defbinding tool-item-rebuild-menu () nil + (tool-item tool-item)) ;;; Editable @@ -1366,12 +2339,11 @@ (defbinding editable-get-selection-bounds (editable) nil (start int :out) (end int :out)) -(defbinding editable-insert-text - (editable text &optional (position 0)) nil +(defbinding editable-insert-text (editable text &optional (position 0)) nil (editable editable) (text string) ((length text) int) - ((or position -1) int :in-out)) + (position position :in/out)) (defun editable-append-text (editable text) (editable-insert-text editable text nil)) @@ -1414,13 +2386,35 @@ (defbinding editable-delete-selection () nil ;;; Spin button +(defbinding spin-button-configure () nil + (spin-button spin-button) + (adjustment adjustment) + (climb-rate double-float) + (digits unsigned-int)) + +(defbinding spin-button-set-range () nil + (spin-button spin-button) + (min double-float) + (max double-float)) + +(defbinding spin-button-get-range () nil + (spin-button spin-button) + (min double-float :out) + (max double-float :out)) + (defun spin-button-value-as-int (spin-button) (round (spin-button-value spin-button))) -(defbinding spin-button-spin () nil +(defbinding %spin-button-spin () nil (spin-button spin-button) (direction spin-type) - (increment single-float)) + (increment double-float)) + +(defun spin-button-spin (spin-button value) + (etypecase value + (real (%spin-button-spin spin-button :user-defined value)) + (spin-type (%spin-button-spin spin-button value 0)))) + (defbinding spin-button-update () nil (spin-button spin-button)) @@ -1436,11 +2430,12 @@ (defbinding ruler-set-range () nil (position single-float) (max-size single-float)) -(defbinding ruler-draw-ticks () nil - (ruler ruler)) - -(defbinding ruler-draw-pos () nil - (ruler ruler)) +(defbinding ruler-get-range () nil + (ruler ruler) + (lower single-float :out) + (upper single-float :out) + (position single-float :out) + (max-size single-float :out)) @@ -1483,9 +2478,10 @@ (defbinding range-set-increments () nil ;;; Scale -; (defbinding scale-draw-value () nil -; (scale scale)) - +(defbinding scale-get-layout-offsets () nil + (scale scale) + (x int :out) + (y int :out)) ;;; Progress bar @@ -1494,17 +2490,104 @@ (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)) + +(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) + (with-memory (stock-item (foreign-size (find-class 'stock-item))) + (when (%stock-lookup stock-id stock-item) + (ensure-proxy-instance 'stock-item (%stock-item-copy stock-item))))) + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") +(progn + (define-callback-marshal %stock-translate-callback string ((path string))) + + (defbinding (stock-set-translate-function "gtk_stock_set_translate_func") + (domain function) nil + (domain string) + (%stock-translate-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback))) + + +;;; Tooltip + +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0") +(progn + (defbinding tooltip-set-markup () nil + tooltip + (markup string)) + + (defbinding tooltip-set-text () nil + tooltip + (text string)) + + (defbinding %tooltip-set-icon () nil + tooltip + (icon gdk:pixbuf)) + + (defbinding %tooltip-set-icon-from-stock () nil + tooltip + (stock-id string) + icon-size) + + (defun tooltip-set-icon (tooltip icon &key (size :button)) + (etypecase icon + (gdk:pixbuf (%tooltip-set-icon tooltip icon)) + (string (%tooltip-set-icon-from-stock tooltip icon size)))) + + (defbinding tooltip-set-custom () nil + tooltip + widget) + + (defbinding tooltip-trigger-tooltip-query (&optional (display (gdk:display-get-default))) nil + (display gdk:display)) + + (defbinding tooltip-set-tip-area () nil + tooltip + gdk:rectangle)) + +;;; Tooltips - -;;; Tooltips +;; GtkTooltips has been deprecated in favor of the new tooltip API +;; introduced in in GTK+ 2.12 (defbinding tooltips-enable () nil (tooltips tooltips)) @@ -1523,120 +2606,151 @@ (defbinding tooltips-set-tip () nil (tip-text string) (tip-private string)) +(defbinding tooltips-data-get () tooltips-data + (widget widget)) + (defbinding tooltips-force-window () nil (tooltips tooltips)) +(defbinding tooltips-get-info-from-tip-window () boolean + (tip-window window) + (tooltips tooltips :out) + (current-widget widget :out)) -;;; Rc +;;; Resource Files -(defbinding rc-add-default-file (filename) nil - ((namestring (truename filename)) string)) +(defbinding rc-get-style () style + (widget widget)) -(defbinding rc-parse (filename) nil - ((namestring (truename filename)) string)) +(defbinding rc-get-style-by-paths (&key path class-path class) style + (path (or null string)) + (class-path (or null string)) + (class gtype)) + +(defbinding rc-parse () nil + (filename pathname)) (defbinding rc-parse-string () nil (rc-string string)) -(defbinding rc-reparse-all () nil) +(defbinding %rc-reparse-all () boolean) -(defbinding rc-get-style () style - (widget widget)) +(defbinding %rc-reparse-all-for-settings () boolean + (settings settings) + (force-load-p boolean)) +(defun rc-reparse-all (&optional setting force-load-p) + (if setting + (%rc-reparse-all-for-settings setting force-load-p) + (%rc-reparse-all))) +(defbinding rc-reset-styles () nil + (settings settings)) -;;; Accelerator Groups -#| -(defbinding accel-group-get-default () accel-group) +(defbinding rc-add-default-file () nil + (filename pathname)) -(deftype-method alien-ref accel-group (type-spec) - (declare (ignore type-spec)) - '%accel-group-ref) +(defbinding rc-get-default-files () + (copy-of (null-terminated-vector (copy-of string)))) -(deftype-method alien-unref accel-group (type-spec) - (declare (ignore type-spec)) - '%accel-group-unref) +(defbinding rc-get-module-dir () string) -(defbinding %accel-group-ref () accel-group - (accel-group (or accel-group pointer))) +(defbinding rc-get-im-module-path () string) -(defbinding %accel-group-unref () nil - (accel-group (or accel-group pointer))) +(defbinding rc-get-im-module-file () string) -(defbinding accel-group-activate (accel-group key modifiers) boolean - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) +(defbinding rc-get-theme-dir () string) -(defbinding accel-groups-activate (object key modifiers) boolean - (object object) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) -(defbinding accel-group-attach () nil - (accel-group accel-group) - (object object)) +;;; Settings -(defbinding accel-group-detach () nil - (accel-group accel-group) - (object object)) +(defbinding (settings-get "gtk_settings_get_for_screen") + (&optional (screen (gdk:display-get-default-screen))) settings + (screen gdk:screen)) -(defbinding accel-group-lock () nil - (accel-group accel-group)) -(defbinding accel-group-unlock () nil - (accel-group accel-group)) +;;; Plug and Socket +(defbinding socket-add-id () nil + (socket socket) + (id gdk:native-window)) -;;; Accelerator Groups Entries +(defbinding %plug-new () pointer + (id gdk:native-window)) -(defbinding accel-group-get-entry (accel-group key modifiers) accel-entry - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) +(defmethod allocate-foreign ((plug plug) &key id) + (%plug-new (or id 0))) -(defbinding accel-group-lock-entry (accel-group key modifiers) nil - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) -(defbinding accel-group-unlock-entry (accel-group key modifiers) nil - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) +;;; Link button -(defbinding accel-group-add - (accel-group key modifiers flags object signal) nil - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type) - (flags accel-flags) - (object object) - ((name-to-string signal) string)) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0") +(progn + (define-callback-marshal %link-button-uri-callback nil (link-button (link string))) -(defbinding accel-group-add (accel-group key modifiers object) nil - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type) - (object object)) + (defbinding link-button-set-uri-hook (function) pointer + (%link-button-uri-callback callback) + ((register-callback-function function) unsigned-int) + (user-data-destroy-callback callback))) -;;; Accelerator Signals +;;; Builder -(defbinding accel-group-handle-add - (object signal-id accel-group key modifiers flags) nil - (object object) - (signal-id unsigned-int) - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type) - (flags accel-flags)) +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0") +(progn + (defmethod initialize-instance ((builder builder) &key interface + (connect-signals t) (package *package*)) + (call-next-method) + (etypecase interface + (null) + (string (builder-add-from-string builder interface)) + (pathname (builder-add-from-file builder interface))) + (when connect-signals + (builder-connect-signals builder package))) + + + (defbinding builder-add-from-file () boolean + builder + pathname + (nil gerror-signal :out)) + + (defbinding builder-add-from-string () boolean + builder + (buffer string) + (-1 int) ; TODO: add gsize type + (nil gerror-signal :out)) + + (defbinding builder-get-object () gobject + builder + (name string)) + + (defbinding builder-get-objects () (gslist gobject) + builder) + + (defun intern-with-package-prefix (name default-package) + (let ((pos (position #\: name))) + (if pos + (intern + (string-upcase (subseq name (1+ pos))) + (string-upcase (subseq name 0 pos))) + (intern (string-upcase name) default-package)))) + + (define-callback %builder-connect-function nil + (builder (object gobject) (signal-name string) (handler-name string) + (connect-object gobject) connect-flags (package user-data-id)) + (format t "Connect signal ~A for ~A to ~A in default package ~A with flags ~A~%" signal-name object handler-name (find-user-data package) connect-flags) + (signal-connect + object signal-name + (intern-with-package-prefix handler-name (find-user-data package)) + :object (or connect-object object) :after (find :after connect-flags))) + + (defbinding %builder-connect-signals-full (builder package) nil + builder + (%builder-connect-function callback) + (package user-data-id)) + + (defun builder-connect-signals (builder &optional (package *package*)) + (with-user-data (id package) + (%builder-connect-signals-full builder id)))) -(defbinding accel-group-handle-remove - (object accel-group key modifiers) nil - (object object) - (accel-group accel-group) - ((gdk:keyval-from-name key) unsigned-int) - (modifiers gdk:modifier-type)) -|#