X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/25d755bb92d7a70ce26cc4df27f6779dc24889e8..6d0c1491fd35bbf2d9f405d0708d3cbc51fb1d16:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index a2fe742..0bb3154 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2000-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: gtkwidget.lisp,v 1.22 2006-04-25 20:19:32 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.27 2007-02-19 14:29:33 espen Exp $
 
 (in-package "GTK")
 
@@ -32,10 +32,11 @@
        (slot-boundp widget 'name) (not (zerop (length (widget-name widget)))))
       (print-unreadable-object (widget stream :type t :identity nil)
         (format stream "~S at 0x~X" 
-	 (widget-name widget) (sap-int (foreign-location widget))))
+	 (widget-name widget) (pointer-address (foreign-location widget))))
     (call-next-method)))
 
 (defmethod shared-initialize ((widget widget) names &key (visible nil visible-p))
+  (declare (ignore names))
   (when (and visible-p (not visible)) ; widget explicit set as not visible
     (setf (user-data widget 'hidden-p) t)
     (signal-connect widget 'show 
@@ -66,11 +67,13 @@
    ((call-next-method))))
 
 
-(defmethod compute-signal-function ((widget widget) signal function object)
+(defmethod compute-signal-function ((widget widget) signal function object args)
+  (declare (ignore signal))
   (if (eq object :parent)
-      #'(lambda (&rest args)
-	  (if (slot-boundp widget 'parent)
-	      (apply function (widget-parent widget) (rest args))
+      #'(lambda (&rest emission-args)
+	  (let ((all-args (nconc (rest emission-args) args)))
+	    (if (slot-boundp widget 'parent)
+		(apply function (widget-parent widget) all-args)
 	    ;; Delay until parent is set
 	    (signal-connect widget 'parent-set
 	     #'(lambda (old-parent)
@@ -78,10 +81,10 @@
 		 (let ((*signal-stop-emission* 
 			#'(lambda ()
 			    (warn "Ignoring emission stop in delayed signal handler"))))
-		   (apply function (widget-parent widget) (rest args))))
+		   (apply function (widget-parent widget) all-args)))
 	     :remove t)
 ;	    (warn "Widget has no parent -- ignoring signal")
-	    ))
+	    )))
     (call-next-method)))
       
 (defun child-property-value (widget slot)
@@ -146,12 +149,12 @@
 (defbinding widget-size-request
     (widget &optional (requisition (make-instance 'requisition))) nil
   (widget widget)
-  (requisition requisition :return))
+  (requisition requisition :in/return))
 
 (defbinding widget-get-child-requisition 
     (widget &optional (requisition (make-instance 'requisition))) nil
   (widget widget)
-  (requisition requisition :return))
+  (requisition requisition :in/return))
 
 (defbinding widget-size-allocate () nil
   (widget widget)
@@ -294,17 +297,58 @@ received."
   (x-offset int)
   (y-offset int))
 
-(defbinding widget-path () nil
-  (widget widget)
-  (path-length int :out)
-  (path string :out)
-  (reverse-path string :out))
+(defun widget-path (widget)
+  (let ((subpath (list (if (and 
+			    (slot-boundp widget 'name) 
+			    (not (zerop (length (widget-name widget)))))
+			   (widget-name widget)
+			 (type-of widget)))))
+    (if (slot-boundp widget 'parent)
+	(nconc (widget-path (widget-parent widget)) subpath)
+      subpath)))
+
+(defun widget-class-path (widget)
+    (let ((subpath (list (type-of widget))))
+  (if (slot-boundp widget 'parent)
+      (nconc (widget-class-path (widget-parent widget)) subpath)
+    subpath)))
+
+
+(defun widget-path-lookup (path &optional (root (nreverse (window-list-toplevels))) (error-p t))
+  (let ((component (first path)))
+    (loop
+     for widget in (mklist root)
+     do (when (or
+	       (and 
+		(stringp component) (slot-boundp widget 'name) 
+		(string= component (widget-name widget)))
+	       (and
+		(symbolp component) (typep widget component)))
+	  (cond
+	   ((endp (rest path)) (return widget))
+	   ((typep widget 'container)
+	    (let ((descendant (widget-path-lookup (rest path) (container-children widget) nil)))
+	      (when descendant
+		(return descendant))))))))
+  (when error-p
+    (error "Widget not found: ~A" path)))
+
+
+(defun widget-find (name &optional (root (nreverse (window-list-toplevels))) (error-p t))
+  "Search for a widget with the given name. ROOT should be a container
+widget or a list of containers."
+  (loop
+   for widget in (mklist root)
+   do (cond
+       ((and (slot-boundp widget 'name) (string= name (widget-name widget)))
+	(return-from widget-find widget))
+       ((typep widget 'container)
+	(let ((descendant (widget-find name (container-children widget) nil)))
+	  (when descendant
+	    (return-from widget-find descendant))))))
+  (when error-p
+    (error "Widget not found: ~A" name)))
 
-(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)
@@ -368,9 +412,9 @@ received."
 (defbinding widget-reset-shapes () nil
   (widget widget))
 
-;; (defbinding widget-set-double-buffered () nil
-;;   (widget widget)
-;;   (double-buffered boolean))
+(defbinding widget-set-double-buffered () nil
+  (widget widget)
+  (double-buffered boolean))
 
 ;; (defbinding widget-set-redraw-on-allocate () nil
 ;;   (widget widget)