;; License along with this library; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-;; $Id: gtk.lisp,v 1.31 2005-01-13 00:17:55 espen Exp $
+;; $Id: gtk.lisp,v 1.38 2005-02-27 12:37:01 espen Exp $
(in-package "GTK")
(gtk-init)
(prog1
(gdk:display-open display)
- (system:add-fd-handler
- (gdk:display-connection-number) :input #'main-iterate-all)
- (setq lisp::*periodic-polling-function* #'main-iterate-all)
- (setq lisp::*max-event-to-sec* 0)
- (setq lisp::*max-event-to-usec* 1000))))
+ (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))))
+
+
+;;; Misc
+
+(defbinding grab-add () nil
+ (widget widget))
+
+(defbinding grab-get-current () widget)
+
+(defbinding grab-remove () nil
+ (widget widget))
+
+
+;;; About dialog
+
+#+gtk2.6
+(progn
+ (def-callback-marshal %about-dialog-activate-link-func
+ (nil (dialog about-dialog) (link (copy-of string))))
+
+ (defbinding about-dialog-set-email-hook (function) nil
+ ((callback %about-dialog-activate-link-func) pointer)
+ ((register-callback-function function) unsigned-int)
+ ((callback user-data-destroy-func) pointer))
+
+ (defbinding about-dialog-set-url-hook (function) nil
+ ((callback %about-dialog-activate-link-func) pointer)
+ ((register-callback-function function) unsigned-int)
+ ((callback user-data-destroy-func) pointer)))
;;; Acccel group
(defbinding accel-groups-from-object () (gslist accel-groups)
(object gobject))
-(defbinding accelerator-valid-p (key &optional mask) boolean
+(defbinding accelerator-valid-p (key &optional modifiers) boolean
(key unsigned-int)
(modifiers gdk:modifier-type))
(container-add bin child)
child)
-(defmethod create-callback-function ((bin bin) function arg1)
- (if (eq arg1 :child)
+(defmethod compute-signal-function ((bin bin) signal function object)
+ (declare (ignore signal))
+ (if (eq object :child)
#'(lambda (&rest args)
(apply function (bin-child bin) (rest args)))
(call-next-method)))
(check-menu-item check-menu-item))
-
-;;; Clipboard
-
-
;;; Color selection
(defbinding (color-selection-is-adjusting-p
(initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
-(defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
- (or
- (cadr (assoc id (rest (type-expand-1 'response-type))))
- (let ((response-ids (object-data dialog 'response-id-key)))
- (cond
- ((and response-ids (position id response-ids :test #'equal)))
- (create-p
+(defun dialog-response-id (dialog response &optional create-p error-p)
+ "Returns a numeric response id"
+ (if (typep response 'response-type)
+ (response-type-to-int response)
+ (let ((responses (object-data dialog 'responses)))
+ (cond
+ ((and responses (position response responses :test #'equal)))
+ (create-p
(cond
- (response-ids
- (vector-push-extend id response-ids)
- (1- (length response-ids)))
+ (responses
+ (vector-push-extend response responses)
+ (1- (length responses)))
(t
(setf
- (object-data dialog 'response-id-key)
- (make-array 1 :adjustable t :fill-pointer t :initial-element id))
+ (object-data dialog 'responses)
+ (make-array 1 :adjustable t :fill-pointer t
+ :initial-element response))
0)))
(error-p
- (error "Invalid response: ~A" id))))))
-
-(defun %dialog-find-response-id (dialog response-id-num)
- (if (< response-id-num 0)
- (car
- (rassoc
- (list response-id-num)
- (rest (type-expand-1 'response-type)) :test #'equal))
- (aref (object-data dialog 'response-id-key) response-id-num )))
-
-
-(defmethod signal-connect ((dialog dialog) signal function &key object after)
- (let ((response-id-num (%dialog-find-response-id-num dialog signal)))
- (cond
- (response-id-num
- (call-next-method
- dialog 'response
- #'(lambda (dialog id)
- (when (= id response-id-num)
- (cond
- ((eq object t) (funcall function dialog))
- (object (funcall function object))
- (t (funcall function)))))
- :object t :after after))
- ((call-next-method)))))
+ (error "Invalid response: ~A" response))))))
+
+(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)))
+
+
+(defmethod compute-signal-id ((dialog dialog) signal)
+ (if (dialog-response-id dialog signal)
+ (ensure-signal-id 'response dialog)
+ (call-next-method)))
+(defmethod compute-signal-function ((dialog dialog) signal function object)
+ (declare (ignore function object))
+ (let ((callback (call-next-method))
+ (id (dialog-response-id dialog signal)))
+ (if id
+ #'(lambda (dialog response)
+ (when (= response id)
+ (funcall callback dialog)))
+ callback)))
(defbinding dialog-run () nil
(dialog dialog))
-(defbinding dialog-response (dialog response-id) nil
+(defbinding dialog-response (dialog response) nil
(dialog dialog)
- ((%dialog-find-response-id-num dialog response-id nil t) int))
+ ((dialog-response-id dialog response nil t) int))
(defbinding %dialog-add-button () button
(dialog dialog)
(text string)
- (response-id-num int))
+ (response-id int))
(defun dialog-add-button (dialog label &optional (response label)
&key default object after)
"Adds a button to the dialog."
- (let* ((id (if (functionp response)
- label
- response))
- (id-num (%dialog-find-response-id-num dialog id t))
- (button (%dialog-add-button dialog label id-num)))
+ (let* ((signal (if (functionp response)
+ label
+ response))
+ (id (dialog-response-id dialog signal t))
+ (button (%dialog-add-button dialog label id)))
(when (functionp response)
- (signal-connect dialog id response :object object :after after))
+ (signal-connect dialog signal response :object object :after after))
(when default
- (%dialog-set-default-response dialog id-num))
+ (%dialog-set-default-response dialog id))
button))
-(defbinding %dialog-add-action-widget () button
+(defbinding %dialog-add-action-widget () nil
(dialog dialog)
(action-widget widget)
- (response-id-num int))
+ (response-id int))
(defun dialog-add-action-widget (dialog widget &optional (response widget)
&key default object after)
- (let* ((id (if (functionp response)
- widget
- response))
- (id-num (%dialog-find-response-id-num dialog id t)))
- (%dialog-add-action-widget dialog widget id-num)
+ (let* ((signal (if (functionp response)
+ widget
+ response))
+ (id (dialog-response-id dialog signal t)))
+ (unless (widget-hidden-p widget)
+ (widget-show widget))
+ (%dialog-add-action-widget dialog widget id)
(when (functionp response)
- (signal-connect dialog id response :object object :after after))
+ (signal-connect dialog signal response :object object :after after))
(when default
- (%dialog-set-default-response dialog id-num))
+ (%dialog-set-default-response dialog id))
widget))
(defbinding %dialog-set-default-response () nil
(dialog dialog)
- (response-id-num int))
+ (response-id int))
-(defun dialog-set-default-response (dialog response-id)
+(defun dialog-set-default-response (dialog response)
(%dialog-set-default-response
- dialog (%dialog-find-response-id-num dialog response-id nil t)))
+ dialog (dialog-response-id dialog response nil t)))
-(defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
+(defbinding dialog-set-response-sensitive (dialog response sensitive) nil
(dialog dialog)
- ((%dialog-find-response-id-num dialog response-id nil t) int)
+ ((dialog-response-id dialog response nil t) int)
(sensitive boolean))
#+gtk2.6
-(defbinding alternative-dialog-button-order-p(&optional screen)
- (screen (or null screen)))
+(defbinding alternative-dialog-button-order-p (&optional screen) boolean
+ (screen (or null gdk:screen)))
#+gtk2.6
(defbinding (dialog-set-alternative-button-order
(dialog new-order)
(dialog dialog)
((length new-order) int)
- ((map 'vector #'(lambda (id)
- (%dialog-find-response-id-num dialog id nil t))
+ ((map 'vector #'(lambda (response)
+ (dialog-response-id dialog response nil t))
new-order) (vector int)))
(defmethod container-add ((dialog dialog) (child widget) &rest args)
(apply #'container-add (dialog-vbox dialog) child args))
+
(defmethod container-remove ((dialog dialog) (child widget))
(container-remove (dialog-vbox dialog) child))
(completion entry-completion)
((callback %entry-completion-match-func) pointer)
((register-callback-function function) unsigned-int)
- ((callback %destroy-user-data) pointer))
+ ((callback user-data-destroy-func) pointer))
(defbinding entry-completion-complete () nil
(completion entry-completion))
#+gtk2.6
(defbinding file-filter-add-pixbuf-formats () nil
- (filter file-filter)
- (pattern string))
+ (filter file-filter))
(def-callback-marshal %file-filter-func (boolean file-filter-info))
-(defbinding file-filter-add-custom () nil
+(defbinding file-filter-add-custom (filter needed function) nil
(filter file-filter)
(needed file-filter-flags)
((callback %file-filter-func) pointer)
((register-callback-function function) unsigned-int)
- ((callback %destroy-user-data) pointer))
+ ((callback user-data-destroy-func) pointer))
(defbinding file-filter-get-needed () file-filter-flags
(filter file-filter))
;;; Menu tool button
#+gtk2.6
-(defbinding menu-tool-button-set-arrow-tip () nil
+(defbinding menu-tool-button-set-arrow-tooltip () nil
(menu-tool-button menu-tool-button)
(tooltips tooltips)
(tip-text string)
(editable editable)
(text string)
((length text) int)
- (position position-type :in-out))
+ (position position :in-out))
(defun editable-append-text (editable text)
(editable-insert-text editable text nil))
(defun spin-button-value-as-int (spin-button)
(round (spin-button-value spin-button)))
-(defbinding spin-button-spin () nil
+(defbinding %spin-button-spin () nil
(spin-button spin-button)
(direction spin-type)
- (increment single-float))
+ (increment double-float))
+
+(defun spin-button-spin (spin-button value)
+ (etypecase value
+ (real (%spin-button-spin spin-button :spin-user-defined value))
+ (spin-type (%spin-button-spin spin-button value 0))))
+
(defbinding spin-button-update () nil
(spin-button spin-button))
~mdw / clg / blobdiff