windows.uniscribe: Render image lazily. Speeds up panes benchmark.

diff --git a/basis/ui/text/uniscribe/uniscribe.factor b/basis/ui/text/uniscribe/uniscribe.factor
index b9e5e1f69487eccbfcced7101735963c05a794fe..ef28868bc36c187173c2ced253b7abc65c3e829e 100644 (file)
--- a/basis/ui/text/uniscribe/uniscribe.factor
+++ b/basis/ui/text/uniscribe/uniscribe.factor
@@ -14,7 +14,7 @@ M: uniscribe-renderer flush-layout-cache
     cached-script-strings get purge-cache ;\r
 \r
 M: uniscribe-renderer string>image ( font string -- image loc )\r
-    cached-script-string image>> { 0 0 } ;\r
+    cached-script-string script-string>image { 0 0 } ;\r
 \r
 M: uniscribe-renderer x>offset ( x font string -- n )\r
     [ 2drop 0 ] [\r

diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor
index f1b75832c1f053f41d337fea68c4b66d9b2e5223..4f9142066d2e3a634a8b3bcbe7a21ac4a97c167f 100755 (executable)
--- a/basis/windows/uniscribe/uniscribe.factor
+++ b/basis/windows/uniscribe/uniscribe.factor
@@ -29,7 +29,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
 
 <PRIVATE
 
-: make-script-string ( dc string -- script-string )
+: make-ssa ( dc script-string -- ssa )
     dup selection? [ string>> ] when
     [ utf16n encode ] ! pString
     [ length ] bi ! cString
@@ -53,32 +53,29 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
 : selection-start/end ( script-string -- iMinSel iMaxSel )
     string>> dup selection? [ [ start>> ] [ end>> ] bi ] [ drop 0 0 ] if ;
 
-: (draw-script-string) ( script-string -- )
+: draw-script-string ( ssa size script-string -- )
     [
-        ssa>> ! ssa
         0 ! iX
         0 ! iY
         ETO_OPAQUE ! uOptions
     ]
-    [ [ { 0 0 } ] dip size>> <RECT> ]
-    [ selection-start/end ] tri
+    [ [ { 0 0 } ] dip <RECT> ]
+    [ selection-start/end ] tri*
     ! iMinSel
     ! iMaxSel
     FALSE ! fDisabled
     ScriptStringOut check-ole32-error ;
 
-: draw-script-string ( dc script-string -- )
-    [ font>> set-dc-colors ] keep (draw-script-string) ;
-
-:: make-script-string-image ( dc script-string -- image )
-    script-string size>> dc
-    [ dc script-string draw-script-string ] make-bitmap-image ;
+:: render-image ( dc ssa script-string -- image )
+    script-string size>> :> size
+    size dc
+    [ ssa size script-string draw-script-string ] make-bitmap-image ;
 
 : set-dc-font ( dc font -- )
     cache-font SelectObject win32-error=0/f ;
 
-: script-string-size ( script-string -- dim )
-    ssa>> ScriptString_pSize
+: ssa-size ( ssa -- dim )
+    ScriptString_pSize
     dup win32-error=0/f
     [ cx>> ] [ cy>> ] bi 2array ;
 
@@ -87,6 +84,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
     [ GetTextMetrics drop ] keep
     TEXTMETRIC>metrics ;
 
+! DC limit is default soft-limited to 10,000 per process.
 : <script-string> ( font string -- script-string )
     [ script-string new-disposable ] 2dip
         [ >>font ] [ >>string ] bi*
@@ -94,9 +92,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
         {
             [ over font>> set-dc-font ]
             [ dc-metrics >>metrics ]
-            [ over string>> make-script-string >>ssa ]
-            [ drop dup script-string-size >>size ]
-            [ over make-script-string-image >>image ]
+            [ over string>> make-ssa [ >>ssa ] [ ssa-size >>size ] bi ]
         } cleave
     ] with-memory-dc ;
 
@@ -110,5 +106,19 @@ SYMBOL: cached-script-strings
 : cached-script-string ( font string -- script-string )
     cached-script-strings get-global [ <script-string> ] 2cache ;
 
+: script-string>image ( script-string -- image )
+    dup image>> [
+        [
+            {
+                [ over font>> [ set-dc-font ] [ set-dc-colors ] 2bi ]
+                [
+                    dup pick string>> make-ssa
+                    dup void* <ref> &ScriptStringFree drop
+                    pick render-image >>image
+                ]
+            } cleave
+        ] with-memory-dc
+    ] unless image>> ;
+
 [ <cache-assoc> &dispose cached-script-strings set-global ]
 "windows.uniscribe" add-startup-hook