X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/43e8a182b5a4b41d3b5bb063cecb15d12ae3964b..98d09247c5f1cb84774faeca5ddd8fa32558c881:/gdk/pixbuf.lisp diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp index 143567e..493292d 100644 --- a/gdk/pixbuf.lisp +++ b/gdk/pixbuf.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2004 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2004-2005 Espen S. Johnsen ;; -;; This library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public -;; License as published by the Free Software Foundation; either -;; version 2 of the License, or (at your option) any later version. +;; Permission is hereby granted, free of charge, to any person obtaining +;; a copy of this software and associated documentation files (the +;; "Software"), to deal in the Software without restriction, including +;; without limitation the rights to use, copy, modify, merge, publish, +;; distribute, sublicense, and/or sell copies of the Software, and to +;; permit persons to whom the Software is furnished to do so, subject to +;; the following conditions: ;; -;; This library is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; Lesser General Public License for more details. +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. ;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this library; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +;; 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.1 2004-12-28 20:26:01 espen Exp $ +;; $Id: pixbuf.lisp,v 1.8 2008-04-30 18:04:09 espen Exp $ (in-package "GDK") @@ -24,39 +29,47 @@ (pixbuf pixbuf) (key string)) -(defbinding %pixbuf-new-from-file () (referenced pixbuf) +(defbinding %pixbuf-new-from-file () (or null (referenced pixbuf)) (filename pathname) - (nil null)) + (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 null)) + (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 null)) + (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")) - (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)) - ((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)) - ((or width height) - (error "Both :width and :height must be specified")) - ((%pixbuf-new-from-file filename)))) + (multiple-value-bind (pixbuf gerror) + (cond + (size + #?-(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) + #?-(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))) + (if gerror + (signal-gerror gerror) + pixbuf))) ;; (defbinding pixbuf-get-file-info () (copy-of pixbuf-format) @@ -68,15 +81,16 @@ (pixbuf pixbuf) (filename pathname) (type string) - (keys (vector (or null string))) - (values (vector (or null string))) - (nil null)) + (keys strings) + (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 @@ -84,9 +98,10 @@ (symbol (string-downcase value)) (number (format nil "~A" value))) values)) - (vector-push-extend nil keys) - (vector-push-extend nil values) - (%pixbuf-savev pixbuf filename type keys values))) + (multiple-value-bind (ok-p gerror) + (%pixbuf-savev pixbuf filename (string-downcase type) keys values) + (unless ok-p + (signal-gerror gerror))))) (defbinding pixbuf-new-from-xpm-data () (referenced pixbuf) (data (vector string))) @@ -103,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