;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: cairo.lisp,v 1.14 2007-08-23 21:12:43 espen Exp $
+;; $Id: cairo.lisp,v 1.16 2007-10-16 07:48:39 espen Exp $
(in-package "CAIRO")
(stride
:allocation :virtual
:getter "cairo_image_surface_get_stride"
- :reader surface-height
+ :reader surface-stride
:type int))
(:metaclass surface-class))
(defun scale-to-device (cr &optional keep-rotation-p)
(if keep-rotation-p
- (multiple-value-call #'scale cr (device-to-user-distance cr 1.0))
- (multiple-value-bind (x y)
- (multiple-value-call #'user-to-device cr (get-current-point cr))
-; (identity-matrix cr)
- (setf (matrix cr) (matrix-init-identity))
+ (multiple-value-bind (dx dy) (device-to-user-distance cr 1.0 0.0)
+ (scale cr (sqrt (+ (* dx dx) (* dy dy)))))
+ (multiple-value-bind (x y)
+ (with-context (cr)
+ (move-to cr 0.0 0.0)
+ (multiple-value-call #'user-to-device cr (get-current-point cr)))
+ (identity-matrix cr)
(translate cr x y))))
(defbinding rotate () nil
:success)
+(defmacro with-surface ((surface cr) &body body)
+ `(let ((,cr (make-instance 'context :target ,surface)))
+ ,@body))
+
+
;; Image Surface
;; Should data be automatically freed when the surface is GCed?
(defbinding matrix-init-identity (&optional (matrix (make-instance 'matrix))) nil
(matrix matrix :in/return))
+(defun identity-matrix-p (matrix)
+ (with-slots (xx yx xy yy x0 y0) matrix
+ (and
+ (= xx 1.0d0) (= yx 0.0d0) (= xy 0.0d0)
+ (= yy 1.0d0) (= x0 0.0d0) (= y0 0.0d0))))
+
(defbinding matrix-init-translate () nil
(matrix matrix :in/return)
(tx double-float)
(ty double-float))
-(defbinding matrix-init-scale () nil
+(defbinding matrix-init-scale (matrix sx &optional (sy sx)) nil
(matrix matrix :in/return)
(sx double-float)
(sy double-float))
(tx double-float)
(ty double-float))
-(defbinding matrix-scale () nil
+(defbinding matrix-scale (matrix sx &optional (sy sx)) nil
(matrix matrix :in/return)
(sx double-float)
(sy double-float))
(a matrix)
(b matrix))
-(defbinding matrix-transform-distance () nil
- (matrix matrix :in/return)
- (dx double-float)
- (dy double-float))
+(defbinding matrix-transform-distance (matrix dx &optional (dy dx)) nil
+ (matrix matrix)
+ (dx double-float :in/out)
+ (dy double-float :in/out))
(defbinding matrix-transform-point () nil
- (matrix matrix :in/return)
- (x double-float)
- (y double-float))
-
-
-
+ (matrix matrix)
+ (x double-float :in/out)
+ (y double-float :in/out))