From: espen <espen>
Date: Sun, 24 Mar 2002 12:58:34 +0000 (+0000)
Subject: Updated and added new bindings for gtk 2.0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/1de3a4180b9466454eeb09e9e690ff50097be710

Updated and added new bindings for gtk 2.0
---

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 073dd36..ece84b7 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,7 +15,7 @@
 ;; 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: gtkcontainer.lisp,v 1.6 2001-11-20 18:25:53 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.7 2002-03-24 12:58:34 espen Exp $
 
 (in-package "GTK")
             
@@ -65,13 +65,19 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
-(defbinding (%container-foreach "gtk_container_foreach_full")
-    (container function) nil
+(defvar *callback-marshal*
+  (system:foreign-symbol-address "gtk_callback_marshal"))
+
+(defbinding %container-foreach (container callback-id) nil
   (container container)
-  (0 unsigned-long)
   (*callback-marshal* pointer)
-  ((register-callback-function function) pointer)
-  (*destroy-marshal* pointer))
+  (callback-id unsigned-int))
+
+(defun container-foreach (container function)
+  (let ((callback-id (register-callback-function function)))
+    (unwind-protect
+	(%container-foreach container callback-id)
+      (destroy-user-data callback-id))))
 
 (defun map-container (seqtype func container)
   (case seqtype
@@ -80,15 +86,15 @@ (defun map-container (seqtype func container)
      nil)
     (list
      (let ((list nil))
-       (%container-foreach
+       (container-foreach
 	container
 	#'(lambda (child)
 	    (push (funcall func child) list)))
        (nreverse list)))
     (t
-     (let ((seq (make-sequence seqtype (container-num-children container)))
+     (let ((seq (make-sequence seqtype (container-length container)))
 	   (index 0))
-       (%container-foreach
+       (container-foreach
 	container
 	#'(lambda (child)
 	    (setf (elt seq index) (funcall func child))
@@ -98,7 +104,7 @@ (defun map-container (seqtype func container)
 (defmacro do-container ((var container &optional (result nil)) &body body)
   (let ((continue (make-symbol "CONTINUE")))
     `(let ((,continue t))
-       (%container-foreach
+       (container-foreach
 	,container
 	#'(lambda (,var)
 	    (when ,continue
@@ -108,11 +114,12 @@ (defmacro do-container ((var container &optional (result nil)) &body body)
 		(setq ,continue t)))))
        ,result)))
 
-(defbinding %container-get-children () (glist widget)
-  (container container))
+;; (defbinding %container-get-children () (glist widget)
+;;   (container container))
 
 (defmethod container-children ((container container))
-  (%container-get-children container))
+;;   (%container-get-children container)
+  (map-container 'list #'identity container))
 
 (defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
@@ -121,9 +128,40 @@ (defmethod (setf container-children) (children (container container))
     (container-add container child))
   children)
 
-;; Should be implemented as a foreign function
-(defun container-num-children (container)
-  (length (container-children container)))
+(defun container-length (container)
+  (let ((n 0))
+    (container-foreach container
+     #'(lambda (child)
+	 (declare (ignore child))
+	 (incf n)))
+    n))
 
 (defbinding container-resize-children () nil
   (container container))
+
+(defbinding container-propagate-expose () nil
+  (container container)
+  (child widget)
+  (event gdk:expose-event))
+
+
+(defbinding %container-get-focus-chain () boolean
+  (container container)
+  (focusable-widgets (glist widget) :out))
+
+(defun container-focus-chain (container)
+  (multiple-value-bind (chain-set-p focusable-widgets)
+      (%container-get-focus-chain container)
+    (and chain-set-p focusable-widgets)))
+
+(defbinding %container-set-focus-chain () nil
+  (container container)
+  (focusable-widgets (glist widget)))
+
+(defbinding %container-unset-focus-chain () nil
+  (container container))
+
+(defun (setf container-focus-chain) (focusable-widgets container)
+  (if (null focusable-widgets)
+      (%container-unset-focus-chain container)
+    (%container-set-focus-chain container focusable-widgets)))
diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 4a59545..b510ec0 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000-2001 Espen S. Johnsen <espen@users.sourceforge.net>
+;; Copyright (C) 2000-2002 Espen S. Johnsen <espen@users.sourceforge.net>
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -15,21 +15,22 @@
 ;; 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: gtkwidget.lisp,v 1.7 2001-12-12 20:24:41 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.8 2002-03-24 12:58:34 espen Exp $
 
 (in-package "GTK")
 
 
 (defmethod shared-initialize ((widget widget) names &rest initargs &key parent)
   (declare (ignore initargs names))
-  (call-next-method)
-  (when parent
-    (let ((old-parent (widget-parent widget))
-	  (parent-widget (first (mklist parent)))
-	  (args (rest (mklist parent))))
-      (when old-parent
-	(container-remove old-parent widget))
-      (apply #'container-add parent-widget widget args))))
+  (prog1
+      (call-next-method)
+    (when parent
+      (let ((old-parent (widget-parent widget))
+	    (parent-widget (first (mklist parent)))
+	    (args (rest (mklist parent))))
+	(when old-parent
+	  (container-remove old-parent widget))
+	(apply #'container-add parent-widget widget args)))))
 
 (defmethod shared-initialize :after ((widget widget) names &rest initargs
 				     &key show-all)
@@ -60,9 +61,13 @@ (defmacro with-child-slots (slots widget &body body)
   `(with-slots ,slots (widget-child-slots ,widget)
      ,@body))
 
+
 (defmacro widget-destroyed (place)
   `(setf ,place nil))
 
+
+;;; Bindings
+
 (defbinding widget-destroy () nil
   (widget widget))
 
@@ -96,7 +101,25 @@ (defbinding widget-realize () nil
 (defbinding widget-unrealize () nil
   (widget widget))
 
-#|
+(defbinding widget-queue-draw () nil
+  (widget widget))
+
+(defbinding widget-queue-resize () nil
+  (widget widget))
+
+(defbinding widget-size-request () nil
+  (widget widget)
+  (requisition requisition))
+
+(defbinding widget-get-child-requisition () nil
+  (widget widget)
+  (requisition requisition))
+
+(defbinding widget-size-allocate () nil
+  (widget widget)
+  (allocation allocation))
+
+
 (defbinding widget-add-accelerator
     (widget signal accel-group key modifiers flags) nil
   (widget widget)
@@ -113,79 +136,58 @@ (defbinding widget-remove-accelerator
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(defbinding widget-accelerator-signal
-    (widget accel-group key modifiers) unsigned-int
+(defbinding (widget-set-accelerator-path "gtk_widget_set_accel_path") () nil
   (widget widget)
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding widget-lock-accelerators () nil
-  (widget widget))
-
-(defbinding widget-unlock-accelerators () nil
-  (widget widget))
-
-(defbinding (widget-accelerators-locked-p "gtk_widget_accelerators_locked")
-    () boolean
-  (widget widget))
-|#
+  (accel-path string)
+  (accel-group accel-group))
+  
 
 (defbinding widget-event () int
   (widget widget)
   (event gdk:event))
 
-(defbinding get-event-widget () widget
-  (event gdk:event))
-
 (defbinding widget-activate () boolean
   (widget widget))
 
-(defbinding widget-set-scroll-adjustments () boolean
-  (widget widget)
-  (hadjustment adjustment)
-  (vadjustment adjustment))
-
 (defbinding widget-reparent () nil
   (widget widget)
   (new-parent widget))
 
-; (defbinding widget-popup () nil
-;   (widget widget)
-;   (x int)
-;   (y int))
+(defbinding %widget-intersect () boolean
+  (widget widget)
+  (area gdk:rectangle)
+  (intersection pointer))
 
-(defbinding widget-grab-focus () nil
-  (widget widget))
 
-(defbinding widget-grab-default () nil
-  (widget widget))
+(defun widget-intersection (widget area)
+  (let ((intersection (make-instance 'gdk:rectangle)))
+    (when (%widget-intersect widget area intersection)
+      intersection)))
 
-(defbinding grab-add () nil
-  (widget widget))
+(defun widget-intersect-p (widget area)
+  (%widget-intersect widget area (make-pointer 0)))
 
-(defbinding grab-get-current () widget)
+(defbinding (widget-is-focus-p "gtk_widget_is_focus") () boolean
+  (widget widget))
 
-(defbinding grab-remove () nil
+(defbinding widget-grab-focus () nil
   (widget widget))
 
-(defbinding widget-allocation () nil
-  (widget widget)
-  (width int :out)
-  (height int :out))
+(defbinding widget-grab-default () nil
+  (widget widget))
 
 (defbinding widget-add-events () nil
   (widget widget)
   (events gdk:event-mask))
 
-(defbinding (widget-toplevel "gtk_widget_get_toplevel") () widget
+(defbinding widget-get-toplevel () widget
   (widget widget))
 
-(defbinding (widget-ancestor "gtk_widget_get_ancestor") (widget type) widget
+(defbinding widget-get-ancestor (widget type) widget
   (widget widget)
   ((find-type-number type) type-number))
 
-(defbinding (widget-pointer "gtk_widget_get_pointer") () nil
+(defbinding widget-get-pointer () nil
   (widget widget)
   (x int :out)
   (y int :out))
@@ -194,35 +196,34 @@ (defbinding (widget-is-ancestor-p "gtk_widget_is_ancestor") () boolean
   (widget widget)
   (ancestor widget))
 
+(defbinding widget-translate-coordinates () boolean
+  (src-widget widget)
+  (dest-widget widget)
+  (src-x int) (src-y int)
+  (set-x int :out) (dest-y int :out))
+
+(defun widget-hide-on-delete (widget)
+  "Utility function; intended to be connected to the DELETE-EVENT
+signal on a GtkWindow. The function calls WIDGET-HIDE on its
+argument, then returns T. If connected to DELETE-EVENT, the
+result is that clicking the close button for a window (on the window
+frame, top right corner usually) will hide but not destroy the
+window. By default, GTK+ destroys windows when DELETE-EVENT is
+received."
+  (widget-hide widget)
+  t)
+  
 (defbinding widget-ensure-style () nil
   (widget widget))
 
 (defbinding widget-reset-rc-styles () nil
   (widget widget))
 
-(defun (setf widget-cursor) (cursor-type widget)
-  (let ((cursor (gdk:cursor-new cursor-type))
-	(window (widget-window widget)))
-    (gdk:window-set-cursor window cursor)
-    ;(gdk:cursor-destroy cursor)
-    ))
-
-;; Push/pop pairs, to change default values upon a widget's creation.
-;; This will override the values that got set by the
-;; widget-set-default-* functions.
-
 (defbinding widget-push-colormap () nil
   (colormap gdk:colormap))
 
-(defbinding widget-push-composite-child () nil)
-
 (defbinding widget-pop-colormap () nil)
 
-(defbinding widget-pop-composite-child () nil)
-
-
-;; Set certain default values to be used at widget creation time.
-
 (defbinding widget-set-default-colormap () nil
   (colormap gdk:colormap))
 
@@ -230,13 +231,160 @@ (defbinding widget-get-default-style () style)
 
 (defbinding widget-get-default-colormap () gdk:colormap)
 
+(defbinding widget-get-default-visual () gdk:visual)
+
+(defbinding widget-get-default-direction () text-direction)
+
+(defbinding widget-set-default-direction () nil
+  (direction  text-direction))
+
 (defbinding widget-shape-combine-mask () nil
   (widget widget)
   (shape-mask gdk:bitmap)
   (x-offset int)
   (y-offset int))
 
-;; defined in gtkglue.c
+(defbinding widget-path () nil
+  (widget widget)
+  (path-length int :out)
+  (path string :out)
+  (reverse-path string :out))
+
+(defbinding widget-class-path () nil
+  (widget widget)
+  (path-length int :out)
+  (path string :out)
+  (reverse-path string :out))
+
+(defbinding widget-modify-style () nil
+  (widget widget)
+  (style rc-style))
+
+(defbinding widget-modify-style () rc-style
+  (widget widget))
+
+(defbinding (widget-modify-foreground "gtk_widget_modify_fg") () nil
+  (widget widget)
+  (state state-type)
+  (color gdk:color))
+
+(defbinding (widget-modify-background "gtk_widget_modify_bg") () nil
+  (widget widget)
+  (state state-type)
+  (color gdk:color))
+
+(defbinding widget-modify-text () nil
+  (widget widget)
+  (state state-type)
+  (color gdk:color))
+
+(defbinding widget-modify-base () nil
+  (widget widget)
+  (state state-type)
+  (color gdk:color))
+
+(defbinding widget-modify-font () nil
+  (widget widget)
+  (state state-type)
+  (font-desc pango:font-description))
+
+(defbinding widget-create-pango-context () pango:context
+  (widget widget))
+
+(defbinding widget-get-pango-context () pango:context
+  (widget widget))
+
+(defbinding widget-create-pango-layout (widget &optional text) pango:layout
+  (widget widget)
+  (text (or string null)))
+
+(defbinding widget-render-icon () gdk:pixbuf
+  (widget widget)
+  (stock-id string)
+  (size icon-size)
+  (detail string))
+
+(defbinding widget-push-composite-child () nil)
+
+(defbinding widget-pop-composite-child () nil)
+
+(defbinding widget-queue-draw-area () nil
+  (widget widget)
+  (x int) (y int) (width int) (height int))
+
+(defbinding widget-reset-shapes () nil
+  (widget widget))
+
+(defbinding widget-set-double-buffered () nil
+  (widget widget)
+  (double-buffered boolean))
+
+(defbinding widget-set-redraw-on-allocate () nil
+  (widget widget)
+  (redraw-on-allocate boolean))
+
+(defbinding widget-set-scroll-adjustments () boolean
+  (widget widget)
+  (hadjustment adjustment)
+  (vadjustment adjustment))
+
+(defbinding widget-mnemonic-activate () boolean
+  (widget widget)
+  (group-cycling boolean))
+
+(defbinding widget-region-intersect () pointer ;gdk:region
+  (widget widget)
+  (region pointer)) ;gdk:region))
+
+(defbinding widget-send-expose () int
+  (widget widget)
+  (event gdk:event))
+
+(defbinding widget-get-accessible () atk:object
+  (widget widget))
+
+(defbinding widget-child-focus () boolean
+  (widget widget)
+  (direction direction-type))
+
+(defbinding widget-child-notify () nil
+  (widget widget)
+  (child-property string))
+
+(defbinding widget-freeze-child-notify () nil
+  (widget widget))
+
+(defbinding %widget-get-size-request () nil
+  (widget widget)
+  (width int :out)
+  (height int :out))
+
+(defun widget-get-size-request (widget)
+  (multiple-value-bind (width height) (%widget-get-size-request widget)
+    (values (unless (= width -1) width) (unless (= height -1) height))))
+
+(defbinding widget-set-size-request (widget width height) nil
+  (widget widget)
+  ((or width -1) int)
+  ((or height -1) int))
+
+(defbinding widget-thaw-child-notify () nil
+  (widget widget))
+
+
+;;; Additional bindings and functions
+
 (defbinding widget-mapped-p () boolean
   (widget widget))
 
+(defbinding widget-get-size-allocation () nil
+  (widget widget)
+  (width int :out)
+  (height int :out))
+
+(defbinding get-event-widget () widget
+  (event gdk:event))
+
+(defun (setf widget-cursor) (cursor-type widget)
+  (let ((cursor (make-instance 'cursor  :type cursor-type)))
+    (gdk:window-set-cursor (widget-window widget) cursor)))