;; 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.75 2007-06-20 14:28:48 espen Exp $
+;; $Id: gtk.lisp,v 1.94 2008-05-06 00:04:42 espen Exp $
(in-package "GTK")
(format nil "Gtk+ v~A.~A.~A" major minor micro))))
(defun clg-version ()
- "clg 0.93")
+ "clg 0.94")
;;;; Initalization and display handling
-(defparameter *event-poll-interval* 10000) ; in microseconds
+(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."
(clg-init display t))
-#?(sbcl>= 1 0 6)
+#?(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)))
: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))
+ (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 ~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)))
+ (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/Communication-style.html> for more information." style)))
- #?(or (featurep :cmu) (sbcl< 1 0 6))
+ #?(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 6))
(progn
(signal-connect (gdk:display-manager) 'display-opened
#'(lambda (display)
(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*))
+ #?(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 :cmu) (sbcl< 1 0 6))
+ #?(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.
- (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)))))))
+ (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."))
(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:threads-init)
(gdk:with-global-lock
(gdk:display-open display)
#+win32(gdk:timeout-add-with-lock (/ *event-poll-interval* 1000)
;; 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)))
- swank::*slime-repl-eval-hooks*))))
+ (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)
(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
(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
(defmethod compute-signal-function ((bin bin) signal function object args)
(declare (ignore signal))
(if (eq object :child)
- #'(lambda (&rest emission-args)
- (apply function (bin-child bin) (nconc (rest emission-args) args)))
+ #'(lambda (bin &rest emission-args)
+ (apply function (bin-child bin) (nconc emission-args args)))
(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
(defun dialog-find-response (dialog id)
"Finds a symbolic response given a numeric id"
- (if (< id 0)
- (int-to-response-type id)
- (aref (user-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)
(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))
(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))
;;; 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
+ 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))
#?(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
(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.")
icons)
(defbinding %window-set-default-icon () nil
- (icons (glist gdk:pixbuf)))
+ (icon gdk:pixbuf))
(defgeneric (setf window-default-icon) (icon))
(defun spin-button-spin (spin-button value)
(etypecase value
- (real (%spin-button-spin spin-button :spin-user-defined value))
+ (real (%spin-button-spin spin-button :user-defined value))
(spin-type (%spin-button-spin spin-button value 0))))
((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))
(%plug-new (or id 0)))
-;;;; New stuff in Gtk+ 2.10
-
;;; Link button
#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
(%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