X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/6ac8ef4748d38d2a3fe1c24d311090e4d6187230..3494da2a2fe7551426d4fbdbce7dc21200423772:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index fc2e7bf..100b0e2 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -20,11 +20,10 @@
 ;; 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.23 2006-04-26 12:11:21 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.30 2008-04-11 18:42:40 espen Exp $
 
 (in-package "GTK")
 
-
 #-debug-ref-counting
 (defmethod print-object ((widget widget) stream)
   (if (and 
@@ -61,30 +60,36 @@ (defmethod slot-unbound ((class gobject-class) (object widget)
    ((slot-boundp object 'parent)
     (with-slots (parent child-properties) object
       (setf child-properties
-       (make-instance 
-        (gethash (class-of parent) *container-to-child-class-mappings*)
+       (make-instance (find-child-class (class-of parent))
 	:parent parent :child object))))
    ((call-next-method))))
 
 
-(defmethod compute-signal-function ((widget widget) signal function object)
-  (declare (ignore signal))
-  (if (eq object :parent)
-      #'(lambda (&rest args)
-	  (if (slot-boundp widget 'parent)
-	      (apply function (widget-parent widget) (rest args))
-	    ;; Delay until parent is set
-	    (signal-connect widget 'parent-set
-	     #'(lambda (old-parent)
-		 (declare (ignore old-parent))
-		 (let ((*signal-stop-emission* 
-			#'(lambda ()
-			    (warn "Ignoring emission stop in delayed signal handler"))))
-		   (apply function (widget-parent widget) (rest args))))
-	     :remove t)
-;	    (warn "Widget has no parent -- ignoring signal")
-	    ))
-    (call-next-method)))
+(defparameter *widget-display-as-default-in-signal-handler-p* t)
+
+(defmethod compute-signal-function ((widget widget) signal function object args)
+  (let ((wrapper
+	 (if (eq object :parent)
+	     #'(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)
+			  (declare (ignore old-parent))
+			  (apply #'signal-emit widget signal (rest emission-args)))
+		      :remove t))))
+	   (call-next-method))))
+    (if *widget-display-as-default-in-signal-handler-p*
+	#'(lambda (&rest args)
+	    (let ((display (when (slot-boundp widget 'window)
+			     (gdk:drawable-display (widget-window widget)))))
+	      (gdk:with-default-display (display)
+	        (apply wrapper args))))
+      wrapper)))
+
+
       
 (defun child-property-value (widget slot)
   (slot-value (widget-child-properties widget) slot))
@@ -296,17 +301,58 @@ (defbinding widget-shape-combine-mask () nil
   (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)
@@ -370,9 +416,9 @@ (defbinding widget-queue-draw-area () nil
 (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)
@@ -478,9 +524,21 @@ (defbinding widget-remove-mnemonic-label () nil
 
 ;;; Additional bindings and functions
 
-(defbinding (widget-mapped-p "gtk_widget_mapped_p") () boolean
+(defbinding %widget-flags () int
   (widget widget))
 
+(defun widget-flags (widget)
+  (let ((flags (%widget-flags widget)))
+    (nconc 
+     (int-to-object-flags flags)
+     (int-to-widget-flags flags))))
+
+(defun widget-mapped-p (widget)
+  (find :mapped (widget-flags widget)))
+
+(defun widget-realized-p (widget)
+  (find :realized (widget-flags widget)))
+
 (defbinding widget-get-size-allocation () nil
   (widget widget)
   (width int :out)