X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1047e159d403df191a35ed684e3c80517fbf3807..72e5ffecd76611413258320b50b93cc38247541b:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 22014c4..f7c6184 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -15,14 +15,14 @@
 ;; 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.13 2004-10-31 12:05:52 espen Exp $
+;; $Id: gtk.lisp,v 1.18 2004-11-19 13:09:00 espen Exp $
 
 
 (in-package "GTK")
 
 ;;; Gtk version
 
-(defbinding check-version () string
+(defbinding check-version () (copy-of string)
   (required-major unsigned-int)
   (required-minor unsigned-int)
   (required-micro unsigned-int))
@@ -39,7 +39,28 @@ (defun gtk-version ()
 	(format nil "Gtk+ v~A.~A" major minor) 
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
-(defbinding get-default-language () string)
+(defbinding get-default-language () (copy-of pango:language))
+
+
+;;;; Initalization
+
+(defbinding (gtk-init "gtk_parse_args") () nil
+  "Initializes the library without opening the display."
+  (nil null)
+  (nil null))
+
+(defun clg-init (&optional display)
+  "Initializes the system and starts the event handling"
+  (unless (gdk:display-get-default)
+    (gdk:gdk-init)
+    (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))))
 
 
 ;;; Acccel group
@@ -111,8 +132,8 @@ (defbinding box-pack-end () nil
   (fill boolean)
   (padding unsigned-int))
 
-(defun box-pack (box child &key from-end expand fill (padding 0))
-  (if from-end
+(defun box-pack (box child &key end expand fill (padding 0))
+  (if end
       (box-pack-end box child expand fill padding)
     (box-pack-start box child expand fill padding)))
 
@@ -244,26 +265,64 @@ (defbinding (color-selection-is-adjusting-p
 
 
 
-;;; Combo
+;;;; Combo Box
 
-(defmethod shared-initialize ((combo combo) names &rest initargs
-			      &key popdown-strings)
-  (call-next-method)
-  (when popdown-strings
-    (combo-set-popdown-strings combo popdown-strings)))
-			    
-(defbinding combo-set-popdown-strings () nil
-  (combo combo)
-  (strings (glist string)))
+(defmethod shared-initialize ((combo-box combo-box) names &key model content)
+  (unless model
+    (setf 
+     (combo-box-model combo-box) 
+     (make-instance 'list-store :column-types '(string)))
+    (unless (typep combo-box 'combo-box-entry)
+      (let ((cell (make-instance 'cell-renderer-text)))
+	(cell-layout-pack combo-box cell :expand t)
+	(cell-layout-add-attribute combo-box cell :text 0)))
+    (when content
+      (map 'nil #'(lambda (text)
+		    (combo-box-append-text combo-box text))
+	   content)))
+    (call-next-method))
+
+;; (defmethod shared-initialize :after ((combo-box combo-box) names &key active)
+;;   (when active
+;;     (signal-emit combo-box 'changed)))
+
+(defbinding combo-box-append-text () nil
+  (combo-box combo-box)
+  (text string))
+
+(defbinding combo-box-insert-text () nil
+  (combo-box combo-box)
+  (position int)
+  (text string))
+
+(defbinding combo-box-prepend-text () nil
+  (combo-box combo-box)
+  (text string))
 
-(defbinding combo-disable-activate () nil
-  (combo combo))
+#+gtk2.6
+(defbinding combo-box-get-active-text () string
+  (combo-box combo-box))
 
+(defbinding combo-box-popup () nil
+  (combo-box combo-box))
+
+(defbinding combo-box-popdown () nil
+  (combo-box combo-box))
+
+
+
+;;;; Combo Box Entry
+
+(defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model)
+  (call-next-method)
+  (unless model
+    (setf (combo-box-entry-text-column combo-box-entry) 0)))
 
 
 ;;;; Dialog
 
 (defmethod shared-initialize ((dialog dialog) names &rest initargs &key button)
+  (declare (ignore button))
   (call-next-method)
   (dolist (button-definition (get-all initargs :button))
     (apply #'dialog-add-button dialog (mklist button-definition))))
@@ -398,7 +457,7 @@ (defmethod (setf container-children) (children (dialog dialog))
 
 ;;; Entry
 
-(defbinding  entry-get-layout () pango:layout
+(defbinding  entry-get-layout () (copy-of pango:layout)
   (entry entry))
 
 (defbinding entry-get-layout-offsets () nil
@@ -465,7 +524,7 @@ (defbinding label-select-region () nil
 (defbinding label-get-text () string
   (label label))
 
-(defbinding label-get-layout () pango:layout
+(defbinding label-get-layout () (copy-of pango:layout)
   (label label))
 
 (defbinding label-get-selection-bounds () boolean
@@ -497,23 +556,6 @@ (defmethod initialize-instance ((button radio-button)
     (radio-button-add-to-group button group-with)))
 
 
-;;; Option menu
-
-(defbinding %option-menu-set-menu () nil
-  (option-menu option-menu)
-  (menu widget))
-
-(defbinding %option-menu-remove-menu () nil
-  (option-menu option-menu))
-
-(defun (setf option-menu-menu) (menu option-menu)
-  (if (not menu)
-      (%option-menu-remove-menu option-menu)
-    (%option-menu-set-menu option-menu menu))
-  menu)
-    
-
-
 ;;; Item
 
 (defbinding item-select () nil
@@ -677,14 +719,14 @@ (defbinding window-begin-resize-drag () nil
   (edge gdk:window-edge)
   (button int)
   (root-x int) (root-y int)
-  (timestamp (unsigned-int 32)))
+  (timestamp unsigned-int))
 
 (defbinding window-begin-move-drag () nil
   (window window)
   (edge gdk:window-edge)
   (button int)
   (root-x int) (root-y int)
-  (timestamp (unsigned-int 32)))
+  (timestamp unsigned-int))
 
 (defbinding window-set-frame-dimensions () nil
   (window window)
@@ -914,7 +956,7 @@ (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
-    (notebook page) string
+    (notebook page) (copy-of string)
   (notebook notebook)
   ((%notebook-child notebook page) widget))
 
@@ -937,7 +979,7 @@ (defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
-    (notebook page) string
+    (notebook page) (copy-of string)
   (notebook notebook)
   ((%notebook-child notebook page) widget))
 
@@ -1073,8 +1115,7 @@ (defbinding menu-reorder-child (menu menu-item position) nil
   (menu-item menu-item)
   ((%menu-position menu position) int))
 
-(defvar *menu-position-callback-marshal*
-  (system:foreign-symbol-address "gtk_menu_position_callback_marshal"))
+(def-callback-marshal %menu-popup-callback (nil (x int) (y int) (push-in boolean)))
 
 (defbinding %menu-popup () nil
   (menu menu)
@@ -1088,12 +1129,10 @@ (defbinding %menu-popup () nil
 (defun menu-popup (menu button activate-time &key callback parent-menu-shell
 		   parent-menu-item)
   (if callback
-      (let ((callback-id (register-callback-function callback)))
-	(unwind-protect
-	    (%menu-popup
-	     menu parent-menu-shell parent-menu-item
-	     *menu-position-callback-marshal* callback-id button activate-time)
-	  (destroy-user-data callback-id)))
+      (with-callback-function (id callback)
+	(%menu-popup 
+	 menu parent-menu-shell parent-menu-item 
+	 (callback %menu-popup-callback) id button activate-time))
     (%menu-popup
      menu parent-menu-shell parent-menu-item nil 0 button activate-time)))
  
@@ -1460,7 +1499,7 @@ (defbinding progress-bar-pulse () nil
 
 (defbinding stock-lookup () boolean
   (stock-id string)
-  (stock-item stock-item :out))
+  ((make-instance 'stock-item) stock-item :return))