X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/2b18bfaf9fd19cafb2dab00095dcfb6bf8cc55dc..72d9260f8258b525339c7241da0631ceaf9f3842:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 07a6468..0117544 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.24 2006-09-05 13:37:07 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.32 2008-11-25 22:17:08 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 (widget &rest emission-args)
+		 (let ((all-args (nconc 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 emission-args))
+		      :remove t))))
+	   (call-next-method))))
+    (if *widget-display-as-default-in-signal-handler-p*
+	#'(lambda (widget &rest args)
+	    (let ((display (when (slot-boundp widget 'window)
+			     (gdk:drawable-display (widget-window widget)))))
+	      (gdk:with-default-display (display)
+	        (apply wrapper widget args))))
+      wrapper)))
+
+
       
 (defun child-property-value (widget slot)
   (slot-value (widget-child-properties widget) slot))
@@ -340,11 +345,11 @@ (defun widget-find (name &optional (root (nreverse (window-list-toplevels))) (er
    for widget in (mklist root)
    do (cond
        ((and (slot-boundp widget 'name) (string= name (widget-name widget)))
-	(return widget))
+	(return-from widget-find widget))
        ((typep widget 'container)
 	(let ((descendant (widget-find name (container-children widget) nil)))
 	  (when descendant
-	    (return descendant))))))
+	    (return-from widget-find descendant))))))
   (when error-p
     (error "Widget not found: ~A" name)))
 
@@ -411,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)
@@ -516,12 +521,29 @@ (defbinding widget-remove-mnemonic-label () nil
   (widget widget)
   (label widget))
 
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.14.0")
+(defbinding widget-get-snapshot () gdk:pixmap
+  (widget widget)
+  (clip-rect (or null gdk:rectangle)))
+
 
 ;;; 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)