-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2006 Espen S. Johnsen <espen@users.sf.net>
;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtk.lisp,v 1.40 2005-04-17 21:39:04 espen Exp $
+;; $Id: gtk.lisp,v 1.83 2007-09-06 14:18:56 espen Exp $
(in-package "GTK")
(format nil "Gtk+ v~A.~A" major minor)
(format nil "Gtk+ v~A.~A.~A" major minor micro))))
-(defbinding get-default-language () (copy-of pango:language))
+(defun clg-version ()
+ "clg 0.93")
+
+
+;;;; Initalization and display handling
+(defparameter *event-poll-interval* 10000) ; in microseconds
-;;;; Initalization
-(defbinding (gtk-init "gtk_parse_args") () nil
+(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)
- (add-fd-handler (gdk:display-connection-number) :input #'main-iterate-all)
- (setq *periodic-polling-function* #'main-iterate-all)
- (setq *max-event-to-sec* 0)
- (setq *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))
+
+
+#?(sbcl>= 1 0 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)) :fd-handler
+ #?-(or (featurep :cmu) (sbcl< 1 0 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 ~A must be used in combination with asynchronous event handling on this platform. See the README file and <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information." style)))
+
+ #?(or (featurep :cmu) (sbcl< 1 0 6))
+ (progn
+ (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))))))))
+ (setq *periodic-polling-function* #'main-iterate-all)
+ (setq *max-event-to-sec* 0)
+ (setq *max-event-to-usec* *event-poll-interval*))
+
+ #+(and clisp readline)
+ ;; Readline will call the event hook at most ten times per second
+ (setf readline:event-hook #'main-iterate-all)
+
+ #?-(or (featurep :cmu) (sbcl< 1 0 6))
+ ;; When running in Slime we need to hook into the Swank server
+ ;; to handle events asynchronously.
+ (if (find-package "SWANK")
+ (let ((read-from-emacs (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK")))
+ (stream (funcall (find-symbol "CONNECTION.SOCKET-IO" "SWANK") (symbol-value (find-symbol "*EMACS-CONNECTION*" "SWANK")))))
+ (setf (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK"))
+ #'(lambda ()
+ (loop
+ (case (socket-status (cons stream :input) 0 *event-poll-interval*)
+ ((:input :eof) (return (funcall read-from-emacs)))
+ (otherwise (main-iterate-all)))))))
+ #-(and clisp readline)
+ (warn "Asynchronous event handling not supported on this platform. An explicit main loop has to be started."))
+
+ (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 <http://common-lisp.net/project/slime/doc/html/slime_45.html> 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")
+ (push #'(lambda (form)
+ (within-main-loop (eval form)))
+ (symbol-value (find-symbol "*SLIME-REPL-EVAL-HOOKS*" "SWANK"))))))
+
+#-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-remove () nil
(widget widget))
+(defbinding get-default-language () (copy-of pango:language))
+
;;; About dialog
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(progn
- (def-callback-marshal %about-dialog-activate-link-func
- (nil (dialog about-dialog) (link (copy-of string))))
+ (define-callback-marshal %about-dialog-activate-link-callback nil
+ (about-dialog (link string)))
(defbinding about-dialog-set-email-hook (function) nil
- ((callback %about-dialog-activate-link-func) pointer)
+ (%about-dialog-activate-link-callback callback)
((register-callback-function function) unsigned-int)
- ((callback user-data-destroy-func) pointer))
+ (user-data-destroy-callback callback))
(defbinding about-dialog-set-url-hook (function) nil
- ((callback %about-dialog-activate-link-func) pointer)
+ (%about-dialog-activate-link-callback callback)
((register-callback-function function) unsigned-int)
- ((callback user-data-destroy-func) pointer)))
+ (user-data-destroy-callback callback)))
;;; Acccel group
(gclosure gclosure))
(defun accel-group-connect (group accelerator function &optional flags)
- (multiple-value-bind (key modifiers) (accelerator-parse accelerator)
+ (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 :return))
+ ((make-callback-closure function) gclosure :in/return))
(defbinding %accel-group-disconnect (group gclosure) boolean
(group accel-group)
(etypecase accelerator
(gclosure (%accel-group-disconnect group accelerator))
(string
- (multiple-value-bind (key modifiers) (accelerator-parse accelerator)
+ (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) (accelerator-parse accelerator)
+ (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
(%accel-groups-activate object key modifiers)))
-(defbinding accel-groups-from-object () (gslist accel-groups)
+(defbinding accel-groups-from-object () (gslist accel-group)
(object gobject))
(defbinding accelerator-valid-p (key &optional modifiers) boolean
(key unsigned-int :out)
(modifiers gdk:modifier-type :out))
-(defun accelerator-parse (accelerator)
+(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))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding accelerator-get-label () string
(key unsigned-int)
(modifiers 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))
(modifiers gdk:modifier-type))
(defun accel-map-add-entry (path accelerator)
- (multiple-value-bind (key modifiers) (accelerator-parse accelerator)
+ (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
(%accel-map-add-entry path key modifiers)))
-(defbinding accel-map-lookup-entry () boolean
+(defbinding %accel-map-lookup-entry () boolean
(path string)
- (key pointer)) ;accel-key))
+ ((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)
(replace boolean))
(defun accel-map-change-entry (path accelerator &optional replace)
- (multiple-value-bind (key modifiers) (accelerator-parse accelerator)
+ (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
(%accel-map-change-entry path key modifiers replace)))
(defbinding accel-map-load () nil
(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
-;;; Accessible
+;;; Accessibility
(defbinding accessible-connect-widget-destroyed () nil
(accessible accessible))
(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)))
+
+
+
;;; Aspect frame
(container-add bin child)
child)
-(defmethod compute-signal-function ((bin bin) signal function object)
+(defmethod compute-signal-function ((bin bin) signal function object args)
(declare (ignore signal))
(if (eq object :child)
- #'(lambda (&rest args)
- (apply function (bin-child bin) (rest args)))
+ #'(lambda (&rest emission-args)
+ (apply function (bin-child bin) (nconc (rest emission-args) args)))
(call-next-method)))
(defmethod initialize-instance ((button button) &rest initargs &key stock)
(if stock
- (apply #'call-next-method button :label stock :use-stock t initargs)
+ (apply #'call-next-method button
+ :label stock :use-stock t :use-underline t initargs)
(call-next-method)))
(combo-box combo-box)
(text string))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding combo-box-get-active-text () string
(combo-box combo-box))
(defmethod shared-initialize ((dialog dialog) names &rest initargs
&key button buttons)
- (declare (ignore button buttons))
+ (declare (ignore names button buttons))
(prog1
(call-next-method)
(initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
"Returns a numeric response id"
(if (typep response 'response-type)
(response-type-to-int response)
- (let ((responses (object-data dialog 'responses)))
+ (let ((responses (user-data dialog 'responses)))
(cond
((and responses (position response responses :test #'equal)))
(create-p
(1- (length responses)))
(t
(setf
- (object-data dialog 'responses)
+ (user-data dialog 'responses)
(make-array 1 :adjustable t :fill-pointer t
:initial-element response))
0)))
(defun dialog-find-response (dialog id)
"Finds a symbolic response given a numeric id"
- (if (< id 0)
- (int-to-response-type id)
- (aref (object-data dialog 'responses) id)))
+ (cond
+ ((not (numberp id)) id)
+ ((< id 0) (int-to-response-type id))
+ ((aref (user-data dialog 'responses) id))))
(defmethod compute-signal-id ((dialog dialog) signal)
(ensure-signal-id 'response dialog)
(call-next-method)))
-(defmethod compute-signal-function ((dialog dialog) signal function object)
- (declare (ignore function object))
+(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)))
- (if id
- #'(lambda (dialog response)
- (when (= response id)
- (funcall callback dialog)))
- callback)))
+ (cond
+ (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 () nil
(dialog dialog))
((dialog-response-id dialog response nil t) int)
(sensitive boolean))
-#+gtk2.6
+#?(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)))
-#+gtk2.6
+#?(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)
+ "gtk_dialog_set_alternative_button_order_from_array")
+ (dialog new-order) nil
(dialog dialog)
((length new-order) int)
((map 'vector #'(lambda (response)
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))))
+
+
(defmethod container-add ((dialog dialog) (child widget) &rest args)
(apply #'container-add (dialog-vbox dialog) child args))
(setf (container-children (dialog-vbox dialog)) children))
+;;; Drawing Area
+
+(defun drawing-area-scroll (drawing-area dx dy)
+ (gdk:window-scroll (widget-window drawing-area) dx dy))
+
+
;;; Entry
(defbinding entry-get-layout-offsets () nil
;;; Entry Completion
-(def-callback-marshal %entry-completion-match-func
- (boolean entry-completion string (copy-of tree-iter)))
+(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)
- ((callback %entry-completion-match-func) pointer)
+ (%entry-completion-match-callback callback)
((register-callback-function function) unsigned-int)
- ((callback user-data-destroy-func) pointer))
+ (user-data-destroy-callback callback))
(defbinding entry-completion-complete () nil
(completion entry-completion))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding entry-completion-insert-prefix () nil
(completion entry-completion))
(prog1
(call-next-method)
(when pixbuf-formats
- #-gtk2.6(warn "Initarg :PIXBUF-FORMATS not supportet in this version of Gtk")
- #+gtk2.6(file-filter-add-pixbuf-formats file-filter))
+ #?-(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
(filter file-filter)
(pattern string))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding file-filter-add-pixbuf-formats () nil
(filter file-filter))
-(def-callback-marshal %file-filter-func (boolean file-filter-info))
+(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)
- ((callback %file-filter-func) pointer)
+ (%file-filter-callback callback)
((register-callback-function function) unsigned-int)
- ((callback user-data-destroy-func) pointer))
+ (user-data-destroy-callback callback))
(defbinding file-filter-get-needed () file-filter-flags
(filter file-filter))
((or list vector) (make-instance 'image :pixmap source))
(gdk:pixmap (make-instance 'image :pixmap source :mask mask))))
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
+(defbinding image-clear () nil
+ (image image))
+
+
;;; Image menu item
"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 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)
;;; Menu tool button
-#+gtk2.6
+#?(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)
;;; Message dialog
-(defmethod initialize-instance ((dialog message-dialog)
- &key (message-type :info) (buttons :close)
- flags text #+gtk 2.6 secondary-text
- transient-parent)
- (setf
- (slot-value dialog 'location)
- (%message-dialog-new transient-parent flags message-type buttons))
+(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))
- #+gtk2.6
+ #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(when secondary-text
(message-dialog-format-secondary-markup dialog secondary-text))
- (call-next-method))
+ (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
(message-dialog message-dialog)
(markup string))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding message-dialog-format-secondary-text () nil
(message-dialog message-dialog)
(text string))
-#+gtk2.6
+#?(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 radio-menu-item)
(group pointer))
+(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 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)
(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 ((widget widget) function &key object after)
- (if object
- (signal-connect widget 'clicked
- #'(lambda (object)
- (when (slot-value widget 'active)
- (funcall function object (slot-value widget 'value))))
- :object object :after after)
- (signal-connect widget 'clicked
- #'(lambda ()
- (when (slot-value widget 'active)
- (funcall function (slot-value widget 'value))))
- :after after)))
+(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
;;; Window
(defmethod initialize-instance ((window window) &rest initargs
- &key accel-group accel-groups)
+ &key display accel-group accel-groups)
(declare (ignore accel-group accel-groups))
(prog1
- (call-next-method)
+ (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)
(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 min-width min-height
+(defun window-set-geometry-hints (window &key widget min-width min-height
max-width max-height base-width base-height
- width-inc height-inc min-aspect max-aspect
- (gravity nil gravity-p) min-size max-size)
+ 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)
:width-inc (or width-inc 0)
:height-inc (or height-inc 0)
:min-aspect (or min-aspect 0)
- :max-aspect (or max-aspect 0)
- :gravity gravity))
+ :max-aspect (or max-aspect 0)))
(mask ()))
- (when (or min-size min-width min-height)
+ (when (or min-width min-height)
(push :min-size mask))
- (when (or max-size max-width max-height)
+ (when (or max-width max-height)
(push :max-size mask))
(when (or base-width base-height)
(push :base-size mask))
(push :resize-inc mask))
(when (or min-aspect max-aspect)
(push :aspect mask))
- (when gravity-p
- (push :win-gravity mask))
- (%window-set-geometry-hints window geometry mask)))
+ (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.")
(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))
(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))
(defbinding window-get-position () nil
(defbinding %window-set-default-icon () nil
(icons (glist 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)
(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))
((%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
(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))
(notebook-get-nth-page notebook (notebook-current-page-num notebook))))
(defun (setf notebook-current-page) (page notebook)
- (setf (notebook-current-page notebook) (notebook-page-num notebook page)))
+ (setf (notebook-current-page-num notebook) (notebook-page-num notebook page)))
(defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
(notebook page) 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))
(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))
(top-attach unsigned-int)
(bottom-attach unsigned-int))
-(def-callback-marshal %menu-position-func (nil (menu menu) (x int) (y int) (push-in boolean)))
+(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)))
(with-callback-function (id callback)
(%menu-popup
menu parent-menu-shell parent-menu-item
- (callback %menu-position-func) 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)))
(%menu-set-active menu (%menu-position menu child))
child)
-(defcallback %menu-detach-func (nil (widget widget) (menu menu))
- (funcall (object-data menu 'detach-func) widget menu))
+(define-callback %menu-detach-callback nil ((widget widget) (menu menu))
+ (funcall (user-data menu 'detach-func) widget menu))
-(defbinding %menu-attach-to-widget () nil
+(defbinding %menu-attach-to-widget (menu widget) nil
(menu menu)
(widget widget)
- ((callback %menu-detach-func) pointer))
+ (%menu-detach-callback callback))
(defun menu-attach-to-widget (menu widget function)
- (setf (object-data menu 'detach-func) function)
+ (setf (user-data menu 'detach-func) function)
(%menu-attach-to-widget menu widget))
(defbinding menu-detach () nil
(menu menu))
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding menu-get-for-attach-widget () (copy-of (glist widget))
(widget widget))
(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))
(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
(%tool-item-set-proxy-menu-item menu-item-id tool-item menu-item)
menu-item)
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding tool-item-rebuild-menu () nil
(tool-item tool-item))
(editable editable)
(text string)
((length text) int)
- (position position :in-out))
+ (position position :in/out))
(defun editable-append-text (editable text)
(editable-insert-text editable text nil))
(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))
(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))))
+ (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)))
+
+
;;; Tooltips
(current-widget widget :out))
-;;; Rc
+;;; Resource Files
+
+(defbinding rc-get-style () style
+ (widget widget))
-(defbinding rc-add-default-file (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 (filename) nil
- ((namestring (truename filename)) string))
+(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))
+
+(defbinding rc-add-default-file () nil
+ (filename pathname))
+
+(defbinding rc-get-default-files ()
+ (copy-of (null-terminated-vector (copy-of string))))
+
+(defbinding rc-get-module-dir () string)
+
+(defbinding rc-get-im-module-path () string)
+
+(defbinding rc-get-im-module-file () string)
+
+(defbinding rc-get-theme-dir () string)
+
+
+;;; Settings
+
+(defbinding (settings-get "gtk_settings_get_for_screen")
+ (&optional (screen (gdk:display-get-default-screen))) settings
+ (screen gdk:screen))
+
+
+;;; Plug and Socket
+
+(defbinding socket-add-id () nil
+ (socket socket)
+ (id gdk:native-window))
+
+(defbinding %plug-new () pointer
+ (id gdk:native-window))
+
+(defmethod allocate-foreign ((plug plug) &key id)
+ (%plug-new (or id 0)))
+
+
+;;;; New stuff in Gtk+ 2.10
+
+;;; Link button
+
+#?(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 link-button-set-uri-hook (function) pointer
+ (%link-button-uri-callback callback)
+ ((register-callback-function function) unsigned-int)
+ (user-data-destroy-callback callback)))
~mdw / clg / blobdiff