From ff1e8f35a1d447091e9ee8361ba6f8f1d934102b Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 19 Aug 2010 08:34:47 -0600
Subject: [PATCH] drawing repairs

---
 collects/racket/draw/bitmap.rkt         |  9 +++------
 collects/racket/draw/dc.rkt             | 18 +++++++++++++++---
 collects/racket/draw/local.rkt          |  3 ++-
 collects/racket/draw/post-script-dc.rkt |  3 +++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/collects/racket/draw/bitmap.rkt b/collects/racket/draw/bitmap.rkt
index f96d7aaa9e..9c54a23c22 100644
--- a/collects/racket/draw/bitmap.rkt
+++ b/collects/racket/draw/bitmap.rkt
@@ -607,12 +607,9 @@
           (cairo_surface_mark_dirty s)))
       (cond
        [(and set-alpha?
-             (not alpha-channel?)
-             loaded-mask
-             (= width (send loaded-mask get-width))
-             (= height (send loaded-mask get-height)))
-        ;; Set alphas in mask bitmap:
-        (send loaded-mask set-alphas-as-mask x y w h bstr (* 4 w) 0)]))
+             (not alpha-channel?))
+        ;; Set alphas:
+        (set-alphas-as-mask x y w h bstr (* 4 w) 0)]))
     
     (define/public (get-alphas-as-mask x y w h bstr)
       (let ([data (cairo_image_surface_get_data (if (or b&w? alpha-channel?)
diff --git a/collects/racket/draw/dc.rkt b/collects/racket/draw/dc.rkt
index ccdc70dfda..4904e9a6d7 100644
--- a/collects/racket/draw/dc.rkt
+++ b/collects/racket/draw/dc.rkt
@@ -132,7 +132,13 @@
     ;; Return #t if text at given font size (already scaled)
     ;;  looks good when drawn all at once (which allows kerning,
     ;;  but may be spaced weirdly)
-    can-combine-text?))
+    can-combine-text?
+
+    ;; can-mask-bitmap? : -> bool
+    ;;
+    ;; Return #t if bitmap drawing with a mask is supported.
+    ;; It's not supported for PostScirpt output, for example.
+    can-mask-bitmap?))
 
 (define default-dc-backend%
   (class* object% (dc-backend<%>)
@@ -184,6 +190,9 @@
     (define/public (can-combine-text? sz)
       (sz . > . 32.0))
 
+    (define/public (can-mask-bitmap?)
+      #t)
+
     (super-new)))
 
 (define hilite-color (send the-color-database find-color "black"))
@@ -199,7 +208,7 @@
     (inherit flush-cr get-cr release-cr end-cr init-cr-matrix get-pango
              install-color dc-adjust-smoothing reset-clip
              collapse-bitmap-b&w? call-with-cr-lock
-             can-combine-text?)
+             can-combine-text? can-mask-bitmap?)
 
     (define-syntax-rule (with-cr default cr . body)
       (call-with-cr-lock
@@ -1127,7 +1136,10 @@
                                                                style black 1.0 alpha-mask)])
                             (values tmp-bm 0 0)))
                         ;; no change to source
-                        (values src src-x src-y))])
+                        (values src src-x src-y))]
+                   [(mask) (if mask
+                               (and (can-mask-bitmap?) mask)
+                               #f)])
         (let ([black? (or (not color)
                           (and (= 0 (color-red color))
                                (= 0 (color-green color))
diff --git a/collects/racket/draw/local.rkt b/collects/racket/draw/local.rkt
index 18f7f9876f..8c988555b4 100644
--- a/collects/racket/draw/local.rkt
+++ b/collects/racket/draw/local.rkt
@@ -40,4 +40,5 @@
   get-font-metrics-key
   install-color
   dc-adjust-smoothing
-  can-combine-text?)
+  can-combine-text?
+  can-mask-bitmap?)
diff --git a/collects/racket/draw/post-script-dc.rkt b/collects/racket/draw/post-script-dc.rkt
index 7e74680526..6d5a3c85be 100644
--- a/collects/racket/draw/post-script-dc.rkt
+++ b/collects/racket/draw/post-script-dc.rkt
@@ -120,6 +120,9 @@
 
     (define/override (can-combine-text? sz)
       #t)
+    
+    (define/override (can-mask-bitmap?)
+      #f)
 
     (super-new)))