;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 1999-2006 Espen S. Johnsen <espen@users.sf.net>
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
;; 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.59 2006/02/28 16:29:45 espen Exp $
+;; $Id: gtk.lisp,v 1.90 2008/02/29 18:34:19 espen Exp $
(in-package "GTK")
(format nil "Gtk+ v~A.~A.~A" major minor micro))))
(defun clg-version ()
- "clg 0.92")
+ "clg 0.93")
-;;;; Initalization
+;;;; Initalization and display handling
+
+(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"
- #+sbcl(when (and
- (find-package "SWANK")
- (eq (symbol-value (find-symbol "*COMMUNICATION-STYLE*" "SWANK")) :spawn))
- (error "When running clg in Slime the communication style :spawn can not be used. See the README file and <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information."))
-
+(defun clg-init (&optional display multi-threading-p)
+ "Initializes the system and starts event handling."
(unless (gdk:display-get-default)
- (gdk:gdk-init)
- (unless (gtk-init)
- (error "Initialization of GTK+ failed."))
- (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))
+
+
+#?(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 <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information." style)))
+
+ #?(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 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)
+ #?(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*))
+
+ #+(and clisp readline)
+ ;; Readline will call the event hook at most ten times per second
+ (setf readline:event-hook #'main-iterate-all)
+
+ #?(or (featurep :clisp) (and (sbcl>= 1 0 6) (sbcl< 1 0 15 6)))
+ ;; When running in Slime we need to hook into the Swank server
+ ;; to handle events asynchronously.
+ (unless (and
+ (find-package "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)))))))))))
+ #-(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")
+ (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
;;; About dialog
-#+gtk2.6
+#?(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 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)
(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)
(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))
;;; Accel map
-(defbinding (accel-map-init "_gtk_accel_map_init") () nil)
-
(defbinding %accel-map-add-entry () nil
(path string)
(key unsigned-int)
(defbinding %accel-map-lookup-entry () boolean
(path string)
- ((make-instance 'accel-key) accel-key :return))
+ ((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)
(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)))
;;; 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
(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))
(when (functionp response)
(signal-connect dialog signal response :object object :after after))
(when default
+ (setf (widget-can-default-p widget) t)
(%dialog-set-default-response dialog id))
widget))
((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) nil
new-order) (vector int)))
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(progn
(defbinding %dialog-get-response-for-widget () int
(dialog dialog)
(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
(defbinding entry-completion-complete () nil
(completion entry-completion))
-#+gtk2.6
+#?(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))
(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))
((or list vector) (make-instance 'image :pixmap source))
(gdk:pixmap (make-instance 'image :pixmap source :mask mask))))
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(defbinding image-clear () nil
(image image))
(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))
;;; 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 allocate-foreign ((dialog message-dialog) &key (message-type :info)
- (buttons :close) flags transient-parent)
- (%message-dialog-new transient-parent flags message-type buttons))
-
-
-(defmethod shared-initialize ((dialog message-dialog) names
- &key text #+gtk 2.6 secondary-text)
+ 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))
;;; 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)))
(not (zerop (length (window-title window)))))
(print-unreadable-object (window stream :type t :identity nil)
(format stream "~S at 0x~X"
- (window-title window) (sap-int (foreign-location window))))
+ (window-title window) (pointer-address (foreign-location window))))
(call-next-method)))
(defbinding window-set-wmclass () nil
(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))
-#-gtk2.8
+#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(defbinding window-present () nil
(window window))
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(progn
(defbinding %window-present () nil
(window window))
(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
(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
child)
(define-callback %menu-detach-callback nil ((widget widget) (menu menu))
- (funcall (object-data menu 'detach-func) widget menu))
+ (funcall (user-data menu 'detach-func) widget menu))
(defbinding %menu-attach-to-widget (menu widget) nil
(menu menu)
(%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)
- (with-allocated-memory (stock-item (foreign-size (find-class 'stock-item)))
+ (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)))))
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(progn
(define-callback-marshal %stock-translate-callback string ((path string)))
((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-from-stock-icon () nil
+;; tooltip
+;; (stock-id string)
+;; icon-size)
+
+;; (defbinding %tooltip-set-custom () nil
+;; tooltip
+;; widget)
+
+;; (defun tooltip-set (tooltip value &key (markup t) (icon-size :button))
+;; (etypecase value
+;; (string (if markup
+;; (tooltip-set-markup tooltip value)
+;; (tooltip-set-text tooltip value)))
+;; (pixbuf (tooltip-set-icon tooltip value))
+;; (keyword (tooltip-set-icon-from-stock tooltip value icon-size))
+
-;;; 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))
(defmethod allocate-foreign ((plug plug) &key id)
(%plug-new (or id 0)))
+
+
+;;; 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)))
+
+
+;;; Builder
+
+#?(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))))
+
~mdw / clg / blobdiff