Return type for ACCEL-GROUPS-FROM-OBJECT corrected

[clg] / gdk / pixbuf.lisp

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index 334bb9de0167c2f791ef2cb60c37f132c7346591..08f96d887206cfda9f39c9b0f83289488b792451 100644 (file)
--- a/gdk/pixbuf.lisp
+++ b/gdk/pixbuf.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.
 
-;; $Id: pixbuf.lisp,v 1.3 2005-04-23 16:48:50 espen Exp $
+;; $Id: pixbuf.lisp,v 1.6 2007-06-18 10:14:39 espen Exp $
 
 
 (in-package "GDK")
@@ -39,7 +39,7 @@ (defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
   (height int)
   (nil gerror :out))
 
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
   (filename pathname)
   (width int)
@@ -48,18 +48,22 @@ (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
   (nil gerror :out))
 
 (defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
-  #-gtk2.6
+  #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
   (unless preserve-aspect-ratio 
     (warn ":preserve-aspect-ratio not supported with this version of Gtk"))
 
   (multiple-value-bind (pixbuf gerror)
       (cond
        (size 
-       #-gtk2.6(%pixbuf-new-from-file-at-size filename size size)
-       #+gtk2.6(%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
+       #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-size filename size size)
+       #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
        ((and width height)
-       #-gtk2.6(%pixbuf-new-from-file-at-size filename width height)
-       #+gtk2.6(%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
+       #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-size filename width height)
+       #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
        ((or width height)
        (error "Both :width and :height must be specified"))
        (t (%pixbuf-new-from-file filename)))
@@ -78,7 +82,7 @@ (defbinding %pixbuf-savev () boolean
   (filename pathname)
   (type string)
   (keys strings)
-  (values string)
+  (values strings)
   (nil gerror :out))
 
 (defun pixbuf-save (pixbuf filename type &rest options)
@@ -86,6 +90,7 @@ (defun pixbuf-save (pixbuf filename type &rest options)
        (values (make-array 0 :adjustable t :fill-pointer t)))
     (loop 
      as (key value . rest) = options then rest
+     while key
      do (vector-push-extend (string-downcase key) keys)
         (vector-push-extend 
         (etypecase value 
@@ -94,7 +99,7 @@ (defun pixbuf-save (pixbuf filename type &rest options)
           (number (format nil "~A" value)))
         values))
     (multiple-value-bind (ok-p gerror)
-       (%pixbuf-savev pixbuf filename type keys values)
+       (%pixbuf-savev pixbuf filename (string-downcase type) keys values)
       (unless ok-p
        (signal-gerror gerror)))))
 
@@ -113,6 +118,29 @@ (defun copy-pixbuf (pixbuf &optional x y width height)
       (%pixbuf-copy pixbuf)
     (%pixbuf-new-subpixbuf pixbuf x y width height)))
 
+(defbinding %pixbuf-get-from-drawable () (referenced pixbuf)
+  (dest (or null pixbuf))
+  (drawable drawable)
+  (colormap (or null colormap))
+  (src-x int)
+  (src-y int)
+  (dest-x int)
+  (dest-y int)
+  (width int)
+  (height int))
+
+(defun pixbuf-get-from-drawable (drawable &key (src-x 0) (src-y 0) (dest-x 0) (dest-y 0) width height colormap dest)
+  (unless (or (and width height) (not (typep drawable 'window)))
+    (error "Width and height must be specified for windows"))
+  (or
+   (%pixbuf-get-from-drawable dest drawable
+    (cond
+     (colormap)
+     ((slot-boundp drawable 'colormap) nil)
+     ((colormap-get-system)))
+    src-x src-y dest-x dest-y (or width -1) (or height -1))
+   (error "Couldn't get pixbuf from drawable")))
+
 
 ;;; Utilities