Return type for ACCEL-GROUPS-FROM-OBJECT corrected

[clg] / gdk / pixbuf.lisp

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index 7cbdce25e4a634067095daad92dbc3c42336a243..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.4 2006-04-25 22:27:13 espen Exp $
+;; $Id: pixbuf.lisp,v 1.6 2007-06-18 10:14:39 espen Exp $
 
 
 (in-package "GDK")
@@ -82,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)
@@ -90,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 
@@ -98,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)))))
 
@@ -117,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