X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/61f0bf539beac04730c31bd69a4a9b258d4401fe..4c371500f9bbd981090b5d3a93a7b6afa28c7f72:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 2696173..269be02 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -1,5 +1,5 @@
 ;; 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
@@ -20,7 +20,7 @@
 ;; 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.57 2006-02-26 23:38:03 espen Exp $
+;; $Id: gtk.lisp,v 1.67 2007-01-07 20:23:22 espen Exp $
 
 
 (in-package "GTK")
@@ -45,7 +45,7 @@ (defun gtk-version ()
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
 (defun clg-version ()
-  "clg 0.91 version")
+  "clg 0.93")
 
 
 ;;;; Initalization
@@ -55,6 +55,8 @@ (defbinding (gtk-init "gtk_parse_args") () boolean
   (nil null)
   (nil null))
 
+(defparameter *event-poll-interval* 10000)
+
 (defun clg-init (&optional display)
   "Initializes the system and starts the event handling"
   #+sbcl(when (and 
@@ -63,15 +65,67 @@ (defun clg-init (&optional display)
 	  (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."))
 
   (unless (gdk:display-get-default)
+    #?(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."))
     (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))))
+      #+(or cmu sbcl)
+      (progn
+	(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* *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)
+      #+clisp      
+      ;; 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:socket-status (cons stream :input) 0 *event-poll-interval*)
+		    (:input (return (funcall read-from-emacs)))
+		    (:eof (read-char stream))
+		    (otherwise (main-iterate-all)))))))
+	#-readline(warn "Not running in Slime and Readline support is missing, so the Gtk main loop has to be invoked explicit.")))))
+
+#+sbcl	  
+(defun clg-init-with-threading (&optional display)
+  "Initializes the system and starts the event handling"
+  (unless (gdk:display-get-default)
+    #?(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)
+    (gdk:threads-set-lock-functions)
+    (unless (gtk-init)
+      (error "Initialization of GTK+ failed."))
+    (sb-thread:make-thread 
+     #'(lambda () 
+	 (gdk:display-open display)
+	 (gdk:with-global-lock (main)))
+     :name "gtk event loop")))
+
+
+;;; Generic functions 
+
+(defgeneric add-to-radio-group (item1 item2))
+(defgeneric activate-radio-widget (item))
+(defgeneric (setf tool-item-tip-text) (tip-text tool-item))
+(defgeneric (setf tool-item-tip-private) (tip-private tool-item))
+
 
 
 ;;; Misc
@@ -89,7 +143,7 @@ (defbinding get-default-language () (copy-of pango:language))
 
 ;;; 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)))
@@ -123,7 +177,7 @@ (defun accel-group-connect (group accelerator function &optional flags)
 (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)
@@ -224,7 +278,7 @@ (defbinding accelerator-name () string
   (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))
@@ -250,8 +304,6 @@ (defbinding accel-label-refetch () boolean
 
 ;;; Accel map
 
-(defbinding (accel-map-init "_gtk_accel_map_init") () nil)
-
 (defbinding %accel-map-add-entry () nil
   (path string)
   (key unsigned-int)
@@ -263,7 +315,7 @@ (defun accel-map-add-entry (path accelerator)
 
 (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)
@@ -384,11 +436,11 @@ (defun (setf bin-child) (child bin)
   (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)))
 
 
@@ -440,7 +492,8 @@ (defbinding box-set-child-packing () nil
 
 (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)))
 
 
@@ -554,7 +607,7 @@ (defbinding combo-box-prepend-text () nil
   (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))
 
@@ -578,7 +631,7 @@ (defmethod initialize-instance ((combo-box-entry combo-box-entry) &key model)
 
 (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)))
@@ -588,7 +641,7 @@ (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)))
+    (let ((responses (user-data dialog 'responses)))
       (cond
        ((and responses (position response responses :test #'equal)))
        (create-p
@@ -598,7 +651,7 @@ (defun dialog-response-id (dialog response &optional create-p error-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)))
@@ -609,7 +662,7 @@ (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)))
+    (aref (user-data dialog 'responses) id)))
 
 
 (defmethod compute-signal-id ((dialog dialog) signal)
@@ -617,8 +670,8 @@ (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
@@ -689,11 +742,11 @@ (defbinding dialog-set-response-sensitive (dialog response sensitive) nil
   ((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
@@ -704,7 +757,7 @@ (defbinding (dialog-set-alternative-button-order
 	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)
@@ -758,7 +811,7 @@ (defbinding entry-completion-set-match-func (completion function) nil
 (defbinding entry-completion-complete () nil
   (completion entry-completion))
 
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding entry-completion-insert-prefix () nil
   (completion entry-completion))
 
@@ -870,8 +923,10 @@ (defmethod initialize-instance ((file-filter file-filter) &rest initargs
   (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
@@ -886,7 +941,7 @@ (defbinding file-filter-add-pattern () nil
   (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))
 
@@ -938,7 +993,7 @@ (defun create-image-widget (source &optional mask)
     ((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))
 
@@ -1084,7 +1139,7 @@ (defbinding menu-item-toggle-size-allocate () nil
 
 ;;; 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)
@@ -1099,12 +1154,13 @@ (defmethod allocate-foreign ((dialog message-dialog) &key (message-type :info)
   (%message-dialog-new transient-parent flags message-type buttons))
 
 
-(defmethod shared-initialize ((dialog message-dialog) names
-			      &key text #+gtk 2.6 secondary-text)
+(defmethod shared-initialize ((dialog message-dialog) names &key 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))
@@ -1121,12 +1177,12 @@ (defbinding message-dialog-set-markup () nil
   (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))
@@ -1210,7 +1266,7 @@ (defmethod print-object ((window window) stream)
        (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
@@ -1299,11 +1355,11 @@ (defbinding window-propagate-key-event () boolean
   (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))
@@ -1559,21 +1615,21 @@ (defun %ensure-notebook-child (notebook position)
      (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
@@ -1617,7 +1673,7 @@ (defun %notebook-current-page (notebook)
     (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
@@ -1833,7 +1889,7 @@ (defun (setf menu-active) (menu child)
   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)
@@ -1841,13 +1897,13 @@ (defbinding %menu-attach-to-widget (menu widget) nil
   (%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))
 
@@ -2032,7 +2088,7 @@ (defun (setf tool-item-proxy-menu-item) (menu-item menu-item-id tool-item)
   (%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))
 
@@ -2053,7 +2109,7 @@ (defbinding editable-insert-text (editable text &optional (position 0)) nil
   (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))
@@ -2228,12 +2284,6 @@ (defbinding %stock-item-copy () pointer
 (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))
@@ -2245,11 +2295,11 @@ (defbinding %stock-lookup () boolean
   (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)))