;; 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.87 2008-01-02 15:57:57 espen Exp $
+;; $Id: gtk.lisp,v 1.98 2008-11-25 22:11:08 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 ~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))
+ (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 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
- (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))
+ (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 :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."))
+ #?(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))
(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
(text string))
#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
-(defbinding combo-box-get-active-text () string
+(defbinding combo-box-get-active-text () (or null string)
(combo-box combo-box))
(defbinding combo-box-popup () nil
(funcall callback dialog (dialog-find-response dialog response))))
(callback))))
-(defbinding dialog-run () nil
+(defbinding %dialog-run () int
(dialog dialog))
+(defun dialog-run (dialog)
+ (dialog-find-response dialog (%dialog-run dialog)))
(defbinding dialog-response (dialog response) nil
(dialog dialog)
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))))
;;; 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))
+#?(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))
~mdw / clg / blobdiff