X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..98d09247c5f1cb84774faeca5ddd8fa32558c881:/gdk/pixbuf.lisp

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index 334bb9d..493292d 100644
--- 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.8 2008-04-30 18:04:09 espen Exp $
 
 
 (in-package "GDK")
@@ -29,37 +29,41 @@
   (pixbuf pixbuf)
   (key string))
 
-(defbinding %pixbuf-new-from-file () (referenced pixbuf)
+(defbinding %pixbuf-new-from-file () (or null (referenced pixbuf))
   (filename pathname)
-  (nil gerror :out))
+  (nil (or null gerror) :out))
 
-(defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
+(defbinding %pixbuf-new-from-file-at-size () (or null (referenced pixbuf))
   (filename pathname)
   (width int)
   (height int)
-  (nil gerror :out))
+  (nil (or null gerror) :out))
 
-#+gtk2.6
-(defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+(defbinding %pixbuf-new-from-file-at-scale () (or null (referenced pixbuf))
   (filename pathname)
   (width int)
   (height int)
   (preserve-aspect-ratio boolean)
-  (nil gerror :out))
+  (nil (or null 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,14 +82,15 @@
   (filename pathname)
   (type string)
   (keys strings)
-  (values string)
-  (nil gerror :out))
+  (values strings)
+  (nil (or null gerror) :out))
 
 (defun pixbuf-save (pixbuf filename type &rest options)
   (let ((keys (make-array 0 :adjustable t :fill-pointer t))
 	(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 @@
 	   (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,69 @@
       (%pixbuf-copy pixbuf)
     (%pixbuf-new-subpixbuf pixbuf x y width height)))
 
+(defbinding %pixbuf-get-from-drawable () (or null (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")))
+
+
+;;; Pixbuf Loader
+
+(defbinding %pixbuf-loader-new-with-type () pointer
+  (type string)
+  (nil gerror-signal :out))
+
+(defbinding %pixbuf-loader-new-with-mime-type () pointer
+  (mime-type string)
+  (nil gerror-signal :out))
+
+(defmethod allocate-foreign ((loader pixbuf-loader) &key type mime-type)
+  (cond
+   ((and type mime-type) 
+    (error "Only one of the keyword arguments :TYPE and :MIME-TYPE can be specified"))
+   (type (%pixbuf-loader-new-with-type type))
+   (mime-type (%pixbuf-loader-new-with-mime-type mime-type))
+   ((call-next-method))))
+
+(defbinding pixbuf-loader-write (loader buffer &optional (length (length buffer))) boolean
+  (loader pixbuf-loader)
+  (buffer (unboxed-vector (unsigned-byte 8)))
+  (length integer)  
+  (nil gerror-signal :out))
+
+(defbinding pixbuf-loader-close () boolean
+  (loader pixbuf-loader)
+  (nil gerror-signal :out))
+
+(defbinding pixbuf-loader-get-pixbuf () (or null pixbuf)
+  (loader pixbuf-loader))
+
+(defbinding pixbuf-loader-get-animation () (or null pixbuf-animation)
+  (loader pixbuf-loader))
+
+(defbinding pixbuf-loader-set-size () nil
+  (loader pixbuf-loader)
+  (width integer)
+  (height integer))
+
 
 ;;; Utilities