;; 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.34 2005-02-10 00:15:51 espen Exp $
+;; $Id: gtk.lisp,v 1.41 2005-04-19 08:11:39 espen Exp $
(in-package "GTK")
;;;; 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))
"Initializes the system and starts the event handling"
(unless (gdk:display-get-default)
(gdk:gdk-init)
- (gtk-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 *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
;;; Accel map
+;(defbinding (accel-map-init "_gtk_accel_map_init") () nil)
+
(defbinding %accel-map-add-entry () nil
(path string)
(key unsigned-int)
(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)))
(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
(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))
;;; Label
+(defmethod shared-initialize ((label label) names &key pattern)
+ (declare (ignore names))
+ (call-next-method)
+ (when pattern
+ (setf (label-pattern label) pattern)))
+
(defbinding label-get-layout-offsets () nil
(label label)
(x int :out)
"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))
+
+(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)
;;; Message dialog
-(defmethod initialize-instance ((dialog message-dialog) &rest initargs
- &key (type :info) (buttons :close) ; or :ok?
- flags message parent)
- (remf initargs :parent)
+(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 parent flags type buttons nil))
- (message-dialog-set-markup dialog message)
- (apply #'call-next-method dialog initargs))
+ (%message-dialog-new transient-parent flags message-type buttons))
+ (when text
+ (message-dialog-set-markup dialog text))
+ #+gtk2.6
+ (when secondary-text
+ (message-dialog-format-secondary-markup dialog secondary-text))
+ (call-next-method))
(defbinding %message-dialog-new () pointer
(flags dialog-flags)
(type message-type)
(buttons buttons-type)
- (message (or null string)))
-
-(defbinding %message-dialog-new-with-markup () pointer
- (parent (or null window))
- (flags dialog-flags)
- (type message-type)
- (buttons buttons-type)
- (message string))
+ (nil null))
(defbinding message-dialog-set-markup () nil
(message-dialog message-dialog)
(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
(scrolled-window scrolled-window)
(child widget))
-(defmethod initialize-instance ((window scrolled-window) &rest initargs
- &key policy)
- (if policy
- (apply #'call-next-method window
- :vscrollbar-policy policy :hscrollbar-policy policy initargs)
- (call-next-method)))
+(defmethod shared-initialize ((window scrolled-window) names &key policy)
+ (declare (ignore names))
+ (when policy
+ (setf (slot-value window 'hscrollbar-policy) policy)
+ (setf (slot-value window 'vscrollbar-policy) policy))
+ (call-next-method))
;;; Statusbar
(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