Mostly Cairo releated fixes

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 1e277fa0877311cbe5d54b3916e7c53f15ce6171..b9af37375e0baac24de4a11f90da6e45ffd7c5f5 100644 (file)
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -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.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gdk.lisp,v 1.44 2007/09/07 07:36:26 espen Exp $
+;; $Id: gdk.lisp,v 1.45 2007/10/17 18:04:47 espen Exp $

 
 
 (in-package "GDK")
 
 
 (in-package "GDK")


@@ -851,7 +851,7 @@ (defbinding %pixmap-new () pointer
   (depth int))
 
 (defmethod allocate-foreign ((pximap pixmap) &key width height depth window)
   (depth int))
 
 (defmethod allocate-foreign ((pximap pixmap) &key width height depth window)

-  (%pixmap-new window width height depth))
+  (%pixmap-new window (or width (drawable-width window)) (or height (drawable-height window)) (or depth -1)))

 
 (defun pixmap-new (width height depth &key window)
   (warn "PIXMAP-NEW is deprecated, use (make-instance 'pixmap ...) instead")
 
 (defun pixmap-new (width height depth &key window)
   (warn "PIXMAP-NEW is deprecated, use (make-instance 'pixmap ...) instead")


@@ -1073,6 +1073,7 @@ (defbinding (keyval-is-upper-p "gdk_keyval_is_upper") () boolean
 (defbinding (keyval-is-lower-p "gdk_keyval_is_lower") () boolean
   (keyval unsigned-int))
 
 (defbinding (keyval-is-lower-p "gdk_keyval_is_lower") () boolean
   (keyval unsigned-int))
 

+

 ;;; Cairo interaction
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
 ;;; Cairo interaction
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")


@@ -1090,19 +1091,25 @@   (defbinding cairo-set-source-color () nil
     (cr cairo:context)
     (color color))
 
     (cr cairo:context)
     (color color))
 

-  (defbinding cairo-set-source-pixbuf () nil
+  (defbinding cairo-set-source-pixbuf (cr pixbuf &optional (x 0.0) (y 0.0)) nil

     (cr cairo:context)
     (pixbuf pixbuf)
     (x double-float)
     (y double-float))
  
     (cr cairo:context)
     (pixbuf pixbuf)
     (x double-float)
     (y double-float))
  

+  (defbinding cairo-set-source-pixmap (cr pixmap &optional (x 0.0) (y 0.0)) nil
+    (cr cairo:context)
+    (pixmap pixmap)
+    (x double-float)
+    (y double-float))
+ 

   (defbinding cairo-rectangle () nil
     (cr cairo:context)
     (rectangle rectangle))
  
   (defbinding cairo-rectangle () nil
     (cr cairo:context)
     (rectangle rectangle))
  

-  (defbinding cairo-region () nil
+  (defbinding cairo-region (cr region) nil

     (cr cairo:context)
     (cr cairo:context)

-    (region region))
+    ((ensure-region region) region))

 
   (defbinding (cairo-surface-get-window "clg_gdk_cairo_surface_get_window") () window
     (surface cairo:surface))
 
   (defbinding (cairo-surface-get-window "clg_gdk_cairo_surface_get_window") () window
     (surface cairo:surface))


@@ -1146,8 +1153,8 @@   (defbinding %threads-set-lock-functions (&optional) nil
     (%leave-fn callback))
 
   (defun threads-init ()
     (%leave-fn callback))
 
   (defun threads-init ()

-    (%threads-set-lock-functions)
-    (setq *global-lock* (sb-thread:make-mutex :name "global GDK lock")))
+    (setq *global-lock* (sb-thread:make-mutex :name "global GDK lock"))
+    (%threads-set-lock-functions))

 
   (defmacro with-global-lock (&body body)
     `(progn
 
   (defmacro with-global-lock (&body body)
     `(progn